daemon-skeleton: Try to fix verbose mode again...

Author: mtwebster

plugins/common/daemon-skeleton-gtk.h

@@ -179,29 +179,20 @@ handle_signal (gpointer user_data)
   return G_SOURCE_REMOVE;
 }
 
-static void
-message_handler (const gchar *log_domain,
-                 GLogLevelFlags log_level,
-                 const gchar *message,
-                 gpointer user_data)
-{
-  /* Make this look like normal console output */
-  if (log_level & G_LOG_LEVEL_DEBUG) {
-    g_autoptr(GDateTime) dt = g_date_time_new_now_local ();
-    g_autofree gchar *iso8601 = g_date_time_format (dt, "%F:%T");
-    printf ("csd-%s:%s: %s\n", PLUGIN_NAME, iso8601, message);
-  }
-  else {
-    printf ("%s: %s\n", g_get_prgname (), message);
-  }
-}
-
 int
 main (int argc, char **argv)
 {
         GError  *error;
         gboolean started;
 
+        for (int i = 1; i < argc; i++) {
+            if (g_strcmp0 (argv[i], "--verbose") == 0 || g_strcmp0 (argv[i], "-v") == 0) {
+                verbose = TRUE;
+                g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
+                break;
+            }
+        }
+
         bindtextdomain (GETTEXT_PACKAGE, CINNAMON_SETTINGS_LOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
@@ -242,9 +233,6 @@ main (int argc, char **argv)
 
         g_unix_signal_add (SIGTERM, (GSourceFunc) handle_signal, NULL);
 
-        if (verbose)
-            g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL);
-
         if (timeout > 0) {
                 guint id;
                 id = g_timeout_add_seconds (timeout, (GSourceFunc) gtk_main_quit, NULL);

plugins/common/daemon-skeleton.h

@@ -176,23 +176,6 @@ handle_signal (gpointer user_data)
     return G_SOURCE_REMOVE;
 }
 
-static void
-message_handler (const gchar *log_domain,
-                 GLogLevelFlags log_level,
-                 const gchar *message,
-                 gpointer user_data)
-{
-  /* Make this look like normal console output */
-  if (log_level & G_LOG_LEVEL_DEBUG) {
-    g_autoptr(GDateTime) dt = g_date_time_new_now_local ();
-    g_autofree gchar *iso8601 = g_date_time_format (dt, "%F:%T");
-    printf ("csd-%s:%s: %s\n", PLUGIN_NAME, iso8601, message);
-  }
-  else {
-    printf ("%s: %s\n", g_get_prgname (), message);
-  }
-}
-
 int
 main (int argc, char **argv)
 {
@@ -202,6 +185,14 @@ main (int argc, char **argv)
         GMainLoop *loop;
 
 
+        for (int i = 1; i < argc; i++) {
+            if (g_strcmp0 (argv[i], "--verbose") == 0 || g_strcmp0 (argv[i], "-v") == 0) {
+                verbose = TRUE;
+                g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
+                break;
+            }
+        }
+
         bindtextdomain (GETTEXT_PACKAGE, CINNAMON_SETTINGS_LOCALEDIR);
         bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
@@ -230,9 +221,6 @@ main (int argc, char **argv)
 
         g_unix_signal_add (SIGTERM, (GSourceFunc) handle_signal, loop);
 
-        if (verbose)
-            g_log_set_handler (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, message_handler, NULL);
-
         if (timeout > 0) {
                 guint id;
                 id = g_timeout_add_seconds (timeout, (GSourceFunc) g_main_loop_quit, loop);