Commits

commits@gajim.org

17632 discussions

gajim: fix typo
by Fomin Denis 19 Jun '12

19 Jun '12

changeset 31c666671ead in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=31c666671ead description: fix typo diffstat: src/tooltips.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (21 lines): diff -r dd85d8b743c2 -r 31c666671ead src/tooltips.py --- a/src/tooltips.py Tue Jun 19 19:19:24 2012 +0200 +++ b/src/tooltips.py Tue Jun 19 22:45:19 2012 +0400 @@ -207,13 +207,13 @@ formatted = "%s" color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - color = gajim.conig.get('tooltip_affiliation_none_color') + color = gajim.config.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - color = gajim.conig.get('tooltip_affiliation_member_color') + color = gajim.config.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - color = gajim.conig.get('tooltip_affiliation_administrator_color') + color = gajim.config.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - color = gajim.conig.get('tooltip_affiliation_owner_color') + color = gajim.config.get('tooltip_affiliation_owner_color') if color: affiliation = formatted % (color, affiliation) return affiliation

1 0

gajim: current version is 0.15.0.1
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 02abfa8a4a5f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=02abfa8a4a5f description: current version is 0.15.0.1 diffstat: autogen.sh | 7 +------ src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diffs (34 lines): diff -r 9939e4c2a4b8 -r 02abfa8a4a5f autogen.sh --- a/autogen.sh Sat Jun 16 22:58:46 2012 +0200 +++ b/autogen.sh Sun Jun 17 22:11:17 2012 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15" + gajimversion="0.15.0.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" @@ -10,11 +10,6 @@ AM_ARGS="--add-missing --gnu --copy -Wno-portability" CONF_ARGS="" - if test x`uname -s 2>/dev/null` = 'xDarwin' -a -f /Library/Frameworks/GTK+.framework/Versions/Current/env; then - . /Library/Frameworks/GTK+.framework/Versions/Current/env - AM_ARGS="${AM_ARGS} --ignore-deps" - CONF_ARGS="${CONF_ARGS} --disable-idle --without-x" - fi echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ diff -r 9939e4c2a4b8 -r 02abfa8a4a5f src/common/defs.py --- a/src/common/defs.py Sat Jun 16 22:58:46 2012 +0200 +++ b/src/common/defs.py Sun Jun 17 22:11:17 2012 +0200 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.15' +version = '0.15.0.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: correctly handle see-other-host (earlier in the connectio...
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 73d9c50e6736 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73d9c50e6736 description: correctly handle see-other-host (earlier in the connection process). Fixes #7179 diffstat: src/common/connection.py | 5 +++++ src/common/connection_handlers.py | 3 +-- src/common/connection_handlers_events.py | 6 ++++-- src/common/resolver.py | 2 ++ src/common/xmpp/client_nb.py | 11 ++++++++--- src/common/xmpp/dispatcher_nb.py | 3 +++ 6 files changed, 23 insertions(+), 7 deletions(-) diffs (132 lines): diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/connection.py --- a/src/common/connection.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection.py Tue Jun 19 19:19:24 2012 +0200 @@ -1139,6 +1139,10 @@ self._disconnectedReconnCB() def connect_to_next_type(self, retry=False): + if self.redirected: + self.disconnect(on_purpose=True) + self.connect() + return if len(self._connection_types): self._current_type = self._connection_types.pop(0) if self.last_connection: @@ -1199,6 +1203,7 @@ on_connect=self.on_connect_success, on_proxy_failure=self.on_proxy_failure, on_connect_failure=self.connect_to_next_type, + on_stream_error_cb=self._StreamCB, proxy=self._proxy, secure_tuple = secure_tuple) diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers.py Tue Jun 19 19:19:24 2012 +0200 @@ -1254,6 +1254,7 @@ PrivateStorageRosternotesReceivedEvent) gajim.nec.register_incoming_event(RosternotesReceivedEvent) gajim.nec.register_incoming_event(StreamConflictReceivedEvent) + gajim.nec.register_incoming_event(StreamOtherHostReceivedEvent) gajim.nec.register_incoming_event(MessageReceivedEvent) gajim.nec.register_incoming_event(ArchivingErrorReceivedEvent) gajim.nec.register_incoming_event( @@ -1988,8 +1989,6 @@ if obj.conn.name != self.name: return self.redirected = obj.redirected - self.disconnect(on_purpose=True) - self.connect() def _StreamCB(self, con, iq_obj): log.debug('StreamCB') diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/connection_handlers_events.py Tue Jun 19 19:19:24 2012 +0200 @@ -689,8 +689,10 @@ base_network_events = ['stream-received'] def generate(self): - other_host = obj.getTag('see-other-host') - if other_host and self.conn.last_connection_type in ('ssl', 'tls'): + self.conn = self.base_event.conn + self.stanza = self.base_event.stanza + other_host = self.stanza.getTag('see-other-host') + if other_host and self.conn._current_type in ('ssl', 'tls'): host = other_host.getData() if ':' in host: host_l = host.split(':', 1) diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/resolver.py --- a/src/common/resolver.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/resolver.py Tue Jun 19 19:19:24 2012 +0200 @@ -63,6 +63,7 @@ self.handlers = {} def resolve(self, host, on_ready, type='srv'): + host = host.lower() log.debug('resolve %s type=%s' % (host, type)) assert(type in ['srv', 'txt']) if not host: @@ -88,6 +89,7 @@ def _on_ready(self, host, type, result_list): # practically it is impossible to be the opposite, but who knows :) + host = host.lower() log.debug('Resolving result for %s: %s' % (host, result_list)) if not self.resolved_hosts.has_key(host+type): self.resolved_hosts[host+type] = result_list diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/xmpp/client_nb.py --- a/src/common/xmpp/client_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/client_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -67,6 +67,7 @@ self.on_connect_failure = None self.proxy = None self.got_features = False + self.got_see_other_host = None self.stream_started = False self.disconnecting = False self.protocol_type = 'XMPP' @@ -138,8 +139,8 @@ self.disconnecting = False def connect(self, on_connect, on_connect_failure, hostname=None, port=5222, - on_proxy_failure=None, proxy=None, secure_tuple=('plain', None, - None)): + on_proxy_failure=None, on_stream_error_cb=None, proxy=None, + secure_tuple=('plain', None, None)): """ Open XMPP connection (open XML streams in both directions) @@ -161,6 +162,7 @@ self.on_connect = on_connect self.on_connect_failure=on_connect_failure self.on_proxy_failure = on_proxy_failure + self.on_stream_error_cb = on_stream_error_cb self.desired_security, self.cacerts, self.mycerts = secure_tuple self.Connection = None self.Port = port @@ -350,7 +352,10 @@ # sometimes <features> are received together with document # attributes and sometimes on next receive... self.Dispatcher.ProcessNonBlocking(data) - if not self.got_features: + if self.got_see_other_host: + log.info('got see-other-host') + self.on_stream_error_cb(self, self.got_see_other_host) + elif not self.got_features: self._xmpp_connect_machine( mode='FAILURE', data='Missing <features> in 1.0 stream') diff -r 02abfa8a4a5f -r 73d9c50e6736 src/common/xmpp/dispatcher_nb.py --- a/src/common/xmpp/dispatcher_nb.py Sun Jun 17 22:11:17 2012 +0200 +++ b/src/common/xmpp/dispatcher_nb.py Tue Jun 19 19:19:24 2012 +0200 @@ -415,6 +415,9 @@ if name == 'features': self._owner.got_features = True session.Stream.features = stanza + if name == 'error': + if stanza.getTag('see-other-host'): + self._owner.got_see_other_host = stanza xmlns = stanza.getNamespace()

