GNOME.org
 

[nautilus] all: don't use deprecated Gtk[H/V]Box

commit d6de7f5f0ff90775445c3dc353328301c66f0de1
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Jun 13 10:01:23 2011 -0400

    all: don't use deprecated Gtk[H/V]Box

 libnautilus-private/nautilus-column-chooser.c      |    5 +++--
 libnautilus-private/nautilus-column-chooser.h      |    4 ++--
 .../nautilus-file-conflict-dialog.c                |   14 +++++++-------
 libnautilus-private/nautilus-icon-container.c      |    2 +-
 .../nautilus-mime-application-chooser.h            |    4 ++--
 src/nautilus-connect-server-dialog.c               |   10 +++++-----
 src/nautilus-desktop-item-properties.c             |    2 +-
 src/nautilus-image-properties-page.c               |    5 +++--
 src/nautilus-image-properties-page.h               |    4 ++--
 src/nautilus-location-bar.c                        |    7 +++++--
 src/nautilus-location-bar.h                        |    4 ++--
 src/nautilus-notebook.c                            |    2 +-
 src/nautilus-pathbar.c                             |    4 ++--
 src/nautilus-progress-info-widget.c                |    4 ++--
 src/nautilus-progress-ui-handler.c                 |    2 +-
 src/nautilus-properties-window.c                   |   20 ++++++++++----------
 src/nautilus-query-editor.c                        |   12 ++++++------
 src/nautilus-view.c                                |    2 +-
 src/nautilus-window-pane.c                         |    2 +-
 src/nautilus-window-slot.c                         |   11 +++++------
 src/nautilus-window.c                              |    2 +-
 21 files changed, 63 insertions(+), 59 deletions(-)
