summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2012-06-05 13:10:42 +0300
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2012-06-05 13:41:57 +0300
commitbd9a86190f0c6cf65d264cb9302df2fe0a3e26ec (patch)
treeecd57cd84a11323229dbf27f5dc48e6c138d57d4
parent064ff92e2c4e181e23b569ecc032695c0b9f3440 (diff)
downloadobexd-bd9a86190f0c6cf65d264cb9302df2fe0a3e26ec.tar.gz
test: Use org.bluez.obex namespace in ftp-client script
-rwxr-xr-xtest/ftp-client27
1 files changed, 13 insertions, 14 deletions
diff --git a/test/ftp-client b/test/ftp-client
index 7cf9bfc..39d7675 100755
--- a/test/ftp-client
+++ b/test/ftp-client
@@ -38,17 +38,17 @@ class FtpClient:
self.transfer_path = None
self.verbose = verbose
bus = dbus.SessionBus()
- obj = bus.get_object("org.openobex.client", session_path)
- self.session = dbus.Interface(obj, "org.openobex.Session")
- self.ftp = dbus.Interface(obj, "org.openobex.FileTransfer")
+ obj = bus.get_object("org.bluez.obex.client", session_path)
+ self.session = dbus.Interface(obj, "org.bluez.obex.Session")
+ self.ftp = dbus.Interface(obj, "org.bluez.obex.FileTransfer")
bus.add_signal_receiver(self.transfer_complete,
- dbus_interface="org.openobex.Transfer",
- signal_name="Complete",
- path_keyword="path")
+ dbus_interface="org.bluez.obex.Transfer",
+ signal_name="Complete",
+ path_keyword="path")
bus.add_signal_receiver(self.transfer_error,
- dbus_interface="org.openobex.Transfer",
- signal_name="Error",
- path_keyword="path")
+ dbus_interface="org.bluez.obex.Transfer",
+ signal_name="Error",
+ path_keyword="path")
def create_transfer_reply(self, reply):
(path, properties) = reply
@@ -130,14 +130,13 @@ if __name__ == '__main__':
bus = dbus.SessionBus()
mainloop = gobject.MainLoop()
- client = dbus.Interface(bus.get_object("org.openobex.client", "/"),
- "org.openobex.Client")
+ client = dbus.Interface(bus.get_object("org.bluez.obex.client", "/"),
+ "org.bluez.obex.Client")
print "Creating Session"
- session_path = client.CreateSession(options.device,
- { "Target": "ftp" })
+ path = client.CreateSession(options.device, { "Target": "ftp" })
- ftp_client = FtpClient(session_path)
+ ftp_client = FtpClient(path)
if options.new_dir:
ftp_client.change_folder(options.new_dir)