Commits June 2012

commits@gajim.org

4 participants
49 discussions

gajim: fix typo. Fixes #7161
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 239ec662de5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=239ec662de5a description: fix typo. Fixes #7161 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 551f7d62600e -r 239ec662de5a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Wed Jun 13 17:17:45 2012 +0400 +++ b/src/common/connection_handlers.py Sat Jun 16 13:51:54 2012 +0200 @@ -1994,7 +1994,7 @@ def _StreamCB(self, con, iq_obj): log.debug('StreamCB') gajim.nec.push_incoming_event(StreamReceivedEvent(None, - conn=self, stanza=iq_obj)) + conn=self, stanza=obj)) def _register_handlers(self, con, con_type): # try to find another way to register handlers in each class

1 0

gajim: [Schnouki ] using paint_shadow() rather than paint_flat_b...
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 551f7d62600e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=551f7d62600e description: [Schnouki ] using paint_shadow() rather than paint_flat_box() to add these borders/shadows. Fixes #5899 diffstat: src/tooltips.py | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diffs (20 lines): diff -r e3bb1938d448 -r 551f7d62600e src/tooltips.py --- a/src/tooltips.py Wed May 30 08:30:49 2012 +0200 +++ b/src/tooltips.py Wed Jun 13 17:17:45 2012 +0400 @@ -135,14 +135,8 @@ def expose(self, widget, event): style = self.win.get_style() size = self.win.get_size() - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', 0, 0, -1, 1) - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', 0, size[1] - 1, -1, 1) - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', 0, 0, 1, -1) - style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, - None, self.win, 'tooltip', size[0] - 1, 0, 1, -1) + style.paint_shadow(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, + None, self.win, 'tooltip', 0, 0, size[0], size[1]) return True def show_tooltip(self, data, widget_height, widget_y_position):

1 0

gajim: don't crash when there are non-ascii chars in gpg keys list
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset e3bb1938d448 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e3bb1938d448 description: don't crash when there are non-ascii chars in gpg keys list diffstat: src/common/gpg.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 4a0e9afc56f3 -r e3bb1938d448 src/common/gpg.py --- a/src/common/gpg.py Fri May 18 16:58:51 2012 +0200 +++ b/src/common/gpg.py Wed May 30 08:30:49 2012 +0200 @@ -31,6 +31,7 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): gnupg.GPG.__init__(self) + gnupg.GPG.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent self.always_trust = False

1 0

gajim: fix threads problem in OpenBSD. Fixes #7154
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 3997ab204178 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3997ab204178 description: fix threads problem in OpenBSD. Fixes #7154 diffstat: src/gajim.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 10f1f986a00b -r 3997ab204178 src/gajim.py --- a/src/gajim.py Tue Apr 24 14:18:54 2012 +0400 +++ b/src/gajim.py Wed May 09 12:16:48 2012 +0400 @@ -454,6 +454,9 @@ # This makes Gajim unusable under windows, and threads are used only # for GPG, so not under windows gtk.gdk.threads_init() + gtk.gdk.threads_enter() gtk.main() + if os.name != 'nt': + gtk.gdk.threads_leave() except KeyboardInterrupt: print >> sys.stderr, 'KeyboardInterrupt'

1 0

