[gdm/f14/master] Update to 2.32.0
Matthias Clasen
mclasen at fedoraproject.org
Thu Sep 30 14:59:06 UTC 2010
commit d225e860821fb1ae14de2429e0f0ca613c899911
Author: Matthias Clasen <mclasen at redhat.com>
Date: Thu Sep 30 10:58:21 2010 -0400
Update to 2.32.0
.gitignore | 1 +
gdm-multistack.patch | 538 +++++++++++++++++++++++++++++++++++---------------
gdm.spec | 9 +-
sources | 2 +-
4 files changed, 389 insertions(+), 161 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b6c00b6..97e71d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gdm-2.30.2.tar.bz2
/gdm-2.31.90.tar.bz2
+/gdm-2.32.0.tar.bz2
diff --git a/gdm-multistack.patch b/gdm-multistack.patch
index 68f2e45..4930230 100644
--- a/gdm-multistack.patch
+++ b/gdm-multistack.patch
@@ -1,7 +1,7 @@
-From bfe236555216f30e82c562ad0393a1762afdfab2 Mon Sep 17 00:00:00 2001
+From f7d2b3e241a8856f9a57cc47d36caaa73afb2237 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 22 Jul 2010 13:38:09 -0400
-Subject: [PATCH 01/35] Revert "Don't wait a mandatory 2 seconds when resetting greeter"
+Subject: [PATCH 01/34] Revert "Don't wait a mandatory 2 seconds when resetting greeter"
This reverts commit 83552f19154bf5689b395a76c1a9931b2558f41b.
@@ -25,13 +25,17 @@ index 2994014..6b9159a 100644
static void
--
+<<<<<<< HEAD
1.7.2.2
+=======
+1.7.3
+>>>>>>> 49a9b45... Update to 2.32.0
-From 7ced60d18d4aed59060e260550bf7e1837018c93 Mon Sep 17 00:00:00 2001
+From fbf8627abdc2f83a1295ac8a6efd8bb295ed1e78 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 7 Jul 2010 17:16:38 -0400
-Subject: [PATCH 02/35] Don't set list-visible unless the widget is visible
+Subject: [PATCH 02/34] Don't set list-visible unless the widget is visible
list-visible is a special property that means the
list part of the chooser widget is visible. We need
@@ -46,10 +50,10 @@ isn't visible to begin with.
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
-index 9e3ae73..28c8404 100644
+index db2d9b2..5a078e8 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
-@@ -698,7 +698,7 @@ update_chooser_visibility (GdmChooserWidget *widget)
+@@ -699,7 +699,7 @@ update_chooser_visibility (GdmChooserWidget *widget)
if (gdm_chooser_widget_get_number_of_items (widget) > 0) {
gtk_widget_show (widget->priv->frame);
@@ -59,13 +63,17 @@ index 9e3ae73..28c8404 100644
gtk_widget_hide (widget->priv->frame);
set_chooser_list_visible (widget, FALSE);
--
+<<<<<<< HEAD
1.7.2.2
+=======
+1.7.3
+>>>>>>> 49a9b45... Update to 2.32.0
-From 686cfe7fc5d691f31323751b57aa24f3034231aa Mon Sep 17 00:00:00 2001
+From 90d0a15326f9918687e1929cdf567b04fa6f7c3f Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 28 Jun 2010 14:35:35 -0400
-Subject: [PATCH 03/35] Add user chooser to ui file
+Subject: [PATCH 03/34] Add user chooser to ui file
Before it was getting added manually from the source code.
@@ -76,10 +84,10 @@ This way is a lot cleaner.
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 96e6fce..95371b8 100644
+index ca170a5..8ed7a6b 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1208,6 +1208,17 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1221,6 +1221,17 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
static void
@@ -97,7 +105,7 @@ index 96e6fce..95371b8 100644
load_theme (GdmGreeterLoginWindow *login_window)
{
GtkWidget *entry;
-@@ -1218,6 +1229,8 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1231,6 +1242,8 @@ load_theme (GdmGreeterLoginWindow *login_window)
gdm_profile_start (NULL);
@@ -106,7 +114,7 @@ index 96e6fce..95371b8 100644
login_window->priv->builder = gtk_builder_new ();
if (!gtk_builder_add_from_file (login_window->priv->builder, UIDIR "/" UI_XML_FILE, &error)) {
g_warning ("Couldn't load builder file: %s", error->message);
-@@ -1251,12 +1264,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1264,12 +1277,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "window-frame"));
gtk_container_add (GTK_CONTAINER (login_window), box);
@@ -141,13 +149,17 @@ index d8cf1cc..83375ed 100644
<child>
<object class="GtkHBox" id="auth-input-box">
--
+<<<<<<< HEAD
1.7.2.2
+=======
+1.7.3
+>>>>>>> 49a9b45... Update to 2.32.0
-From e2b84e687b0fd3ccd5e53b6dca5c24689c42ffcd Mon Sep 17 00:00:00 2001
+From 450c5e7e0efeeeeeb663e9e5b191d43cfd39829a Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 20 Feb 2009 14:05:20 -0500
-Subject: [PATCH 04/35] Add new api to ask when chooser widget is done loading items
+Subject: [PATCH 04/34] Add new api to ask when chooser widget is done loading items
---
gui/simple-greeter/gdm-chooser-widget.c | 8 ++++++++
@@ -155,10 +167,10 @@ Subject: [PATCH 04/35] Add new api to ask when chooser widget is done loading it
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/gui/simple-greeter/gdm-chooser-widget.c b/gui/simple-greeter/gdm-chooser-widget.c
-index 28c8404..4fa7175 100644
+index 5a078e8..6b4dd67 100644
--- a/gui/simple-greeter/gdm-chooser-widget.c
+++ b/gui/simple-greeter/gdm-chooser-widget.c
-@@ -98,6 +98,7 @@ struct GdmChooserWidgetPrivate
+@@ -99,6 +99,7 @@ struct GdmChooserWidgetPrivate
guint32 should_hide_inactive_items : 1;
guint32 emit_activated_after_resize_animation : 1;
@@ -166,7 +178,7 @@ index 28c8404..4fa7175 100644
GdmChooserWidgetPosition separator_position;
GdmChooserWidgetState state;
-@@ -2741,9 +2742,16 @@ gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget)
+@@ -2843,9 +2844,16 @@ gdm_chooser_widget_propagate_pending_key_events (GdmChooserWidget *widget)
gdm_scrollable_widget_replay_queued_key_events (GDM_SCROLLABLE_WIDGET (widget->priv->scrollable_widget));
}
@@ -197,13 +209,17 @@ index 11a6456..3f6fea3 100644
*/
void gdm_chooser_widget_loaded (GdmChooserWidget *widget);
--
+<<<<<<< HEAD
1.7.2.2
+=======
+1.7.3
+>>>>>>> 49a9b45... Update to 2.32.0
-From 19f14037c4e503c21d205e45cc3a3b3354a7c198 Mon Sep 17 00:00:00 2001
+From 794b3df0b2e16a734a177184cf4f5b9da5ed4977 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Mar 2009 11:19:40 -0500
-Subject: [PATCH 05/35] Create session settings object up front
+Subject: [PATCH 05/34] Create session settings object up front
This allows us to set language, session, etc,
before the PAM conversation is started.
@@ -212,10 +228,10 @@ before the PAM conversation is started.
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index 3715396..775f99b 100644
+index 11dc800..6082fd8 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
-@@ -2334,8 +2334,6 @@ do_setup (GdmSessionWorker *worker)
+@@ -2336,8 +2336,6 @@ do_setup (GdmSessionWorker *worker)
GError *error;
gboolean res;
@@ -224,7 +240,7 @@ index 3715396..775f99b 100644
g_signal_connect_swapped (worker->priv->user_settings,
"notify::language-name",
G_CALLBACK (on_saved_language_name_read),
-@@ -2961,6 +2959,7 @@ gdm_session_worker_init (GdmSessionWorker *worker)
+@@ -2963,6 +2961,7 @@ gdm_session_worker_init (GdmSessionWorker *worker)
g_str_equal,
(GDestroyNotify) g_free,
(GDestroyNotify) g_free);
@@ -233,13 +249,20 @@ index 3715396..775f99b 100644
static void
--
+<<<<<<< HEAD
1.7.2.2
From 0c706f20aac5759b2f6b6fc7f54aba6b0ae6c3ce Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 191e6011c8264265feea29cf781b0ff883b83dd2 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 13 Jul 2010 22:42:43 -0400
-Subject: [PATCH 06/35] disconnect signal handlers in destroy session
+Subject: [PATCH 06/34] disconnect signal handlers in destroy session
We don't want them firing as part of object destruction
---
@@ -376,13 +399,20 @@ index 6b9159a..cd343c7 100644
GdmSimpleSlave *slave)
{
--
+<<<<<<< HEAD
1.7.2.2
From fc8e33d9853fb42a738097f0552f4e1b43b6bb35 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From d765b90a29c719f18dfe0b94652720b854a071a9 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 11:00:08 -0500
-Subject: [PATCH 07/35] Introduce new Conversation object
+Subject: [PATCH 07/34] Introduce new Conversation object
We want to eventually support having multiple
simultaneous PAM conversations in one login
@@ -1464,13 +1494,20 @@ index 8bed085..9bfda86 100644
g_signal_connect (session,
"conversation-started",
--
+<<<<<<< HEAD
1.7.2.2
From d88e3d3c3574a96afe3fd1c8008ee9582f6c2910 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 37344a3c548715ff7408f5198fe80d816f3480cf Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Feb 2009 10:55:03 -0500
-Subject: [PATCH 08/35] Rename session worker to the service it's managing
+Subject: [PATCH 08/34] 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.
@@ -1653,13 +1690,20 @@ index d24f025..4833f23 100644
GPid gdm_session_worker_job_get_pid (GdmSessionWorkerJob *session_worker_job);
--
+<<<<<<< HEAD
1.7.2.2
From 267162d00a4807295d9a65daec94d806e675a615 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 4e72956a17e50adf57b96d3dfdd47380a1fa87c9 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 13:01:48 -0500
-Subject: [PATCH 09/35] Make greeter/autologin session explicitly request PAM conversation
+Subject: [PATCH 09/34] Make greeter/autologin session explicitly request PAM conversation
Now the greeter (and also the autologin code) has to say what
PAM stack it wants the slave to run. When that stack is ready,
@@ -2014,13 +2058,20 @@ index d4ef77f..63de620 100644
return res;
--
+<<<<<<< HEAD
1.7.2.2
From 9c4dda8ccab58f2873d0cdd48e196037cd4c4175 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From cb88bae99e85b08491a3c612f543a32ff1556d2d Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 16 Jan 2009 15:18:31 -0500
-Subject: [PATCH 10/35] Store multiple conversations in the session
+Subject: [PATCH 10/34] Store multiple conversations in the session
We keep multiple conversations in the session now, keyed off of
PAM service is at the other end. Much of the guts still
@@ -5008,10 +5059,10 @@ index a0b4cbf..98ccc51 100644
return DBUS_HANDLER_RESULT_HANDLED;
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index 775f99b..6abd97d 100644
+index 6082fd8..fd11907 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
-@@ -2892,6 +2892,28 @@ worker_dbus_filter_function (DBusConnection *connection,
+@@ -2894,6 +2894,28 @@ worker_dbus_filter_function (DBusConnection *connection,
return DBUS_HANDLER_RESULT_HANDLED;
}
@@ -5040,7 +5091,7 @@ index 775f99b..6abd97d 100644
static GObject *
gdm_session_worker_constructor (GType type,
guint n_construct_properties,
-@@ -2918,6 +2940,11 @@ gdm_session_worker_constructor (GType type,
+@@ -2920,6 +2942,11 @@ gdm_session_worker_constructor (GType type,
exit (1);
}
@@ -6667,13 +6718,20 @@ index 63de620..b7e7f1c 100644
static int
--
+<<<<<<< HEAD
1.7.2.2
From d230a78a749f42fd5215ee4e651888105e28c3f0 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 12c545e0d3bee590afca92120029f7ba2ac1eeec Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 16:05:14 -0400
-Subject: [PATCH 11/35] Return a different error code for "service won't work" than "auth failed"
+Subject: [PATCH 11/34] Return a different error code for "service won't work" than "auth failed"
If we bubble it up to the greeter then we should be able to have
a more sensible UI when e.g. fingerprinting isn't enabled.
@@ -6683,7 +6741,7 @@ a more sensible UI when e.g. fingerprinting isn't enabled.
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index 6abd97d..ed6cacf 100644
+index fd11907..0fd7268 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
@@ -1306,8 +1306,8 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker,
@@ -6727,13 +6785,20 @@ index ee5465a..b1c8285 100644
GDM_SESSION_WORKER_ERROR_AUTHORIZING,
GDM_SESSION_WORKER_ERROR_OPENING_LOG_FILE,
--
+<<<<<<< HEAD
1.7.2.2
From 440f428b1afbb472fac647e2fa4682e081be671f Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From e19cd77d22eddf31215e3a6c36c3e975e18df186 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:32:00 -0400
-Subject: [PATCH 12/35] Emit "service-unavailable" from session when pam service refuses to work
+Subject: [PATCH 12/34] Emit "service-unavailable" from session when pam service refuses to work
---
daemon/gdm-session-direct.c | 26 +++++++++++++++++++++++---
@@ -6860,10 +6925,10 @@ index 98ccc51..88aee14 100644
" </method>\n"
" <method name=\"SetupFailed\">\n"
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c
-index ed6cacf..8e1fa80 100644
+index 0fd7268..ab2f6c5 100644
--- a/daemon/gdm-session-worker.c
+++ b/daemon/gdm-session-worker.c
-@@ -2382,9 +2382,16 @@ do_setup (GdmSessionWorker *worker)
+@@ -2384,9 +2384,16 @@ do_setup (GdmSessionWorker *worker)
worker->priv->display_device,
&error);
if (! res) {
@@ -6883,7 +6948,7 @@ index ed6cacf..8e1fa80 100644
g_error_free (error);
return;
}
-@@ -2405,10 +2412,18 @@ do_authenticate (GdmSessionWorker *worker)
+@@ -2407,10 +2414,18 @@ do_authenticate (GdmSessionWorker *worker)
worker->priv->password_is_required,
&error);
if (! res) {
@@ -6966,13 +7031,20 @@ index 22c2ccb..9636b92 100644
const char *service_name);
void (* setup_for_user) (GdmSession *session,
--
+<<<<<<< HEAD
1.7.2.2
From 633789ad11b0475fbdba987692ec5ebb5143fe9b Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 0c423df1aa38bd16a71f4d0b3224de16bfc78a54 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:38:52 -0400
-Subject: [PATCH 13/35] Bubble service-unavailable up to greeter
+Subject: [PATCH 13/34] Bubble service-unavailable up to greeter
---
daemon/gdm-greeter-server.c | 13 +++++++++++--
@@ -7100,13 +7172,20 @@ index 4f4f331..6faeeb3 100644
slave);
g_signal_handlers_disconnect_by_func (slave->priv->session,
--
+<<<<<<< HEAD
1.7.2.2
From cd3fdb44fdea51277dbf1fa3bf9f470a657df626 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 3bc57989d1a1ba68f9029202ca18b05f274dc376 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 21:46:39 -0400
-Subject: [PATCH 14/35] Catch service-unavailable from server in client and propagate it
+Subject: [PATCH 14/34] Catch service-unavailable from server in client and propagate it
---
gui/simple-greeter/gdm-greeter-client.c | 20 ++++++++++++++++++++
@@ -7179,13 +7258,20 @@ index 2f27503..917ca9c 100644
const char *service_name);
void (* reset) (GdmGreeterClient *client);
--
+<<<<<<< HEAD
1.7.2.2
From 18877571d83bf9ff9a496f8caf18b3933c8a082d Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 02c136a9a08099931a3df1b1be7132fea1f0d11a Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Thu, 5 Feb 2009 15:20:25 -0500
-Subject: [PATCH 15/35] Queue a greeter reset when the user clicks cancel
+Subject: [PATCH 15/34] Queue a greeter reset when the user clicks cancel
---
daemon/gdm-simple-slave.c | 34 ++++++++++++++++++++++++++++++++++
@@ -7314,13 +7400,20 @@ index 6faeeb3..05972a4 100644
}
--
+<<<<<<< HEAD
1.7.2.2
From 6a1a72cd49dc224ab5a4212e7a9935853731c274 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 767bf4957dd632d6327e9bf5509066ab613ddec4 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Nov 2009 13:35:26 -0500
-Subject: [PATCH 16/35] Don't delay login for passwd -d users
+Subject: [PATCH 16/34] 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
@@ -7330,10 +7423,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 95371b8..a0caff9 100644
+index 8ed7a6b..afa8d47 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -840,7 +840,7 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -845,7 +845,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.
*/
@@ -7343,13 +7436,20 @@ index 95371b8..a0caff9 100644
g_debug ("GdmGreeterLoginWindow: Okay, we'll start the session anyway,"
"because the user isn't ever going to get an opportunity to"
--
+<<<<<<< HEAD
1.7.2.2
From 1c3b63a8ac87ee569ae1d8e626c208a38b590f68 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From e53e60a2ee5dafc9095beff838351ff078245e59 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 30 Jan 2009 23:57:31 -0500
-Subject: [PATCH 17/35] Add a plugin based extension system to greeter
+Subject: [PATCH 17/34] Add a plugin based extension system to greeter
This allows plugins to drive which PAM conversations
get run. This commit just adds one plugin "password"
@@ -7388,7 +7488,7 @@ run.
gui/simple-greeter/plugins/password/page.ui | 57 ++
gui/simple-greeter/plugins/password/plugin.c | 40 +
po/POTFILES.in | 1 +
- 32 files changed, 3749 insertions(+), 252 deletions(-)
+ 32 files changed, 3746 insertions(+), 255 deletions(-)
create mode 100644 gui/simple-greeter/gdm-greeter-plugin.c
create mode 100644 gui/simple-greeter/gdm-greeter-plugin.h
create mode 100644 gui/simple-greeter/gdm-plugin-manager.c
@@ -7421,7 +7521,7 @@ index d5455e1..d8a9e72 100644
VOID:DOUBLE
+BOOLEAN:STRING
diff --git a/configure.ac b/configure.ac
-index fd920c0..ab35800 100644
+index ed07dce..67b4cab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,22 @@ AC_PROG_CXX
@@ -7643,7 +7743,7 @@ index 917ca9c..3fd62d4 100644
void (* authentication_failed) (GdmGreeterClient *client);
void (* selected_user_changed) (GdmGreeterClient *client,
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index a0caff9..36a6d21 100644
+index afa8d47..77b235c 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -1,7 +1,7 @@
@@ -8104,19 +8204,21 @@ index a0caff9..36a6d21 100644
label = GTK_WIDGET (gtk_builder_get_object (GDM_GREETER_LOGIN_WINDOW (login_window)->priv->builder, "auth-prompt-label"));
gtk_label_set_text (GTK_LABEL (label), "");
-@@ -667,7 +819,10 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
+@@ -667,12 +819,9 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
if (can_jump_to_authenticate (login_window)) {
/* If we don't have a user list jump straight to authenticate */
g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate");
- switch_mode (login_window, MODE_AUTHENTICATION);
-+
-+ g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
-+ 0, GDM_USER_CHOOSER_USER_OTHER);
+-
+- g_debug ("Starting PAM conversation since no local users");
+ g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
+ 0, GDM_USER_CHOOSER_USER_OTHER);
+- g_signal_emit (login_window, signals[BEGIN_VERIFICATION], 0);
+ begin_verification (login_window);
} else {
switch_mode (login_window, dialog_mode);
}
-@@ -683,88 +838,177 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
+@@ -688,88 +837,177 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
}
static void
@@ -8217,15 +8319,15 @@ index a0caff9..36a6d21 100644
+ /* If every conversation has failed, then just start over.
+ */
+ task = gdm_task_list_get_active_task (GDM_TASK_LIST (login_window->priv->conversation_list));
-+
+
+- /* FIXME: shake? */
+- reset_dialog (login_window, MODE_AUTHENTICATION);
+ if (!gdm_task_is_enabled (task)) {
+ g_debug ("GdmGreeterLoginWindow: No conversations left, starting over");
+ restart_conversations (login_window);
+ }
+ g_object_unref (task);
-
-- /* FIXME: shake? */
-- reset_dialog (login_window, MODE_AUTHENTICATION);
++
+ update_conversation_list_visibility (login_window);
return TRUE;
@@ -8321,7 +8423,7 @@ index a0caff9..36a6d21 100644
return TRUE;
}
-@@ -788,6 +1032,26 @@ request_timed_login (GdmGreeterLoginWindow *login_window)
+@@ -793,6 +1031,26 @@ request_timed_login (GdmGreeterLoginWindow *login_window)
login_window->priv->timed_login_already_enabled = TRUE;
}
@@ -8348,7 +8450,7 @@ index a0caff9..36a6d21 100644
void
gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window,
const char *username,
-@@ -815,11 +1079,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
+@@ -820,11 +1078,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo
}
static void
@@ -8372,7 +8474,7 @@ index a0caff9..36a6d21 100644
} else {
g_debug ("GdmGreeterLoginWindow: not starting session since "
"user hasn't had an opportunity to pick language "
-@@ -829,8 +1103,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -834,8 +1102,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
*/
login_window->priv->start_session_handler_id =
g_signal_connect (login_window, "notify::is-interactive",
@@ -8383,7 +8485,7 @@ index a0caff9..36a6d21 100644
/* FIXME: If the user wasn't asked any questions by pam but
* pam still authorized them (passwd -d, or the questions got
-@@ -853,10 +1127,10 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
+@@ -858,10 +1126,10 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_
gboolean
gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
@@ -8396,7 +8498,7 @@ index a0caff9..36a6d21 100644
g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
-@@ -865,15 +1139,15 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -870,15 +1138,15 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
g_debug ("GdmGreeterLoginWindow: info query: %s", text);
@@ -8419,7 +8521,7 @@ index a0caff9..36a6d21 100644
set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -885,25 +1159,26 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -890,25 +1158,26 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
gboolean
gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
@@ -8455,7 +8557,7 @@ index a0caff9..36a6d21 100644
set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
set_ready (GDM_GREETER_LOGIN_WINDOW (login_window));
set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -914,13 +1189,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -919,13 +1188,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
}
void
@@ -8475,7 +8577,7 @@ index a0caff9..36a6d21 100644
}
static void
-@@ -991,6 +1269,49 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window)
+@@ -996,6 +1268,49 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window)
update_banner_message (login_window);
}
@@ -8525,7 +8627,7 @@ index a0caff9..36a6d21 100644
static void
on_users_loaded (GdmUserChooserWidget *user_chooser,
GdmGreeterLoginWindow *login_window)
-@@ -1004,38 +1325,153 @@ on_users_loaded (GdmUserChooserWidget *user_chooser,
+@@ -1009,38 +1324,153 @@ on_users_loaded (GdmUserChooserWidget *user_chooser,
gtk_widget_show (login_window->priv->user_chooser);
}
@@ -8546,10 +8648,12 @@ index a0caff9..36a6d21 100644
0, GDM_USER_CHOOSER_USER_OTHER);
- g_signal_emit (login_window, signals[BEGIN_VERIFICATION], 0);
+ begin_verification (login_window);
-+ }
-+}
-+
-+static void
+ }
+ }
+
+ static void
+-on_user_chosen (GdmUserChooserWidget *user_chooser,
+- GdmGreeterLoginWindow *login_window)
+choose_user (GdmGreeterLoginWindow *login_window,
+ const char *user_name)
+{
@@ -8596,7 +8700,7 @@ index a0caff9..36a6d21 100644
+{
+ if (task == given_task) {
+ return FALSE;
- }
++ }
+
+ gdm_conversation_reset (GDM_CONVERSATION (task));
+ return FALSE;
@@ -8610,11 +8714,9 @@ index a0caff9..36a6d21 100644
+ (GdmTaskListForeachFunc)
+ reset_task_if_not_given,
+ task);
- }
-
- static void
--on_user_chosen (GdmUserChooserWidget *user_chooser,
-- GdmGreeterLoginWindow *login_window)
++}
++
++static void
+begin_single_service_verification (GdmGreeterLoginWindow *login_window,
+ const char *service_name)
+{
@@ -8691,7 +8793,7 @@ index a0caff9..36a6d21 100644
}
static void
-@@ -1206,11 +1642,74 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
+@@ -1219,11 +1649,74 @@ create_computer_info (GdmGreeterLoginWindow *login_window)
#define INVISIBLE_CHAR_BULLET 0x2022
#define INVISIBLE_CHAR_NONE 0
@@ -8767,7 +8869,7 @@ index a0caff9..36a6d21 100644
int i;
for (i = 0; i < G_N_ELEMENTS (types); i++) {
-@@ -1221,7 +1720,6 @@ register_custom_types (GdmGreeterLoginWindow *login_window)
+@@ -1234,7 +1727,6 @@ register_custom_types (GdmGreeterLoginWindow *login_window)
static void
load_theme (GdmGreeterLoginWindow *login_window)
{
@@ -8775,7 +8877,7 @@ index a0caff9..36a6d21 100644
GtkWidget *button;
GtkWidget *box;
GtkWidget *image;
-@@ -1274,7 +1772,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1287,7 +1779,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
login_window);
g_signal_connect (login_window->priv->user_chooser,
"activated",
@@ -8784,7 +8886,7 @@ index a0caff9..36a6d21 100644
login_window);
g_signal_connect (login_window->priv->user_chooser,
"deactivated",
-@@ -1286,30 +1784,30 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1299,30 +1791,30 @@ load_theme (GdmGreeterLoginWindow *login_window)
G_CALLBACK (on_user_chooser_visibility_changed),
login_window);
@@ -8828,7 +8930,7 @@ index a0caff9..36a6d21 100644
gdm_profile_end (NULL);
}
-@@ -1465,6 +1963,15 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1478,6 +1970,15 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
widget_class->key_press_event = gdm_greeter_login_window_key_press_event;
widget_class->size_request = gdm_greeter_login_window_size_request;
@@ -8844,7 +8946,7 @@ index a0caff9..36a6d21 100644
signals [BEGIN_AUTO_LOGIN] =
g_signal_new ("begin-auto-login",
G_TYPE_FROM_CLASS (object_class),
-@@ -1481,9 +1988,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1494,9 +1995,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification),
NULL,
NULL,
@@ -8856,7 +8958,7 @@ index a0caff9..36a6d21 100644
signals [BEGIN_VERIFICATION_FOR_USER] =
g_signal_new ("begin-verification-for-user",
G_TYPE_FROM_CLASS (object_class),
-@@ -1491,9 +1998,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1504,9 +2005,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification_for_user),
NULL,
NULL,
@@ -8868,7 +8970,7 @@ index a0caff9..36a6d21 100644
signals [QUERY_ANSWER] =
g_signal_new ("query-answer",
G_TYPE_FROM_CLASS (object_class),
-@@ -1501,9 +2008,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1514,9 +2015,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, query_answer),
NULL,
NULL,
@@ -8880,7 +8982,7 @@ index a0caff9..36a6d21 100644
signals [USER_SELECTED] =
g_signal_new ("user-selected",
G_TYPE_FROM_CLASS (object_class),
-@@ -1541,9 +2048,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
+@@ -1554,9 +2055,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass)
G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session),
NULL,
NULL,
@@ -8892,7 +8994,7 @@ index a0caff9..36a6d21 100644
g_object_class_install_property (object_class,
PROP_DISPLAY_IS_LOCAL,
-@@ -1596,6 +2103,246 @@ on_gconf_key_changed (GConfClient *client,
+@@ -1609,6 +2110,246 @@ on_gconf_key_changed (GConfClient *client,
}
}
@@ -11007,10 +11109,10 @@ index 0000000..1c15168
+
+#endif /* __GDM_TASK_LIST_H */
diff --git a/gui/simple-greeter/gdm-user-chooser-widget.c b/gui/simple-greeter/gdm-user-chooser-widget.c
-index 211b033..33708b9 100644
+index 19a7922..daa55fc 100644
--- a/gui/simple-greeter/gdm-user-chooser-widget.c
+++ b/gui/simple-greeter/gdm-user-chooser-widget.c
-@@ -365,9 +365,30 @@ gdm_user_chooser_widget_set_show_user_auto (GdmUserChooserWidget *widget,
+@@ -371,9 +371,30 @@ gdm_user_chooser_widget_set_show_user_auto (GdmUserChooserWidget *widget,
char *
gdm_user_chooser_widget_get_chosen_user_name (GdmUserChooserWidget *widget)
{
@@ -12380,13 +12482,20 @@ index 1fccb90..7c344c9 100644
gui/user-switch-applet/gdm-entry-menu-item.c
gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--
+<<<<<<< HEAD
1.7.2.2
From a298f20f8a47763215b45e07afcb3e5d39f5c20b Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From a97c6bd001162f5a8b2d7a0a90508a871e2238f3 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:25:50 -0400
-Subject: [PATCH 18/35] squash with password
+Subject: [PATCH 18/34] squash with password
---
.../plugins/password/gdm-password-extension.c | 11 ++++++++++-
@@ -12445,13 +12554,20 @@ index 255283e..11a171c 100644
static void
--
+<<<<<<< HEAD
1.7.2.2
From c0eb496fc909661da80d9e0e28d1041dc6c401d3 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 396ae085b57e36ab91c71a2c2926c5bddebb1eb4 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Aug 2010 11:13:10 -0400
-Subject: [PATCH 19/35] task list fix
+Subject: [PATCH 19/34] task list fix
---
gui/simple-greeter/gdm-task-list.c | 11 ++++++++---
@@ -12495,13 +12611,20 @@ index a7f8c74..906938d 100644
button = g_object_get_data (G_OBJECT (task), "gdm-task-list-button");
--
+<<<<<<< HEAD
1.7.2.2
From d2dec665069a5a3d2899b492b6beff7b245d2ce0 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 6dfe9ceba14c83c3215931327de140f4b235e75d Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 29 Jun 2010 14:13:35 -0400
-Subject: [PATCH 20/35] Show cancel button after first message
+Subject: [PATCH 20/34] Show cancel button after first message
Not all PAM modules ask for input at the keyboard. We need
to show the cancel button after the first message even if
@@ -12511,10 +12634,10 @@ that message isn't asking for input.
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 36a6d21..5845c7b 100644
+index 77b235c..60c4d00 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -827,6 +827,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
+@@ -826,6 +826,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
switch_mode (login_window, dialog_mode);
}
@@ -12522,7 +12645,7 @@ index 36a6d21..5845c7b 100644
set_sensitive (login_window, TRUE);
set_ready (login_window);
set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
-@@ -977,6 +978,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -976,6 +977,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
g_debug ("GdmGreeterLoginWindow: info: %s", text);
@@ -12530,7 +12653,7 @@ index 36a6d21..5845c7b 100644
task = find_task_with_service_name (login_window, service_name);
if (task != NULL) {
-@@ -999,6 +1001,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -998,6 +1000,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
g_debug ("GdmGreeterLoginWindow: problem: %s", text);
@@ -12539,13 +12662,20 @@ index 36a6d21..5845c7b 100644
if (task != NULL) {
--
+<<<<<<< HEAD
1.7.2.2
From 649f3dde0dd320226a745bebc01bd53a450bdbde Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 699f426299d23d0d8d84442af60e4f690adecede Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 28 Oct 2009 11:13:10 -0400
-Subject: [PATCH 21/35] Prevent start session signal handler from getting called multiple times
+Subject: [PATCH 21/34] Prevent start session signal handler from getting called multiple times
It was causing a double free.
---
@@ -12553,10 +12683,10 @@ It was causing a double free.
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 5845c7b..d0c0781 100644
+index 60c4d00..74e3b12 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1086,8 +1086,17 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window,
+@@ -1085,8 +1085,17 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window,
GParamSpec *param_spec,
char *service_name)
{
@@ -12575,13 +12705,20 @@ index 5845c7b..d0c0781 100644
static void
--
+<<<<<<< HEAD
1.7.2.2
From 965429573ae1d3c99061f1bc369f883fd65317a2 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 127a965565b6644ba2df3866abc600afe1469078 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 22/35] Add fingerprint plugin
+Subject: [PATCH 22/34] Add fingerprint plugin
This commit adds a plugin to initiate a conversation for
fingerprint scans.
@@ -12614,7 +12751,7 @@ fingerprint scans.
create mode 100644 gui/simple-greeter/plugins/fingerprint/plugin.c
diff --git a/configure.ac b/configure.ac
-index ab35800..af7c2f3 100644
+index 67b4cab..f8829f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1445,6 +1445,10 @@ gui/simple-greeter/libgdmsimplegreeter/Makefile
@@ -13346,13 +13483,20 @@ index 7c344c9..dd08b21 100644
gui/user-switch-applet/gdm-entry-menu-item.c
gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--
+<<<<<<< HEAD
1.7.2.2
From 516c35fc268333a047ca8f60c5e614971228ee81 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From e377e2770fabc19f4337f2f01c0150e8d84f19dd Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Feb 2009 16:25:47 -0500
-Subject: [PATCH 23/35] Add smartcard plugin
+Subject: [PATCH 23/34] Add smartcard plugin
This commit adds a plugin to initiate a conversation when
smartcards are inserted.
@@ -13395,7 +13539,7 @@ smartcards are inserted.
create mode 100644 gui/simple-greeter/plugins/smartcard/plugin.c
diff --git a/configure.ac b/configure.ac
-index af7c2f3..abec739 100644
+index f8829f6..28b08d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4
@@ -16863,13 +17007,20 @@ index dd08b21..ed922a5 100644
gui/user-switch-applet/gdm-entry-menu-item.c
gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in
--
+<<<<<<< HEAD
1.7.2.2
From 4263f7ad304f1c816050404e0931a3f309cfa137 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 52586f856c5ae4c1e21fe0942e2a69cbd4c26a8a Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:26:01 -0400
-Subject: [PATCH 24/35] squash with smartcard
+Subject: [PATCH 24/34] squash with smartcard
---
.../plugins/smartcard/gdm-smartcard-extension.c | 3 +++
@@ -16904,13 +17055,20 @@ index b925f5e..b40a21c 100644
static void
--
+<<<<<<< HEAD
1.7.2.2
From 6a624b8704dcf331336d825aff4f13d2d7fdedd3 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From ff8a0c3705973be7b0a55023af99407c70a0077f Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 21 Apr 2009 10:25:18 -0400
-Subject: [PATCH 25/35] When one PAM conversation wins, stop the others
+Subject: [PATCH 25/34] When one PAM conversation wins, stop the others
At some point we'll want to have policy here, to allow
e.g. two factor authentication.
@@ -17036,13 +17194,20 @@ index 05972a4..a19d4b3 100644
service_name);
if (! res) {
--
+<<<<<<< HEAD
1.7.2.2
From 85885ea63a754167cd23dd42161452477ae3a154 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From d24d158cf1c2ff032143ee50a4360729edc66995 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 24 Jul 2009 14:41:48 -0400
-Subject: [PATCH 26/35] KILL stuck processes if they don't die on TERM
+Subject: [PATCH 26/34] KILL stuck processes if they don't die on TERM
Some PAM modules are really slow to shut down.
We need to handle them being slow to shut down better,
@@ -17160,6 +17325,7 @@ index be85f30..8b93663 100644
if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) {
g_debug ("GdmSessionWorkerJob: Wait on child process failed");
--
+<<<<<<< HEAD
1.7.2.2
@@ -17198,9 +17364,15 @@ index 33708b9..f8cf845 100644
From c1e486c395743ed855cdd723e8b1bdd7235926a4 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 3dbbc2d4a678786cb327311e13e0c411f5684a9e Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 13 Jul 2010 22:36:19 -0400
-Subject: [PATCH 28/35] add better debug spew (needs squash)
+Subject: [PATCH 27/34] add better debug spew (needs squash)
---
daemon/gdm-session-direct.c | 8 ++++----
@@ -17247,23 +17419,30 @@ index 41c7dc2..e4e4166 100644
conversation = find_conversation_by_name (impl, service_name);
--
+<<<<<<< HEAD
1.7.2.2
From 2f107f6fc833394aab02daaffca7bcb22acb2c01 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 887730359a1441410513e3b9dc5cc0ca99a47402 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 13 Jul 2010 22:37:35 -0400
-Subject: [PATCH 29/35] switch to proper mode when going to timed login
+Subject: [PATCH 28/34] switch to proper mode when going to timed login
---
gui/simple-greeter/gdm-greeter-login-window.c | 2 +-
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 d0c0781..217aac8 100644
+index 74e3b12..f03b1c3 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -1384,7 +1384,7 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+@@ -1383,7 +1383,7 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
/* just wait for the user to select language and stuff */
set_message (login_window, _("Select language and click Log In"));
@@ -17273,13 +17452,20 @@ index d0c0781..217aac8 100644
show_widget (login_window, "conversation-list", FALSE);
gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list),
--
+<<<<<<< HEAD
1.7.2.2
From eaea5226939e884250bdb794e1395d72dcb22105 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From d85bcf69bf7d45f0d3b087aa8121061791108f19 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 3 Aug 2010 15:21:26 -0400
-Subject: [PATCH 30/35] Drop "Cancelling" message for plugin initiated cancels
+Subject: [PATCH 29/34] Drop "Cancelling" message for plugin initiated cancels
The plugin may be cancelling the mesage for a number of
reasons. We could potentially let it specify the message,
@@ -17289,10 +17475,10 @@ but for now just drop the message.
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 217aac8..13798ff 100644
+index f03b1c3..c576d6c 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -2138,7 +2138,7 @@ static void
+@@ -2145,7 +2145,7 @@ static void
on_conversation_cancel (GdmGreeterLoginWindow *login_window,
GdmConversation *conversation)
{
@@ -17302,20 +17488,27 @@ index 217aac8..13798ff 100644
static gboolean
--
+<<<<<<< HEAD
1.7.2.2
From dfed6496bc45b069ca4a5fc880ee394153b7e457 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From aa4d38ae8169ed0f4d08441fa89eb0957365af45 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:11:27 -0400
-Subject: [PATCH 31/35] drop code for label that doesn't exist anymore
+Subject: [PATCH 30/34] drop code for label that doesn't exist anymore
---
gui/simple-greeter/gdm-greeter-login-window.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 13798ff..536d4bb 100644
+index c576d6c..1000aef 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -776,9 +776,6 @@ static void
@@ -17339,13 +17532,20 @@ index 13798ff..536d4bb 100644
/* If we don't have a user list jump straight to authenticate */
g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate");
--
+<<<<<<< HEAD
1.7.2.2
From 5d9d29165e56af9ddd166961e868fae781686647 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From e05412f5c8a99b3df2de4bb5ce0eba375f9e0884 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 18:03:52 -0400
-Subject: [PATCH 32/35] Add delay when showing messages (needs split)
+Subject: [PATCH 31/34] Add delay when showing messages (needs split)
Previously, there were times when the user would be unable
to read messages, because they would blink by so fast.
@@ -17363,7 +17563,7 @@ screen for a sufficient amount of time.
6 files changed, 188 insertions(+), 10 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 536d4bb..2d7c400 100644
+index 1000aef..a34f42f 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -137,6 +137,9 @@ struct GdmGreeterLoginWindowPrivate
@@ -17393,7 +17593,7 @@ index 536d4bb..2d7c400 100644
return FALSE;
}
-@@ -882,16 +888,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -881,16 +887,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
return TRUE;
}
@@ -17413,7 +17613,7 @@ index 536d4bb..2d7c400 100644
/* If the password conversation failed, then start over
*
* FIXME: we need to get this policy out of the source code
-@@ -899,13 +901,15 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -898,13 +900,15 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
if (strcmp (service_name, "gdm-password") == 0) {
g_debug ("GdmGreeterLoginWindow: main conversation failed, starting over");
restart_conversations (login_window);
@@ -17430,7 +17630,7 @@ index 536d4bb..2d7c400 100644
g_object_unref (task);
}
-@@ -920,6 +924,34 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -919,6 +923,34 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
g_object_unref (task);
update_conversation_list_visibility (login_window);
@@ -17465,7 +17665,7 @@ index 536d4bb..2d7c400 100644
return TRUE;
}
-@@ -931,6 +963,7 @@ restart_task_conversation (GdmTaskList *task_list,
+@@ -930,6 +962,7 @@ restart_task_conversation (GdmTaskList *task_list,
{
char *service_name;
@@ -17473,7 +17673,7 @@ index 536d4bb..2d7c400 100644
service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (task));
if (service_name != NULL) {
char *name;
-@@ -959,6 +992,9 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window)
+@@ -958,6 +991,9 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window)
restart_task_conversation,
login_window);
@@ -17483,7 +17683,7 @@ index 536d4bb..2d7c400 100644
return TRUE;
}
-@@ -976,6 +1012,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -975,6 +1011,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
task = find_task_with_service_name (login_window, service_name);
if (task != NULL) {
@@ -17491,7 +17691,7 @@ index 536d4bb..2d7c400 100644
gdm_conversation_set_message (GDM_CONVERSATION (task),
text);
show_task_actions (task);
-@@ -999,6 +1036,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -998,6 +1035,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
task = find_task_with_service_name (login_window, service_name);
if (task != NULL) {
@@ -17499,7 +17699,7 @@ index 536d4bb..2d7c400 100644
gdm_conversation_set_message (GDM_CONVERSATION (task),
text);
show_task_actions (task);
-@@ -1094,12 +1132,40 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window,
+@@ -1093,12 +1131,40 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window,
}
static void
@@ -17542,7 +17742,7 @@ index 536d4bb..2d7c400 100644
} else {
g_debug ("GdmGreeterLoginWindow: not starting session since "
"user hasn't had an opportunity to pick language "
-@@ -2164,6 +2230,35 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -2171,6 +2237,35 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
return TRUE;
}
@@ -17578,7 +17778,7 @@ index 536d4bb..2d7c400 100644
void
gdm_greeter_login_window_remove_extension (GdmGreeterLoginWindow *login_window,
GdmGreeterExtension *extension)
-@@ -2326,6 +2421,10 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2333,6 +2428,10 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
"user-chosen",
G_CALLBACK (on_conversation_chose_user),
login_window);
@@ -17805,13 +18005,20 @@ index b40a21c..5e234b9 100644
static void
--
+<<<<<<< HEAD
1.7.2.2
From 1e97652fd587074dcd3dda3f08527907e3994972 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 37119c0445e6d8cc78938ed71ff84e9af76a6836 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Wed, 4 Aug 2010 19:27:14 -0400
-Subject: [PATCH 33/35] Drop cancelling message
+Subject: [PATCH 32/34] Drop cancelling message
We cancel very quickly in most cases now, so the message isn't useful
---
@@ -17819,10 +18026,10 @@ We cancel very quickly in most cases now, so the message isn't useful
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 2d7c400..904269c 100644
+index a34f42f..4bfd3f5 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
-@@ -850,7 +850,7 @@ static void
+@@ -849,7 +849,7 @@ static void
do_cancel (GdmGreeterLoginWindow *login_window)
{
/* need to wait for response from backend */
@@ -17832,13 +18039,20 @@ index 2d7c400..904269c 100644
}
--
+<<<<<<< HEAD
1.7.2.2
From 8ff09c46e4881851b850602212d5d1015f1504c3 Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 1932eb618974600b765a6c835c6f72d403b25bf5 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Fri, 6 Aug 2010 11:14:23 -0400
-Subject: [PATCH 34/35] manage tasks outside of task list
+Subject: [PATCH 33/34] manage tasks outside of task list
The task list isn't very good for tracking tasks as
they come and go, since it replies on the groaty details
@@ -17855,7 +18069,7 @@ when we don't need to.
1 files changed, 206 insertions(+), 190 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index 904269c..ac00d62 100644
+index 4bfd3f5..204f37d 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -98,6 +98,7 @@ enum {
@@ -18207,7 +18421,7 @@ index 904269c..ac00d62 100644
static void
reset_dialog (GdmGreeterLoginWindow *login_window,
-@@ -811,10 +853,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
+@@ -811,18 +853,16 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
set_message (login_window, "");
}
@@ -18219,8 +18433,7 @@ index 904269c..ac00d62 100644
if (can_jump_to_authenticate (login_window)) {
/* If we don't have a user list jump straight to authenticate */
-@@ -822,8 +861,9 @@ reset_dialog (GdmGreeterLoginWindow *login_window,
-
+ g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate");
g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
0, GDM_USER_CHOOSER_USER_OTHER);
- begin_verification (login_window);
@@ -18230,7 +18443,7 @@ index 904269c..ac00d62 100644
switch_mode (login_window, dialog_mode);
}
-@@ -868,9 +908,9 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -867,9 +907,9 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
if (gdm_chooser_widget_is_loaded (GDM_CHOOSER_WIDGET (login_window->priv->user_chooser))) {
gdm_conversation_set_ready (GDM_CONVERSATION (task));
} else {
@@ -18242,7 +18455,7 @@ index 904269c..ac00d62 100644
}
set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE);
-@@ -882,7 +922,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
+@@ -881,7 +921,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window,
g_debug ("Starting PAM conversation since user list disabled or no local users");
g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
0, GDM_USER_CHOOSER_USER_OTHER);
@@ -18251,7 +18464,7 @@ index 904269c..ac00d62 100644
}
return TRUE;
-@@ -904,24 +944,37 @@ handle_stopped_conversation (GdmGreeterLoginWindow *login_window,
+@@ -903,24 +943,37 @@ handle_stopped_conversation (GdmGreeterLoginWindow *login_window,
return;
}
@@ -18292,7 +18505,7 @@ index 904269c..ac00d62 100644
update_conversation_list_visibility (login_window);
}
-@@ -937,8 +990,8 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -936,8 +989,8 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name);
@@ -18303,7 +18516,7 @@ index 904269c..ac00d62 100644
messages_pending = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (task), "message-pending"));
} else {
-@@ -957,8 +1010,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
+@@ -956,8 +1009,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind
}
static gboolean
@@ -18313,7 +18526,7 @@ index 904269c..ac00d62 100644
GdmGreeterLoginWindow *login_window)
{
char *service_name;
-@@ -987,10 +1039,7 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window)
+@@ -986,10 +1038,7 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window)
g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE);
reset_dialog (GDM_GREETER_LOGIN_WINDOW (login_window), MODE_SELECTION);
@@ -18325,7 +18538,7 @@ index 904269c..ac00d62 100644
g_free (login_window->priv->service_name_of_session_ready_to_start);
login_window->priv->service_name_of_session_ready_to_start = NULL;
-@@ -1016,7 +1065,6 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
+@@ -1015,7 +1064,6 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window,
gdm_conversation_set_message (GDM_CONVERSATION (task),
text);
show_task_actions (task);
@@ -18333,7 +18546,7 @@ index 904269c..ac00d62 100644
}
return TRUE;
-@@ -1040,7 +1088,6 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
+@@ -1039,7 +1087,6 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window,
gdm_conversation_set_message (GDM_CONVERSATION (task),
text);
show_task_actions (task);
@@ -18341,7 +18554,7 @@ index 904269c..ac00d62 100644
}
gdk_window_beep (GTK_WIDGET (login_window)->window);
-@@ -1079,9 +1126,19 @@ gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_windo
+@@ -1078,9 +1125,19 @@ gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_windo
task = find_task_with_service_name (login_window, service_name);
if (task != NULL) {
@@ -18364,7 +18577,7 @@ index 904269c..ac00d62 100644
}
return TRUE;
-@@ -1216,7 +1273,6 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
+@@ -1215,7 +1272,6 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window,
if (task != NULL) {
gdm_conversation_ask_question (GDM_CONVERSATION (task),
text);
@@ -18372,7 +18585,7 @@ index 904269c..ac00d62 100644
}
set_log_in_button_mode (login_window, LOGIN_BUTTON_ANSWER_QUERY);
-@@ -1247,7 +1303,6 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
+@@ -1246,7 +1302,6 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window,
if (task != NULL) {
gdm_conversation_ask_secret (GDM_CONVERSATION (task),
text);
@@ -18380,7 +18593,7 @@ index 904269c..ac00d62 100644
}
set_log_in_button_mode (login_window, LOGIN_BUTTON_ANSWER_QUERY);
-@@ -1342,8 +1397,7 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window)
+@@ -1341,8 +1396,7 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window)
}
static gboolean
@@ -18390,7 +18603,7 @@ index 904269c..ac00d62 100644
GdmGreeterLoginWindow *login_window)
{
char *user_name;
-@@ -1361,6 +1415,9 @@ begin_task_verification_for_selected_user (GdmTaskList *task_list,
+@@ -1360,6 +1414,9 @@ begin_task_verification_for_selected_user (GdmTaskList *task_list,
g_free (service_name);
}
@@ -18400,7 +18613,7 @@ index 904269c..ac00d62 100644
g_free (user_name);
return FALSE;
}
-@@ -1408,7 +1465,7 @@ on_users_loaded (GdmUserChooserWidget *user_chooser,
+@@ -1407,7 +1464,7 @@ on_users_loaded (GdmUserChooserWidget *user_chooser,
g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate");
g_signal_emit (G_OBJECT (login_window), signals[USER_SELECTED],
0, GDM_USER_CHOOSER_USER_OTHER);
@@ -18409,7 +18622,7 @@ index 904269c..ac00d62 100644
}
}
-@@ -1416,19 +1473,23 @@ static void
+@@ -1415,19 +1472,23 @@ static void
choose_user (GdmGreeterLoginWindow *login_window,
const char *user_name)
{
@@ -18438,7 +18651,7 @@ index 904269c..ac00d62 100644
update_conversation_list_visibility (login_window);
}
-@@ -1444,35 +1505,34 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
+@@ -1443,35 +1504,34 @@ begin_auto_login (GdmGreeterLoginWindow *login_window)
/* just wait for the user to select language and stuff */
set_message (login_window, _("Select language and click Log In"));
@@ -18485,7 +18698,7 @@ index 904269c..ac00d62 100644
}
static void
-@@ -1495,11 +1555,10 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
+@@ -1494,11 +1554,10 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window,
*/
g_signal_emit (login_window, signals[BEGIN_VERIFICATION], 0, service_name);
@@ -18500,7 +18713,7 @@ index 904269c..ac00d62 100644
show_widget (login_window, "conversation-list", FALSE);
}
-@@ -1530,7 +1589,7 @@ on_user_chooser_activated (GdmUserChooserWidget *user_chooser,
+@@ -1529,7 +1588,7 @@ on_user_chooser_activated (GdmUserChooserWidget *user_chooser,
g_debug ("GdmGreeterLoginWindow: Starting all auth conversations");
g_free (item_id);
@@ -18509,7 +18722,7 @@ index 904269c..ac00d62 100644
} else if (strcmp (item_id, GDM_USER_CHOOSER_USER_GUEST) == 0) {
/* FIXME: handle guest account stuff */
g_free (item_id);
-@@ -1718,63 +1777,28 @@ static void
+@@ -1725,63 +1784,28 @@ static void
on_task_activated (GdmGreeterLoginWindow *login_window,
GdmTask *task)
{
@@ -18582,7 +18795,7 @@ index 904269c..ac00d62 100644
}
static void
-@@ -1879,6 +1903,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
+@@ -1886,6 +1910,7 @@ load_theme (GdmGreeterLoginWindow *login_window)
box = GTK_WIDGET (gtk_builder_get_object (login_window->priv->builder, "computer-info-event-box"));
g_signal_connect (box, "button-press-event", G_CALLBACK (on_computer_info_label_button_press), login_window);
@@ -18590,7 +18803,7 @@ index 904269c..ac00d62 100644
switch_mode (login_window, MODE_SELECTION);
gdm_profile_end (NULL);
-@@ -2217,15 +2242,12 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
+@@ -2224,15 +2249,12 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window,
/* If we're already authenticating then we can't pick a user
*/
@@ -18609,7 +18822,7 @@ index 904269c..ac00d62 100644
return TRUE;
}
-@@ -2249,11 +2271,7 @@ on_conversation_message_set (GdmGreeterLoginWindow *login_window,
+@@ -2256,11 +2278,7 @@ on_conversation_message_set (GdmGreeterLoginWindow *login_window,
}
if (login_window->priv->service_name_of_session_ready_to_start != NULL ) {
@@ -18622,7 +18835,7 @@ index 904269c..ac00d62 100644
gdm_greeter_login_window_start_session (login_window);
}
}
-@@ -2429,9 +2447,7 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
+@@ -2436,9 +2454,7 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window,
g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added",
name, description);
@@ -18634,13 +18847,20 @@ index 904269c..ac00d62 100644
if (gdm_task_is_choosable (GDM_TASK (extension))) {
--
+<<<<<<< HEAD
1.7.2.2
From 212f47d46fd17da9e4b635064ed158395a69f40e Mon Sep 17 00:00:00 2001
+=======
+1.7.3
+
+
+From 80cdd8a3dad6ae36ee257d453879922a9f409ca0 Mon Sep 17 00:00:00 2001
+>>>>>>> 49a9b45... Update to 2.32.0
From: Ray Strode <rstrode at redhat.com>
Date: Mon, 9 Aug 2010 18:09:19 -0400
-Subject: [PATCH 35/35] hide task actions more aggressively
+Subject: [PATCH 34/34] hide task actions more aggressively
This fixes "dual login buttons" after the user hits cancel.
---
@@ -18648,7 +18868,7 @@ This fixes "dual login buttons" after the user hits cancel.
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
-index ac00d62..31e599f 100644
+index 204f37d..8b3cace 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -492,6 +492,8 @@ set_log_in_button_mode (GdmGreeterLoginWindow *login_window,
@@ -18669,5 +18889,9 @@ index ac00d62..31e599f 100644
return FALSE;
}
--
+<<<<<<< HEAD
1.7.2.2
+=======
+1.7.3
+>>>>>>> 49a9b45... Update to 2.32.0
diff --git a/gdm.spec b/gdm.spec
index eb6331c..3d5d556 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,14 +14,14 @@
Summary: The GNOME Display Manager
Name: gdm
-Version: 2.31.90
-Release: 7%{?dist}
+Version: 2.32.0
+Release: 1%{?dist}
Epoch: 1
License: GPLv2+
Group: User Interface/X
URL: http://download.gnome.org/sources/gdm
#VCS: git:git://git.gnome.org/gdm
-Source: http://download.gnome.org/sources/gdm/2.30/gdm-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/gdm/2.32/gdm-%{version}.tar.bz2
Source1: gdm-pam
Source2: gdm-autologin-pam
Source3: gdm-password.pam
@@ -374,6 +374,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || :
%{_libdir}/gdm/simple-greeter/plugins/fingerprint.so
%changelog
+* Thu Sep 30 2010 Matthias Clasen <mclasen at redhat.com> 2.32.0-1
+- Update to 2.32.0
+
* Wed Sep 15 2010 Ray Strode <rstrode at redhat.com> 2.31.90-7
- More user switch applet fixes
diff --git a/sources b/sources
index 0c651c1..6e129f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe7691b9d477123c1d25d83f5aa961cc gdm-2.31.90.tar.bz2
+3c28e13a3d5e5f35d29669460acb57bb gdm-2.32.0.tar.bz2
More information about the scm-commits
mailing list