GNOME.org
 

[gnome-bluetooth] Update for Gtk[HV]Box deprecation

commit 23b1f12e8c89b1a14e5c113e79335e99a5b39bfd
Author: Colin Walters <walters verbum org>
Date:   Wed Jun 15 18:12:17 2011 -0400

    Update for Gtk[HV]Box deprecation
    
    Only compile tested.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=652683

 applet/authorisation-dialogue.ui        |    2 +-
 applet/confirm-dialogue.ui              |    2 +-
 applet/passkey-dialogue.ui              |    2 +-
 lib/bluetooth-chooser-combo.c           |    7 ++++---
 lib/bluetooth-chooser-combo.h           |    4 ++--
 lib/bluetooth-chooser.c                 |   11 ++++++-----
 lib/bluetooth-chooser.h                 |    4 ++--
 lib/bluetooth-filter-widget.c           |    3 ++-
 lib/bluetooth-filter-widget.h           |    4 ++--
 lib/test-client.c                       |    2 +-
 lib/test-deviceselection.c              |    4 ++--
 lib/test-plugins.c                      |    2 +-
 moblin/moblin-copy-n-paste/mux-banner.c |    4 ++--
 moblin/moblin-copy-n-paste/mux-banner.h |    4 ++--
 moblin/moblin-panel.c                   |    4 ++--
 moblin/pin.ui                           |    7 ++++---
 properties/bluetooth.ui                 |   27 ++++++++++++++++++---------
 sendto/main.c                           |    4 ++--
 wizard/main.c                           |   23 -----------------------
 wizard/wizard.ui                        |   31 +++++++++++++++++++------------
 20 files changed, 74 insertions(+), 77 deletions(-)
---
diff --git a/applet/authorisation-dialogue.ui b/applet/authorisation-dialogue.ui
index 233cd70..20c493c 100644
--- a/applet/authorisation-dialogue.ui
+++ b/applet/authorisation-dialogue.ui
@@ -17,7 +17,7 @@
     <property name="secondary_text">Device 'Foobar' (AA:BB:CC:DD:EE:FF) wants access to the service 'Foobar'.</property>
     <property name="image">image1</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
diff --git a/applet/confirm-dialogue.ui b/applet/confirm-dialogue.ui
index b11a81a..96aa5c2 100644
--- a/applet/confirm-dialogue.ui
+++ b/applet/confirm-dialogue.ui
@@ -17,7 +17,7 @@
     <property name="secondary_text">Please confirm whether the PIN '123456' matches the one on device 'Foobar' (AA:BB:CC:DD:EE:FF).</property>
     <property name="image">image1</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
diff --git a/applet/passkey-dialogue.ui b/applet/passkey-dialogue.ui
index 5560bcf..9640be4 100644
--- a/applet/passkey-dialogue.ui
+++ b/applet/passkey-dialogue.ui
@@ -18,7 +18,7 @@
     <property name="secondary_text">Please enter the PIN mentioned on device 'Foobar' (AA:BB:CC:DD:EE:FF).</property>
     <property name="image">image1</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
diff --git a/lib/bluetooth-chooser-combo.c b/lib/bluetooth-chooser-combo.c
index 09e8d06..2768f19 100644
--- a/lib/bluetooth-chooser-combo.c
+++ b/lib/bluetooth-chooser-combo.c
@@ -58,9 +58,9 @@ static int signals[LAST_SIGNAL] = { 0 };
 static void	bluetooth_chooser_combo_class_init	(BluetoothChooserComboClass * klass);
 static void	bluetooth_chooser_combo_init		(BluetoothChooserCombo      * combo);
 
-static GtkVBoxClass *parent_class;
+static GtkBoxClass *parent_class;
 
-G_DEFINE_TYPE(BluetoothChooserCombo, bluetooth_chooser_combo, GTK_TYPE_VBOX);
+G_DEFINE_TYPE(BluetoothChooserCombo, bluetooth_chooser_combo, GTK_TYPE_BOX);
 
 #define BLUETOOTH_CHOOSER_COMBO_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), \
 									BLUETOOTH_TYPE_CHOOSER_COMBO, BluetoothChooserComboPrivate))
@@ -299,7 +299,8 @@ bluetooth_chooser_combo_init (BluetoothChooserCombo *combo)
 
 	combo->priv = BLUETOOTH_CHOOSER_COMBO_GET_PRIVATE (combo);
 
