Merge lp:~kalikiana/midori/debug-while-running into lp:midori

[Cris Dywan]

MIDORI_DEBUG on a running instance doesn't work, so it needs to print a warning message.

[Paweł Forysiuk (tuxator)]

Looks and works fine.

review: Approve

=== modified file 'midori/midori-frontend.c'
--- midori/midori-frontend.c	2013-05-19 09:33:02 +0000
+++ midori/midori-frontend.c	2013-05-19 12:10:33 +0000
@@ -442,6 +442,10 @@
     MidoriApp* app = midori_app_new (nickname);
     if (midori_app_instance_is_running (app))
     {
+        /* midori_debug makes no sense on a running instance */
+        if (g_getenv ("MIDORI_DEBUG"))
+            g_warning ("MIDORI_DEBUG only works for a new instance");
+
         /* It makes no sense to show a crash dialog while running */
         if (!diagnostic_dialog)
         {