From 7d1a9d56719aea39ecd38c8dafffee9de898e68b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 29 May 2008 21:12:03 +0000 Subject: Remove GDBusDisconnectFunction type --- gdbus/gdbus.h | 6 ++---- gdbus/mainloop.c | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h index 22c10569..68c6fe80 100644 --- a/gdbus/gdbus.h +++ b/gdbus/gdbus.h @@ -31,13 +31,13 @@ extern "C" { #include #include -typedef void (* GDBusDisconnectFunction) (void *user_data); +typedef void (* GDBusWatchFunction) (void *user_data); DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name, DBusError *error); gboolean g_dbus_set_disconnect_function(DBusConnection *connection, - GDBusDisconnectFunction function, + GDBusWatchFunction function, void *user_data, DBusFreeFunction destroy); #define DBUS_TYPE_STRING_ARRAY_AS_STRING (DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_STRING_AS_STRING) @@ -185,8 +185,6 @@ gboolean g_dbus_send_reply(DBusConnection *connection, gboolean g_dbus_send_reply_valist(DBusConnection *connection, DBusMessage *message, int type, va_list args); -typedef void (* GDBusWatchFunction) (void *user_data); - guint g_dbus_add_disconnect_watch(DBusConnection *connection, const char *name, GDBusWatchFunction function, diff --git a/gdbus/mainloop.c b/gdbus/mainloop.c index a9b8237c..36abbf33 100644 --- a/gdbus/mainloop.c +++ b/gdbus/mainloop.c @@ -290,7 +290,7 @@ DBusConnection *g_dbus_setup_bus(DBusBusType type, const char *name, } gboolean g_dbus_set_disconnect_function(DBusConnection *connection, - GDBusDisconnectFunction function, + GDBusWatchFunction function, void *user_data, DBusFreeFunction destroy) { struct disconnect_data *dc_data; -- cgit