diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2008-10-17 18:43:48 +0200 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2008-10-17 18:43:48 +0200 |
commit | 1f5107e65f9786bd6b84ecfb4d84691e9b34529a (patch) | |
tree | b74bb250ff9113c50ccfd72fedee5146e154ae72 | |
parent | 606e4a9280bc14f7d495df27572a2ae85a021a91 (diff) |
Fix fallouts due to GDBusWatchFunction changes
-rw-r--r-- | plugins/service.c | 4 | ||||
-rw-r--r-- | serial/port.c | 2 | ||||
-rw-r--r-- | src/adapter.c | 2 | ||||
-rw-r--r-- | src/agent.c | 2 | ||||
-rw-r--r-- | src/dbus-common.c | 2 | ||||
-rw-r--r-- | src/device.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/plugins/service.c b/plugins/service.c index 5c9347b2..56dde3ff 100644 --- a/plugins/service.c +++ b/plugins/service.c @@ -313,7 +313,7 @@ static struct pending_auth *find_pending_by_sender( return NULL; } -static void exit_callback(void *user_data) +static void exit_callback(DBusConnection *conn, void *user_data) { struct record_data *user_record = user_data; struct service_adapter *serv_adapter = user_record->serv_adapter; @@ -494,7 +494,7 @@ static int remove_record(DBusConnection *conn, const char *sender, g_dbus_remove_watch(conn, user_record->listener_id); - exit_callback(user_record); + exit_callback(conn, user_record); return 0; } diff --git a/serial/port.c b/serial/port.c index 4abd954e..dc146e79 100644 --- a/serial/port.c +++ b/serial/port.c @@ -167,7 +167,7 @@ static void serial_device_free(struct serial_device *device) g_free(device); } -static void port_owner_exited(void *user_data) +static void port_owner_exited(DBusConnection *conn, void *user_data) { struct serial_port *port = user_data; diff --git a/src/adapter.c b/src/adapter.c index b9307e7d..7dabf0bc 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -1308,7 +1308,7 @@ static void cancel_bonding(struct btd_adapter *adapter, gboolean exited) bonding->cancel = TRUE; } -static void create_bond_req_exit(void *user_data) +static void create_bond_req_exit(DBusConnection *conn, void *user_data) { struct btd_adapter *adapter = user_data; diff --git a/src/agent.c b/src/agent.c index e97f31fc..c4c9b27d 100644 --- a/src/agent.c +++ b/src/agent.c @@ -139,7 +139,7 @@ static void agent_request_free(struct agent_request *req) g_free(req); } -static void agent_exited(void *user_data) +static void agent_exited(DBusConnection *conn, void *user_data) { struct agent *agent = user_data; diff --git a/src/dbus-common.c b/src/dbus-common.c index b2edd4c1..60662398 100644 --- a/src/dbus-common.c +++ b/src/dbus-common.c @@ -157,7 +157,7 @@ failed: return ret_val; } -static void disconnect_callback(void *user_data) +static void disconnect_callback(DBusConnection *conn, void *user_data) { set_dbus_connection(NULL); diff --git a/src/device.c b/src/device.c index 322d9efe..ab3017cd 100644 --- a/src/device.c +++ b/src/device.c @@ -364,7 +364,7 @@ static DBusMessage *set_property(DBusConnection *conn, return invalid_args(msg); } -static void discover_services_req_exit(void *user_data) +static void discover_services_req_exit(DBusConnection *conn, void *user_data) { struct btd_device *device = user_data; struct btd_adapter *adapter = device->adapter; |