---
diff --git a/libnautilus-private/nautilus-column-chooser.c b/libnautilus-private/nautilus-column-chooser.c
index 3504661..ec28d9b 100644
--- a/libnautilus-private/nautilus-column-chooser.c
+++ b/libnautilus-private/nautilus-column-chooser.c
@@ -63,7 +63,7 @@ enum {
 static guint signals[LAST_SIGNAL];
 
 
-G_DEFINE_TYPE(NautilusColumnChooser, nautilus_column_chooser, GTK_TYPE_HBOX);
+G_DEFINE_TYPE(NautilusColumnChooser, nautilus_column_chooser, GTK_TYPE_BOX);
 
 static void nautilus_column_chooser_constructed (GObject *object);
 
@@ -361,7 +361,7 @@ add_buttons (NautilusColumnChooser *chooser)
 	GtkWidget *box;
 	GtkWidget *separator;
 	
-	box = gtk_vbox_new (FALSE, 8);
+	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
 	gtk_widget_show (box);
 	
 	chooser->details->move_up_button = button_new_with_mnemonic (GTK_STOCK_GO_UP,
@@ -455,6 +455,7 @@ nautilus_column_chooser_init (NautilusColumnChooser *chooser)
 	g_object_set (G_OBJECT (chooser), 
 		      "homogeneous", FALSE,
 		      "spacing", 8,
+		      "orientation", GTK_ORIENTATION_HORIZONTAL,
 		      NULL);
 
 	add_tree_view (chooser);
diff --git a/libnautilus-private/nautilus-column-chooser.h b/libnautilus-private/nautilus-column-chooser.h
index cccf80a..31a141b 100644
--- a/libnautilus-private/nautilus-column-chooser.h
+++ b/libnautilus-private/nautilus-column-chooser.h
@@ -43,13 +43,13 @@
 typedef struct _NautilusColumnChooserDetails NautilusColumnChooserDetails;
 
 typedef struct {
-	GtkHBox parent;
+	GtkBox parent;
 	
 	NautilusColumnChooserDetails *details;
 } NautilusColumnChooser;
 
 typedef struct {
-        GtkHBoxClass parent_slot;
+        GtkBoxClass parent_slot;
 
 	void (*changed) (NautilusColumnChooser *chooser);
 	void (*use_default) (NautilusColumnChooser *chooser);
diff --git a/libnautilus-private/nautilus-file-conflict-dialog.c b/libnautilus-private/nautilus-file-conflict-dialog.c
index d7803b6..afe7e45 100644
--- a/libnautilus-private/nautilus-file-conflict-dialog.c
+++ b/libnautilus-private/nautilus-file-conflict-dialog.c
@@ -466,7 +466,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 	dialog = GTK_DIALOG (fcd);
 
 	/* Setup the main hbox */
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	dialog_area = gtk_dialog_get_content_area (dialog);
 	gtk_box_pack_start (GTK_BOX (dialog_area), hbox, FALSE, FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
@@ -478,26 +478,26 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 	gtk_misc_set_alignment (GTK_MISC (widget), 0.5, 0.0);
 
 	/* Setup the vbox containing the dialog body */
-	vbox = gtk_vbox_new (FALSE, 12);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
 
 	/* Setup the vbox for the dialog labels */
-	widget = gtk_vbox_new (FALSE, 12);
+	widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
 	details->titles_vbox = widget;
 
 	/* Setup the hboxes to pack file infos into */
 	alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
 	g_object_set (alignment, "left-padding", 12, NULL);
-	vbox2 = gtk_vbox_new (FALSE, 12);
+	vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 	gtk_container_add (GTK_CONTAINER (alignment), vbox2);
 	gtk_box_pack_start (GTK_BOX (vbox), alignment, FALSE, FALSE, 0);
 
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
 	details->first_hbox = hbox;
 
-	hbox = gtk_hbox_new (FALSE, 12);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
 	details->second_hbox = hbox;
 
@@ -507,7 +507,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
 	g_signal_connect (details->expander, "activate",
 			  G_CALLBACK (expander_activated_cb), dialog);
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (details->expander), hbox);
 
 	widget = gtk_entry_new ();
diff --git a/libnautilus-private/nautilus-icon-container.c b/libnautilus-private/nautilus-icon-container.c
index 9c33549..34d6eae 100644
--- a/libnautilus-private/nautilus-icon-container.c
+++ b/libnautilus-private/nautilus-icon-container.c
@@ -5295,7 +5295,7 @@ nautilus_icon_container_ensure_interactive_directory (NautilusIconContainer *con
 	gtk_widget_show (frame);
 	gtk_container_add (GTK_CONTAINER (container->details->search_window), frame);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
diff --git a/libnautilus-private/nautilus-mime-application-chooser.h b/libnautilus-private/nautilus-mime-application-chooser.h
index c451378..795ec06 100644
--- a/libnautilus-private/nautilus-mime-application-chooser.h
+++ b/libnautilus-private/nautilus-mime-application-chooser.h
@@ -38,12 +38,12 @@ typedef struct _NautilusMimeApplicationChooserClass   NautilusMimeApplicationCho
 typedef struct _NautilusMimeApplicationChooserDetails NautilusMimeApplicationChooserDetails;
 
 struct _NautilusMimeApplicationChooser {
-	GtkVBox parent;
+	GtkBox parent;
 	NautilusMimeApplicationChooserDetails *details;
 };
 
 struct _NautilusMimeApplicationChooserClass {
-	GtkVBoxClass parent_class;
+	GtkBoxClass parent_class;
 };
 
 GType      nautilus_mime_application_chooser_get_type (void);
diff --git a/src/nautilus-connect-server-dialog.c b/src/nautilus-connect-server-dialog.c
index 46ecc00..cd409dc 100644
--- a/src/nautilus-connect-server-dialog.c
+++ b/src/nautilus-connect-server-dialog.c
@@ -171,7 +171,7 @@ connect_dialog_set_connecting (NautilusConnectServerDialog *dialog)
 
 	content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (dialog->details->info_bar));
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (content_area), hbox);
 	gtk_widget_show (hbox);
 
@@ -200,7 +200,7 @@ connect_dialog_gvfs_error (NautilusConnectServerDialog *dialog)
 
 	content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (dialog->details->info_bar));
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_container_add (GTK_CONTAINER (content_area), hbox);
 	gtk_widget_show (hbox);
 
@@ -312,7 +312,7 @@ connect_dialog_set_info_bar_error (NautilusConnectServerDialog *dialog,
 	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
 	gtk_widget_show (dialog->details->info_bar);
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6);
 	gtk_widget_show (hbox);
 
@@ -387,7 +387,7 @@ connect_dialog_request_additional_details (NautilusConnectServerDialog *self,
 
 	content_area = gtk_info_bar_get_content_area (GTK_INFO_BAR (self->details->info_bar));
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 6);
 	gtk_widget_show (hbox);
 
@@ -889,7 +889,7 @@ nautilus_connect_server_dialog_init (NautilusConnectServerDialog *dialog)
 	gtk_size_group_add_widget (dialog->details->labels_size_group, label);
 	gtk_widget_show (label);
 
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_show (hbox);
 	gtk_table_attach (GTK_TABLE (table), hbox,
 			  1, 2,
diff --git a/src/nautilus-desktop-item-properties.c b/src/nautilus-desktop-item-properties.c
index 8a9f512..edac441 100644
--- a/src/nautilus-desktop-item-properties.c
+++ b/src/nautilus-desktop-item-properties.c
@@ -494,7 +494,7 @@ nautilus_desktop_item_properties_make_box (GtkSizeGroup *label_size_group,
 
 	g_assert (nautilus_desktop_item_properties_should_show (files));
 
-	box = gtk_vbox_new (FALSE, 6);
+	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	g_object_set_data_full (G_OBJECT (box), "label-size-group",
 				label_size_group, (GDestroyNotify) g_object_unref);
 
diff --git a/src/nautilus-image-properties-page.c b/src/nautilus-image-properties-page.c
index b38f907..628cf49 100644
--- a/src/nautilus-image-properties-page.c
+++ b/src/nautilus-image-properties-page.c
@@ -89,7 +89,7 @@ static GType nautilus_image_properties_page_provider_get_type (void);
 static void  property_page_provider_iface_init                (NautilusPropertyPageProviderIface *iface);
 
 
-G_DEFINE_TYPE (NautilusImagePropertiesPage, nautilus_image_properties_page, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (NautilusImagePropertiesPage, nautilus_image_properties_page, GTK_TYPE_BOX);
 
 G_DEFINE_TYPE_WITH_CODE (NautilusImagePropertiesPageProvider, nautilus_image_properties_page_provider, G_TYPE_OBJECT,
 			 G_IMPLEMENT_INTERFACE (NAUTILUS_TYPE_PROPERTY_PAGE_PROVIDER,
@@ -607,11 +607,12 @@ nautilus_image_properties_page_init (NautilusImagePropertiesPage *page)
 						     NAUTILUS_TYPE_IMAGE_PROPERTIES_PAGE,
 						     NautilusImagePropertiesPageDetails);
 
+	gtk_orientable_set_orientation (GTK_ORIENTABLE (page), GTK_ORIENTATION_VERTICAL);
 	gtk_box_set_homogeneous (GTK_BOX (page), FALSE);
 	gtk_box_set_spacing (GTK_BOX (page), 2);
 	gtk_container_set_border_width (GTK_CONTAINER (page), 6);
 
-	page->details->vbox = gtk_vbox_new (FALSE, 6);
+	page->details->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	page->details->loading_label =
 		append_label (page->details->vbox,_("loading..."));
 	gtk_box_pack_start (GTK_BOX (page),
diff --git a/src/nautilus-image-properties-page.h b/src/nautilus-image-properties-page.h
index 0430a22..7853f41 100644
--- a/src/nautilus-image-properties-page.h
+++ b/src/nautilus-image-properties-page.h
@@ -41,12 +41,12 @@
 typedef struct NautilusImagePropertiesPageDetails NautilusImagePropertiesPageDetails;
 
 typedef struct {
-	GtkVBox parent;
+	GtkBox parent;
 	NautilusImagePropertiesPageDetails *details;
 } NautilusImagePropertiesPage;
 
 typedef struct {
-	GtkVBoxClass parent;
+	GtkBoxClass parent;
 } NautilusImagePropertiesPageClass;
 
 GType nautilus_image_properties_page_get_type (void);
diff --git a/src/nautilus-location-bar.c b/src/nautilus-location-bar.c
index 472902f..bb04143 100644
--- a/src/nautilus-location-bar.c
+++ b/src/nautilus-location-bar.c
@@ -92,7 +92,7 @@ static const GtkTargetEntry drop_types [] = {
 };
 
 G_DEFINE_TYPE (NautilusLocationBar, nautilus_location_bar,
-	       GTK_TYPE_HBOX);
+	       GTK_TYPE_BOX);
 
 static NautilusWindow *
 nautilus_location_bar_get_window (GtkWidget *bar)
@@ -464,7 +464,10 @@ nautilus_location_bar_init (NautilusLocationBar *bar)
 	bar->details = G_TYPE_INSTANCE_GET_PRIVATE (bar, NAUTILUS_TYPE_LOCATION_BAR,
 						    NautilusLocationBarDetails);
 
-	hbox = gtk_hbox_new (0, FALSE);
+	gtk_orientable_set_orientation (GTK_ORIENTABLE (bar),
+					GTK_ORIENTATION_HORIZONTAL);
+
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
 
 	event_box = gtk_event_box_new ();
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (event_box), FALSE);
diff --git a/src/nautilus-location-bar.h b/src/nautilus-location-bar.h
index 4794d18..ee5749f 100644
--- a/src/nautilus-location-bar.h
+++ b/src/nautilus-location-bar.h
@@ -48,12 +48,12 @@
 typedef struct NautilusLocationBarDetails NautilusLocationBarDetails;
 
 typedef struct NautilusLocationBar {
-	GtkHBox parent;
+	GtkBox parent;
 	NautilusLocationBarDetails *details;
 } NautilusLocationBar;
 
 typedef struct {
-	GtkHBoxClass parent_class;
+	GtkBoxClass parent_class;
 
 	/* for GtkBindingSet */
 	void         (* cancel)           (NautilusLocationBar *bar);
diff --git a/src/nautilus-notebook.c b/src/nautilus-notebook.c
index c8707c9..e4794f1 100644
--- a/src/nautilus-notebook.c
+++ b/src/nautilus-notebook.c
@@ -335,7 +335,7 @@ build_tab_label (NautilusNotebook *nb, NautilusWindowSlot *slot)
 
 	/* set hbox spacing and label padding (see below) so that there's an
 	 * equal amount of space around the label */
-	hbox = gtk_hbox_new (FALSE, 4);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 	gtk_widget_show (hbox);
 
 	/* setup load feedback */
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 11fbaa5..11ffa4d 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1586,7 +1586,7 @@ make_directory_button (NautilusPathBar  *path_bar,
                         button_data->label = gtk_label_new (NULL);
                         label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
                         gtk_container_add (GTK_CONTAINER (label_alignment), button_data->label);
-                        child = gtk_hbox_new (FALSE, 2);
+                        child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
                         gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0);
                         gtk_box_pack_start (GTK_BOX (child), label_alignment, FALSE, FALSE, 0);
                         break;
@@ -1595,7 +1595,7 @@ make_directory_button (NautilusPathBar  *path_bar,
 			button_data->label = gtk_label_new (NULL);
 			label_alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
 			gtk_container_add (GTK_CONTAINER (label_alignment), button_data->label);
-			child = gtk_hbox_new (FALSE, 2);
+                        child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 			gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0);
 			gtk_box_pack_start (GTK_BOX (child), label_alignment, FALSE, FALSE, 0);
 			button_data->is_base_dir = base_dir;
diff --git a/src/nautilus-progress-info-widget.c b/src/nautilus-progress-info-widget.c
index d5cb27b..474c238 100644
--- a/src/nautilus-progress-info-widget.c
+++ b/src/nautilus-progress-info-widget.c
@@ -109,12 +109,12 @@ nautilus_progress_info_widget_constructed (GObject *obj)
 			    0);
 	self->priv->status = label;
 
-	hbox = gtk_hbox_new (FALSE, 10);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
 
 	progress_bar = gtk_progress_bar_new ();
 	self->priv->progress_bar = progress_bar;
 	gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (progress_bar), 0.05);
-	box = gtk_vbox_new (FALSE,0);
+	box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_pack_start(GTK_BOX (box),
 			   progress_bar,
 			   TRUE, FALSE,
diff --git a/src/nautilus-progress-ui-handler.c b/src/nautilus-progress-ui-handler.c
index fe295b2..83b6ae2 100644
--- a/src/nautilus-progress-ui-handler.c
+++ b/src/nautilus-progress-ui-handler.c
@@ -218,7 +218,7 @@ progress_ui_handler_ensure_window (NautilusProgressUIHandler *self)
 	gtk_window_set_icon_name (GTK_WINDOW (progress_window),
 				"system-file-manager");
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_box_set_spacing (GTK_BOX (vbox), 5);
 	gtk_container_add (GTK_CONTAINER (progress_window),
 			   vbox);
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index f5a1c34..1e9d04e 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -334,7 +334,7 @@ get_target_file (NautilusPropertiesWindow *window)
 }
 
 static void
-add_prompt (GtkVBox *vbox, const char *prompt_text, gboolean pack_at_start)
+add_prompt (GtkWidget *vbox, const char *prompt_text, gboolean pack_at_start)
 {
 	GtkWidget *prompt;
 
@@ -350,7 +350,7 @@ add_prompt (GtkVBox *vbox, const char *prompt_text, gboolean pack_at_start)
 }
 
 static void
-add_prompt_and_separator (GtkVBox *vbox, const char *prompt_text)
+add_prompt_and_separator (GtkWidget *vbox, const char *prompt_text)
 {
 	GtkWidget *separator_line;
 
@@ -2354,7 +2354,7 @@ create_page_with_hbox (GtkNotebook *notebook,
 	g_assert (GTK_IS_NOTEBOOK (notebook));
 	g_assert (title != NULL);
 
-	hbox = gtk_hbox_new (FALSE, 0);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 	gtk_widget_show (hbox);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
 	gtk_box_set_spacing (GTK_BOX (hbox), 12);
@@ -2372,7 +2372,7 @@ create_page_with_vbox (GtkNotebook *notebook,
 	g_assert (GTK_IS_NOTEBOOK (notebook));
 	g_assert (title != NULL);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 	gtk_notebook_append_page (notebook, vbox, gtk_label_new (title));
@@ -2398,7 +2398,7 @@ apply_standard_table_padding (GtkTable *table)
 }
 
 static GtkWidget *
-create_attribute_value_table (GtkVBox *vbox, int row_count)
+create_attribute_value_table (GtkWidget *vbox, int row_count)
 {
 	GtkWidget *table;
 
@@ -3063,11 +3063,11 @@ create_basic_page (NautilusPropertiesWindow *window)
 
 	/* Table */
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_widget_show (vbox);
 	gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
-	table = GTK_TABLE (create_attribute_value_table (GTK_VBOX (vbox), 0));
+	table = GTK_TABLE (create_attribute_value_table (vbox, 0));
 	window->details->basic_table = table;
 
 	/* Name label.  The text will be determined in update_name_field */
@@ -4538,7 +4538,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
 		
 		if (!all_can_set_permissions (file_list)) {
 			add_prompt_and_separator (
-				GTK_VBOX (vbox), 
+				vbox, 
 				_("You are not the owner, so you cannot change these permissions."));
 		}
 
@@ -4575,7 +4575,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
 	
 		if (window->details->has_recursive_apply) {
 			last_row = append_row (page_table);
-			hbox = gtk_hbox_new (FALSE, 0);
+			hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 			gtk_widget_show (hbox);
 			gtk_table_attach (page_table, hbox,
 					  0, 2,
@@ -4599,7 +4599,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
 			prompt_text = g_strdup (_("The permissions of the selected file could not be determined."));
 		}
 		
-		add_prompt (GTK_VBOX (vbox), prompt_text, TRUE);
+		add_prompt (vbox, prompt_text, TRUE);
 		g_free (prompt_text);
 	}
 }
diff --git a/src/nautilus-query-editor.c b/src/nautilus-query-editor.c
index 6533d51..89e20bc 100644
--- a/src/nautilus-query-editor.c
+++ b/src/nautilus-query-editor.c
@@ -907,7 +907,7 @@ nautilus_query_editor_add_row (NautilusQueryEditor *editor,
 	row->editor = editor;
 	row->type = type;
 	
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	row->hbox = hbox;
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (editor->details->visible_vbox), hbox, FALSE, FALSE, 0);
@@ -972,11 +972,11 @@ nautilus_query_editor_init (NautilusQueryEditor *editor)
 
 	gtk_orientable_set_orientation (GTK_ORIENTABLE (editor), GTK_ORIENTATION_VERTICAL);
 
-	editor->details->invisible_vbox = gtk_vbox_new (FALSE, 6);
+	editor->details->invisible_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (editor->details->invisible_vbox), 6);
 	gtk_box_pack_start (GTK_BOX (editor), editor->details->invisible_vbox,
 			    FALSE, FALSE, 0);
-	editor->details->visible_vbox = gtk_vbox_new (FALSE, 6);
+	editor->details->visible_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (editor->details->visible_vbox), 6);
 	gtk_box_pack_start (GTK_BOX (editor), editor->details->visible_vbox,
 			    FALSE, FALSE, 0);
@@ -984,7 +984,7 @@ nautilus_query_editor_init (NautilusQueryEditor *editor)
 	gtk_widget_show (editor->details->visible_vbox);
 
 	/* Create invisible part: */
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_box_pack_start (GTK_BOX (editor->details->invisible_vbox),
 			    hbox, FALSE, FALSE, 0);
 	gtk_widget_show (hbox);
@@ -1066,7 +1066,7 @@ setup_internal_entry (NautilusQueryEditor *editor)
 	char *label_markup;
 	
 	/* Create visible part: */
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (editor->details->visible_vbox), hbox, FALSE, FALSE, 0);
 
@@ -1101,7 +1101,7 @@ setup_external_entry (NautilusQueryEditor *editor, GtkWidget *entry)
 	gchar *label_markup;
 	
 	/* Create visible part: */
-	hbox = gtk_hbox_new (FALSE, 6);
+	hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 	gtk_widget_show (hbox);
 	gtk_box_pack_start (GTK_BOX (editor->details->visible_vbox), hbox, FALSE, FALSE, 0);
 
diff --git a/src/nautilus-view.c b/src/nautilus-view.c
index 4851e85..b2d0f6d 100644
--- a/src/nautilus-view.c
+++ b/src/nautilus-view.c
@@ -6736,7 +6736,7 @@ action_connect_to_server_link_callback (GtkAction *action,
 		gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
 		gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 2);
 
-		box = gtk_hbox_new (FALSE, 12);
+		box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 		gtk_widget_show (box);
 		gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
 				    box, TRUE, TRUE, 0);
diff --git a/src/nautilus-window-pane.c b/src/nautilus-window-pane.c
index ecc6c25..13b4dfe 100644
--- a/src/nautilus-window-pane.c
+++ b/src/nautilus-window-pane.c
@@ -659,7 +659,7 @@ nautilus_window_pane_setup (NautilusWindowPane *pane)
 	NautilusWindow *window;
 	GtkActionGroup *action_group;
 
-	pane->widget = gtk_vbox_new (FALSE, 0);
+	pane->widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	window = pane->window;
 
 	header_size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 2a7b41d..32823da 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -175,16 +175,16 @@ nautilus_window_slot_init (NautilusWindowSlot *slot)
 {
 	GtkWidget *content_box, *extras_vbox;
 
-	content_box = gtk_vbox_new (FALSE, 0);
+	content_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	slot->content_box = content_box;
 	gtk_widget_show (content_box);
 
-	extras_vbox = gtk_vbox_new (FALSE, 6);
+	extras_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 	slot->extra_location_widgets = extras_vbox;
 	gtk_box_pack_start (GTK_BOX (content_box), extras_vbox, FALSE, FALSE, 0);
 	gtk_widget_show (extras_vbox);
 
-	slot->view_box = gtk_vbox_new (FALSE, 0);
+	slot->view_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	slot->view_overlay = gedit_overlay_new (slot->view_box, NULL);
 	gtk_box_pack_start (GTK_BOX (content_box), slot->view_overlay, TRUE, TRUE, 0);
 	gtk_widget_show (slot->view_overlay);
@@ -457,9 +457,8 @@ nautilus_window_slot_set_content_view_widget (NautilusWindowSlot *slot,
 
 	if (new_view != NULL) {
 		widget = GTK_WIDGET (new_view);
-		gtk_container_add (GTK_CONTAINER (slot->view_box),
-						  GTK_WIDGET (new_view));
-
+		gtk_box_pack_start (GTK_BOX (slot->view_box), widget, 
+				    TRUE, TRUE, 0);
 		gtk_widget_show (widget);
 
 		slot->content_view = new_view;
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index ab5f166..4d8ed37 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -612,7 +612,7 @@ nautilus_window_constructed (GObject *self)
 			  0,                                  0);
 	gtk_widget_show (window->details->content_paned);
 
-	vbox = gtk_vbox_new (FALSE, 0);
+	vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 	gtk_paned_pack2 (GTK_PANED (window->details->content_paned), vbox,
 			 TRUE, FALSE);
 	gtk_widget_show (vbox);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]