Merge lp:~kalikiana/midori/beetle into lp:midori

[Cris Dywan]

Drop all G_ENABLE_DEBUG guards

=== modified file 'extensions/adblock.c'
--- extensions/adblock.c	2013-08-12 19:21:06 +0000
+++ extensions/adblock.c	2013-09-02 20:33:49 +0000
@@ -28,12 +28,8 @@
     __filter[4] = __active ? (__filter[5] == ':' ? 's' : ':') : '-'
 #define ADBLOCK_FILTER_IS_SET(__filter) \
     (__filter[4] != '-' && __filter[5] != '-')
-#ifdef G_ENABLE_DEBUG
     #define adblock_debug(dmsg, darg1, darg2) \
         do { if (midori_debug ("adblock:match")) g_debug (dmsg, darg1, darg2); } while (0)
-#else
-    #define adblock_debug(dmsg, darg1, darg2) /* nothing */
-#endif
 
 static GHashTable* pattern = NULL;
 static GHashTable* keys = NULL;
@@ -877,10 +873,8 @@
         }
     }
 
-    #ifdef G_ENABLE_DEBUG
     if (midori_debug ("adblock:time"))
         g_test_timer_start ();
-    #endif
     if (adblock_is_matched (req_uri, page_uri))
     {
         blocked_uris = g_object_get_data (G_OBJECT (web_view), "blocked-uris");
@@ -888,11 +882,8 @@
         webkit_network_request_set_uri (request, "about:blank");
         g_object_set_data (G_OBJECT (web_view), "blocked-uris", blocked_uris);
     }
-    #ifdef G_ENABLE_DEBUG
     if (midori_debug ("adblock:time"))
         g_debug ("match: %f%s", g_test_timer_elapsed (), "seconds");
-    #endif
-
 }
 
 static void

=== modified file 'midori/midori-app.c'
--- midori/midori-app.c	2013-09-01 12:49:06 +0000
+++ midori/midori-app.c	2013-09-02 20:33:49 +0000
@@ -1247,8 +1247,7 @@
 midori_debug (const gchar* token)
 {
     static const gchar* debug_token = NULL;
-    const gchar* debug_tokens = "headers body referer cookies paths hsts unarmed bookmarks mouse app ";
-    const gchar* full_debug_tokens = "adblock:match adblock:time startup ";
+    const gchar* debug_tokens = "adblock:match adblock:time startup headers body referer cookies paths hsts unarmed bookmarks mouse app ";
     if (debug_token == NULL)
     {
         gchar* found_token;
@@ -1258,15 +1257,7 @@
             g_warning ("MIDORI_TOUCHSCREEN is obsolete: "
                 "GTK+ 3.4 enables touchscreens automatically, "
                 "older GTK+ versions aren't supported as of Midori 0.4.9");
-        if (debug && (found_token = strstr (full_debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
-        {
-            #ifdef G_ENABLE_DEBUG
-            debug_token = g_intern_static_string (debug);
-            #else
-            g_warning ("Value '%s' for MIDORI_DEBUG requires a full debugging build.", debug);
-            #endif
-        }
-        else if (debug && (found_token = strstr (debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
+        if (debug && (found_token = strstr (debug_tokens, debug)) && *(found_token + strlen (debug)) == ' ')
             debug_token = g_intern_static_string (debug);
         else if (debug)
             g_warning ("Unrecognized value '%s' for MIDORI_DEBUG.", debug);
@@ -1275,12 +1266,11 @@
         if (!debug_token)
         {
             debug_token = "INVALID";
-            g_print ("Supported values: %s\nWith full debugging: %s\n",
-                     debug_tokens, full_debug_tokens);
+            g_print ("Supported values: %s\n", debug_tokens);
         }
     }
     if (debug_token != g_intern_static_string ("NONE")
-     && !strstr (debug_tokens, token) && !strstr (full_debug_tokens, token))
+     && !strstr (debug_tokens, token))
         g_warning ("Token '%s' passed to midori_debug is not a known token.", token);
     return debug_token == g_intern_static_string (token);
 }

=== modified file 'midori/midori-session.c'
--- midori/midori-session.c	2013-08-10 19:20:31 +0000
+++ midori/midori-session.c	2013-09-02 20:33:49 +0000
@@ -359,10 +359,8 @@
     MidoriApp* app = MIDORI_APP (data);
     gchar** keys = g_object_get_data (G_OBJECT (app), "extensions");
     KatzeArray* extensions;
-    #ifdef G_ENABLE_DEBUG
     gboolean startup_timer = midori_debug ("startup");
     GTimer* timer = startup_timer ? g_timer_new () : NULL;
-    #endif
 
     /* Load extensions */
     extensions = katze_array_new (MIDORI_TYPE_EXTENSION);
@@ -370,10 +368,8 @@
     g_object_set (app, "extensions", extensions, NULL);
     midori_extension_load_from_folder (app, keys, TRUE);
 
-    #ifdef G_ENABLE_DEBUG
     if (startup_timer)
         g_debug ("Extensions:\t%f", g_timer_elapsed (timer, NULL));
-    #endif
 
     return FALSE;
 }
@@ -501,10 +497,8 @@
     gchar** execute_commands = g_object_get_data (G_OBJECT (app), "execute-commands");
     gchar* uri;
     guint i = 0;
-    #ifdef G_ENABLE_DEBUG
     gboolean startup_timer = midori_debug ("startup");
     GTimer* timer = startup_timer ? g_timer_new () : NULL;
-    #endif
 
     browser = midori_app_create_browser (app);
     midori_session_persistent_settings (settings, app);
@@ -588,10 +582,8 @@
     if (execute_commands != NULL)
         midori_app_send_command (app, execute_commands);
 
-    #ifdef G_ENABLE_DEBUG
     if (startup_timer)
         g_debug ("Session setup:\t%f", g_timer_elapsed (timer, NULL));
-    #endif
 
     return FALSE;
 }

=== modified file 'midori/midori-view.c'
--- midori/midori-view.c	2013-09-01 16:40:29 +0000
+++ midori/midori-view.c	2013-09-02 20:33:49 +0000
@@ -3859,12 +3859,10 @@
             MidoriBrowser* browser = midori_browser_get_for_widget (GTK_WIDGET (view));
             MidoriSpeedDial* dial = katze_object_get_object (browser, "speed-dial");
             const gchar* html;
-            #ifdef G_ENABLE_DEBUG
             GTimer* timer = NULL;
 
             if (midori_debug ("startup"))
                 timer = g_timer_new ();
-            #endif
 
             midori_tab_set_uri (MIDORI_TAB (view), uri);
             midori_tab_set_mime_type (MIDORI_TAB (view), "text/html");
@@ -3874,13 +3872,11 @@
             html = dial != NULL ? midori_speed_dial_get_html (dial, NULL) : "";
             midori_view_set_html (view, html, uri, NULL);
 
-            #ifdef G_ENABLE_DEBUG
             if (midori_debug ("startup"))
             {
                 g_debug ("Speed Dial: \t%fs", g_timer_elapsed (timer, NULL));
                 g_timer_destroy (timer);
             }
-            #endif
         }
         else if (midori_uri_is_blank (uri))
         {