From ec2d1e21c97c09251eb4b49ebd5664a3362ede39 Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Mon, 5 Jul 2010 23:14:49 +0200 Subject: [PATCH] Fallback to the old parent when inserting bookmarks --- panels/midori-bookmarks.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c index e27df97e..5450f0ba 100644 --- a/panels/midori-bookmarks.c +++ b/panels/midori-bookmarks.c @@ -214,6 +214,7 @@ midori_bookmarks_insert_item_db (sqlite3* db, { gchar* sqlcmd; char* errmsg = NULL; + KatzeItem* old_parent; gchar* parent; gchar* uri; @@ -222,10 +223,12 @@ midori_bookmarks_insert_item_db (sqlite3* db, else uri = g_strdup (""); - if (folder) + /* Use folder, otherwise fallback to parent folder */ + old_parent = katze_item_get_parent (item); + if (folder && *folder) parent = g_strdup (folder); - else if (katze_item_get_name (katze_item_get_parent (item))) - parent = g_strdup (katze_item_get_name (katze_item_get_parent (item))); + else if (old_parent && katze_item_get_name (old_parent)) + parent = g_strdup (katze_item_get_name (old_parent)); else parent = g_strdup ("");