diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-08-29 19:47:37 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-08-29 19:47:37 +0000 |
| commit | adc6724bcf528a377a7f6cd11a60ba2e575ba0e8 (patch) | |
| tree | d00fcdebfc896d6c6a14e98312c00652f8894a8f | |
| parent | 56bdce696d2339fdbe15c3d359fce634714d02ba (diff) | |
| download | gdm-adc6724bcf528a377a7f6cd11a60ba2e575ba0e8.tar.gz | |
Fix bug with ConsoleKit that occurs when the session is going to migrate.
2007-08-29 Brian Cameron <brian.cameron@sun.com>
* daemon/slave.c: Fix bug with ConsoleKit that occurs when
the session is going to migrate. Previous code was failing
to send the notification when the greeter is not TYPE_FLEXI.
Fixes bug #461056. Patch by Ian Jackson <iwj@ubuntu.com>
svn path=/branches/gnome-2-18/; revision=5202
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | daemon/slave.c | 12 |
2 files changed, 12 insertions, 7 deletions
@@ -1,3 +1,10 @@ +2007-08-29 Brian Cameron <brian.cameron@sun.com> + + * daemon/slave.c: Fix bug with ConsoleKit that occurs when + the session is going to migrate. Previous code was failing + to send the notification when the greeter is not TYPE_FLEXI. + Fixes bug #461056. Patch by Ian Jackson <iwj@ubuntu.com> + 2007-08-27 Brian Cameron <brian.cameron@sun.com> * daemon/verify-pam.c: When using gdm_verify_standalone_pam_conv diff --git a/daemon/slave.c b/daemon/slave.c index c794e3df..18d07b5d 100644 --- a/daemon/slave.c +++ b/daemon/slave.c @@ -1263,21 +1263,19 @@ gdm_slave_check_user_wants_to_log_in (const char *user) /* wait for a few seconds to avoid any vt changing race */ gdm_sleep_no_signal (1); + } #ifdef WITH_CONSOLE_KIT - unlock_ck_session (user, migrate_to); + unlock_ck_session (user, migrate_to); #endif + gdm_slave_send_string (GDM_SOP_MIGRATE, migrate_to); + g_free (migrate_to); - gdm_slave_send_string (GDM_SOP_MIGRATE, migrate_to); - g_free (migrate_to); - + if (d->type == TYPE_FLEXI) { /* we are no longer needed so just die. REMANAGE == ABORT here really */ gdm_slave_quick_exit (DISPLAY_REMANAGE); } - - gdm_slave_send_string (GDM_SOP_MIGRATE, migrate_to); - g_free (migrate_to); } else { Display *parent_dsp; |