gajim: check real JID <-> fake JID correspondance only when needed.

changeset 53102f47b5ba in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=53102f47b5ba description: check real JID <-> fake JID correspondance only when needed.

diffstat:

src/common/connection_handlers_events.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r b5efb8187db5 -r 53102f47b5ba src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Oct 24 15:32:38 2010 +0200 +++ b/src/common/connection_handlers_events.py Sun Oct 24 15:33:19 2010 +0200 @@ -36,8 +36,9 @@ log = logging.getLogger('gajim.c.connection_handlers_events')

class HelperEvent: - def get_jid_resource(self): - if hasattr(self, 'id_') and self.id_ in self.conn.groupchat_jids: + def get_jid_resource(self, check_fake_jid=False): + if check_fake_jid and hasattr(self, 'id_') and \ + self.id_ in self.conn.groupchat_jids: self.fjid = self.conn.groupchat_jids[self.id_] del self.conn.groupchat_jids[self.id_] else: @@ -81,7 +82,7 @@

def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) if self.id_ in self.conn.last_ids: self.conn.last_ids.remove(self.id_)

@@ -109,7 +110,7 @@

def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) if self.id_ in self.conn.version_ids: self.conn.version_ids.remove(self.id_)

@@ -135,7 +136,7 @@

def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) if self.id_ in self.conn.entity_time_ids: self.conn.entity_time_ids.remove(self.id_)

@@ -592,7 +593,7 @@

def generate(self): self.get_id() - self.get_jid_resource() + self.get_jid_resource(check_fake_jid=True) self.errmsg = self.stanza.getErrorMsg() self.errcode = self.stanza.getErrorCode() return True