Index: sources/rb-library-source.c
===================================================================
--- sources/rb-library-source.c	(revision 6103)
+++ sources/rb-library-source.c	(working copy)
@@ -486,7 +486,7 @@
 	tmp = glade_xml_get_widget (xml, "layout_path_menu_box");
 	label = glade_xml_get_widget (xml, "layout_path_menu_label");
 	source->priv->layout_path_menu = gtk_combo_box_new_text ();
-	gtk_box_pack_start_defaults (GTK_BOX (tmp), source->priv->layout_path_menu);
+	gtk_box_pack_start (GTK_BOX (tmp), source->priv->layout_path_menu, TRUE, TRUE, 0);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), source->priv->layout_path_menu);
 	g_signal_connect (G_OBJECT (source->priv->layout_path_menu),
 			  "changed",
@@ -500,7 +500,7 @@
 	tmp = glade_xml_get_widget (xml, "layout_filename_menu_box");
 	label = glade_xml_get_widget (xml, "layout_filename_menu_label");
 	source->priv->layout_filename_menu = gtk_combo_box_new_text ();
-	gtk_box_pack_start_defaults (GTK_BOX (tmp), source->priv->layout_filename_menu);
+	gtk_box_pack_start (GTK_BOX (tmp), source->priv->layout_filename_menu, TRUE, TRUE, 0);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), source->priv->layout_filename_menu);
 	g_signal_connect (G_OBJECT (source->priv->layout_filename_menu),
 			  "changed",
@@ -520,7 +520,7 @@
 	tmp = glade_xml_get_widget (xml, "preferred_format_menu_box");
 	label = glade_xml_get_widget (xml, "preferred_format_menu_label");
 	source->priv->preferred_format_menu = gm_audio_profile_choose_new ();
-	gtk_box_pack_start_defaults (GTK_BOX (tmp), source->priv->preferred_format_menu);
+	gtk_box_pack_start (GTK_BOX (tmp), source->priv->preferred_format_menu, TRUE, TRUE, 0);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), source->priv->preferred_format_menu);
 	g_signal_connect (G_OBJECT (source->priv->preferred_format_menu),
 			  "changed",
Index: sources/rb-browser-source.c
===================================================================
--- sources/rb-browser-source.c	(revision 6103)
+++ sources/rb-browser-source.c	(working copy)
@@ -1015,7 +1015,7 @@
 	GtkWidget *box;
 
 	box = gtk_vbox_new (FALSE, 5);
-	gtk_box_pack_start_defaults (GTK_BOX (box), paned);
+	gtk_box_pack_start (GTK_BOX (box), paned, TRUE, TRUE, 0);
 	gtk_container_add (GTK_CONTAINER (source), box);
 }
 
Index: sources/rb-podcast-source.c
===================================================================
--- sources/rb-podcast-source.c	(revision 6103)
+++ sources/rb-podcast-source.c	(working copy)
@@ -834,7 +834,7 @@
 	gtk_paned_pack2 (GTK_PANED (source->priv->paned),
 			 GTK_WIDGET (source->priv->posts), TRUE, FALSE);
 
-	gtk_box_pack_start_defaults (GTK_BOX (source->priv->vbox), source->priv->paned);
+	gtk_box_pack_start (GTK_BOX (source->priv->vbox), source->priv->paned, TRUE, TRUE, 0);
 
 	source->priv->prefs_notify_id = eel_gconf_notification_add (CONF_STATE_PODCAST_PREFIX,
 								    (GConfClientNotifyFunc) rb_podcast_source_state_pref_changed,
Index: shell/rb-shell.c
===================================================================
--- shell/rb-shell.c	(revision 6103)
+++ shell/rb-shell.c	(working copy)
@@ -1161,7 +1157,8 @@
 				    GTK_WIDGET (shell->priv->bottom_container),
 				    FALSE, FALSE, 0);
 
-		gtk_box_pack_start_defaults (shell->priv->sidebar_container, shell->priv->queue_paned);
+		gtk_box_pack_start (shell->priv->sidebar_container, shell->priv->queue_paned,
+				    TRUE, TRUE, 0);
 		gtk_paned_pack1 (GTK_PANED (shell->priv->paned),
 				 GTK_WIDGET (shell->priv->sidebar_container),
 				 FALSE, TRUE);
