diff src/bridge/dbus_bridge.py @ 2142:be96beb7ca14

core, bridge, frontends: renamed asyncConnect to connect, and added options parameters (not used yet)
author Goffi <goffi@goffi.org>
date Mon, 06 Feb 2017 22:54:43 +0100
parents 2f264f3df280
children 1d3f73e065e1
line wrap: on
line diff
--- a/src/bridge/dbus_bridge.py	Mon Feb 06 20:51:56 2017 +0100
+++ b/src/bridge/dbus_bridge.py	Mon Feb 06 22:54:43 2017 +0100
@@ -204,12 +204,6 @@
         return self._callback("addContact", unicode(entity_jid), unicode(profile_key))
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
-                         in_signature='ss', out_signature='b',
-                         async_callbacks=('callback', 'errback'))
-    def asyncConnect(self, profile_key="@DEFAULT@", password='', callback=None, errback=None):
-        return self._callback("asyncConnect", unicode(profile_key), unicode(password), callback=callback, errback=errback)
-
-    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='ss', out_signature='',
                          async_callbacks=('callback', 'errback'))
     def asyncCreateProfile(self, profile, password='', callback=None, errback=None):
@@ -234,6 +228,12 @@
         return self._callback("asyncGetParamsValuesFromCategory", unicode(category), security_limit, unicode(profile_key), callback=callback, errback=errback)
 
     @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
+                         in_signature='ssa{ss}', out_signature='b',
+                         async_callbacks=('callback', 'errback'))
+    def connect(self, profile_key="@DEFAULT@", password='', options={}, callback=None, errback=None):
+        return self._callback("connect", unicode(profile_key), unicode(password), options, callback=callback, errback=errback)
+
+    @dbus.service.method(const_INT_PREFIX+const_CORE_SUFFIX,
                          in_signature='ss', out_signature='',
                          async_callbacks=('callback', 'errback'))
     def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None):