Merge lp:~aauzi/midori/fix-bookmarks-tests-regression into lp:midori

[André Auzi]

fix bookmarks test regression after fix-1179200-4

[Cris Dywan (kalikiana)]

Thanks for the fix!

review: Approve

=== modified file 'midori/midori-bookmarks-db.c'
--- midori/midori-bookmarks-db.c	2013-09-17 19:34:23 +0000
+++ midori/midori-bookmarks-db.c	2013-09-26 21:03:27 +0000
@@ -132,7 +132,7 @@
 {
     bookmarks->db = NULL;
 
-    katze_item_set_meta_integer (KATZE_ITEM (bookmarks), "id", 0);
+    katze_item_set_meta_integer (KATZE_ITEM (bookmarks), "id", -1);
     katze_item_set_name (KATZE_ITEM (bookmarks), _("Bookmarks"));
     /* g_object_ref (bookmarks); */
 }
@@ -203,21 +203,21 @@
 
     db_parent = midori_bookmarks_db_get_item_parent (bookmarks, item);
 
-    g_return_if_fail (db_parent);
-
     if (parent == db_parent)
     {
         if (IS_MIDORI_BOOKMARKS_DB (parent))
             KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->update (parent);
-        else
+        else if (KATZE_IS_ARRAY (parent))
             katze_array_update (parent);
         return;
     }
 
     if (IS_MIDORI_BOOKMARKS_DB (parent))
         KATZE_ARRAY_CLASS (midori_bookmarks_db_parent_class)->add_item (parent, item);
-    else
+    else if (KATZE_IS_ARRAY (parent))
         katze_array_add_item (parent, item);
+
+    g_assert (parent == katze_item_get_parent (KATZE_ITEM (item)));
 }
 
 /**