Merge lp:~aauzi/midori/fix-1185595 into lp:midori

[André Auzi]

Fill in bookmark folder attributes in bookmarkbar populate

[Cris Dywan (kalikiana)]

The fix feels to me like a work-around. I would expect the function to return an array with all the values, same as for an item. Not inside the bookmarkbar code.

I'll leave it to another reviewer to override my concerns.

review: Abstain

[Cris Dywan (kalikiana)]

Too late for a fancy solution, but should we get this in for a bug-fix now?

[Cris Dywan (kalikiana)]

Decidedly deferred to next release.

[Cris Dywan (kalikiana)]

review: Approve

=== modified file 'midori/midori-browser.c'
--- midori/midori-browser.c	2013-05-28 20:02:29 +0000
+++ midori/midori-browser.c	2013-05-29 22:34:27 +0000
@@ -7011,6 +7011,14 @@
 
                 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);
         }