Commits June 2015

commits@gajim.org

1 participants
6 discussions

gajim: add jid to NotificationEvent for groupchat messages
by Gajim 20 Jun '15

20 Jun '15

changeset c87b83e2ed1f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=c87b83e2ed1f description: add jid to NotificationEvent for groupchat messages diffstat: src/common/connection_handlers_events.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r befdb44a7c2c -r c87b83e2ed1f src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun May 17 22:38:26 2015 +0200 +++ b/src/common/connection_handlers_events.py Sat Jun 20 21:30:48 2015 +0200 @@ -2373,6 +2373,7 @@ if not msg_obj.msg_obj.gc_control: # we got a message from a room we're not in? ignore it return + self.jid = msg_obj.jid sound = msg_obj.msg_obj.gc_control.highlighting_for_message( msg_obj.msgtxt, msg_obj.timestamp)[1]

1 0

gajim-plugins: handle groupchat messages
by Gajim Plugins 20 Jun '15

20 Jun '15

changeset 9fa9ce820249 in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=9fa9ce820249 description: handle groupchat messages diffstat: triggers/manifest.ini | 2 +- triggers/triggers.py | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diffs (67 lines): diff -r 61639c5a7019 -r 9fa9ce820249 triggers/manifest.ini --- a/triggers/manifest.ini Mon Apr 06 19:17:39 2015 +0300 +++ b/triggers/manifest.ini Sat Jun 20 21:26:53 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Triggers short_name: triggers -version: 0.0.7 +version: 0.0.8 description: Configure Gajim's behaviour for each contact authors: Yann Leboulanger <asterix(a)lagaule.org> homepage: http://trac-plugins.gajim.org/wiki/TriggersPlugin diff -r 61639c5a7019 -r 9fa9ce820249 triggers/triggers.py --- a/triggers/triggers.py Mon Apr 06 19:17:39 2015 +0300 +++ b/triggers/triggers.py Sat Jun 20 21:26:53 2015 +0200 @@ -36,16 +36,22 @@ @log_calls('TriggersPlugin') def init(self): + self.description = _('Configure Gajim\'s behaviour for each contact') self.config_dialog = TriggersPluginConfigDialog(self) self.config_default_values = {} self.events_handlers = {'notification': (ged.PREGUI, self._nec_notif), 'decrypted-message-received': (ged.PREGUI2, self._nec_decrypted_message_received), + 'gc-message-received': (ged.PREGUI2, self._nec_gc_message_received), 'presence-received': (ged.PREGUI, self._nec_presence_received)} def _check_rule_recipients(self, obj, rule): rule_recipients = [t.strip() for t in rule['recipients'].split(',')] + if rule['recipient_type'] == 'groupchat': + if obj.jid in rule_recipients: + return True + return False if rule['recipient_type'] == 'contact' and obj.jid not in \ rule_recipients: return False @@ -107,7 +113,7 @@ def check_rule_apply_notif(self, obj, rule): # Check notification type notif_type = '' - if obj.notif_type == 'msg': + if obj.notif_type in ('msg', 'gc-msg'): notif_type = 'message_received' elif obj.notif_type == 'pres': if obj.base_event.old_show < 2 and obj.base_event.new_show > 1: @@ -210,6 +216,10 @@ self._nec_all(obj, self.check_rule_apply_decrypted_msg, self.apply_rule_decrypted_message) + def _nec_gc_message_received(self, obj): + self._nec_all(obj, self.check_rule_apply_decrypted_msg, + self.apply_rule_decrypted_message) + def _nec_presence_received(self, obj): if obj.old_show < 2 and obj.new_show > 1: check_func = self.check_rule_apply_connected @@ -232,7 +242,7 @@ 'use_roster_cb', 'disable_roster_cb'] #, 'gc_msg_highlight': [], 'gc_msg': []} } - recipient_types_list = ['contact', 'group', 'all'] + recipient_types_list = ['contact', 'group', 'groupchat', 'all'] config_options = ['event', 'recipient_type', 'recipients', 'status', 'tab_opened', 'sound', 'sound_file', 'popup', 'auto_open', 'run_command', 'command', 'systray', 'roster', 'urgency_hint',

1 0

python-nbxmpp: stop using decode string method in py3 in other p...
by Python-nbxmpp 20 Jun '15

20 Jun '15

