[gedit/wip/browser-menu: 2/2] Use dispose to cleanup member

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 0ab19ffd603705217fce7f6c4b67defc4caa3dbd
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Thu Apr 18 18:56:14 2013 +0200

    Use dispose to cleanup member

 plugins/filebrowser/gedit-file-browser-widget.c | 37 ++++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)
---
diff --git a/plugins/filebrowser/gedit-file-browser-widget.c b/plugins/filebrowser/gedit-file-browser-widget.c
index 18d03d3..c302a92 100644
--- a/plugins/filebrowser/gedit-file-browser-widget.c
+++ b/plugins/filebrowser/gedit-file-browser-widget.c
@@ -342,28 +342,38 @@ filter_func_free (FilterFunc *func)
 static void
 gedit_file_browser_widget_finalize (GObject *object)
 {
-       GeditFileBrowserWidget *obj = GEDIT_FILE_BROWSER_WIDGET (object);
+       GeditFileBrowserWidgetPrivate *priv = GEDIT_FILE_BROWSER_WIDGET (object)->priv;
 
-       g_object_unref (obj->priv->file_store);
-       g_object_unref (obj->priv->bookmarks_store);
+       g_free (priv->filter_pattern_str);
 
-       g_slist_free_full (obj->priv->filter_funcs, (GDestroyNotify)filter_func_free);
+       G_OBJECT_CLASS (gedit_file_browser_widget_parent_class)->finalize (object);
+}
 
-       g_list_free_full (obj->priv->locations, (GDestroyNotify)location_free);
+static void
+gedit_file_browser_widget_dispose (GObject *object)
+{
+       GeditFileBrowserWidget *obj = GEDIT_FILE_BROWSER_WIDGET (object);
+       GeditFileBrowserWidgetPrivate *priv = obj->priv;
 
-       g_hash_table_destroy (obj->priv->bookmarks_hash);
+       g_clear_object (&priv->file_store);
+       g_clear_object (&priv->bookmarks_store);
 
-       cancel_async_operation (obj);
+       g_slist_free_full (priv->filter_funcs, (GDestroyNotify)filter_func_free);
+       g_list_free_full (priv->locations, (GDestroyNotify)location_free);
 
-       if (obj->priv->busy_cursor)
-               g_object_unref (obj->priv->busy_cursor);
+       if (priv->bookmarks_hash != NULL)
+       {
+               g_hash_table_unref (priv->bookmarks_hash);
+               priv->bookmarks_hash = NULL;
+       }
 
-       g_free (obj->priv->filter_pattern_str);
+       cancel_async_operation (obj);
 
-       g_clear_object (&obj->priv->dir_menu);
-       g_clear_object (&obj->priv->bookmarks_menu);
+       g_clear_object (&priv->busy_cursor);
+       g_clear_object (&priv->dir_menu);
+       g_clear_object (&priv->bookmarks_menu);
 
-       G_OBJECT_CLASS (gedit_file_browser_widget_parent_class)->finalize (object);
+       G_OBJECT_CLASS (gedit_file_browser_widget_parent_class)->dispose (object);
 }
 
 static void
@@ -418,6 +428,7 @@ gedit_file_browser_widget_class_init (GeditFileBrowserWidgetClass *klass)
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
        object_class->finalize = gedit_file_browser_widget_finalize;
+       object_class->dispose = gedit_file_browser_widget_dispose;
 
        object_class->get_property = gedit_file_browser_widget_get_property;
        object_class->set_property = gedit_file_browser_widget_set_property;