Don't unconditionally enable debugging.

2008-05-06  William Jon McCann  <jmccann@redhat.com>

	* common/gdm-log.c (log_level_to_priority_and_prefix),
	(gdm_log_set_debug):
	* daemon/factory-slave-main.c (signal_cb), (is_debug_set), (main):
	* daemon/product-slave-main.c (signal_cb), (is_debug_set), (main):
	* daemon/session-worker-main.c (signal_cb), (is_debug_set), (main):
	* daemon/simple-slave-main.c (signal_cb), (is_debug_set), (main):
	* daemon/xdmcp-chooser-slave-main.c (signal_cb), (is_debug_set),
	(main):
	Don't unconditionally enable debugging.


svn path=/trunk/; revision=6220

1 files changed, 16 insertions, 1 deletions

diff --git a/daemon/session-worker-main.c b/daemon/session-worker-main.c
index 666fd9c6..68669d57 100644
--- a/daemon/session-worker-main.c
+++ b/daemon/session-worker-main.c
@@ -98,6 +98,8 @@ signal_cb (int      signo,
                  */
                 ret = TRUE;
 
+                gdm_log_toggle_debug ();
+
                 break;
 
         default:
@@ -110,6 +112,17 @@ signal_cb (int      signo,
         return ret;
 }
 
+static gboolean
+is_debug_set (gboolean arg)
+{
+        /* enable debugging for unstable builds */
+        if (gdm_is_version_unstable ()) {
+                return TRUE;
+        }
+
+        return arg;
+}
+
 int
 main (int    argc,
       char **argv)
@@ -119,7 +132,9 @@ main (int    argc,
         GdmSessionWorker *worker;
         GdmSignalHandler *signal_handler;
         const char       *address;
+        static gboolean   debug      = FALSE;
         static GOptionEntry entries []   = {
+                { "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
                 { NULL }
         };
 
@@ -138,7 +153,7 @@ main (int    argc,
         g_option_context_free (context);
 
         gdm_log_init ();
-        gdm_log_set_debug (TRUE);
+        gdm_log_set_debug (is_debug_set (debug));
 
         address = g_getenv ("GDM_SESSION_DBUS_ADDRESS");
         if (address == NULL) {