general: Drop gtk_box_pack_start()

12 files changed, 67 insertions, 57 deletions

diff --git a/src/nautilus-column-chooser.c b/src/nautilus-column-chooser.c
index 1b58a97ea..e210748ad 100644
--- a/src/nautilus-column-chooser.c
+++ b/src/nautilus-column-chooser.c
@@ -313,7 +313,7 @@ add_tree_view (NautilusColumnChooser *chooser)
     gtk_widget_show (GTK_WIDGET (scrolled));
 
     gtk_container_add (GTK_CONTAINER (scrolled), view);
-    gtk_box_pack_start (GTK_BOX (chooser->main_box), scrolled);
+    gtk_container_add (GTK_CONTAINER (chooser->main_box), scrolled);
 }
 
 static void
@@ -397,7 +397,7 @@ add_buttons (NautilusColumnChooser *chooser)
 
     style_context = gtk_widget_get_style_context (GTK_WIDGET (inline_toolbar));
     gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
-    gtk_box_pack_start (GTK_BOX (chooser->main_box), inline_toolbar);
+    gtk_container_add (GTK_CONTAINER (chooser->main_box), inline_toolbar);
 
     box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     tool_item = gtk_tool_item_new ();
diff --git a/src/nautilus-file-conflict-dialog.c b/src/nautilus-file-conflict-dialog.c
index 1481bcbb5..d63d2377f 100644
--- a/src/nautilus-file-conflict-dialog.c
+++ b/src/nautilus-file-conflict-dialog.c
@@ -67,7 +67,7 @@ nautilus_file_conflict_dialog_set_text (NautilusFileConflictDialog *fcd,
     gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
     gtk_label_set_line_wrap_mode (GTK_LABEL (label), PANGO_WRAP_WORD_CHAR);
     gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-    gtk_box_pack_start (GTK_BOX (fcd->titles_vbox), label);
+    gtk_container_add (GTK_CONTAINER (fcd->titles_vbox), label);
     gtk_widget_show (label);
 
     attr_list = pango_attr_list_new ();
@@ -80,7 +80,7 @@ nautilus_file_conflict_dialog_set_text (NautilusFileConflictDialog *fcd,
     label = gtk_label_new (secondary_text);
     gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
     gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-    gtk_box_pack_start (GTK_BOX (fcd->titles_vbox), label);
+    gtk_container_add (GTK_CONTAINER (fcd->titles_vbox), label);
     gtk_widget_show (label);
 }
 
@@ -92,7 +92,7 @@ nautilus_file_conflict_dialog_set_images (NautilusFileConflictDialog *fcd,
     if (fcd->dest_image == NULL)
     {
         fcd->dest_image = gtk_image_new_from_paintable (GDK_PAINTABLE (destination_texture));
-        gtk_box_pack_start (GTK_BOX (fcd->first_hbox), fcd->dest_image);
+        gtk_container_add (GTK_CONTAINER (fcd->first_hbox), fcd->dest_image);
         gtk_image_set_pixel_size (GTK_IMAGE (fcd->dest_image),
                                   NAUTILUS_CANVAS_ICON_SIZE_SMALL);
         gtk_widget_show (fcd->dest_image);
@@ -108,7 +108,7 @@ nautilus_file_conflict_dialog_set_images (NautilusFileConflictDialog *fcd,
         fcd->src_image = gtk_image_new_from_paintable (GDK_PAINTABLE (source_texture));
         gtk_image_set_pixel_size (GTK_IMAGE (fcd->src_image),
                                   NAUTILUS_CANVAS_ICON_SIZE_SMALL);
-        gtk_box_pack_start (GTK_BOX (fcd->second_hbox), fcd->src_image);
+        gtk_container_add (GTK_CONTAINER (fcd->second_hbox), fcd->src_image);
         gtk_widget_show (fcd->src_image);
     }
     else
@@ -127,12 +127,12 @@ nautilus_file_conflict_dialog_set_file_labels (NautilusFileConflictDialog *fcd,
 
     label = gtk_label_new (NULL);
     gtk_label_set_markup (GTK_LABEL (label), destination_label);
-    gtk_box_pack_start (GTK_BOX (fcd->first_hbox), label);
+    gtk_container_add (GTK_CONTAINER (fcd->first_hbox), label);
     gtk_widget_show (label);
 
     label = gtk_label_new (NULL);
     gtk_label_set_markup (GTK_LABEL (label), source_label);
-    gtk_box_pack_start (GTK_BOX (fcd->second_hbox), label);
+    gtk_container_add (GTK_CONTAINER (fcd->second_hbox), label);
     gtk_widget_show (label);
 }
 
@@ -261,41 +261,41 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
     /* Setup the main hbox */
     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);
+    gtk_container_add (GTK_CONTAINER (dialog_area), hbox);
     g_object_set (hbox, "margin", 6, NULL);
 
     /* Setup the dialog image */
     widget = gtk_image_new_from_icon_name ("dialog-warning");
-    gtk_box_pack_start (GTK_BOX (hbox), widget);
+    gtk_container_add (GTK_CONTAINER (hbox), widget);
     gtk_image_set_pixel_size (GTK_IMAGE (widget), 48);
     gtk_widget_set_valign (widget, GTK_ALIGN_START);
 
     /* Setup the vbox containing the dialog body */
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-    gtk_box_pack_start (GTK_BOX (hbox), vbox);
+    gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
     /* Setup the vbox for the dialog labels */
     widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-    gtk_box_pack_start (GTK_BOX (vbox), widget);
+    gtk_container_add (GTK_CONTAINER (vbox), widget);
     fcd->titles_vbox = widget;
 
     /* Setup the hboxes to pack file infos into */
     vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_widget_set_halign (vbox2, GTK_ALIGN_START);
     gtk_widget_set_margin_start (vbox2, 12);
-    gtk_box_pack_start (GTK_BOX (vbox), vbox2);
+    gtk_container_add (GTK_CONTAINER (vbox), vbox2);
 
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-    gtk_box_pack_start (GTK_BOX (vbox2), hbox);
+    gtk_container_add (GTK_CONTAINER (vbox2), hbox);
     fcd->first_hbox = hbox;
 
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-    gtk_box_pack_start (GTK_BOX (vbox2), hbox);
+    gtk_container_add (GTK_CONTAINER (vbox2), hbox);
     fcd->second_hbox = hbox;
 
     /* Setup the expander for the rename action */
     fcd->expander = gtk_expander_new_with_mnemonic (_("_Select a new name for the destination"));
-    gtk_box_pack_start (GTK_BOX (vbox2), fcd->expander);
+    gtk_container_add (GTK_CONTAINER (vbox2), fcd->expander);
     g_signal_connect (fcd->expander, "activate",
                       G_CALLBACK (expander_activated_cb), dialog);
 
@@ -306,7 +306,7 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
     gtk_widget_set_margin_end (widget, 6);
     gtk_widget_set_margin_start (widget, 6);
     gtk_widget_set_hexpand (widget, TRUE);
-    gtk_box_pack_start (GTK_BOX (hbox), widget);
+    gtk_container_add (GTK_CONTAINER (hbox), widget);
     fcd->entry = widget;
     g_signal_connect (widget, "changed",
                       G_CALLBACK (entry_text_changed_cb), dialog);
@@ -317,14 +317,14 @@ nautilus_file_conflict_dialog_init (NautilusFileConflictDialog *fcd)
                        gtk_image_new_from_icon_name ("edit-undo"));
     gtk_widget_set_margin_end (widget, 6);
     gtk_widget_set_margin_start (widget, 6);
-    gtk_box_pack_start (GTK_BOX (hbox), widget);
+    gtk_container_add (GTK_CONTAINER (hbox), widget);
     g_signal_connect (widget, "clicked",
                       G_CALLBACK (reset_button_clicked_cb), dialog);
 
     /* Setup the checkbox to apply the action to all files */
     widget = gtk_check_button_new_with_mnemonic (_("Apply this action to all files and folders"));
 
-    gtk_box_pack_start (GTK_BOX (vbox), widget);
+    gtk_container_add (GTK_CONTAINER (vbox), widget);
     fcd->checkbox = widget;
     g_signal_connect (widget, "toggled",
                       G_CALLBACK (checkbox_toggled_cb), dialog);
diff --git a/src/nautilus-floating-bar.c b/src/nautilus-floating-bar.c
index ae5ddc9c6..24d9e4bec 100644
--- a/src/nautilus-floating-bar.c
+++ b/src/nautilus-floating-bar.c
@@ -345,7 +345,7 @@ nautilus_floating_bar_constructed (GObject *obj)
     box = GTK_WIDGET (obj);
 
     w = gtk_spinner_new ();
-    gtk_box_pack_start (GTK_BOX (box), w);
+    gtk_container_add (GTK_CONTAINER (box), w);
     gtk_widget_set_visible (w, self->show_spinner);
     gtk_spinner_start (GTK_SPINNER (w));
     self->spinner = w;
@@ -355,7 +355,7 @@ nautilus_floating_bar_constructed (GObject *obj)
 
     labels_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_widget_set_hexpand (labels_box, TRUE);
-    gtk_box_pack_start (GTK_BOX (box), labels_box);
+    gtk_container_add (GTK_CONTAINER (box), labels_box);
     g_object_set (labels_box,
                   "margin-top", 2,
                   "margin-bottom", 2,
diff --git a/src/nautilus-list-view.c b/src/nautilus-list-view.c
index 1831c0609..80e33ec15 100644
--- a/src/nautilus-list-view.c
+++ b/src/nautilus-list-view.c
@@ -3634,7 +3634,7 @@ create_column_editor (NautilusListView *view)
     gtk_widget_set_hexpand (box, TRUE);
     gtk_widget_set_vexpand (box, TRUE);
     gtk_widget_show (box);
-    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), box);
+    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), box);
 
     label_text = _("Choose the order of information to appear in this folder:");
     str = g_strconcat ("<b>", label_text, "</b>", NULL);
