Merge lp:~cavalier/midori/show-combobox_folder into lp:midori

[Peter de Ridder]

Show the bookmarks import location combobox.

[André Auzi (aauzi)]

The change works.

It may had been achieved by just moving the "gtk_widget_show_all" and changing its parameter.

It would had become:

    gtk_container_add (GTK_CONTAINER (content_area), hbox);
    /* REMOVE THIS : gtk_widget_show_all (hbox); */

    combobox_folder = midori_bookmark_folder_button_new (browser->bookmarks, 0);
    gtk_container_add (GTK_CONTAINER (content_area), combobox_folder);

    /* INSERT THIS */
    gtk_widget_show_all (content_area);

This way the content_area is used consistently over the dialog creation and one preserves the defaut pack settings of dialog boxes which may become different from the one forced by the replacement of "gtk_container_add" by:

    gtk_box_pack_start (GTK_BOX (content_area), combobox_folder, FALSE, TRUE, 0);

review: Abstain

[Peter de Ridder (cavalier)]

Indeed the gtk_widget_show_all could be moved. And the packing change doesn't add anything to this function. I did it this way so I wouldn't get conflicts with another brach which is merged by now.

As you state, the default packing could be changed. This is the exact reason why you should use gtk_box_pack_start here. This did change between gtk2 and gtk3 and that broke a few dialogs.

If you want, I can update this branch with gtk_widget_show_all since the other branch is merged.

[André Stösel (ivaldi)]

Yes, please update this branch.

[lp:~cavalier/midori/show-combobox_folder]

6345. By Peter de Ridder on 2013-08-15

Merge lp:midori

6346. By Peter de Ridder on 2013-08-15

Use a single show_all.

[André Stösel (ivaldi)]

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-12 19:21:06 +0000
+++ midori/midori-browser.c	2013-08-15 21:35:54 +0000
@@ -4515,10 +4515,10 @@
     gtk_combo_box_set_active (combobox, 0);
     gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
     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);
-    gtk_container_add (GTK_CONTAINER (content_area), combobox_folder);
+    gtk_box_pack_start (GTK_BOX (content_area), combobox_folder, FALSE, TRUE, 0);
+    gtk_widget_show_all (content_area);
 
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT);
     if (midori_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)