[PATCH] Stop using deprecated gtk margin functions.

Chris Lumens clumens at redhat.com
Mon Dec 16 18:22:01 UTC 2013


---
 configure.ac                     | 2 +-
 widgets/src/BaseWindow.c         | 4 ++--
 widgets/src/LayoutIndicator.c    | 4 ++--
 widgets/src/MountpointSelector.c | 4 ++--
 widgets/src/StandaloneWindow.c   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3b736fa..f1575f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,7 +147,7 @@ PKG_PROG_PKG_CONFIG([0.23])
 PKG_CHECK_MODULES([X11], [x11 >= 1.3])
 PKG_CHECK_MODULES([XCOMPOSITE], [xcomposite >= 0.4.1])
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.16.1])
-PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0 >= 3.0])
+PKG_CHECK_MODULES([GTK_X11], [gtk+-x11-3.0 >= 3.11.2])
 PKG_CHECK_MODULES([GDK], [gdk-3.0])
 PKG_CHECK_MODULES([NETWORKMANAGER], [NetworkManager >= 0.7.1])
 PKG_CHECK_MODULES([LIBNL], [libnl-1 >= 1.0])
diff --git a/widgets/src/BaseWindow.c b/widgets/src/BaseWindow.c
index 77977cf..26ec2b5 100644
--- a/widgets/src/BaseWindow.c
+++ b/widgets/src/BaseWindow.c
@@ -229,8 +229,8 @@ static void anaconda_base_window_init(AnacondaBaseWindow *win) {
     win->priv->nav_area = gtk_grid_new();
     gtk_grid_set_row_homogeneous(GTK_GRID(win->priv->nav_area), FALSE);
     gtk_grid_set_column_homogeneous(GTK_GRID(win->priv->nav_area), FALSE);
-    gtk_widget_set_margin_left(win->priv->nav_area, 6);
-    gtk_widget_set_margin_right(win->priv->nav_area, 6);
+    gtk_widget_set_margin_start(win->priv->nav_area, 6);
+    gtk_widget_set_margin_end(win->priv->nav_area, 6);
     gtk_widget_set_margin_top(win->priv->nav_area, 6);
 
     gtk_container_add(GTK_CONTAINER(win->priv->nav_box), win->priv->nav_area);
diff --git a/widgets/src/LayoutIndicator.c b/widgets/src/LayoutIndicator.c
index 2a44560..4e29523 100644
--- a/widgets/src/LayoutIndicator.c
+++ b/widgets/src/LayoutIndicator.c
@@ -224,8 +224,8 @@ static void anaconda_layout_indicator_init(AnacondaLayoutIndicator *self) {
     self->priv->main_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4));
     gtk_box_pack_start(self->priv->main_box, self->priv->icon, FALSE, FALSE, 0);
     gtk_box_pack_end(self->priv->main_box, GTK_WIDGET(self->priv->layout_label), FALSE, FALSE, 0);
-    gtk_widget_set_margin_left(GTK_WIDGET(self->priv->main_box), 4);
-    gtk_widget_set_margin_right(GTK_WIDGET(self->priv->main_box), 4);
+    gtk_widget_set_margin_start(GTK_WIDGET(self->priv->main_box), 4);
+    gtk_widget_set_margin_end(GTK_WIDGET(self->priv->main_box), 4);
     gtk_widget_set_margin_top(GTK_WIDGET(self->priv->main_box), 3);
     gtk_widget_set_margin_bottom(GTK_WIDGET(self->priv->main_box), 3);
 
diff --git a/widgets/src/MountpointSelector.c b/widgets/src/MountpointSelector.c
index e14072b..24a0855 100644
--- a/widgets/src/MountpointSelector.c
+++ b/widgets/src/MountpointSelector.c
@@ -196,7 +196,7 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
     /* Create the grid. */
     mountpoint->priv->grid = gtk_grid_new();
     gtk_grid_set_column_spacing(GTK_GRID(mountpoint->priv->grid), 12);
-    gtk_widget_set_margin_left(GTK_WIDGET(mountpoint->priv->grid), 30);
+    gtk_widget_set_margin_start(GTK_WIDGET(mountpoint->priv->grid), 30);
 
     /* Create the icon.  We don't need to check if it returned NULL since
      * gtk_image_new_from_file will just display a broken image icon in that
@@ -235,7 +235,7 @@ static void anaconda_mountpoint_selector_init(AnacondaMountpointSelector *mountp
     gtk_grid_attach(GTK_GRID(mountpoint->priv->grid), mountpoint->priv->size_label, 1, 0, 1, 2);
     gtk_grid_attach(GTK_GRID(mountpoint->priv->grid), mountpoint->priv->arrow, 2, 0, 1, 2);
     gtk_grid_attach(GTK_GRID(mountpoint->priv->grid), mountpoint->priv->name_label, 0, 1, 1, 2);
-    gtk_widget_set_margin_right(GTK_WIDGET(mountpoint->priv->grid), 12);
+    gtk_widget_set_margin_end(GTK_WIDGET(mountpoint->priv->grid), 12);
 
     gtk_container_add(GTK_CONTAINER(mountpoint), mountpoint->priv->grid);
 }
diff --git a/widgets/src/StandaloneWindow.c b/widgets/src/StandaloneWindow.c
index 5bb5b7c..a770bc7 100644
--- a/widgets/src/StandaloneWindow.c
+++ b/widgets/src/StandaloneWindow.c
@@ -145,8 +145,8 @@ static void anaconda_standalone_window_init(AnacondaStandaloneWindow *win) {
 
     /* Create the button box and pack the buttons into it. */
     win->priv->button_box = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-    gtk_widget_set_margin_left(win->priv->button_box, 6);
-    gtk_widget_set_margin_right(win->priv->button_box, 6);
+    gtk_widget_set_margin_start(win->priv->button_box, 6);
+    gtk_widget_set_margin_end(win->priv->button_box, 6);
     gtk_widget_set_margin_bottom(win->priv->button_box, 6);
     gtk_button_box_set_layout(GTK_BUTTON_BOX(win->priv->button_box), GTK_BUTTONBOX_EDGE);
     gtk_container_add(GTK_CONTAINER(win->priv->button_box), win->priv->quit_button);
-- 
1.8.3.1



More information about the anaconda-patches mailing list