Merge lp:~cavalier/midori/dialog-packing into lp:midori

[Peter de Ridder]

Correct packing of cookie and nojs permission dialog.

[André Stösel (ivaldi)]

review: Approve

=== modified file 'extensions/adblock.c'
--- extensions/adblock.c	2013-07-28 20:18:39 +0000
+++ extensions/adblock.c	2013-08-12 20:25:31 +0000
@@ -936,7 +936,7 @@
     gtk_entry_set_text (GTK_ENTRY (entry),
                         g_object_get_data (G_OBJECT (widget), "uri"));
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 
=== modified file 'extensions/cookie-permissions/cookie-permission-manager-preferences-window.c'
--- extensions/cookie-permissions/cookie-permission-manager-preferences-window.c	2013-03-23 11:36:21 +0000
+++ extensions/cookie-permissions/cookie-permission-manager-preferences-window.c	2013-08-12 20:25:31 +0000
@@ -723,7 +723,7 @@
 	gtk_container_add(GTK_CONTAINER(hbox), priv->addDomainButton);
 	g_signal_connect_swapped(priv->addDomainButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_add_domain_clicked), self);
 
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
 	/* Set up cookie domain list */
 	priv->list=gtk_tree_view_new_with_model(GTK_TREE_MODEL(priv->listStore));
@@ -780,7 +780,7 @@
 	gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
 	g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_cookie_permission_manager_preferences_on_delete_all), self);
 
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
 	/* Add "ask-for-unknown-policy" checkbox */
 	priv->askForUnknownPolicyCheckbox=gtk_check_button_new_with_mnemonic(_("A_sk for policy if unknown for a domain"));
@@ -788,10 +788,10 @@
 																"toggled",
 																G_CALLBACK(_cookie_permission_manager_preferences_window_ask_for_unknown_policy_changed),
 																self);
-	gtk_box_pack_start(GTK_BOX(vbox), priv->askForUnknownPolicyCheckbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), priv->askForUnknownPolicyCheckbox, FALSE, TRUE, 5);
 
 	/* Finalize setup of content area */
-	gtk_container_add(GTK_CONTAINER(priv->contentArea), vbox);
+	gtk_box_pack_start(GTK_BOX(priv->contentArea), vbox, TRUE, TRUE, 0);
 }
 
 /* Implementation: Public API */
 
=== modified file 'extensions/feed-panel/main.c'
--- extensions/feed-panel/main.c	2013-07-27 12:35:55 +0000
+++ extensions/feed-panel/main.c	2013-08-12 20:25:31 +0000
@@ -366,7 +366,7 @@
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
     gtk_entry_set_text (GTK_ENTRY (entry), "");
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX(gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
 
=== modified file 'extensions/formhistory/formhistory.c'
--- extensions/formhistory/formhistory.c	2013-06-17 19:15:01 +0000
+++ extensions/formhistory/formhistory.c	2013-08-12 20:25:31 +0000
@@ -117,13 +117,13 @@
     label = gtk_label_new (_("Master password required\n"
                              "to open password database"));
     gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
 
     entry = gtk_entry_new ();
     g_object_set (entry, "truncate-multiline", TRUE, NULL);
     gtk_entry_set_visibility(GTK_ENTRY (entry),FALSE);
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
-    gtk_container_add (GTK_CONTAINER (content_area), entry);
+    gtk_box_pack_start (GTK_BOX (content_area), entry, FALSE, TRUE, 0);
 
     gtk_widget_show_all (entry);
     gtk_widget_show_all (hbox);
@@ -612,7 +612,7 @@
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox),
         !midori_extension_get_boolean (extension, "always-load"));
     g_object_set_data (G_OBJECT (dialog), "always-load-checkbox", checkbox);