@@ -1262,7 +1259,7 @@
 	gtk_box_reorder_child (GTK_BOX (shell->priv->main_vbox), hbox, 1);
 
 	toolbar = gtk_ui_manager_get_widget (shell->priv->ui_manager, "/ToolBar");
-	gtk_box_pack_start_defaults (GTK_BOX (hbox), toolbar);
+	gtk_box_pack_start (GTK_BOX (hbox), toolbar, TRUE, TRUE, 0);
 
 #ifdef HAVE_GTK_VOLUME_BUTTON
 	shell->priv->volume_button = gtk_volume_button_new ();
Index: plugins/iradio/rb-iradio-source.c
===================================================================
--- plugins/iradio/rb-iradio-source.c	(revision 6103)
+++ plugins/iradio/rb-iradio-source.c	(working copy)
@@ -364,7 +364,7 @@
 	gtk_paned_pack2 (GTK_PANED (source->priv->paned),
 			 GTK_WIDGET (source->priv->stations), TRUE, FALSE);
 
-	gtk_box_pack_start_defaults (GTK_BOX (source->priv->vbox), source->priv->paned);
+	gtk_box_pack_start (GTK_BOX (source->priv->vbox), source->priv->paned, TRUE, TRUE, 0);
 
 	source->priv->prefs_notify_id =
 		eel_gconf_notification_add (CONF_STATE_IRADIO_DIR,
Index: plugins/audioscrobbler/rb-lastfm-source.c
===================================================================
--- plugins/audioscrobbler/rb-lastfm-source.c	(revision 6103)
+++ plugins/audioscrobbler/rb-lastfm-source.c	(working copy)
@@ -527,11 +527,11 @@
 
 	source->priv->txtbox = gtk_entry_new ();
 
-	gtk_box_pack_end_defaults (GTK_BOX (editor_box), add_button);
-	gtk_box_pack_end_defaults (GTK_BOX (editor_box), source->priv->txtbox);
-	gtk_box_pack_start_defaults (GTK_BOX (editor_box), source->priv->typecombo);
-	gtk_box_pack_end_defaults (GTK_BOX (editor_vbox), editor_box);
-	gtk_box_pack_end_defaults (GTK_BOX (editor_vbox), instructions);
+	gtk_box_pack_end (GTK_BOX (editor_box), add_button, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (editor_box), source->priv->txtbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (editor_box), source->priv->typecombo, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (editor_vbox), editor_box, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (editor_vbox), instructions, TRUE, TRUE, 0);
 
 	source->priv->paned = gtk_vpaned_new ();
 
@@ -585,7 +585,7 @@
 
 	source->priv->main_box = gtk_vbox_new (FALSE, 5);
 	gtk_box_pack_start (GTK_BOX (source->priv->main_box), editor_vbox, FALSE, FALSE, 5);
-	gtk_box_pack_start_defaults (GTK_BOX (source->priv->main_box), source->priv->paned);
+	gtk_box_pack_start (GTK_BOX (source->priv->main_box), source->priv->paned, TRUE, TRUE, 0);
 	gtk_container_add (GTK_CONTAINER (source), source->priv->main_box);
 
 	gtk_widget_show_all (GTK_WIDGET (source));
Index: widgets/rb-query-creator.c
===================================================================
--- widgets/rb-query-creator.c	(revision 6103)
+++ widgets/rb-query-creator.c	(working copy)
@@ -787,30 +787,30 @@
 	len = g_list_length (rows);
 
 	hbox = GTK_BOX (gtk_hbox_new (FALSE, 5));
-	gtk_box_pack_start_defaults (GTK_BOX (priv->vbox), GTK_WIDGET (hbox));
+	gtk_box_pack_start (GTK_BOX (priv->vbox), GTK_WIDGET (hbox), TRUE, TRUE, 0);
 	priv->rows = g_list_prepend (priv->rows, hbox);
 	gtk_box_reorder_child (priv->vbox, GTK_WIDGET (hbox), -1);
 
 	/* This is the main (leftmost) GtkOptionMenu, for types. */
 	option = create_property_option_menu (creator, property_options, num_property_options);
 	gtk_size_group_add_widget (priv->property_size_group, option);
-	gtk_box_pack_start_defaults (hbox, GTK_WIDGET (option));
+	gtk_box_pack_start (hbox, GTK_WIDGET (option), TRUE, TRUE, 0);
 	gtk_option_menu_set_history (GTK_OPTION_MENU (option), 0);
 	criteria = create_criteria_option_menu (property_options[0].property_type->criteria_options,
 						property_options[0].property_type->num_criteria_options);
 	gtk_size_group_add_widget (priv->criteria_size_group, criteria);
-	gtk_box_pack_start_defaults (hbox, GTK_WIDGET (criteria));
+	gtk_box_pack_start (hbox, GTK_WIDGET (criteria), TRUE, TRUE, 0);
 
 	entry = get_entry_for_property (creator, property_options[0].strict_val, &constrain);
 	if (constrain)
 		gtk_size_group_add_widget (priv->entry_size_group, entry);
-	gtk_box_pack_start_defaults (hbox, GTK_WIDGET (entry));
+	gtk_box_pack_start (hbox, GTK_WIDGET (entry), TRUE, TRUE, 0);
 
 	remove_button = gtk_button_new_from_stock (GTK_STOCK_REMOVE);
 	g_signal_connect_object (G_OBJECT (remove_button), "clicked", G_CALLBACK (remove_button_click_cb),
 				 creator, 0);
 	gtk_size_group_add_widget (priv->button_size_group, remove_button);
-	gtk_box_pack_start_defaults (hbox, GTK_WIDGET (remove_button));
+	gtk_box_pack_start (hbox, GTK_WIDGET (remove_button), TRUE, TRUE, 0);
 
 	gtk_widget_show_all (GTK_WIDGET (priv->vbox));
 	return GTK_WIDGET (hbox);
@@ -888,7 +888,7 @@
 	criteria = create_criteria_option_menu (criteria_options, length);
 	gtk_widget_show (criteria);
 	gtk_size_group_add_widget (priv->criteria_size_group, criteria);
-	gtk_box_pack_start_defaults (GTK_BOX (row), GTK_WIDGET (criteria));
+	gtk_box_pack_start (GTK_BOX (row), GTK_WIDGET (criteria), TRUE, TRUE, 0);
 	gtk_box_reorder_child (GTK_BOX (row), criteria, 1);
 
 	entry = get_box_widget_at_pos (GTK_BOX (row), 2);
@@ -899,7 +899,7 @@
 
 	if (constrain)
 		gtk_size_group_add_widget (priv->entry_size_group, entry);
-	gtk_box_pack_start_defaults (GTK_BOX (row), GTK_WIDGET (entry));
+	gtk_box_pack_start (GTK_BOX (row), GTK_WIDGET (entry), TRUE, TRUE, 0);
 	gtk_box_reorder_child (GTK_BOX (row), entry, 2);
 }
 
