Commits May 2016

commits@gajim.org

1 participants
30 discussions

gajim-plugins: Replace omemo symlink with actual files
by Gajim Plugins 03 May '16

03 May '16

changeset c66c6d9161d2 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=c66c6d9161d2 description: Replace omemo symlink with actual files This solves issues for our windows friends diffstat: omemo/lib/python-omemo/src/omemo/__init__.py | 1 - omemo/lib/python-omemo/src/omemo/aes_gcm.py | 160 ------ omemo/lib/python-omemo/src/omemo/db_helpers.py | 13 - omemo/lib/python-omemo/src/omemo/encryption.py | 95 ---- omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py | 130 ----- omemo/lib/python-omemo/src/omemo/liteidentitykeystore.py | 76 --- omemo/lib/python-omemo/src/omemo/liteprekeystore.py | 72 --- omemo/lib/python-omemo/src/omemo/litesessionstore.py | 88 --- omemo/lib/python-omemo/src/omemo/litesignedprekeystore.py | 77 --- omemo/lib/python-omemo/src/omemo/state.py | 332 -------------- omemo/omemo | 1 - omemo/omemo/__init__.py | 1 + omemo/omemo/aes_gcm.py | 160 ++++++ omemo/omemo/db_helpers.py | 13 + omemo/omemo/encryption.py | 95 ++++ omemo/omemo/liteaxolotlstore.py | 130 +++++ omemo/omemo/liteidentitykeystore.py | 76 +++ omemo/omemo/liteprekeystore.py | 72 +++ omemo/omemo/litesessionstore.py | 88 +++ omemo/omemo/litesignedprekeystore.py | 77 +++ omemo/omemo/state.py | 332 ++++++++++++++ 21 files changed, 1044 insertions(+), 1045 deletions(-) diffs (truncated from 2174 to 300 lines): diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/__init__.py --- a/omemo/lib/python-omemo/src/omemo/__init__.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -__version__ = "0.1.0" diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/aes_gcm.py --- a/omemo/lib/python-omemo/src/omemo/aes_gcm.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,160 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2014 Jonathan Zdziarski <jonathan(a)zdziarski.com> -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its contributors -# may be used to endorse or promote products derived from this software without -# specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -import logging -from struct import pack, unpack - -from Crypto.Cipher import AES -from Crypto.Util import strxor - -log = logging.getLogger('gajim.plugin_system.omemo') - - -def gcm_rightshift(vec): - for x in range(15, 0, -1): - c = vec[x] >> 1 - c |= (vec[x - 1] << 7) & 0x80 - vec[x] = c - vec[0] >>= 1 - return vec - - -def gcm_gf_mult(a, b): - mask = [0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01] - poly = [0x00, 0xe1] - - Z = [0] * 16 - V = [c for c in a] - - for x in range(128): - if b[x >> 3] & mask[x & 7]: - Z = [V[y] ^ Z[y] for y in range(16)] - bit = V[15] & 1 - V = gcm_rightshift(V) - V[0] ^= poly[bit] - return Z - - -def ghash(h, auth_data, data): - u = (16 - len(data)) % 16 - v = (16 - len(auth_data)) % 16 - - x = auth_data + chr(0) * v + data + chr(0) * u - x += pack('>QQ', len(auth_data) * 8, len(data) * 8) - - y = [0] * 16 - vec_h = [ord(c) for c in h] - - for i in range(0, len(x), 16): - block = [ord(c) for c in x[i:i + 16]] - y = [y[j] ^ block[j] for j in range(16)] - y = gcm_gf_mult(y, vec_h) - - return ''.join(chr(c) for c in y) - - -def inc32(block): - counter, = unpack('>L', block[12:]) - counter += 1 - return block[:12] + pack('>L', counter) - - -def gctr(k, icb, plaintext): - y = '' - if len(plaintext) == 0: - return y - - aes = AES.new(k) - cb = icb - - for i in range(0, len(plaintext), aes.block_size): - cb = inc32(cb) - encrypted = aes.encrypt(cb) - plaintext_block = plaintext[i:i + aes.block_size] - y += strxor.strxor(plaintext_block, encrypted[:len(plaintext_block)]) - - return y - - -def gcm_decrypt(k, iv, encrypted, auth_data, tag): - aes = AES.new(k) - h = aes.encrypt(chr(0) * aes.block_size) - - if len(iv) == 12: - y0 = iv + "\x00\x00\x00\x01" - else: - y0 = ghash(h, '', iv) - - decrypted = gctr(k, y0, encrypted) - s = ghash(h, auth_data, encrypted) - - t = aes.encrypt(y0) - T = strxor.strxor(s, t) - if T != tag: - raise ValueError('Decrypted data is invalid') - else: - return decrypted - - -def gcm_encrypt(k, iv, plaintext, auth_data): - aes = AES.new(k) - h = aes.encrypt(chr(0) * aes.block_size) - - if len(iv) == 12: - y0 = iv + "\x00\x00\x00\x01" - else: - y0 = ghash(h, '', iv) - - encrypted = gctr(k, y0, plaintext) - s = ghash(h, auth_data, encrypted) - - t = aes.encrypt(y0) - T = strxor.strxor(s, t) - return (encrypted, T) - - -def aes_encrypt(key, nonce, plaintext): - """ Use AES128 GCM with the given key and iv to encrypt the payload. """ - c, t = gcm_encrypt(key, nonce, plaintext, '') - result = c + t - log.info(result) - return result - - -def aes_decrypt(key, nonce, payload): - """ Use AES128 GCM with the given key and iv to decrypt the payload. """ - ciphertext = payload[:-16] - mac = payload[-16:] - return gcm_decrypt(key, nonce, ciphertext, '', mac) - - -class NoValidSessions(Exception): - pass diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/db_helpers.py --- a/omemo/lib/python-omemo/src/omemo/db_helpers.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ - -def table_exists(db, name): - """ Check if the specified table exists in the db. """ - - q = """ SELECT name FROM sqlite_master - WHERE type='table' AND name=?; - """ - return db.execute(q, (name, )).fetchone() is not None - - -def user_version(db): - """ Return the value of PRAGMA user_version. """ - return db.execute('PRAGMA user_version').fetchone()[0] diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/encryption.py --- a/omemo/lib/python-omemo/src/omemo/encryption.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,95 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2015 Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> -# Copyright 2015 Daniel Gultsch <daniel(a)cgultsch.de> -# -# This file is part of Gajim-OMEMO plugin. -# -# The Gajim-OMEMO plugin is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) any -# later version. -# -# Gajim-OMEMO is distributed in the hope that it will be useful, but WITHOUT ANY -# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR -# A PARTICULAR PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License along with -# the Gajim-OMEMO plugin. If not, see <http://www.gnu.org/licenses/>. -# - -from .db_helpers import table_exists, user_version - - -class EncryptionState(): - """ Used to store if OMEMO is enabled or not between gajim restarts """ - - def __init__(self, dbConn): - """ - :type dbConn: Connection - """ - self.dbConn = migrate(dbConn) - - def activate(self, jid): - q = """INSERT OR REPLACE INTO encryption_state (jid, encryption) - VALUES (?, 1) """ - - c = self.dbConn.cursor() - c.execute(q, (jid, )) - self.dbConn.commit() - - def deactivate(self, jid): - q = """INSERT OR REPLACE INTO encryption_state (jid, encryption) - VALUES (?, 0)""" - - c = self.dbConn.cursor() - c.execute(q, (jid, )) - self.dbConn.commit() - - def is_active(self, jid): - q = 'SELECT encryption FROM encryption_state where jid = ?;' - c = self.dbConn.cursor() - c.execute(q, (jid, )) - result = c.fetchone() - if result is None: - return False - return result[0] == 1 - - -def migrate(dbConn): - """ Creates the encryption_state table and migrates it if needed. - """ - if user_version(dbConn) == 0: - create_table = """ CREATE TABLE encryption_state ( - id INTEGER PRIMARY KEY AUTOINCREMENT, - jid TEXT UNIQUE, - encryption INTEGER, - timestamp NUMBER DEFAULT CURRENT_TIMESTAMP - ); - """ - - if table_exists(dbConn, 'encryption_state'): - # Given a database which already has `encryption_state` and has - # `user_version` 0, we assume the database needs migration and - # migrate it to add an `ID INTEGER AUTOINCREMENT` column - migrate_sql = """ - BEGIN TRANSACTION; - ALTER TABLE encryption_state RENAME TO encryption_state_back; - %s - INSERT INTO encryption_state(jid, encryption, timestamp) - SELECT jid, encryption, timestamp FROM encryption_state_back; - DROP TABLE encryption_state_back; - PRAGMA user_version=1; - END TRANSACTION ; - """ % (create_table) - dbConn.executescript(migrate_sql) - else: - # The database has `user_version` 0 and has no `encryption_state - # table, so crate it! - dbConn.executescript(""" BEGIN TRANSACTION; - %s - PRAGMA user_version=1; - END TRANSACTION; - """ % (create_table)) - - return dbConn diff -r 1dcdf1104bac -r c66c6d9161d2 omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py --- a/omemo/lib/python-omemo/src/omemo/liteaxolotlstore.py Mon Apr 25 05:51:43 2016 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,130 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright 2015 Tarek Galal <tare2.galal(a)gmail.com> -# -# This file is part of Gajim-OMEMO plugin. -# -# The Gajim-OMEMO plugin is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) any -# later version. -#

