[gdm] Fix intermittent failure to load user list

[Ray Strode <halfline src gnome org>]

commit cff88c97104c021399c95ab9884f0232966b71d2
Author: Ray Strode <rstrode redhat com>
Date:   Wed Aug 11 13:36:46 2010 -0400

    Fix intermittent failure to load user list
    
    The greeter was failing to show the user list if ck-history took longer
    than a second to load.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=626564
    (cherry picked from commit 285d6dda3ee0439349cca22346efef3392d66d48)

 gui/simple-greeter/gdm-user-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
index 2ce1f81..a14c09b 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
@@ -1387,8 +1387,8 @@ ck_history_watch (GIOChannel     *source,
                 if (manager->priv->ck_history_watchdog_id != 0) {
                         g_source_remove (manager->priv->ck_history_watchdog_id);
                         manager->priv->ck_history_watchdog_id = 0;
-                        manager->priv->ck_history_pid = 0;
                 }
+                manager->priv->ck_history_pid = 0;
 
                 if (! manager->priv->load_passwd_pending) {
                         set_is_loaded (manager, TRUE);
@@ -1431,6 +1431,7 @@ ck_history_watchdog (GdmUserManager *manager)
         if (manager->priv->ck_history_pid > 0) {
                 g_debug ("Killing ck-history process");
                 signal_pid (manager->priv->ck_history_pid, SIGTERM);
+                manager->priv->ck_history_pid = 0;
         }
 
         manager->priv->ck_history_watchdog_id = 0;