summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2010-06-25 13:39:24 -0400
committerRay Strode <rstrode@redhat.com>2010-06-25 13:39:24 -0400
commit18f94ef09ec3e243738cac64c932d2b7e332a5a9 (patch)
treeac651e17d02313cdbeb9eb3b40005816f1148ad2
parentb01744d01a859edc5d1a6c38e5adff7856a79919 (diff)
downloadgdm-18f94ef09ec3e243738cac64c932d2b7e332a5a9.tar.gz
Actually drop cancellable
Previously, I dropped the variable, but not some other parts. This commit fixes that up.
-rw-r--r--gui/simple-greeter/gdm-user-manager.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c
index 01e27a20..70565778 100644
--- a/gui/simple-greeter/gdm-user-manager.c
+++ b/gui/simple-greeter/gdm-user-manager.c
@@ -1952,7 +1952,7 @@ schedule_reload_passwd (GdmUserManager *manager)
passwd_data,
NULL,
G_PRIORITY_DEFAULT,
- manager->priv->cancellable);
+ NULL);
}
static void
@@ -2433,8 +2433,6 @@ gdm_user_manager_init (GdmUserManager *manager)
return;
}
- manager->priv->cancellable = g_cancellable_new ();
-
manager->priv->seat.state = GDM_USER_MANAGER_SEAT_STATE_UNLOADED;
}
@@ -2461,11 +2459,6 @@ gdm_user_manager_finalize (GObject *object)
unload_seat (manager);
- if (manager->priv->cancellable != NULL) {
- g_object_unref (manager->priv->cancellable);
- manager->priv->cancellable = NULL;
- }
-
if (manager->priv->exclude_usernames != NULL) {
g_slist_foreach (manager->priv->exclude_usernames, (GFunc) g_free, NULL);
g_slist_free (manager->priv->exclude_usernames);