1 0

gajim-plugins: Fix some formatting
by Gajim Plugins 03 May '16

03 May '16

changeset 1dcdf1104bac in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=1dcdf1104bac description: Fix some formatting diffstat: omemo/__init__.py | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diffs (59 lines): diff -r 586934b4a3c1 -r 1dcdf1104bac omemo/__init__.py --- a/omemo/__init__.py Mon Apr 25 05:17:27 2016 +0200 +++ b/omemo/__init__.py Mon Apr 25 05:51:43 2016 +0200 @@ -22,6 +22,7 @@ import os import sqlite3 +# pylint: disable=import-error from common import caps_cache, gajim, ged from common.pep import SUPPORTED_PERSONAL_USER_EVENTS from plugins import GajimPlugin @@ -33,6 +34,7 @@ DeviceListAnnouncement, DevicelistPEP, OmemoMessage, successful, unpack_device_bundle, unpack_device_list_update, unpack_message) + iq_ids_to_callbacks = {} AXOLOTL_MISSING = 'Please install python-axolotl.' @@ -49,6 +51,7 @@ class OmemoPlugin(GajimPlugin): + # pylint: disable=no-init omemo_states = {} @@ -69,8 +72,7 @@ (ged.PRECORE, self.handle_outgoing_msgs), } self.config_dialog = None - self.gui_extension_points = {'chat_control': - (self.connect_ui, None)} + self.gui_extension_points = {'chat_control': (self.connect_ui, None)} SUPPORTED_PERSONAL_USER_EVENTS.append(DevicelistPEP) @log_calls('OmemoPlugin') @@ -307,8 +309,8 @@ device_id : int The device_id for which we are missing an axolotl session """ - log.debug(account_name + '→ Fetch bundle device ' + str(device_id) + '#' - + jid) + log.debug(account_name + '→ Fetch bundle device ' + str(device_id) + + '#' + jid) iq = BundleInformationQuery(jid, device_id) iq_id = str(iq.getAttr('id')) iq_ids_to_callbacks[iq_id] = \ @@ -455,8 +457,8 @@ if not state.encryption.is_active(to_jid): return False try: - msg_dict = state.create_msg(gajim.get_jid_from_account(account), - to_jid, plaintext) + msg_dict = state.create_msg( + gajim.get_jid_from_account(account), to_jid, plaintext) if not msg_dict: return True encrypted_node = OmemoMessage(msg_dict)

