about summary refs log tree commit diff
path: root/src/bluez-manager/nm-bluez-common.h
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd@luon.net>2013-10-25 21:21:07 +0200
committerSjoerd Simons <sjoerd@luon.net>2013-10-25 21:21:07 +0200
commite83d1de9b746dbc078ac1cf45f1798e1bc6b7e2f (patch)
treec36a40d79a5ae7d2bbca7d240d0a6f664049b435 /src/bluez-manager/nm-bluez-common.h
parent26283b4c9e5035574a6c168003e7f1da53a8f32a (diff)
parenta4256940da049f91bbbea5e53e469a59ea9c10f7 (diff)
Merge tag 'upstream/0.9.8.8' into experimental
Upstream version 0.9.8.8
Diffstat (limited to 'src/bluez-manager/nm-bluez-common.h')
-rw-r--r--src/bluez-manager/nm-bluez-common.h17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/bluez-manager/nm-bluez-common.h b/src/bluez-manager/nm-bluez-common.h
index 61296255..ecc4d709 100644
--- a/src/bluez-manager/nm-bluez-common.h
+++ b/src/bluez-manager/nm-bluez-common.h
@@ -21,14 +21,31 @@
 #ifndef NM_BLUEZ_COMMON_H
 #define NM_BLUEZ_COMMON_H
 
+#include <config.h>
+
+#define BLUETOOTH_CONNECT_DUN "dun"
+#define BLUETOOTH_CONNECT_NAP "nap"
+
 #define BLUEZ_SERVICE           "org.bluez"
 
 #define BLUEZ_MANAGER_PATH      "/"
+#define OBJECT_MANAGER_INTERFACE "org.freedesktop.DBus.ObjectManager"
+
+#if ! WITH_BLUEZ4
+
+#define BLUEZ_ADAPTER_INTERFACE "org.bluez.Adapter1"
+#define BLUEZ_DEVICE_INTERFACE  "org.bluez.Device1"
+#define BLUEZ_NETWORK_INTERFACE "org.bluez.Network1"
+
+#else
+
 #define BLUEZ_MANAGER_INTERFACE "org.bluez.Manager"
 #define BLUEZ_ADAPTER_INTERFACE "org.bluez.Adapter"
 #define BLUEZ_DEVICE_INTERFACE  "org.bluez.Device"
 #define BLUEZ_SERIAL_INTERFACE  "org.bluez.Serial"
 #define BLUEZ_NETWORK_INTERFACE "org.bluez.Network"
 
+#endif /* WITH_BLUEZ */
+
 #endif  /* NM_BLUEZ_COMMON_H */