diff options
| -rw-r--r-- | hcid/Makefile.am | 9 | ||||
| -rw-r--r-- | hcid/dbus-common.c | 2 | ||||
| -rw-r--r-- | hcid/dbus-hci.c | 2 | ||||
| -rw-r--r-- | hcid/dbus-service.c | 2 | ||||
| -rw-r--r-- | hcid/manager.c (renamed from hcid/dbus-manager.c) | 3 | ||||
| -rw-r--r-- | hcid/manager.h (renamed from hcid/dbus-manager.h) | 7 |
6 files changed, 10 insertions, 15 deletions
diff --git a/hcid/Makefile.am b/hcid/Makefile.am index d1ade7d9..77593c36 100644 --- a/hcid/Makefile.am +++ b/hcid/Makefile.am @@ -15,13 +15,12 @@ noinst_LIBRARIES = libhciserver.a libhciserver_a_SOURCES = hcid.h security.c device.c \ storage.c parser.h parser.y lexer.l kword.c kword.h \ - server.h server.c \ - dbus-hci.h dbus-hci.c dbus-common.c dbus-common.h \ - dbus-error.c dbus-error.h dbus-manager.c dbus-manager.h \ + manager.h manager.c server.h server.c \ + dbus-common.c dbus-common.h dbus-error.c dbus-error.h \ dbus-database.c dbus-database.h dbus-security.c dbus-security.h \ dbus-adapter.c dbus-adapter.h dbus-device.c dbus-device.h \ - dbus-service.c dbus-service.h dbus-sdp.c dbus-sdp.h \ - dbus-test.c dbus-test.h + dbus-service.c dbus-service.h dbus-test.c dbus-test.h \ + dbus-hci.h dbus-hci.c dbus-sdp.c dbus-sdp.h if HCID sbin_PROGRAMS = hcid diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c index 3df3d4d1..68137875 100644 --- a/hcid/dbus-common.c +++ b/hcid/dbus-common.c @@ -53,7 +53,7 @@ #include "dbus-helper.h" #include "dbus-error.h" #include "dbus-hci.h" -#include "dbus-manager.h" +#include "manager.h" #include "dbus-adapter.h" #include "dbus-service.h" #include "dbus-database.h" diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c index 5df7012d..fd9fbb47 100644 --- a/hcid/dbus-hci.c +++ b/hcid/dbus-hci.c @@ -52,7 +52,7 @@ #include "dbus-test.h" #include "dbus-security.h" #include "dbus-service.h" -#include "dbus-manager.h" +#include "manager.h" #include "dbus-adapter.h" #include "dbus-hci.h" diff --git a/hcid/dbus-service.c b/hcid/dbus-service.c index c7c2b766..49db4e00 100644 --- a/hcid/dbus-service.c +++ b/hcid/dbus-service.c @@ -46,7 +46,7 @@ #include "server.h" #include "dbus-common.h" #include "dbus-error.h" -#include "dbus-manager.h" +#include "manager.h" #include "dbus-service.h" #include "dbus-hci.h" diff --git a/hcid/dbus-manager.c b/hcid/manager.c index 695b3112..e946886f 100644 --- a/hcid/dbus-manager.c +++ b/hcid/manager.c @@ -49,10 +49,11 @@ #include "dbus-database.h" #include "dbus-security.h" #include "dbus-service.h" -#include "dbus-manager.h" #include "dbus-hci.h" #include "sdp-xml.h" +#include "manager.h" + static int default_adapter_id = -1; static DBusHandlerResult interface_version(DBusConnection *conn, diff --git a/hcid/dbus-manager.h b/hcid/manager.h index 87e8d4d5..eef0dd36 100644 --- a/hcid/dbus-manager.h +++ b/hcid/manager.h @@ -21,15 +21,10 @@ * */ -#ifndef __MANAGER_H -#define __MANAGER_H - -#define MANAGER_INTERFACE "org.bluez.Manager" +#define MANAGER_INTERFACE "org.bluez.Manager" dbus_bool_t manager_init(DBusConnection *conn, const char *path); int get_default_adapter(void); void set_default_adapter(int new_default); - -#endif /* __MANAGER_H */ |