[gnome-screensaver] Stop using deprecated GTK methods



commit 6e66f0234e0decc0d17d467f449c22287ab54415
Author: Robert Ancell <robert ancell canonical com>
Date:   Fri Feb 10 16:31:27 2012 +1100

    Stop using deprecated GTK methods

 src/gs-lock-plug.c  |   10 +++++-----
 src/gs-window-x11.c |   12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/src/gs-lock-plug.c b/src/gs-lock-plug.c
index e54cb49..fe53437 100644
--- a/src/gs-lock-plug.c
+++ b/src/gs-lock-plug.c
@@ -1384,17 +1384,17 @@ create_page_one (GSLockPlug *plug)
         align = gtk_alignment_new (0.5, 0.5, 1, 1);
         gtk_notebook_append_page (GTK_NOTEBOOK (plug->priv->notebook), align, NULL);
 
-        vbox = gtk_vbox_new (FALSE, 12);
+        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
         gtk_container_add (GTK_CONTAINER (align), vbox);
 
-        hbox = gtk_hbox_new (FALSE, 6);
+        hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
         gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
         plug->priv->auth_face_image = gtk_image_new ();
         gtk_box_pack_start (GTK_BOX (hbox), plug->priv->auth_face_image, FALSE, FALSE, 0);
         gtk_misc_set_alignment (GTK_MISC (plug->priv->auth_face_image), 0, 0);
 
-        vbox2 = gtk_vbox_new (FALSE, 6);
+        vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
         gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
         gtk_container_set_border_width (GTK_CONTAINER (vbox2), 10);
 
@@ -1422,7 +1422,7 @@ create_page_one (GSLockPlug *plug)
         gtk_box_pack_start (GTK_BOX (vbox), plug->priv->auth_message_label,
                             FALSE, FALSE, 0);
         /* Buttons */
-        plug->priv->auth_action_area = gtk_hbutton_box_new ();
+        plug->priv->auth_action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 
         gtk_button_box_set_layout (GTK_BUTTON_BOX (plug->priv->auth_action_area),
                                    GTK_BUTTONBOX_END);
@@ -1483,7 +1483,7 @@ gs_lock_plug_init (GSLockPlug *plug)
         gtk_frame_set_shadow_type (GTK_FRAME (plug->priv->frame), GTK_SHADOW_OUT);
         gtk_container_add (GTK_CONTAINER (plug), plug->priv->frame);
 
-        plug->priv->vbox = gtk_vbox_new (FALSE, 0);
+        plug->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (plug->priv->frame), plug->priv->vbox);
 
         plug->priv->auth_prompt_kbd_layout_indicator = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c
index 6956874..4c1d47c 100644
--- a/src/gs-window-x11.c
+++ b/src/gs-window-x11.c
@@ -692,7 +692,7 @@ set_info_text_and_icon (GSWindow   *window,
         GtkWidget *primary_label;
         GtkWidget *secondary_label;
 
-        hbox_content = gtk_hbox_new (FALSE, 8);
+        hbox_content = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
         gtk_widget_show (hbox_content);
 
         image = gtk_image_new_from_stock (icon_stock_id, GTK_ICON_SIZE_DIALOG);
@@ -700,7 +700,7 @@ set_info_text_and_icon (GSWindow   *window,
         gtk_box_pack_start (GTK_BOX (hbox_content), image, FALSE, FALSE, 0);
         gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0);
 
-        vbox = gtk_vbox_new (FALSE, 6);
+        vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
         gtk_widget_show (vbox);
         gtk_box_pack_start (GTK_BOX (hbox_content), vbox, FALSE, FALSE, 0);
 
@@ -2263,7 +2263,7 @@ create_panel (GSWindow *window)
 
         g_signal_connect (window->priv->panel, "draw", G_CALLBACK (on_panel_draw), window);
 
-        left_hbox = gtk_hbox_new (FALSE, 6);
+        left_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
         gtk_box_pack_start (GTK_BOX (window->priv->panel), left_hbox, TRUE, TRUE, 0);
 
         alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
@@ -2277,7 +2277,7 @@ create_panel (GSWindow *window)
         gtk_alignment_set_padding (GTK_ALIGNMENT (right_alignment),
                                    0, 0, 10, 10);
 
-        right_hbox = gtk_hbox_new (FALSE, 6);
+        right_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
         gtk_container_add (GTK_CONTAINER (right_alignment), right_hbox);
 
         window->priv->name_label = gtk_label_new (NULL);
@@ -2331,11 +2331,11 @@ gs_window_init (GSWindow *window)
                                | GDK_ENTER_NOTIFY_MASK
                                | GDK_LEAVE_NOTIFY_MASK);
 
-        window->priv->vbox = gtk_vbox_new (FALSE, 0);
+        window->priv->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_widget_show (window->priv->vbox);
         gtk_container_add (GTK_CONTAINER (window), window->priv->vbox);
 
-        window->priv->panel = gtk_hbox_new (FALSE, 12);
+        window->priv->panel = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
         gtk_widget_show (window->priv->panel);
         gtk_box_pack_start (GTK_BOX (window->priv->vbox), window->priv->panel, FALSE, FALSE, 0);
         create_panel (window);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]