Index: widgets/rb-library-browser.c
===================================================================
--- widgets/rb-library-browser.c	(revision 6103)
+++ widgets/rb-library-browser.c	(working copy)
@@ -264,7 +264,7 @@
 					 browser, 0);
 		gtk_widget_show_all (GTK_WIDGET (view));
 		gtk_widget_set_no_show_all (GTK_WIDGET (view), TRUE);
-		gtk_box_pack_start_defaults (GTK_BOX (browser), GTK_WIDGET (view));
+		gtk_box_pack_start (GTK_BOX (browser), GTK_WIDGET (view), TRUE, TRUE, 0);
 	}
 
 	update_browser_views_visibility (browser);
Index: widgets/rb-query-creator-properties.c
===================================================================
--- widgets/rb-query-creator-properties.c	(revision 6103)
+++ widgets/rb-query-creator-properties.c	(working copy)
@@ -508,11 +508,11 @@
 	box = GTK_BOX (gtk_hbox_new (FALSE, 6));
 
 	timeSpin = gtk_spin_button_new_with_range (1.0, G_MAXINT, 1.0);
-	gtk_box_pack_start_defaults (box, timeSpin);
+	gtk_box_pack_start (box, timeSpin, TRUE, TRUE, 0);
 
 	timeOption = create_time_unit_option_menu (time_unit_options, G_N_ELEMENTS (time_unit_options));
 	gtk_option_menu_set_history (GTK_OPTION_MENU (timeOption), time_unit_options_default);
-	gtk_box_pack_start_defaults (box, timeOption);
+	gtk_box_pack_start (box, timeOption, TRUE, TRUE, 0);
 	
 	g_signal_connect_object (timeOption, "changed",
 				 G_CALLBACK (update_time_unit_limits),
