[seahorse] Fix up for GTK+3 deprecations of GtkHBox and GtkVBox



commit 9042815fdb31e8d45b19c50db01c12d68a482958
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Aug 30 15:39:59 2011 +0200

    Fix up for GTK+3 deprecations of GtkHBox and GtkVBox

 libegg/egg-datetime.c             |   10 +++++-----
 libegg/egg-datetime.h             |    4 ++--
 libseahorse/seahorse-passphrase.c |    6 +++---
 src/seahorse-key-manager.c        |    2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/libegg/egg-datetime.c b/libegg/egg-datetime.c
index 15303b5..554a5c9 100644
--- a/libegg/egg-datetime.c
+++ b/libegg/egg-datetime.c
@@ -267,7 +267,7 @@ static void  update_date_label      (EggDateTime *edt);
 static void  update_time_label      (EggDateTime *edt);
 
 
-static GtkHBoxClass *parent_class = NULL;
+static GtkBoxClass *parent_class = NULL;
 
 
 GType
@@ -288,7 +288,7 @@ egg_datetime_get_type (void)
          (GInstanceInitFunc) egg_datetime_init
       };
 
-      datetime_type = g_type_register_static (GTK_TYPE_HBOX, "EggDateTime", &datetime_info, 0);
+      datetime_type = g_type_register_static (GTK_TYPE_BOX, "EggDateTime", &datetime_info, 0);
    }
 
    return datetime_type;
@@ -488,7 +488,7 @@ egg_datetime_init (EggDateTime *edt)
 
    /* Date Widgets */
 
-   priv->date_box = gtk_hbox_new (FALSE, 0);
+   priv->date_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
    gtk_box_pack_start (GTK_BOX (edt), priv->date_box, TRUE, TRUE, 0);
 
    priv->date_entry = gtk_entry_new ();
@@ -513,7 +513,7 @@ egg_datetime_init (EggDateTime *edt)
 
    /* Time Widgets */
 
-   priv->time_box = gtk_hbox_new (FALSE, 0);
+   priv->time_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
    gtk_box_pack_start (GTK_BOX (edt), priv->time_box, TRUE, TRUE, 0);
 
    priv->time_entry = gtk_entry_new ();
@@ -1384,7 +1384,7 @@ egg_datetime_new (void)
 {
    EggDateTime *edt;
 
-   edt = g_object_new (EGG_TYPE_DATETIME, NULL);
+   edt = g_object_new (EGG_TYPE_DATETIME, "orientation", GTK_ORIENTATION_HORIZONTAL, NULL);
    egg_datetime_set_from_time_t (edt, time (NULL));
 
    return GTK_WIDGET (edt);
diff --git a/libegg/egg-datetime.h b/libegg/egg-datetime.h
index e466071..6519a5c 100644
--- a/libegg/egg-datetime.h
+++ b/libegg/egg-datetime.h
@@ -68,14 +68,14 @@ typedef struct _EggDateTimePrivate  EggDateTimePrivate;
 
 struct _EggDateTime
 {
-   GtkHBox parent;
+   GtkBox parent;
 
    EggDateTimePrivate *priv;
 };
 
 struct _EggDateTimeClass
 {
-   GtkHBoxClass parent_class;
+   GtkBoxClass parent_class;
 
    /* Signals */
 
diff --git a/libseahorse/seahorse-passphrase.c b/libseahorse/seahorse-passphrase.c
index 33a0b04..231566d 100644
--- a/libseahorse/seahorse-passphrase.c
+++ b/libseahorse/seahorse-passphrase.c
@@ -189,11 +189,11 @@ seahorse_passphrase_prompt_show (const gchar *title, const gchar *description,
     g_signal_connect (G_OBJECT (dialog), "unmap-event", G_CALLBACK (ungrab_keyboard), NULL);
     g_signal_connect (G_OBJECT (dialog), "window-state-event", G_CALLBACK (window_state_changed), NULL); 
 
-    wvbox = gtk_vbox_new (FALSE, HIG_LARGE * 2);
+    wvbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_LARGE * 2);
     gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (dialog)), wvbox);
     gtk_container_set_border_width (GTK_CONTAINER (wvbox), HIG_LARGE);
 
-    chbox = gtk_hbox_new (FALSE, HIG_LARGE);
+    chbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, HIG_LARGE);
     gtk_box_pack_start (GTK_BOX (wvbox), chbox, FALSE, FALSE, 0);
 
     /* The image */
@@ -201,7 +201,7 @@ seahorse_passphrase_prompt_show (const gchar *title, const gchar *description,
     gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
     gtk_box_pack_start (GTK_BOX (chbox), w, FALSE, FALSE, 0);
 
-    box = gtk_vbox_new (FALSE, HIG_SMALL);
+    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, HIG_SMALL);
     gtk_box_pack_start (GTK_BOX (chbox), box, TRUE, TRUE, 0);
 
     /* The description text */
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index 4c5239c..ebcacd2 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -919,7 +919,7 @@ seahorse_key_manager_constructed (GObject *object)
 				gtk_toolbar_insert (toolbar, GTK_TOOL_ITEM (sep), -1);
 				
 				/* Insert a filter bar */
-				box = GTK_BOX (gtk_hbox_new (FALSE, 0));
+				box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
 				gtk_box_pack_start (box, GTK_WIDGET (gtk_label_new (_("Filter:"))), FALSE, TRUE, 3);
 				
 				self->pv->filter_entry = GTK_ENTRY (gtk_entry_new ());



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