core: fixed default message type

This commit is contained in:
Goffi 2011-01-23 14:14:47 +01:00
commit 9951b0b116
2 changed files with 4 additions and 4 deletions

View file

@ -84,8 +84,8 @@ class MaildirBox():
@return: False if it's a normal message, True else"""
for e in message.elements():
if e.name == "body":
type = message['type'] if message.hasAttribute('type') else 'chat' #FIXME: check specs
if message['type'] != 'normal':
mess_type = message['type'] if message.hasAttribute('type') else 'normal'
if mess_type != 'normal':
return True
self.accessMessageBox("INBOX", profile_key=profile).addMessage(message)
return False

View file

@ -140,8 +140,8 @@ class SatMessageProtocol(xmppim.MessageProtocol):
return
for e in message.elements():
if e.name == "body":
type = message['type'] if message.hasAttribute('type') else 'chat' #FIXME: check specs
self.host.bridge.newMessage(message["from"], e.children[0], type, profile=self.parent.profile)
mess_type = message['type'] if message.hasAttribute('type') else 'normal'
self.host.bridge.newMessage(message["from"], e.children[0], mess_type, profile=self.parent.profile)
self.host.memory.addToHistory(self.parent.jid, jid.JID(message["from"]), self.parent.jid, "chat", e.children[0])
break