[Xfce4-commits] <midori:master> Allow bookmark strace debugging without full debug

[Christian Dywan]

Updating branch refs/heads/master
         to dd592e19bbaa180dbf7830f17adf3c8eb780f036 (commit)
       from 54bbb6f269a4031b2764dc5e0a5d75314e4a8310 (commit)

commit dd592e19bbaa180dbf7830f17adf3c8eb780f036
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Nov 18 16:43:11 2012 +0100

    Allow bookmark strace debugging without full debug

 midori/midori-app.c       |    4 ++--
 midori/midori-bookmarks.c |    8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/midori/midori-app.c b/midori/midori-app.c
index 6cfffa1..6159985 100644
--- a/midori/midori-app.c
+++ b/midori/midori-app.c
@@ -1470,8 +1470,8 @@ midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
     const gchar* debug = g_getenv ("MIDORI_DEBUG");
-    const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed ";
-    const gchar* full_debug_tokens = "adblock:match adblock:time startup bookmarks ";
+    const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks ";
+    const gchar* full_debug_tokens = "adblock:match adblock:time startup ";
     if (debug_token == NULL)
     {
         gchar* found_token;
diff --git a/midori/midori-bookmarks.c b/midori/midori-bookmarks.c
index 381749d..be5ecd8 100644
--- a/midori/midori-bookmarks.c
+++ b/midori/midori-bookmarks.c
@@ -24,12 +24,12 @@
     #include <unistd.h>
 #endif
 
-#ifdef G_ENABLE_DEBUG
-void midori_bookmarks_dbtracer(void* dummy, const char* query)
+void
+midori_bookmarks_dbtracer (void*       dummy,
+                           const char* query)
 {
     g_printerr ("%s\n", query);
 }
-#endif
 
 void
 midori_bookmarks_add_item_cb (KatzeArray* array,
@@ -160,10 +160,8 @@ midori_bookmarks_initialize (KatzeArray*  array,
         goto init_failed;
     }
 
-#ifdef G_ENABLE_DEBUG
     if (midori_debug ("bookmarks"))
         sqlite3_trace (db, midori_bookmarks_dbtracer, NULL);
-#endif
 
     create_stmt =     /* Table structure */
         "CREATE TABLE IF NOT EXISTS bookmarks "