diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2015-10-16 11:09:13 +0100 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2015-10-16 11:09:13 +0100 |
commit | 84dc5f35a9dd6489bdf76f65da4eea428c1ba6c0 (patch) | |
tree | 57e0a8f76a9f6c9907a868b9ce35d65e95f65199 | |
parent | aef36c92e606fef5789fda5b680e861c62939a90 (diff) | |
download | lightdm-84dc5f35a9dd6489bdf76f65da4eea428c1ba6c0.tar.gz |
Replace unnecessary dispose method with finalize
-rw-r--r-- | src/accounts.c | 14 | ||||
-rw-r--r-- | src/shared-data-manager.c | 13 |
2 files changed, 7 insertions, 20 deletions
diff --git a/src/accounts.c b/src/accounts.c index d4d54a2e..77cfdf5e 100644 --- a/src/accounts.c +++ b/src/accounts.c @@ -122,17 +122,13 @@ user_init (User *user) } static void -user_dispose (GObject *object) +user_finalize (GObject *object) { - User *self; + User *self = USER (object); - self = USER (object); + g_clear_object (&self->priv->common_user); - if (self->priv->common_user) - g_object_unref (self->priv->common_user); - self->priv->common_user = NULL; - - G_OBJECT_CLASS (user_parent_class)->dispose (object); + G_OBJECT_CLASS (user_parent_class)->finalize (object); } static void @@ -140,7 +136,7 @@ user_class_init (UserClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = user_dispose; + object_class->finalize = user_finalize; g_type_class_add_private (klass, sizeof (UserPrivate)); } diff --git a/src/shared-data-manager.c b/src/shared-data-manager.c index 47f1c10d..8285a86d 100644 --- a/src/shared-data-manager.c +++ b/src/shared-data-manager.c @@ -245,22 +245,14 @@ shared_data_manager_init (SharedDataManager *manager) } static void -shared_data_manager_dispose (GObject *object) +shared_data_manager_finalize (GObject *object) { SharedDataManager *self = SHARED_DATA_MANAGER (object); - + /* Should also cancel outstanding GIO operations, but whatever, let them do their thing. */ g_signal_handlers_disconnect_by_data (common_user_list_get_instance (), self); - G_OBJECT_CLASS (shared_data_manager_parent_class)->dispose (object); -} - -static void -shared_data_manager_finalize (GObject *object) -{ - SharedDataManager *self = SHARED_DATA_MANAGER (object); - if (self->priv->starting_dirs) g_hash_table_destroy (self->priv->starting_dirs); @@ -274,7 +266,6 @@ shared_data_manager_class_init (SharedDataManagerClass *klass) { GObjectClass *object_class = G_OBJECT_CLASS (klass); - object_class->dispose = shared_data_manager_dispose; object_class->finalize = shared_data_manager_finalize; g_type_class_add_private (klass, sizeof (SharedDataManagerPrivate)); |