# HG changeset patch # User Goffi # Date 1353541560 -3600 # Node ID f25eef861b43e3471821e1a1243ab8f25da65161 # Parent 2c5ef983f2efcbfcb1eaf47ff4a65463c0032386 core: asyncConnect is now fired when roster is available diff -r 2c5ef983f2ef -r f25eef861b43 src/core/sat_main.py --- a/src/core/sat_main.py Thu Nov 22 00:44:56 2012 +0100 +++ b/src/core/sat_main.py Thu Nov 22 00:46:00 2012 +0100 @@ -116,7 +116,7 @@ self.bridge.register("getVersion", lambda: self.get_const('client_version')) self.bridge.register("getProfileName", self.memory.getProfileName) self.bridge.register("getProfilesList", self.memory.getProfilesList) - self.bridge.register("getEntityData", lambda _jid, keys, profile: self.memory.getEntityData(jid.JID(_jid),keys, profile)) + self.bridge.register("getEntityData", lambda _jid, keys, profile: self.memory.getEntityData(jid.JID(_jid), keys, profile)) self.bridge.register("createProfile", self.memory.createProfile) self.bridge.register("asyncCreateProfile", self.memory.asyncCreateProfile) self.bridge.register("deleteProfile", self.memory.deleteProfile) @@ -256,7 +256,9 @@ current.startService() - return current.getConnectionDeferred() + d = current.getConnectionDeferred() + d.addCallback(lambda x: current.roster.got_roster) #we want to be sure that we got the roster + return d self.memory.startProfileSession(profile) return self.memory.loadIndividualParams(profile).addCallback(afterMemoryInit)