rpms/gdm/devel gdm-2.27.4-multistack.patch, NONE, 1.1 gdm-system-keyboard.patch, 1.3, 1.4 gdm.spec, 1.475, 1.476 gdm-2.26.0-fix-lang-regex.patch, 1.1, NONE gdm-2.26.1-multistack.patch, 1.1, NONE polkit1.patch, 1.1, NONE xklavier4.patch, 1.1, NONE
Ray Strode
rstrode at fedoraproject.org
Mon Jul 20 17:20:52 UTC 2009
- Previous message (by thread): rpms/valide/devel .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4 valide.spec, 1.3, 1.4
- Next message (by thread): rpms/lftp/devel lftp.spec,1.80,1.81
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/pkgs/rpms/gdm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4087
Modified Files:
gdm-system-keyboard.patch gdm.spec
Added Files:
gdm-2.27.4-multistack.patch
Removed Files:
gdm-2.26.0-fix-lang-regex.patch gdm-2.26.1-multistack.patch
polkit1.patch xklavier4.patch
Log Message:
- Update to 2.27.4
gdm-2.27.4-multistack.patch:
b/common/gdm-marshal.list | 1
b/configure.ac | 45
b/daemon/gdm-factory-slave.c | 13
b/daemon/gdm-greeter-server.c | 2
b/daemon/gdm-greeter-server.h | 5
b/daemon/gdm-product-slave.c | 47
b/daemon/gdm-session-direct.c | 14
b/daemon/gdm-session-private.h | 3
b/daemon/gdm-session-relay.c | 29
b/daemon/gdm-session-worker-job.c | 11
b/daemon/gdm-session-worker-job.h | 2
b/daemon/gdm-session-worker.c | 27
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 | 32
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.glade | 39
b/gui/simple-greeter/gdm-greeter-login-window.h | 11
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 | 316 ++
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 | 41
b/gui/simple-greeter/plugins/smartcard/Makefile.am | 77
b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 420 +++
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 | 41
configure.ac | 15
daemon/gdm-factory-slave.c | 103
daemon/gdm-greeter-server.c | 187 +
daemon/gdm-greeter-server.h | 19
daemon/gdm-product-slave.c | 263 +
daemon/gdm-session-direct.c | 1132 +++++---
daemon/gdm-session-private.h | 29
daemon/gdm-session-relay.c | 190 +
daemon/gdm-session-worker-job.c | 70
daemon/gdm-session-worker-job.h | 6
daemon/gdm-session-worker.c | 18
daemon/gdm-session.c | 229 +
daemon/gdm-session.h | 59
daemon/gdm-simple-slave.c | 223 +
daemon/test-session.c | 22
gui/simple-greeter/Makefile.am | 15
gui/simple-greeter/gdm-chooser-widget.c | 9
gui/simple-greeter/gdm-chooser-widget.h | 3
gui/simple-greeter/gdm-greeter-client.c | 209 +
gui/simple-greeter/gdm-greeter-client.h | 18
gui/simple-greeter/gdm-greeter-login-window.c | 1147 ++++++--
gui/simple-greeter/gdm-greeter-login-window.glade | 144 -
gui/simple-greeter/gdm-greeter-login-window.h | 21
gui/simple-greeter/gdm-greeter-session.c | 133
gui/simple-greeter/gdm-task-list.c | 228 +
gui/simple-greeter/gdm-task-list.h | 36
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 | 6
gui/simple-greeter/libgdmsimplegreeter/gdm-task.h | 2
gui/simple-greeter/plugins/Makefile.am | 4
gui/simple-greeter/plugins/fingerprint/gdm-fingerprint-extension.c | 10
gui/simple-greeter/plugins/password/gdm-password-extension.c | 7
gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c | 35
105 files changed, 9643 insertions(+), 1287 deletions(-)
--- NEW FILE gdm-2.27.4-multistack.patch ---
>From a1ab1c57fa91751f067ff10465f01034bc5c1953 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 20 Feb 2009 13:52:19 -0500
Subject: [PATCH 01/36] Add a comment marking protected api in chooser
The chooser widget has methods that only its
subclasses are supposed to call. We should
mark them as such.
---
gui/simple-greeter/gdm-chooser-widget.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/gui/simple-greeter/gdm-chooser-widget.h b/gui/simple-greeter/gdm-chooser-widget.h
index 578e613..7e3e59c 100644
--- a/gui/simple-greeter/gdm-chooser-widget.h
+++ b/gui/simple-greeter/gdm-chooser-widget.h
@@ -136,6 +136,8 @@ int gdm_chooser_widget_get_number_of_items (GdmChooserWidget
void gdm_chooser_widget_activate_if_one_item (GdmChooserWidget *widget);
void gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget);
+/* Protected
+ */
void gdm_chooser_widget_loaded (GdmChooserWidget *widget);
G_END_DECLS
--
1.6.3.3
>From 4e9cef5860311e3b39d2076f4dc9de5f69dfa51f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 17:44:37 -0500
Subject: [PATCH 02/36] Drop duplicated entry introspection output
---
daemon/gdm-greeter-server.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/gdm-greeter-server.c b/daemon/gdm-greeter-server.c
index 2e01d33..cecce83 100644
--- a/daemon/gdm-greeter-server.c
+++ b/daemon/gdm-greeter-server.c
@@ -752,7 +752,6 @@ do_introspect (DBusConnection *connection,
" <arg name=\"layout_name\" type=\"s\"/>\n"
" </signal>\n"
" <signal name=\"DefaultSessionNameChanged\">\n"
- " <signal name=\"DefaultSessionNameChanged\">\n"
" <arg name=\"session_name\" type=\"s\"/>\n"
" </signal>\n"
" <signal name=\"TimedLoginRequested\">\n"
--
1.6.3.3
>From ca75999e3ce75549554efb758c9210e2997cc9f6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 2 Mar 2009 10:07:03 -0500
Subject: [PATCH 03/36] Make lookup_item not warn when passing NULL for args
gtk_tree_model_get doesn't like NULL, and we allow
NULL for optional return values.
We now check each argument for NULL and call
gtk_tree_model_get individually N times (one for
each argument) instead of just once.
---
gui/simple-greeter/gdm-chooser-widget.c | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
index b3f2a0d..4e76439 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
@@ -2157,13 +2157,30 @@ gdm_chooser_widget_lookup_item (GdmChooserWidget *widget,
}
g_free (active_item_id);
- gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
- CHOOSER_IMAGE_COLUMN, image,
- CHOOSER_NAME_COLUMN, name,
- CHOOSER_PRIORITY_COLUMN, priority,
- CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use,
- CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate,
- -1);
+ if (image != NULL) {
+ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+ CHOOSER_IMAGE_COLUMN, image, -1);
+ }
+
+ if (name != NULL) {
+ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+ CHOOSER_NAME_COLUMN, name, -1);
+ }
+
+ if (priority != NULL) {
+ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+ CHOOSER_PRIORITY_COLUMN, priority, -1);
+ }
+
+ if (is_in_use != NULL) {
+ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+ CHOOSER_ITEM_IS_IN_USE_COLUMN, is_in_use, -1);
+ }
+
+ if (is_separate != NULL) {
+ gtk_tree_model_get (GTK_TREE_MODEL (widget->priv->list_store), &iter,
+ CHOOSER_ITEM_IS_SEPARATED_COLUMN, is_separate, -1);
+ }
return TRUE;
}
--
1.6.3.3
>From 835922303f2b08036727aca11adf256f2209ac0c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 15:35:00 -0500
Subject: [PATCH 04/36] Drop "stopped" signal from worker-job class
It was unused, dead code.
---
daemon/gdm-session-direct.c | 14 --------------
daemon/gdm-session-worker-job.c | 11 -----------
daemon/gdm-session-worker-job.h | 1 -
3 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index e1ea8a0..e4c8e05 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -1538,13 +1538,6 @@ gdm_session_direct_init (GdmSessionDirect *session)
}
static void
-worker_stopped (GdmSessionWorkerJob *job,
- GdmSessionDirect *session)
-{
- g_debug ("GdmSessionDirect: Worker job stopped");
-}
-
-static void
worker_started (GdmSessionWorkerJob *job,
GdmSessionDirect *session)
{
@@ -1587,10 +1580,6 @@ start_worker (GdmSessionDirect *session)
session->priv->job = gdm_session_worker_job_new ();
gdm_session_worker_job_set_server_address (session->priv->job, session->priv->server_address);
g_signal_connect (session->priv->job,
- "stopped",
- G_CALLBACK (worker_stopped),
- session);
- g_signal_connect (session->priv->job,
"started",
G_CALLBACK (worker_started),
session);
@@ -1612,9 +1601,6 @@ static void
stop_worker (GdmSessionDirect *session)
{
g_signal_handlers_disconnect_by_func (session->priv->job,
- G_CALLBACK (worker_stopped),
- session);
- g_signal_handlers_disconnect_by_func (session->priv->job,
G_CALLBACK (worker_started),
session);
g_signal_handlers_disconnect_by_func (session->priv->job,
diff --git a/daemon/gdm-session-worker-job.c b/daemon/gdm-session-worker-job.c
index 6723464..633d6e2 100644
--- a/daemon/gdm-session-worker-job.c
+++ b/daemon/gdm-session-worker-job.c
@@ -68,7 +68,6 @@ enum {
enum {
STARTED,
- STOPPED,
EXITED,
DIED,
LAST_SIGNAL
@@ -390,16 +389,6 @@ gdm_session_worker_job_class_init (GdmSessionWorkerJobClass *klass)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
- signals [STOPPED] =
- g_signal_new ("stopped",
- G_OBJECT_CLASS_TYPE (object_class),
- G_SIGNAL_RUN_FIRST,
- G_STRUCT_OFFSET (GdmSessionWorkerJobClass, stopped),
- NULL,
- NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE,
- 0);
signals [EXITED] =
g_signal_new ("exited",
G_OBJECT_CLASS_TYPE (object_class),
diff --git a/daemon/gdm-session-worker-job.h b/daemon/gdm-session-worker-job.h
index d42eb37..5ad1c92 100644
--- a/daemon/gdm-session-worker-job.h
+++ b/daemon/gdm-session-worker-job.h
[...17728 lines suppressed...]
- g_hash_table_iter_init (&iter, session->priv->conversations);
- while (g_hash_table_iter_next (&iter, &key, &value)) {
- GdmSessionConversation *conversation;
-
- conversation = (GdmSessionConversation *) value;
-
- stop_conversation (conversation);
- }
-
- g_hash_table_remove_all (session->priv->conversations);
+ stop_all_other_conversations (session, NULL);
}
static void
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
index 337718b..63ea82c 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -575,7 +575,7 @@ on_session_conversation_stopped (GdmSession *session,
gboolean res;
g_debug ("GdmSimpleSlave: conversation stopped");
- if (slave->priv->greeter_server != NULL) {
+ if (slave->priv->greeter != NULL) {
res = gdm_greeter_server_conversation_stopped (slave->priv->greeter_server,
service_name);
if (! res) {
--
1.6.3.3
>From ba40486a7e8a7be80b16a89d8a0f7fd264ddfe21 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 15:30:28 -0400
Subject: [PATCH 33/36] When one PAM conv. wins, actually stop the others
We weren't properly keeping the winning conversation
around in the previous commit
---
daemon/gdm-session-direct.c | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index e63e453..2899ea2 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -2293,13 +2293,20 @@ stop_all_other_conversations (GdmSessionDirect *session,
conversation = (GdmSessionConversation *) value;
if (conversation == conversation_to_keep) {
- continue;
+ g_hash_table_iter_steal (&iter);
+ g_free (key);
+ } else {
+ stop_conversation (conversation);
}
-
- stop_conversation (conversation);
}
g_hash_table_remove_all (session->priv->conversations);
+
+ if (conversation_to_keep != NULL) {
+ g_hash_table_insert (session->priv->conversations,
+ g_strdup (conversation_to_keep->service_name),
+ conversation_to_keep);
+ }
}
static void
--
1.6.3.3
>From c4ebe26db9c963d587694d0197e145e086ec43ca Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 13 May 2009 13:43:33 -0400
Subject: [PATCH 34/36] Don't send auth-failed when worker dies
Authentication hasn't failed, it just got aborted before it
could. This prevents a crash that happens when switching
runlevels while the login screen is up.
---
daemon/gdm-session-direct.c | 10 ++--------
1 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 2899ea2..689e4cf 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -87,7 +87,6 @@ struct _GdmSessionDirectPrivate
GList *pending_connections;
- guint32 is_authenticated : 1;
guint32 is_running : 1;
GPid session_pid;
@@ -1761,9 +1760,7 @@ worker_exited (GdmSessionWorkerJob *job,
g_debug ("GdmSessionDirect: Worker job exited: %d", code);
g_object_ref (conversation);
- if (!conversation->session->priv->is_authenticated) {
- _gdm_session_authentication_failed (GDM_SESSION (conversation->session), NULL);
- } else if (conversation->session->priv->is_running) {
+ if (conversation->session->priv->is_running) {
_gdm_session_session_exited (GDM_SESSION (conversation->session), code);
}
@@ -1781,9 +1778,7 @@ worker_died (GdmSessionWorkerJob *job,
g_debug ("GdmSessionDirect: Worker job died: %d", signum);
g_object_ref (conversation);
- if (!conversation->session->priv->is_authenticated) {
- _gdm_session_authentication_failed (GDM_SESSION (conversation->session), NULL);
- } else if (conversation->session->priv->is_running) {
+ if (conversation->session->priv->is_running) {
_gdm_session_session_died (GDM_SESSION (conversation->session), signum);
}
@@ -2398,7 +2393,6 @@ gdm_session_direct_close (GdmSession *session)
g_hash_table_remove_all (impl->priv->environment);
- impl->priv->is_authenticated = FALSE;
impl->priv->is_running = FALSE;
}
--
1.6.3.3
>From 68384fcc0d1dfb5b451d4be8136959a037c6c2a6 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Jun 2009 08:49:05 -0400
Subject: [PATCH 35/36] Drop bogus conversation = NULL line
cancel_pending_query would set conversation to NULL
immediately before trying to use the conversation.
I probably introduced this bug when converting the
code over to work in terms of multiple conversation
objects instead of one conversation per session.
Spotted by Michael Young:
https://bugzilla.redhat.com/show_bug.cgi?id=499489#c9
---
daemon/gdm-session-direct.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 689e4cf..7528ae6 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -789,7 +789,6 @@ cancel_pending_query (GdmSessionConversation *conversation)
reply = dbus_message_new_error (conversation->message_pending_reply,
GDM_SESSION_DBUS_ERROR_CANCEL,
"Operation cancelled");
- conversation = NULL;
dbus_connection_send (conversation->worker_connection, reply, NULL);
dbus_connection_flush (conversation->worker_connection);
--
1.6.3.3
>From 0daaf4814f9f78be4e85bef7f181426c06c5349c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 20 Jul 2009 11:06:59 -0400
Subject: [PATCH 36/36] Drop is_authenticated flag in session
It's not used anymore, so no reason to set it.
---
daemon/gdm-session-direct.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
index 7528ae6..4b08da3 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -377,7 +377,6 @@ gdm_session_direct_handle_authenticated (GdmSessionDirect *session,
dbus_connection_send (conversation->worker_connection, reply, NULL);
dbus_message_unref (reply);
- session->priv->is_authenticated = TRUE;
_gdm_session_authenticated (GDM_SESSION (session), conversation->service_name);
return DBUS_HANDLER_RESULT_HANDLED;
@@ -405,7 +404,6 @@ gdm_session_direct_handle_authentication_failed (GdmSessionDirect *session,
g_debug ("GdmSessionDirect: Emitting 'authentication-failed' signal");
- session->priv->is_authenticated = FALSE;
_gdm_session_authentication_failed (GDM_SESSION (session), conversation->service_name, text);
return DBUS_HANDLER_RESULT_HANDLED;
--
1.6.3.3
gdm-system-keyboard.patch:
configure.ac | 1
daemon/gdm-session-direct.c | 60 +++++++++++++++++++++++++++++++++++++++---
daemon/gdm-session-settings.c | 3 --
3 files changed, 59 insertions(+), 5 deletions(-)
Index: gdm-system-keyboard.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm-system-keyboard.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- gdm-system-keyboard.patch 25 Feb 2009 03:56:44 -0000 1.3
+++ gdm-system-keyboard.patch 20 Jul 2009 17:20:51 -0000 1.4
@@ -60,8 +60,8 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
+ "input.xkb.layout",
+ NULL);
+ }
-+ result = g_strdup (layout);
-+ libhal_free_string (layout);
++ result = g_strdup (layout);
++ libhal_free_string (layout);
+ }
+
+ libhal_free_string_array (devices);
@@ -82,7 +82,7 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
{
- if (session->priv->saved_layout != NULL) {
- return session->priv->saved_layout;
-+ if (!session->priv->saved_layout) {
++ if (session->priv->saved_layout == NULL) {
+ session->priv->saved_layout = get_system_default_layout (session);
}
@@ -91,20 +91,6 @@ diff -up gdm-2.25.2/daemon/gdm-session-d
}
static char *
-@@ -1971,9 +2025,10 @@ setup_session_environment (GdmSessionDir
- "GDM_LANG",
- get_language_name (session));
-
-- gdm_session_direct_set_environment_variable (session,
-- "GDM_KEYBOARD_LAYOUT",
-- get_layout_name (session));
-+ if (g_strcmp0 (get_layout_name (session), get_system_default_layout (session)) != 0)
-+ gdm_session_direct_set_environment_variable (session,
-+ "GDM_KEYBOARD_LAYOUT",
-+ get_layout_name (session));
-
- gdm_session_direct_set_environment_variable (session,
- "DISPLAY",
diff -up gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard gdm-2.25.2/daemon/gdm-session-settings.c
--- gdm-2.25.2/daemon/gdm-session-settings.c.system-keyboard 2008-08-26 15:04:00.000000000 -0400
+++ gdm-2.25.2/daemon/gdm-session-settings.c 2009-02-24 22:51:00.158815919 -0500
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -p -r1.475 -r1.476
--- gdm.spec 2 Jul 2009 19:53:37 -0000 1.475
+++ gdm.spec 20 Jul 2009 17:20:51 -0000 1.476
@@ -15,8 +15,8 @@
Summary: The GNOME Display Manager
Name: gdm
-Version: 2.26.1
-Release: 13%{?dist}
+Version: 2.27.4
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
@@ -31,6 +31,7 @@ Source6: gdm-smartcard-16.png
Source7: gdm-smartcard-48.png
Source8: gdm-fingerprint-16.png
Source9: gdm-fingerprint-48.png
+Source10: polkit-gnome-authentication-agent-1.desktop
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Prereq: /usr/sbin/useradd
@@ -49,6 +50,7 @@ Requires: ConsoleKit >= %{consolekit_ver
Requires: gnome-settings-daemon >= 2.21.92
Requires: iso-codes
Requires: gnome-session
+Requires: polkit-gnome
# since we use it, and pam spams the log if the module is missing
Requires: gnome-keyring-pam
Requires: plymouth-gdm-hooks
@@ -94,15 +96,7 @@ Patch3: gdm-2.23.92-save-root-window.pat
# should probably be changed to get the system layout from the X server
Patch13: gdm-system-keyboard.patch
-Patch19: gdm-2.26.1-multistack.patch
-
-# https://bugzilla.redhat.com/show_bug.cgi?id=498361
-Patch20: polkit1.patch
-
-# fixed upstream, rh 502778
-Patch22: gdm-2.26.0-fix-lang-regex.patch
-
-Patch35: xklavier4.patch
+Patch19: gdm-2.27.4-multistack.patch
# Fedora-specific
Patch99: gdm-2.23.1-fedora-logo.patch
@@ -147,9 +141,6 @@ The GDM fingerprint plugin provides func
%patch13 -p1 -b .system-keyboard
%patch19 -p1 -b .multistack
-%patch20 -p1 -b .polkit1
-%patch22 -p1 -b .fix-lang-regex
-%patch35 -p1 -b .xklavier4
%patch99 -p1 -b .fedora-logo
@@ -211,6 +202,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow
+# temporarily manually copy this
+cp -f %{SOURCE10} $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
+
rm -rf $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
find $RPM_BUILD_ROOT -name '*.a' -delete
@@ -391,6 +385,9 @@ fi
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Mon Jul 20 2009 Ray Strode <rstrode at redhat.com> 1:2.27.4-1
+- Update to 2.27.4
+
* Thu Jul 02 2009 Adam Jackson <ajax at redhat.com> 1:2.26.1-13
- Requires: xorg-x11-xkb-utils -> Requires: setxkbmap
--- gdm-2.26.0-fix-lang-regex.patch DELETED ---
--- gdm-2.26.1-multistack.patch DELETED ---
--- polkit1.patch DELETED ---
--- xklavier4.patch DELETED ---
- Previous message (by thread): rpms/valide/devel .cvsignore, 1.3, 1.4 import.log, 1.3, 1.4 sources, 1.3, 1.4 valide.spec, 1.3, 1.4
- Next message (by thread): rpms/lftp/devel lftp.spec,1.80,1.81
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list