From 9951b0b116c9da68c75d79a5dcc069db2cd6f6b3 Mon Sep 17 00:00:00 2001 From: Goffi Date: Sun, 23 Jan 2011 14:14:47 +0100 Subject: [PATCH] core: fixed default message type --- src/plugins/plugin_misc_maildir.py | 4 ++-- src/sat.tac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/plugin_misc_maildir.py b/src/plugins/plugin_misc_maildir.py index 56404881..cee966b9 100755 --- a/src/plugins/plugin_misc_maildir.py +++ b/src/plugins/plugin_misc_maildir.py @@ -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 diff --git a/src/sat.tac b/src/sat.tac index bceb20b3..18db86a4 100644 --- a/src/sat.tac +++ b/src/sat.tac @@ -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