[Xfce4-commits] <midori:master> Only read history into History panel if an array is given

[Christian Dywan]

Updating branch refs/heads/master
         to 6d722f6294d1d1274712f51d7c52b908330852ed (commit)
       from 0243e26bed5d937ab95f81a8783a52b0896dfc49 (commit)

commit 6d722f6294d1d1274712f51d7c52b908330852ed
Author: Christian Dywan <christian at twotoasts.de>
Date:   Mon Feb 8 23:13:35 2010 +0100

    Only read history into History panel if an array is given

 panels/midori-history.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/panels/midori-history.c b/panels/midori-history.c
index 96cfe70..0d6c186 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -498,7 +498,8 @@ midori_history_set_app (MidoriHistory* history,
     history->array = katze_object_get_object (app, "history");
     model = gtk_tree_view_get_model (GTK_TREE_VIEW (history->treeview));
     #if HAVE_SQLITE
-    midori_history_read_from_db (history, GTK_TREE_STORE (model), NULL, 0, NULL);
+    if (history->array)
+        midori_history_read_from_db (history, GTK_TREE_STORE (model), NULL, 0, NULL);
     #endif
 }