Tighten up bounds-checking of agent responses.

[PuTTY.git] / unix / gtkmisc.c

diff --git a/unix/gtkmisc.c b/unix/gtkmisc.c
index bf2647fd038045aff833835c3f6bf18d7bf13236..6ee68be2e87b6d861635b4b4938636a3af29f650 100644 (file)
--- a/unix/gtkmisc.c
+++ b/unix/gtkmisc.c
@@ -62,6 +62,8 @@ void align_label_left(GtkLabel *label)
 {
 #if GTK_CHECK_VERSION(3,16,0)
     gtk_label_set_xalign(label, 0.0);
+#elif GTK_CHECK_VERSION(3,14,0)
+    gtk_widget_set_halign(GTK_WIDGET(label), GTK_ALIGN_START);
 #else
     gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.0);
 #endif
@@ -156,14 +158,15 @@ void our_dialog_set_action_area(GtkWindow *dlg, GtkWidget *w)
     /* GtkWindow is a GtkBin, hence contains exactly one child, which
      * here we always expect to be a vbox */
     GtkBox *vbox = GTK_BOX(gtk_bin_get_child(GTK_BIN(dlg)));
-
-    GtkWidget *sep = gtk_hseparator_new();
-    gtk_box_pack_end(vbox, sep, FALSE, TRUE, 0);
-    gtk_widget_show(sep);
+    GtkWidget *sep;
 
     g_object_set(G_OBJECT(w), "margin", 8, (const char *)NULL);
     gtk_box_pack_end(vbox, w, FALSE, TRUE, 0);
 
+    sep = gtk_hseparator_new();
+    gtk_box_pack_end(vbox, sep, FALSE, TRUE, 0);
+    gtk_widget_show(sep);
+
 #endif
 }
 
@@ -172,6 +175,8 @@ GtkBox *our_dialog_make_action_hbox(GtkWindow *dlg)
 #if GTK_CHECK_VERSION(3,0,0)
     GtkWidget *hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
     our_dialog_set_action_area(dlg, hbox);
+    g_object_set(G_OBJECT(hbox), "margin", 0, (const char *)NULL);
+    g_object_set(G_OBJECT(hbox), "spacing", 8, (const char *)NULL);
     gtk_widget_show(hbox);
     return GTK_BOX(hbox);
 #else /* not GTK 3 */