-    gtk_container_add (GTK_CONTAINER (content_area), checkbox);
+    gtk_box_pack_start (GTK_BOX (content_area), checkbox, FALSE, TRUE, 0);
     /* FIXME: Add pref to disable password manager */
 
     g_signal_connect (dialog,
 
=== modified file 'extensions/nojs/nojs-preferences.c'
--- extensions/nojs/nojs-preferences.c	2013-07-05 16:10:15 +0000
+++ extensions/nojs/nojs-preferences.c	2013-08-12 20:25:31 +0000
@@ -705,7 +705,7 @@
 	gtk_container_add(GTK_CONTAINER(hbox), priv->deleteAllButton);
 	g_signal_connect_swapped(priv->deleteAllButton, "clicked", G_CALLBACK(_nojs_preferences_on_delete_all), self);
 
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 5);
 
 	/* Add "allow-all-sites" checkbox */
 	priv->allowAllSitesCheckbox=gtk_check_button_new_with_mnemonic(_("A_llow scripts at all sites"));
@@ -713,7 +713,7 @@
 																"toggled",
 																G_CALLBACK(_nojs_preferences_on_allow_all_sites_changed),
 																self);
-	gtk_box_pack_start(GTK_BOX(vbox), priv->allowAllSitesCheckbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), priv->allowAllSitesCheckbox, FALSE, TRUE, 5);
 
 	/* Add "block-unknown-domains" checkbox */
 	priv->blockUnknownDomainsCheckbox=gtk_check_button_new_with_mnemonic(_("Bloc_k scripts at unknown domains by default"));
@@ -721,7 +721,7 @@
 																		"toggled",
 																		G_CALLBACK(_nojs_preferences_on_block_unknown_domains_changed),
 																		self);
-	gtk_box_pack_start(GTK_BOX(vbox), priv->blockUnknownDomainsCheckbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), priv->blockUnknownDomainsCheckbox, FALSE, TRUE, 5);
 
 	/* Add "check-second-level-only" checkbox */
 	priv->checkSecondLevelOnlyCheckbox=gtk_check_button_new_with_mnemonic(_("S_et permissions on second-level domain"));
@@ -729,10 +729,10 @@
 																		"toggled",
 																		G_CALLBACK(_nojs_preferences_on_check_second_level_only_changed),
 																		self);
-	gtk_box_pack_start(GTK_BOX(vbox), priv->checkSecondLevelOnlyCheckbox, TRUE, TRUE, 5);
+	gtk_box_pack_start(GTK_BOX(vbox), priv->checkSecondLevelOnlyCheckbox, FALSE, TRUE, 5);
 
 	/* Finalize setup of content area */
-	gtk_container_add(GTK_CONTAINER(priv->contentArea), vbox);
+	gtk_box_pack_start(GTK_BOX(priv->contentArea), vbox, TRUE, TRUE, 0);
 }
 
 /* Implementation: Public API */
 
=== modified file 'katze/katze-http-auth.c'
--- katze/katze-http-auth.c	2011-10-26 18:07:11 +0000
+++ katze/katze-http-auth.c	2013-08-12 20:25:31 +0000
@@ -226,14 +226,14 @@
     label = gtk_label_new (_("A username and a password are required\n"
                              "to open this location:"));
     gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     label = gtk_label_new (soup_auth_get_host (auth));
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, TRUE, 0);
     /* If the realm is merely the host, omit the realm label */
     if (g_strcmp0 (soup_auth_get_host (auth), soup_auth_get_realm (auth)))
     {
         label = gtk_label_new (soup_auth_get_realm (auth));
-        gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
+        gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label, FALSE, TRUE, 0);
     }
     sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
     hbox = gtk_hbox_new (FALSE, 6);
@@ -248,7 +248,7 @@
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
     g_object_set_data (G_OBJECT (dialog), "username", entry);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     hbox = gtk_hbox_new (FALSE, 6);
     label = gtk_label_new (_("Password"));
     align = gtk_alignment_new (0, 0.5, 0, 0);
