rpms/gdm/F-9 gdm-2.22.0-fix-auto-login.patch, 1.1, 1.2 gdm.spec, 1.389, 1.390

[Ray Strode (rstrode)]

Author: rstrode

Update of /cvs/pkgs/rpms/gdm/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27196

Modified Files:
	gdm-2.22.0-fix-auto-login.patch gdm.spec 
Log Message:
- Fix automatic login option fix


gdm-2.22.0-fix-auto-login.patch:

Index: gdm-2.22.0-fix-auto-login.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-9/gdm-2.22.0-fix-auto-login.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gdm-2.22.0-fix-auto-login.patch	27 Jun 2008 16:58:29 -0000	1.1
+++ gdm-2.22.0-fix-auto-login.patch	30 Jun 2008 14:10:34 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login gdm-2.22.0/common/gdm-settings-keys.h
---- gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login	2008-06-27 12:49:43.000000000 -0400
-+++ gdm-2.22.0/common/gdm-settings-keys.h	2008-06-27 12:50:25.000000000 -0400
+--- gdm-2.22.0/common/gdm-settings-keys.h.fix-auto-login	2008-06-27 12:57:23.000000000 -0400
++++ gdm-2.22.0/common/gdm-settings-keys.h	2008-06-27 12:57:23.000000000 -0400
 @@ -27,6 +27,8 @@ G_BEGIN_DECLS
  
  #define GDM_KEY_USER "daemon/User"
@@ -10,29 +10,9 @@
  #define GDM_KEY_TIMED_LOGIN_ENABLE "daemon/TimedLoginEnable"
  #define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
  #define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
-diff -up gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login gdm-2.22.0/data/gdm.schemas.in.in
---- gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login	2008-06-27 12:55:20.000000000 -0400
-+++ gdm-2.22.0/data/gdm.schemas.in.in	2008-06-27 12:55:08.000000000 -0400
-@@ -12,6 +12,16 @@
-       <default>gdm</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>
-diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.fix-autologin gdm-2.22.0/daemon/gdm-simple-slave.c
---- gdm-2.22.0/daemon/gdm-simple-slave.c.fix-autologin	2008-06-27 12:47:26.000000000 -0400
-+++ gdm-2.22.0/daemon/gdm-simple-slave.c	2008-06-27 12:54:21.000000000 -0400
+diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.fix-auto-login gdm-2.22.0/daemon/gdm-simple-slave.c
+--- gdm-2.22.0/daemon/gdm-simple-slave.c.fix-auto-login	2008-06-27 12:57:23.000000000 -0400
++++ gdm-2.22.0/daemon/gdm-simple-slave.c	2008-06-27 12:57:23.000000000 -0400
 @@ -427,12 +427,26 @@ get_timed_login_details (GdmSimpleSlave 
          gboolean res;
  
@@ -41,7 +21,7 @@
 +        if (enabled) {
 +
 +            *username = NULL;
-+            res = gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, username);
++            res = gdm_settings_client_get_string (GDM_KEY_AUTO_LOGIN_USER, username);
 +        }
 +
 +        if (enabled && *username != NULL)
@@ -61,3 +41,43 @@
          res = gdm_settings_client_get_string (GDM_KEY_TIMED_LOGIN_USER, username);
  
          if (username == NULL) {
+diff -up gdm-2.22.0/data/gdm.schemas.in.fix-auto-login gdm-2.22.0/data/gdm.schemas.in
+--- gdm-2.22.0/data/gdm.schemas.in.fix-auto-login	2008-06-30 10:06:29.000000000 -0400
++++ gdm-2.22.0/data/gdm.schemas.in	2008-06-30 10:06:49.000000000 -0400
+@@ -12,6 +12,16 @@
+       <default>gdm</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>
+diff -up gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login gdm-2.22.0/data/gdm.schemas.in.in
+--- gdm-2.22.0/data/gdm.schemas.in.in.fix-auto-login	2008-04-17 23:29:29.000000000 -0400
++++ gdm-2.22.0/data/gdm.schemas.in.in	2008-06-27 12:57:23.000000000 -0400
+@@ -12,6 +12,16 @@
+       <default>gdm</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>


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-9/gdm.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- gdm.spec	27 Jun 2008 16:58:29 -0000	1.389
+++ gdm.spec	30 Jun 2008 14:10:34 -0000	1.390
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.22.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -309,6 +309,9 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Mon Jun 30 2008 Ray Strode <rstrode at redhat.com> - 1:2.22.0-8
+- Fix automatic login option fix
+
 * Fri Jun 27 2008 Ray Strode <rstrode at redhat.com> - 1:2.22.0-7
 - Fix automatic login option