Merge lp:~gue5t/midori/open-in-tabs into lp:midori

[gue5t gue5t]

Fix "open all in tabs" for bookmarks

Currently "open all in folder" does not work for bookmarks in the sidepanel, menubar, or bookmarks toolbar. The sidepanel is broken because it opens all bookmarks in the folder *containing* the folder on which the action is performed, while the other two are operating on KatzeArrays which do not have their children loaded. This fixes both the midori-browser.c and bookmarks panel implementations so all three ways to access the feature work.

[André Auzi (aauzi)]

The code is correct and works fine.

Nevertheless, katze-arrayaction implements the update_folder signal that may be used to avoid future code duplication if another folder submenu action is added in the popup menu and unnecessary database read as long as the menu is up to date.

This can be investigated and cleaned up later though.

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2014-04-06 17:00:38 +0000
+++ midori/midori-browser.c	2014-04-09 06:26:08 +0000
@@ -4192,8 +4192,12 @@
     if (KATZE_IS_ARRAY (item))
     {
         KatzeItem* child;
-
-        KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (item))
+        KatzeArray* array;
+
+        array = midori_bookmarks_db_query_recursive (browser->bookmarks,
+            "*", "parentid = %q", katze_item_get_meta_string (item, "id"), FALSE);
+
+        KATZE_ARRAY_FOREACH_ITEM (child, KATZE_ARRAY (array))
         {
             if ((uri = katze_item_get_uri (child)) && *uri)
             {
@@ -4201,6 +4205,7 @@
                 midori_browser_set_current_tab_smartly (browser, view);
             }
         }
+        g_object_unref (G_OBJECT (array));
     }
     else
     {

=== modified file 'panels/midori-bookmarks.c'
--- panels/midori-bookmarks.c	2014-01-24 23:04:05 +0000
+++ panels/midori-bookmarks.c	2014-04-09 06:26:08 +0000
@@ -243,6 +243,7 @@
         gtk_tree_store_remove (model, &child);
     else
         g_object_unref (item);
+    g_object_unref (G_OBJECT (array));
 }
 
 static gboolean
@@ -1021,7 +1022,7 @@
         KatzeArray* array;
 
         array = midori_bookmarks_read_from_db (bookmarks,
-                katze_item_get_meta_integer (item, "parentid"), NULL);
+                katze_item_get_meta_integer (item, "id"), NULL);
 
         g_return_if_fail (KATZE_IS_ARRAY (array));
         KATZE_ARRAY_FOREACH_ITEM (child, array)
@@ -1033,6 +1034,7 @@
                 midori_browser_set_current_tab_smartly (browser, view);
             }
         }
+        g_object_unref (G_OBJECT (array));
     }
     else if ((uri = katze_item_get_uri (item)) && *uri)
     {