copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove useless code

Browse source 
Simplify whats left
This commit is contained in:
Philipp Hörist 2017-08-02 23:01:07 +02:00
parent 9d2898bb35
commit a2e2fb2ed1
3 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gajim/common/connection.py
View file

@ -426,15 +426,13 @@ class CommonConnection:
return return
if obj.xhtml and gajim.config.get('log_xhtml_messages'): if obj.xhtml and gajim.config.get('log_xhtml_messages'):
message = '<body xmlns="%s">%s</body>' % (nbxmpp.NS_XHTML, obj.message = '<body xmlns="%s">%s</body>' % (nbxmpp.NS_XHTML,
obj.xhtml) obj.xhtml)
else: if obj.message is None:
message = obj.original_message or obj.message
if not message:
return return
gajim.logger.insert_into_logs(jid, obj.timestamp, obj.kind, gajim.logger.insert_into_logs(jid, obj.timestamp, obj.kind,
message=message, message=obj.message,
subject=obj.subject, subject=obj.subject,
additional_data=obj.additional_data, additional_data=obj.additional_data,
stanza_id=obj.stanza_id) stanza_id=obj.stanza_id)

3
gajim/common/connection_handlers_events.py
View file

@ -2708,7 +2708,7 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent):
def init(self): def init(self):
self.additional_data = None self.additional_data = None
self.message = '' self.message = None
self.keyID = None self.keyID = None
self.type_ = 'chat' self.type_ = 'chat'
self.kind = None self.kind = None
@ -2723,7 +2723,6 @@ class MessageOutgoingEvent(nec.NetworkOutgoingEvent):
self.session = None self.session = None
self.forward_from = None self.forward_from = None
self.form_node = None self.form_node = None
self.original_message = None
self.delayed = None self.delayed = None
self.callback = None self.callback = None
self.callback_args = [] self.callback_args = []

1
gajim/message_control.py
View file

@ -230,7 +230,6 @@ class MessageControl(object):
return return
obj.message = helpers.remove_invalid_xml_chars(obj.message) obj.message = helpers.remove_invalid_xml_chars(obj.message)
obj.original_message = obj.message
conn = gajim.connections[self.account] conn = gajim.connections[self.account]