gdm r6182 - in trunk: . gui/simple-greeter

[mccann svn gnome org]

Author: mccann
Date: Tue Apr 29 21:31:42 2008
New Revision: 6182
URL: http://svn.gnome.org/viewvc/gdm?rev=6182&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in
   trunk/gui/simple-greeter/greeter-main.c

Modified: trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in
==============================================================================
--- trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in	(original)
+++ trunk/gui/simple-greeter/gdm-simple-greeter.schemas.in	Tue Apr 29 21:31:42 2008
@@ -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>

Modified: trunk/gui/simple-greeter/greeter-main.c
==============================================================================
--- trunk/gui/simple-greeter/greeter-main.c	(original)
+++ trunk/gui/simple-greeter/greeter-main.c	Tue Apr 29 21:31:42 2008
@@ -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 @@
         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 @@
         /*sleep (15);*/
 
         gdm_log_init ();
-        gdm_log_set_debug (TRUE);
+        gdm_log_set_debug (is_debug_set ());
 
         gdk_init (&argc, &argv);