From be9a675626b221669739f0f19a495c031debfff7 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 15 Oct 2012 14:25:54 +0300 Subject: [PATCH] test: Update simple-agent to support the new Device.Pair API --- test/simple-agent | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/test/simple-agent b/test/simple-agent index a2df51f6b..1a5b4a667 100755 --- a/test/simple-agent +++ b/test/simple-agent @@ -88,11 +88,11 @@ class Agent(dbus.service.Object): def Cancel(self): print("Cancel") -def create_device_reply(device): - print("New device (%s)" % (device)) +def pair_reply(): + print("Device paired") mainloop.quit() -def create_device_error(error): +def pair_error(error): print("Creating device failed: %s" % (error)) mainloop.quit() @@ -126,15 +126,14 @@ if __name__ == '__main__': mainloop = GObject.MainLoop() if len(args) > 1: - if len(args) > 2: - device = adapter.FindDevice(args[1]) - adapter.RemoveDevice(device) + dev_path = adapter.FindDevice(args[1]) + device = dbus.Interface(bus.get_object("org.bluez", dev_path), + "org.bluez.Device") agent.set_exit_on_release(False) - adapter.CreatePairedDevice(args[1], path, capability, - timeout=60000, - reply_handler=create_device_reply, - error_handler=create_device_error) + device.Pair(path, capability, timeout=60000, + reply_handler=pair_reply, + error_handler=pair_error) else: adapter.RegisterAgent(path, capability) print("Agent registered") -- 2.11.0