diff --git a/doc/proximity-api.txt b/doc/proximity-api.txt
index b68a4fe..4719428 100644
--- a/doc/proximity-api.txt
+++ b/doc/proximity-api.txt
===========================
Service org.bluez
-Interface org.bluez.ProximityMonitor
+Interface org.bluez.ProximityMonitor1
Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX
Properties string SignalLevel [readonly]
alert level handling.
Service org.bluez
-Interface org.bluez.ProximityReporter
+Interface org.bluez.ProximityReporter1
Object path [variable prefix]/{hci0,hci1,...}/dev_XX_XX_XX_XX_XX_XX
Properties string ImmediateAlertLevel [readonly]
diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index 023de72..d9ed3ff 100644
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
#include "monitor.h"
#include "textfile.h"
-#define PROXIMITY_INTERFACE "org.bluez.ProximityMonitor"
+#define PROXIMITY_INTERFACE "org.bluez.ProximityMonitor1"
#define ALERT_LEVEL_CHR_UUID 0x2A06
#define POWER_LEVEL_CHR_UUID 0x2A07
diff --git a/profiles/proximity/reporter.h b/profiles/proximity/reporter.h
index 480c668..6a7066d 100644
--- a/profiles/proximity/reporter.h
+++ b/profiles/proximity/reporter.h
*
*/
-#define PROXIMITY_REPORTER_INTERFACE "org.bluez.ProximityReporter"
+#define PROXIMITY_REPORTER_INTERFACE "org.bluez.ProximityReporter1"
#define IMMEDIATE_ALERT_SVC_UUID 0x1802
#define LINK_LOSS_SVC_UUID 0x1803
diff --git a/test/test-proximity b/test/test-proximity
index d6862de..0cbf315 100755
--- a/test/test-proximity
+++ b/test/test-proximity
from optparse import OptionParser, make_option
import bluezutils
+BUS_NAME = 'org.bluez'
+PROXIMITY_MONITOR_INTERFACE = 'org.bluez.ProxymityMonitor1'
+
def properties_changed(interface, changed, invalidated):
- if interface != "org.bluez.ProximityMonitor":
+ if interface != PROXIMITY_MONITOR_INTERFACE:
return
for name, value in changed.iteritems():
device = bluezutils.find_device(options.address, options.dev_id)
device_path = device.object_path
- bus.add_signal_receiver(properties_changed, bus_name="org.bluez",
+ bus.add_signal_receiver(properties_changed, bus_name=BUS_NAME,
path=device_path,
dbus_interface="org.freedesktop.DBus.Properties",
signal_name="PropertiesChanged")
- proximity = dbus.Interface(bus.get_object("org.bluez",
- device_path), "org.bluez.ProximityMonitor")
+ proximity = dbus.Interface(bus.get_object(BUS_NAME, device_path),
+ PROXIMITY_MONITOR_INTERFACE)
- device_prop = dbus.Interface(bus.get_object("org.bluez", device_path),
+ device_prop = dbus.Interface(bus.get_object(BUS_NAME, device_path),
"org.freedesktop.DBus.Properties")
print("Proximity SetProperty('%s', '%s')" % (args[0], args[1]))
- device_prop.Set("org.bluez.ProximityMonitor", args[0], args[1])
+ device_prop.Set(PROXIMITY_MONITOR_INTERFACE, args[0], args[1])
mainloop = gobject.MainLoop()
mainloop.run()