rpms/gdm/devel xklavier-fix.patch, NONE, 1.1 fix-boot.patch, 1.2, 1.3 gdm-multistack.patch, 1.3, 1.4 gdm.spec, 1.499, 1.500
Ray Strode
rstrode at fedoraproject.org
Wed Jan 27 02:09:59 UTC 2010
Author: rstrode
Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12381
Modified Files:
fix-boot.patch gdm-multistack.patch gdm.spec
Added Files:
xklavier-fix.patch
Log Message:
- Update to 2.29.5
xklavier-fix.patch:
gdm-session-direct.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE xklavier-fix.patch ---
>From 51669cb03613b36b0b1798b1f8d2bba85b3e2a49 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Mon, 18 Jan 2010 16:09:58 +0100
Subject: [PATCH] Fix crash in getting system keyboard layout
In get_system_default_layout(), use a static variable for
xkl_engine_get_instance() result, and don't close the X Display.
This fixes the crash that happens at the second call of
get_system_default_layout(): xkl_engine_get_instance() returns a singleton
which saves the passed X Display instance, so we must never close it.
https://launchpad.net/bugs/505972
---
daemon/gdm-session-direct.c | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 011a919..d2e1a83 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -601,16 +601,19 @@ get_default_language_name (GdmSessionDirect *session)
static char *
get_system_default_layout (GdmSessionDirect *session)
{
- char *result;
- Display *display;
+ char *result = NULL;
+ static XklEngine *engine = NULL;
- result = NULL;
- display = XOpenDisplay (session->priv->display_name);
- if (display) {
- XklConfigRec *config;
- XklEngine *engine = xkl_engine_get_instance (display);
- if (engine)
- {
+ if (engine == NULL) {
+ Display *display = XOpenDisplay (session->priv->display_name);
+ if (display != NULL) {
+ engine = xkl_engine_get_instance (display);
+ }
+ /* do NOT call XCloseDisplay (display) here;
+ * xkl_engine_get_instance() is a singleton which saves the display */
+ }
+
+ if (engine != NULL) {
XklConfigRec *config = xkl_config_rec_new ();
if (xkl_config_rec_get_from_server (config, engine) && config->layouts && config->layouts[0]) {
if (config->variants && config->variants[0] && config->variants[0][0])
@@ -619,8 +622,6 @@ get_system_default_layout (GdmSessionDirect *session)
result = g_strdup (config->layouts[0]);
}
g_object_unref (config);
- }
- XCloseDisplay (display);
}
if (!result)
--
1.6.6
fix-boot.patch:
daemon/Makefile.am | 1 +
daemon/gdm-simple-slave.c | 13 +++++++++++--
daemon/gdm-simple-slave.h | 3 ++-
daemon/gdm-slave.c | 23 +++++++++++++++++++++++
daemon/gdm-static-display.c | 17 +++++++++++++++++
daemon/simple-slave-main.c | 4 +++-
data/Makefile.am | 7 +++++++
7 files changed, 64 insertions(+), 4 deletions(-)
Index: fix-boot.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/fix-boot.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- fix-boot.patch 14 Jan 2010 21:24:19 -0000 1.2
+++ fix-boot.patch 27 Jan 2010 02:09:58 -0000 1.3
@@ -1,6 +1,7 @@
-diff -up gdm-2.29.4/daemon/gdm-simple-slave.c.fix-boot gdm-2.29.4/daemon/gdm-simple-slave.c
---- gdm-2.29.4/daemon/gdm-simple-slave.c.fix-boot 2010-01-14 16:10:58.507800165 -0500
-+++ gdm-2.29.4/daemon/gdm-simple-slave.c 2010-01-14 16:10:58.543800532 -0500
+
+diff -up gdm-2.29.5/daemon/gdm-simple-slave.c.fix-boot gdm-2.29.5/daemon/gdm-simple-slave.c
+--- gdm-2.29.5/daemon/gdm-simple-slave.c.fix-boot 2010-01-26 17:34:33.980834884 -0500
++++ gdm-2.29.5/daemon/gdm-simple-slave.c 2010-01-26 17:34:34.027782630 -0500
@@ -91,6 +91,7 @@ struct GdmSimpleSlavePrivate
enum {
@@ -9,7 +10,7 @@ diff -up gdm-2.29.4/daemon/gdm-simple-sl
};
static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass);
-@@ -1321,11 +1322,13 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
+@@ -1327,11 +1328,13 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
char *display_name;
char *auth_file;
gboolean display_is_local;
@@ -23,7 +24,7 @@ diff -up gdm-2.29.4/daemon/gdm-simple-sl
NULL);
/* if this is local display start a server if one doesn't
-@@ -1363,7 +1366,11 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
+@@ -1369,7 +1372,11 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
plymouth_prepare_for_transition (slave);
res = gdm_server_start_on_active_vt (slave->priv->server);
} else {
@@ -36,7 +37,7 @@ diff -up gdm-2.29.4/daemon/gdm-simple-sl
}
if (! res) {
g_warning (_("Could not start the X "
-@@ -1515,12 +1522,14 @@ gdm_simple_slave_finalize (GObject *obje
+@@ -1521,12 +1528,14 @@ gdm_simple_slave_finalize (GObject *obje
}
GdmSlave *
@@ -52,9 +53,9 @@ diff -up gdm-2.29.4/daemon/gdm-simple-sl
NULL);
return GDM_SLAVE (object);
-diff -up gdm-2.29.4/daemon/gdm-simple-slave.h.fix-boot gdm-2.29.4/daemon/gdm-simple-slave.h
---- gdm-2.29.4/daemon/gdm-simple-slave.h.fix-boot 2009-12-08 10:20:18.000000000 -0500
-+++ gdm-2.29.4/daemon/gdm-simple-slave.h 2010-01-14 16:10:58.543800532 -0500
+diff -up gdm-2.29.5/daemon/gdm-simple-slave.h.fix-boot gdm-2.29.5/daemon/gdm-simple-slave.h
+--- gdm-2.29.5/daemon/gdm-simple-slave.h.fix-boot 2009-12-08 10:20:18.000000000 -0500
++++ gdm-2.29.5/daemon/gdm-simple-slave.h 2010-01-26 17:34:34.027782630 -0500
@@ -48,7 +48,8 @@ typedef struct
} GdmSimpleSlaveClass;
@@ -65,9 +66,9 @@ diff -up gdm-2.29.4/daemon/gdm-simple-sl
G_END_DECLS
-diff -up gdm-2.29.4/daemon/gdm-slave.c.fix-boot gdm-2.29.4/daemon/gdm-slave.c
---- gdm-2.29.4/daemon/gdm-slave.c.fix-boot 2010-01-14 16:10:58.280770006 -0500
-+++ gdm-2.29.4/daemon/gdm-slave.c 2010-01-14 16:10:58.544770030 -0500
+diff -up gdm-2.29.5/daemon/gdm-slave.c.fix-boot gdm-2.29.5/daemon/gdm-slave.c
+--- gdm-2.29.5/daemon/gdm-slave.c.fix-boot 2010-01-26 17:34:33.777750861 -0500
++++ gdm-2.29.5/daemon/gdm-slave.c 2010-01-26 17:46:49.256752923 -0500
@@ -84,6 +84,7 @@ struct GdmSlavePrivate
char *display_hostname;
gboolean display_is_local;
@@ -84,7 +85,7 @@ diff -up gdm-2.29.4/daemon/gdm-slave.c.f
PROP_DISPLAY_SEAT_ID,
PROP_DISPLAY_X11_AUTHORITY_FILE
};
-@@ -1404,6 +1406,13 @@ _gdm_slave_set_display_is_local (GdmSlav
+@@ -1402,6 +1404,13 @@ _gdm_slave_set_display_is_local (GdmSlav
}
static void
@@ -98,7 +99,7 @@ diff -up gdm-2.29.4/daemon/gdm-slave.c.f
gdm_slave_set_property (GObject *object,
guint prop_id,
const GValue *value,
-@@ -1435,6 +1444,9 @@ gdm_slave_set_property (GObject *ob
+@@ -1433,6 +1442,9 @@ gdm_slave_set_property (GObject *ob
case PROP_DISPLAY_IS_LOCAL:
_gdm_slave_set_display_is_local (self, g_value_get_boolean (value));
break;
@@ -108,7 +109,7 @@ diff -up gdm-2.29.4/daemon/gdm-slave.c.f
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-@@ -1473,6 +1485,9 @@ gdm_slave_get_property (GObject *obje
+@@ -1471,6 +1483,9 @@ gdm_slave_get_property (GObject *obje
case PROP_DISPLAY_IS_LOCAL:
g_value_set_boolean (value, self->priv->display_is_local);
break;
@@ -118,9 +119,24 @@ diff -up gdm-2.29.4/daemon/gdm-slave.c.f
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
-diff -up gdm-2.29.4/daemon/gdm-static-display.c.fix-boot gdm-2.29.4/daemon/gdm-static-display.c
---- gdm-2.29.4/daemon/gdm-static-display.c.fix-boot 2009-12-17 09:20:42.000000000 -0500
-+++ gdm-2.29.4/daemon/gdm-static-display.c 2010-01-14 16:10:58.545800295 -0500
+@@ -1595,6 +1610,14 @@ gdm_slave_class_init (GdmSlaveClass *kla
+ "display is local",
+ TRUE,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
++ g_object_class_install_property (object_class,
++ PROP_FORCE_ACTIVE_VT,
++ g_param_spec_boolean ("force-active-vt",
++ "Force Active VT",
++ "Force display to active VT",
++ TRUE,
++ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
++
+
+ signals [STOPPED] =
+ g_signal_new ("stopped",
+diff -up gdm-2.29.5/daemon/gdm-static-display.c.fix-boot gdm-2.29.5/daemon/gdm-static-display.c
+--- gdm-2.29.5/daemon/gdm-static-display.c.fix-boot 2009-12-17 09:20:42.000000000 -0500
++++ gdm-2.29.5/daemon/gdm-static-display.c 2010-01-26 17:34:34.029750726 -0500
@@ -86,10 +86,27 @@ gdm_static_display_remove_user_authoriza
}
@@ -149,9 +165,9 @@ diff -up gdm-2.29.4/daemon/gdm-static-di
GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->manage (display);
return TRUE;
-diff -up gdm-2.29.4/daemon/Makefile.am.fix-boot gdm-2.29.4/daemon/Makefile.am
---- gdm-2.29.4/daemon/Makefile.am.fix-boot 2010-01-14 16:16:26.262770051 -0500
-+++ gdm-2.29.4/daemon/Makefile.am 2010-01-14 16:17:35.998771692 -0500
+diff -up gdm-2.29.5/daemon/Makefile.am.fix-boot gdm-2.29.5/daemon/Makefile.am
+--- gdm-2.29.5/daemon/Makefile.am.fix-boot 2010-01-12 15:30:45.000000000 -0500
++++ gdm-2.29.5/daemon/Makefile.am 2010-01-26 17:34:34.029750726 -0500
@@ -14,6 +14,7 @@ AM_CPPFLAGS = \
-DLOGDIR=\"$(logdir)\" \
-DSBINDIR=\"$(sbindir)\" \
@@ -160,9 +176,9 @@ diff -up gdm-2.29.4/daemon/Makefile.am.f
-DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \
-DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \
-DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \
-diff -up gdm-2.29.4/daemon/simple-slave-main.c.fix-boot gdm-2.29.4/daemon/simple-slave-main.c
---- gdm-2.29.4/daemon/simple-slave-main.c.fix-boot 2009-12-21 11:36:30.000000000 -0500
-+++ gdm-2.29.4/daemon/simple-slave-main.c 2010-01-14 16:10:58.545800295 -0500
+diff -up gdm-2.29.5/daemon/simple-slave-main.c.fix-boot gdm-2.29.5/daemon/simple-slave-main.c
+--- gdm-2.29.5/daemon/simple-slave-main.c.fix-boot 2010-01-12 11:36:37.000000000 -0500
++++ gdm-2.29.5/daemon/simple-slave-main.c 2010-01-26 17:34:34.029750726 -0500
@@ -178,9 +178,11 @@ main (int argc,
DBusGConnection *connection;
GdmSlave *slave;
@@ -184,9 +200,9 @@ diff -up gdm-2.29.4/daemon/simple-slave-
if (slave == NULL) {
goto out;
}
-diff -up gdm-2.29.4/data/Makefile.am.fix-boot gdm-2.29.4/data/Makefile.am
---- gdm-2.29.4/data/Makefile.am.fix-boot 2009-12-21 11:36:30.000000000 -0500
-+++ gdm-2.29.4/data/Makefile.am 2010-01-14 16:10:58.546769600 -0500
+diff -up gdm-2.29.5/data/Makefile.am.fix-boot gdm-2.29.5/data/Makefile.am
+--- gdm-2.29.5/data/Makefile.am.fix-boot 2010-01-13 09:44:40.000000000 -0500
++++ gdm-2.29.5/data/Makefile.am 2010-01-26 17:34:34.030752200 -0500
@@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession
postlogindir = $(gdmconfdir)/PostLogin
workingdir = $(GDM_WORKING_DIR)
@@ -195,7 +211,7 @@ diff -up gdm-2.29.4/data/Makefile.am.fix
screenshotdir = $(GDM_SCREENSHOT_DIR)
cachedir = $(localstatedir)/cache/gdm
-@@ -125,6 +126,7 @@ uninstall-hook:
+@@ -129,6 +130,7 @@ uninstall-hook:
$(DESTDIR)$(workingdir)/.gconf.mandatory \
$(DESTDIR)$(screenshotdir) \
$(DESTDIR)$(xauthdir)
@@ -203,7 +219,7 @@ diff -up gdm-2.29.4/data/Makefile.am.fix
install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path
if test '!' -d $(DESTDIR)$(gdmconfdir); then \
-@@ -217,6 +219,11 @@ install-data-hook: gdm.conf-custom Xsess
+@@ -221,6 +223,11 @@ install-data-hook: gdm.conf-custom Xsess
chmod 1770 $(DESTDIR)$(workingdir); \
chown root:gdm $(DESTDIR)$(workingdir) || : ; \
fi
gdm-multistack.patch:
b/common/gdm-marshal.list | 1
b/configure.ac | 44
b/daemon/gdm-factory-slave.c | 13
b/daemon/gdm-greeter-server.c | 53
b/daemon/gdm-greeter-server.h | 5
b/daemon/gdm-product-slave.c | 47
b/daemon/gdm-session-direct.c | 322 +-
b/daemon/gdm-session-private.h | 3
b/daemon/gdm-session-relay.c | 29
b/daemon/gdm-session-worker-job.c | 7
b/daemon/gdm-session-worker-job.h | 2
b/daemon/gdm-session-worker.c | 27
b/daemon/gdm-session-worker.h | 2
b/daemon/gdm-session.c | 20
b/daemon/gdm-session.h | 9
b/daemon/gdm-simple-slave.c | 3
b/daemon/test-session.c | 14
b/gui/simple-greeter/Makefile.am | 4
b/gui/simple-greeter/gdm-chooser-widget.c | 8
b/gui/simple-greeter/gdm-chooser-widget.h | 3
b/gui/simple-greeter/gdm-greeter-client.c | 18
b/gui/simple-greeter/gdm-greeter-client.h | 4
b/gui/simple-greeter/gdm-greeter-login-window.c | 91
b/gui/simple-greeter/gdm-greeter-login-window.h | 11
b/gui/simple-greeter/gdm-greeter-login-window.ui | 42
b/gui/simple-greeter/gdm-greeter-plugin.c | 255 +
b/gui/simple-greeter/gdm-greeter-plugin.h | 61
b/gui/simple-greeter/gdm-greeter-session.c | 5
b/gui/simple-greeter/gdm-plugin-manager.c | 478 +++
b/gui/simple-greeter/gdm-plugin-manager.h | 66
b/gui/simple-greeter/gdm-task-list.c | 198 +
b/gui/simple-greeter/gdm-task-list.h | 65
b/gui/simple-greeter/gdm-user-chooser-widget.c | 23
b/gui/simple-greeter/libgdmsimplegreeter/Makefile.am | 46
b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c | 147 +
b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h | 87
b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.c | 93
b/gui/simple-greeter/libgdmsimplegreeter/gdm-greeter-extension.h | 55
b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.c | 117
b/gui/simple-greeter/libgdmsimplegreeter/gdm-task.h | 62
b/gui/simple-greeter/libgdmsimplegreeter/gdmsimplegreeter.pc.in | 11
b/gui/simple-greeter/plugins/Makefile.am | 1
b/gui/simple-greeter/plugins/fingerprint/Makefile.am | 56
b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c | 299 ++
b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.h | 56
b/gui/simple-greeter/plugins/fingerprint/gdm-fingerprint.pam | 17
b/gui/simple-greeter/plugins/fingerprint/icons/16x16/Makefile.am | 5
b/gui/simple-greeter/plugins/fingerprint/icons/48x48/Makefile.am | 5
b/gui/simple-greeter/plugins/fingerprint/icons/Makefile.am | 1
b/gui/simple-greeter/plugins/fingerprint/page.ui | 56
b/gui/simple-greeter/plugins/fingerprint/plugin.c | 41
b/gui/simple-greeter/plugins/password/Makefile.am | 53
b/gui/simple-greeter/plugins/password/gdm-password-extension.c | 314 ++
b/gui/simple-greeter/plugins/password/gdm-password-extension.h | 56
b/gui/simple-greeter/plugins/password/gdm-password.pam | 19
b/gui/simple-greeter/plugins/password/page.ui | 56
b/gui/simple-greeter/plugins/password/plugin.c | 40
b/gui/simple-greeter/plugins/smartcard/Makefile.am | 77
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 418 ++
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.h | 56
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.c | 1394 ++++++++++
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-manager.h | 86
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-worker.c | 167 +
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.c | 558 ++++
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.h | 94
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard.pam | 18
b/gui/simple-greeter/plugins/smartcard/icons/16x16/Makefile.am | 5
b/gui/simple-greeter/plugins/smartcard/icons/48x48/Makefile.am | 5
b/gui/simple-greeter/plugins/smartcard/icons/Makefile.am | 1
b/gui/simple-greeter/plugins/smartcard/page.ui | 56
b/gui/simple-greeter/plugins/smartcard/plugin.c | 40
b/po/POTFILES.in | 2
configure.ac | 15
daemon/gdm-factory-slave.c | 103
daemon/gdm-greeter-server.c | 142 -
daemon/gdm-greeter-server.h | 21
daemon/gdm-product-slave.c | 263 +
daemon/gdm-session-direct.c | 815 ++++-
daemon/gdm-session-private.h | 31
daemon/gdm-session-relay.c | 223 +
daemon/gdm-session-worker-job.c | 66
daemon/gdm-session-worker-job.h | 4
daemon/gdm-session-worker.c | 61
daemon/gdm-session.c | 250 +
daemon/gdm-session.h | 62
daemon/gdm-simple-slave.c | 241 +
daemon/test-session.c | 22
gui/simple-greeter/Makefile.am | 15
gui/simple-greeter/gdm-greeter-client.c | 229 +
gui/simple-greeter/gdm-greeter-client.h | 21
gui/simple-greeter/gdm-greeter-login-window.c | 1157 ++++++--
gui/simple-greeter/gdm-greeter-login-window.h | 24
gui/simple-greeter/gdm-greeter-session.c | 148 -
gui/simple-greeter/gdm-task-list.c | 268 +
gui/simple-greeter/gdm-task-list.h | 40
gui/simple-greeter/gdm-user-chooser-widget.c | 9
gui/simple-greeter/libgdmsimplegreeter/Makefile.am | 2
gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c | 51
gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h | 13
gui/simple-greeter/libgdmsimplegreeter/gdm-task.c | 12
gui/simple-greeter/libgdmsimplegreeter/gdm-task.h | 5
gui/simple-greeter/plugins/Makefile.am | 4
gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c | 54
gui/simple-greeter/plugins/password/gdm-password-extension.c | 15
gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 62
po/POTFILES.in | 2
106 files changed, 9876 insertions(+), 1177 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.3 -r 1.4 gdm-multistack.patchIndex: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-multistack.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdm-multistack.patch 3 Dec 2009 05:05:23 -0000 1.3
+++ gdm-multistack.patch 27 Jan 2010 02:09:58 -0000 1.4
@@ -1,7 +1,7 @@
-From fd73f04cae7990b317c9ee434e4c9dfd12a11732 Mon Sep 17 00:00:00 2001
+From 61fb36fe30a4781e4b4fce7d11fa8eec567463ac Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 01/51] Drop session "Open" in favor of "StartConversation"
+Subject: [PATCH 01/50] Drop session "Open" in favor of "StartConversation"
We want to eventually support having multiple
simultaneous PAM conversations in one login
@@ -154,10 +154,10 @@ index 9adcb09..15a2820 100644
on_relay_cancelled (slave, message);
} else {
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 2d711b1..5edbfeb 100644
+index bb85393..ba7a90e 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
-@@ -61,6 +61,16 @@
+@@ -66,6 +66,16 @@
#define GDM_SESSION_DEFAULT_PATH "/usr/local/bin:/usr/bin:/bin"
#endif
@@ -174,7 +174,7 @@ index 2d711b1..5edbfeb 100644
struct _GdmSessionDirectPrivate
{
/* per open scope */
-@@ -73,8 +83,7 @@ struct _GdmSessionDirectPrivate
+@@ -78,8 +88,7 @@ struct _GdmSessionDirectPrivate
char *selected_user;
char *user_x11_authority_file;
@@ -184,7 +184,7 @@ index 2d711b1..5edbfeb 100644
GdmSessionWorkerJob *job;
GPid session_pid;
-@@ -115,39 +124,39 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionDirect,
+@@ -120,39 +129,39 @@ G_DEFINE_TYPE_WITH_CODE (GdmSessionDirect,
gdm_session_iface_init))
static gboolean
@@ -231,7 +231,7 @@ index 2d711b1..5edbfeb 100644
message = dbus_message_new_signal (GDM_SESSION_DBUS_PATH,
GDM_SESSION_DBUS_INTERFACE,
-@@ -156,7 +165,7 @@ send_dbus_string_signal (GdmSessionDirect *session,
+@@ -161,7 +170,7 @@ send_dbus_string_signal (GdmSessionDirect *session,
dbus_message_iter_init_append (message, &iter);
dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &text);
@@ -240,7 +240,7 @@ index 2d711b1..5edbfeb 100644
g_debug ("GdmSessionDirect: Could not send %s signal",
name ? name : "(null)");
}
-@@ -165,18 +174,18 @@ send_dbus_string_signal (GdmSessionDirect *session,
+@@ -170,18 +179,18 @@ send_dbus_string_signal (GdmSessionDirect *session,
}
static void
@@ -263,7 +263,7 @@ index 2d711b1..5edbfeb 100644
g_debug ("GdmSessionDirect: Could not send %s signal", name);
}
-@@ -188,22 +197,32 @@ on_authentication_failed (GdmSession *session,
+@@ -193,22 +202,32 @@ on_authentication_failed (GdmSession *session,
const char *message)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -306,7 +306,7 @@ index 2d711b1..5edbfeb 100644
}
static void
-@@ -211,11 +230,16 @@ on_session_start_failed (GdmSession *session,
+@@ -216,11 +235,16 @@ on_session_start_failed (GdmSession *session,
const char *message)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -328,7 +328,7 @@ index 2d711b1..5edbfeb 100644
}
static void
-@@ -223,6 +247,7 @@ on_session_exited (GdmSession *session,
+@@ -228,6 +252,7 @@ on_session_exited (GdmSession *session,
int exit_code)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -336,7 +336,7 @@ index 2d711b1..5edbfeb 100644
gdm_session_record_logout (impl->priv->session_pid,
impl->priv->selected_user,
impl->priv->display_hostname,
-@@ -731,54 +756,52 @@ gdm_session_direct_handle_username_changed (GdmSessionDirect *session,
+@@ -770,54 +795,52 @@ gdm_session_direct_handle_username_changed (GdmSessionDirect *session,
}
static void
@@ -408,7 +408,7 @@ index 2d711b1..5edbfeb 100644
}
static DBusHandlerResult
-@@ -788,6 +811,9 @@ gdm_session_direct_handle_info_query (GdmSessionDirect *session,
+@@ -827,6 +850,9 @@ gdm_session_direct_handle_info_query (GdmSessionDirect *session,
{
DBusError error;
const char *text;
@@ -418,7 +418,7 @@ index 2d711b1..5edbfeb 100644
dbus_error_init (&error);
if (! dbus_message_get_args (message, &error,
-@@ -796,7 +822,7 @@ gdm_session_direct_handle_info_query (GdmSessionDirect *session,
+@@ -835,7 +861,7 @@ gdm_session_direct_handle_info_query (GdmSessionDirect *session,
g_warning ("ERROR: %s", error.message);
}
@@ -427,7 +427,7 @@ index 2d711b1..5edbfeb 100644
g_debug ("GdmSessionDirect: Emitting 'info-query' signal");
_gdm_session_info_query (GDM_SESSION (session), text);
-@@ -811,6 +837,9 @@ gdm_session_direct_handle_secret_info_query (GdmSessionDirect *session,
+@@ -850,6 +876,9 @@ gdm_session_direct_handle_secret_info_query (GdmSessionDirect *session,
{
DBusError error;
const char *text;
@@ -437,7 +437,7 @@ index 2d711b1..5edbfeb 100644
dbus_error_init (&error);
if (! dbus_message_get_args (message, &error,
-@@ -819,7 +848,7 @@ gdm_session_direct_handle_secret_info_query (GdmSessionDirect *session,
+@@ -858,7 +887,7 @@ gdm_session_direct_handle_secret_info_query (GdmSessionDirect *session,
g_warning ("ERROR: %s", error.message);
}
@@ -446,7 +446,7 @@ index 2d711b1..5edbfeb 100644
g_debug ("GdmSessionDirect: Emitting 'secret-info-query' signal");
_gdm_session_secret_info_query (GDM_SESSION (session), text);
-@@ -859,9 +888,13 @@ gdm_session_direct_handle_cancel_pending_query (GdmSessionDirect *session,
+@@ -898,9 +927,13 @@ gdm_session_direct_handle_cancel_pending_query (GdmSessionDirect *session,
DBusMessage *message)
{
DBusMessage *reply;
@@ -461,7 +461,7 @@ index 2d711b1..5edbfeb 100644
reply = dbus_message_new_method_return (message);
dbus_connection_send (connection, reply, NULL);
-@@ -1427,16 +1460,18 @@ handle_connection (DBusServer *server,
+@@ -1466,16 +1499,18 @@ handle_connection (DBusServer *server,
void *user_data)
{
GdmSessionDirect *session = GDM_SESSION_DIRECT (user_data);
@@ -482,7 +482,7 @@ index 2d711b1..5edbfeb 100644
dbus_connection_ref (new_connection);
dbus_connection_setup_with_g_main (new_connection, NULL);
-@@ -1453,8 +1488,9 @@ handle_connection (DBusServer *server,
+@@ -1492,8 +1527,9 @@ handle_connection (DBusServer *server,
&vtable,
session);
@@ -494,7 +494,7 @@ index 2d711b1..5edbfeb 100644
}
}
-@@ -1524,8 +1560,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
+@@ -1563,8 +1599,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
G_CALLBACK (on_session_exited),
NULL);
@@ -503,7 +503,7 @@ index 2d711b1..5edbfeb 100644
session->priv->environment = g_hash_table_new_full (g_str_hash,
g_str_equal,
(GDestroyNotify) g_free,
-@@ -1537,7 +1571,7 @@ gdm_session_direct_init (GdmSessionDirect *session)
+@@ -1576,7 +1610,7 @@ gdm_session_direct_init (GdmSessionDirect *session)
static void
worker_started (GdmSessionWorkerJob *job,
@@ -512,7 +512,7 @@ index 2d711b1..5edbfeb 100644
{
g_debug ("GdmSessionDirect: Worker job started");
}
-@@ -1545,87 +1579,105 @@ worker_started (GdmSessionWorkerJob *job,
+@@ -1584,87 +1618,105 @@ worker_started (GdmSessionWorkerJob *job,
static void
worker_exited (GdmSessionWorkerJob *job,
int code,
@@ -654,7 +654,7 @@ index 2d711b1..5edbfeb 100644
}
static void
-@@ -1638,6 +1690,7 @@ send_setup (GdmSessionDirect *session,
+@@ -1677,6 +1729,7 @@ send_setup (GdmSessionDirect *session,
const char *display_device;
[...4526 lines suppressed...]
---
gui/simple-greeter/gdm-task-list.c | 5 +++--
@@ -19099,13 +18348,13 @@ index 162b784..be50832 100644
G_OBJECT_CLASS (gdm_task_list_parent_class)->finalize (object);
--
-1.6.5.2
+1.6.6
-From 3150b82ace1a469ef0d7369d1cbca7f1901d642c Mon Sep 17 00:00:00 2001
+From 39008493b92a9193d83fab9178c62750b84e9f22 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 22:09:45 -0400
-Subject: [PATCH 44/51] Add gdm_task_list_remove_task
+Subject: [PATCH 44/50] Add gdm_task_list_remove_task
---
gui/simple-greeter/gdm-task-list.c | 29 +++++++++++++++++++++++++++++
@@ -19167,13 +18416,13 @@ index 8bc0c0e..3df5415 100644
G_END_DECLS
--
-1.6.5.2
+1.6.6
-From d25cbe607c6365640e1e2eb8bbb5da60bedbeaf2 Mon Sep 17 00:00:00 2001
+From 68f370d08ca326e9661d581520498361c7c8f4ac Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:58:44 -0400
-Subject: [PATCH 45/51] Remove task from task list if unavailable
+Subject: [PATCH 45/50] Remove task from task list if unavailable
---
gui/simple-greeter/gdm-greeter-login-window.c | 20 ++++++++++++++++++++
@@ -19182,10 +18431,10 @@ Subject: [PATCH 45/51] Remove task from
3 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 0ec21a3..6a5b77e 100644
+index e185efb..03858e3 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -872,6 +872,26 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -870,6 +870,26 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
return TRUE;
}
@@ -19259,23 +18508,23 @@ index 848ea1e..3bf24e8 100644
G_CALLBACK (on_ready),
session);
--
-1.6.5.2
+1.6.6
-From 5eeb6c6d3522963c0dbe0b3923c596f3e08e7dc7 Mon Sep 17 00:00:00 2001
+From 452c6103577b400544d7e0c5ed548b9fee919bc3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 23:55:00 -0400
-Subject: [PATCH 46/51] Don't add task to UI if it's invisible
+Subject: [PATCH 46/50] Don't add task to UI if it's invisible
---
gui/simple-greeter/gdm-greeter-login-window.c | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 6a5b77e..9280d76 100644
+index 03858e3..4a3df26 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -2141,6 +2141,17 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2113,6 +2113,17 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
g_object_unref (actions);
@@ -19293,7 +18542,7 @@ index 6a5b77e..9280d76 100644
g_signal_connect_swapped (GDM_CONVERSATION (extension),
"answer",
G_CALLBACK (on_conversation_answer),
-@@ -2154,9 +2165,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2126,9 +2137,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
G_CALLBACK (on_conversation_chose_user),
login_window);
@@ -19304,13 +18553,13 @@ index 6a5b77e..9280d76 100644
name, description);
--
-1.6.5.2
+1.6.6
-From b8b0470e8ea5b9f1c502ba2621fca3112e8a40cd Mon Sep 17 00:00:00 2001
+From 7ad647521a33faee7f5785971fcd2bcdc0411d19 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 00:39:20 -0400
-Subject: [PATCH 47/51] add lame check to see if fingerprint is enabled
+Subject: [PATCH 47/50] add lame check to see if fingerprint is enabled
---
.../fingerprint/gdm-fingerprint-extension.c | 35 +++++++++++++++++++-
@@ -19363,13 +18612,13 @@ index e1fc0ed..b749ac1 100644
static void
--
-1.6.5.2
+1.6.6
-From aef6c0c7fdb292b05fb91b4d7f7f926189a74951 Mon Sep 17 00:00:00 2001
+From cf005789c45da97b92e28f45e0ac94ca4cc941fb Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 00:10:40 -0400
-Subject: [PATCH 48/51] don't activate invisible tasks
+Subject: [PATCH 48/50] don't activate invisible tasks
---
gui/simple-greeter/gdm-task-list.c | 4 ++++
@@ -19391,13 +18640,13 @@ index dd77ed6..c9d7451 100644
gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE);
--
-1.6.5.2
+1.6.6
-From e990afc9c83863b2db09ff1dc202d75eff4583c9 Mon Sep 17 00:00:00 2001
+From 9b3eb3f3b79f2169e43138575f33d6f0fefe812d Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 29 Oct 2009 00:46:34 -0400
-Subject: [PATCH 49/51] Add lame check for smart card daemon
+Subject: [PATCH 49/50] Add lame check for smart card daemon
We don't want to show the smart card bits if the daemon isn't running
@@ -19443,13 +18692,13 @@ index 9967d5f..903e18d 100644
static void
--
-1.6.5.2
+1.6.6
-From 85de0d6e72612cf495d4ce87d9bbc46574759615 Mon Sep 17 00:00:00 2001
+From 92a18ffdee98e2867beebcab9d9d51d908cf0776 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Nov 2009 13:35:26 -0500
-Subject: [PATCH 50/51] Don't delay login for passwd -d users
+Subject: [PATCH 50/50] Don't delay login for passwd -d users
Before we'd delay login if timed login was enabled, but
we should have been checking if it was the reason login
@@ -19459,10 +18708,10 @@ was happening.
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 9280d76..42f27bf 100644
+index 4a3df26..de45663 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -968,7 +968,7 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -966,7 +966,7 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
* so they can pick language/session. Will need to refactor things
* a bit so we can share code with timed login.
*/
@@ -19472,30 +18721,5 @@ index 9280d76..42f27bf 100644
g_debug ("GdmGreeterLoginWindow: Okay, we'll start the session anyway,"
"because the user isn't ever going to get an opportunity to"
--
-1.6.5.2
-
-
-From 5e63bab8f742eba575856e85f24d5d357cb8816f Mon Sep 17 00:00:00 2001
-From: Ray Strode <rstrode at redhat.com>
-Date: Fri, 6 Nov 2009 13:41:31 -0500
-Subject: [PATCH 51/51] Remove go-home icon from button
-
----
- gui/simple-greeter/gdm-greeter-login-window.glade | 1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/gui/simple-greeter/gdm-greeter-login-window.glade b/gui/simple-greeter/gdm-greeter-login-window.glade
-index d221d78..032bc6d 100644
---- a/gui/simple-greeter/gdm-greeter-login-window.glade
-+++ b/gui/simple-greeter/gdm-greeter-login-window.glade
-@@ -365,7 +365,6 @@
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
-- <property name="icon_name">go-home</property>
- <property name="pixel_size">16</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
---
-1.6.5.2
+1.6.6
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.499
retrieving revision 1.500
diff -u -p -r1.499 -r1.500
--- gdm.spec 17 Jan 2010 23:02:26 -0000 1.499
+++ gdm.spec 27 Jan 2010 02:09:59 -0000 1.500
@@ -15,8 +15,8 @@
Summary: The GNOME Display Manager
Name: gdm
-Version: 2.29.4
-Release: 3%{?dist}
+Version: 2.29.5
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -94,11 +94,8 @@ Provides: service(graphical-login)
Requires: audit-libs >= %{libauditver}
Patch2: plymouth.patch
-
-# uses /etc/sysconfig/keyboard and is thus not directly upstreamable
-# should probably be changed to get the system layout from the X server
-# https://bugzilla.gnome.org/show_bug.cgi?id=572765
-Patch13: gdm-system-keyboard.patch
+Patch3: add-locale-alias.patch
+Patch4: xklavier-fix.patch
Patch96: gdm-multistack.patch
# Fedora-specific
@@ -143,7 +140,8 @@ The GDM fingerprint plugin provides func
%prep
%setup -q
%patch2 -p1 -b .plymouth
-%patch13 -p1 -b .system-keyboard
+%patch3 -p1 -b .add-locale-alias
+%patch4 -p1 -b .xklavier-fix
%patch96 -p1 -b .multistack
%patch97 -p1 -b .bubble-location
%patch98 -p1 -b .tray-padding
@@ -361,7 +359,8 @@ fi
%{_sbindir}/gdm-stop
%{_bindir}/gdmflexiserver
%{_bindir}/gdm-screenshot
-%{_datadir}/gdm/*.glade
+%{_datadir}/gdm/*.ui
+%{_datadir}/gdm/locale.alias
%{_sysconfdir}/gconf/schemas/*.schemas
%{_datadir}/gdm/gdb-cmd
%{_libexecdir}/gdm-crash-logger
@@ -404,6 +403,9 @@ fi
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Tue Jan 26 2010 Ray Strode <rstrode at redhat.com> 2.29.5-1
+- Update to 2.29.5
+
* Sun Jan 17 2010 Matthias Clasen <mclasen at redhat.com> - 2.29.4-3
- Rebuild
More information about the scm-commits
mailing list