diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-09-08 10:30:05 +0300 |
| commit | 17370895fde2d210bb50dfaa1c89fe6601de3467 (patch) | |
| tree | 2797d5e061b7948a53f270f9ccfcc31b1c0ad6f5 /input/manager.c | |
| parent | fa141e676e82cd20082779c086d1fef6427fdc20 (diff) | |
| parent | 393416b170d6e4b2b7406418d63c7be2aefda70f (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/bluetooth/bluez
Diffstat (limited to 'input/manager.c')
| -rw-r--r-- | input/manager.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/input/manager.c b/input/manager.c index a2a22762..d3829323 100644 --- a/input/manager.c +++ b/input/manager.c @@ -25,21 +25,14 @@ #include <config.h> #endif -#include <ctype.h> -#include <dirent.h> #include <errno.h> -#include <stdlib.h> -#include <unistd.h> #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> -#include <bluetooth/hci_lib.h> #include <bluetooth/hidp.h> #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> -#include <glib.h> -#include <dbus/dbus.h> #include <gdbus.h> #include "logging.h" @@ -49,10 +42,8 @@ #include "device.h" #include "server.h" -#include "error.h" #include "manager.h" #include "storage.h" -#include "glib-helper.h" static int idle_timeout = 0; @@ -319,12 +310,11 @@ int input_manager_init(DBusConnection *conn, GKeyFile *config) void input_manager_exit(void) { - - btd_unregister_adapter_driver(&input_server_driver); - btd_unregister_device_driver(&input_hid_driver); btd_unregister_device_driver(&input_headset_driver); + btd_unregister_adapter_driver(&input_server_driver); + dbus_connection_unref(connection); connection = NULL; |