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

Fixup the bookmark panel initialization

Browse source
This commit is contained in:
Alexander Butenko 2010-06-12 23:06:27 -04:00 committed by Christian Dywan
parent 87ac3ae563
commit 3b46d80161
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
panels/midori-bookmarks.c
View file

@ -531,14 +531,11 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
{ {
GtkTreeModel* model; GtkTreeModel* model;
model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
if (bookmarks->array) if (bookmarks->array)
{ {
g_object_unref (bookmarks->array); g_object_unref (bookmarks->array);
model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
gtk_tree_store_clear (GTK_TREE_STORE (model)); gtk_tree_store_clear (GTK_TREE_STORE (model));
#if HAVE_SQLITE
midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, "");
#endif
} }
katze_assign (bookmarks->app, app); katze_assign (bookmarks->app, app);
if (!app) if (!app)
@ -546,6 +543,10 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
g_object_ref (app); g_object_ref (app);
bookmarks->array = katze_object_get_object (app, "bookmarks"); bookmarks->array = katze_object_get_object (app, "bookmarks");
#if HAVE_SQLITE
midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model), NULL, "");
#endif
} }
static void static void