changeset 4005dc4707fe in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=4005dc4707fe
description: Fixed resource extraction from jid. Fixes #5310
diffstat:
src/common/gajim.py | 8 ++++----
src/session.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diffs (30 lines):
diff -r 194887928a4b -r 4005dc4707fe src/common/gajim.py
--- a/src/common/gajim.py Tue Oct 06 23:26:22 2009 +0300
+++ b/src/common/gajim.py Thu Oct 08 15:21:18 2009 +0300
@@ -212,10 +212,10 @@
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
- # [email protected]/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)
diff -r 194887928a4b -r 4005dc4707fe src/session.py
--- a/src/session.py Tue Oct 06 23:26:22 2009 +0300
+++ b/src/session.py Thu Oct 08 15:21:18 2009 +0300
@@ -86,7 +86,7 @@
'''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:
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