gajim: update python-gnupg to 0.3.0 + add KEYEXPIRED support. Fi...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 4a0e9afc56f3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4a0e9afc56f3 description: update python-gnupg to 0.3.0 + add KEYEXPIRED support. Fixes #7151 diffstat: src/common/gnupg.py | 1190 ++++++++++++++++++++++++++------------------------ src/common/gpg.py | 4 +- 2 files changed, 622 insertions(+), 572 deletions(-) diffs (truncated from 1364 to 300 lines): diff -r 3997ab204178 -r 4a0e9afc56f3 src/common/gnupg.py --- a/src/common/gnupg.py Wed May 09 12:16:48 2012 +0400 +++ b/src/common/gnupg.py Fri May 18 16:58:51 2012 +0200 @@ -27,25 +27,22 @@ and so does not work on Windows). Renamed to gnupg.py to avoid confusion with the previous versions. -Modifications Copyright (C) 2008-2011 Vinay Sajip. All rights reserved. +Modifications Copyright (C) 2008-2012 Vinay Sajip. All rights reserved. A unittest harness (test_gnupg.py) has also been added. """ import locale +__version__ = "0.3.0" __author__ = "Vinay Sajip" -__date__ = "$25-Jan-2011 11:40:48$" +__date__ = "$12-May-2012 10:49:10$" try: from io import StringIO - from io import TextIOWrapper - from io import BufferedReader - from io import BufferedWriter except ImportError: from cStringIO import StringIO - class BufferedReader: pass - class BufferedWriter: pass +import codecs import locale import logging import os @@ -110,34 +107,11 @@ passphrase = '%s\n' % passphrase passphrase = passphrase.encode(encoding) stream.write(passphrase) - logger.debug("Passphrase written") + logger.debug("Wrote passphrase: %r", passphrase) def _is_sequence(instance): return isinstance(instance,list) or isinstance(instance,tuple) -def _wrap_input(inp): - if isinstance(inp, BufferedWriter): - oldinp = inp - inp = TextIOWrapper(inp) - logger.debug('wrapped input: %r -> %r', oldinp, inp) - return inp - -def _wrap_output(outp): - if isinstance(outp, BufferedReader): - oldoutp = outp - outp = TextIOWrapper(outp) - logger.debug('wrapped output: %r -> %r', oldoutp, outp) - return outp - -#The following is needed for Python2.7 :-( -def _make_file(s): - try: - rv = StringIO(s) - except (TypeError, UnicodeError): - from io import BytesIO - rv = BytesIO(s) - return rv - def _make_binary_stream(s, encoding): try: if _py3k: @@ -152,526 +126,11 @@ rv = StringIO(s) return rv -class GPG(object): - "Encapsulate access to the gpg executable" - def __init__(self, gpgbinary='gpg', gnupghome=None, verbose=False, use_agent=False): - """Initialize a GPG process wrapper. Options are: - - gpgbinary -- full pathname for GPG binary. - - gnupghome -- full pathname to where we can find the public and - private keyrings. Default is whatever gpg defaults to. - """ - self.gpgbinary = gpgbinary - self.gnupghome = gnupghome - self.verbose = verbose - self.use_agent = use_agent - self.encoding = locale.getpreferredencoding() - if self.encoding is None: # This happens on Jython! - self.encoding = sys.stdin.encoding - if gnupghome and not os.path.isdir(self.gnupghome): - os.makedirs(self.gnupghome,0x1C0) - p = self._open_subprocess(["--version"]) - result = Verify() # any result will do for this - self._collect_output(p, result, stdin=p.stdin) - if p.returncode != 0: - raise ValueError("Error invoking gpg: %s: %s" % (p.returncode, - result.stderr)) - - def _open_subprocess(self, args, passphrase=False): - # Internal method: open a pipe to a GPG subprocess and return - # the file objects for communicating with it. - cmd = [self.gpgbinary, '--status-fd 2 --no-tty'] - if self.gnupghome: - cmd.append('--homedir "%s" ' % self.gnupghome) - if passphrase: - cmd.append('--batch --passphrase-fd 0') - if self.use_agent: - cmd.append('--use-agent') - cmd.extend(args) - cmd = ' '.join(cmd) - if self.verbose: - print(cmd) - logger.debug("%s", cmd) - return Popen(cmd, shell=True, stdin=PIPE, stdout=PIPE, stderr=PIPE) - - def _read_response(self, stream, result): - # Internal method: reads all the output from GPG, taking notice - # only of lines that begin with the magic [GNUPG:] prefix. - # - # Calls methods on the response object for each valid token found, - # with the arg being the remainder of the status line. - lines = [] - while True: - line = stream.readline() - lines.append(line) - if self.verbose: - print(line) - logger.debug("%s", line.rstrip()) - if line == "": break - line = line.rstrip() - if line[0:9] == '[GNUPG:] ': - # Chop off the prefix - line = line[9:] - L = line.split(None, 1) - keyword = L[0] - if len(L) > 1: - value = L[1] - else: - value = "" - result.handle_status(keyword, value) - result.stderr = ''.join(lines) - - def _read_data(self, stream, result): - # Read the contents of the file from GPG's stdout - chunks = [] - while True: - data = stream.read(1024) - if len(data) == 0: - break - logger.debug("chunk: %r" % data[:256]) - chunks.append(data) - if _py3k: - # Join using b'' or '', as appropriate - result.data = type(data)().join(chunks) - else: - result.data = ''.join(chunks) - - def _collect_output(self, process, result, writer=None, stdin=None): - """ - Drain the subprocesses output streams, writing the collected output - to the result. If a writer thread (writing to the subprocess) is given, - make sure it's joined before returning. If a stdin stream is given, - close it before returning. - """ - stderr = _wrap_output(process.stderr) - rr = threading.Thread(target=self._read_response, args=(stderr, result)) - rr.setDaemon(True) - logger.debug('stderr reader: %r', rr) - rr.start() - - stdout = process.stdout # _wrap_output(process.stdout) - dr = threading.Thread(target=self._read_data, args=(stdout, result)) - dr.setDaemon(True) - logger.debug('stdout reader: %r', dr) - dr.start() - - dr.join() - rr.join() - if writer is not None: - writer.join() - process.wait() - if stdin is not None: - try: - stdin.close() - except IOError: - pass - stderr.close() - stdout.close() - - def _handle_io(self, args, file, result, passphrase=None, binary=False): - "Handle a call to GPG - pass input data, collect output data" - # Handle a basic data call - pass data to GPG, handle the output - # including status information. Garbage In, Garbage Out :) - p = self._open_subprocess(args, passphrase is not None) - if not binary and not isinstance(file, BufferedReader): - stdin = _wrap_input(p.stdin) - else: - stdin = p.stdin - if passphrase: - _write_passphrase(stdin, passphrase, self.encoding) - writer = _threaded_copy_data(file, stdin) - self._collect_output(p, result, writer, stdin) - return result - - # - # SIGNATURE METHODS - # - def sign(self, message, **kwargs): - """sign message""" - f = _make_binary_stream(message, self.encoding) - result = self.sign_file(f, **kwargs) - f.close() - return result - - def sign_file(self, file, keyid=None, passphrase=None, clearsign=True, - detach=False, binary=False): - """sign file""" - logger.debug("sign_file: %s", file) - if binary: - args = ['-s'] - else: - args = ['-sa'] - # You can't specify detach-sign and clearsign together: gpg ignores - # the detach-sign in that case. - if detach: - args.append("--detach-sign") - elif clearsign: - args.append("--clearsign") - if keyid: - args.append("--default-key %s" % keyid) - result = Sign(self.encoding) - #We could use _handle_io here except for the fact that if the - #passphrase is bad, gpg bails and you can't write the message. - #self._handle_io(args, _make_file(message), result, passphrase=passphrase) - p = self._open_subprocess(args, passphrase is not None) - try: - stdin = p.stdin - if passphrase: - _write_passphrase(stdin, passphrase, self.encoding) - writer = _threaded_copy_data(file, stdin) - except IOError: - logging.exception("error writing message") - writer = None - self._collect_output(p, result, writer, stdin) - return result - - def verify(self, data): - """Verify the signature on the contents of the string 'data' - - >>> gpg = GPG(gnupghome="keys") - >>> input = gpg.gen_key_input(Passphrase='foo') - >>> key = gpg.gen_key(input) - >>> assert key - >>> sig = gpg.sign('hello',keyid=key.fingerprint,passphrase='bar') - >>> assert not sig - >>> sig = gpg.sign('hello',keyid=key.fingerprint,passphrase='foo') - >>> assert sig - >>> verify = gpg.verify(sig.data) - >>> assert verify - - """ - f = _make_binary_stream(data, self.encoding) - result = self.verify_file(f) - f.close() - return result - - def verify_file(self, file, data_filename=None): - "Verify the signature on the contents of the file-like object 'file'" - logger.debug('verify_file: %r, %r', file, data_filename) - result = Verify() - args = ['--verify'] - if data_filename is None: - self._handle_io(args, file, result, binary=True) - else: - logger.debug('Handling detached verification') - import tempfile - fd, fn = tempfile.mkstemp(prefix='pygpg') - s = file.read() - file.close() - logger.debug('Wrote to temp file: %r', s) - os.write(fd, s) - os.close(fd) - args.append(fn) - args.append(data_filename) - try: - p = self._open_subprocess(args) - self._collect_output(p, result, stdin=p.stdin) - finally: - os.unlink(fn) - return result - - # - # KEY MANAGEMENT - # - - def import_keys(self, key_data): - """ import the key_data into our keyring - - >>> import shutil

