Updating branch refs/heads/master
to 3b46d80161b69811504e5c2812f8fe61d9681c0a (commit)
from 87ac3ae563dd99778537661d6abc708b2db6f737 (commit)
commit 3b46d80161b69811504e5c2812f8fe61d9681c0a
Author: Alexander Butenko <[email protected]>
Date: Sat Jun 12 23:06:27 2010 -0400
Fixup the bookmark panel initialization
panels/midori-bookmarks.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index fdc7080..e5deb9c 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -531,14 +531,11 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
{
GtkTreeModel* model;
+ model = gtk_tree_view_get_model (GTK_TREE_VIEW (bookmarks->treeview));
if (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));
- #if HAVE_SQLITE
- midori_bookmarks_read_from_db (bookmarks, GTK_TREE_STORE (model),
NULL, "");
- #endif
}
katze_assign (bookmarks->app, app);
if (!app)
@@ -546,6 +543,10 @@ midori_bookmarks_set_app (MidoriBookmarks* bookmarks,
g_object_ref (app);
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
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
