Delete bookmarks from the folder they reside in

This commit is contained in:
Alexander Butenko 2010-07-02 11:13:55 -04:00 committed by Christian Dywan
parent 067eb6c3ec
commit b170dd688a

View file

@ -231,12 +231,17 @@ midori_bookmarks_remove_item_from_db (sqlite3* db,
if (KATZE_ITEM_IS_BOOKMARK (item)) if (KATZE_ITEM_IS_BOOKMARK (item))
sqlcmd = sqlite3_mprintf ( sqlcmd = sqlite3_mprintf (
"DELETE FROM bookmarks WHERE uri = '%q'", "DELETE FROM bookmarks WHERE uri = '%q' "
katze_item_get_uri (item)); " AND folder = '%q'",
katze_item_get_uri (item),
katze_item_get_meta_string (item, "folder"));
else else
sqlcmd = sqlite3_mprintf ( sqlcmd = sqlite3_mprintf (
"DELETE FROM bookmarks WHERE title = '%q'", "DELETE FROM bookmarks WHERE title = '%q'"
katze_item_get_name (item)); " 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) if (sqlite3_exec (db, sqlcmd, NULL, NULL, &errmsg) != SQLITE_OK)
{ {