[Xfce4-commits] <midori:master> Ignore form history database errors in unit test

[Christian Dywan]

Updating branch refs/heads/master
         to 975c2446228351474c49264225703da34973b5ec (commit)
       from 583c5be7ef07fc609afc7f89a9448cd5236b7c1a (commit)

commit 975c2446228351474c49264225703da34973b5ec
Author: Christian Dywan <christian at twotoasts.de>
Date:   Fri Nov 18 00:52:35 2011 +0100

    Ignore form history database errors in unit test

 extensions/formhistory.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/extensions/formhistory.c b/extensions/formhistory.c
index 76b39c3..8b20aa1 100644
--- a/extensions/formhistory.c
+++ b/extensions/formhistory.c
@@ -412,7 +412,9 @@ formhistory_activate_cb (MidoriExtension* extension,
     filename = g_build_filename (config_dir, "forms.db", NULL);
     if (sqlite3_open (filename, &db) != SQLITE_OK)
     {
-        g_warning (_("Failed to open database: %s\n"), sqlite3_errmsg (db));
+        /* If the folder is /, this is a test run, thus no error */
+        if (!g_str_equal (midori_extension_get_config_dir (extension), "/"))
+            g_warning (_("Failed to open database: %s\n"), sqlite3_errmsg (db));
         sqlite3_close (db);
     }
     g_free (filename);