1 0

gajim-plugins: Extend CHANGELOG
by Gajim Plugins 03 May '16

03 May '16

changeset 140f993231bc in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=140f993231bc description: Extend CHANGELOG diffstat: omemo/CHANGELOG | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (12 lines): diff -r c66c6d9161d2 -r 140f993231bc omemo/CHANGELOG --- a/omemo/CHANGELOG Mon May 02 03:16:53 2016 +0200 +++ b/omemo/CHANGELOG Mon May 02 03:22:24 2016 +0200 @@ -1,3 +1,8 @@ +0.5 / 2016-05-02 +================ +- Add Windows support +- Fix bugs + 0.4 / 2016-01-21 ==================

1 0

gajim-plugins: Manifest bump version — #58
by Gajim Plugins 03 May '16

03 May '16

changeset e89baf64da56 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=e89baf64da56 description: Manifest bump version — #58 diffstat: omemo/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 140f993231bc -r e89baf64da56 omemo/manifest.ini --- a/omemo/manifest.ini Mon May 02 03:22:24 2016 +0200 +++ b/omemo/manifest.ini Tue May 03 18:33:45 2016 +0200 @@ -1,7 +1,7 @@ [info] name: OMEMO Multi-End Message and Object Encryption short_name: omemo -version: 0.4 +version: 0.5.1 description: OMEMO is an XMPP Extension Protocol (XEP) for secure multi-client end-to-end encryption based on Axolotl and PEP. You need to install python-axolotl via pip to run this plugin. authors: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de>, Daniel Gultsch <daniel(a)gultsch.de>

1 0

gajim: rmdir dn't always work on the first time ...
by Gajim 01 May '16

01 May '16