changeset 1ac6e9a303a7 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=1ac6e9a303a7 description: stop using decode string method in py3 in other places diffstat: nbxmpp/transports_nb.py | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diffs (70 lines): diff -r 6f86fbe3f1a2 -r 1ac6e9a303a7 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Jun 14 10:38:49 2015 -0400 +++ b/nbxmpp/transports_nb.py Sat Jun 20 07:54:12 2015 -0400 @@ -87,8 +87,10 @@ def decode_py2(string, encoding): # decodes string into unicode if in py2 # py3 has unicode strings by default - if sys.version_info[0] < 3: - return string.decode(encoding) + try: + string = string.decode(encoding) + except AttributeError: + pass return string #: timeout to connect to the server socket, it doesn't include auth @@ -482,7 +484,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - errstr = e.strerror.decode(locale.getpreferredencoding()) + errstr = decode_py2(e.strerror, locale.getpreferredencoding()) log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -577,7 +579,7 @@ self.sent_bytes_buff = b'' # try to decode sent data try: - sent_data = sent_data.decode('utf-8') + sent_data = decode_py2(sent_data, 'utf-8') except UnicodeDecodeError: for i in range(-1, -4, -1): char = sent_data[i] @@ -585,7 +587,7 @@ self.sent_bytes_buff = sent_data[i:] sent_data = sent_data[:i] break - sent_data = sent_data.decode('utf-8') + sent_data = decode_py2(sent_data, 'utf-8') self.raise_event(DATA_SENT, sent_data) except Exception: @@ -611,7 +613,7 @@ log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) errnum, errstr = e.errno,\ - e.strerror.decode(locale.getpreferredencoding()) + decode_py2(e.strerror, locale.getpreferredencoding()) if received == '': errstr = 'zero bytes on recv' @@ -647,7 +649,7 @@ # try to decode data try: - received = received.decode('utf-8') + received = decode_py2(received, 'utf-8') except UnicodeDecodeError: for i in range(-1, -4, -1): char = received[i] @@ -657,7 +659,7 @@ self.received_bytes_buff = received[i:] received = received[:i] break - received = received.decode('utf-8') + received = decode_py2(received, 'utf-8') # pass received data to owner if self.on_receive:

1 0

python-nbxmpp: stop using decode string method in py3
by Python-nbxmpp 14 Jun '15

14 Jun '15

changeset 6f86fbe3f1a2 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=6f86fbe3f1a2 description: stop using decode string method in py3 diffstat: nbxmpp/transports_nb.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (28 lines): diff -r 9cbf8b322d8b -r 6f86fbe3f1a2 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sun Jun 14 14:32:21 2015 +0200 +++ b/nbxmpp/transports_nb.py Sun Jun 14 10:38:49 2015 -0400 @@ -84,6 +84,13 @@ proxy_user, proxy_pass = proxy['user'], proxy['pass'] return tcp_host, tcp_port, proxy_user, proxy_pass +def decode_py2(string, encoding): + # decodes string into unicode if in py2 + # py3 has unicode strings by default + if sys.version_info[0] < 3: + return string.decode(encoding) + return string + #: timeout to connect to the server socket, it doesn't include auth CONNECT_TIMEOUT_SECONDS = 30 @@ -371,8 +378,8 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno,\ - exc.strerror.decode(locale.getpreferredencoding()) + errnum, errstr = exc.errno, \ + decode_py2(exc.strerror, locale.getpreferredencoding()) if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress

1 0

python-nbxmpp: [Florob] fix a type issue with pyopenssl 0.15.1. ...
by Python-nbxmpp 14 Jun '15

14 Jun '15

changeset 9cbf8b322d8b in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=9cbf8b322d8b description: [Florob] fix a type issue with pyopenssl 0.15.1. Fixes #33 diffstat: nbxmpp/auth_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 398e3c8055a3 -r 9cbf8b322d8b nbxmpp/auth_nb.py --- a/nbxmpp/auth_nb.py Sun May 10 14:54:16 2015 +0200 +++ b/nbxmpp/auth_nb.py Sun Jun 14 14:32:21 2015 +0200 @@ -422,7 +422,7 @@ r = 'c=' + scram_base64(self.scram_gs2) else: # Channel binding data goes in here too. - r = 'c=' + scram_base64(self.scram_gs2 + r = 'c=' + scram_base64(bytes(self.scram_gs2) + self.channel_binding) r += ',r=' + data['r'] self.scram_soup += r

1 0

gajim-website: fix typo
by Gajim Website 04 Jun '15

04 Jun '15

changeset dc44ec9bfe09 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=dc44ec9bfe09 description: fix typo diffstat: locale/fr_FR/LC_MESSAGES/msg.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 387c4d4e41fd -r dc44ec9bfe09 locale/fr_FR/LC_MESSAGES/msg.po --- a/locale/fr_FR/LC_MESSAGES/msg.po Sat Feb 28 22:58:13 2015 +0100 +++ b/locale/fr_FR/LC_MESSAGES/msg.po Thu Jun 04 09:37:28 2015 +0200 @@ -278,7 +278,7 @@ #: downloads.php:14 msgid "you are advised to use the " -msgstr "il est conseillé d'utiliser l'" +msgstr "il est conseillé d'utiliser les " #: downloads.php:103 #, c-format

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits June 2015