Mercurial > libervia-backend
diff frontends/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/frontends/src/bridge/dbus_bridge.py Mon Feb 06 20:51:56 2017 +0100 +++ b/frontends/src/bridge/dbus_bridge.py Mon Feb 06 22:54:43 2017 +0100 @@ -164,15 +164,6 @@ kwargs['error_handler'] = error_handler return self.db_core_iface.addContact(entity_jid, profile_key, **kwargs) - def asyncConnect(self, profile_key="@DEFAULT@", password='', callback=None, errback=None): - if callback is None: - error_handler = None - else: - if errback is None: - errback = log.error - error_handler = lambda err:errback(dbus_to_bridge_exception(err)) - return self.db_core_iface.asyncConnect(profile_key, password, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) - def asyncCreateProfile(self, profile, password='', callback=None, errback=None): if callback is None: error_handler = None @@ -209,6 +200,15 @@ error_handler = lambda err:errback(dbus_to_bridge_exception(err)) return self.db_core_iface.asyncGetParamsValuesFromCategory(category, security_limit, profile_key, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) + def connect(self, profile_key="@DEFAULT@", password='', options={}, callback=None, errback=None): + if callback is None: + error_handler = None + else: + if errback is None: + errback = log.error + error_handler = lambda err:errback(dbus_to_bridge_exception(err)) + return self.db_core_iface.connect(profile_key, password, options, timeout=const_TIMEOUT, reply_handler=callback, error_handler=error_handler) + def delContact(self, entity_jid, profile_key="@DEFAULT@", callback=None, errback=None): if callback is None: error_handler = None