rpms/gdm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- Reset "start session when ready" state to FALSE when starting new greeter

Browse Source 
from existing slave. May fix problem Chris Ball is seeing with language
    selection in autologin the second time after boot up.
This commit is contained in:
Ray Strode 2009-03-06 20:05:08 +00:00
parent b5bbb75e9c
commit 0be099efa7
2 changed files with 78 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
gdm-2.25.2-multistack-but-boring.patch
View File

@ -4403,7 +4403,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-worker-job.h.multistack-but-boring gdm-2.
#endif /* __GDM_SESSION_WORKER_JOB_H */ #endif /* __GDM_SESSION_WORKER_JOB_H */
diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-simple-slave.c diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/daemon/gdm-simple-slave.c
--- gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring 2009-03-04 21:03:53.057442982 -0500 --- gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring 2009-03-04 21:03:53.057442982 -0500
+++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-05 17:39:40.008530152 -0500 +++ gdm-2.25.2/daemon/gdm-simple-slave.c 2009-03-06 15:03:10.290300356 -0500
@@ -68,6 +68,8 @@ struct GdmSimpleSlavePrivate @@ -68,6 +68,8 @@ struct GdmSimpleSlavePrivate
guint greeter_reset_id; guint greeter_reset_id;
guint start_session_id; guint start_session_id;
@ -4421,7 +4421,16 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
int pid, int pid,
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
@@ -172,7 +175,6 @@ reset_session (GdmSimpleSlave *slave) @@ -165,6 +168,8 @@ destroy_session (GdmSimpleSlave *slave)
g_object_unref (slave->priv->session);
slave->priv->session = NULL;
}
+
+ slave->priv->start_session_when_ready = FALSE;
}
static void
@@ -172,7 +177,6 @@ reset_session (GdmSimpleSlave *slave)
{ {
destroy_session (slave); destroy_session (slave);
create_new_session (slave); create_new_session (slave);
@ -4429,7 +4438,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} }
static gboolean static gboolean
@@ -203,23 +205,25 @@ queue_greeter_reset (GdmSimpleSlave *sla @@ -203,23 +207,25 @@ queue_greeter_reset (GdmSimpleSlave *sla
static void static void
on_session_setup_complete (GdmSession *session, on_session_setup_complete (GdmSession *session,
@ -4458,7 +4467,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} }
static void static void
@@ -239,26 +243,30 @@ on_session_reset_failed (GdmSession @@ -239,26 +245,30 @@ on_session_reset_failed (GdmSession
static void static void
on_session_authenticated (GdmSession *session, on_session_authenticated (GdmSession *session,
@ -4493,7 +4502,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
{ {
if (slave->priv->start_session_when_ready) { if (slave->priv->start_session_when_ready) {
char *ssid; char *ssid;
@@ -279,7 +287,7 @@ gdm_simple_slave_accredit_when_ready (Gd @@ -279,7 +289,7 @@ gdm_simple_slave_accredit_when_ready (Gd
g_free (ssid); g_free (ssid);
g_free (username); g_free (username);
@ -4502,7 +4511,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} else { } else {
slave->priv->waiting_to_start_session = TRUE; slave->priv->waiting_to_start_session = TRUE;
} }
@@ -287,29 +295,31 @@ gdm_simple_slave_accredit_when_ready (Gd @@ -287,29 +297,31 @@ gdm_simple_slave_accredit_when_ready (Gd
static void static void
on_session_authorized (GdmSession *session, on_session_authorized (GdmSession *session,
@ -4539,7 +4548,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} }
static gboolean static gboolean
@@ -385,31 +395,38 @@ start_session_timeout (GdmSimpleSlave *s @@ -385,31 +397,38 @@ start_session_timeout (GdmSimpleSlave *s
g_free (auth_file); g_free (auth_file);
@ -4581,7 +4590,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
const char *message, const char *message,
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
@@ -424,6 +441,7 @@ on_session_accreditation_failed (GdmSess @@ -424,6 +443,7 @@ on_session_accreditation_failed (GdmSess
if (! migrated) { if (! migrated) {
if (slave->priv->greeter_server != NULL) { if (slave->priv->greeter_server != NULL) {
gdm_greeter_server_problem (slave->priv->greeter_server, gdm_greeter_server_problem (slave->priv->greeter_server,
@ -4589,7 +4598,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
_("Unable establish credentials")); _("Unable establish credentials"));
} }
} }
@@ -432,62 +450,67 @@ on_session_accreditation_failed (GdmSess @@ -432,62 +452,67 @@ on_session_accreditation_failed (GdmSess
when Xorg exits it switches to the VT it was when Xorg exits it switches to the VT it was
started from. That interferes with fast started from. That interferes with fast
user switching. */ user switching. */
@ -4667,7 +4676,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
if (! res) { if (! res) {
g_warning ("Unable to send ready"); g_warning ("Unable to send ready");
} }
@@ -503,8 +526,10 @@ on_session_opened (GdmSession *sessi @@ -503,8 +528,10 @@ on_session_opened (GdmSession *sessi
gdm_greeter_server_request_timed_login (slave->priv->greeter_server, username, delay); gdm_greeter_server_request_timed_login (slave->priv->greeter_server, username, delay);
} else { } else {
g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username);
@ -4679,7 +4688,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
username); username);
} }
@@ -512,6 +537,23 @@ on_session_opened (GdmSession *sessi @@ -512,6 +539,23 @@ on_session_opened (GdmSession *sessi
} }
static void static void
@ -4703,7 +4712,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
on_session_selected_user_changed (GdmSession *session, on_session_selected_user_changed (GdmSession *session,
const char *text, const char *text,
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
@@ -596,8 +638,12 @@ create_new_session (GdmSimpleSlave *slav @@ -596,8 +640,12 @@ create_new_session (GdmSimpleSlave *slav
g_free (display_hostname); g_free (display_hostname);
g_signal_connect (slave->priv->session, g_signal_connect (slave->priv->session,
@ -4718,7 +4727,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
slave); slave);
g_signal_connect (slave->priv->session, g_signal_connect (slave->priv->session,
"setup-complete", "setup-complete",
@@ -728,12 +774,29 @@ on_greeter_session_died (GdmGreeterSessi @@ -728,12 +776,29 @@ on_greeter_session_died (GdmGreeterSessi
} }
static void static void
@ -4749,7 +4758,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} }
static void static void
@@ -742,6 +805,9 @@ on_greeter_begin_auto_login (GdmGreeterS @@ -742,6 +807,9 @@ on_greeter_begin_auto_login (GdmGreeterS
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username);
@ -4759,7 +4768,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), gdm_session_setup_for_user (GDM_SESSION (slave->priv->session),
"gdm-autologin", "gdm-autologin",
username); username);
@@ -749,21 +815,29 @@ on_greeter_begin_auto_login (GdmGreeterS @@ -749,21 +817,29 @@ on_greeter_begin_auto_login (GdmGreeterS
static void static void
on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server, on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server,
@ -4791,7 +4800,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} }
static void static void
@@ -771,6 +845,9 @@ on_greeter_session_selected (GdmGreeterS @@ -771,6 +847,9 @@ on_greeter_session_selected (GdmGreeterS
const char *text, const char *text,
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
@ -4801,7 +4810,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
gdm_session_select_session (GDM_SESSION (slave->priv->session), text); gdm_session_select_session (GDM_SESSION (slave->priv->session), text);
} }
@@ -779,6 +856,9 @@ on_greeter_language_selected (GdmGreeter @@ -779,6 +858,9 @@ on_greeter_language_selected (GdmGreeter
const char *text, const char *text,
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
@ -4811,7 +4820,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
gdm_session_select_language (GDM_SESSION (slave->priv->session), text); gdm_session_select_language (GDM_SESSION (slave->priv->session), text);
} }
@@ -787,6 +867,9 @@ on_greeter_layout_selected (GdmGreeterSe @@ -787,6 +869,9 @@ on_greeter_layout_selected (GdmGreeterSe
const char *text, const char *text,
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
@ -4821,7 +4830,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
gdm_session_select_layout (GDM_SESSION (slave->priv->session), text); gdm_session_select_layout (GDM_SESSION (slave->priv->session), text);
} }
@@ -803,7 +886,11 @@ on_greeter_cancel (GdmGreeterServer *gre @@ -803,7 +888,11 @@ on_greeter_cancel (GdmGreeterServer *gre
GdmSimpleSlave *slave) GdmSimpleSlave *slave)
{ {
g_debug ("GdmSimpleSlave: Greeter cancelled"); g_debug ("GdmSimpleSlave: Greeter cancelled");
@ -4833,7 +4842,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
} }
static void static void
@@ -813,8 +900,9 @@ on_greeter_connected (GdmGreeterServer * @@ -813,8 +902,9 @@ on_greeter_connected (GdmGreeterServer *
gboolean display_is_local; gboolean display_is_local;
g_debug ("GdmSimpleSlave: Greeter connected"); g_debug ("GdmSimpleSlave: Greeter connected");
@ -4845,7 +4854,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
g_object_get (slave, g_object_get (slave,
"display-is-local", &display_is_local, "display-is-local", &display_is_local,
@@ -828,21 +916,29 @@ on_greeter_connected (GdmGreeterServer * @@ -828,21 +918,29 @@ on_greeter_connected (GdmGreeterServer *
static void static void
on_start_session_when_ready (GdmGreeterServer *session, on_start_session_when_ready (GdmGreeterServer *session,
@ -4876,7 +4885,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
slave->priv->start_session_when_ready = FALSE; slave->priv->start_session_when_ready = FALSE;
} }
@@ -850,6 +946,15 @@ static void @@ -850,6 +948,15 @@ static void
setup_server (GdmSimpleSlave *slave) setup_server (GdmSimpleSlave *slave)
{ {
/* Set the busy cursor */ /* Set the busy cursor */
@ -4892,7 +4901,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
gdm_slave_set_busy_cursor (GDM_SLAVE (slave)); gdm_slave_set_busy_cursor (GDM_SLAVE (slave));
/* The root window has a background that may be useful /* The root window has a background that may be useful
@@ -908,6 +1013,10 @@ start_greeter (GdmSimpleSlave *slave) @@ -908,6 +1015,10 @@ start_greeter (GdmSimpleSlave *slave)
slave->priv->greeter_server = gdm_greeter_server_new (display_id); slave->priv->greeter_server = gdm_greeter_server_new (display_id);
g_signal_connect (slave->priv->greeter_server, g_signal_connect (slave->priv->greeter_server,
@ -4903,7 +4912,7 @@ diff -up gdm-2.25.2/daemon/gdm-simple-slave.c.multistack-but-boring gdm-2.25.2/d
"begin-auto-login", "begin-auto-login",
G_CALLBACK (on_greeter_begin_auto_login), G_CALLBACK (on_greeter_begin_auto_login),
slave); slave);
@@ -1017,8 +1126,17 @@ idle_connect_to_display (GdmSimpleSlave @@ -1017,8 +1128,17 @@ idle_connect_to_display (GdmSimpleSlave
if (! enabled || delay > 0) { if (! enabled || delay > 0) {
start_greeter (slave); start_greeter (slave);
create_new_session (slave); create_new_session (slave);
@ -7206,7 +7215,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-login-window.h.multistack-but
G_END_DECLS G_END_DECLS
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c 2009-03-04 21:03:53.146447953 -0500
@@ -0,0 +1,255 @@ @@ -0,0 +1,255 @@
+/* +/*
@ -7465,7 +7474,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.c
+} +}
+ +
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-greeter-plugin.h 2009-03-04 21:03:53.147432504 -0500
@@ -0,0 +1,61 @@ @@ -0,0 +1,61 @@
+/* +/*
@ -7795,7 +7804,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-greeter-session.c.multistack-but-bori
} }
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c 2009-03-04 21:03:53.151447317 -0500
@@ -0,0 +1,478 @@ @@ -0,0 +1,478 @@
+/* +/*
@ -8277,7 +8286,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.c
+ return g_hash_table_lookup (manager->priv->plugins, name); + return g_hash_table_lookup (manager->priv->plugins, name);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h 2009-03-04 21:03:53.152449048 -0500
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
+/* +/*
@ -8347,7 +8356,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-plugin-manager.h
+ +
+#endif /* __GDM_PLUGIN_MANAGER_H */ +#endif /* __GDM_PLUGIN_MANAGER_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.c 2009-03-04 21:03:53.153442188 -0500
@@ -0,0 +1,329 @@ @@ -0,0 +1,329 @@
+/* +/*
@ -8680,7 +8689,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.c
+ return g_list_length (widget->priv->tasks); + return g_list_length (widget->priv->tasks);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/gdm-task-list.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500 +++ gdm-2.25.2/gui/simple-greeter/gdm-task-list.h 2009-03-04 21:03:53.154446921 -0500
@@ -0,0 +1,80 @@ @@ -0,0 +1,80 @@
+/* +/*
@ -8826,7 +8835,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/gdm-user-chooser-widget.c.multistack-but-
pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme, pixbuf = gtk_icon_theme_load_icon (widget->priv->icon_theme,
"emblem-default", "emblem-default",
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c 2009-03-04 21:03:53.157442475 -0500
@@ -0,0 +1,186 @@ @@ -0,0 +1,186 @@
+/* +/*
@ -9016,7 +9025,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-convers
+ return was_chosen; + return was_chosen;
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h 2009-03-04 21:03:53.158446161 -0500
@@ -0,0 +1,93 @@ @@ -0,0 +1,93 @@
+/* +/*
@ -9113,7 +9122,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-convers
+ +
+#endif /* __GDM_CONVERSATION_H */ +#endif /* __GDM_CONVERSATION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c 2009-03-04 21:03:53.159446844 -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 @@ @@ -0,0 +1,93 @@
+/* +/*
@ -9210,7 +9219,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter
+ g_signal_emit (extension, signals [LOAD_FAILED], 0, error); + 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 diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h 2009-03-04 21:03:53.160442079 -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 @@ @@ -0,0 +1,55 @@
+/* +/*
@ -9269,7 +9278,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter
+G_END_DECLS +G_END_DECLS
+#endif /* __GDM_GREETER_EXTENSION_H */ +#endif /* __GDM_GREETER_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in 2009-03-04 21:03:53.161442133 -0500
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+prefix=@prefix@ +prefix=@prefix@
@ -9284,7 +9293,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegr
+Libs: -L${libdir} -lgdmsimplegreeter +Libs: -L${libdir} -lgdmsimplegreeter
+Cflags: -I${includedir}/gdm/simple-greeter +Cflags: -I${includedir}/gdm/simple-greeter
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c 2009-03-04 21:03:53.162442257 -0500
@@ -0,0 +1,123 @@ @@ -0,0 +1,123 @@
+/* +/*
@ -9411,7 +9420,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c
+ 0); + 0);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h 2009-03-04 21:03:53.163442172 -0500
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+/* +/*
@ -9479,7 +9488,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h
+ +
+#endif /* __GDM_TASK_H */ +#endif /* __GDM_TASK_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500 +++ gdm-2.25.2/gui/simple-greeter/libgdmsimplegreeter/Makefile.am 2009-03-04 21:03:53.164444252 -0500
@@ -0,0 +1,48 @@ @@ -0,0 +1,48 @@
+NULL = +NULL =
@ -9609,7 +9618,7 @@ diff -up gdm-2.25.2/gui/simple-greeter/Makefile.am.multistack-but-boring gdm-2.2
$(EXTRA_GREETER_LIBS) \ $(EXTRA_GREETER_LIBS) \
$(SIMPLE_GREETER_LIBS) \ $(SIMPLE_GREETER_LIBS) \
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c 2009-03-04 21:03:53.167443367 -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 @@ @@ -0,0 +1,304 @@
+/* +/*
@ -9917,7 +9926,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerp
+ gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension)); + gdm_fingerprint_extension_reset (GDM_CONVERSATION (extension));
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h 2009-03-04 21:03:53.168442094 -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 @@ @@ -0,0 +1,56 @@
+/* +/*
@ -9977,7 +9986,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerp
+ +
+#endif /* GDM_FINGERPRINT_EXTENSION_H */ +#endif /* GDM_FINGERPRINT_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint 2009-03-04 21:03:53.169450949 -0500
@@ -0,0 +1,10 @@ @@ -0,0 +1,10 @@
+#%PAM-1.0 +#%PAM-1.0
@ -9991,7 +10000,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/gdm-fingerp
+session required pam_namespace.so +session required pam_namespace.so
+session include system-auth +session include system-auth
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am 2009-03-04 21:03:53.170444507 -0500
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
+NULL = +NULL =
@ -10045,7 +10054,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/Makefile.am
+ *~ \ + *~ \
+ Makefile.in + Makefile.in
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui 2009-03-04 21:03:53.171445819 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
@ -10105,7 +10114,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/page.ui
+ </object> + </object>
+</interface> +</interface>
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c 2009-03-04 21:03:53.172450483 -0500
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*
@ -10149,12 +10158,12 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/fingerprint/plugin.c
+ return GDM_GREETER_EXTENSION (extension); + return GDM_GREETER_EXTENSION (extension);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/Makefile.am 2009-03-04 21:03:53.173442226 -0500
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+SUBDIRS = password +SUBDIRS = password
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.c 2009-03-04 21:03:53.174446121 -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 @@ @@ -0,0 +1,323 @@
+/* +/*
@ -10481,7 +10490,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-e
+ gdm_password_extension_reset (GDM_CONVERSATION (extension)); + gdm_password_extension_reset (GDM_CONVERSATION (extension));
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-extension.h 2009-03-04 21:03:53.175446036 -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 @@ @@ -0,0 +1,56 @@
+/* +/*
@ -10541,7 +10550,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password-e
+ +
+#endif /* GDM_PASSWORD_EXTENSION_H */ +#endif /* GDM_PASSWORD_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password 2009-03-04 21:03:53.176442109 -0500
@@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
+#%PAM-1.0 +#%PAM-1.0
@ -10558,7 +10567,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/gdm-password
+session optional pam_gnome_keyring.so auto_start +session optional pam_gnome_keyring.so auto_start
+session include system-auth +session include system-auth
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am 2009-03-04 21:03:53.177442234 -0500
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+NULL = +NULL =
@ -10606,7 +10615,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/Makefile.am
+ *~ \ + *~ \
+ Makefile.in + Makefile.in
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui 2009-03-04 21:03:53.178442358 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
@ -10666,7 +10675,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/page.ui
+ </object> + </object>
+</interface> +</interface>
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c 2009-03-04 21:03:53.179446254 -0500
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*
@ -10710,7 +10719,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/password/plugin.c
+ return GDM_GREETER_EXTENSION (extension); + return GDM_GREETER_EXTENSION (extension);
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c 2009-03-04 21:03:53.181445175 -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 @@ @@ -0,0 +1,558 @@
+/* gdm-smartcard.c - smartcard object +/* gdm-smartcard.c - smartcard object
@ -11272,7 +11281,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ return NULL; + return NULL;
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c 2009-03-04 21:03:53.182438804 -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 @@ @@ -0,0 +1,440 @@
+/* +/*
@ -11716,7 +11725,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ gdm_smartcard_extension_reset (GDM_CONVERSATION (extension)); + gdm_smartcard_extension_reset (GDM_CONVERSATION (extension));
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h 2009-03-04 21:03:53.184436468 -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 @@ @@ -0,0 +1,56 @@
+/* +/*
@ -11776,7 +11785,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ +
+#endif /* GDM_SMARTCARD_EXTENSION_H */ +#endif /* GDM_SMARTCARD_EXTENSION_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h 2009-03-04 21:03:53.185432192 -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 @@ @@ -0,0 +1,94 @@
+/* securitycard.h - api for reading and writing data to a security card +/* securitycard.h - api for reading and writing data to a security card
@ -11874,7 +11883,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+G_END_DECLS +G_END_DECLS
+#endif /* GDM_SMARTCARD_H */ +#endif /* GDM_SMARTCARD_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c 2009-03-04 21:03:53.188432285 -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 @@ @@ -0,0 +1,1394 @@
+/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and +/* gdm-smartcard-manager.c - object for monitoring smartcard insertion and
@ -13272,7 +13281,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+} +}
+#endif +#endif
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h 2009-03-04 21:03:53.189434924 -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 @@ @@ -0,0 +1,86 @@
+/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and +/* gdm-smartcard-manager.h - object for monitoring smartcard insertion and
@ -13362,7 +13371,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+G_END_DECLS +G_END_DECLS
+#endif /* GDM_SMARTCARD_MANAGER_H */ +#endif /* GDM_SMARTCARD_MANAGER_H */
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard 2009-03-04 21:03:53.190448876 -0500
@@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
+#%PAM-1.0 +#%PAM-1.0
@ -13377,7 +13386,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+session required pam_namespace.so +session required pam_namespace.so
+session include system-auth +session include system-auth
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c 2009-03-04 21:03:53.191446556 -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 @@ @@ -0,0 +1,167 @@
+#include "config.h" +#include "config.h"
@ -13548,7 +13557,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/gdm-smartcard
+ return 0; + return 0;
+} +}
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am 2009-03-04 21:03:53.192442070 -0500
@@ -0,0 +1,71 @@ @@ -0,0 +1,71 @@
+NULL = +NULL =
@ -13623,7 +13632,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/Makefile.am
+ *~ \ + *~ \
+ Makefile.in + Makefile.in
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui 2009-03-04 21:03:53.193451204 -0500
@@ -0,0 +1,56 @@ @@ -0,0 +1,56 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
@ -13683,7 +13692,7 @@ diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/page.ui
+ </object> + </object>
+</interface> +</interface>
diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c diff -up /dev/null gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c
--- /dev/null 2009-03-05 12:25:58.550012246 -0500 --- /dev/null 2009-03-06 04:28:12.547006661 -0500
+++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500 +++ gdm-2.25.2/gui/simple-greeter/plugins/smartcard/plugin.c 2009-03-04 21:03:53.194449722 -0500
@@ -0,0 +1,40 @@ @@ -0,0 +1,40 @@
+/* +/*

8
gdm.spec
View File

@ -15,7 +15,7 @@
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
Name: gdm Name: gdm
Version: 2.25.2 Version: 2.25.2
Release: 13%{?dist} Release: 14%{?dist}
Epoch: 1 Epoch: 1
License: GPLv2+ License: GPLv2+
Group: User Interface/X Group: User Interface/X
@ -341,6 +341,12 @@ fi
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml %{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
%changelog %changelog
* Fri Mar 6 2009 Ray Strode <rstrode@redhat.com> - 1:2.25.2-14
- Reset "start session when ready" state to FALSE when starting
new greeter from existing slave. May fix problem Chris Ball
is seeing with language selection in autologin the second time
after boot up.
* Thu Mar 5 2009 Ray Strode <rstrode@redhat.com> - 1:2.25.2-13 * Thu Mar 5 2009 Ray Strode <rstrode@redhat.com> - 1:2.25.2-13
- 2.25.2-10 fixes were actually only for timed login. - 2.25.2-10 fixes were actually only for timed login.
Add same fix for auto login Add same fix for auto login