1 0

gajim: make tooltip colors configurable. Fixes #7165
by Yann Leboulanger 19 Jun '12

19 Jun '12

changeset 9939e4c2a4b8 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9939e4c2a4b8 description: make tooltip colors configurable. Fixes #7165 diffstat: src/common/config.py | 12 ++++++++++++ src/tooltips.py | 39 ++++++++++++++++++++++++--------------- 2 files changed, 36 insertions(+), 15 deletions(-) diffs (109 lines): diff -r 239ec662de5a -r 9939e4c2a4b8 src/common/config.py --- a/src/common/config.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/common/config.py Sat Jun 16 22:58:46 2012 +0200 @@ -213,6 +213,18 @@ 'roster_avatar_height': [opt_int, 32], 'tooltip_avatar_width': [opt_int, 125], 'tooltip_avatar_height': [opt_int, 125], + 'tooltip_status_online_color': [opt_color, '#73D216'], + 'tooltip_status_free_for_chat_color': [opt_color, '#3465A4'], + 'tooltip_status_away_color': [opt_color, '#EDD400'], + 'tooltip_status_busy_color': [opt_color, '#F57900'], + 'tooltip_status_na_color': [opt_color, '#CC0000'], + 'tooltip_status_offline_color': [opt_color, '#555753'], + 'tooltip_affiliation_none_color': [opt_color, '#555753'], + 'tooltip_affiliation_member_color': [opt_color, '#73D216'], + 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'], + 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'], + 'tooltip_account_name_color': [opt_color, '#888A85'], + 'tooltip_idle_color': [opt_color, '#888A85'], 'vcard_avatar_width': [opt_int, 200], 'vcard_avatar_height': [opt_int, 200], 'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')], diff -r 239ec662de5a -r 9939e4c2a4b8 src/tooltips.py --- a/src/tooltips.py Sat Jun 16 13:51:54 2012 +0200 +++ b/src/tooltips.py Sat Jun 16 22:58:46 2012 +0200 @@ -181,18 +181,21 @@ semantics. Color palette is the Tango. """ formatted = "%s" + color = None if status.startswith(Q_("?user status:Available")): - status = formatted % ('#73D216', status) + color = gajim.config.get('tooltip_status_online_color') elif status.startswith(_("Free for Chat")): - status = formatted % ('#3465A4', status) + color = gajim.config.get('tooltip_status_free_for_chat_color') elif status.startswith(_("Away")): - status = formatted % ('#EDD400', status) + color = gajim.config.get('tooltip_status_away_color') elif status.startswith(_("Busy")): - status = formatted % ('#F57900', status) + color = gajim.config.get('tooltip_status_busy_color') elif status.startswith(_("Not Available")): - status = formatted % ('#CC0000', status) + color = gajim.config.get('tooltip_status_na_color') elif status.startswith(_("Offline")): - status = formatted % ('#555753', status) + color = gajim.config.get('tooltip_status_offline_color') + if color: + status = formatted % (color, status) return status @staticmethod @@ -202,14 +205,17 @@ it's semantics. Color palette is the Tango. """ formatted = "%s" + color = None if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")): - affiliation = formatted % ('#555753', affiliation) + color = gajim.conig.get('tooltip_affiliation_none_color') elif affiliation.startswith(_("Member")): - affiliation = formatted % ('#73D216', affiliation) + color = gajim.conig.get('tooltip_affiliation_member_color') elif affiliation.startswith(_("Administrator")): - affiliation = formatted % ('#F57900', affiliation) + color = gajim.conig.get('tooltip_affiliation_administrator_color') elif affiliation.startswith(_("Owner")): - affiliation = formatted % ('#CC0000', affiliation) + color = gajim.conig.get('tooltip_affiliation_owner_color') + if color: + affiliation = formatted % (color, affiliation) return affiliation class StatusTable: @@ -493,9 +499,9 @@ gobject.markup_escape_text(prim_contact.get_shown_name())\ + '' if gajim.config.get('mergeaccounts'): - name_markup += u" (" + \ - gobject.markup_escape_text(prim_contact.account.name) \ - + ')' + name_markup += u" (%s)" % ( + gajim.config.get('tooltip_account_name_color'), + gobject.markup_escape_text(prim_contact.account.name)) if self.account and helpers.jid_is_blocked(self.account, prim_contact.jid): @@ -528,7 +534,8 @@ iconset = gajim.config.get('iconset') if not iconset: iconset = 'dcraven' - file_path = os.path.join(helpers.get_iconset_path(iconset), '16x16') + file_path = os.path.join(helpers.get_iconset_path(iconset), + '16x16') contact_keys = sorted(contacts_dict.keys()) contact_keys.reverse() @@ -641,7 +648,9 @@ # is no meaningful difference between last activity time and # current time. if diff.days > 0 or diff.seconds > 0: - cs = "%s" + cs = "" % gajim.config.get( + 'tooltip_idle_color') + cs += '%s' properties.append((str(), None)) properties.append(((cs % _("Idle since %s")) % formatted, None)) properties.append(((cs % _("Idle for %s")) % str(diff), None))

1 0

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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits