Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/common/zeroconf/connection_zeroconf.py')
-rw-r--r--src/common/zeroconf/connection_zeroconf.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/zeroconf/connection_zeroconf.py b/src/common/zeroconf/connection_zeroconf.py
index 283b3ab5b..c3e01de1b 100644
--- a/src/common/zeroconf/connection_zeroconf.py
+++ b/src/common/zeroconf/connection_zeroconf.py
@@ -360,7 +360,7 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
def get_status(self):
return STATUS_LIST[self.connected]
- def send_message(self, jid, msg, keyID, type = 'chat', subject='',
+ def send_message(self, jid, msg, keyID, type_ = 'chat', subject='',
chatstate = None, msg_id = None, composing_xep = None, resource = None,
user_nick = None, session=None, forward_from=None, form_node=None, original_message=None):
fjid = jid
@@ -396,8 +396,8 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
self.dispatch('MSGNOTSENT', (jid, error, msgtxt, tim, session))
return 3
- if type == 'chat':
- msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type)
+ if type_ == 'chat':
+ msg_iq = common.xmpp.Message(to = fjid, body = msgtxt, typ = type_)
else:
if subject:
@@ -445,7 +445,7 @@ class ConnectionZeroconf(ConnectionHandlersZeroconf):
log_msg = _('Subject: %(subject)s\n%(message)s') % \
{'subject': subject, 'message': msg}
if log_msg:
- if type == 'chat':
+ if type_ == 'chat':
kind = 'chat_msg_sent'
else:
kind = 'single_msg_sent'