diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-02 02:28:33 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-02 02:28:33 +0200 |
| commit | 0c05dd3dc5a18d64734a9f091d5285612e41107b (patch) | |
| tree | 57de979b0fdef6c07329d0aae06235730a2fb4cb /network/manager.c | |
| parent | 4f946e36897fc67a28a56fb3102994da6857a038 (diff) | |
| parent | 3f498e694e39756890db475f1f1edb528b378ee2 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
Diffstat (limited to 'network/manager.c')
| -rw-r--r-- | network/manager.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/network/manager.c b/network/manager.c index 7cbf8220..8067b821 100644 --- a/network/manager.c +++ b/network/manager.c @@ -25,34 +25,24 @@ #include <config.h> #endif -#include <errno.h> -#include <ctype.h> -#include <dirent.h> - -#include <sys/stat.h> - #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> #include <bluetooth/hci_lib.h> #include <bluetooth/bnep.h> #include <bluetooth/sdp.h> -#include <bluetooth/sdp_lib.h> #include <glib.h> #include <gdbus.h> #include "logging.h" -#include "textfile.h" -#include "glib-helper.h" #include "adapter.h" #include "device.h" -#include "error.h" #include "bridge.h" #include "manager.h" #include "common.h" - -#define MAX_NAME_SIZE 256 +#include "connection.h" +#include "server.h" static struct network_conf *conf = NULL;/* Network service configuration */ |