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

bugfix : messageCB must send a string to the plugins and not a JID instance

This commit is contained in:
Yann Leboulanger 2004-05-24 19:41:14 +00:00
parent c5570e33a0
commit 3a91cda882
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core.py
View File

@ -119,7 +119,7 @@ class GajimCore:
def messageCB(self, con, msg):
"""Called when we recieve a message"""
self.hub.sendPlugin('MSG', self.connexions[con], \
(msg.getFrom(), msg.getBody()))
(str(msg.getFrom()), msg.getBody()))
# END messageCB
def presenceCB(self, con, prs):

7
plugins/gtkgui/gtkgui.py
View File

@ -1254,10 +1254,9 @@ class plugin:
self.roster.chg_user_status(user1, ev[2][1], ev[2][2], ev[1])
#('MSG', account, (user, msg))
elif ev[0] == 'MSG':
if string.find(ev[2][0], "@") <= 0:
jid = string.replace(ev[2][0], '@', '')
else:
jid = ev[2][0]
jid = string.split(ev[2][0], '/')[0]
if string.find(jid, "@") <= 0:
jid = string.replace(jid, '@', '')
self.roster.on_message(jid, ev[2][1], ev[1])
#('SUBSCRIBE', account, (jid, text))
elif ev[0] == 'SUBSCRIBE':