Merge lp:~dobey/ubuntuone-client-gnome/list-expand into lp:ubuntuone-client-gnome

[dobey]

Be more explicit about expanding since GTK+ 3.x broke this

[Manuel de la Peña (mandel)]

Would be nice to rename the var fro table to vbox, but is not an issue therefore I approve it and let dobey decide.

review: Approve

=== modified file 'nautilus/share-dialog.c'
--- nautilus/share-dialog.c	2011-07-20 20:44:39 +0000
+++ nautilus/share-dialog.c	2011-09-21 19:28:16 +0000
@@ -116,31 +116,30 @@
 				(_("Share")), GTK_RESPONSE_ACCEPT,
 				NULL);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
-	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT, FALSE);
+	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
+                                       GTK_RESPONSE_ACCEPT, FALSE);
 	gtk_window_set_icon_name (GTK_WINDOW (dialog), "ubuntuone");
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (dialog_response_cb), NULL);
 
 	area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
-	table = gtk_table_new (3, 2, FALSE);
-	gtk_table_set_row_spacings (GTK_TABLE (table), 12);
-	gtk_table_set_col_spacings (GTK_TABLE (table), 6);
-	gtk_container_set_border_width (GTK_CONTAINER (table), 7);
-	gtk_widget_show (table);
-	gtk_container_add (GTK_CONTAINER (area), table);
+    table = gtk_vbox_new (FALSE, 12);
+    gtk_container_set_border_width (GTK_CONTAINER (table), 7);
+    gtk_box_pack_start (GTK_BOX (area), table, TRUE, TRUE, 0);
+    gtk_widget_show (table);
 
 	dialog->user_picker = u1_contacts_picker_new ();
 	g_signal_connect (G_OBJECT (dialog->user_picker), "selection-changed",
 			  G_CALLBACK (picker_selection_changed_cb), dialog);
-	gtk_table_attach (GTK_TABLE (table), dialog->user_picker, 0, 2, 0, 2,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK,
-			  GTK_FILL | GTK_EXPAND | GTK_SHRINK, 3, 3);
+    gtk_box_pack_start (GTK_BOX (table), dialog->user_picker, TRUE, TRUE, 0);
 	gtk_widget_show (dialog->user_picker);
 
 	dialog->allow_mods = gtk_check_button_new_with_mnemonic (_("_Allow Modification"));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->allow_mods), TRUE); /* Default to RW */
-	gtk_table_attach (GTK_TABLE (table), dialog->allow_mods, 0, 2, 2, 3, GTK_FILL, GTK_FILL, 3, 3);
+    /* Default to RW */
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dialog->allow_mods),
+                                  TRUE);
+    gtk_box_pack_end (GTK_BOX (table), dialog->allow_mods, FALSE, FALSE, 0);
 	gtk_widget_show (dialog->allow_mods);
 
 	gtk_widget_set_size_request (GTK_WIDGET (dialog), 500, 450);