diff options
Diffstat (limited to 'src/common/zeroconf/connection_zeroconf.py')
| -rw-r--r-- | src/common/zeroconf/connection_zeroconf.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py index cb5a780de..8c96ec23b 100644 --- a/src/common/zeroconf/connection_zeroconf.py +++ b/src/common/zeroconf/connection_zeroconf.py @@ -333,10 +333,10 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): msg=_('Please check if avahi-daemon is running.'))) def send_message(self, jid, msg, keyID, type_='chat', subject='', - chatstate=None, msg_id=None, composing_xep=None, resource=None, - user_nick=None, xhtml=None, label=None, session=None, forward_from=None, - form_node=None, original_message=None, delayed=None, callback=None, - callback_args=[], now=True): + chatstate=None, msg_id=None, resource=None, user_nick=None, xhtml=None, + label=None, session=None, forward_from=None, form_node=None, + original_message=None, delayed=None, callback=None, callback_args=[], + now=True): def on_send_ok(msg_id): gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, @@ -366,8 +366,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): msg=None, time_=None, session=session)) self._prepare_message(jid, msg, keyID, type_=type_, subject=subject, - chatstate=chatstate, msg_id=msg_id, composing_xep=composing_xep, - resource=resource, user_nick=user_nick, xhtml=xhtml, session=session, + chatstate=chatstate, msg_id=msg_id, resource=resource, + user_nick=user_nick, xhtml=xhtml, session=session, forward_from=forward_from, form_node=form_node, original_message=original_message, delayed=delayed, callback=cb) @@ -406,9 +406,8 @@ class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): self._prepare_message(obj.jid, obj.message, obj.keyID, type_=obj.type_, subject=obj.subject, chatstate=obj.chatstate, msg_id=obj.msg_id, - composing_xep=obj.composing_xep, resource=obj.resource, - user_nick=obj.user_nick, xhtml=obj.xhtml, label=obj.label, - session=obj.session, forward_from=obj.forward_from, + resource=obj.resource, user_nick=obj.user_nick, xhtml=obj.xhtml, + label=obj.label, session=obj.session, forward_from=obj.forward_from, form_node=obj.form_node, original_message=obj.original_message, delayed=obj.delayed, callback=cb) |