diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-04 15:03:35 +0200 |
| commit | 01761bea1ce6539b97640123660c67d81c54318b (patch) | |
| tree | a9eb2957891081a1ae111b6c7f53a8d2108597b2 /plugins | |
| parent | 0019156df63264bdb80131f947833cd2a1293994 (diff) | |
| parent | 18614bd2b008cb9f3879990883c569c37b72f195 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/aloks-clone
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/echo.c | 4 | ||||
| -rw-r--r-- | plugins/service.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/echo.c b/plugins/echo.c index ead488e4..dcb57949 100644 --- a/plugins/echo.c +++ b/plugins/echo.c @@ -123,7 +123,7 @@ static GIOChannel *setup_rfcomm(uint8_t channel) static GIOChannel *chan = NULL; -static int echo_probe(struct adapter *adapter) +static int echo_probe(struct btd_adapter *adapter) { const char *path = adapter_get_path(adapter); @@ -134,7 +134,7 @@ static int echo_probe(struct adapter *adapter) return 0; } -static void echo_remove(struct adapter *adapter) +static void echo_remove(struct btd_adapter *adapter) { const char *path = adapter_get_path(adapter); diff --git a/plugins/service.c b/plugins/service.c index 03820198..4ec8cca0 100644 --- a/plugins/service.c +++ b/plugins/service.c @@ -430,7 +430,7 @@ static int remove_record(DBusConnection *conn, const char *sender, static DBusMessage *add_service_record(DBusConnection *conn, DBusMessage *msg, void *data) { - struct adapter *adapter = data; + struct btd_adapter *adapter = data; DBusMessage *reply; const char *sender, *record; dbus_uint32_t handle; @@ -460,7 +460,7 @@ static DBusMessage *add_service_record(DBusConnection *conn, static DBusMessage *update_service_record(DBusConnection *conn, DBusMessage *msg, void *data) { - struct adapter *adapter = data; + struct btd_adapter *adapter = data; bdaddr_t src; str2ba(adapter_get_address(adapter), &src); @@ -517,7 +517,7 @@ static void path_unregister(void *data) g_slist_foreach(records, (GFunc) exit_callback, NULL); } -static int service_probe(struct adapter *adapter) +static int service_probe(struct btd_adapter *adapter) { const char *path = adapter_get_path(adapter); @@ -537,7 +537,7 @@ static int service_probe(struct adapter *adapter) return 0; } -static void service_remove(struct adapter *adapter) +static void service_remove(struct btd_adapter *adapter) { const char *path = adapter_get_path(adapter); |