From: Alexander Butenko <a.butenka@gmail.com>
Date: Fri, 2 Jul 2010 15:13:55 +0000 (-0400)
Subject: Delete bookmarks from the folder they reside in
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b170dd688a3d45fea4b74954328379e91a645ebe;p=midori

Delete bookmarks from the folder they reside in
---

diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 2624f22a..b8c9b69c 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -231,12 +231,17 @@ midori_bookmarks_remove_item_from_db (sqlite3*   db,
 
     if (KATZE_ITEM_IS_BOOKMARK (item))
         sqlcmd = sqlite3_mprintf (
-            "DELETE FROM bookmarks WHERE uri = '%q'",
-            katze_item_get_uri (item));
+            "DELETE FROM bookmarks WHERE uri = '%q' "
+            " AND folder = '%q'",
+            katze_item_get_uri (item),
+            katze_item_get_meta_string (item, "folder"));
+
     else
        sqlcmd = sqlite3_mprintf (
-            "DELETE FROM bookmarks WHERE title = '%q'",
-            katze_item_get_name (item));
+            "DELETE FROM bookmarks WHERE title = '%q'"
+            " AND folder = '%q'",
+            katze_item_get_name (item),
+            katze_item_get_meta_string (item, "folder"));
 
     if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
     {