1 0

gajim: correctly check window list size before removing from it
by Aleksey Rybalkin 19 Jun '12

19 Jun '12

changeset 10f1f986a00b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=10f1f986a00b description: correctly check window list size before removing from it diffstat: src/dialogs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 847f5ab1aaff -r 10f1f986a00b src/dialogs.py --- a/src/dialogs.py Mon Apr 30 21:04:37 2012 +0200 +++ b/src/dialogs.py Tue Apr 24 14:18:54 2012 +0400 @@ -2832,7 +2832,7 @@ gajim.interface.roster.popups_notification_height -= self.window_height self.window.destroy() - if len(gajim.interface.roster.popup_notification_windows) > 0: + if len(gajim.interface.roster.popup_notification_windows) > self.index: # we want to remove the destroyed window from the list gajim.interface.roster.popup_notification_windows.pop(self.index)

1 0

gajim: don't load unactivatable plugins
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 847f5ab1aaff in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=847f5ab1aaff description: don't load unactivatable plugins diffstat: src/plugins/gui.py | 9 ++++++--- src/plugins/plugin.py | 1 + src/plugins/pluginmanager.py | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diffs (61 lines): diff -r f3a3b525516e -r 847f5ab1aaff src/plugins/gui.py --- a/src/plugins/gui.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/gui.py Mon Apr 30 21:04:37 2012 +0200 @@ -114,10 +114,13 @@ desc_textbuffer = self.plugin_description_textview.get_buffer() from plugins.plugins_i18n import _ - desc_textbuffer.set_text(_(plugin.description)) + txt = plugin.description + if plugin.available_text: + txt += '\n\n' + _('Warning: %s') % plugin.available_text + desc_textbuffer.set_text(txt) self.plugin_description_textview.set_property('sensitive', True) self.uninstall_plugin_button.set_property('sensitive', - gajim.PLUGINS_DIRS[1] in plugin.__path__) + gajim.PLUGINS_DIRS[1] in plugin.__path__) if plugin.config_dialog is None: self.configure_plugin_button.set_property('sensitive', False) else: @@ -145,7 +148,7 @@ for plugin in pm.plugins: self.installed_plugins_model.append([plugin, plugin.name, - plugin.active, plugin.activatable]) + plugin.active and plugin.activatable, plugin.activatable]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): diff -r f3a3b525516e -r 847f5ab1aaff src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/plugin.py Mon Apr 30 21:04:37 2012 +0200 @@ -155,6 +155,7 @@ :type: `plugins.plugin.GajimPluginConfig` ''' self.activatable = True + self.available_text = '' self.load_config() self.config_dialog = GajimPluginConfigDialog(self) self.init() diff -r f3a3b525516e -r 847f5ab1aaff src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Apr 30 00:43:18 2012 +0200 +++ b/src/plugins/pluginmanager.py Mon Apr 30 21:04:37 2012 +0200 @@ -292,7 +292,7 @@ :param plugin: plugin to be activated :type plugin: class object of `GajimPlugin` subclass ''' - if not plugin.active: + if not plugin.active and plugin.activatable: self._add_gui_extension_points_handlers_from_plugin(plugin) self._handle_all_gui_extension_points_with_plugin(plugin) @@ -374,7 +374,8 @@ def _activate_all_plugins_from_global_config(self): for plugin in self.plugins: - if self._plugin_is_active_in_global_config(plugin): + if self._plugin_is_active_in_global_config(plugin) and \ + plugin.activatable: try: self.activate_plugin(plugin) except GajimPluginActivateException:

1 0

gajim: fix gnomekeyring import
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 14f8ef5dacde in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=14f8ef5dacde description: fix gnomekeyring import diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 6aa75f58fbc4 -r 14f8ef5dacde src/common/passwords.py --- a/src/common/passwords.py Mon Apr 30 10:52:12 2012 +0400 +++ b/src/common/passwords.py Mon Apr 30 14:16:04 2012 +0400 @@ -183,7 +183,7 @@ if gajim.config.get('use_gnomekeyring'): global gnomekeyring try: - __import__('gnomekeyring') + gnomekeyring = __import__('gnomekeyring') except ImportError: pass else:

1 0

gajim: ability for plugins to be activatable. True by default, b...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset f3a3b525516e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f3a3b525516e description: ability for plugins to be activatable. True by default, but plugin can be non-activatable is a dep is missing for example. diffstat: src/plugins/gui.py | 13 +++++++------ src/plugins/plugin.py | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diffs (63 lines): diff -r 14f8ef5dacde -r f3a3b525516e src/plugins/gui.py --- a/src/plugins/gui.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/plugins/gui.py Mon Apr 30 00:43:18 2012 +0200 @@ -60,7 +60,7 @@ self.plugin_name_label.set_attributes(attr_list) self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT, - gobject.TYPE_STRING, gobject.TYPE_BOOLEAN) + gobject.TYPE_STRING, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN) self.installed_plugins_treeview.set_model(self.installed_plugins_model) self.installed_plugins_treeview.set_rules_hint(True) @@ -69,9 +69,8 @@ self.installed_plugins_treeview.append_column(col) renderer = gtk.CellRendererToggle() - renderer.set_property('activatable', True) renderer.connect('toggled', self.installed_plugins_toggled_cb) - col = gtk.TreeViewColumn(_('Active'), renderer, active=2) + col = gtk.TreeViewColumn(_('Active'), renderer, active=2, activatable=3) self.installed_plugins_treeview.append_column(col) # connect signal for selection change @@ -146,7 +145,7 @@ for plugin in pm.plugins: self.installed_plugins_model.append([plugin, plugin.name, - plugin.active]) + plugin.active, plugin.activatable]) @log_calls('PluginsWindow') def installed_plugins_toggled_cb(self, cell, path): @@ -230,7 +229,8 @@ model.remove(model.get_iter((row, 0))) break - iter_ = model.append([plugin, plugin.name, False]) + iter_ = model.append([plugin, plugin.name, False, + plugin.activatable]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) @@ -252,7 +252,8 @@ show_warn_dialog() return model = self.installed_plugins_model - iter_ = model.append([plugin, plugin.name, False]) + iter_ = model.append([plugin, plugin.name, False, + plugin.activatable]) sel = self.installed_plugins_treeview.get_selection() sel.select_iter(iter_) diff -r 14f8ef5dacde -r f3a3b525516e src/plugins/plugin.py --- a/src/plugins/plugin.py Mon Apr 30 14:16:04 2012 +0400 +++ b/src/plugins/plugin.py Mon Apr 30 00:43:18 2012 +0200 @@ -154,6 +154,7 @@ :type: `plugins.plugin.GajimPluginConfig` ''' + self.activatable = True self.load_config() self.config_dialog = GajimPluginConfigDialog(self) self.init()

1 0

gajim: gnomekeyring import will not be delayed
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 6aa75f58fbc4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6aa75f58fbc4 description: gnomekeyring import will not be delayed diffstat: src/common/passwords.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r bc8af06950aa -r 6aa75f58fbc4 src/common/passwords.py --- a/src/common/passwords.py Sat Apr 28 22:45:53 2012 +0200 +++ b/src/common/passwords.py Mon Apr 30 10:52:12 2012 +0400 @@ -183,7 +183,7 @@ if gajim.config.get('use_gnomekeyring'): global gnomekeyring try: - import gnomekeyring + __import__('gnomekeyring') except ImportError: pass else:

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 2012