@@ -3644,14 +3644,14 @@ create_column_editor (NautilusListView *view)
     gtk_label_set_xalign (GTK_LABEL (label), 0);
     gtk_label_set_yalign (GTK_LABEL (label), 0);
     gtk_widget_show (label);
-    gtk_box_pack_start (GTK_BOX (box), label);
+    gtk_container_add (GTK_CONTAINER (box), label);
 
     g_free (str);
 
     column_chooser = nautilus_column_chooser_new (file);
     gtk_widget_set_vexpand (column_chooser, TRUE);
     gtk_widget_show (column_chooser);
-    gtk_box_pack_start (GTK_BOX (box), column_chooser);
+    gtk_container_add (GTK_CONTAINER (box), column_chooser);
 
     g_signal_connect (column_chooser, "changed",
                       G_CALLBACK (column_chooser_changed_callback),
diff --git a/src/nautilus-mime-application-chooser.c b/src/nautilus-mime-application-chooser.c
index d03719de2..2c9119a93 100644
--- a/src/nautilus-mime-application-chooser.c
+++ b/src/nautilus-mime-application-chooser.c
@@ -314,7 +314,7 @@ nautilus_mime_application_chooser_build_ui (NautilusMimeApplicationChooser *choo
     gtk_label_set_line_wrap_mode (GTK_LABEL (chooser->label),
                                   PANGO_WRAP_WORD_CHAR);
     gtk_label_set_max_width_chars (GTK_LABEL (chooser->label), 60);
-    gtk_box_pack_start (GTK_BOX (chooser), chooser->label);
+    gtk_container_add (GTK_CONTAINER (chooser), chooser->label);
 
     gtk_widget_show (chooser->label);
 
@@ -325,7 +325,7 @@ nautilus_mime_application_chooser_build_ui (NautilusMimeApplicationChooser *choo
                                               TRUE);
     gtk_app_chooser_widget_set_show_other (GTK_APP_CHOOSER_WIDGET (chooser->open_with_widget),
                                            TRUE);
-    gtk_box_pack_start (GTK_BOX (chooser), chooser->open_with_widget);
+    gtk_container_add (GTK_CONTAINER (chooser), chooser->open_with_widget);
     g_object_set (chooser->open_with_widget, "margin", 6, NULL);
     gtk_widget_set_vexpand (chooser->open_with_widget, TRUE);
     gtk_widget_show (chooser->open_with_widget);
@@ -333,7 +333,7 @@ nautilus_mime_application_chooser_build_ui (NautilusMimeApplicationChooser *choo
     box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
     gtk_box_set_spacing (GTK_BOX (box), 6);
     gtk_button_box_set_layout (GTK_BUTTON_BOX (box), GTK_BUTTONBOX_END);
-    gtk_box_pack_start (GTK_BOX (chooser), box);
+    gtk_container_add (GTK_CONTAINER (chooser), box);
     g_object_set (box, "margin", 6, NULL);
     gtk_widget_show (box);
 
@@ -342,7 +342,7 @@ nautilus_mime_application_chooser_build_ui (NautilusMimeApplicationChooser *choo
                       G_CALLBACK (reset_clicked_cb),
                       chooser);
     gtk_widget_show (button);
-    gtk_box_pack_start (GTK_BOX (box), button);
+    gtk_container_add (GTK_CONTAINER (box), button);
     gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (box), button, TRUE);
 
     button = gtk_button_new_with_mnemonic (_("_Add"));
@@ -350,7 +350,7 @@ nautilus_mime_application_chooser_build_ui (NautilusMimeApplicationChooser *choo
                       G_CALLBACK (add_clicked_cb),
                       chooser);
     gtk_widget_show (button);
-    gtk_box_pack_start (GTK_BOX (box), button);
+    gtk_container_add (GTK_CONTAINER (box), button);
     chooser->add_button = button;
 
     button = gtk_button_new_with_label (_("Set as default"));
@@ -358,7 +358,7 @@ nautilus_mime_application_chooser_build_ui (NautilusMimeApplicationChooser *choo
                       G_CALLBACK (set_as_default_clicked_cb),
                       chooser);
     gtk_widget_show (button);
-    gtk_box_pack_start (GTK_BOX (box), button);
+    gtk_container_add (GTK_CONTAINER (box), button);
 
     chooser->set_as_default_button = button;
 
diff --git a/src/nautilus-pathbar.c b/src/nautilus-pathbar.c
index 2a69656d1..f2cb7f416 100644
--- a/src/nautilus-pathbar.c
+++ b/src/nautilus-pathbar.c
@@ -1439,11 +1439,15 @@ make_button_data (NautilusPathBar *self,
             button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic");
             gtk_widget_set_margin_start (button_data->disclosure_arrow, 0);
             button_data->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-            gtk_container_add (GTK_CONTAINER (button_data->button), button_data->container);
-
-            gtk_box_pack_start (GTK_BOX (button_data->container), button_data->image);
-            gtk_box_pack_start (GTK_BOX (button_data->container), button_data->label);
-            gtk_box_pack_start (GTK_BOX (button_data->container), button_data->disclosure_arrow);
+            gtk_container_add (GTK_CONTAINER (button_data->button),
+                               button_data->container);
+
+            gtk_container_add (GTK_CONTAINER (button_data->container),
+                               button_data->image);
+            gtk_container_add (GTK_CONTAINER (button_data->container),
+                               button_data->label);
+            gtk_container_add (GTK_CONTAINER (button_data->container),
+                               button_data->disclosure_arrow);
         }
         break;
 
@@ -1455,10 +1459,13 @@ make_button_data (NautilusPathBar *self,
             button_data->disclosure_arrow = gtk_image_new_from_icon_name ("pan-down-symbolic");
             gtk_widget_set_margin_start (button_data->disclosure_arrow, 0);
             button_data->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-            gtk_container_add (GTK_CONTAINER (button_data->button), button_data->container);
+            gtk_container_add (GTK_CONTAINER (button_data->button),
+                               button_data->container);
 
-            gtk_box_pack_start (GTK_BOX (button_data->container), button_data->label);
-            gtk_box_pack_start (GTK_BOX (button_data->container), button_data->disclosure_arrow);
+            gtk_container_add (GTK_CONTAINER (button_data->container),
+                               button_data->label);
+            gtk_container_add (GTK_CONTAINER (button_data->container),
+                               button_data->disclosure_arrow);
         }
         break;
     }
diff --git a/src/nautilus-preferences-window.c b/src/nautilus-preferences-window.c
index 00a4b0d60..141a09801 100644
--- a/src/nautilus-preferences-window.c
+++ b/src/nautilus-preferences-window.c
@@ -354,7 +354,7 @@ nautilus_preferences_window_setup_list_column_page (GtkBuilder *builder)
     gtk_widget_show (chooser);
     box = GTK_WIDGET (gtk_builder_get_object (builder, "list_columns_vbox"));
 
-    gtk_box_pack_start (GTK_BOX (box), chooser);
+    gtk_container_add (GTK_CONTAINER (box), chooser);
 }
 
 static gboolean
diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
index 0cc29226f..891a0daa3 100644
--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
@@ -299,7 +299,7 @@ add_prompt (GtkWidget  *vbox,
     gtk_widget_show (prompt);
     if (pack_at_start)
     {
-        gtk_box_pack_start (GTK_BOX (vbox), prompt);
+        gtk_container_add (GTK_CONTAINER (vbox), prompt);
     }
     else
     {
@@ -3166,7 +3166,7 @@ create_basic_page (NautilusPropertiesWindow *window)
     gtk_widget_set_valign (icon_pixmap_widget, GTK_ALIGN_START);
     gtk_widget_show (icon_pixmap_widget);
 
-    gtk_box_pack_start (GTK_BOX (hbox), icon_pixmap_widget);
+    gtk_container_add (GTK_CONTAINER (hbox), icon_pixmap_widget);
 
     window->icon_chooser = NULL;
 
@@ -3177,7 +3177,7 @@ create_basic_page (NautilusPropertiesWindow *window)
     gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
     grid = GTK_GRID (create_grid_with_standard_properties ());
-    gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (grid));
+    gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (grid));
     window->basic_grid = grid;
 
     /* Name label.  The text will be determined in update_name_field */
@@ -4639,8 +4639,8 @@ on_change_permissions_clicked (GtkWidget                *button,
 
     gtk_widget_set_vexpand (GTK_WIDGET (grid), TRUE);
 
-    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-                        GTK_WIDGET (grid));
+    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                       GTK_WIDGET (grid));
 
     label = gtk_label_new (_("Files"));
     gtk_grid_attach (grid, label, 1, 0, 1, 1);
