diff --git a/.gitignore b/.gitignore index 97e71d7..74cfae5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gdm-2.30.2.tar.bz2 /gdm-2.31.90.tar.bz2 /gdm-2.32.0.tar.bz2 +/gdm-2.91.4.tar.bz2 diff --git a/gdm-2.29.1-force-active-vt.patch b/gdm-2.29.1-force-active-vt.patch deleted file mode 100644 index 04cc810..0000000 --- a/gdm-2.29.1-force-active-vt.patch +++ /dev/null @@ -1,432 +0,0 @@ -diff -up gdm-2.29.1/configure.ac.force-active-vt gdm-2.29.1/configure.ac ---- gdm-2.29.1/configure.ac.force-active-vt 2009-11-30 17:23:11.000000000 -0500 -+++ gdm-2.29.1/configure.ac 2009-12-02 23:31:13.064009409 -0500 -@@ -1254,6 +1254,23 @@ AC_SUBST(GDM_SCREENSHOT_DIR) - - - dnl --------------------------------------------------------------------------- -+dnl - Directory to spool events from other processes -+dnl --------------------------------------------------------------------------- -+ -+AC_ARG_WITH(spool-dir, -+ AS_HELP_STRING([--with-spool-dir=], -+ [spool directory])) -+ -+if ! test -z "$with_spool_dir"; then -+ GDM_SPOOL_DIR=$with_spool_dir -+else -+ GDM_SPOOL_DIR=${localstatedir}/spool/gdm -+fi -+ -+AC_SUBST(GDM_SPOOL_DIR) -+ -+ -+dnl --------------------------------------------------------------------------- - dnl - Finish - dnl --------------------------------------------------------------------------- - -diff -up gdm-2.29.1/daemon/gdm-display.c.force-active-vt gdm-2.29.1/daemon/gdm-display.c ---- gdm-2.29.1/daemon/gdm-display.c.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-display.c 2009-12-02 23:31:13.065009323 -0500 -@@ -65,7 +65,9 @@ struct GdmDisplayPrivate - gsize x11_cookie_size; - GdmDisplayAccessFile *access_file; - -- gboolean is_local; -+ guint is_local : 1; -+ guint force_active_vt : 1; -+ - guint finish_idle_id; - - GdmSlaveProxy *slave_proxy; -@@ -84,6 +86,7 @@ enum { - PROP_X11_COOKIE, - PROP_X11_AUTHORITY_FILE, - PROP_IS_LOCAL, -+ PROP_FORCE_ACTIVE_VT, - PROP_SLAVE_COMMAND, - }; - -@@ -574,9 +577,10 @@ gdm_display_real_prepare (GdmDisplay *di - gdm_slave_proxy_set_log_path (display->priv->slave_proxy, log_path); - g_free (log_path); - -- command = g_strdup_printf ("%s --display-id %s", -+ command = g_strdup_printf ("%s --display-id %s %s", - display->priv->slave_command, -- display->priv->id); -+ display->priv->id, -+ display->priv->force_active_vt? "--force-active-vt" : ""); - gdm_slave_proxy_set_command (display->priv->slave_proxy, command); - g_free (command); - -@@ -824,6 +828,13 @@ _gdm_display_set_is_local (GdmDisplay - } - - static void -+_gdm_display_set_force_active_vt (GdmDisplay *display, -+ gboolean force_active_vt) -+{ -+ display->priv->force_active_vt = force_active_vt; -+} -+ -+static void - _gdm_display_set_slave_command (GdmDisplay *display, - const char *command) - { -@@ -866,6 +877,9 @@ gdm_display_set_property (GObject - case PROP_IS_LOCAL: - _gdm_display_set_is_local (self, g_value_get_boolean (value)); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ _gdm_display_set_force_active_vt (self, g_value_get_boolean (value)); -+ break; - case PROP_SLAVE_COMMAND: - _gdm_display_set_slave_command (self, g_value_get_string (value)); - break; -@@ -914,6 +928,9 @@ gdm_display_get_property (GObject - case PROP_IS_LOCAL: - g_value_set_boolean (value, self->priv->is_local); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ g_value_set_boolean (value, self->priv->force_active_vt); -+ break; - case PROP_SLAVE_COMMAND: - g_value_set_string (value, self->priv->slave_command); - break; -@@ -1084,6 +1101,13 @@ gdm_display_class_init (GdmDisplayClass - NULL, - TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); -+ g_object_class_install_property (object_class, -+ PROP_FORCE_ACTIVE_VT, -+ g_param_spec_boolean ("force-active-vt", -+ NULL, -+ NULL, -+ FALSE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, - PROP_SLAVE_COMMAND, -diff -up gdm-2.29.1/daemon/gdm-server.c.force-active-vt gdm-2.29.1/daemon/gdm-server.c ---- gdm-2.29.1/daemon/gdm-server.c.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-server.c 2009-12-02 23:31:13.066009518 -0500 -@@ -34,6 +34,8 @@ - #include - #include - -+#include -+ - #include - #include - #include -@@ -663,6 +665,44 @@ gdm_server_spawn (GdmServer *server, - return ret; - } - -+static int -+get_active_vt (void) -+{ -+ int console_fd; -+ struct vt_stat console_state = { 0 }; -+ -+ console_fd = open ("/dev/tty0", O_RDONLY | O_NOCTTY); -+ -+ if (console_fd < 0) { -+ goto out; -+ } -+ -+ if (ioctl (console_fd, VT_GETSTATE, &console_state) < 0) { -+ goto out; -+ } -+ -+out: -+ if (console_fd >= 0) { -+ close (console_fd); -+ } -+ -+ return console_state.v_active; -+} -+ -+static char * -+get_active_vt_as_string (void) -+{ -+ int vt; -+ -+ vt = get_active_vt (); -+ -+ if (vt <= 0) { -+ return NULL; -+ } -+ -+ return g_strdup_printf ("vt%d", vt); -+} -+ - /** - * gdm_server_start: - * @disp: Pointer to a GdmDisplay structure -@@ -681,6 +721,21 @@ gdm_server_start (GdmServer *server) - return res; - } - -+gboolean -+gdm_server_start_on_active_vt (GdmServer *server) -+{ -+ gboolean res; -+ char *vt; -+ -+ g_free (server->priv->command); -+ server->priv->command = g_strdup (X_SERVER " -nr -verbose"); -+ vt = get_active_vt_as_string (); -+ res = gdm_server_spawn (server, vt); -+ g_free (vt); -+ -+ return res; -+} -+ - static void - server_died (GdmServer *server) - { -diff -up gdm-2.29.1/daemon/gdm-server.h.force-active-vt gdm-2.29.1/daemon/gdm-server.h ---- gdm-2.29.1/daemon/gdm-server.h.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-server.h 2009-12-02 23:31:13.066009518 -0500 -@@ -56,6 +56,7 @@ GType gdm_server_get_type - GdmServer * gdm_server_new (const char *display_id, - const char *auth_file); - gboolean gdm_server_start (GdmServer *server); -+gboolean gdm_server_start_on_active_vt (GdmServer *server); - gboolean gdm_server_stop (GdmServer *server); - char * gdm_server_get_display_device (GdmServer *server); - -diff -up gdm-2.29.1/daemon/gdm-simple-slave.c.force-active-vt gdm-2.29.1/daemon/gdm-simple-slave.c ---- gdm-2.29.1/daemon/gdm-simple-slave.c.force-active-vt 2009-11-24 02:26:07.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-simple-slave.c 2009-12-02 23:31:13.067013552 -0500 -@@ -88,6 +88,7 @@ struct GdmSimpleSlavePrivate - - enum { - PROP_0, -+ FORCE_ACTIVE_VT - }; - - static void gdm_simple_slave_class_init (GdmSimpleSlaveClass *klass); -@@ -1075,11 +1076,13 @@ gdm_simple_slave_run (GdmSimpleSlave *sl - char *display_name; - char *auth_file; - gboolean display_is_local; -+ gboolean force_active_vt; - - g_object_get (slave, - "display-is-local", &display_is_local, - "display-name", &display_name, - "display-x11-authority-file", &auth_file, -+ "force-active-vt", &force_active_vt, - NULL); - - /* if this is local display start a server if one doesn't -@@ -1111,7 +1114,10 @@ gdm_simple_slave_run (GdmSimpleSlave *sl - G_CALLBACK (on_server_ready), - slave); - -- res = gdm_server_start (slave->priv->server); -+ if (force_active_vt) -+ res = gdm_server_start_on_active_vt (slave->priv->server); -+ else -+ res = gdm_server_start (slave->priv->server); - if (! res) { - g_warning (_("Could not start the X " - "server (your graphical environment) " -@@ -1259,12 +1265,14 @@ gdm_simple_slave_finalize (GObject *obje - } - - GdmSlave * --gdm_simple_slave_new (const char *id) -+gdm_simple_slave_new (const char *id, -+ gboolean force_active_vt) - { - GObject *object; - - object = g_object_new (GDM_TYPE_SIMPLE_SLAVE, - "display-id", id, -+ "force-active-vt", force_active_vt, - NULL); - - return GDM_SLAVE (object); -diff -up gdm-2.29.1/daemon/gdm-simple-slave.h.force-active-vt gdm-2.29.1/daemon/gdm-simple-slave.h ---- gdm-2.29.1/daemon/gdm-simple-slave.h.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-simple-slave.h 2009-12-02 23:31:13.067013552 -0500 -@@ -48,7 +48,8 @@ typedef struct - } GdmSimpleSlaveClass; - - GType gdm_simple_slave_get_type (void); --GdmSlave * gdm_simple_slave_new (const char *id); -+GdmSlave * gdm_simple_slave_new (const char *id, -+ gboolean force_active_vt); - - G_END_DECLS - -diff -up gdm-2.29.1/daemon/gdm-slave.c.force-active-vt gdm-2.29.1/daemon/gdm-slave.c ---- gdm-2.29.1/daemon/gdm-slave.c.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-slave.c 2009-12-02 23:31:13.068018007 -0500 -@@ -83,6 +83,7 @@ struct GdmSlavePrivate - char *display_hostname; - gboolean display_is_local; - gboolean display_is_parented; -+ gboolean force_active_vt; - char *display_seat_id; - char *display_x11_authority_file; - char *parent_display_name; -@@ -101,6 +102,7 @@ enum { - PROP_DISPLAY_NUMBER, - PROP_DISPLAY_HOSTNAME, - PROP_DISPLAY_IS_LOCAL, -+ PROP_FORCE_ACTIVE_VT, - PROP_DISPLAY_SEAT_ID, - PROP_DISPLAY_X11_AUTHORITY_FILE - }; -@@ -1332,6 +1334,13 @@ _gdm_slave_set_display_is_local (GdmSlav - } - - static void -+_gdm_slave_set_force_active_vt (GdmSlave *slave, -+ gboolean force_active_vt) -+{ -+ slave->priv->force_active_vt = force_active_vt; -+} -+ -+static void - gdm_slave_set_property (GObject *object, - guint prop_id, - const GValue *value, -@@ -1363,6 +1372,9 @@ gdm_slave_set_property (GObject *ob - case PROP_DISPLAY_IS_LOCAL: - _gdm_slave_set_display_is_local (self, g_value_get_boolean (value)); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ _gdm_slave_set_force_active_vt (self, g_value_get_boolean (value)); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -1401,6 +1413,9 @@ gdm_slave_get_property (GObject *obje - case PROP_DISPLAY_IS_LOCAL: - g_value_set_boolean (value, self->priv->display_is_local); - break; -+ case PROP_FORCE_ACTIVE_VT: -+ g_value_set_boolean (value, self->priv->force_active_vt); -+ break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -1526,6 +1541,14 @@ gdm_slave_class_init (GdmSlaveClass *kla - TRUE, - G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - -+ g_object_class_install_property (object_class, -+ PROP_FORCE_ACTIVE_VT, -+ g_param_spec_boolean ("force-active-vt", -+ "Force Active VT", -+ "Force display to active VT", -+ TRUE, -+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); -+ - signals [STOPPED] = - g_signal_new ("stopped", - G_TYPE_FROM_CLASS (object_class), -diff -up gdm-2.29.1/daemon/gdm-static-display.c.force-active-vt gdm-2.29.1/daemon/gdm-static-display.c ---- gdm-2.29.1/daemon/gdm-static-display.c.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/gdm-static-display.c 2009-12-02 23:31:13.068018007 -0500 -@@ -86,10 +86,27 @@ gdm_static_display_remove_user_authoriza - } - - static gboolean -+triggered_to_force_display_on_active_vt (void) -+{ -+ gboolean should_force_display_on_active_vt; -+ -+ should_force_display_on_active_vt = g_file_test (GDM_SPOOL_DIR "/force-display-on-active-vt", -+ G_FILE_TEST_EXISTS); -+ g_unlink (GDM_SPOOL_DIR "/force-display-on-active-vt"); -+ -+ return should_force_display_on_active_vt; -+} -+ -+static gboolean - gdm_static_display_manage (GdmDisplay *display) - { - g_return_val_if_fail (GDM_IS_DISPLAY (display), FALSE); - -+ if (triggered_to_force_display_on_active_vt ()) { -+ g_object_set (display, "force-active-vt", TRUE, NULL); -+ } else { -+ g_object_set (display, "force-active-vt", FALSE, NULL); -+ } - GDM_DISPLAY_CLASS (gdm_static_display_parent_class)->manage (display); - - return TRUE; -diff -up gdm-2.29.1/daemon/Makefile.am.force-active-vt gdm-2.29.1/daemon/Makefile.am ---- gdm-2.29.1/daemon/Makefile.am.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/Makefile.am 2009-12-02 23:31:13.069017990 -0500 -@@ -14,6 +14,7 @@ AM_CPPFLAGS = \ - -DLOGDIR=\"$(logdir)\" \ - -DSBINDIR=\"$(sbindir)\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -+ -DGDM_SPOOL_DIR=\"$(GDM_SPOOL_DIR)\" \ - -DGDM_XAUTH_DIR=\"$(GDM_XAUTH_DIR)\" \ - -DGDM_SCREENSHOT_DIR=\"$(GDM_SCREENSHOT_DIR)\" \ - -DGDM_CACHE_DIR=\""$(localstatedir)/cache/gdm"\" \ -diff -up gdm-2.29.1/daemon/simple-slave-main.c.force-active-vt gdm-2.29.1/daemon/simple-slave-main.c ---- gdm-2.29.1/daemon/simple-slave-main.c.force-active-vt 2009-11-16 17:37:43.000000000 -0500 -+++ gdm-2.29.1/daemon/simple-slave-main.c 2009-12-02 23:31:54.674210044 -0500 -@@ -178,9 +178,11 @@ main (int argc, - DBusGConnection *connection; - GdmSlave *slave; - static char *display_id = NULL; -+ static gboolean force_active_vt = FALSE; - GdmSignalHandler *signal_handler; - static GOptionEntry entries [] = { - { "display-id", 0, 0, G_OPTION_ARG_STRING, &display_id, N_("Display ID"), N_("ID") }, -+ { "force-active-vt", 0, 0, G_OPTION_ARG_NONE, &force_active_vt, N_("Force X to start on active vt"), NULL }, - { NULL } - }; - -@@ -248,7 +250,7 @@ main (int argc, - gdm_signal_handler_add (signal_handler, SIGUSR1, signal_cb, NULL); - gdm_signal_handler_add (signal_handler, SIGUSR2, signal_cb, NULL); - -- slave = gdm_simple_slave_new (display_id); -+ slave = gdm_simple_slave_new (display_id, force_active_vt); - if (slave == NULL) { - goto out; - } -diff -up gdm-2.29.1/data/Makefile.am.force-active-vt gdm-2.29.1/data/Makefile.am ---- gdm-2.29.1/data/Makefile.am.force-active-vt 2009-11-16 19:45:22.000000000 -0500 -+++ gdm-2.29.1/data/Makefile.am 2009-12-02 23:31:13.070023842 -0500 -@@ -13,6 +13,7 @@ predir = $(gdmconfdir)/PreSession - postlogindir = $(gdmconfdir)/PostLogin - workingdir = $(GDM_WORKING_DIR) - xauthdir = $(GDM_XAUTH_DIR) -+spooldir = $(GDM_SPOOL_DIR) - screenshotdir = $(GDM_SCREENSHOT_DIR) - cachedir = $(localstatedir)/cache/gdm - -@@ -125,6 +126,7 @@ uninstall-hook: - $(DESTDIR)$(workingdir)/.gconf.mandatory \ - $(DESTDIR)$(screenshotdir) \ - $(DESTDIR)$(xauthdir) -+ $(DESTDIR)$(spooldir) - - install-data-hook: gdm.conf-custom Xsession Init PostSession PreSession gconf.path - if test '!' -d $(DESTDIR)$(gdmconfdir); then \ -@@ -224,6 +226,12 @@ install-data-hook: gdm.conf-custom Xsess - chown root:gdm $(DESTDIR)$(cachedir) || : ; \ - fi - -+ if test '!' -d $(DESTDIR)$(spooldir); then \ -+ $(mkinstalldirs) $(DESTDIR)$(spooldir); \ -+ chmod 775 $(DESTDIR)$(spooldir); \ -+ chown root:gdm $(DESTDIR)$(spooldir) || : ; \ -+ fi -+ - $(INSTALL_DATA) $(srcdir)/gconf.path $(DESTDIR)$(workingdir)/.gconf.path - gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --recursive-unset / - gconftool-2 --direct --config-source=xml:merged:$(DESTDIR)$(workingdir)/.gconf.mandatory --load $(srcdir)/session-setup.entries diff --git a/gdm-2.32.0-maybe-set-is-loaded.patch b/gdm-2.32.0-maybe-set-is-loaded.patch deleted file mode 100644 index d47f663..0000000 --- a/gdm-2.32.0-maybe-set-is-loaded.patch +++ /dev/null @@ -1,82 +0,0 @@ -3 patches from upstream to fix issue with GDM user list sometimes not loading properly - - -From 45e1f603f7b77644c7d4fed2bd0fae5e9b586f55 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Fri, 08 Oct 2010 01:47:51 +0000 -Subject: user-manager: fixes for when consolekit is unavailable - -Part of the user manager load sequence involves communicating -with ConsoleKit. If ConsoleKit is unavailable, we need to -properly finish the sequence so that the user manager -becomes accessible in a "degraded" mode. ---- -diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c -index 7e7719a..112116c 100644 ---- a/gui/simple-greeter/gdm-user-manager.c -+++ b/gui/simple-greeter/gdm-user-manager.c -@@ -609,6 +609,7 @@ on_get_seat_id_finished (DBusGProxy *proxy, - "current session"); - } - unload_seat (manager); -+ maybe_set_is_loaded (manager); - return; - } - -@@ -918,6 +919,7 @@ on_get_current_session_finished (DBusGProxy *proxy, - g_debug ("Failed to identify the current session"); - } - unload_seat (manager); -+ maybe_set_is_loaded (manager); - return; - } - --- -cgit v0.8.3.1 - -From 68fbf55992773124b4f79118d4a1564c737a3195 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Sun, 10 Oct 2010 19:47:47 +0000 -Subject: user-manager: add forward declaration - -This fixes a compiler warning. ---- -diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c -index 112116c..6705acc 100644 ---- a/gui/simple-greeter/gdm-user-manager.c -+++ b/gui/simple-greeter/gdm-user-manager.c -@@ -229,6 +229,7 @@ static void fetch_user_locally (GdmUserManager *manager, - const char *username); - static void fetch_user_incrementally (GdmUserManagerFetchUserRequest *request); - -+static void maybe_set_is_loaded (GdmUserManager *manager); - static gpointer user_manager_object = NULL; - - G_DEFINE_TYPE (GdmUserManager, gdm_user_manager, G_TYPE_OBJECT) --- -cgit v0.8.3.1 - -From efda830b8b978b96cd6a5923b3c1066250a31ac3 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Mon, 06 Dec 2010 15:46:28 +0000 -Subject: user-manager: maybe set is loaded ListCachedUsers - -This is another asynchronous fix, needed to make sure -the race of competing conditions properly end up with -a loaded user. ---- -diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c -index 6705acc..c631989 100644 ---- a/gui/simple-greeter/gdm-user-manager.c -+++ b/gui/simple-greeter/gdm-user-manager.c -@@ -1198,6 +1198,8 @@ on_list_cached_users_finished (DBusGProxy *proxy, - return; - } - -+ maybe_set_is_loaded (manager); -+ - g_ptr_array_foreach (paths, (GFunc)add_new_user_for_object_path, manager); - - g_ptr_array_foreach (paths, (GFunc)g_free, NULL); --- -cgit v0.8.3.1 diff --git a/gdm-multistack.patch b/gdm-multistack.patch index 032eee0..dfb211a 100644 --- a/gdm-multistack.patch +++ b/gdm-multistack.patch @@ -1,7 +1,7 @@ -From f7d2b3e241a8856f9a57cc47d36caaa73afb2237 Mon Sep 17 00:00:00 2001 +From 1a8f15321d71e8700777b859bd703b80572fa4b6 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 22 Jul 2010 13:38:09 -0400 -Subject: [PATCH 01/34] Revert "Don't wait a mandatory 2 seconds when resetting greeter" +Subject: [PATCH 01/35] Revert "Don't wait a mandatory 2 seconds when resetting greeter" This reverts commit 83552f19154bf5689b395a76c1a9931b2558f41b. @@ -12,10 +12,10 @@ long enough. A better fix would belong in the greeter. 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 2994014..6b9159a 100644 +index e3cb96d..8906e3a 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -227,7 +227,7 @@ queue_greeter_reset (GdmSimpleSlave *slave) +@@ -294,7 +294,7 @@ queue_greeter_reset (GdmSimpleSlave *slave) return; } @@ -25,13 +25,13 @@ index 2994014..6b9159a 100644 static void -- -1.7.3 +1.7.3.3 -From fbf8627abdc2f83a1295ac8a6efd8bb295ed1e78 Mon Sep 17 00:00:00 2001 +From 1538a1859971d7ed886a6d2490dc346bac05f672 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 7 Jul 2010 17:16:38 -0400 -Subject: [PATCH 02/34] Don't set list-visible unless the widget is visible +Subject: [PATCH 02/35] 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 @@ -59,13 +59,13 @@ index db2d9b2..5a078e8 100644 gtk_widget_hide (widget->priv->frame); set_chooser_list_visible (widget, FALSE); -- -1.7.3 +1.7.3.3 -From 90d0a15326f9918687e1929cdf567b04fa6f7c3f Mon Sep 17 00:00:00 2001 +From 35e2c60276db3ff902c3f7ad98b6a508e68ab7a9 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 28 Jun 2010 14:35:35 -0400 -Subject: [PATCH 03/34] Add user chooser to ui file +Subject: [PATCH 03/35] Add user chooser to ui file Before it was getting added manually from the source code. @@ -76,10 +76,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 ca170a5..8ed7a6b 100644 +index 6069e00..b7ee893 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1221,6 +1221,17 @@ create_computer_info (GdmGreeterLoginWindow *login_window) +@@ -1224,6 +1224,17 @@ create_computer_info (GdmGreeterLoginWindow *login_window) static void @@ -97,7 +97,7 @@ index ca170a5..8ed7a6b 100644 load_theme (GdmGreeterLoginWindow *login_window) { GtkWidget *entry; -@@ -1231,6 +1242,8 @@ load_theme (GdmGreeterLoginWindow *login_window) +@@ -1234,6 +1245,8 @@ load_theme (GdmGreeterLoginWindow *login_window) gdm_profile_start (NULL); @@ -106,7 +106,7 @@ index ca170a5..8ed7a6b 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); -@@ -1264,12 +1277,7 @@ load_theme (GdmGreeterLoginWindow *login_window) +@@ -1267,12 +1280,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 +141,13 @@ index d8cf1cc..83375ed 100644 -- -1.7.3 +1.7.3.3 -From 450c5e7e0efeeeeeb663e9e5b191d43cfd39829a Mon Sep 17 00:00:00 2001 +From 863ef39bb74f65363fa0edfd6970199c11f7f433 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 20 Feb 2009 14:05:20 -0500 -Subject: [PATCH 04/34] Add new api to ask when chooser widget is done loading items +Subject: [PATCH 04/35] Add new api to ask when chooser widget is done loading items --- gui/simple-greeter/gdm-chooser-widget.c | 8 ++++++++ @@ -197,13 +197,13 @@ index 11a6456..3f6fea3 100644 */ void gdm_chooser_widget_loaded (GdmChooserWidget *widget); -- -1.7.3 +1.7.3.3 -From 794b3df0b2e16a734a177184cf4f5b9da5ed4977 Mon Sep 17 00:00:00 2001 +From 50929cd96a824e88daf0f9dc4aa21b99fc841f60 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Mar 2009 11:19:40 -0500 -Subject: [PATCH 05/34] Create session settings object up front +Subject: [PATCH 05/35] Create session settings object up front This allows us to set language, session, etc, before the PAM conversation is started. @@ -212,10 +212,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 11dc800..6082fd8 100644 +index 281c554..e8ebc60 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c -@@ -2336,8 +2336,6 @@ do_setup (GdmSessionWorker *worker) +@@ -2297,8 +2297,6 @@ do_setup (GdmSessionWorker *worker) GError *error; gboolean res; @@ -224,7 +224,7 @@ index 11dc800..6082fd8 100644 g_signal_connect_swapped (worker->priv->user_settings, "notify::language-name", G_CALLBACK (on_saved_language_name_read), -@@ -2963,6 +2961,7 @@ gdm_session_worker_init (GdmSessionWorker *worker) +@@ -2924,6 +2922,7 @@ gdm_session_worker_init (GdmSessionWorker *worker) g_str_equal, (GDestroyNotify) g_free, (GDestroyNotify) g_free); @@ -233,13 +233,13 @@ index 11dc800..6082fd8 100644 static void -- -1.7.3 +1.7.3.3 -From 191e6011c8264265feea29cf781b0ff883b83dd2 Mon Sep 17 00:00:00 2001 +From 7c5bd8125257dff521474681c3cbbf43ec56e1bc Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 13 Jul 2010 22:42:43 -0400 -Subject: [PATCH 06/34] disconnect signal handlers in destroy session +Subject: [PATCH 06/35] disconnect signal handlers in destroy session We don't want them firing as part of object destruction --- @@ -247,10 +247,10 @@ We don't want them firing as part of object destruction 1 files changed, 94 insertions(+), 10 deletions(-) diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 6b9159a..cd343c7 100644 +index 8906e3a..6a90d02 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -97,6 +97,7 @@ static void gdm_simple_slave_finalize (GObject *object); +@@ -104,6 +104,7 @@ static void gdm_simple_slave_finalize (GObject *object); G_DEFINE_TYPE (GdmSimpleSlave, gdm_simple_slave, GDM_TYPE_SLAVE) static void create_new_session (GdmSimpleSlave *slave); @@ -258,7 +258,7 @@ index 6b9159a..cd343c7 100644 static void start_greeter (GdmSimpleSlave *slave); static void -@@ -171,16 +172,6 @@ add_user_authorization (GdmSimpleSlave *slave, +@@ -238,16 +239,6 @@ add_user_authorization (GdmSimpleSlave *slave, } static void @@ -275,7 +275,7 @@ index 6b9159a..cd343c7 100644 reset_session (GdmSimpleSlave *slave) { destroy_session (slave); -@@ -780,6 +771,99 @@ create_new_session (GdmSimpleSlave *slave) +@@ -851,6 +842,99 @@ create_new_session (GdmSimpleSlave *slave) } static void @@ -376,13 +376,13 @@ index 6b9159a..cd343c7 100644 GdmSimpleSlave *slave) { -- -1.7.3 +1.7.3.3 -From d765b90a29c719f18dfe0b94652720b854a071a9 Mon Sep 17 00:00:00 2001 +From 71c371f27fe31cc3f41a5d33dceb66aacec96c8d Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 16 Jan 2009 11:00:08 -0500 -Subject: [PATCH 07/34] Introduce new Conversation object +Subject: [PATCH 07/35] Introduce new Conversation object We want to eventually support having multiple simultaneous PAM conversations in one login @@ -489,7 +489,7 @@ index a423965..9be89b4 100644 static void diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index 0282ab7..f9621a2 100644 +index 223f6f4..aa76f52 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -67,6 +67,16 @@ @@ -1182,7 +1182,7 @@ index 0282ab7..f9621a2 100644 } char * -@@ -2276,6 +2346,7 @@ gdm_session_direct_select_session (GdmSession *session, +@@ -2284,6 +2354,7 @@ gdm_session_direct_select_session (GdmSession *session, const char *text) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); @@ -1190,7 +1190,7 @@ index 0282ab7..f9621a2 100644 g_free (impl->priv->selected_session); -@@ -2285,7 +2356,8 @@ gdm_session_direct_select_session (GdmSession *session, +@@ -2293,7 +2364,8 @@ gdm_session_direct_select_session (GdmSession *session, impl->priv->selected_session = g_strdup (text); } @@ -1200,7 +1200,7 @@ index 0282ab7..f9621a2 100644 get_session_name (impl)); } -@@ -2294,6 +2366,7 @@ gdm_session_direct_select_language (GdmSession *session, +@@ -2302,6 +2374,7 @@ gdm_session_direct_select_language (GdmSession *session, const char *text) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); @@ -1208,7 +1208,7 @@ index 0282ab7..f9621a2 100644 g_free (impl->priv->selected_language); -@@ -2303,7 +2376,8 @@ gdm_session_direct_select_language (GdmSession *session, +@@ -2311,7 +2384,8 @@ gdm_session_direct_select_language (GdmSession *session, impl->priv->selected_language = g_strdup (text); } @@ -1218,7 +1218,7 @@ index 0282ab7..f9621a2 100644 get_language_name (impl)); } -@@ -2312,6 +2386,7 @@ gdm_session_direct_select_layout (GdmSession *session, +@@ -2320,6 +2394,7 @@ gdm_session_direct_select_layout (GdmSession *session, const char *text) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); @@ -1226,7 +1226,7 @@ index 0282ab7..f9621a2 100644 g_free (impl->priv->selected_layout); -@@ -2321,7 +2396,8 @@ gdm_session_direct_select_layout (GdmSession *session, +@@ -2329,7 +2404,8 @@ gdm_session_direct_select_layout (GdmSession *session, impl->priv->selected_layout = g_strdup (text); } @@ -1416,10 +1416,10 @@ 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 cd343c7..7ccd601 100644 +index 6a90d02..1cad6ad 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -176,7 +176,6 @@ reset_session (GdmSimpleSlave *slave) +@@ -243,7 +243,6 @@ reset_session (GdmSimpleSlave *slave) { destroy_session (slave); create_new_session (slave); @@ -1427,7 +1427,7 @@ index cd343c7..7ccd601 100644 } static gboolean -@@ -983,8 +982,6 @@ on_greeter_connected (GdmGreeterServer *greeter_server, +@@ -1054,8 +1053,6 @@ on_greeter_connected (GdmGreeterServer *greeter_server, g_debug ("GdmSimpleSlave: Greeter connected"); @@ -1464,13 +1464,13 @@ index 8bed085..9bfda86 100644 g_signal_connect (session, "conversation-started", -- -1.7.3 +1.7.3.3 -From 37344a3c548715ff7408f5198fe80d816f3480cf Mon Sep 17 00:00:00 2001 +From 24794eef2b3f4397542f45899948fa65e601851a Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 4 Feb 2009 10:55:03 -0500 -Subject: [PATCH 08/34] Rename session worker to the service it's managing +Subject: [PATCH 08/35] 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. @@ -1481,7 +1481,7 @@ it will be obvious which worker is managing which conversation. 3 files changed, 57 insertions(+), 16 deletions(-) diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index f9621a2..cfbaa15 100644 +index aa76f52..87e38d3 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -1745,6 +1745,7 @@ start_conversation (GdmSessionDirect *session, @@ -1653,13 +1653,13 @@ index d24f025..4833f23 100644 GPid gdm_session_worker_job_get_pid (GdmSessionWorkerJob *session_worker_job); -- -1.7.3 +1.7.3.3 -From 4e72956a17e50adf57b96d3dfdd47380a1fa87c9 Mon Sep 17 00:00:00 2001 +From 2719a3241a971b47a9c5e426280419521a01eb9c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 16 Jan 2009 13:01:48 -0500 -Subject: [PATCH 09/34] Make greeter/autologin session explicitly request PAM conversation +Subject: [PATCH 09/35] 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, @@ -1827,10 +1827,10 @@ index f9c157f..7e2424a 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 7ccd601..5bb5251 100644 +index 1cad6ad..0b60ef7 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -545,6 +545,7 @@ on_session_secret_info_query (GdmSession *session, +@@ -616,6 +616,7 @@ on_session_secret_info_query (GdmSession *session, static void on_session_conversation_started (GdmSession *session, @@ -1838,7 +1838,7 @@ index 7ccd601..5bb5251 100644 GdmSimpleSlave *slave) { gboolean res; -@@ -554,7 +555,8 @@ on_session_conversation_started (GdmSession *session, +@@ -625,7 +626,8 @@ on_session_conversation_started (GdmSession *session, g_debug ("GdmSimpleSlave: session conversation started"); if (slave->priv->greeter_server != NULL) { @@ -1848,7 +1848,7 @@ index 7ccd601..5bb5251 100644 if (! res) { g_warning ("Unable to send ready"); } -@@ -570,8 +572,10 @@ on_session_conversation_started (GdmSession *session, +@@ -641,8 +643,10 @@ on_session_conversation_started (GdmSession *session, gdm_greeter_server_request_timed_login (slave->priv->greeter_server, username, delay); } else { g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); @@ -1860,7 +1860,7 @@ index 7ccd601..5bb5251 100644 username); } -@@ -627,6 +631,21 @@ on_default_session_name_changed (GdmSession *session, +@@ -698,6 +702,21 @@ on_default_session_name_changed (GdmSession *session, } static void @@ -1882,7 +1882,7 @@ index 7ccd601..5bb5251 100644 create_new_session (GdmSimpleSlave *slave) { gboolean display_is_local; -@@ -767,6 +786,8 @@ create_new_session (GdmSimpleSlave *slave) +@@ -838,6 +857,8 @@ create_new_session (GdmSimpleSlave *slave) "default-session-name-changed", G_CALLBACK (on_default_session_name_changed), slave); @@ -1891,7 +1891,7 @@ index 7ccd601..5bb5251 100644 } static void -@@ -896,6 +917,16 @@ on_greeter_session_died (GdmGreeterSession *greeter, +@@ -967,6 +988,16 @@ on_greeter_session_died (GdmGreeterSession *greeter, } static void @@ -1908,7 +1908,7 @@ index 7ccd601..5bb5251 100644 on_greeter_begin_verification (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { -@@ -1073,6 +1104,10 @@ start_greeter (GdmSimpleSlave *slave) +@@ -1144,6 +1175,10 @@ start_greeter (GdmSimpleSlave *slave) slave->priv->greeter_server = gdm_greeter_server_new (display_id); g_signal_connect (slave->priv->greeter_server, @@ -2014,13 +2014,13 @@ index d4ef77f..63de620 100644 return res; -- -1.7.3 +1.7.3.3 -From cb88bae99e85b08491a3c612f543a32ff1556d2d Mon Sep 17 00:00:00 2001 +From 7a11766a320ce024301f1cb63169729b33f79793 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 16 Jan 2009 15:18:31 -0500 -Subject: [PATCH 10/34] Store multiple conversations in the session +Subject: [PATCH 10/35] 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 @@ -3152,7 +3152,7 @@ index 9be89b4..607bbc6 100644 static void diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index cfbaa15..13c8974 100644 +index 87e38d3..680c0f0 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -89,9 +89,10 @@ struct _GdmSessionDirectPrivate @@ -4396,7 +4396,7 @@ index cfbaa15..13c8974 100644 } char * -@@ -2351,7 +2540,8 @@ gdm_session_direct_select_session (GdmSession *session, +@@ -2359,7 +2548,8 @@ gdm_session_direct_select_session (GdmSession *session, const char *text) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); @@ -4406,7 +4406,7 @@ index cfbaa15..13c8974 100644 g_free (impl->priv->selected_session); -@@ -2361,9 +2551,15 @@ gdm_session_direct_select_session (GdmSession *session, +@@ -2369,9 +2559,15 @@ gdm_session_direct_select_session (GdmSession *session, impl->priv->selected_session = g_strdup (text); } @@ -4425,7 +4425,7 @@ index cfbaa15..13c8974 100644 } static void -@@ -2371,7 +2567,8 @@ gdm_session_direct_select_language (GdmSession *session, +@@ -2379,7 +2575,8 @@ gdm_session_direct_select_language (GdmSession *session, const char *text) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); @@ -4435,7 +4435,7 @@ index cfbaa15..13c8974 100644 g_free (impl->priv->selected_language); -@@ -2381,9 +2578,15 @@ gdm_session_direct_select_language (GdmSession *session, +@@ -2389,9 +2586,15 @@ gdm_session_direct_select_language (GdmSession *session, impl->priv->selected_language = g_strdup (text); } @@ -4454,7 +4454,7 @@ index cfbaa15..13c8974 100644 } static void -@@ -2391,7 +2594,8 @@ gdm_session_direct_select_layout (GdmSession *session, +@@ -2399,7 +2602,8 @@ gdm_session_direct_select_layout (GdmSession *session, const char *text) { GdmSessionDirect *impl = GDM_SESSION_DIRECT (session); @@ -4464,7 +4464,7 @@ index cfbaa15..13c8974 100644 g_free (impl->priv->selected_layout); -@@ -2401,9 +2605,15 @@ gdm_session_direct_select_layout (GdmSession *session, +@@ -2409,9 +2613,15 @@ gdm_session_direct_select_layout (GdmSession *session, impl->priv->selected_layout = g_strdup (text); } @@ -4483,7 +4483,7 @@ index cfbaa15..13c8974 100644 } static void -@@ -2665,6 +2875,7 @@ static void +@@ -2673,6 +2883,7 @@ static void gdm_session_iface_init (GdmSessionIface *iface) { iface->start_conversation = gdm_session_direct_start_conversation; @@ -5008,10 +5008,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 6082fd8..fd11907 100644 +index e8ebc60..f992340 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c -@@ -2894,6 +2894,28 @@ worker_dbus_filter_function (DBusConnection *connection, +@@ -2855,6 +2855,28 @@ worker_dbus_filter_function (DBusConnection *connection, return DBUS_HANDLER_RESULT_HANDLED; } @@ -5040,7 +5040,7 @@ index 6082fd8..fd11907 100644 static GObject * gdm_session_worker_constructor (GType type, guint n_construct_properties, -@@ -2920,6 +2942,11 @@ gdm_session_worker_constructor (GType type, +@@ -2881,6 +2903,11 @@ gdm_session_worker_constructor (GType type, exit (1); } @@ -5724,10 +5724,10 @@ index 00c2fa4..22c2ccb 100644 void gdm_session_select_session (GdmSession *session, const char *session_name); diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 5bb5251..4f4f331 100644 +index 0b60ef7..c45011c 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -71,6 +71,8 @@ struct GdmSimpleSlavePrivate +@@ -75,6 +75,8 @@ struct GdmSimpleSlavePrivate guint greeter_reset_id; guint start_session_id; @@ -5736,7 +5736,7 @@ index 5bb5251..4f4f331 100644 int ping_interval; GPid server_pid; -@@ -102,6 +104,7 @@ static void start_greeter (GdmSimpleSlave *slave); +@@ -109,6 +111,7 @@ static void start_greeter (GdmSimpleSlave *slave); static void on_session_started (GdmSession *session, @@ -5744,7 +5744,7 @@ index 5bb5251..4f4f331 100644 int pid, GdmSimpleSlave *slave) { -@@ -233,23 +236,25 @@ queue_auth_failed_reset (GdmSimpleSlave *slave) +@@ -300,23 +303,25 @@ queue_auth_failed_reset (GdmSimpleSlave *slave) static void on_session_setup_complete (GdmSession *session, @@ -5774,7 +5774,7 @@ index 5bb5251..4f4f331 100644 } static void -@@ -269,29 +274,32 @@ on_session_reset_failed (GdmSession *session, +@@ -336,29 +341,32 @@ on_session_reset_failed (GdmSession *session, static void on_session_authenticated (GdmSession *session, @@ -5811,7 +5811,7 @@ index 5bb5251..4f4f331 100644 { if (slave->priv->start_session_when_ready) { char *ssid; -@@ -312,7 +320,7 @@ gdm_simple_slave_accredit_when_ready (GdmSimpleSlave *slave) +@@ -379,7 +387,7 @@ gdm_simple_slave_accredit_when_ready (GdmSimpleSlave *slave) g_free (ssid); g_free (username); @@ -5820,7 +5820,7 @@ index 5bb5251..4f4f331 100644 } else { slave->priv->waiting_to_start_session = TRUE; } -@@ -320,29 +328,31 @@ gdm_simple_slave_accredit_when_ready (GdmSimpleSlave *slave) +@@ -387,29 +395,31 @@ gdm_simple_slave_accredit_when_ready (GdmSimpleSlave *slave) static void on_session_authorized (GdmSession *session, @@ -5858,7 +5858,7 @@ index 5bb5251..4f4f331 100644 } static gboolean -@@ -425,31 +435,38 @@ start_session_timeout (GdmSimpleSlave *slave) +@@ -492,31 +502,38 @@ start_session_timeout (GdmSimpleSlave *slave) g_free (auth_file); @@ -5900,7 +5900,7 @@ index 5bb5251..4f4f331 100644 const char *message, GdmSimpleSlave *slave) { -@@ -470,6 +487,7 @@ on_session_accreditation_failed (GdmSession *session, +@@ -537,6 +554,7 @@ on_session_accreditation_failed (GdmSession *session, problem = _("Unable to establish credentials"); } gdm_greeter_server_problem (slave->priv->greeter_server, @@ -5908,7 +5908,7 @@ index 5bb5251..4f4f331 100644 problem); } } -@@ -478,69 +496,74 @@ on_session_accreditation_failed (GdmSession *session, +@@ -545,73 +563,78 @@ on_session_accreditation_failed (GdmSession *session, when Xorg exits it switches to the VT it was started from. That interferes with fast user switching. */ @@ -5923,6 +5923,10 @@ index 5bb5251..4f4f331 100644 + const char *service_name, GdmSimpleSlave *slave) { + #ifdef HAVE_LOGINDEVPERM + gdm_simple_slave_grant_console_permissions (slave); + #endif /* HAVE_LOGINDEVPERM */ + - queue_start_session (slave); + queue_start_session (slave, service_name); } @@ -5992,7 +5996,7 @@ index 5bb5251..4f4f331 100644 } static void -@@ -583,6 +606,23 @@ on_session_conversation_started (GdmSession *session, +@@ -654,6 +677,23 @@ on_session_conversation_started (GdmSession *session, } static void @@ -6016,7 +6020,7 @@ index 5bb5251..4f4f331 100644 on_session_selected_user_changed (GdmSession *session, const char *text, GdmSimpleSlave *slave) -@@ -686,6 +726,10 @@ create_new_session (GdmSimpleSlave *slave) +@@ -757,6 +797,10 @@ create_new_session (GdmSimpleSlave *slave) G_CALLBACK (on_session_conversation_started), slave); g_signal_connect (slave->priv->session, @@ -6027,7 +6031,7 @@ index 5bb5251..4f4f331 100644 "setup-complete", G_CALLBACK (on_session_setup_complete), slave); -@@ -801,6 +845,9 @@ destroy_session (GdmSimpleSlave *slave) +@@ -872,6 +916,9 @@ destroy_session (GdmSimpleSlave *slave) G_CALLBACK (on_session_conversation_started), slave); g_signal_handlers_disconnect_by_func (slave->priv->session, @@ -6037,7 +6041,7 @@ index 5bb5251..4f4f331 100644 G_CALLBACK (on_session_setup_complete), slave); g_signal_handlers_disconnect_by_func (slave->priv->session, -@@ -928,11 +975,12 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server, +@@ -999,11 +1046,12 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server, static void on_greeter_begin_verification (GdmGreeterServer *greeter_server, @@ -6051,7 +6055,7 @@ index 5bb5251..4f4f331 100644 } static void -@@ -948,21 +996,23 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server, +@@ -1019,21 +1067,23 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server, static void on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server, @@ -6077,7 +6081,7 @@ index 5bb5251..4f4f331 100644 } static void -@@ -1025,18 +1075,20 @@ on_greeter_connected (GdmGreeterServer *greeter_server, +@@ -1096,18 +1146,20 @@ on_greeter_connected (GdmGreeterServer *greeter_server, static void on_start_session_when_ready (GdmGreeterServer *session, @@ -6667,13 +6671,13 @@ index 63de620..b7e7f1c 100644 static int -- -1.7.3 +1.7.3.3 -From 12c545e0d3bee590afca92120029f7ba2ac1eeec Mon Sep 17 00:00:00 2001 +From afa1b73fec6699efbf0fe2fa7a592cb0c844d751 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Oct 2009 16:05:14 -0400 -Subject: [PATCH 11/34] Return a different error code for "service won't work" than "auth failed" +Subject: [PATCH 11/35] 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,10 +6687,10 @@ 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 fd11907..0fd7268 100644 +index f992340..fc2ec21 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c -@@ -1306,8 +1306,8 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker, +@@ -1286,8 +1286,8 @@ gdm_session_worker_initialize_pam (GdmSessionWorker *worker, */ g_set_error (error, GDM_SESSION_WORKER_ERROR, @@ -6697,7 +6701,7 @@ index fd11907..0fd7268 100644 error_code == PAM_ABORT? _("general failure") : error_code == PAM_BUF_ERR? _("out of memory") : error_code == PAM_SYSTEM_ERR? _("application programmer error") : -@@ -1418,7 +1418,15 @@ gdm_session_worker_authenticate_user (GdmSessionWorker *worker, +@@ -1398,7 +1398,15 @@ gdm_session_worker_authenticate_user (GdmSessionWorker *worker, /* blocking call, does the actual conversation */ error_code = pam_authenticate (worker->priv->pam_handle, authentication_flags); @@ -6727,13 +6731,13 @@ index ee5465a..b1c8285 100644 GDM_SESSION_WORKER_ERROR_AUTHORIZING, GDM_SESSION_WORKER_ERROR_OPENING_LOG_FILE, -- -1.7.3 +1.7.3.3 -From e19cd77d22eddf31215e3a6c36c3e975e18df186 Mon Sep 17 00:00:00 2001 +From 6d6dfbd6f97c4adab7fafb233ece88567fbe8ff0 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Oct 2009 21:32:00 -0400 -Subject: [PATCH 12/34] Emit "service-unavailable" from session when pam service refuses to work +Subject: [PATCH 12/35] Emit "service-unavailable" from session when pam service refuses to work --- daemon/gdm-session-direct.c | 26 +++++++++++++++++++++++--- @@ -6745,7 +6749,7 @@ Subject: [PATCH 12/34] Emit "service-unavailable" from session when pam service 6 files changed, 103 insertions(+), 10 deletions(-) diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index 13c8974..5a604bf 100644 +index 680c0f0..832b870 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -283,9 +283,27 @@ on_session_exited (GdmSession *session, @@ -6860,10 +6864,10 @@ index 98ccc51..88aee14 100644 " \n" " \n" diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c -index 0fd7268..ab2f6c5 100644 +index fc2ec21..64055e7 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c -@@ -2384,9 +2384,16 @@ do_setup (GdmSessionWorker *worker) +@@ -2345,9 +2345,16 @@ do_setup (GdmSessionWorker *worker) worker->priv->display_device, &error); if (! res) { @@ -6883,7 +6887,7 @@ index 0fd7268..ab2f6c5 100644 g_error_free (error); return; } -@@ -2407,10 +2414,18 @@ do_authenticate (GdmSessionWorker *worker) +@@ -2368,10 +2375,18 @@ do_authenticate (GdmSessionWorker *worker) worker->priv->password_is_required, &error); if (! res) { @@ -6966,13 +6970,13 @@ index 22c2ccb..9636b92 100644 const char *service_name); void (* setup_for_user) (GdmSession *session, -- -1.7.3 +1.7.3.3 -From 0c423df1aa38bd16a71f4d0b3224de16bfc78a54 Mon Sep 17 00:00:00 2001 +From d828346081eb0a4fc7451237d79e584b327134d0 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Oct 2009 21:38:52 -0400 -Subject: [PATCH 13/34] Bubble service-unavailable up to greeter +Subject: [PATCH 13/35] Bubble service-unavailable up to greeter --- daemon/gdm-greeter-server.c | 13 +++++++++++-- @@ -7022,10 +7026,10 @@ index 5af32fd..ff1ff5d 100644 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 4f4f331..6faeeb3 100644 +index c45011c..7a1da63 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -197,22 +197,6 @@ greeter_reset_timeout (GdmSimpleSlave *slave) +@@ -264,22 +264,6 @@ greeter_reset_timeout (GdmSimpleSlave *slave) return FALSE; } @@ -7048,7 +7052,7 @@ index 4f4f331..6faeeb3 100644 static void queue_greeter_reset (GdmSimpleSlave *slave) { -@@ -224,14 +208,16 @@ queue_greeter_reset (GdmSimpleSlave *slave) +@@ -291,14 +275,16 @@ queue_greeter_reset (GdmSimpleSlave *slave) } static void @@ -7070,7 +7074,7 @@ index 4f4f331..6faeeb3 100644 } static void -@@ -294,7 +280,6 @@ on_session_authentication_failed (GdmSession *session, +@@ -361,7 +347,6 @@ on_session_authentication_failed (GdmSession *session, g_debug ("GdmSimpleSlave: Authentication failed - may retry"); gdm_session_stop_conversation (session, service_name); @@ -7078,7 +7082,7 @@ index 4f4f331..6faeeb3 100644 } static void -@@ -730,6 +715,10 @@ create_new_session (GdmSimpleSlave *slave) +@@ -801,6 +786,10 @@ create_new_session (GdmSimpleSlave *slave) G_CALLBACK (on_session_conversation_stopped), slave); g_signal_connect (slave->priv->session, @@ -7089,7 +7093,7 @@ index 4f4f331..6faeeb3 100644 "setup-complete", G_CALLBACK (on_session_setup_complete), slave); -@@ -848,6 +837,9 @@ destroy_session (GdmSimpleSlave *slave) +@@ -919,6 +908,9 @@ destroy_session (GdmSimpleSlave *slave) G_CALLBACK (on_session_conversation_stopped), slave); g_signal_handlers_disconnect_by_func (slave->priv->session, @@ -7100,13 +7104,13 @@ index 4f4f331..6faeeb3 100644 slave); g_signal_handlers_disconnect_by_func (slave->priv->session, -- -1.7.3 +1.7.3.3 -From 3bc57989d1a1ba68f9029202ca18b05f274dc376 Mon Sep 17 00:00:00 2001 +From 330592f0c533f711aae7efa58245794551e691cd Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Oct 2009 21:46:39 -0400 -Subject: [PATCH 14/34] Catch service-unavailable from server in client and propagate it +Subject: [PATCH 14/35] Catch service-unavailable from server in client and propagate it --- gui/simple-greeter/gdm-greeter-client.c | 20 ++++++++++++++++++++ @@ -7179,23 +7183,23 @@ index 2f27503..917ca9c 100644 const char *service_name); void (* reset) (GdmGreeterClient *client); -- -1.7.3 +1.7.3.3 -From 02c136a9a08099931a3df1b1be7132fea1f0d11a Mon Sep 17 00:00:00 2001 +From 7768021af7f0a00bb5caacf834f440a08e462e4e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 5 Feb 2009 15:20:25 -0500 -Subject: [PATCH 15/34] Queue a greeter reset when the user clicks cancel +Subject: [PATCH 15/35] Queue a greeter reset when the user clicks cancel --- daemon/gdm-simple-slave.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 6faeeb3..05972a4 100644 +index 7a1da63..c49e6c7 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -961,6 +961,9 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server, +@@ -1032,6 +1032,9 @@ on_greeter_start_conversation (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: starting conversation with '%s' pam service'", service_name); @@ -7205,7 +7209,7 @@ index 6faeeb3..05972a4 100644 gdm_session_start_conversation (GDM_SESSION (slave->priv->session), service_name); } -@@ -971,6 +974,9 @@ on_greeter_begin_verification (GdmGreeterServer *greeter_server, +@@ -1042,6 +1045,9 @@ on_greeter_begin_verification (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: begin verification"); @@ -7215,7 +7219,7 @@ index 6faeeb3..05972a4 100644 gdm_session_setup (GDM_SESSION (slave->priv->session), service_name); } -@@ -981,6 +987,9 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server, +@@ -1052,6 +1058,9 @@ on_greeter_begin_auto_login (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: begin auto login for user '%s'", username); @@ -7225,7 +7229,7 @@ index 6faeeb3..05972a4 100644 gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), "gdm-autologin", username); -@@ -993,6 +1002,9 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server, +@@ -1064,6 +1073,9 @@ on_greeter_begin_verification_for_user (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: begin verification"); @@ -7235,7 +7239,7 @@ index 6faeeb3..05972a4 100644 gdm_session_setup_for_user (GDM_SESSION (slave->priv->session), service_name, username); -@@ -1004,6 +1016,9 @@ on_greeter_answer (GdmGreeterServer *greeter_server, +@@ -1075,6 +1087,9 @@ on_greeter_answer (GdmGreeterServer *greeter_server, const char *text, GdmSimpleSlave *slave) { @@ -7245,7 +7249,7 @@ index 6faeeb3..05972a4 100644 gdm_session_answer_query (GDM_SESSION (slave->priv->session), service_name, text); } -@@ -1012,6 +1027,9 @@ on_greeter_session_selected (GdmGreeterServer *greeter_server, +@@ -1083,6 +1098,9 @@ on_greeter_session_selected (GdmGreeterServer *greeter_server, const char *text, GdmSimpleSlave *slave) { @@ -7255,7 +7259,7 @@ index 6faeeb3..05972a4 100644 gdm_session_select_session (GDM_SESSION (slave->priv->session), text); } -@@ -1020,6 +1038,9 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server, +@@ -1091,6 +1109,9 @@ on_greeter_language_selected (GdmGreeterServer *greeter_server, const char *text, GdmSimpleSlave *slave) { @@ -7265,7 +7269,7 @@ index 6faeeb3..05972a4 100644 gdm_session_select_language (GDM_SESSION (slave->priv->session), text); } -@@ -1028,6 +1049,9 @@ on_greeter_layout_selected (GdmGreeterServer *greeter_server, +@@ -1099,6 +1120,9 @@ on_greeter_layout_selected (GdmGreeterServer *greeter_server, const char *text, GdmSimpleSlave *slave) { @@ -7275,7 +7279,7 @@ index 6faeeb3..05972a4 100644 gdm_session_select_layout (GDM_SESSION (slave->priv->session), text); } -@@ -1044,6 +1068,7 @@ on_greeter_cancel (GdmGreeterServer *greeter_server, +@@ -1115,6 +1139,7 @@ on_greeter_cancel (GdmGreeterServer *greeter_server, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: Greeter cancelled"); @@ -7283,7 +7287,7 @@ index 6faeeb3..05972a4 100644 queue_greeter_reset (slave); } -@@ -1054,6 +1079,9 @@ on_greeter_connected (GdmGreeterServer *greeter_server, +@@ -1125,6 +1150,9 @@ on_greeter_connected (GdmGreeterServer *greeter_server, gboolean display_is_local; g_debug ("GdmSimpleSlave: Greeter connected"); @@ -7293,7 +7297,7 @@ index 6faeeb3..05972a4 100644 g_object_get (slave, "display-is-local", &display_is_local, -@@ -1071,6 +1099,9 @@ on_start_session_when_ready (GdmGreeterServer *session, +@@ -1142,6 +1170,9 @@ on_start_session_when_ready (GdmGreeterServer *session, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: Will start session when ready"); @@ -7303,7 +7307,7 @@ index 6faeeb3..05972a4 100644 slave->priv->start_session_when_ready = TRUE; if (slave->priv->waiting_to_start_session) { -@@ -1084,6 +1115,9 @@ on_start_session_later (GdmGreeterServer *session, +@@ -1155,6 +1186,9 @@ on_start_session_later (GdmGreeterServer *session, GdmSimpleSlave *slave) { g_debug ("GdmSimpleSlave: Will start session when ready and told"); @@ -7314,13 +7318,13 @@ index 6faeeb3..05972a4 100644 } -- -1.7.3 +1.7.3.3 -From 767bf4957dd632d6327e9bf5509066ab613ddec4 Mon Sep 17 00:00:00 2001 +From 4874b7a931e0e050cc5f4678a2b3ed287462126c Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Nov 2009 13:35:26 -0500 -Subject: [PATCH 16/34] Don't delay login for passwd -d users +Subject: [PATCH 16/35] 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 +7334,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 8ed7a6b..afa8d47 100644 +index b7ee893..1d66c73 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -845,7 +845,7 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_ +@@ -846,7 +846,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 +7347,13 @@ index 8ed7a6b..afa8d47 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.3 +1.7.3.3 -From e53e60a2ee5dafc9095beff838351ff078245e59 Mon Sep 17 00:00:00 2001 +From 55d49cc15eb49fbe69d83287238cabcaa8b566ab Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 30 Jan 2009 23:57:31 -0500 -Subject: [PATCH 17/34] Add a plugin based extension system to greeter +Subject: [PATCH 17/35] 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" @@ -7364,7 +7368,7 @@ run. gui/simple-greeter/gdm-greeter-login-window.c | 1061 +++++++++++++++++--- gui/simple-greeter/gdm-greeter-login-window.h | 36 +- gui/simple-greeter/gdm-greeter-login-window.ui | 67 +- - gui/simple-greeter/gdm-greeter-plugin.c | 255 +++++ + gui/simple-greeter/gdm-greeter-plugin.c | 254 +++++ gui/simple-greeter/gdm-greeter-plugin.h | 61 ++ gui/simple-greeter/gdm-greeter-session.c | 161 +++- gui/simple-greeter/gdm-plugin-manager.c | 478 +++++++++ @@ -7388,7 +7392,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, 3746 insertions(+), 255 deletions(-) + 32 files changed, 3745 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 +7425,7 @@ index d5455e1..d8a9e72 100644 VOID:DOUBLE +BOOLEAN:STRING diff --git a/configure.ac b/configure.ac -index ed07dce..67b4cab 100644 +index 3a12767..8c8b74d 100644 --- a/configure.ac +++ b/configure.ac @@ -18,6 +18,22 @@ AC_PROG_CXX @@ -7643,7 +7647,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 afa8d47..77b235c 100644 +index 1d66c73..c01b9cb 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -1,7 +1,7 @@ @@ -8118,7 +8122,7 @@ index afa8d47..77b235c 100644 } else { switch_mode (login_window, dialog_mode); } -@@ -688,88 +837,177 @@ reset_dialog (GdmGreeterLoginWindow *login_window, +@@ -688,89 +837,178 @@ reset_dialog (GdmGreeterLoginWindow *login_window, } static void @@ -8163,6 +8167,7 @@ index afa8d47..77b235c 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)); + gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (login_window))); - /* If we are retrying a previously selected user */ - if (!login_window->priv->user_list_disabled && @@ -8323,7 +8328,7 @@ index afa8d47..77b235c 100644 return TRUE; } -@@ -793,6 +1031,26 @@ request_timed_login (GdmGreeterLoginWindow *login_window) +@@ -794,6 +1032,26 @@ request_timed_login (GdmGreeterLoginWindow *login_window) login_window->priv->timed_login_already_enabled = TRUE; } @@ -8350,7 +8355,7 @@ index afa8d47..77b235c 100644 void gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_window, const char *username, -@@ -820,11 +1078,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo +@@ -821,11 +1079,21 @@ gdm_greeter_login_window_request_timed_login (GdmGreeterLoginWindow *login_windo } static void @@ -8374,7 +8379,7 @@ index afa8d47..77b235c 100644 } else { g_debug ("GdmGreeterLoginWindow: not starting session since " "user hasn't had an opportunity to pick language " -@@ -834,8 +1102,8 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_ +@@ -835,8 +1103,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", @@ -8385,7 +8390,7 @@ index afa8d47..77b235c 100644 /* FIXME: If the user wasn't asked any questions by pam but * pam still authorized them (passwd -d, or the questions got -@@ -858,10 +1126,10 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_ +@@ -859,10 +1127,10 @@ gdm_greeter_login_window_start_session_when_ready (GdmGreeterLoginWindow *login_ gboolean gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, @@ -8398,7 +8403,7 @@ index afa8d47..77b235c 100644 g_return_val_if_fail (GDM_IS_GREETER_LOGIN_WINDOW (login_window), FALSE); -@@ -870,15 +1138,15 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, +@@ -871,15 +1139,15 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, g_debug ("GdmGreeterLoginWindow: info query: %s", text); @@ -8421,7 +8426,7 @@ index afa8d47..77b235c 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)); -@@ -890,25 +1158,26 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, +@@ -891,25 +1159,26 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, gboolean gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window, @@ -8457,7 +8462,7 @@ index afa8d47..77b235c 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)); -@@ -919,13 +1188,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window, +@@ -920,13 +1189,16 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window, } void @@ -8477,7 +8482,7 @@ index afa8d47..77b235c 100644 } static void -@@ -996,6 +1268,49 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window) +@@ -997,6 +1269,49 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window) update_banner_message (login_window); } @@ -8527,7 +8532,7 @@ index afa8d47..77b235c 100644 static void on_users_loaded (GdmUserChooserWidget *user_chooser, GdmGreeterLoginWindow *login_window) -@@ -1009,38 +1324,153 @@ on_users_loaded (GdmUserChooserWidget *user_chooser, +@@ -1010,38 +1325,153 @@ on_users_loaded (GdmUserChooserWidget *user_chooser, gtk_widget_show (login_window->priv->user_chooser); } @@ -8693,7 +8698,7 @@ index afa8d47..77b235c 100644 } static void -@@ -1219,11 +1649,74 @@ create_computer_info (GdmGreeterLoginWindow *login_window) +@@ -1222,11 +1652,74 @@ create_computer_info (GdmGreeterLoginWindow *login_window) #define INVISIBLE_CHAR_BULLET 0x2022 #define INVISIBLE_CHAR_NONE 0 @@ -8769,7 +8774,7 @@ index afa8d47..77b235c 100644 int i; for (i = 0; i < G_N_ELEMENTS (types); i++) { -@@ -1234,7 +1727,6 @@ register_custom_types (GdmGreeterLoginWindow *login_window) +@@ -1237,7 +1730,6 @@ register_custom_types (GdmGreeterLoginWindow *login_window) static void load_theme (GdmGreeterLoginWindow *login_window) { @@ -8777,7 +8782,7 @@ index afa8d47..77b235c 100644 GtkWidget *button; GtkWidget *box; GtkWidget *image; -@@ -1287,7 +1779,7 @@ load_theme (GdmGreeterLoginWindow *login_window) +@@ -1290,7 +1782,7 @@ load_theme (GdmGreeterLoginWindow *login_window) login_window); g_signal_connect (login_window->priv->user_chooser, "activated", @@ -8786,7 +8791,7 @@ index afa8d47..77b235c 100644 login_window); g_signal_connect (login_window->priv->user_chooser, "deactivated", -@@ -1299,30 +1791,30 @@ load_theme (GdmGreeterLoginWindow *login_window) +@@ -1302,30 +1794,30 @@ load_theme (GdmGreeterLoginWindow *login_window) G_CALLBACK (on_user_chooser_visibility_changed), login_window); @@ -8830,7 +8835,7 @@ index afa8d47..77b235c 100644 gdm_profile_end (NULL); } -@@ -1478,6 +1970,15 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) +@@ -1481,6 +1973,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; @@ -8846,7 +8851,7 @@ index afa8d47..77b235c 100644 signals [BEGIN_AUTO_LOGIN] = g_signal_new ("begin-auto-login", G_TYPE_FROM_CLASS (object_class), -@@ -1494,9 +1995,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) +@@ -1497,9 +1998,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification), NULL, NULL, @@ -8858,7 +8863,7 @@ index afa8d47..77b235c 100644 signals [BEGIN_VERIFICATION_FOR_USER] = g_signal_new ("begin-verification-for-user", G_TYPE_FROM_CLASS (object_class), -@@ -1504,9 +2005,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) +@@ -1507,9 +2008,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, begin_verification_for_user), NULL, NULL, @@ -8870,7 +8875,7 @@ index afa8d47..77b235c 100644 signals [QUERY_ANSWER] = g_signal_new ("query-answer", G_TYPE_FROM_CLASS (object_class), -@@ -1514,9 +2015,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) +@@ -1517,9 +2018,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, query_answer), NULL, NULL, @@ -8882,7 +8887,7 @@ index afa8d47..77b235c 100644 signals [USER_SELECTED] = g_signal_new ("user-selected", G_TYPE_FROM_CLASS (object_class), -@@ -1554,9 +2055,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) +@@ -1557,9 +2058,9 @@ gdm_greeter_login_window_class_init (GdmGreeterLoginWindowClass *klass) G_STRUCT_OFFSET (GdmGreeterLoginWindowClass, start_session), NULL, NULL, @@ -8894,7 +8899,7 @@ index afa8d47..77b235c 100644 g_object_class_install_property (object_class, PROP_DISPLAY_IS_LOCAL, -@@ -1609,6 +2110,246 @@ on_gconf_key_changed (GConfClient *client, +@@ -1612,6 +2113,246 @@ on_gconf_key_changed (GConfClient *client, } } @@ -9326,10 +9331,10 @@ index 83375ed..35195d8 100644 diff --git a/gui/simple-greeter/gdm-greeter-plugin.c b/gui/simple-greeter/gdm-greeter-plugin.c new file mode 100644 -index 0000000..02814a2 +index 0000000..1919aae --- /dev/null +++ b/gui/simple-greeter/gdm-greeter-plugin.c -@@ -0,0 +1,255 @@ +@@ -0,0 +1,254 @@ +/* + * Copyright (C) 2009 Red Hat, Inc. + * @@ -9584,7 +9589,6 @@ index 0000000..02814a2 + + gdm_greeter_plugin_unload (plugin); +} -+ diff --git a/gui/simple-greeter/gdm-greeter-plugin.h b/gui/simple-greeter/gdm-greeter-plugin.h new file mode 100644 index 0000000..904c231 @@ -12382,13 +12386,13 @@ index 1fccb90..7c344c9 100644 gui/user-switch-applet/gdm-entry-menu-item.c gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in -- -1.7.3 +1.7.3.3 -From a97c6bd001162f5a8b2d7a0a90508a871e2238f3 Mon Sep 17 00:00:00 2001 +From 8550523cb6c1cfed48de6260b3da659e0842fa85 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 4 Aug 2010 18:25:50 -0400 -Subject: [PATCH 18/34] squash with password +Subject: [PATCH 18/35] squash with password --- .../plugins/password/gdm-password-extension.c | 11 ++++++++++- @@ -12447,13 +12451,13 @@ index 255283e..11a171c 100644 static void -- -1.7.3 +1.7.3.3 -From 396ae085b57e36ab91c71a2c2926c5bddebb1eb4 Mon Sep 17 00:00:00 2001 +From bb31f1696b0875d6d8e6e81acf11f51900d1dacd Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Aug 2010 11:13:10 -0400 -Subject: [PATCH 19/34] task list fix +Subject: [PATCH 19/35] task list fix --- gui/simple-greeter/gdm-task-list.c | 11 ++++++++--- @@ -12497,13 +12501,13 @@ index a7f8c74..906938d 100644 button = g_object_get_data (G_OBJECT (task), "gdm-task-list-button"); -- -1.7.3 +1.7.3.3 -From 6dfe9ceba14c83c3215931327de140f4b235e75d Mon Sep 17 00:00:00 2001 +From 4902b18b3eb6fb6cbf820909f33987473928fe29 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 29 Jun 2010 14:13:35 -0400 -Subject: [PATCH 20/34] Show cancel button after first message +Subject: [PATCH 20/35] 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 @@ -12513,7 +12517,7 @@ 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 77b235c..60c4d00 100644 +index c01b9cb..a0e8936 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -826,6 +826,7 @@ reset_dialog (GdmGreeterLoginWindow *login_window, @@ -12524,7 +12528,7 @@ index 77b235c..60c4d00 100644 set_sensitive (login_window, TRUE); set_ready (login_window); set_focus (GDM_GREETER_LOGIN_WINDOW (login_window)); -@@ -976,6 +977,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window, +@@ -977,6 +978,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); @@ -12532,7 +12536,7 @@ index 77b235c..60c4d00 100644 task = find_task_with_service_name (login_window, service_name); if (task != NULL) { -@@ -998,6 +1000,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, +@@ -999,6 +1001,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); @@ -12541,13 +12545,13 @@ index 77b235c..60c4d00 100644 if (task != NULL) { -- -1.7.3 +1.7.3.3 -From 699f426299d23d0d8d84442af60e4f690adecede Mon Sep 17 00:00:00 2001 +From 626e4b4bd340b961713b32258828ac8d602e01c7 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 28 Oct 2009 11:13:10 -0400 -Subject: [PATCH 21/34] Prevent start session signal handler from getting called multiple times +Subject: [PATCH 21/35] Prevent start session signal handler from getting called multiple times It was causing a double free. --- @@ -12555,10 +12559,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 60c4d00..74e3b12 100644 +index a0e8936..151164e 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1085,8 +1085,17 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window, +@@ -1086,8 +1086,17 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window, GParamSpec *param_spec, char *service_name) { @@ -12577,13 +12581,13 @@ index 60c4d00..74e3b12 100644 static void -- -1.7.3 +1.7.3.3 -From 127a965565b6644ba2df3866abc600afe1469078 Mon Sep 17 00:00:00 2001 +From fecee605d0eeeafbefc768cb3e463c3eb5beed19 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Feb 2009 16:25:47 -0500 -Subject: [PATCH 22/34] Add fingerprint plugin +Subject: [PATCH 22/35] Add fingerprint plugin This commit adds a plugin to initiate a conversation for fingerprint scans. @@ -12616,7 +12620,7 @@ fingerprint scans. create mode 100644 gui/simple-greeter/plugins/fingerprint/plugin.c diff --git a/configure.ac b/configure.ac -index 67b4cab..f8829f6 100644 +index 8c8b74d..911864e 100644 --- a/configure.ac +++ b/configure.ac @@ -1445,6 +1445,10 @@ gui/simple-greeter/libgdmsimplegreeter/Makefile @@ -13348,13 +13352,13 @@ index 7c344c9..dd08b21 100644 gui/user-switch-applet/gdm-entry-menu-item.c gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in -- -1.7.3 +1.7.3.3 -From e377e2770fabc19f4337f2f01c0150e8d84f19dd Mon Sep 17 00:00:00 2001 +From 440055f84d48b8ccbffb054f02250a3e1be74e3f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Feb 2009 16:25:47 -0500 -Subject: [PATCH 23/34] Add smartcard plugin +Subject: [PATCH 23/35] Add smartcard plugin This commit adds a plugin to initiate a conversation when smartcards are inserted. @@ -13397,7 +13401,7 @@ smartcards are inserted. create mode 100644 gui/simple-greeter/plugins/smartcard/plugin.c diff --git a/configure.ac b/configure.ac -index f8829f6..28b08d4 100644 +index 911864e..95c623d 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,7 @@ LIBCANBERRA_GTK_REQUIRED_VERSION=0.4 @@ -16865,13 +16869,13 @@ index dd08b21..ed922a5 100644 gui/user-switch-applet/gdm-entry-menu-item.c gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in -- -1.7.3 +1.7.3.3 -From 52586f856c5ae4c1e21fe0942e2a69cbd4c26a8a Mon Sep 17 00:00:00 2001 +From b7f8fa13fab5be9c3832bdf2c0d0c6f06d78adb8 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 4 Aug 2010 18:26:01 -0400 -Subject: [PATCH 24/34] squash with smartcard +Subject: [PATCH 24/35] squash with smartcard --- .../plugins/smartcard/gdm-smartcard-extension.c | 3 +++ @@ -16906,13 +16910,13 @@ index b925f5e..b40a21c 100644 static void -- -1.7.3 +1.7.3.3 -From ff8a0c3705973be7b0a55023af99407c70a0077f Mon Sep 17 00:00:00 2001 +From 96db16e70a1614a7857b99b1e3f3dda11b725490 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 21 Apr 2009 10:25:18 -0400 -Subject: [PATCH 25/34] When one PAM conversation wins, stop the others +Subject: [PATCH 25/35] 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. @@ -16922,7 +16926,7 @@ e.g. two factor authentication. 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index 5a604bf..41c7dc2 100644 +index 832b870..3c512c0 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -2370,6 +2370,47 @@ gdm_session_direct_open_session (GdmSession *session, @@ -17025,10 +17029,10 @@ index 5a604bf..41c7dc2 100644 static void diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 05972a4..a19d4b3 100644 +index c49e6c7..16ae9c8 100644 --- a/daemon/gdm-simple-slave.c +++ b/daemon/gdm-simple-slave.c -@@ -598,7 +598,7 @@ on_session_conversation_stopped (GdmSession *session, +@@ -669,7 +669,7 @@ on_session_conversation_stopped (GdmSession *session, gboolean res; g_debug ("GdmSimpleSlave: conversation stopped"); @@ -17038,13 +17042,13 @@ index 05972a4..a19d4b3 100644 service_name); if (! res) { -- -1.7.3 +1.7.3.3 -From d24d158cf1c2ff032143ee50a4360729edc66995 Mon Sep 17 00:00:00 2001 +From 920d71b3af3731e5177105cf31be2ee139ad9426 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 24 Jul 2009 14:41:48 -0400 -Subject: [PATCH 26/34] KILL stuck processes if they don't die on TERM +Subject: [PATCH 26/35] 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, @@ -17162,20 +17166,20 @@ index be85f30..8b93663 100644 if (WIFEXITED (exit_status) && (WEXITSTATUS (exit_status) != 0)) { g_debug ("GdmSessionWorkerJob: Wait on child process failed"); -- -1.7.3 +1.7.3.3 -From 3dbbc2d4a678786cb327311e13e0c411f5684a9e Mon Sep 17 00:00:00 2001 +From 34dc9718c517688df3bb60d2ee8c50417bf0fc5d Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 13 Jul 2010 22:36:19 -0400 -Subject: [PATCH 27/34] add better debug spew (needs squash) +Subject: [PATCH 27/35] add better debug spew (needs squash) --- daemon/gdm-session-direct.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/gdm-session-direct.c b/daemon/gdm-session-direct.c -index 41c7dc2..e4e4166 100644 +index 3c512c0..53d26df 100644 --- a/daemon/gdm-session-direct.c +++ b/daemon/gdm-session-direct.c @@ -210,7 +210,7 @@ find_conversation_by_name (GdmSessionDirect *session, @@ -17215,23 +17219,23 @@ index 41c7dc2..e4e4166 100644 conversation = find_conversation_by_name (impl, service_name); -- -1.7.3 +1.7.3.3 -From 887730359a1441410513e3b9dc5cc0ca99a47402 Mon Sep 17 00:00:00 2001 +From c6e70b135f6dae4faeb522145b4e0eb94cafb551 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 13 Jul 2010 22:37:35 -0400 -Subject: [PATCH 28/34] switch to proper mode when going to timed login +Subject: [PATCH 28/35] 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 74e3b12..f03b1c3 100644 +index 151164e..b741977 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -1383,7 +1383,7 @@ begin_auto_login (GdmGreeterLoginWindow *login_window) +@@ -1384,7 +1384,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")); @@ -17241,13 +17245,13 @@ index 74e3b12..f03b1c3 100644 show_widget (login_window, "conversation-list", FALSE); gdm_task_list_foreach_task (GDM_TASK_LIST (login_window->priv->conversation_list), -- -1.7.3 +1.7.3.3 -From d85bcf69bf7d45f0d3b087aa8121061791108f19 Mon Sep 17 00:00:00 2001 +From c49e4e49d5121bd254ba3fb6a3de0dedb7cfaaa8 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 3 Aug 2010 15:21:26 -0400 -Subject: [PATCH 29/34] Drop "Cancelling" message for plugin initiated cancels +Subject: [PATCH 29/35] 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, @@ -17257,10 +17261,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 f03b1c3..c576d6c 100644 +index b741977..c33b871 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c -@@ -2145,7 +2145,7 @@ static void +@@ -2148,7 +2148,7 @@ static void on_conversation_cancel (GdmGreeterLoginWindow *login_window, GdmConversation *conversation) { @@ -17270,20 +17274,20 @@ index f03b1c3..c576d6c 100644 static gboolean -- -1.7.3 +1.7.3.3 -From aa4d38ae8169ed0f4d08441fa89eb0957365af45 Mon Sep 17 00:00:00 2001 +From 7c67d095efda02e9ebee00ad93d99d8de54d334e Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 4 Aug 2010 18:11:27 -0400 -Subject: [PATCH 30/34] drop code for label that doesn't exist anymore +Subject: [PATCH 30/35] 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 c576d6c..1000aef 100644 +index c33b871..05e06bc 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 @@ -17307,13 +17311,13 @@ index c576d6c..1000aef 100644 /* If we don't have a user list jump straight to authenticate */ g_debug ("GdmGreeterLoginWindow: jumping straight to authenticate"); -- -1.7.3 +1.7.3.3 -From e05412f5c8a99b3df2de4bb5ce0eba375f9e0884 Mon Sep 17 00:00:00 2001 +From 2ad1e9e4ea17d5428c87028c1a2b52560b06f57f Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 4 Aug 2010 18:03:52 -0400 -Subject: [PATCH 31/34] Add delay when showing messages (needs split) +Subject: [PATCH 31/35] 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. @@ -17323,15 +17327,15 @@ adds some queueing and timeouts to make sure the messages stay on screen for a sufficient amount of time. --- gui/simple-greeter/gdm-greeter-login-window.c | 119 ++++++++++++++++++-- - .../libgdmsimplegreeter/gdm-conversation.c | 18 +++ + .../libgdmsimplegreeter/gdm-conversation.c | 17 +++ .../libgdmsimplegreeter/gdm-conversation.h | 2 + .../fingerprint/gdm-fingerprint-extension.c | 20 ++++ .../plugins/password/gdm-password-extension.c | 20 ++++ .../plugins/smartcard/gdm-smartcard-extension.c | 19 +++ - 6 files changed, 188 insertions(+), 10 deletions(-) + 6 files changed, 187 insertions(+), 10 deletions(-) diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c -index 1000aef..a34f42f 100644 +index 05e06bc..57e2251 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 @@ -17361,7 +17365,7 @@ index 1000aef..a34f42f 100644 return FALSE; } -@@ -881,16 +887,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window, +@@ -882,16 +888,12 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window, return TRUE; } @@ -17381,7 +17385,7 @@ index 1000aef..a34f42f 100644 /* If the password conversation failed, then start over * * FIXME: we need to get this policy out of the source code -@@ -898,13 +900,15 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind +@@ -899,13 +901,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); @@ -17398,7 +17402,7 @@ index 1000aef..a34f42f 100644 g_object_unref (task); } -@@ -919,6 +923,34 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind +@@ -920,6 +924,34 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind g_object_unref (task); update_conversation_list_visibility (login_window); @@ -17433,7 +17437,7 @@ index 1000aef..a34f42f 100644 return TRUE; } -@@ -930,6 +962,7 @@ restart_task_conversation (GdmTaskList *task_list, +@@ -931,6 +963,7 @@ restart_task_conversation (GdmTaskList *task_list, { char *service_name; @@ -17441,7 +17445,7 @@ index 1000aef..a34f42f 100644 service_name = gdm_conversation_get_service_name (GDM_CONVERSATION (task)); if (service_name != NULL) { char *name; -@@ -958,6 +991,9 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window) +@@ -959,6 +992,9 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window) restart_task_conversation, login_window); @@ -17451,7 +17455,7 @@ index 1000aef..a34f42f 100644 return TRUE; } -@@ -975,6 +1011,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window, +@@ -976,6 +1012,7 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window, task = find_task_with_service_name (login_window, service_name); if (task != NULL) { @@ -17459,7 +17463,7 @@ index 1000aef..a34f42f 100644 gdm_conversation_set_message (GDM_CONVERSATION (task), text); show_task_actions (task); -@@ -998,6 +1035,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, +@@ -999,6 +1036,7 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, task = find_task_with_service_name (login_window, service_name); if (task != NULL) { @@ -17467,7 +17471,7 @@ index 1000aef..a34f42f 100644 gdm_conversation_set_message (GDM_CONVERSATION (task), text); show_task_actions (task); -@@ -1093,12 +1131,40 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window, +@@ -1094,12 +1132,40 @@ on_ready_to_start_session (GdmGreeterLoginWindow *login_window, } static void @@ -17510,7 +17514,7 @@ index 1000aef..a34f42f 100644 } else { g_debug ("GdmGreeterLoginWindow: not starting session since " "user hasn't had an opportunity to pick language " -@@ -2171,6 +2237,35 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window, +@@ -2174,6 +2240,35 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window, return TRUE; } @@ -17546,7 +17550,7 @@ index 1000aef..a34f42f 100644 void gdm_greeter_login_window_remove_extension (GdmGreeterLoginWindow *login_window, GdmGreeterExtension *extension) -@@ -2333,6 +2428,10 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window, +@@ -2336,6 +2431,10 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window, "user-chosen", G_CALLBACK (on_conversation_chose_user), login_window); @@ -17558,7 +17562,7 @@ index 1000aef..a34f42f 100644 g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added", name, description); diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c -index ee763ef..1320d9c 100644 +index ee763ef..a3514e8 100644 --- a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c +++ b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.c @@ -32,6 +32,7 @@ enum { @@ -17586,7 +17590,7 @@ index ee763ef..1320d9c 100644 } void -@@ -184,3 +195,10 @@ gdm_conversation_choose_user (GdmConversation *conversation, +@@ -184,3 +195,9 @@ gdm_conversation_choose_user (GdmConversation *conversation, return was_chosen; } @@ -17596,7 +17600,6 @@ index ee763ef..1320d9c 100644 +{ + g_signal_emit (conversation, signals [MESSAGE_SET], 0); +} -+ diff --git a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h b/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h index b37b21e..f76b18c 100644 --- a/gui/simple-greeter/libgdmsimplegreeter/gdm-conversation.h @@ -17773,13 +17776,13 @@ index b40a21c..5e234b9 100644 static void -- -1.7.3 +1.7.3.3 -From 37119c0445e6d8cc78938ed71ff84e9af76a6836 Mon Sep 17 00:00:00 2001 +From bdc3b20af9aaa433c90c7e094bba3099f8eb544d Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 4 Aug 2010 19:27:14 -0400 -Subject: [PATCH 32/34] Drop cancelling message +Subject: [PATCH 32/35] Drop cancelling message We cancel very quickly in most cases now, so the message isn't useful --- @@ -17787,7 +17790,7 @@ 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 a34f42f..4bfd3f5 100644 +index 57e2251..d9e14f0 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -849,7 +849,7 @@ static void @@ -17800,13 +17803,13 @@ index a34f42f..4bfd3f5 100644 } -- -1.7.3 +1.7.3.3 -From 1932eb618974600b765a6c835c6f72d403b25bf5 Mon Sep 17 00:00:00 2001 +From b893801e9f3bed81fcc3c21ceb291251b9b88279 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 6 Aug 2010 11:14:23 -0400 -Subject: [PATCH 33/34] manage tasks outside of task list +Subject: [PATCH 33/35] 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 @@ -17823,7 +17826,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 4bfd3f5..204f37d 100644 +index d9e14f0..406107e 100644 --- a/gui/simple-greeter/gdm-greeter-login-window.c +++ b/gui/simple-greeter/gdm-greeter-login-window.c @@ -98,6 +98,7 @@ enum { @@ -18209,7 +18212,7 @@ index 4bfd3f5..204f37d 100644 } set_sensitive (GDM_GREETER_LOGIN_WINDOW (login_window), TRUE); -@@ -881,7 +921,7 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window, +@@ -882,7 +922,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); @@ -18218,7 +18221,7 @@ index 4bfd3f5..204f37d 100644 } return TRUE; -@@ -903,24 +943,37 @@ handle_stopped_conversation (GdmGreeterLoginWindow *login_window, +@@ -904,24 +944,37 @@ handle_stopped_conversation (GdmGreeterLoginWindow *login_window, return; } @@ -18259,7 +18262,7 @@ index 4bfd3f5..204f37d 100644 update_conversation_list_visibility (login_window); } -@@ -936,8 +989,8 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind +@@ -937,8 +990,8 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind g_debug ("GdmGreeterLoginWindow: conversation '%s' has stopped", service_name); @@ -18270,7 +18273,7 @@ index 4bfd3f5..204f37d 100644 messages_pending = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (task), "message-pending")); } else { -@@ -956,8 +1009,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind +@@ -957,8 +1010,7 @@ gdm_greeter_login_window_conversation_stopped (GdmGreeterLoginWindow *login_wind } static gboolean @@ -18280,7 +18283,7 @@ index 4bfd3f5..204f37d 100644 GdmGreeterLoginWindow *login_window) { char *service_name; -@@ -986,10 +1038,7 @@ gdm_greeter_login_window_reset (GdmGreeterLoginWindow *login_window) +@@ -987,10 +1039,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); @@ -18292,7 +18295,7 @@ index 4bfd3f5..204f37d 100644 g_free (login_window->priv->service_name_of_session_ready_to_start); login_window->priv->service_name_of_session_ready_to_start = NULL; -@@ -1015,7 +1064,6 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window, +@@ -1016,7 +1065,6 @@ gdm_greeter_login_window_info (GdmGreeterLoginWindow *login_window, gdm_conversation_set_message (GDM_CONVERSATION (task), text); show_task_actions (task); @@ -18300,7 +18303,7 @@ index 4bfd3f5..204f37d 100644 } return TRUE; -@@ -1039,7 +1087,6 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, +@@ -1040,7 +1088,6 @@ gdm_greeter_login_window_problem (GdmGreeterLoginWindow *login_window, gdm_conversation_set_message (GDM_CONVERSATION (task), text); show_task_actions (task); @@ -18308,7 +18311,7 @@ index 4bfd3f5..204f37d 100644 } gdk_window_beep (GTK_WIDGET (login_window)->window); -@@ -1078,9 +1125,19 @@ gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_windo +@@ -1079,9 +1126,19 @@ gdm_greeter_login_window_service_unavailable (GdmGreeterLoginWindow *login_windo task = find_task_with_service_name (login_window, service_name); if (task != NULL) { @@ -18331,7 +18334,7 @@ index 4bfd3f5..204f37d 100644 } return TRUE; -@@ -1215,7 +1272,6 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, +@@ -1216,7 +1273,6 @@ gdm_greeter_login_window_info_query (GdmGreeterLoginWindow *login_window, if (task != NULL) { gdm_conversation_ask_question (GDM_CONVERSATION (task), text); @@ -18339,7 +18342,7 @@ index 4bfd3f5..204f37d 100644 } set_log_in_button_mode (login_window, LOGIN_BUTTON_ANSWER_QUERY); -@@ -1246,7 +1302,6 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window, +@@ -1247,7 +1303,6 @@ gdm_greeter_login_window_secret_info_query (GdmGreeterLoginWindow *login_window, if (task != NULL) { gdm_conversation_ask_secret (GDM_CONVERSATION (task), text); @@ -18347,7 +18350,7 @@ index 4bfd3f5..204f37d 100644 } set_log_in_button_mode (login_window, LOGIN_BUTTON_ANSWER_QUERY); -@@ -1341,8 +1396,7 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window) +@@ -1342,8 +1397,7 @@ on_user_chooser_visibility_changed (GdmGreeterLoginWindow *login_window) } static gboolean @@ -18357,7 +18360,7 @@ index 4bfd3f5..204f37d 100644 GdmGreeterLoginWindow *login_window) { char *user_name; -@@ -1360,6 +1414,9 @@ begin_task_verification_for_selected_user (GdmTaskList *task_list, +@@ -1361,6 +1415,9 @@ begin_task_verification_for_selected_user (GdmTaskList *task_list, g_free (service_name); } @@ -18367,7 +18370,7 @@ index 4bfd3f5..204f37d 100644 g_free (user_name); return FALSE; } -@@ -1407,7 +1464,7 @@ on_users_loaded (GdmUserChooserWidget *user_chooser, +@@ -1408,7 +1465,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); @@ -18376,7 +18379,7 @@ index 4bfd3f5..204f37d 100644 } } -@@ -1415,19 +1472,23 @@ static void +@@ -1416,19 +1473,23 @@ static void choose_user (GdmGreeterLoginWindow *login_window, const char *user_name) { @@ -18405,7 +18408,7 @@ index 4bfd3f5..204f37d 100644 update_conversation_list_visibility (login_window); } -@@ -1443,35 +1504,34 @@ begin_auto_login (GdmGreeterLoginWindow *login_window) +@@ -1444,35 +1505,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")); @@ -18452,7 +18455,7 @@ index 4bfd3f5..204f37d 100644 } static void -@@ -1494,11 +1554,10 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window, +@@ -1495,11 +1555,10 @@ begin_single_service_verification (GdmGreeterLoginWindow *login_window, */ g_signal_emit (login_window, signals[BEGIN_VERIFICATION], 0, service_name); @@ -18467,7 +18470,7 @@ index 4bfd3f5..204f37d 100644 show_widget (login_window, "conversation-list", FALSE); } -@@ -1529,7 +1588,7 @@ on_user_chooser_activated (GdmUserChooserWidget *user_chooser, +@@ -1530,7 +1589,7 @@ on_user_chooser_activated (GdmUserChooserWidget *user_chooser, g_debug ("GdmGreeterLoginWindow: Starting all auth conversations"); g_free (item_id); @@ -18476,7 +18479,7 @@ index 4bfd3f5..204f37d 100644 } else if (strcmp (item_id, GDM_USER_CHOOSER_USER_GUEST) == 0) { /* FIXME: handle guest account stuff */ g_free (item_id); -@@ -1725,63 +1784,28 @@ static void +@@ -1728,63 +1787,28 @@ static void on_task_activated (GdmGreeterLoginWindow *login_window, GdmTask *task) { @@ -18549,7 +18552,7 @@ index 4bfd3f5..204f37d 100644 } static void -@@ -1886,6 +1910,7 @@ load_theme (GdmGreeterLoginWindow *login_window) +@@ -1889,6 +1913,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); @@ -18557,7 +18560,7 @@ index 4bfd3f5..204f37d 100644 switch_mode (login_window, MODE_SELECTION); gdm_profile_end (NULL); -@@ -2224,15 +2249,12 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window, +@@ -2227,15 +2252,12 @@ on_conversation_chose_user (GdmGreeterLoginWindow *login_window, /* If we're already authenticating then we can't pick a user */ @@ -18576,7 +18579,7 @@ index 4bfd3f5..204f37d 100644 return TRUE; } -@@ -2256,11 +2278,7 @@ on_conversation_message_set (GdmGreeterLoginWindow *login_window, +@@ -2259,11 +2281,7 @@ on_conversation_message_set (GdmGreeterLoginWindow *login_window, } if (login_window->priv->service_name_of_session_ready_to_start != NULL ) { @@ -18589,7 +18592,7 @@ index 4bfd3f5..204f37d 100644 gdm_greeter_login_window_start_session (login_window); } } -@@ -2436,9 +2454,7 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window, +@@ -2439,9 +2457,7 @@ gdm_greeter_login_window_add_extension (GdmGreeterLoginWindow *login_window, g_debug ("GdmGreeterLoginWindow: new extension '%s - %s' added", name, description); @@ -18601,13 +18604,13 @@ index 4bfd3f5..204f37d 100644 if (gdm_task_is_choosable (GDM_TASK (extension))) { -- -1.7.3 +1.7.3.3 -From 80cdd8a3dad6ae36ee257d453879922a9f409ca0 Mon Sep 17 00:00:00 2001 +From bed394c6f270f77d4b7d76030bf7dcb0c6759ef4 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 9 Aug 2010 18:09:19 -0400 -Subject: [PATCH 34/34] hide task actions more aggressively +Subject: [PATCH 34/35] hide task actions more aggressively This fixes "dual login buttons" after the user hits cancel. --- @@ -18615,7 +18618,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 204f37d..8b3cace 100644 +index 406107e..c8d56c5 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, @@ -18636,5 +18639,33 @@ index 204f37d..8b3cace 100644 return FALSE; } -- -1.7.3 +1.7.3.3 + + +From d9197164a4ed20c645753cc4275644eb1050cdae Mon Sep 17 00:00:00 2001 +From: Gal Hammer +Date: Thu, 21 Oct 2010 10:14:32 -0400 +Subject: [PATCH 35/35] smartcard: don't show extension if disabled in authconfig + +It was erroneously always returning TRUE instead of the the +value determined from reading authconfig's configuration. +--- + .../plugins/smartcard/gdm-smartcard-extension.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c +index 5e234b9..ef79c28 100644 +--- a/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c ++++ b/gui/simple-greeter/plugins/smartcard/gdm-smartcard-extension.c +@@ -391,7 +391,7 @@ gdm_smartcard_extension_is_visible (GdmTask *task) + + g_strfreev (lines); + +- return TRUE; ++ return ret; + } + + static void +-- +1.7.3.3 diff --git a/gdm.spec b/gdm.spec index 5e009f3..a623f4b 100644 --- a/gdm.spec +++ b/gdm.spec @@ -14,8 +14,8 @@ Summary: The GNOME Display Manager Name: gdm -Version: 2.32.0 -Release: 4%{?dist} +Version: 2.91.4 +Release: 1%{?dist} Epoch: 1 License: GPLv2+ Group: User Interface/X @@ -88,7 +88,6 @@ Provides: service(graphical-login) = %{name} Requires: audit-libs >= %{libauditver} Patch2: plymouth.patch -Patch10: gdm-2.32.0-maybe-set-is-loaded.patch Patch96: gdm-multistack.patch # Fedora-specific @@ -132,7 +131,6 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint %prep %setup -q %patch2 -p1 -b .plymouth -%patch10 -p1 -b .maybe-set-is-loaded %patch96 -p1 -b .multistack %patch97 -p1 -b .bubble-location %patch98 -p1 -b .tray-padding @@ -350,6 +348,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || : %attr(1770, root, gdm) %dir %{_localstatedir}/gdm %attr(1777, root, gdm) %dir %{_localstatedir}/run/gdm %attr(1755, root, gdm) %dir %{_localstatedir}/cache/gdm +%{_sysconfdir}/dconf/profile/gdm +%{_sysconfdir}/dconf/db/gdm + %files user-switch-applet %defattr(-, root, root) @@ -371,6 +372,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/ull || : %{_libdir}/gdm/simple-greeter/plugins/fingerprint.so %changelog +* Fri Dec 17 2010 Ray Strode 2.91.4-1 +- Update to 2.91.4 + * Wed Dec 15 2010 Christopher Aillon 2.32.0-4 - Add maybe-set-is-loaded.patch to ensure we end up with a loaded user diff --git a/sources b/sources index 6e129f7..c675a3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c28e13a3d5e5f35d29669460acb57bb gdm-2.32.0.tar.bz2 +3f78383f89141eef2cc87e58ecd3d351 gdm-2.91.4.tar.bz2