copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed resource extraction from jid. Fixes #5310

This commit is contained in:
red-agent 2009-10-08 15:21:18 +03:00
parent 3ef8557a8e
commit 90c653b83a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/gajim.py
View File

@ -212,10 +212,10 @@ def get_server_from_jid(jid):
pos = jid.find('@') + 1 # after @
return jid[pos:]
def get_nick_from_fjid(jid):
# fake jid is the jid for a contact in a room
# gaim@conference.jabber.no/nick/nick-continued
return jid.split('/', 1)[1]
def get_resource_from_jid(jid):
tokens = jid.split('/', 1)
if len(tokens) > 1:
return tokens[1]
def get_name_and_server_from_jid(jid):
name = get_nick_from_jid(jid)

2
src/session.py
View File

@ -86,7 +86,7 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession):
'''dispatch a received <message> stanza'''
msg_type = msg.getType()
subject = msg.getSubject()
resource = gajim.get_nick_from_fjid(full_jid_with_resource)
resource = gajim.get_resource_from_jid(full_jid_with_resource)
if self.resource != resource:
self.resource = resource
if self.control and self.control.resource: