core: sendMessage's options parameter has been renamed to extra to be consistent with newMessage

This commit is contained in:
Goffi 2013-11-13 13:58:10 +01:00
commit 9d42c269db

View file

@ -185,8 +185,8 @@ class XEP_0085(object):
# launch the chat state machine (init the timer)
self.__chatStateActive(to_jid, mess_data["type"], profile)
except StopIteration:
if "chat_state" in mess_data["options"]:
state = mess_data["options"]["chat_state"]
if "chat_state" in mess_data["extra"]:
state = mess_data["extra"].pop("chat_state")
assert(state in CHAT_STATES)
message.addElement(state, NS_CHAT_STATES)
return mess_data
@ -303,7 +303,7 @@ class ChatStateMachine:
'',
'',
self.mess_type,
options={"chat_state": state},
extra={"chat_state": state},
profile_key=self.profile)
self.state = state
if not self.timer is None: