[Xfce4-commits] <xfconf:signal-bindings> Merge branch 'master' into signal-bindings

[Nick Schermer]

Updating branch refs/heads/signal-bindings
         to 9e0aca3ff5d1644d5825cf9ae2541a85222a7da8 (commit)
       from b05b15ea90944621ebeecc312f4a83e959a5f270 (commit)

commit 9e0aca3ff5d1644d5825cf9ae2541a85222a7da8
Merge: b05b15ea90944621ebeecc312f4a83e959a5f270 2232d8577105799c758c63394a8d5a2fa8766d6c
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Sep 13 20:26:40 2009 +0200

    Merge branch 'master' into signal-bindings

commit 2232d8577105799c758c63394a8d5a2fa8766d6c
Author: Brian J. Tarricone <brian at tarricone.org>
Date:   Sat Sep 5 01:27:58 2009 -0700

    always call the parent class' dispose

 xfconf/xfconf-channel.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c
index 1de89cb..b9d887f 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -333,9 +333,9 @@ xfconf_channel_dispose(GObject *obj)
                                              G_CALLBACK(xfconf_channel_property_changed),
                                              channel);
         g_object_unref(G_OBJECT(channel->cache));
-
-        G_OBJECT_CLASS(xfconf_channel_parent_class)->dispose(obj);
     }
+
+    G_OBJECT_CLASS(xfconf_channel_parent_class)->dispose(obj);
 }
 
 static void