debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Do removal from bookmarkbar via the database

Browse source
This commit is contained in:
Alexander Butenko 2010-07-02 10:39:53 -04:00 committed by Christian Dywan
parent 1e8e6f4652
commit dbcc8e2054
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
midori/midori-browser.c
View file

@ -3981,33 +3981,27 @@ midori_browser_bookmark_edit_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
KatzeItem* item; KatzeItem* item;
const gchar* uri;
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
uri = katze_item_get_uri (item);
if (!uri) if (KATZE_ITEM_IS_BOOKMARK (item))
midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE);
else
midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE);
else
midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, TRUE);
} }
static void static void
midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem, midori_browser_bookmark_delete_activate_cb (GtkWidget* menuitem,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
sqlite3* db;
KatzeItem* item; KatzeItem* item;
const gchar* uri;
KatzeItem* parent;
db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem"); item = (KatzeItem*)g_object_get_data (G_OBJECT (menuitem), "KatzeItem");
uri = katze_item_get_uri (item);
/* FIXME: Even toplevel items should technically have a parent */ midori_bookmarks_remove_item_from_db (db, item);
g_return_if_fail (katze_item_get_parent (item)); g_object_unref (item);
parent = katze_item_get_parent (item);
katze_array_remove_item (KATZE_ARRAY (parent), item);
} }
static void static void