diff options
| author | Luiz Augusto von Dentz <luiz.dentz@indt.org.br> | 2008-08-18 19:20:42 -0300 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.dentz@indt.org.br> | 2008-08-18 19:20:42 -0300 |
| commit | c560d02ccf1dd156f068b1da8a3e7d75d2319dfd (patch) | |
| tree | f0925d7821b400fe061a97d9521f78daf0ff9f66 /input | |
| parent | 0dda767d09a31eb13976371730e4cfe5e437869e (diff) | |
Remove driver.c driver.h and remove workaround for to force a symbol resolution.
Diffstat (limited to 'input')
| -rw-r--r-- | input/main.c | 1 | ||||
| -rw-r--r-- | input/manager.c | 1 | ||||
| -rw-r--r-- | input/server.c | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/input/main.c b/input/main.c index d70bf2a0..d3d152e0 100644 --- a/input/main.c +++ b/input/main.c @@ -34,7 +34,6 @@ #include "plugin.h" #include "logging.h" -#include "dbus-service.h" #include "manager.h" static GKeyFile *load_config_file(const char *file) diff --git a/input/manager.c b/input/manager.c index 4a461b4e..b8f8b2de 100644 --- a/input/manager.c +++ b/input/manager.c @@ -46,7 +46,6 @@ #include "textfile.h" #include "../src/adapter.h" #include "../src/device.h" -#include "../src/driver.h" #include "device.h" #include "server.h" diff --git a/input/server.c b/input/server.c index 9267e4aa..d8bd1925 100644 --- a/input/server.c +++ b/input/server.c @@ -44,10 +44,10 @@ #include "logging.h" +#include "adapter.h" #include "device.h" #include "server.h" #include "storage.h" -#include "dbus-service.h" #include "glib-helper.h" static const char *HID_UUID = "00001124-0000-1000-8000-00805f9b34fb"; @@ -64,7 +64,7 @@ static void auth_callback(DBusError *derr, void *user_data) if (derr) { error("Access denied: %s", derr->message); if (dbus_error_has_name(derr, DBUS_ERROR_NO_REPLY)) - service_cancel_auth(&auth->src, &auth->dst); + btd_cancel_authorization(&auth->src, &auth->dst); input_device_close_channels(&auth->src, &auth->dst); } else @@ -81,7 +81,7 @@ static int authorize_device(const bdaddr_t *src, const bdaddr_t *dst) bacpy(&auth->src, src); bacpy(&auth->dst, dst); - return service_req_auth(src, dst, HID_UUID, + return btd_request_authorization(src, dst, HID_UUID, auth_callback, auth); } |