aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-11-15 08:54:03 -0600
committerTed Gould <ted@gould.cx>2010-11-15 08:54:03 -0600
commitdbb933c7da1d7ec7d3a40b7f0aead90aafe87911 (patch)
tree274ca3a6c2f508ecd549930e3b588730713f8275
parent5a5e31fd65810bd106f01833c5b66545d936e831 (diff)
downloadlibdbusmenu-dbb933c7da1d7ec7d3a40b7f0aead90aafe87911.tar.gz
libdbusmenu-dbb933c7da1d7ec7d3a40b7f0aead90aafe87911.tar.bz2
libdbusmenu-dbb933c7da1d7ec7d3a40b7f0aead90aafe87911.zip
Changing the prototype for one call to the callback, need a different approach
-rw-r--r--libdbusmenu-glib/client.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index e24a182..b80999e 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -60,7 +60,7 @@ enum {
LAST_SIGNAL
};
-typedef void (*properties_func) (DbusmenuClient * client, GVariant * properties);
+typedef void (*properties_func) (DbusmenuClient * client, GVariant * properties, GError * error);
static guint signals[LAST_SIGNAL] = { 0 };
@@ -318,6 +318,7 @@ dbusmenu_client_init (DbusmenuClient *self)
static void
dbusmenu_client_dispose (GObject *object)
{
+ DbusmenuClient * client = DBUSMENU_CLIENT(object);
DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(object);
if (priv->delayed_idle != 0) {
@@ -347,7 +348,7 @@ dbusmenu_client_dispose (GObject *object)
if (localerror == NULL) {
g_set_error_literal(&localerror, error_domain(), 0, "DbusmenuClient Shutdown");
}
- listener->callback(priv->menuproxy, NULL, localerror, listener->user_data);
+ listener->callback(client, NULL, localerror);
}
}
if (localerror != NULL) {