[Xfce4-commits] <xfconf:xfce-4.8> Fix compiler warnings on solaris.

[Nick Schermer]

Updating branch refs/heads/xfce-4.8
         to 1e89ed2cce441cd0af0c987dac7010e74bbe942d (commit)
       from 2a4673e1dae7d766d095582b47aa2b1c31e3de71 (commit)

commit 1e89ed2cce441cd0af0c987dac7010e74bbe942d
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Mar 27 13:56:12 2011 +0200

    Fix compiler warnings on solaris.
    
    (cherry picked from commit a9629255ab6a75b6ad4b4d577335debceed02fe5)

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

diff --git a/xfconf/xfconf-binding.c b/xfconf/xfconf-binding.c
index c532822..f3073c1 100644
--- a/xfconf/xfconf-binding.c
+++ b/xfconf/xfconf-binding.c
@@ -583,12 +583,12 @@ xfconf_g_property_unbind_all(gpointer channel_or_object)
     if(XFCONF_IS_CHANNEL(channel_or_object)) {
         n = g_signal_handlers_disconnect_matched(channel_or_object, G_SIGNAL_MATCH_FUNC,
                                                  0, 0, NULL,
-                                                 G_CALLBACK(xfconf_g_property_channel_notify),
+                                                 xfconf_g_property_channel_notify,
                                                  NULL);
     } else {
         n = g_signal_handlers_disconnect_matched(channel_or_object, G_SIGNAL_MATCH_FUNC,
                                                  0, 0, NULL,
-                                                 G_CALLBACK(xfconf_g_property_object_notify),
+                                                 xfconf_g_property_object_notify,
                                                  NULL);
     }
 
diff --git a/xfconf/xfconf-channel.c b/xfconf/xfconf-channel.c
index be214a9..548ffc9 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -330,7 +330,7 @@ xfconf_channel_dispose(GObject *obj)
         channel->disposed = TRUE;
 
         g_signal_handlers_disconnect_by_func(channel->cache,
-                                             G_CALLBACK(xfconf_channel_property_changed),
+                                             xfconf_channel_property_changed,
                                              channel);
         g_object_unref(G_OBJECT(channel->cache));
     }