[gconf-editor] 2009-04-21 Cosimo Cecchi <cosimoc gnome org>

[Cosimo Cecchi <cosimoc src gnome org>]

commit a699cc47e1936008f9df1837849c3cfcba089e1e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Apr 21 23:13:14 2009 +0200

    2009-04-21  Cosimo Cecchi  <cosimoc gnome org>
    
    	* src/gconf-editor-window.c (gconf_editor_window_finalize):
    	We can always unref the GConfClient object now that bug #579751 has
    	been fixed.
---
 ChangeLog                 |    6 ++++++
 src/gconf-editor-window.c |    8 +-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9865a90..ec23f85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-21  Cosimo Cecchi  <cosimoc gnome org>
 
+	* src/gconf-editor-window.c (gconf_editor_window_finalize):
+	We can always unref the GConfClient object now that bug #579751 has
+	been fixed.
+
+2009-04-21  Cosimo Cecchi  <cosimoc gnome org>
+
 	* src/gconf-list-model.c (gconf_list_model_finalize),
 	(gconf_list_model_set_client):
 	* src/gconf-tree-model.c (gconf_tree_model_set_client):
diff --git a/src/gconf-editor-window.c b/src/gconf-editor-window.c
index 0c6094b..c9ec8f8 100644
--- a/src/gconf-editor-window.c
+++ b/src/gconf-editor-window.c
@@ -1419,13 +1419,7 @@ gconf_editor_window_finalize (GObject *object)
 		gconf_client_notify_remove (client, window->icons_notify_id);
 
 	g_object_unref (client);
-
-	/* for some reason, the program crashes if I try to unref the client for
-         * the other window types.
-         */
-	if (window->type == GCONF_EDITOR_WINDOW_TYPE_NORMAL) {
-	  g_object_unref (window->client);
-        }
+	g_object_unref (window->client);
 
 	G_OBJECT_CLASS (gconf_editor_window_parent_class)->finalize (object);