gdm r6458 - in trunk: . common daemon data

[halfline svn gnome org]

Author: halfline
Date: Wed Sep  3 18:08:52 2008
New Revision: 6458
URL: http://svn.gnome.org/viewvc/gdm?rev=6458&view=rev

Log:
2008-09-03  Ray Strode  <rstrode redhat com>

	* common/gdm-settings-keys.h:
	* daemon/gdm-simple-slave.c
	(get_timed_login_details):
	* data/gdm.schemas.in.in:
	Make old AutomaticLogin key initiate a timed login
	of 0 seconds for backward compatibility.


Modified:
   trunk/ChangeLog
   trunk/common/gdm-settings-keys.h
   trunk/daemon/gdm-simple-slave.c
   trunk/data/gdm.schemas.in.in

Modified: trunk/common/gdm-settings-keys.h
==============================================================================
--- trunk/common/gdm-settings-keys.h	(original)
+++ trunk/common/gdm-settings-keys.h	Wed Sep  3 18:08:52 2008
@@ -27,6 +27,8 @@
 
 #define GDM_KEY_USER "daemon/User"
 #define GDM_KEY_GROUP "daemon/Group"
+#define GDM_KEY_AUTO_LOGIN_ENABLE "daemon/AutomaticLoginEnable"
+#define GDM_KEY_AUTO_LOGIN_USER "daemon/AutomaticLogin"
 #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
 #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
 #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"

Modified: trunk/daemon/gdm-simple-slave.c
==============================================================================
--- trunk/daemon/gdm-simple-slave.c	(original)
+++ trunk/daemon/gdm-simple-slave.c	Wed Sep  3 18:08:52 2008
@@ -442,12 +442,26 @@
         gboolean res;
 
         enabled = FALSE;
+        res = gdm_settings_client_get_boolean (GDM_KEY_AUTO_LOGIN_ENABLE, &enabled);
+        if (enabled) {
+
+            *username = NULL;
+            res = gdm_settings_client_get_string (GDM_KEY_AUTO_LOGIN_USER, username);
+        }
+
+        if (enabled && *username != NULL)
+        {
+            *delay = 0;
+            return TRUE;
+        }
+
+        *username = NULL;
+        enabled = FALSE;
         res = gdm_settings_client_get_boolean (GDM_KEY_TIMED_LOGIN_ENABLE, &enabled);
         if (! enabled) {
                 return FALSE;
         }
 
-        *username = NULL;
         res = gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, username);
 
         if (username == NULL) {

Modified: trunk/data/gdm.schemas.in.in
==============================================================================
--- trunk/data/gdm.schemas.in.in	(original)
+++ trunk/data/gdm.schemas.in.in	Wed Sep  3 18:08:52 2008
@@ -12,6 +12,16 @@
       <default>@GDM_GROUPNAME@</default>
     </schema>
     <schema>
+      <key>daemon/AutomaticLoginEnable</key>
+      <signature>b</signature>
+      <default>false</default>
+    </schema>
+    <schema>
+      <key>daemon/AutomaticLogin</key>
+      <signature>s</signature>
+      <default></default>
+    </schema>
+    <schema>
       <key>daemon/TimedLoginEnable</key>
       <signature>b</signature>
       <default>false</default>