Merge lp:~aauzi/midori/fix-1179200-2 into lp:midori

[André Auzi]

Re-work midori_array_query_recursive to not include folder items twice

Second step for merge of fix-1179200

Here, midori_array_query_recursive is reworked to not include twice the folder items, once as a KatzeItem and the second time as a KatzeArray.

Note: after this step, the XBEL bookmark import is functional. Nevertheless, since insert notifications are still broken, one needs to restart midori to be able to see the imported bookmarks in the bookmark bar.

[Cris Dywan (kalikiana)]

Works as advertised, de-dupes some code, nice. Apologies for not getting to this sooner. We need a better strategy for code review.

review: Approve

=== modified file 'midori/midori-array.c'
--- midori/midori-array.c	2013-05-30 21:57:04 +0000
+++ midori/midori-array.c	2013-08-05 07:07:23 +0000
@@ -97,15 +97,15 @@
         if (katze_str_equal ((gchar*)cur->name, "title"))
         {
             gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
+            katze_item_set_name (KATZE_ITEM (array), value);
+            xmlFree (value);
+        }
+        else if (katze_str_equal ((gchar*)cur->name, "desc"))
+        {
+            gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
             katze_item_set_text (KATZE_ITEM (array), value);
             xmlFree (value);
         }
-        else if (katze_str_equal ((gchar*)cur->name, "desc"))
-        {
-            gchar* value = g_strstrip ((gchar*)xmlNodeGetContent (cur));
-            katze_item_set_name (KATZE_ITEM (array), value);
-            xmlFree (value);
-        }
         else if (katze_str_equal ((gchar*)cur->name, "info"))
             katze_xbel_parse_info ((KatzeItem*)array, cur);
         else if (katze_str_equal ((gchar*)cur->name, "folder"))
@@ -1069,6 +1069,17 @@
         item = katze_item_new ();
         for (i = 0; i < cols; i++)
             katze_item_set_value_from_column (stmt, i, item);
+
+        if (KATZE_ITEM_IS_FOLDER (item))
+        {
+            g_object_unref (item);
+
+            item = KATZE_ITEM (katze_array_new (KATZE_TYPE_ITEM));
+
+            for (i = 0; i < cols; i++)
+                katze_item_set_value_from_column (stmt, i, item);
+        }
+
         katze_array_add_item (array, item);
     }
 
@@ -1157,12 +1168,18 @@
         if (KATZE_ITEM_IS_FOLDER (item))
         {
             gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT,
-                katze_item_get_meta_integer (item, "id"));
+					       katze_item_get_meta_integer (item, "id"));
             KatzeArray* subarray = midori_array_query_recursive (bookmarks,
-                fields, "parentid=%q", parentid, TRUE);
-            katze_item_set_name (KATZE_ITEM (subarray), katze_item_get_name (item));
-            katze_array_add_item (array, subarray);
-
+								 fields, "parentid=%q", parentid, TRUE);
+            KatzeItem* subitem;
+            GList* sublist;
+
+            KATZE_ARRAY_FOREACH_ITEM_L (subitem, subarray, sublist)
+            {
+                katze_array_add_item (KATZE_ARRAY (item), subitem);
+            }
+
+            g_object_unref (subarray);
             g_free (parentid);
         }
     }

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-08-02 12:00:42 +0000
+++ midori/midori-browser.c	2013-08-05 07:07:23 +0000
@@ -7014,29 +7014,7 @@
 
     KATZE_ARRAY_FOREACH_ITEM (item, array)
     {
-        if (KATZE_ITEM_IS_BOOKMARK (item))
-            midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
-        else
-        {
-            gint64 id = katze_item_get_meta_integer (item, "id");
-            gchar* parentid = g_strdup_printf ("%" G_GINT64_FORMAT, id);
-            KatzeArray* subfolder = midori_array_query (browser->bookmarks,
-                "id, parentid, title, uri, desc, app, toolbar, pos_panel, pos_bar", "parentid = %q",
-                parentid);
-
-                katze_item_set_name (KATZE_ITEM (subfolder), katze_item_get_name (item));
-                katze_item_set_meta_integer (KATZE_ITEM (subfolder), "id", id);
-                katze_item_set_meta_integer (KATZE_ITEM (subfolder), "toolbar", 1);
-                katze_item_set_meta_integer (KATZE_ITEM (subfolder), "parentid", 
-                    katze_item_get_meta_integer (item, "parentid"));
-		katze_item_set_uri (KATZE_ITEM (subfolder), NULL);
-		katze_item_set_meta_string (KATZE_ITEM (subfolder), "desc",
-		    katze_item_get_meta_string (KATZE_ITEM (item), "desc"));
-		katze_item_set_meta_integer (KATZE_ITEM (subfolder), "app",
-		    katze_item_get_meta_boolean (KATZE_ITEM (item), "app"));
-                midori_bookmarkbar_insert_item (browser->bookmarkbar, KATZE_ITEM (subfolder));
-            g_free (parentid);
-        }
+        midori_bookmarkbar_insert_item (browser->bookmarkbar, item);
     }
     _action_set_sensitive (browser, "BookmarkAdd", TRUE);
     _action_set_sensitive (browser, "BookmarkFolderAdd", TRUE);