rpms/gdm/devel gdm-2.25.2-multistack-but-boring.patch, 1.4, 1.5 gdm.spec, 1.445, 1.446

Ray Strode rstrode at fedoraproject.org
Thu Mar 5 21:54:47 UTC 2009


Author: rstrode

Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30853

Modified Files:
	gdm-2.25.2-multistack-but-boring.patch gdm.spec 
Log Message:
- Create settings object early to prevent assertion failures
  when one pam conversation completes before another starts.


gdm-2.25.2-multistack-but-boring.patch:

Index: gdm-2.25.2-multistack-but-boring.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-2.25.2-multistack-but-boring.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gdm-2.25.2-multistack-but-boring.patch	5 Mar 2009 14:40:08 -0000	1.4
+++ gdm-2.25.2-multistack-but-boring.patch	5 Mar 2009 21:54:46 -0000	1.5
@@ -4151,8 +4151,17 @@
          iface->authenticate = gdm_session_relay_authenticate;
 diff -up gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker.c
 --- gdm-2.25.2/daemon/gdm-session-worker.c.multistack-but-boring	2008-11-18 17:19:05.000000000 -0500
-+++ gdm-2.25.2/daemon/gdm-session-worker.c	2009-03-04 21:03:53.123432737 -0500
-@@ -2568,6 +2568,28 @@ worker_dbus_filter_function (DBusConnect
++++ gdm-2.25.2/daemon/gdm-session-worker.c	2009-03-05 16:51:38.010621245 -0500
+@@ -2054,8 +2054,6 @@ do_setup (GdmSessionWorker *worker)
+         GError  *error;
+         gboolean res;
+ 
+-        worker->priv->user_settings = gdm_session_settings_new ();
+-
+         g_signal_connect_swapped (worker->priv->user_settings,
+                                   "notify::language-name",
+                                   G_CALLBACK (on_saved_language_name_read),
+@@ -2568,6 +2566,28 @@ worker_dbus_filter_function (DBusConnect
          return DBUS_HANDLER_RESULT_HANDLED;
  }
  
@@ -4181,7 +4190,7 @@
  static GObject *
  gdm_session_worker_constructor (GType                  type,
                                  guint                  n_construct_properties,
-@@ -2594,6 +2616,11 @@ gdm_session_worker_constructor (GType   
+@@ -2594,6 +2614,11 @@ gdm_session_worker_constructor (GType   
                  exit (1);
          }
  
@@ -4193,6 +4202,14 @@
          dbus_connection_setup_with_g_main (worker->priv->connection, NULL);
          dbus_connection_set_exit_on_disconnect (worker->priv->connection, TRUE);
  
+@@ -2635,6 +2660,7 @@ gdm_session_worker_init (GdmSessionWorke
+                                                            g_str_equal,
+                                                            (GDestroyNotify) g_free,
+                                                            (GDestroyNotify) g_free);
++        worker->priv->user_settings = gdm_session_settings_new ();
+ }
+ 
+ static void
 diff -up gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring gdm-2.25.2/daemon/gdm-session-worker-job.c
 --- gdm-2.25.2/daemon/gdm-session-worker-job.c.multistack-but-boring	2008-08-26 15:04:00.000000000 -0400
 +++ gdm-2.25.2/daemon/gdm-session-worker-job.c	2009-03-04 21:03:53.125433055 -0500
@@ -7183,7 +7200,7 @@
  G_END_DECLS
  
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c	2009-03-04 21:03:53.146447953 -0500
 @@ -0,0 +1,255 @@
 +/*
@@ -7442,7 +7459,7 @@
 +}
 +
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h	2009-03-04 21:03:53.147432504 -0500
 @@ -0,0 +1,61 @@
 +/*
@@ -7772,7 +7789,7 @@
  }
  
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c	2009-03-04 21:03:53.151447317 -0500
 @@ -0,0 +1,478 @@
 +/*
@@ -8254,7 +8271,7 @@
 +        return g_hash_table_lookup (manager->priv->plugins, name);
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h	2009-03-04 21:03:53.152449048 -0500
 @@ -0,0 +1,66 @@
 +/*
@@ -8324,7 +8341,7 @@
 +
 +#endif /* __GDM_PLUGIN_MANAGER_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c	2009-03-04 21:03:53.153442188 -0500
 @@ -0,0 +1,329 @@
 +/*
@@ -8657,7 +8674,7 @@
 +        return g_list_length (widget->priv->tasks);
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h	2009-03-04 21:03:53.154446921 -0500
 @@ -0,0 +1,80 @@
 +/*
@@ -8803,7 +8820,7 @@
          pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
                                             "emblem-default",
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c	2009-03-04 21:03:53.157442475 -0500
 @@ -0,0 +1,186 @@
 +/*
@@ -8993,7 +9010,7 @@
 +        return was_chosen;
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h	2009-03-04 21:03:53.158446161 -0500
 @@ -0,0 +1,93 @@
 +/*
@@ -9090,7 +9107,7 @@
 +
 +#endif /* __GDM_CONVERSATION_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c	2009-03-04 21:03:53.159446844 -0500
 @@ -0,0 +1,93 @@
 +/*
@@ -9187,7 +9204,7 @@
 +        g_signal_emit (extension, signals [LOAD_FAILED], 0, error);
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h	2009-03-04 21:03:53.160442079 -0500
 @@ -0,0 +1,55 @@
 +/*
@@ -9246,7 +9263,7 @@
 +G_END_DECLS
 +#endif /* __GDM_GREETER_EXTENSION_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in	2009-03-04 21:03:53.161442133 -0500
 @@ -0,0 +1,11 @@
 +prefix=@prefix@
@@ -9261,7 +9278,7 @@
 +Libs: -L${libdir} -lgdmsimplegreeter
 +Cflags: -I${includedir}/gdm/simple-greeter
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c	2009-03-04 21:03:53.162442257 -0500
 @@ -0,0 +1,123 @@
 +/*
@@ -9388,7 +9405,7 @@
 +                              0);
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h	2009-03-04 21:03:53.163442172 -0500
 @@ -0,0 +1,64 @@
 +/*
@@ -9456,7 +9473,7 @@
 +
 +#endif /* __GDM_TASK_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am	2009-03-04 21:03:53.164444252 -0500
 @@ -0,0 +1,48 @@
 +NULL =
@@ -9586,7 +9603,7 @@
  	$(EXTRA_GREETER_LIBS)   	\
  	$(SIMPLE_GREETER_LIBS)		\
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c	2009-03-04 21:03:53.167443367 -0500
 @@ -0,0 +1,304 @@
 +/*
@@ -9894,7 +9911,7 @@
 +        gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension));
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h	2009-03-04 21:03:53.168442094 -0500
 @@ -0,0 +1,56 @@
 +/*
@@ -9954,7 +9971,7 @@
 +
 +#endif /* GDM_FINGERPRINT_EXTENSION_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint	2009-03-04 21:03:53.169450949 -0500
 @@ -0,0 +1,10 @@
 +#%PAM-1.0
@@ -9968,7 +9985,7 @@
 +session    required    pam_namespace.so
 +session    include     system-auth
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am	2009-03-04 21:03:53.170444507 -0500
 @@ -0,0 +1,50 @@
 +NULL =
@@ -10022,7 +10039,7 @@
 +        *~                              \
 +        Makefile.in
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui	2009-03-04 21:03:53.171445819 -0500
 @@ -0,0 +1,56 @@
 +<?xml version="1.0"?>
@@ -10082,7 +10099,7 @@
 +    </object>
 +</interface>
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c	2009-03-04 21:03:53.172450483 -0500
 @@ -0,0 +1,40 @@
 +/*
@@ -10126,12 +10143,12 @@
 +        return GDM_GREETER_EXTENSION (extension);
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am	2009-03-04 21:03:53.173442226 -0500
 @@ -0,0 +1 @@
 +SUBDIRS = password
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c	2009-03-04 21:03:53.174446121 -0500
 @@ -0,0 +1,323 @@
 +/*
@@ -10458,7 +10475,7 @@
 +        gdm_password_extension_reset (GDM_CONVERSATION (extension));
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h	2009-03-04 21:03:53.175446036 -0500
 @@ -0,0 +1,56 @@
 +/*
@@ -10518,7 +10535,7 @@
 +
 +#endif /* GDM_PASSWORD_EXTENSION_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password	2009-03-04 21:03:53.176442109 -0500
 @@ -0,0 +1,13 @@
 +#%PAM-1.0
@@ -10535,7 +10552,7 @@
 +session    optional    pam_gnome_keyring.so auto_start
 +session    include     system-auth
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am	2009-03-04 21:03:53.177442234 -0500
 @@ -0,0 +1,44 @@
 +NULL =
@@ -10583,7 +10600,7 @@
 +        *~                              \
 +        Makefile.in
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui	2009-03-04 21:03:53.178442358 -0500
 @@ -0,0 +1,56 @@
 +<?xml version="1.0"?>
@@ -10643,7 +10660,7 @@
 +    </object>
 +</interface>
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c	2009-03-04 21:03:53.179446254 -0500
 @@ -0,0 +1,40 @@
 +/*
@@ -10687,7 +10704,7 @@
 +        return GDM_GREETER_EXTENSION (extension);
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c	2009-03-04 21:03:53.181445175 -0500
 @@ -0,0 +1,558 @@
 +/* gdm-smartcard.c - smartcard object
@@ -11249,7 +11266,7 @@
 +        return NULL;
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c	2009-03-04 21:03:53.182438804 -0500
 @@ -0,0 +1,440 @@
 +/*
@@ -11693,7 +11710,7 @@
 +        gdm_smartcard_extension_reset (GDM_CONVERSATION (extension));
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h	2009-03-04 21:03:53.184436468 -0500
 @@ -0,0 +1,56 @@
 +/*
@@ -11753,7 +11770,7 @@
 +
 +#endif /* GDM_SMARTCARD_EXTENSION_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h	2009-03-04 21:03:53.185432192 -0500
 @@ -0,0 +1,94 @@
 +/* securitycard.h - api for reading and writing data to a security card
@@ -11851,7 +11868,7 @@
 +G_END_DECLS
 +#endif                                /* GDM_SMARTCARD_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c	2009-03-04 21:03:53.188432285 -0500
 @@ -0,0 +1,1394 @@
 +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and
@@ -13249,7 +13266,7 @@
 +}
 +#endif
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h	2009-03-04 21:03:53.189434924 -0500
 @@ -0,0 +1,86 @@
 +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and
@@ -13339,7 +13356,7 @@
 +G_END_DECLS
 +#endif                                /* GDM_SMARTCARD_MANAGER_H */
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard	2009-03-04 21:03:53.190448876 -0500
 @@ -0,0 +1,11 @@
 +#%PAM-1.0
@@ -13354,7 +13371,7 @@
 +session    required    pam_namespace.so
 +session    include     system-auth
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c	2009-03-04 21:03:53.191446556 -0500
 @@ -0,0 +1,167 @@
 +#include "config.h"
@@ -13525,7 +13542,7 @@
 +        return 0;
 +}
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am	2009-03-04 21:03:53.192442070 -0500
 @@ -0,0 +1,71 @@
 +NULL =
@@ -13600,7 +13617,7 @@
 +        *~                              \
 +        Makefile.in
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui	2009-03-04 21:03:53.193451204 -0500
 @@ -0,0 +1,56 @@
 +<?xml version="1.0"?>
@@ -13660,7 +13677,7 @@
 +    </object>
 +</interface>
 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c
---- /dev/null	2009-03-05 04:25:32.556261885 -0500
+--- /dev/null	2009-03-05 05:52:53.556012017 -0500
 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c	2009-03-04 21:03:53.194449722 -0500
 @@ -0,0 +1,40 @@
 +/*


Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.445
retrieving revision 1.446
diff -u -r1.445 -r1.446
--- gdm.spec	5 Mar 2009 14:40:08 -0000	1.445
+++ gdm.spec	5 Mar 2009 21:54:46 -0000	1.446
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.25.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -341,6 +341,10 @@
 %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
 
 %changelog
+* Thu Mar 5 2009 Ray Strode <rstrode at redhat.com> - 1:2.25.2-12
+- Create settings object early to prevent assertion failures
+  when one pam conversation completes before another starts.
+
 * Wed Mar 4 2009 Ray Strode <rstrode at redhat.com> - 1:2.25.2-11
 - Bring back language/session/layout selector for autologin
 




More information about the fedora-extras-commits mailing list