[Xfce4-commits] <midori:master> Delete bookmarks from the folder they reside in

[Christian Dywan]

Updating branch refs/heads/master
         to b170dd688a3d45fea4b74954328379e91a645ebe (commit)
       from 067eb6c3ece102b8d03532a983caba371de56a2f (commit)

commit b170dd688a3d45fea4b74954328379e91a645ebe
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Fri Jul 2 11:13:55 2010 -0400

    Delete bookmarks from the folder they reside in

 panels/midori-bookmarks.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 2624f22..b8c9b69 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)
     {