@@ -262,13 +262,13 @@
     gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
     gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
     g_object_set_data (G_OBJECT (dialog), "password", entry);
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     hbox = gtk_hbox_new (FALSE, 6);
     label = gtk_check_button_new_with_mnemonic (_("_Remember password"));
     gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
     g_object_set_data (G_OBJECT (dialog), "remember", label);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (label), (login != NULL));
-    gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox);
+    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, TRUE, 0);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
     gtk_widget_show_all (gtk_dialog_get_content_area (GTK_DIALOG (dialog)));
 
 
=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-06 20:20:49 +0000
+++ midori/midori-browser.c	2013-08-12 20:25:31 +0000
@@ -2846,7 +2846,7 @@
     granite_widgets_contractor_view_name_blacklist (GRANITE_WIDGETS_CONTRACTOR_VIEW (
         contractor), blacklisted_contracts, -1); */
     g_free (filename);
-    gtk_container_add (GTK_CONTAINER (content_area), contractor);
+    gtk_box_pack_start (GTK_BOX (content_area), contractor, TRUE, TRUE, 0);
     gtk_widget_show (contractor);
     gtk_widget_show (dialog);
     /* FIXME: granite: "box" isn't visible by default */
@@ -4514,7 +4514,7 @@
         0, _("Import from XBEL or HTML file"), 1, NULL, 2, NULL, 3, icon_width, -1);
     gtk_combo_box_set_active (combobox, 0);
     gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, 0);
 
=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-07-30 21:00:46 +0000
+++ midori/midori-frontend.c	2013-08-12 20:25:31 +0000
@@ -339,7 +339,7 @@
     gtk_window_set_title (GTK_WINDOW (dialog), g_get_application_name ());
     content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
     align = gtk_alignment_new (0.5, 0.5, 0.5, 0.5);
-    gtk_container_add (GTK_CONTAINER (content_area), align);
+    gtk_box_pack_start (GTK_BOX (content_area), align, FALSE, TRUE, 0);
     box = gtk_hbox_new (FALSE, 0);
     gtk_container_add (GTK_CONTAINER (align), box);
     button = gtk_button_new_with_mnemonic (_("Modify _preferences"));
@@ -357,7 +357,7 @@
     button = katze_property_proxy (settings, "show-crash-dialog", NULL);
     gtk_button_set_label (GTK_BUTTON (button), _("Show a dialog after Midori crashed"));
     gtk_widget_show (button);
-    gtk_container_add (GTK_CONTAINER (content_area), button);
+    gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, TRUE, 0);
     gtk_container_set_focus_child (GTK_CONTAINER (dialog), gtk_dialog_get_action_area (GTK_DIALOG (dialog)));
     gtk_dialog_add_buttons (GTK_DIALOG (dialog),
         _("Discard old tabs"), MIDORI_STARTUP_BLANK_PAGE,
 
=== modified file 'midori/midori-searchaction.c'
--- midori/midori-searchaction.c	2013-08-02 23:45:16 +0000
+++ midori/midori-searchaction.c	2013-08-12 20:25:31 +0000
@@ -1084,7 +1084,7 @@
     gtk_entry_set_text (GTK_ENTRY (entry_name),
         katze_str_non_null (katze_item_get_name (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_name, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
@@ -1097,7 +1097,7 @@
     gtk_entry_set_text (GTK_ENTRY (entry_description)
          , katze_str_non_null (katze_item_get_text (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_description, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
@@ -1112,7 +1112,7 @@
     gtk_entry_set_text (GTK_ENTRY (entry_uri),
         katze_str_non_null (katze_item_get_uri (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_uri, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     hbox = gtk_hbox_new (FALSE, 8);
@@ -1125,7 +1125,7 @@
     gtk_entry_set_text (GTK_ENTRY (entry_token)
          , katze_str_non_null (katze_item_get_token (item)));
     gtk_box_pack_start (GTK_BOX (hbox), entry_token, TRUE, TRUE, 0);
-    gtk_container_add (GTK_CONTAINER (content_area), hbox);
+    gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, TRUE, 0);
     gtk_widget_show_all (hbox);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);