From ae470f3badc8e832f21b946c82eec97e4104fd36 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 17 Oct 2008 18:26:13 +0200 Subject: [PATCH] Change declaration of GDBusWatchFunction --- gdbus/gdbus.h | 3 ++- gdbus/watch.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index b44bc86..42b9061 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -31,7 +31,8 @@ extern "C" { #include #include -typedef void (* GDBusWatchFunction) (void *user_data); +typedef void (* GDBusWatchFunction) (DBusConnection *connection, + void *user_data); typedef gboolean (* GDBusSignalFunction) (DBusConnection *connection, DBusMessage *message, void *user_data); diff --git a/gdbus/watch.c b/gdbus/watch.c index fb0bef3..63e3a7c 100644 --- a/gdbus/watch.c +++ b/gdbus/watch.c @@ -94,7 +94,7 @@ static void name_data_call_and_free(struct name_data *data) for (l = data->callbacks; l != NULL; l = l->next) { struct name_callback *cb = l->data; if (cb->func) - cb->func(cb->user_data); + cb->func(data->connection, cb->user_data); g_free(cb); } @@ -246,7 +246,7 @@ static DBusHandlerResult name_exit_filter(DBusConnection *connection, for (l = data->callbacks; l != NULL; l = l->next) { struct name_callback *cb = l->data; - cb->func(cb->user_data); + cb->func(connection, cb->user_data); } name_listeners = g_slist_remove(name_listeners, data); -- 2.7.4