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

Fix edit bookmark behavior

Browse source
This commit is contained in:
Alexander Butenko 2010-07-19 16:58:18 -04:00 committed by Christian Dywan
parent f77eaf6d9b
commit 5859bbe2ab
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
midori/midori-browser.c
View file

@ -915,6 +915,11 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
{ {
gchar* selected; gchar* selected;
GtkTreeView* treeview;
GtkTreeModel* model;
if (!new_bookmark)
midori_bookmarks_remove_item_from_db (db, bookmark);
katze_item_set_name (bookmark, katze_item_set_name (bookmark,
gtk_entry_get_text (GTK_ENTRY (entry_title))); gtk_entry_get_text (GTK_ENTRY (entry_title)));
@ -932,20 +937,18 @@ midori_browser_edit_bookmark_dialog_new (MidoriBrowser* browser,
selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder)); selected = gtk_combo_box_get_active_text (GTK_COMBO_BOX (combo_folder));
midori_bookmarks_remove_item_from_db (db, bookmark);
if (!strcmp (selected, _("Toplevel folder"))) if (!strcmp (selected, _("Toplevel folder")))
{ selected = g_strdup ("");
GtkTreeView* treeview;
GtkTreeModel* model;
midori_bookmarks_insert_item_db (db, bookmark, ""); midori_bookmarks_insert_item_db (db, bookmark, selected);
if (new_bookmark)
{
treeview = g_object_get_data (G_OBJECT (browser->bookmarks), "treeview"); treeview = g_object_get_data (G_OBJECT (browser->bookmarks), "treeview");
model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)); model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
gtk_tree_store_insert_with_values (GTK_TREE_STORE (model), gtk_tree_store_insert_with_values (GTK_TREE_STORE (model),
NULL, NULL, G_MAXINT, 0, bookmark, -1); NULL, NULL, G_MAXINT, 0, bookmark, -1);
} }
else
midori_bookmarks_insert_item_db (db, bookmark, selected);
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar))) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (check_toolbar)))
if (!gtk_widget_get_visible (browser->bookmarkbar)) if (!gtk_widget_get_visible (browser->bookmarkbar))

7
panels/midori-bookmarks.c
View file

@ -345,11 +345,8 @@ midori_bookmarks_edit_clicked_cb (GtkWidget* toolitem,
g_assert (!KATZE_ITEM_IS_SEPARATOR (item)); g_assert (!KATZE_ITEM_IS_SEPARATOR (item));
browser = midori_browser_get_for_widget (bookmarks->treeview); browser = midori_browser_get_for_widget (bookmarks->treeview);
if (midori_browser_edit_bookmark_dialog_new ( midori_browser_edit_bookmark_dialog_new (
browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item))) browser, item, FALSE, KATZE_ITEM_IS_FOLDER (item));
{
gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
}
g_object_unref (item); g_object_unref (item);
} }
} }