Really fix debug output on glib >= 2.31

1 files changed, 12 insertions, 0 deletions

diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 9cffedb..3c2f4d2 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -172,6 +172,18 @@ static guint signals[SIGNAL_LAST];
 void
 virt_viewer_app_set_debug(gboolean debug)
 {
+#if GLIB_CHECK_VERSION(2, 31, 0)
+    if (debug) {
+        gchar *doms = getenv("G_MESSAGES_DEBUG");
+        if (!doms) {
+            setenv("G_MESSAGES_DEBUG", G_LOG_DOMAIN, 1);
+        } else if (!strstr(doms, G_LOG_DOMAIN)) {
+            gchar *newdoms = g_strdup_printf("%s %s", doms, G_LOG_DOMAIN);
+            setenv("G_MESSAGES_DEBUG", newdoms, 1);
+            g_free(newdoms);
+        }
+    }
+#endif
     doDebug = debug;
 }