From ea2c87f513af2b325daff4ceaf7205dceca21972 Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Fri, 16 Oct 2015 11:09:13 +0100
Subject: [PATCH] Replace unnecessary dispose method with finalize

---
 src/accounts.c            | 14 +++++---------
 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));
-- 
2.39.2