david/jmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch to stanza type "normal"

Browse Source 
- Stanza type "message" does not exist, "normal" is the correct type.

darcs-hash:20060201091207-86b55-7ff9bd7e919cb97950b7b71df05f7c12c9e8696d.gz
This commit is contained in:
David Rousselie
2006-02-01 10:12:07 +01:00
parent 391fd9e765
commit 4a5848a66c
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jabber/component.py
View File

@@ -652,7 +652,7 @@ class MailComponent(Component):
socket = host socket = host
if self.__storage.has_key((base_from_jid, name)): if self.__storage.has_key((base_from_jid, name)):
m = Message(from_jid = self.jid, to_jid = from_jid, \ m = Message(from_jid = self.jid, to_jid = from_jid, \
stanza_type = "message", \ stanza_type = "normal", \
subject = lang_class.update_account_message_subject \ subject = lang_class.update_account_message_subject \
% (type, name), \ % (type, name), \
body = lang_class.update_account_message_body \ body = lang_class.update_account_message_body \
@@ -660,7 +660,7 @@ class MailComponent(Component):
self.stream.send(m) self.stream.send(m)
else: else:
m = Message(from_jid = self.jid, to_jid = from_jid, \ m = Message(from_jid = self.jid, to_jid = from_jid, \
stanza_type = "message", \ stanza_type = "normal", \
subject = lang_class.new_account_message_subject \ subject = lang_class.new_account_message_subject \
% (type, name), \ % (type, name), \
body = lang_class.new_account_message_body \ body = lang_class.new_account_message_body \
@@ -741,7 +741,7 @@ class MailComponent(Component):
account.waiting_password_reply = True account.waiting_password_reply = True
msg = Message(from_jid = name + "@" + unicode(self.jid), \ msg = Message(from_jid = name + "@" + unicode(self.jid), \
to_jid = from_jid, \ to_jid = from_jid, \
stanza_type = "message", \ stanza_type = "normal", \
subject = u"[PASSWORD] " + lang_class.ask_password_subject, \ subject = u"[PASSWORD] " + lang_class.ask_password_subject, \
body = lang_class.ask_password_body % \ body = lang_class.ask_password_body % \
(account.host, account.login)) (account.host, account.login))
@@ -829,7 +829,7 @@ class MailComponent(Component):
account.waiting_password_reply = False account.waiting_password_reply = False
msg = Message(from_jid = name + "@" + unicode(self.jid), \ msg = Message(from_jid = name + "@" + unicode(self.jid), \
to_jid = message.get_from(), \ to_jid = message.get_from(), \
stanza_type = "message", \ stanza_type = "normal", \
subject = lang_class.password_saved_for_session, \ subject = lang_class.password_saved_for_session, \
body = lang_class.password_saved_for_session) body = lang_class.password_saved_for_session)
self.stream.send(msg) self.stream.send(msg)
@@ -865,7 +865,7 @@ class MailComponent(Component):
mesg = Message(from_jid = name + "@" + \ mesg = Message(from_jid = name + "@" + \
unicode(self.jid), \ unicode(self.jid), \
to_jid = jid, \ to_jid = jid, \
stanza_type = "message", \ stanza_type = "normal", \
body = body) body = body)
self.stream.send(mesg) self.stream.send(mesg)
account.lastmail += 1 account.lastmail += 1