From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 4 Jan 2016 13:05:14 +0000 (+0100)
Subject: "margin-left" -> "margin-start" && "margin-right" -> "margin-end"
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=cfe65232ff4bf28987ff1c1d02c9ec385de3c4af

"margin-left" -> "margin-start" && "margin-right" -> "margin-end"

These are the preferred property names on recent Gtk releases.
---

diff --git a/src/ui/gui/examine.ui b/src/ui/gui/examine.ui
index 75ec3d2672..ac6f104d00 100644
--- a/src/ui/gui/examine.ui
+++ b/src/ui/gui/examine.ui
@@ -73,7 +73,7 @@
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow3">
                         <property name="visible">True</property>
-                        <property name="margin-left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="hscrollbar_policy">never</property>
@@ -120,7 +120,7 @@
                     <child>
                       <object class="GtkScrolledWindow" id="scrolledwindow2">
                         <property name="visible">True</property>
-                        <property name="margin-left">12</property>
+                        <property name="margin-start">12</property>
                         <property name="can_focus">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                         <property name="hscrollbar_policy">never</property>
diff --git a/src/ui/gui/psppire-val-chooser.c b/src/ui/gui/psppire-val-chooser.c
index 8db9cd77d7..25a34f1275 100644
--- a/src/ui/gui/psppire-val-chooser.c
+++ b/src/ui/gui/psppire-val-chooser.c
@@ -349,8 +349,8 @@ psppire_val_chooser_init (PsppireValChooser *vr)
   gint row = 0;
 
   g_object_set (G_OBJECT (grid),
-		"margin-left", 5,
-		"margin-right", 5,
+		"margin-start", 5,
+		"margin-end", 5,
 		NULL);
   
   vr->input_var_is_string = FALSE;