@@ -4726,7 +4726,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
 
         gtk_widget_set_vexpand (GTK_WIDGET (page_grid), TRUE);
         gtk_widget_show (GTK_WIDGET (page_grid));
-        gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (page_grid));
+        gtk_container_add (GTK_CONTAINER (vbox), GTK_WIDGET (page_grid));
 
         create_simple_permissions (window, page_grid);
 
@@ -4751,7 +4751,7 @@ create_permissions_page (NautilusPropertiesWindow *window)
 
             button = gtk_button_new_with_mnemonic (_("Change Permissions for Enclosed Files…"));
             gtk_widget_show (button);
-            gtk_box_pack_start (GTK_BOX (hbox), button);
+            gtk_container_add (GTK_CONTAINER (hbox), button);
             g_signal_connect (button, "clicked",
                               G_CALLBACK (on_change_permissions_clicked),
                               window);
@@ -5135,8 +5135,8 @@ create_properties_window (StartupData *startup_data)
     gtk_notebook_set_show_border (window->notebook, FALSE);
     gtk_widget_set_vexpand (GTK_WIDGET (window->notebook), TRUE);
     gtk_widget_show (GTK_WIDGET (window->notebook));
-    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
-                        GTK_WIDGET (window->notebook));
+    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))),
+                       GTK_WIDGET (window->notebook));
 
     /* Create the pages. */
     create_basic_page (window);