changeset 57f171136f0d 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=57f171136f0d description: rmdir dn't always work on the first time ... diffstat: build.bat | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 9cd1fe5026e8 -r 57f171136f0d build.bat --- a/build.bat Sun May 01 20:54:44 2016 +0200 +++ b/build.bat Sun May 01 20:55:21 2016 +0200 @@ -1,3 +1,4 @@ +rmdir /S /Q gajim_built rmdir /S /Q gajim_built mkdir gajim_built @@ -37,4 +38,4 @@ "C:\Program Files (x86)\NSIS\makensis" gajim.nsi -cd .. \ No newline at end of file +cd ..

1 0

gajim: add PIL and axolotl to windows installer
by Gajim 01 May '16

01 May '16

changeset 9cd1fe5026e8 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=9cd1fe5026e8 description: add PIL and axolotl to windows installer diffstat: gajim.nsi | 11 ++++++++++- setup_win32.py | 4 ++-- 2 files changed, 12 insertions(+), 3 deletions(-) diffs (50 lines): diff -r 9cacfaf1a747 -r 9cd1fe5026e8 gajim.nsi --- a/gajim.nsi Sun May 01 20:50:32 2016 +0200 +++ b/gajim.nsi Sun May 01 20:54:44 2016 +0200 @@ -163,6 +163,7 @@ File "bin\_sqlite3.pyd" File "bin\_ssl.pyd" File "bin\atk.pyd" + File "bin\axolotl_curve25519.pyd" File "bin\bz2.pyd" File "bin\cairo._cairo.pyd" File "bin\Crypto.Cipher._AES.pyd" @@ -185,6 +186,7 @@ File "bin\gst.interfaces.pyd" File "bin\gtk._gtk.pyd" File "bin\history_manager.exe" + File "bin\libcurl.dll" File "bin\libeay32.dll" File "bin\libgoocanvas-3.dll" File "bin\library.zip" @@ -192,7 +194,14 @@ File "bin\libxmlmods.libxml2mod.pyd" File "bin\pangocairo.pyd" File "bin\pango.pyd" - File "bin\pycurl.pyd" + File "bin\PIL._imaging.pyd" + File "bin\PIL._imagingcms.pyd" + File "bin\PIL._imagingft.pyd" + File "bin\PIL._imagingmath.pyd" + File "bin\PIL._imagingmorph.pyd" + File "bin\PIL._imagingtk.pyd" + File "bin\PIL._webp.pyd" + File "bin\pycurl.pyd" File "bin\pyexpat.pyd" File "bin\python27.dll" File "bin\pythoncom27.dll" diff -r 9cacfaf1a747 -r 9cd1fe5026e8 setup_win32.py --- a/setup_win32.py Sun May 01 20:50:32 2016 +0200 +++ b/setup_win32.py Sun May 01 20:54:44 2016 +0200 @@ -33,9 +33,9 @@ 'build_exe': { 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', - 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser'], + 'numbers', 'win32com.client', 'win32com.server', 'HTMLParser', 'pkg_resources'], 'base': 'Win32GUI', - 'packages': ['cffi', 'cryptography'], + 'packages': ['cffi', 'cryptography', 'PIL', 'axolotl', 'google'], 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',

1 0

gajim: remove notworking crypto thing under windows
by Gajim 01 May '16

01 May '16

changeset 9cacfaf1a747 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=9cacfaf1a747 description: remove notworking crypto thing under windows diffstat: src/common/crypto.py | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diffs (13 lines): diff -r 0d3d8e5b03e1 -r 9cacfaf1a747 src/common/crypto.py --- a/src/common/crypto.py Sun May 01 20:49:05 2016 +0200 +++ b/src/common/crypto.py Sun May 01 20:50:32 2016 +0200 @@ -89,9 +89,6 @@ for s in sources: OpenSSL.rand.add(str(s), 1) - # On Windows add the current contents of the screen to the PRNG state. - if os.name == 'nt': - OpenSSL.rand.screen() # The /proc filesystem on POSIX systems contains many random variables: # memory statistics, interrupt counts, network packet counts if os.name == 'posix':

1 0

gajim: missing part of previous commit: Fix decoding GPG messages
by Gajim 01 May '16

01 May '16

