[devhelp/wip/swilmet/misc-improvements: 1/10] dispose() before finalize()

[Sébastien Wilmet <swilmet src gnome org>]

commit b3862e6b0f27a349d08c07327414406df14ddb49
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sun May 24 17:19:37 2015 +0200

    dispose() before finalize()
    
    So that the code can be read in the logical order.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=749797

 src/dh-keyword-model.c |    2 +-
 src/dh-sidebar.c       |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/dh-keyword-model.c b/src/dh-keyword-model.c
index 3ee0a3d..60a9ac0 100644
--- a/src/dh-keyword-model.c
+++ b/src/dh-keyword-model.c
@@ -84,8 +84,8 @@ dh_keyword_model_class_init (DhKeywordModelClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);;
 
-        object_class->finalize = dh_keyword_model_finalize;
         object_class->dispose = dh_keyword_model_dispose;
+        object_class->finalize = dh_keyword_model_finalize;
 }
 
 static void
diff --git a/src/dh-sidebar.c b/src/dh-sidebar.c
index 14d06f0..4c97bbb 100644
--- a/src/dh-sidebar.c
+++ b/src/dh-sidebar.c
@@ -462,23 +462,23 @@ dh_sidebar_new (DhBookManager *book_manager)
 }
 
 static void
-dh_sidebar_finalize (GObject *object)
+dh_sidebar_dispose (GObject *object)
 {
         DhSidebarPrivate *priv = dh_sidebar_get_instance_private (DH_SIDEBAR (object));
 
-        g_completion_free (priv->completion);
+        g_clear_object (&priv->book_manager);
 
-        G_OBJECT_CLASS (dh_sidebar_parent_class)->finalize (object);
+        G_OBJECT_CLASS (dh_sidebar_parent_class)->dispose (object);
 }
 
 static void
-dh_sidebar_dispose (GObject *object)
+dh_sidebar_finalize (GObject *object)
 {
         DhSidebarPrivate *priv = dh_sidebar_get_instance_private (DH_SIDEBAR (object));
 
-        g_clear_object (&priv->book_manager);
+        g_completion_free (priv->completion);
 
-        G_OBJECT_CLASS (dh_sidebar_parent_class)->dispose (object);
+        G_OBJECT_CLASS (dh_sidebar_parent_class)->finalize (object);
 }
 
 static void
@@ -640,8 +640,8 @@ dh_sidebar_class_init (DhSidebarClass *klass)
 {
         GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-        object_class->finalize = dh_sidebar_finalize;
         object_class->dispose = dh_sidebar_dispose;
+        object_class->finalize = dh_sidebar_finalize;
         object_class->get_property = dh_sidebar_get_property;
         object_class->set_property = dh_sidebar_set_property;
         object_class->constructed = dh_sidebar_constructed;