-	combo->priv->drop_box = gtk_hbox_new (TRUE, 0);
+	combo->priv->drop_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	gtk_box_set_homogeneous (GTK_BOX (combo->priv->drop_box), TRUE);
 	gtk_box_pack_start (GTK_BOX (combo), combo->priv->drop_box,
 			    TRUE, FALSE, 0);
 	/* Setup the combo itself */
diff --git a/lib/bluetooth-chooser-combo.h b/lib/bluetooth-chooser-combo.h
index 2191fcc..c78c23c 100644
--- a/lib/bluetooth-chooser-combo.h
+++ b/lib/bluetooth-chooser-combo.h
@@ -39,13 +39,13 @@ typedef struct _BluetoothChooserComboPrivate BluetoothChooserComboPrivate;
 typedef struct _BluetoothChooserComboClass BluetoothChooserComboClass;
 
 typedef struct _BluetoothChooserCombo {
-	GtkVBox            parent;
+	GtkBox            parent;
 
 	BluetoothChooserComboPrivate *priv;
 } BluetoothChooserCombo;
 
 struct _BluetoothChooserComboClass {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   void (*chooser_created) (BluetoothChooserCombo *self, GtkWidget *chooser);
 };
diff --git a/lib/bluetooth-chooser.c b/lib/bluetooth-chooser.c
index 0bc988b..4a02ccf 100644
--- a/lib/bluetooth-chooser.c
+++ b/lib/bluetooth-chooser.c
@@ -89,7 +89,7 @@ struct _BluetoothChooserPrivate {
 	guint internal_filter : 1;
 };
 
-G_DEFINE_TYPE(BluetoothChooser, bluetooth_chooser, GTK_TYPE_VBOX)
+G_DEFINE_TYPE(BluetoothChooser, bluetooth_chooser, GTK_TYPE_BOX)
 
 enum {
 	DEVICE_TYPE_FILTER_COL_NAME = 0,
@@ -863,7 +863,7 @@ bluetooth_chooser_init(BluetoothChooser *self)
 	gtk_box_set_spacing (GTK_BOX(self), 18);
 	gtk_container_set_border_width (GTK_CONTAINER(self), 0);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox);
 	gtk_box_pack_start (GTK_BOX (self), vbox, TRUE, TRUE, 0);
 
@@ -880,11 +880,11 @@ bluetooth_chooser_init(BluetoothChooser *self)
 	gtk_alignment_set_padding (GTK_ALIGNMENT (priv->label_align), 0, 0, 0, 0);
 
 	/* The treeview label */
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (priv->label_align), vbox);
 
-	priv->search_hbox = gtk_hbox_new (FALSE, 24);
+	priv->search_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 24);
 	gtk_widget_set_name (priv->search_hbox, "search_hbox");
 	if (priv->show_searching)
 		gtk_widget_show (priv->search_hbox);
@@ -897,7 +897,7 @@ bluetooth_chooser_init(BluetoothChooser *self)
 			  G_CALLBACK (adapter_model_row_changed), self);
 
 	/* The searching label */
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_set_name (hbox, "searching label hbox");
 	priv->spinner = gtk_spinner_new ();
 	gtk_container_add (GTK_CONTAINER (hbox), priv->spinner);
@@ -1250,6 +1250,7 @@ GtkWidget *
 bluetooth_chooser_new (const gchar *title)
 {
 	return g_object_new(BLUETOOTH_TYPE_CHOOSER,
+			    "orientation", GTK_ORIENTATION_VERTICAL,
 			    "title", title,
 			    NULL);
 }
