core, quick_frontend(app): fixed connected signal handling
This commit is contained in:
parent
8c6be44375
commit
5a90f9d407
5 changed files with 10 additions and 12 deletions
|
|
@ -10,8 +10,8 @@ type=signal
|
|||
category=core
|
||||
sig_in=ss
|
||||
doc=Connection is done
|
||||
doc_param_0=%(doc_profile)s
|
||||
doc_param_1=jid_s: the JID that we were assigned by the server, as the resource might differ from the JID we asked for.
|
||||
doc_param_0=jid_s: the JID that we were assigned by the server, as the resource might differ from the JID we asked for.
|
||||
doc_param_1=%(doc_profile)s
|
||||
|
||||
[disconnected]
|
||||
type=signal
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ class DbusObject(dbus.service.Object):
|
|||
|
||||
@dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
|
||||
signature='ss')
|
||||
def connected(self, profile, jid_s):
|
||||
def connected(self, jid_s, profile):
|
||||
pass
|
||||
|
||||
@dbus.service.signal(const_INT_PREFIX+const_CORE_SUFFIX,
|
||||
|
|
@ -698,8 +698,8 @@ class Bridge(object):
|
|||
def actionNew(self, action_data, id, security_limit, profile):
|
||||
self.dbus_bridge.actionNew(action_data, id, security_limit, profile)
|
||||
|
||||
def connected(self, profile, jid_s):
|
||||
self.dbus_bridge.connected(profile, jid_s)
|
||||
def connected(self, jid_s, profile):
|
||||
self.dbus_bridge.connected(jid_s, profile)
|
||||
|
||||
def contactDeleted(self, entity_jid, profile):
|
||||
self.dbus_bridge.contactDeleted(entity_jid, profile)
|
||||
|
|
|
|||
|
|
@ -141,8 +141,8 @@ class Bridge(object):
|
|||
def actionNew(self, action_data, id, security_limit, profile):
|
||||
self.sendSignal("actionNew", action_data, id, security_limit, profile)
|
||||
|
||||
def connected(self, profile, jid_s):
|
||||
self.sendSignal("connected", profile, jid_s)
|
||||
def connected(self, jid_s, profile):
|
||||
self.sendSignal("connected", jid_s, profile)
|
||||
|
||||
def contactDeleted(self, entity_jid, profile):
|
||||
self.sendSignal("contactDeleted", entity_jid, profile)
|
||||
|
|
|
|||
|
|
@ -259,10 +259,8 @@ class SatXMPPEntity(object):
|
|||
self._connected_d.addCallback(self._disconnectionCb)
|
||||
self._connected_d.addErrback(self._disconnectionEb)
|
||||
|
||||
self.host_app.bridge.connected(
|
||||
self.profile, unicode(self.jid)
|
||||
) # we send the signal to the clients
|
||||
|
||||
# we send the signal to the clients
|
||||
self.host_app.bridge.connected(self.jid.full(), self.profile)
|
||||
|
||||
self.disco = SatDiscoProtocol(self)
|
||||
self.disco.setHandlerParent(self)
|
||||
|
|
|
|||
|
|
@ -682,7 +682,7 @@ class QuickApp(object):
|
|||
|
||||
# bridge signals hanlers
|
||||
|
||||
def connectedHandler(self, profile, jid_s):
|
||||
def connectedHandler(self, jid_s, profile):
|
||||
"""Called when the connection is made.
|
||||
|
||||
@param jid_s (unicode): the JID that we were assigned by the server,
|
||||
|
|
|
|||
Loading…
Reference in a new issue