diff --git a/src/nautilus-search-popover.c b/src/nautilus-search-popover.c
index 5b3b253fd..3de50f302 100644
--- a/src/nautilus-search-popover.c
+++ b/src/nautilus-search-popover.c
@@ -591,7 +591,8 @@ show_other_types_dialog (NautilusSearchPopover *popover)
 
     gtk_widget_set_vexpand (scrolled, TRUE);
     gtk_widget_show (scrolled);
-    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), scrolled);
+    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                       scrolled);
 
     treeview = gtk_tree_view_new ();
     gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
diff --git a/src/nautilus-toolbar.c b/src/nautilus-toolbar.c
index afdca17a8..4f126d7d2 100644
--- a/src/nautilus-toolbar.c
+++ b/src/nautilus-toolbar.c
@@ -531,7 +531,7 @@ update_operations (NautilusToolbar *self)
         g_signal_connect_swapped (l->data, "progress-changed",
                                   G_CALLBACK (on_progress_info_progress_changed), self);
         progress = nautilus_progress_info_widget_new (l->data);
-        gtk_box_pack_start (GTK_BOX (self->operations_container), progress);
+        gtk_container_add (GTK_CONTAINER (self->operations_container), progress);
     }
 
     g_list_free (progress_infos);
@@ -1338,12 +1338,14 @@ on_slot_toolbar_menu_sections_changed (NautilusToolbar    *self,
 
     if (new_sections->zoom_section != NULL)
     {
-        gtk_box_pack_start (GTK_BOX (self->view_menu_zoom_section), new_sections->zoom_section);
+        gtk_container_add (GTK_CONTAINER (self->view_menu_zoom_section),
+                           new_sections->zoom_section);
     }
 
     if (new_sections->extended_section != NULL)
     {
-        gtk_box_pack_start (GTK_BOX (self->view_menu_extended_section), new_sections->extended_section);
+        gtk_container_add (GTK_CONTAINER (self->view_menu_extended_section),
+                           new_sections->extended_section);
     }
 
     gtk_widget_set_sensitive (self->view_button, new_sections->extended_section != NULL ||
diff --git a/src/nautilus-view-icon-item-ui.c b/src/nautilus-view-icon-item-ui.c
index e9049ef75..ade8bb7c1 100644
--- a/src/nautilus-view-icon-item-ui.c
+++ b/src/nautilus-view-icon-item-ui.c
@@ -59,7 +59,7 @@ create_icon (NautilusViewIconItemUi *self)
         gtk_style_context_add_class (style_context, "icon-background");
     }
 
-    gtk_box_pack_start (fixed_height_box, icon);
+    gtk_container_add (GTK_CONTAINER (fixed_height_box), icon);
 
     return GTK_WIDGET (fixed_height_box);
 }