changeset 0d3d8e5b03e1 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=0d3d8e5b03e1 description: missing part of previous commit: Fix decoding GPG messages diffstat: src/common/connection_handlers.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 9b99422d9cf8 -r 0d3d8e5b03e1 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun May 01 20:46:48 2016 +0200 +++ b/src/common/connection_handlers.py Sun May 01 20:49:05 2016 +0200 @@ -1092,8 +1092,7 @@ decmsg = self.gpg.decrypt(encmsg, keyID) decmsg = self.connection.Dispatcher.replace_non_character(decmsg) # \x00 chars are not allowed in C (so in GTK) - obj.msgtxt = decmsg.replace('\x00', '').encode( - locale.getpreferredencoding()).decode('utf-8') + obj.msgtxt = decmsg.replace('\x00', '').decode('utf-8') obj.encrypted = 'xep27' self.gpg_messages_to_decrypt.remove([encmsg, keyID, obj])

1 0

gajim: fix decoding GPG messages.
by Gajim 01 May '16

01 May '16

changeset 9b99422d9cf8 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=9b99422d9cf8 description: fix decoding GPG messages. diffstat: src/common/gnupg.py | 6 ++---- src/common/gpg.py | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diffs (44 lines): diff -r 36cecfcc49f3 -r 9b99422d9cf8 src/common/gnupg.py --- a/src/common/gnupg.py Sat Apr 30 14:55:12 2016 +0200 +++ b/src/common/gnupg.py Sun May 01 20:46:48 2016 +0200 @@ -796,10 +796,8 @@ si = STARTUPINFO() si.dwFlags = STARTF_USESHOWWINDOW si.wShowWindow = SW_HIDE - env = os.environ - env['LANG'] = 'C' return Popen(cmd, shell=False, stdin=PIPE, stdout=PIPE, stderr=PIPE, - env=env, startupinfo=si) + startupinfo=si) def _read_response(self, stream, result): # Internal method: reads all the stderr output from GPG, taking notice @@ -1139,7 +1137,7 @@ # Get the response information result = self.result_map[kind](self) self._collect_output(p, result, stdin=p.stdin) - lines = result.data.decode(self.encoding, + lines = result.data.decode('utf-8', self.decode_errors).splitlines() valid_keywords = 'pub uid sec fpr sub ssb sig'.split() for line in lines: diff -r 36cecfcc49f3 -r 9b99422d9cf8 src/common/gpg.py --- a/src/common/gpg.py Sat Apr 30 14:55:12 2016 +0200 +++ b/src/common/gpg.py Sun May 01 20:46:48 2016 +0200 @@ -24,6 +24,7 @@ from gajim import HAVE_GPG, GPG_BINARY import os +import locale if HAVE_GPG: import gnupg @@ -31,7 +32,7 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): gnupg.GPG.__init__(self, gpgbinary=GPG_BINARY) - self.encoding = 'utf-8' + self.encoding = locale.getpreferredencoding() self.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent

1 0

gajim-plugins: [Latex] Correctly delete TextTag when unloading t...
by Gajim Plugins 01 May '16

01 May '16

changeset eb475e715cbd in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=eb475e715cbd description: [Latex] Correctly delete TextTag when unloading the plugin. Fixes #98 diffstat: latex/latex.py | 8 ++++++-- latex/manifest.ini | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diffs (36 lines): diff -r f0d3759795e1 -r eb475e715cbd latex/latex.py --- a/latex/latex.py Mon Apr 18 03:03:38 2016 +0200 +++ b/latex/latex.py Sun May 01 14:34:40 2016 +0200 @@ -407,7 +407,7 @@ self.latex_tag = gtk.TextTag('latex') self.latex_tag.set_property('foreground', 'blue') self.latex_tag.set_property('underline', 'single') - d['tag_id'] = self.latex_tag.connect('event', self.textview_event_after) + self.latex_tag.connect('event', self.textview_event_after) tb.get_tag_table().add(self.latex_tag) d['h_id'] = tb.connect('changed', self.textbuffer_live_latex_expander) @@ -418,6 +418,10 @@ def disconnect_from_chat_control_base(self, chat_control): d = chat_control.latexs_expander_plugin_data tv = chat_control.conv_textview.tv + tb = tv.get_buffer() tv.get_buffer().disconnect(d['h_id']) - self.latex_tag.disconnect(d['tag_id']) + tag_table = tb.get_tag_table() + tt = tag_table.lookup('latex') + if tt: + tag_table.remove(tt) diff -r f0d3759795e1 -r eb475e715cbd latex/manifest.ini --- a/latex/manifest.ini Mon Apr 18 03:03:38 2016 +0200 +++ b/latex/manifest.ini Sun May 01 14:34:40 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Latex short_name: latex -version: 0.2.2 +version: 0.2.3 description: Invoke Latex to render $$foobar$$ sourrounded Latex equations. Needs latex and dvipng or ImageMagick. authors: Yves Fischer <yvesf(a)xapek.org> Yann Leboulanger <asterix(a)lagaule.org>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2016