Updating branch refs/heads/master
to a9629255ab6a75b6ad4b4d577335debceed02fe5 (commit)
from a2d91c0e7ec3fa327b68dbc26809d40a5592307f (commit)
commit a9629255ab6a75b6ad4b4d577335debceed02fe5
Author: Nick Schermer <[email protected]>
Date: Sun Mar 27 13:56:12 2011 +0200
Fix compiler warnings on solaris.
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 6cfced6..7e821f4 100644
--- a/xfconf/xfconf-binding.c
+++ b/xfconf/xfconf-binding.c
@@ -584,12 +584,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 e3a3e31..ba8a43d 100644
--- a/xfconf/xfconf-channel.c
+++ b/xfconf/xfconf-channel.c
@@ -331,7 +331,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));
}
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
