changeset 3285a344f63b in /home/hg/repos/gajim-plugins
author: lovetox <[email protected]>
branches:
details:gajim-plugins?cmd=changeset;node=3285a344f63b
description: Change all arrows to "=>"
Arrows could not be displayed in a Windows Log file
diffstat:
omemo/__init__.py | 34 +++++++++++++++++-----------------
omemo/omemo/state.py | 2 +-
omemo/ui.py | 6 +++---
omemo/xmpp.py | 6 +++---
4 files changed, 24 insertions(+), 24 deletions(-)
diffs (211 lines):
diff -r e27f5dd8f762 -r 3285a344f63b omemo/__init__.py
--- a/omemo/__init__.py Tue Jun 07 20:19:48 2016 +0200
+++ b/omemo/__init__.py Wed Jun 08 21:04:49 2016 +0200
@@ -134,7 +134,7 @@
def mam_message_received(self, msg):
if msg.msg_.getTag('encrypted', namespace=NS_OMEMO):
account = msg.conn.name
- log.debug(account + ' ⇒ OMEMO MAM msg received')
+ log.debug(account + ' => OMEMO MAM msg received')
log.debug(msg.msg_)
state = self.get_omemo_state(account)
@@ -181,7 +181,7 @@
if msg.stanza.getTag('encrypted', namespace=NS_OMEMO) and \
msg.mtype == 'chat':
account = msg.conn.name
- log.debug(account + ' ⇒ OMEMO msg received')
+ log.debug(account + ' => OMEMO msg received')
state = self.get_omemo_state(account)
if msg.forwarded and msg.sent:
@@ -260,7 +260,7 @@
my_jid = gajim.get_jid_from_account(account_name)
if contact_jid == my_jid:
- log.info(account_name + ' ⇒ Received own device_list:' + str(
+ log.info(account_name + ' => Received own device_list:' + str(
devices_list))
state.set_own_devices(devices_list)
@@ -273,7 +273,7 @@
devices_list.append(state.own_device_id)
self.publish_own_devices_list(account_name, state)
else:
- log.info(account_name + ' ⇒ Received device_list for ' +
+ log.info(account_name + ' => Received device_list for ' +
contact_jid + ':' + str(devices_list))
state.set_devices(contact_jid, devices_list)
if (account_name in self.ui_list and
@@ -295,7 +295,7 @@
devices_list = state.own_devices
devices_list += [state.own_device_id]
- log.debug(account_name + ' ⇒ Publishing own devices_list ' + str(
+ log.debug(account_name + ' => Publishing own devices_list ' + str(
devices_list))
iq = DeviceListAnnouncement(devices_list)
gajim.connections[account_name].connection.send(iq)
@@ -311,12 +311,12 @@
state = self.get_omemo_state(account_name)
my_jid = gajim.get_jid_from_account(account_name)
if contact_jid in state.device_ids or contact_jid == my_jid:
- log.debug(account_name + " ⇒ Adding OMEMO ui for " + contact_jid)
+ log.debug(account_name + " => Adding OMEMO ui for " + contact_jid)
omemo_enabled = state.encryption.is_active(contact_jid)
self.ui_list[account_name][contact_jid] = Ui(self, chat_control,
omemo_enabled, state)
else:
- log.warn(account_name + " ⇒ No OMEMO dev_keys for " + contact_jid)
+ log.warn(account_name + " => No OMEMO dev_keys for " + contact_jid)
def are_keys_missing(self, account_name, contact_jid):
""" Used by the ui to set the state of the PreKeyButton. """
@@ -327,7 +327,7 @@
result += len(state.devices_without_sessions(str(contact_jid)))
result += len(state.own_devices_without_sessions(my_jid))
if result > 0:
- log.warn(account_name + " ⇒ Missing keys for " + contact_jid + ":
" +
+ log.warn(account_name + " => Missing keys for " + contact_jid + ":
" +
str(result))
log.warn('query keys now ...')
self.query_prekey(account_name, contact_jid)
@@ -378,7 +378,7 @@
device_id : int
The device_id for which we are missing an axolotl session
"""
- log.debug(account_name + '→ Fetch bundle device ' + str(device_id) +
+ log.debug(account_name + '=> Fetch bundle device ' + str(device_id) +
'#' + jid)
iq = BundleInformationQuery(jid, device_id)
iq_id = str(iq.getAttr('id'))
@@ -455,7 +455,7 @@
iq = BundleInformationAnnouncement(state.bundle, state.own_device_id)
gajim.connections[account].connection.send(iq)
id_ = str(iq.getAttr("id"))
- log.debug(account + " → Announcing OMEMO support via PEP")
+ log.debug(account + " => Announcing OMEMO support via PEP")
iq_ids_to_callbacks[id_] = lambda stanza: \
self.handle_announcement_result(account, stanza)
@@ -476,14 +476,14 @@
my_jid = gajim.get_jid_from_account(account)
iq = DevicelistQuery(my_jid)
if successful(stanza):
- log.debug(account + ' → Publishing bundle was successful')
+ log.debug(account + ' => Publishing bundle was successful')
gajim.connections[account].connection.send(iq)
- log.debug(account + ' → Querry own Devicelist')
+ log.debug(account + ' => Querry own Devicelist')
id_ = str(iq.getAttr("id"))
iq_ids_to_callbacks[id_] = lambda stanza: \
self.handle_devicelist_result(account, stanza)
else:
- log.error(account + ' → Publishing bundle was NOT successful')
+ log.error(account + ' => Publishing bundle was NOT successful')
@log_calls('OmemoPlugin')
def handle_devicelist_result(self, account, stanza):
@@ -501,7 +501,7 @@
state = self.get_omemo_state(account)
if successful(stanza):
- log.debug(account + ' → Devicelistquery was successful')
+ log.debug(account + ' => Devicelistquery was successful')
devices_list = unpack_device_list_update(stanza, account)
if len(devices_list) == 0:
return False
@@ -517,7 +517,7 @@
devices_list.append(state.own_device_id)
self.publish_own_devices_list(account, state)
else:
- log.error(account + ' → Devicelistquery was NOT successful')
+ log.error(account + ' => Devicelistquery was NOT successful')
self.publish_own_devices_list(account, state)
@log_calls('OmemoPlugin')
@@ -526,7 +526,7 @@
devices_list = [state.own_device_id]
state.set_own_devices(devices_list)
- log.info(account + ' ⇒ Clearing devices_list ' + str(devices_list))
+ log.info(account + ' => Clearing devices_list ' + str(devices_list))
iq = DeviceListAnnouncement(devices_list)
connection = gajim.connections[account].connection
if not connection: # not connected
@@ -556,7 +556,7 @@
event.msg_iq.addChild(node=encrypted_node)
store = Node('store', attrs={'xmlns': NS_HINTS})
event.msg_iq.addChild(node=store)
- log.debug(account + ' → ' + str(event.msg_iq))
+ log.debug(account + ' => ' + str(event.msg_iq))
except:
return True
diff -r e27f5dd8f762 -r 3285a344f63b omemo/omemo/state.py
--- a/omemo/omemo/state.py Tue Jun 07 20:19:48 2016 +0200
+++ b/omemo/omemo/state.py Wed Jun 08 21:04:49 2016 +0200
@@ -177,7 +177,7 @@
key = self.handleWhisperMessage(sender_jid, sid, encrypted_key)
except (NoSessionException, InvalidMessageException) as e:
log.error('No Session found ' + e.message)
- log.error('sender_jid → ' + str(sender_jid) + ' sid =>' + str(
+ log.error('sender_jid => ' + str(sender_jid) + ' sid =>' +
str(
sid))
return
except (DuplicateMessageException) as e:
diff -r e27f5dd8f762 -r 3285a344f63b omemo/ui.py
--- a/omemo/ui.py Tue Jun 07 20:19:48 2016 +0200
+++ b/omemo/ui.py Wed Jun 08 21:04:49 2016 +0200
@@ -59,14 +59,14 @@
def on_click(self, widget):
enabled = self.get_active()
if enabled:
- log.info(self.contact.account.name + ' ⇒ Enable OMEMO for ' +
+ log.info(self.contact.account.name + ' => Enable OMEMO for ' +
self.contact.jid)
self.plugin.omemo_enable_for(self.contact)
self.ui.WarnIfUndecidedFingerprints()
self.chat_control.print_conversation_line(
u'OMEMO encryption enabled ', 'status', '', None)
else:
- log.info(self.contact.account.name + ' ⇒ Disable OMEMO for ' +
+ log.info(self.contact.account.name + ' => Disable OMEMO for ' +
self.contact.jid)
self.plugin.omemo_disable_for(self.contact)
self.ui.refreshAuthLockSymbol()
@@ -107,7 +107,7 @@
if self.checkbox.get_active():
self.checkbox.set_active(False)
else:
- log.info(self.contact.account.name + ' ⇒ Disable OMEMO for ' +
+ log.info(self.contact.account.name + ' => Disable OMEMO for ' +
self.contact.jid)
self.refreshAuthLockSymbol()
self.chat_control.print_conversation_line(
diff -r e27f5dd8f762 -r 3285a344f63b omemo/xmpp.py
--- a/omemo/xmpp.py Tue Jun 07 20:19:48 2016 +0200
+++ b/omemo/xmpp.py Wed Jun 08 21:04:49 2016 +0200
@@ -298,19 +298,19 @@
result = []
if not event_node:
- log.warn(account + ' → Device list update event node empty!')
+ log.warn(account + ' => Device list update event node empty!')
return result
items = event_node.getTag('items', {'node': NS_DEVICE_LIST})
if not items or len(items.getChildren()) != 1:
log.debug(
account +
- ' → Device list update items node empty or not omemo device
update')
+ ' => Device list update items node empty or not omemo device
update')
return result
list_node = items.getChildren()[0].getTag('list')
if not list_node or len(list_node.getChildren()) == 0:
- log.warn(account + ' → Device list update list node empty!')
+ log.warn(account + ' => Device list update list node empty!')
return result
devices_nodes = list_node.getChildren()
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
