rpms/gdm/F-13 accounts-service.patch, 1.1, 1.2 gdm-multistack.patch, 1.5, 1.6 gdm.spec, 1.512, 1.513 sources, 1.121, 1.122
Ray Strode
rstrode at fedoraproject.org
Tue Apr 27 22:12:19 UTC 2010
Author: rstrode
Update of /cvs/pkgs/rpms/gdm/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12916
Modified Files:
accounts-service.patch gdm-multistack.patch gdm.spec sources
Log Message:
- Update to 2.32.2
accounts-service.patch:
b/gui/simple-greeter/gdm-user-chooser-widget.c | 4
b/gui/simple-greeter/gdm-user-manager.c | 7
b/gui/simple-greeter/gdm-user-manager.h | 2
b/gui/simple-greeter/gdm-user-private.h | 4
b/gui/simple-greeter/gdm-user.c | 6
b/gui/simple-greeter/gdm-user.h | 2
b/gui/user-switch-applet/applet.c | 29 -
gui/simple-greeter/gdm-user-chooser-widget.c | 58 +-
gui/simple-greeter/gdm-user-manager.c | 606 ++++++++++++++---------
gui/simple-greeter/gdm-user-manager.h | 2
gui/simple-greeter/gdm-user-private.h | 4
gui/simple-greeter/gdm-user.c | 655 +++++++++++--------------
gui/simple-greeter/gdm-user.h | 11
gui/user-switch-applet/applet.c | 20
14 files changed, 781 insertions(+), 629 deletions(-)
Index: accounts-service.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-13/accounts-service.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- accounts-service.patch 24 Mar 2010 14:34:58 -0000 1.1
+++ accounts-service.patch 27 Apr 2010 22:12:16 -0000 1.2
@@ -1,4 +1,4 @@
-From 05c318bd1085f307259522bdcef18275662008c9 Mon Sep 17 00:00:00 2001
+From 04a77f1fbb48138a6dfe0a1a20027fd3af6773fe Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 11 Mar 2010 09:07:21 -0500
Subject: [PATCH 01/22] Add new gdm_user_is_logged_in method
@@ -38,10 +38,10 @@ index 77e06a7..9658c2b 100644
gdm_chooser_widget_set_item_in_use (GDM_CHOOSER_WIDGET (widget),
user_name,
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index e2b612f..e880fc5 100644
+index 276a867..e182c2a 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -1080,6 +1080,12 @@ frame_pixbuf (GdkPixbuf *source)
+@@ -992,6 +992,12 @@ frame_pixbuf (GdkPixbuf *source)
return dest;
}
@@ -70,7 +70,7 @@ index 9f153d9..c0b27ca 100644
1.6.5.2
-From 5b2e2563d0554bb0af2ff86798ef70de3e443fda Mon Sep 17 00:00:00 2001
+From c40b580ed71f206e8bcf0b2772011b4c944d1832 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 13:21:24 -0400
Subject: [PATCH 02/22] Don't match users as dupes of themselves
@@ -80,10 +80,10 @@ Subject: [PATCH 02/22] Don't match users
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
-index 58def68..e5b64b9 100644
+index 01dc507..fe9d13d 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
-@@ -757,9 +757,9 @@ match_real_name_cmpfunc (gconstpointer a,
+@@ -746,9 +746,9 @@ match_real_name_cmpfunc (gconstpointer a,
static gboolean
match_real_name_hrfunc (gpointer key,
gpointer value,
@@ -95,7 +95,7 @@ index 58def68..e5b64b9 100644
}
static void
-@@ -771,7 +771,7 @@ add_user (GdmUserManager *manager,
+@@ -760,7 +760,7 @@ add_user (GdmUserManager *manager,
add_sessions_for_user (manager, user);
dup = g_hash_table_find (manager->priv->users,
match_real_name_hrfunc,
@@ -108,7 +108,7 @@ index 58def68..e5b64b9 100644
1.6.5.2
-From 20a172c85d5bd75f9c529aa4a5b4ba07887adb3e Mon Sep 17 00:00:00 2001
+From 4f766f1a7be43b0b8d20159651371b462a1f9301 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 13:56:38 -0400
Subject: [PATCH 03/22] Move get_primary_session_id to gdm-user.h
@@ -122,7 +122,7 @@ us to drop get_sessions eventually.
3 files changed, 41 insertions(+), 51 deletions(-)
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
-index e5b64b9..d5865da 100644
+index fe9d13d..0bb868f 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
@@ -150,55 +150,6 @@ start_new_login_session (GdmUserManager *manager)
@@ -208,10 +208,10 @@ index e5b64b9..d5865da 100644
goto out;
}
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index e880fc5..9d50a8a 100644
+index e182c2a..2c62334 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -1153,3 +1153,33 @@ gdm_user_render_icon (GdmUser *user,
+@@ -1065,3 +1065,33 @@ gdm_user_render_icon (GdmUser *user,
return pixbuf;
}
@@ -261,7 +261,7 @@ index c0b27ca..3e448dd 100644
1.6.5.2
-From ccb38b131309abcf80de60544b889e6aef0bab42 Mon Sep 17 00:00:00 2001
+From c9e7a8b8410ef7788c05c4937d4263a5308ae568 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 14:05:58 -0400
Subject: [PATCH 04/22] Don't track manager from user object
@@ -273,10 +273,10 @@ We don't need it, and it's a bit backwar
2 files changed, 1 insertions(+), 22 deletions(-)
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
-index d5865da..83fb8ff 100644
+index 0bb868f..aadb147 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
-@@ -690,7 +690,7 @@ create_user (GdmUserManager *manager)
+@@ -683,7 +683,7 @@ create_user (GdmUserManager *manager)
{
GdmUser *user;
@@ -286,7 +286,7 @@ index d5865da..83fb8ff 100644
"sessions-changed",
G_CALLBACK (on_user_sessions_changed),
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 9d50a8a..7a40302 100644
+index 2c62334..65ca7b5 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -30,7 +30,6 @@
@@ -305,7 +305,7 @@ index 9d50a8a..7a40302 100644
PROP_REAL_NAME,
PROP_DISPLAY_NAME,
PROP_USER_NAME,
-@@ -63,8 +61,6 @@ enum {
+@@ -62,8 +60,6 @@ enum {
struct _GdmUser {
GObject parent;
@@ -314,7 +314,7 @@ index 9d50a8a..7a40302 100644
uid_t uid;
char *user_name;
char *real_name;
-@@ -174,10 +170,6 @@ gdm_user_set_property (GObject *object,
+@@ -170,10 +166,6 @@ gdm_user_set_property (GObject *object,
user = GDM_USER (object);
switch (param_id) {
@@ -325,7 +325,7 @@ index 9d50a8a..7a40302 100644
case PROP_LOGIN_FREQUENCY:
_gdm_user_set_login_frequency (user, g_value_get_ulong (value));
break;
-@@ -198,9 +190,6 @@ gdm_user_get_property (GObject *object,
+@@ -194,9 +186,6 @@ gdm_user_get_property (GObject *object,
user = GDM_USER (object);
switch (param_id) {
@@ -335,7 +335,7 @@ index 9d50a8a..7a40302 100644
case PROP_USER_NAME:
g_value_set_string (value, user->user_name);
break;
-@@ -240,15 +229,6 @@ gdm_user_class_init (GdmUserClass *class)
+@@ -236,15 +225,6 @@ gdm_user_class_init (GdmUserClass *class)
gobject_class->finalize = gdm_user_finalize;
g_object_class_install_property (gobject_class,
@@ -351,7 +351,7 @@ index 9d50a8a..7a40302 100644
PROP_REAL_NAME,
g_param_spec_string ("real-name",
"Real Name",
-@@ -378,7 +358,6 @@ update_icon_monitor (GdmUser *user)
+@@ -311,7 +291,6 @@ gdm_user_class_init (GdmUserClass *class)
static void
gdm_user_init (GdmUser *user)
{
@@ -363,7 +363,7 @@ index 9d50a8a..7a40302 100644
1.6.5.2
-From 6ccfc3ac5ca42c3cef0ba9e3ba49c15f2b7cd22e Mon Sep 17 00:00:00 2001
+From 321e40e627b9c8f570d7e293571f56892f8758c1 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 14:21:56 -0400
Subject: [PATCH 05/22] Drop user properties in favor of a "changed" signal
@@ -371,59 +371,15 @@ Subject: [PATCH 05/22] Drop user propert
This is less specific, but good enough, and will make
changing out the backend easier.
---
- gui/simple-greeter/gdm-user-manager.c | 11 --
- gui/simple-greeter/gdm-user-private.h | 2 -
- gui/simple-greeter/gdm-user.c | 186 ++++-----------------------------
- gui/user-switch-applet/applet.c | 28 ++----
- 4 files changed, 26 insertions(+), 201 deletions(-)
+ gui/simple-greeter/gdm-user.c | 165 +++++---------------------------------
+ gui/user-switch-applet/applet.c | 28 ++-----
+ 2 files changed, 29 insertions(+), 164 deletions(-)
-diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
-index 83fb8ff..aadb147 100644
---- a/gui/simple-greeter/gdm-user-manager.c
-+++ b/gui/simple-greeter/gdm-user-manager.c
-@@ -442,13 +442,6 @@ on_user_sessions_changed (GdmUser *user,
- g_signal_emit (manager, signals [USER_IS_LOGGED_IN_CHANGED], 0, user);
- }
-
--static void
--on_user_icon_changed (GdmUser *user,
-- GdmUserManager *manager)
--{
-- g_debug ("GdmUserManager: user icon changed");
--}
--
- static char *
- get_seat_id_for_session (DBusGConnection *connection,
- const char *session_id)
-@@ -695,10 +688,6 @@ create_user (GdmUserManager *manager)
- "sessions-changed",
- G_CALLBACK (on_user_sessions_changed),
- manager);
-- g_signal_connect (user,
-- "icon-changed",
-- G_CALLBACK (on_user_icon_changed),
-- manager);
- return user;
- }
-
-diff --git a/gui/simple-greeter/gdm-user-private.h b/gui/simple-greeter/gdm-user-private.h
-index 1b1b368..79cdcf4 100644
---- a/gui/simple-greeter/gdm-user-private.h
-+++ b/gui/simple-greeter/gdm-user-private.h
-@@ -37,8 +37,6 @@ void _gdm_user_add_session (GdmUser *user,
- void _gdm_user_remove_session (GdmUser *user,
- const char *session_id);
-
--void _gdm_user_icon_changed (GdmUser *user);
--
- void _gdm_user_show_full_display_name (GdmUser *user);
- void _gdm_user_show_short_display_name (GdmUser *user);
-
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 7a40302..9538c07 100644
+index 65ca7b5..182ef72 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -42,18 +42,7 @@
+@@ -42,17 +42,7 @@
#define MINIMAL_UID 100
enum {
@@ -438,22 +394,11 @@ index 7a40302..9538c07 100644
-};
-
-enum {
-- ICON_CHANGED,
+ CHANGED,
SESSIONS_CHANGED,
LAST_SIGNAL
};
-@@ -77,8 +66,7 @@ typedef struct _GdmUserClass
- {
- GObjectClass parent_class;
-
-- void (* icon_changed) (GdmUser *user);
-- void (* sessions_changed) (GdmUser *user);
-+ void (* sessions_changed) (GdmUser *user);
- } GdmUserClass;
-
- static void gdm_user_finalize (GObject *object);
-@@ -152,141 +140,19 @@ gdm_user_get_sessions (GdmUser *user)
+@@ -148,136 +138,22 @@ gdm_user_get_sessions (GdmUser *user)
}
static void
@@ -587,27 +532,18 @@ index 7a40302..9538c07 100644
- 0,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-
-- signals [ICON_CHANGED] =
-- g_signal_new ("icon-changed",
+ signals [CHANGED] =
+ g_signal_new ("changed",
- G_TYPE_FROM_CLASS (class),
- G_SIGNAL_RUN_LAST,
-- G_STRUCT_OFFSET (GdmUserClass, icon_changed),
++ G_TYPE_FROM_CLASS (class),
++ G_SIGNAL_RUN_LAST,
+ 0,
- NULL, NULL,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
-@@ -315,7 +181,7 @@ on_icon_monitor_changed (GFileMonitor *monitor,
- return;
- }
-
-- _gdm_user_icon_changed (user);
-+ g_signal_emit (user, signals[CHANGED], 0);
- }
-
- static void
-@@ -395,11 +261,12 @@ _gdm_user_update (GdmUser *user,
++ NULL, NULL,
++ g_cclosure_marshal_VOID__VOID,
++ G_TYPE_NONE, 0);
+ signals [SESSIONS_CHANGED] =
+ g_signal_new ("sessions-changed",
+ G_TYPE_FROM_CLASS (class),
+@@ -326,11 +202,12 @@ _gdm_user_update (GdmUser *user,
const struct passwd *pwent)
{
gchar *real_name = NULL;
@@ -621,7 +557,7 @@ index 7a40302..9538c07 100644
/* Display Name */
if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
-@@ -439,7 +306,7 @@ _gdm_user_update (GdmUser *user,
+@@ -370,7 +247,7 @@ _gdm_user_update (GdmUser *user,
strcmp (real_name, user->real_name) != 0)) {
g_free (user->real_name);
user->real_name = real_name;
@@ -630,7 +566,7 @@ index 7a40302..9538c07 100644
} else {
g_free (real_name);
}
-@@ -451,13 +318,13 @@ _gdm_user_update (GdmUser *user,
+@@ -382,13 +259,13 @@ _gdm_user_update (GdmUser *user,
strncmp (user->real_name, user->display_name, strlen (user->real_name)) != 0)) {
g_free (user->display_name);
user->display_name = NULL;
@@ -646,7 +582,7 @@ index 7a40302..9538c07 100644
}
/* Username */
-@@ -468,7 +335,7 @@ _gdm_user_update (GdmUser *user,
+@@ -399,7 +276,7 @@ _gdm_user_update (GdmUser *user,
strcmp (user->user_name, pwent->pw_name) != 0)) {
g_free (user->user_name);
user->user_name = g_strdup (pwent->pw_name);
@@ -655,17 +591,16 @@ index 7a40302..9538c07 100644
}
/* Home Directory */
-@@ -477,8 +344,7 @@ _gdm_user_update (GdmUser *user,
+@@ -408,7 +285,7 @@ _gdm_user_update (GdmUser *user,
strcmp (user->home_dir, pwent->pw_dir) != 0) {
g_free (user->home_dir);
user->home_dir = g_strdup (pwent->pw_dir);
- g_object_notify (G_OBJECT (user), "home-directory");
-- g_signal_emit (user, signals[ICON_CHANGED], 0);
+ changed = TRUE;
}
/* Shell */
-@@ -489,28 +355,14 @@ _gdm_user_update (GdmUser *user,
+@@ -419,10 +296,12 @@ _gdm_user_update (GdmUser *user,
strcmp (user->shell, pwent->pw_shell) != 0)) {
g_free (user->shell);
user->shell = g_strdup (pwent->pw_shell);
@@ -673,32 +608,14 @@ index 7a40302..9538c07 100644
+ changed = TRUE;
}
- update_icon_monitor (user);
-
- g_object_thaw_notify (G_OBJECT (user));
--}
--
--/**
-- * _gdm_user_icon_changed:
-- * @user: the user to emit the signal for.
-- *
-- * Emits the "icon-changed" signal for @user.
-- *
-- * Since: 1.0
-- **/
--void
--_gdm_user_icon_changed (GdmUser *user)
--{
-- g_return_if_fail (GDM_IS_USER (user));
--
-- g_signal_emit (user, signals[ICON_CHANGED], 0);
+ if (changed) {
+ g_signal_emit (user, signals[CHANGED], 0);
+ }
}
/**
-@@ -670,7 +522,7 @@ _gdm_user_show_full_display_name (GdmUser *user)
+@@ -582,7 +461,7 @@ _gdm_user_show_full_display_name (GdmUser *user)
strcmp (uniq_name, user->display_name) != 0)) {
g_free (user->display_name);
user->display_name = uniq_name;
@@ -707,7 +624,7 @@ index 7a40302..9538c07 100644
} else {
g_free (uniq_name);
}
-@@ -692,7 +544,7 @@ _gdm_user_show_short_display_name (GdmUser *user)
+@@ -604,7 +483,7 @@ _gdm_user_show_short_display_name (GdmUser *user)
if (user->display_name) {
g_free (user->display_name);
user->display_name = NULL;
@@ -791,7 +708,7 @@ index 5d73283..89c2b69 100644
1.6.5.2
-From 0ec22014b9086a5581fc9becccb51a51a1db8f63 Mon Sep 17 00:00:00 2001
+From 5dfb0d92923bede734900b362745c11744c095ad Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 14:22:47 -0400
Subject: [PATCH 06/22] drop sessions_changed class member
@@ -804,19 +721,19 @@ need the vfunc.
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 9538c07..7ea710b 100644
+index 182ef72..3e0c61a 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -65,8 +65,6 @@ struct _GdmUser {
+@@ -63,8 +63,6 @@ struct _GdmUser {
typedef struct _GdmUserClass
{
GObjectClass parent_class;
-
-- void (* sessions_changed) (GdmUser *user);
+- void (* sessions_changed) (GdmUser *user);
} GdmUserClass;
static void gdm_user_finalize (GObject *object);
-@@ -160,7 +158,7 @@ gdm_user_class_init (GdmUserClass *class)
+@@ -158,7 +156,7 @@ gdm_user_class_init (GdmUserClass *class)
g_signal_new ("sessions-changed",
G_TYPE_FROM_CLASS (class),
G_SIGNAL_RUN_LAST,
@@ -829,7 +746,7 @@ index 9538c07..7ea710b 100644
1.6.5.2
-From 189eba4d945ee9098072edf48aaca5c8bca90b1f Mon Sep 17 00:00:00 2001
+From a407a2af7ad4cd19bab7daf412d7aab64b6f64a3 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 22:49:55 -0400
Subject: [PATCH 07/22] Drop get_sessions
@@ -841,10 +758,10 @@ We don't need it now.
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 7ea710b..c1e0a9f 100644
+index 3e0c61a..dff394a 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -131,12 +131,6 @@ gdm_user_get_num_sessions (GdmUser *user)
+@@ -129,12 +129,6 @@ gdm_user_get_num_sessions (GdmUser *user)
return g_list_length (user->sessions);
}
@@ -873,7 +790,7 @@ index 3e448dd..f871a5d 100644
1.6.5.2
-From 99679f31af4cd60503a2bfcff15b6aaa66695fc4 Mon Sep 17 00:00:00 2001
+From 2f734941bcaaf095cbe2e46663d07aff51276c2b Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 22:59:02 -0400
Subject: [PATCH 08/22] Drop get_shell and get_home_directory
@@ -885,10 +802,10 @@ They aren't used, so let's cull them.
2 files changed, 0 insertions(+), 62 deletions(-)
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index c1e0a9f..d1f229d 100644
+index dff394a..465c55f 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -330,26 +330,6 @@ _gdm_user_update (GdmUser *user,
+@@ -271,26 +271,6 @@ _gdm_user_update (GdmUser *user,
changed = TRUE;
}
@@ -912,10 +829,10 @@ index c1e0a9f..d1f229d 100644
- changed = TRUE;
- }
-
- update_icon_monitor (user);
-
if (changed) {
-@@ -436,46 +416,6 @@ gdm_user_get_user_name (GdmUser *user)
+ g_signal_emit (user, signals[CHANGED], 0);
+ }
+@@ -375,46 +355,6 @@ gdm_user_get_user_name (GdmUser *user)
return user->user_name;
}
@@ -979,7 +896,7 @@ index f871a5d..6b51ffb 100644
1.6.5.2
-From 9846521eba75e6400ae3b638c70811ca1bf608be Mon Sep 17 00:00:00 2001
+From ab2ca579a1e7b5dc468d020f67ceb97f65f4253a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 23:03:09 -0400
Subject: [PATCH 09/22] drop loading-users signal
@@ -1041,7 +958,7 @@ index b2d0019..ffccea1 100644
1.6.5.2
-From 8ba00c784b7110657ba056492c228effd1609bb7 Mon Sep 17 00:00:00 2001
+From 59b9a9e2bfe86602e755adb490225cb3cbb5c654 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 23:30:01 -0400
Subject: [PATCH 10/22] Drop "user-login-frequency-changed" signal in favor of "changed"
@@ -1253,10 +1170,10 @@ index 79cdcf4..b16547a 100644
const char *session_id);
void _gdm_user_remove_session (GdmUser *user,
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index d1f229d..15eec11 100644
+index 465c55f..4bb2b78 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -338,6 +338,28 @@ _gdm_user_update (GdmUser *user,
+@@ -277,6 +277,28 @@ _gdm_user_update (GdmUser *user,
}
/**
@@ -1289,7 +1206,7 @@ index d1f229d..15eec11 100644
1.6.5.2
-From 74661e8abe7662f8ba779b8a37e636721fc8db7c Mon Sep 17 00:00:00 2001
+From 8bf6c0686c680cb413e78245ca40d53526390d7a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 23:47:16 -0400
Subject: [PATCH 11/22] include settings-client.h to silence warning
@@ -1314,7 +1231,7 @@ index 375f21e..f2b4332 100644
1.6.5.2
-From c209ea5ab27828225872853e0a35dfeef8c5cc36 Mon Sep 17 00:00:00 2001
+From 70232fcc80fa1007efe6061f0e83425ca99879e2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 15 Mar 2010 23:51:22 -0400
Subject: [PATCH 12/22] Rename users hashtable to user_by_name
@@ -1464,7 +1381,7 @@ index f2b4332..9f88e99 100644
1.6.5.2
-From 9334d12f9097b3bb32c6c01d54e3aa8f2b310ccc Mon Sep 17 00:00:00 2001
+From 7bada6caaeabe92eb00eb7edc6d602c6ee01c396 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 00:20:38 -0400
Subject: [PATCH 13/22] move local user monitoring code to its own function
@@ -1595,7 +1512,7 @@ index 9f88e99..8c97c0a 100644
1.6.5.2
-From a2234e8fda72043411b21fef4cf0d8fbb139e469 Mon Sep 17 00:00:00 2001
+From ddc1fd619e022a91fdefbf2e6620b33b8f723df2 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 00:25:17 -0400
Subject: [PATCH 14/22] rearrange gdm_user_collate
@@ -1606,10 +1523,10 @@ This way we don't make unnecessary assig
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 15eec11..3fea58c 100644
+index 4bb2b78..dd10f91 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -514,18 +514,6 @@ gdm_user_collate (GdmUser *user1,
+@@ -453,18 +453,6 @@ gdm_user_collate (GdmUser *user1,
g_return_val_if_fail (GDM_IS_USER (user1), 0);
g_return_val_if_fail (GDM_IS_USER (user2), 0);
@@ -1628,7 +1545,7 @@ index 15eec11..3fea58c 100644
num1 = user1->login_frequency;
num2 = user2->login_frequency;
g_debug ("Login freq 1=%u 2=%u", (guint)num1, (guint)num2);
-@@ -538,6 +526,18 @@ gdm_user_collate (GdmUser *user1,
+@@ -477,6 +465,18 @@ gdm_user_collate (GdmUser *user1,
}
/* if login frequency is equal try names */
@@ -1651,7 +1568,7 @@ index 15eec11..3fea58c 100644
1.6.5.2
-From 725ca40dbb715efcdcaacfff240ca955c191ff4b Mon Sep 17 00:00:00 2001
+From a6df273f4c2226444a2dfbbaea52a8a47f7e1309 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 00:33:48 -0400
Subject: [PATCH 15/22] Drop get_filesystem_type
@@ -1662,10 +1579,10 @@ It's unused code.
1 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 3fea58c..63b879c 100644
+index dd10f91..9a75274 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -584,39 +584,6 @@ check_user_file (const char *filename,
+@@ -523,39 +523,6 @@ check_user_file (const char *filename,
return TRUE;
}
@@ -1709,7 +1626,7 @@ index 3fea58c..63b879c 100644
1.6.5.2
-From 5da29c91e8ef16c27e1ccde8249ef0581fd4766a Mon Sep 17 00:00:00 2001
+From 8abc93ba8da0bdfc8ea99f33174ef18c0e626bc9 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 00:41:13 -0400
Subject: [PATCH 16/22] Get dbus connection outside of get_seat_proxy
@@ -1778,7 +1695,7 @@ index 8c97c0a..cec9b1e 100644
1.6.5.2
-From 7de217f707381c011fa4b0bdf005eb931c529344 Mon Sep 17 00:00:00 2001
+From d1470adb6df929da7d801b041b5ef3a62252c39e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 00:53:30 -0400
Subject: [PATCH 17/22] Rename on_proxy_destroy to on_seat_proxy_destroy
@@ -1815,7 +1732,7 @@ index cec9b1e..8778043 100644
1.6.5.2
-From 86e4b3f237b0659d2efb27bc2fde970cd51cbe4b Mon Sep 17 00:00:00 2001
+From 8937a1e0f2e2f4361b5414f57d445e34dbd6ff67 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 01:11:27 -0400
Subject: [PATCH 18/22] Drop unused defines
@@ -1842,7 +1759,7 @@ index 8778043..a029bdb 100644
1.6.5.2
-From 5e08f499aa9417d5489a7bff8c6c188d558573c3 Mon Sep 17 00:00:00 2001
+From 94328aa66bfda7dbcced49122b76ea5c56b79e0e Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 02:44:28 -0400
Subject: [PATCH 19/22] rename update to update_from_pwent
@@ -1910,10 +1827,10 @@ index b16547a..6b1fe47 100644
void _gdm_user_update_login_frequency (GdmUser *user,
guint64 login_frequency);
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index 63b879c..f20983a 100644
+index 9a75274..7901fb0 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
-@@ -240,7 +240,7 @@ gdm_user_finalize (GObject *object)
+@@ -181,7 +181,7 @@ gdm_user_finalize (GObject *object)
}
/**
@@ -1922,7 +1839,7 @@ index 63b879c..f20983a 100644
* @user: the user object to update.
* @pwent: the user data to use.
*
-@@ -249,8 +249,8 @@ gdm_user_finalize (GObject *object)
+@@ -190,8 +190,8 @@ gdm_user_finalize (GObject *object)
* Since: 1.0
**/
void
@@ -1937,7 +1854,7 @@ index 63b879c..f20983a 100644
1.6.5.2
-From 5315b41c46b9880ffd7d5d4d2bf555a38ef2300d Mon Sep 17 00:00:00 2001
+From 55d5dcc3f47937496f5a3ca092a9ddd988204e49 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 03:06:37 -0400
Subject: [PATCH 20/22] drop dirty user
@@ -1972,17 +1889,17 @@ index c9954bd..13533ca 100644
1.6.5.2
-From bd4d9c954f8236635835466ec6bb99e4351027c0 Mon Sep 17 00:00:00 2001
+From 19210562f5845caa2e54db45bece8d018d768427 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 16 Mar 2010 03:07:19 -0400
Subject: [PATCH 21/22] Get users from account service, fallback to old way
---
gui/simple-greeter/gdm-user-manager.c | 310 +++++++++++++++++++++++++++------
- gui/simple-greeter/gdm-user.c | 287 +++++++++++++++++++++++--------
+ gui/simple-greeter/gdm-user.c | 278 ++++++++++++++++++++++-------
gui/simple-greeter/gdm-user.h | 4 +
gui/user-switch-applet/applet.c | 7 +-
- 4 files changed, 482 insertions(+), 126 deletions(-)
+ 4 files changed, 477 insertions(+), 122 deletions(-)
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
index 13533ca..3eaf231 100644
@@ -2475,7 +2392,7 @@ index 13533ca..3eaf231 100644
g_file_monitor_cancel (manager->priv->shells_monitor);
g_hash_table_destroy (manager->priv->shells);
diff --git a/gui/simple-greeter/gdm-user.c b/gui/simple-greeter/gdm-user.c
-index f20983a..dc142ad 100644
+index 7901fb0..ec60851 100644
--- a/gui/simple-greeter/gdm-user.c
+++ b/gui/simple-greeter/gdm-user.c
@@ -26,6 +26,9 @@
@@ -2515,8 +2432,8 @@ index f20983a..dc142ad 100644
+ gchar *icon_file;
GList *sessions;
gulong login_frequency;
-
-@@ -68,6 +77,8 @@ typedef struct _GdmUserClass
+ };
+@@ -66,6 +75,8 @@ typedef struct _GdmUserClass
} GdmUserClass;
static void gdm_user_finalize (GObject *object);
@@ -2525,33 +2442,7 @@ index f20983a..dc142ad 100644
static guint signals[LAST_SIGNAL] = { 0 };
-@@ -177,13 +188,14 @@ on_icon_monitor_changed (GFileMonitor *monitor,
- }
-
- static void
--update_icon_monitor (GdmUser *user)
-+update_icon_monitor (GdmUser *user,
-+ const char *home_dir)
- {
- GFile *file;
- GError *error;
- char *path;
-
-- if (user->home_dir == NULL) {
-+ if (home_dir == NULL) {
- return;
- }
-
-@@ -192,7 +204,7 @@ update_icon_monitor (GdmUser *user)
- user->icon_monitor = NULL;
- }
-
-- path = g_build_filename (user->home_dir, ".face", NULL);
-+ path = g_build_filename (home_dir, ".face", NULL);
- g_debug ("adding monitor for '%s'", path);
- file = g_file_new_for_path (path);
- error = NULL;
-@@ -216,10 +228,18 @@ update_icon_monitor (GdmUser *user)
+@@ -159,10 +170,18 @@ gdm_user_class_init (GdmUserClass *class)
static void
gdm_user_init (GdmUser *user)
{
@@ -2570,7 +2461,7 @@ index f20983a..dc142ad 100644
}
static void
-@@ -234,6 +254,15 @@ gdm_user_finalize (GObject *object)
+@@ -175,6 +194,15 @@ gdm_user_finalize (GObject *object)
g_free (user->user_name);
g_free (user->real_name);
g_free (user->display_name);
@@ -2586,7 +2477,7 @@ index f20983a..dc142ad 100644
if (G_OBJECT_CLASS (gdm_user_parent_class)->finalize)
(*G_OBJECT_CLASS (gdm_user_parent_class)->finalize) (object);
-@@ -257,6 +286,7 @@ _gdm_user_update_from_pwent (GdmUser *user,
+@@ -198,6 +226,7 @@ _gdm_user_update_from_pwent (GdmUser *user,
g_return_if_fail (GDM_IS_USER (user));
g_return_if_fail (pwent != NULL);
@@ -2594,7 +2485,7 @@ index f20983a..dc142ad 100644
changed = FALSE;
-@@ -325,12 +355,29 @@ _gdm_user_update_from_pwent (GdmUser *user,
+@@ -266,6 +295,23 @@ _gdm_user_update_from_pwent (GdmUser *user,
(pwent->pw_name &&
user->user_name &&
strcmp (user->user_name, pwent->pw_name) != 0)) {
@@ -2618,14 +2509,7 @@ index f20983a..dc142ad 100644
g_free (user->user_name);
user->user_name = g_strdup (pwent->pw_name);
changed = TRUE;
- }
-
-- update_icon_monitor (user);
-+ update_icon_monitor (user, pwent->pw_dir);
-
- if (changed) {
- g_signal_emit (user, signals[CHANGED], 0);
-@@ -584,33 +631,6 @@ check_user_file (const char *filename,
+@@ -523,33 +569,6 @@ check_user_file (const char *filename,
return TRUE;
}
@@ -2659,7 +2543,7 @@ index f20983a..dc142ad 100644
static void
rounded_rectangle (cairo_t *cr,
gdouble aspect,
-@@ -844,55 +864,41 @@ gdm_user_render_icon (GdmUser *user,
+@@ -783,55 +802,41 @@ gdm_user_render_icon (GdmUser *user,
{
GdkPixbuf *pixbuf;
GdkPixbuf *framed;
@@ -2738,7 +2622,7 @@ index f20983a..dc142ad 100644
out:
if (pixbuf != NULL) {
-@@ -906,6 +912,22 @@ gdm_user_render_icon (GdmUser *user,
+@@ -845,6 +850,22 @@ gdm_user_render_icon (GdmUser *user,
return pixbuf;
}
@@ -2761,7 +2645,7 @@ index f20983a..dc142ad 100644
G_CONST_RETURN char *
gdm_user_get_primary_session_id (GdmUser *user)
{
-@@ -935,3 +957,128 @@ out:
+@@ -874,3 +895,128 @@ out:
return primary_ssid;
}
@@ -2935,7 +2819,7 @@ index 89c2b69..436207d 100644
1.6.5.2
-From e6a8252327c7540170fe2a30722269fb28385570 Mon Sep 17 00:00:00 2001
+From f615959724ef9eb2e445ab11e65aa368d08be822 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 18 Mar 2010 08:59:45 -0400
Subject: [PATCH 22/22] Don't crash when adding multiple user switchers
gdm-multistack.patch:
b/common/gdm-marshal.list | 1
b/configure.ac | 44
b/daemon/gdm-factory-slave.c | 5
b/daemon/gdm-greeter-server.c | 53
b/daemon/gdm-greeter-server.h | 5
b/daemon/gdm-product-slave.c | 29
b/daemon/gdm-session-direct.c | 318 +-
b/daemon/gdm-session-private.h | 3
b/daemon/gdm-session-relay.c | 15
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 | 12
b/daemon/gdm-session.h | 9
b/daemon/gdm-simple-slave.c | 3
b/daemon/test-session.c | 6
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 | 95
b/gui/simple-greeter/gdm-greeter-login-window.h | 11
b/gui/simple-greeter/gdm-greeter-login-window.ui | 49
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 | 40
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 | 72
daemon/gdm-greeter-server.c | 142 -
daemon/gdm-greeter-server.h | 21
daemon/gdm-product-slave.c | 246 +
daemon/gdm-session-direct.c | 762 +++--
daemon/gdm-session-private.h | 30
daemon/gdm-session-relay.c | 168 -
daemon/gdm-session-worker-job.c | 66
daemon/gdm-session-worker-job.h | 4
daemon/gdm-session-worker.c | 45
daemon/gdm-session.c | 224 +
daemon/gdm-session.h | 63
daemon/gdm-simple-slave.c | 205 +
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 | 1101 ++++++-
gui/simple-greeter/gdm-greeter-login-window.h | 24
gui/simple-greeter/gdm-greeter-session.c | 148 -
gui/simple-greeter/gdm-task-list.c | 269 +
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 | 6
106 files changed, 9572 insertions(+), 1146 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.5 -r 1.6 gdm-multistack.patchIndex: gdm-multistack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-13/gdm-multistack.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- gdm-multistack.patch 9 Mar 2010 15:52:33 -0000 1.5
+++ gdm-multistack.patch 27 Apr 2010 22:12:17 -0000 1.6
@@ -1,7 +1,7 @@
-From 1324842ceb10360ca3c7362dbf0f86f12ec0dd7f Mon Sep 17 00:00:00 2001
+From 5df4d8024ef0126a524892fb714351134bf727da 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/47] Introduce new Conversation object
+Subject: [PATCH 01/45] Introduce new Conversation object
We want to eventually support having multiple
simultaneous PAM conversations in one login
@@ -108,7 +108,7 @@ index 1fff780..ec6300d 100644
static void
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index 77d5801..dff3e68 100644
+index 031ae33..66e4e0e 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -66,6 +66,16 @@
@@ -736,7 +736,7 @@ index 77d5801..dff3e68 100644
g_debug ("GdmSessionDirect: Could not send %s signal", "SetEnvironmentVariable");
}
-@@ -2070,6 +2139,7 @@ static void
+@@ -2075,6 +2144,7 @@ static void
gdm_session_direct_start_session (GdmSession *session)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -744,7 +744,7 @@ index 77d5801..dff3e68 100644
char *command;
char *program;
-@@ -2089,7 +2159,8 @@ gdm_session_direct_start_session (GdmSession *session)
+@@ -2094,7 +2164,8 @@ gdm_session_direct_start_session (GdmSession *session)
setup_session_environment (impl);
send_environment (impl);
@@ -754,7 +754,7 @@ index 77d5801..dff3e68 100644
g_free (program);
}
-@@ -2102,16 +2173,12 @@ gdm_session_direct_close (GdmSession *session)
+@@ -2107,16 +2178,12 @@ gdm_session_direct_close (GdmSession *session)
g_debug ("GdmSessionDirect: Closing session");
@@ -777,7 +777,7 @@ index 77d5801..dff3e68 100644
}
g_free (impl->priv->selected_user);
-@@ -2149,10 +2216,13 @@ gdm_session_direct_answer_query (GdmSession *session,
+@@ -2154,10 +2221,13 @@ gdm_session_direct_answer_query (GdmSession *session,
const char *text)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -792,7 +792,7 @@ index 77d5801..dff3e68 100644
}
static void
-@@ -2162,7 +2232,7 @@ gdm_session_direct_cancel (GdmSession *session)
+@@ -2167,7 +2237,7 @@ gdm_session_direct_cancel (GdmSession *session)
g_return_if_fail (session != NULL);
@@ -801,7 +801,7 @@ index 77d5801..dff3e68 100644
}
char *
-@@ -2227,6 +2297,7 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2232,6 +2302,7 @@ gdm_session_direct_select_session (GdmSession *session,
const char *text)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -809,7 +809,7 @@ index 77d5801..dff3e68 100644
g_free (impl->priv->selected_session);
-@@ -2236,7 +2307,8 @@ gdm_session_direct_select_session (GdmSession *session,
+@@ -2241,7 +2312,8 @@ gdm_session_direct_select_session (GdmSession *session,
impl->priv->selected_session = g_strdup (text);
}
@@ -819,7 +819,7 @@ index 77d5801..dff3e68 100644
get_session_name (impl));
}
-@@ -2245,6 +2317,7 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2250,6 +2322,7 @@ gdm_session_direct_select_language (GdmSession *session,
const char *text)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -827,7 +827,7 @@ index 77d5801..dff3e68 100644
g_free (impl->priv->selected_language);
-@@ -2254,7 +2327,8 @@ gdm_session_direct_select_language (GdmSession *session,
+@@ -2259,7 +2332,8 @@ gdm_session_direct_select_language (GdmSession *session,
impl->priv->selected_language = g_strdup (text);
}
@@ -837,7 +837,7 @@ index 77d5801..dff3e68 100644
get_language_name (impl));
}
-@@ -2263,6 +2337,7 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2268,6 +2342,7 @@ gdm_session_direct_select_layout (GdmSession *session,
const char *text)
{
GdmSessionDirect *impl = GDM_SESSION_DIRECT (session);
@@ -845,7 +845,7 @@ index 77d5801..dff3e68 100644
g_free (impl->priv->selected_layout);
-@@ -2272,7 +2347,8 @@ gdm_session_direct_select_layout (GdmSession *session,
+@@ -2277,7 +2352,8 @@ gdm_session_direct_select_layout (GdmSession *session,
impl->priv->selected_layout = g_strdup (text);
}
@@ -1035,7 +1035,7 @@ index fb199d3..00c2fa4 100644
const char *service_name);
void gdm_session_setup_for_user (GdmSession *session,
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 59e3530..08f88b7 100644
+index 2910366..b3367fa 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -179,7 +179,6 @@ reset_session (GdmSimpleSlave *slave)
@@ -1083,13 +1083,13 @@ index 9a4d7cf..ed13ff7 100644
g_signal_connect (session,
"conversation-started",
--
-1.7.0.1
+1.6.5.2
-From 2ea9e937438d49f6287e2ea00f016ff692c4fc16 Mon Sep 17 00:00:00 2001
+From e408070a9096fc33bcbc95a231c6971ff70db5db Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 02/47] Rename session worker to the service it's managing
+Subject: [PATCH 02/45] Rename session worker to the service it's managing
This way when we're running multiple PAM conversations at once
it will be obvious which worker is managing which conversation.
@@ -1100,7 +1100,7 @@ it will be obvious which worker is manag
3 files changed, 57 insertions(+), 16 deletions(-)
diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c
-index dff3e68..abc3c9d 100644
+index 66e4e0e..3a89871 100644
--- a/daemon/gdm-session-direct.c
+++ b/daemon/gdm-session-direct.c
@@ -1700,6 +1700,7 @@ start_conversation (GdmSessionDirect *session,
@@ -1272,13 +1272,13 @@ index d24f025..4833f23 100644
GPid gdm_session_worker_job_get_pid (GdmSessionWorkerJob *session_worker_job);
--
-1.7.0.1
+1.6.5.2
-From 3bfd8954024306167813532c0f641f19b1fbde18 Mon Sep 17 00:00:00 2001
+From a914187b5f2efb214ca2a41b1fe087d9d9833a32 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 03/47] Make greeter explicitly request PAM conversation
+Subject: [PATCH 03/45] Make greeter explicitly request PAM conversation
Now the greeter has to say what PAM stack it wants the slave to
run. When that stack is ready, we emit the Ready signal as
@@ -1445,7 +1445,7 @@ index 6e92100..7333db1 100644
const char *text);
void gdm_greeter_server_default_language_name_changed (GdmGreeterServer *greeter_server,
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index 08f88b7..a42c38f 100644
+index b3367fa..1a64bbb 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -517,6 +517,7 @@ on_session_secret_info_query (GdmSession *session,
@@ -1601,13 +1601,13 @@ index e7d206a..cd0cbdf 100644
return res;
--
-1.7.0.1
+1.6.5.2
-From ab835c20419bcc61b4b60e8fc6c2d00f6a267496 Mon Sep 17 00:00:00 2001
+From 32e86b62e22d0f25c73ec904674dac1924b54014 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Mar 2009 22:09:21 -0500
-Subject: [PATCH 04/47] start autologin conversation when creating session if necessary
[...2224 lines suppressed...]
gboolean gdm_greeter_server_ready (GdmGreeterServer *greeter_server,
const char *service_name);
diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c
-index efe7fc7..13b47d7 100644
+index 6454d7d..5c3a7fd 100644
--- a/daemon/gdm-simple-slave.c
+++ b/daemon/gdm-simple-slave.c
@@ -211,6 +211,19 @@ queue_greeter_reset (GdmSimpleSlave *slave)
@@ -17781,13 +17653,13 @@ index efe7fc7..13b47d7 100644
G_CALLBACK (on_session_setup_complete),
slave);
--
-1.7.0.1
+1.6.5.2
-From 0639204367cbd9094611c927f2d76292be62a0fe Mon Sep 17 00:00:00 2001
+From 7514ee20b05aeadea6f7593c44cb69d530a8338c Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:46:39 -0400
-Subject: [PATCH 40/47] Catch service-unavailable from server in client and propagate it
+Subject: [PATCH 38/45] Catch service-unavailable from server in client and propagate it
---
gui/simple-greeter/gdm-greeter-client.c | 20 ++++++++++++++++++++
@@ -17860,13 +17732,13 @@ index f879307..801bae4 100644
const char *service_name);
void (* conversation_stopped) (GdmGreeterClient *client,
--
-1.7.0.1
+1.6.5.2
-From 3c01ce811187603615ca73b5c62f3f0848a589aa Mon Sep 17 00:00:00 2001
+From 593c7ec2900a3aecf79ccf43c2ed4ef363ec4c79 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 41/47] Add gdm_task_list_remove_task
+Subject: [PATCH 39/45] Add gdm_task_list_remove_task
---
gui/simple-greeter/gdm-task-list.c | 29 +++++++++++++++++++++++++++++
@@ -17928,13 +17800,13 @@ index 8bc0c0e..3df5415 100644
G_END_DECLS
--
-1.7.0.1
+1.6.5.2
-From 6454f9efb7aa5b9f73ac35c6622094ef0703eeb3 Mon Sep 17 00:00:00 2001
+From a6ce9f2045e3d1f67ad5a61609b05739fed2c505 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 42/47] Remove task from task list if unavailable
+Subject: [PATCH 40/45] Remove task from task list if unavailable
---
gui/simple-greeter/gdm-greeter-login-window.c | 20 ++++++++++++++++++++
@@ -17943,11 +17815,11 @@ Subject: [PATCH 42/47] 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 e185efb..03858e3 100644
+index 4dc4aee..065d08b 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -870,6 +870,26 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
- return TRUE;
+@@ -918,6 +918,26 @@ on_request_timed_login_after_users_loaded (GdmUserChooserWidget *user_chooser,
+ handle_request_timed_login (login_window);
}
+gboolean
@@ -18020,23 +17892,23 @@ index 848ea1e..3bf24e8 100644
G_CALLBACK (on_ready),
session);
--
-1.7.0.1
+1.6.5.2
-From a00cf6e7fb82cc6bc0cfeefbdeb6303e5163d04c Mon Sep 17 00:00:00 2001
+From 949b12b061286aa93279d6bf1811f248d2ceb399 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 43/47] Don't add task to UI if it's invisible
+Subject: [PATCH 41/45] 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 03858e3..4a3df26 100644
+index 065d08b..0141851 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -2113,6 +2113,17 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2184,6 +2184,17 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
g_object_unref (actions);
@@ -18054,7 +17926,7 @@ index 03858e3..4a3df26 100644
g_signal_connect_swapped (GDM_CONVERSATION (extension),
"answer",
G_CALLBACK (on_conversation_answer),
-@@ -2126,9 +2137,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2197,9 +2208,6 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
G_CALLBACK (on_conversation_chose_user),
login_window);
@@ -18065,13 +17937,13 @@ index 03858e3..4a3df26 100644
name, description);
--
-1.7.0.1
+1.6.5.2
-From 29c3f9d27a6e2c9c2769641eece61bf80bf3dfcb Mon Sep 17 00:00:00 2001
+From baa7dae65b1de218bc3f95f19e1727458cf3619d 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 44/47] add lame check to see if fingerprint is enabled
+Subject: [PATCH 42/45] add lame check to see if fingerprint is enabled
---
.../fingerprint/gdm-fingerprint-extension.c | 35 +++++++++++++++++++-
@@ -18124,13 +17996,13 @@ index e1fc0ed..b749ac1 100644
static void
--
-1.7.0.1
+1.6.5.2
-From c493295a0a421dfa757bb2809aa694356ae3f4a0 Mon Sep 17 00:00:00 2001
+From 2c41cf9ee83412bb5925d7399e26c2a76d8e26f6 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 45/47] don't activate invisible tasks
+Subject: [PATCH 43/45] don't activate invisible tasks
---
gui/simple-greeter/gdm-task-list.c | 4 ++++
@@ -18152,13 +18024,13 @@ index dd77ed6..c9d7451 100644
gtk_widget_set_sensitive (GTK_WIDGET (widget), TRUE);
--
-1.7.0.1
+1.6.5.2
-From 427844337e5690d0a750f1641a5066f96c144b15 Mon Sep 17 00:00:00 2001
+From 9f97661ebdbc37a7bb8f6897dd9cae63ff7f999b 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 46/47] Add lame check for smart card daemon
+Subject: [PATCH 44/45] Add lame check for smart card daemon
We don't want to show the smart card bits if the daemon isn't running
@@ -18204,13 +18076,13 @@ index 9967d5f..903e18d 100644
static void
--
-1.7.0.1
+1.6.5.2
-From 8bc988c89f9c24e59c374a1ddc4c7efd2380bd3b Mon Sep 17 00:00:00 2001
+From 397a9d2cf77d160bda439578320b04f7b0f26266 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 47/47] Don't delay login for passwd -d users
+Subject: [PATCH 45/45] 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
@@ -18220,10 +18092,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 4a3df26..de45663 100644
+index 0141851..2c65e61 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -966,7 +966,7 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -1013,7 +1013,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.
*/
@@ -18233,5 +18105,5 @@ index 4a3df26..de45663 100644
g_debug ("GdmGreeterLoginWindow: Okay, we'll start the session anyway,"
"because the user isn't ever going to get an opportunity to"
--
-1.7.0.1
+1.6.5.2
Index: gdm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-13/gdm.spec,v
retrieving revision 1.512
retrieving revision 1.513
diff -u -p -r1.512 -r1.513
--- gdm.spec 30 Mar 2010 00:32:43 -0000 1.512
+++ gdm.spec 27 Apr 2010 22:12:18 -0000 1.513
@@ -14,7 +14,7 @@
Summary: The GNOME Display Manager
Name: gdm
-Version: 2.30.0
+Version: 2.30.2
Release: 1%{?dist}
Epoch: 1
License: GPLv2+
@@ -402,6 +402,9 @@ fi
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Tue Apr 27 2010 Ray Strode <rstrode at redhat.com> 2.30.2-1
+- Update to 2.32.2
+
* Mon Mar 29 2010 Matthias Clasen <mclasen at redhat.com> 2.30.0-1
- Update to 2.30.0
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gdm/F-13/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- sources 30 Mar 2010 00:07:56 -0000 1.121
+++ sources 27 Apr 2010 22:12:19 -0000 1.122
@@ -1 +1 @@
-0da84637abbcbf1666529d6192a81e6b gdm-2.30.0.tar.bz2
+ba35f9f750b50be572952195989df2c5 gdm-2.30.2.tar.bz2
More information about the scm-commits
mailing list