Don't unconditionally set debugging in the greeter. Now we'll enable it if

2008-04-29  William Jon McCann  <jmccann@redhat.com>

	* gui/simple-greeter/gdm-simple-greeter.schemas.in:
	* gui/simple-greeter/greeter-main.c: (is_debug_set), (main):
	Don't unconditionally set debugging in the greeter.  Now
	we'll enable it if a gconf key is set or we are using
	an unstable build.


svn path=/trunk/; revision=6182

3 files changed, 39 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index cbaea9f0..2faf7ea5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-04-29  William Jon McCann  <jmccann@redhat.com>
 
+	* gui/simple-greeter/gdm-simple-greeter.schemas.in:
+	* gui/simple-greeter/greeter-main.c: (is_debug_set), (main):
+	Don't unconditionally set debugging in the greeter.  Now
+	we'll enable it if a gconf key is set or we are using
+	an unstable build.
+
+2008-04-29  William Jon McCann  <jmccann@redhat.com>
+
 	* daemon/gdm-simple-slave.c (start_session_timeout),
 	(on_session_accreditation_failed):
 	Revert svn change 6041 from 2008-03-18.
diff --git a/gui/simple-greeter/gdm-simple-greeter.schemas.in b/gui/simple-greeter/gdm-simple-greeter.schemas.in
index 1b094692..b7b18643 100644
--- a/gui/simple-greeter/gdm-simple-greeter.schemas.in
+++ b/gui/simple-greeter/gdm-simple-greeter.schemas.in
@@ -2,6 +2,17 @@
   <schemalist>
 
     <schema>
+      <key>/schemas/apps/gdm/simple-greeter/debug</key>
+      <applyto>/apps/gdm/simple-greeter/debug</applyto>
+      <owner>gdm-simple-greeter</owner>
+      <type>bool</type>
+      <default>false</default>
+      <locale name="C">
+        <short>Enable debugging</short>
+        <long>Enable debugging mode for the greeter.</long>
+      </locale>
+    </schema>
+    <schema>
       <key>/schemas/apps/gdm/simple-greeter/banner_message_enable</key>
       <applyto>/apps/gdm/simple-greeter/banner_message_enable</applyto>
       <owner>gdm-simple-greeter</owner>
diff --git a/gui/simple-greeter/greeter-main.c b/gui/simple-greeter/greeter-main.c
index a8ea69d8..c6828387 100644
--- a/gui/simple-greeter/greeter-main.c
+++ b/gui/simple-greeter/greeter-main.c
@@ -41,6 +41,7 @@
 #include "gdm-greeter-session.h"
 
 #define ACCESSIBILITY_KEY         "/desktop/gnome/interface/accessibility"
+#define DEBUG_KEY                 "/apps/gdm/simple-greeter/debug"
 
 static Atom AT_SPI_IOR;
 
@@ -256,6 +257,24 @@ load_a11y (void)
         gdm_profile_end (NULL);
 }
 
+static gboolean
+is_debug_set (void)
+{
+        GConfClient *client;
+        gboolean     is;
+
+        /* enable debugging for unstable builds */
+        if (gdm_is_version_unstable ()) {
+                return TRUE;
+        }
+
+        client = gconf_client_get_default ();
+        is = gconf_client_get_bool (client, DEBUG_KEY, NULL);
+        g_object_unref (client);
+
+        return is;
+}
+
 
 static gboolean
 signal_cb (int      signo,
@@ -348,7 +367,7 @@ main (int argc, char *argv[])
         /*sleep (15);*/
 
         gdm_log_init ();
-        gdm_log_set_debug (TRUE);
+        gdm_log_set_debug (is_debug_set ());
 
         gdk_init (&argc, &argv);