@@ -79,7 +79,7 @@ update_icon (NautilusViewIconItemUi *self)
         gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (self->icon));
     }
     self->icon = create_icon (self);
-    gtk_box_pack_start (box, GTK_WIDGET (self->icon));
+    gtk_container_add (GTK_CONTAINER (box), GTK_WIDGET (self->icon));
 }
 
 static void
@@ -141,7 +141,7 @@ constructed (GObject *object)
     gtk_widget_set_valign (GTK_WIDGET (item_selection_background), GTK_ALIGN_START);
     self->item_container = nautilus_container_max_width_new ();
     self->icon = create_icon (self);
-    gtk_box_pack_start (container, GTK_WIDGET (self->icon));
+    gtk_container_add (GTK_CONTAINER (container), GTK_WIDGET (self->icon));
 
     label = GTK_LABEL (gtk_label_new (nautilus_file_get_display_name (file)));
     gtk_widget_set_vexpand (GTK_WIDGET (label), TRUE);
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 67eabe87e..081b4a25f 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -734,7 +734,7 @@ nautilus_window_slot_add_extra_location_widget (NautilusWindowSlot *self,
     NautilusWindowSlotPrivate *priv;
 
     priv = nautilus_window_slot_get_instance_private (self);
-    gtk_box_pack_start (GTK_BOX (priv->extra_location_widgets), widget);
+    gtk_container_add (GTK_CONTAINER (priv->extra_location_widgets), widget);
     gtk_widget_show (priv->extra_location_widgets);
 }
 
@@ -991,7 +991,7 @@ nautilus_window_slot_constructed (GObject *object)
 
     extras_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     priv->extra_location_widgets = extras_vbox;
-    gtk_box_pack_start (GTK_BOX (self), extras_vbox);
+    gtk_container_add (GTK_CONTAINER (self), extras_vbox);
     gtk_widget_show (extras_vbox);
 
     priv->query_editor = NAUTILUS_QUERY_EDITOR (nautilus_query_editor_new ());