diff --git a/lib/bluetooth-chooser.h b/lib/bluetooth-chooser.h
index b89105a..f657cfe 100644
--- a/lib/bluetooth-chooser.h
+++ b/lib/bluetooth-chooser.h
@@ -46,11 +46,11 @@ typedef struct _BluetoothChooser BluetoothChooser;
 typedef struct _BluetoothChooserClass BluetoothChooserClass;
 
 struct _BluetoothChooser {
-	GtkVBox parent;
+	GtkBox parent;
 };
 
 struct _BluetoothChooserClass {
-	GtkVBoxClass parent_class;
+	GtkBoxClass parent_class;
 
 	void (*selected_device_changed) (BluetoothChooser *chooser, const char *address);
 	void (*selected_device_activated) (BluetoothChooser *chooser, const char *address);
diff --git a/lib/bluetooth-filter-widget.c b/lib/bluetooth-filter-widget.c
index 004e9b8..fa2f087 100644
--- a/lib/bluetooth-filter-widget.c
+++ b/lib/bluetooth-filter-widget.c
@@ -55,7 +55,7 @@ struct _BluetoothFilterWidgetPrivate {
 	guint show_device_category : 1;
 };
 
-G_DEFINE_TYPE(BluetoothFilterWidget, bluetooth_filter_widget, GTK_TYPE_VBOX)
+G_DEFINE_TYPE(BluetoothFilterWidget, bluetooth_filter_widget, GTK_TYPE_BOX)
 
 enum {
 	DEVICE_TYPE_FILTER_COL_NAME = 0,
@@ -481,5 +481,6 @@ GtkWidget *
 bluetooth_filter_widget_new (void)
 {
 	return g_object_new(BLUETOOTH_TYPE_FILTER_WIDGET,
+			    "orientation", GTK_ORIENTATION_VERTICAL,
 			    NULL);
 }
diff --git a/lib/bluetooth-filter-widget.h b/lib/bluetooth-filter-widget.h
index 8010c1f..05912e4 100644
--- a/lib/bluetooth-filter-widget.h
+++ b/lib/bluetooth-filter-widget.h
@@ -47,11 +47,11 @@ typedef struct _BluetoothFilterWidget BluetoothFilterWidget;
 typedef struct _BluetoothFilterWidgetClass BluetoothFilterWidgetClass;
 
 struct _BluetoothFilterWidget {
-	GtkVBox parent;
+	GtkBox parent;
 };
 
 struct _BluetoothFilterWidgetClass {
-	GtkVBoxClass parent_class;
+	GtkBoxClass parent_class;
 };
 
 GType bluetooth_filter_widget_get_type (void);
diff --git a/lib/test-client.c b/lib/test-client.c
index ff759ba..c5920cb 100644
--- a/lib/test-client.c
+++ b/lib/test-client.c
@@ -175,7 +175,7 @@ static void create_window(void)
 	g_signal_connect(G_OBJECT(window), "delete-event",
 					G_CALLBACK(delete_callback), NULL);
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_container_add(GTK_CONTAINER(window), vbox);
 
 	toolbar = gtk_toolbar_new();
diff --git a/lib/test-deviceselection.c b/lib/test-deviceselection.c
index 3819fcc..a57b566 100644
--- a/lib/test-deviceselection.c
+++ b/lib/test-deviceselection.c
@@ -331,7 +331,7 @@ create_filter_dialogue (void)
 
 	dialog = create_dialogue ("Add a Device");
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_show (hbox);
 
 	selector = g_object_new (BLUETOOTH_TYPE_CHOOSER,
@@ -345,7 +345,7 @@ create_filter_dialogue (void)
 		     NULL);
 	gtk_box_pack_start (GTK_BOX (hbox), selector, TRUE, TRUE, 6);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 	filter = bluetooth_filter_widget_new ();
diff --git a/lib/test-plugins.c b/lib/test-plugins.c
index 2875d86..7e04f74 100644
--- a/lib/test-plugins.c
+++ b/lib/test-plugins.c
@@ -85,7 +85,7 @@ int main (int argc, char **argv)
 	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	g_signal_connect (G_OBJECT (window), "delete-event",
 			  G_CALLBACK (delete_event_cb), NULL);
-	vbox = gtk_vbox_new (FALSE, 6);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_add (GTK_CONTAINER (window), vbox);
 
 	list = bluetooth_plugin_manager_get_widgets (bdaddr, (const char **) uuids);
diff --git a/moblin/moblin-copy-n-paste/mux-banner.c b/moblin/moblin-copy-n-paste/mux-banner.c
index 9fce5dc..cc297dd 100644
--- a/moblin/moblin-copy-n-paste/mux-banner.c
+++ b/moblin/moblin-copy-n-paste/mux-banner.c
@@ -28,7 +28,7 @@ struct _MuxBannerPrivate {
 };
 
 #define GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUX_TYPE_BANNER, MuxBannerPrivate))
-G_DEFINE_TYPE (MuxBanner, mux_banner, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (MuxBanner, mux_banner, GTK_TYPE_BOX);
 
 static void
 mux_banner_realize (GtkWidget *widget)
@@ -84,7 +84,7 @@ mux_banner_new (const char *text)
 {
   GtkWidget *widget;
 
-  widget = g_object_new (MUX_TYPE_BANNER, NULL);
+  widget = g_object_new (MUX_TYPE_BANNER, "orientation", GTK_ORIENTATION_HORIZONTAL, NULL);
   if (text)
     mux_banner_set_text ((MuxBanner *)widget, text);
   return widget;
diff --git a/moblin/moblin-copy-n-paste/mux-banner.h b/moblin/moblin-copy-n-paste/mux-banner.h
index 034a1ac..1273312 100644
--- a/moblin/moblin-copy-n-paste/mux-banner.h
+++ b/moblin/moblin-copy-n-paste/mux-banner.h
@@ -51,12 +51,12 @@ typedef struct _MuxBanner      MuxBanner;
 typedef struct _MuxBannerClass MuxBannerClass;
 
 struct _MuxBanner {
-  GtkHBox parent;
+  GtkBox parent;
   MuxBannerPrivate *priv;
 };
 
 struct _MuxBannerClass {
-  GtkHBoxClass parent_class;
+  GtkBoxClass parent_class;
 };
 
 GType mux_banner_get_type (void) G_GNUC_CONST;
diff --git a/moblin/moblin-panel.c b/moblin/moblin-panel.c
index 8a72924..892dc8e 100644
--- a/moblin/moblin-panel.c
+++ b/moblin/moblin-panel.c
@@ -53,7 +53,7 @@
 
 #include "moblin-panel.h"
 
-G_DEFINE_TYPE (MoblinPanel, moblin_panel, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (MoblinPanel, moblin_panel, GTK_TYPE_BOX)
 
 #define MOBLIN_PANEL_GET_PRIVATE(o)                                         \
   (G_TYPE_INSTANCE_GET_PRIVATE ((o), MOBLIN_TYPE_PANEL, MoblinPanelPrivate))
@@ -1832,7 +1832,7 @@ moblin_panel_class_init (MoblinPanelClass *klass)
 GtkWidget *
 moblin_panel_new (void)
 {
-	return g_object_new (MOBLIN_TYPE_PANEL, NULL);
+	return g_object_new (MOBLIN_TYPE_PANEL, "orientation", GTK_ORIENTATION_HORIZONTAL, NULL);
 }
 
 /**
diff --git a/moblin/pin.ui b/moblin/pin.ui
index 820f0e7..60c8805 100644
--- a/moblin/pin.ui
+++ b/moblin/pin.ui
@@ -8,12 +8,12 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -92,7 +92,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkBox" id="hbox1">
+		<property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
                 <child>
diff --git a/properties/bluetooth.ui b/properties/bluetooth.ui
index ce62807..13e204e 100644
--- a/properties/bluetooth.ui
+++ b/properties/bluetooth.ui
@@ -8,13 +8,15 @@
     <property name="default_width">600</property>
     <property name="default_height">420</property>
     <child>
-      <object class="GtkVBox" id="vbox">
+      <object class="GtkBox" id="vbox">
+	<property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="spacing">16</property>
         <child>
-          <object class="GtkHBox" id="hbox2">
+          <object class="GtkBox" id="hbox2">
+	    <property name="orientation">horizontal</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child>
@@ -217,7 +219,8 @@
                         <property name="can_focus">False</property>
                         <property name="shadow_type">none</property>
                         <child>
-                          <object class="GtkVBox" id="properties_vbox">
+                          <object class="GtkBox" id="properties_vbox">
+			    <property name="orientation">vertical</property>
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_top">8</property>
@@ -303,7 +306,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox1">
+                                  <object class="GtkBox" id="hbox1">
+				    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <child>
@@ -391,7 +395,8 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="additional_setup_box">
+                              <object class="GtkBox" id="additional_setup_box">
+				<property name="orientation">vertical</property>
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
                                 <property name="spacing">8</property>
@@ -406,13 +411,15 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkVBox" id="vbox3">
+                              <object class="GtkBox" id="vbox3">
+				<property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="margin_right">6</property>
                                 <property name="margin_bottom">6</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox5">
+                                  <object class="GtkBox" id="hbox5">
+				    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <child>
@@ -441,7 +448,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox3">
+                                  <object class="GtkBox" id="hbox3">
+				    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <child>
@@ -470,7 +478,8 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkHBox" id="hbox4">
+                                  <object class="GtkBox" id="hbox4">
+				    <property name="orientation">horizontal</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <child>
diff --git a/sendto/main.c b/sendto/main.c
index 05eb592..50bfd9c 100644
--- a/sendto/main.c
+++ b/sendto/main.c
@@ -260,7 +260,7 @@ static void create_window(void)
 	gtk_window_set_default_size(GTK_WINDOW(dialog), 400, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(dialog), 6);
 
-	vbox = gtk_vbox_new(FALSE, 0);
+	vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_set_spacing(GTK_BOX(vbox), 6);
 	gtk_container_set_border_width(GTK_CONTAINER(vbox), 6);
 	gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
@@ -314,7 +314,7 @@ static void create_window(void)
 							_("Connecting..."));
 	gtk_box_pack_start(GTK_BOX(vbox), progress, TRUE, TRUE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 
 	image_status = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_MENU);
 	gtk_widget_set_no_show_all (image_status, TRUE);
diff --git a/wizard/main.c b/wizard/main.c
index c01ec0a..8797e5f 100644
--- a/wizard/main.c
+++ b/wizard/main.c
@@ -864,25 +864,11 @@ page_func (gint current_page,
 static GtkAssistant *
 create_wizard (void)
 {
-	const char *pages[] = {
-		"page_intro",
-		"page_search",
-		"page_connecting",
-		"page_setup",
-		"page_ssp_setup",
-		"page_failure",
-		"page_finishing",
-		"page_summary",
-	};
-	guint i;
-
 	GtkAssistant *assistant;
 	GError *err = NULL;
 	GtkWidget *combo, *page_intro;
 	GtkTreeModel *model;
 	GtkCellRenderer *renderer;
-	GdkPixbuf *pixbuf;
-	int height;
 
 	builder = gtk_builder_new ();
 	if (gtk_builder_add_from_file (builder, "wizard.ui", NULL) == 0) {
@@ -961,15 +947,6 @@ create_wizard (void)
 	label_summary = W("label_summary");
 	extra_config_vbox = W("extra_config_vbox");
 
-	/* Set page icons */
-	gtk_icon_size_lookup (GTK_ICON_SIZE_DIALOG, NULL, &height);
-	pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
-					   "bluetooth", height, 0, NULL);
-	for (i = 0; i < G_N_ELEMENTS (pages); i++)
-		gtk_assistant_set_page_header_image (assistant, W(pages[i]), pixbuf);
-	if (pixbuf != NULL)
-		g_object_unref (pixbuf);
-
 	/* PIN dialog */
 	pin_dialog = W("pin_dialog");
 	radio_auto = W("radio_auto");
diff --git a/wizard/wizard.ui b/wizard/wizard.ui
index a72a0bc..f564e88 100644
--- a/wizard/wizard.ui
+++ b/wizard/wizard.ui
@@ -11,7 +11,8 @@
     <signal name="cancel" handler="close_callback"/>
     <signal name="close" handler="close_callback"/>
     <child>
-      <object class="GtkVBox" id="page_intro">
+      <object class="GtkBox" id="page_intro">
+        <property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="border_width">24</property>
         <property name="spacing">6</property>
@@ -64,7 +65,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_search">
+      <object class="GtkBox" id="page_search">
+	<property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="border_width">24</property>
         <property name="spacing">6</property>
@@ -104,7 +106,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_connecting">
+      <object class="GtkBox" id="page_connecting">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
@@ -161,7 +163,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_setup">
+      <object class="GtkBox" id="page_setup">
+	<property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="border_width">24</property>
         <property name="spacing">6</property>
@@ -196,7 +199,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_ssp_setup">
+      <object class="GtkBox" id="page_ssp_setup">
+	<property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="border_width">24</property>
         <property name="spacing">6</property>
@@ -230,7 +234,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_failure">
+      <object class="GtkBox" id="page_failure">
+	<property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="border_width">24</property>
         <property name="spacing">6</property>
@@ -254,7 +259,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_finishing">
+      <object class="GtkBox" id="page_finishing">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
@@ -311,7 +316,8 @@
       </packing>
     </child>
     <child>
-      <object class="GtkVBox" id="page_summary">
+      <object class="GtkBox" id="page_summary">
+	<property name="orientation">vertical</property>
         <property name="visible">True</property>
         <property name="border_width">24</property>
         <property name="spacing">12</property>
@@ -330,7 +336,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkVBox" id="extra_config_vbox">
+          <object class="GtkBox" id="extra_config_vbox">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
@@ -368,12 +374,12 @@
     <property name="destroy_with_parent">True</property>
     <property name="type_hint">normal</property>
     <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+      <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
-          <object class="GtkVBox" id="vbox1">
+          <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
             <property name="border_width">12</property>
             <property name="orientation">vertical</property>
@@ -467,7 +473,8 @@
               </packing>
             </child>
             <child>
-              <object class="GtkHBox" id="hbox1">
+              <object class="GtkBox" id="hbox1">
+		<property name="orientation">horizontal</property>
                 <property name="visible">True</property>
                 <property name="spacing">12</property>
                 <child>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]