Commits December 2013

commits@gajim.org

2 participants
151 discussions

gajim: Typo.Fixes #7551
by Gajim 30 Dec '13

30 Dec '13

changeset 67aed483ecdc in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=67aed483ecdc description: Typo.Fixes #7551 diffstat: src/disco.py | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diffs (31 lines): diff -r ec6f654d9765 -r 67aed483ecdc src/disco.py --- a/src/disco.py Tue Nov 05 13:12:38 2013 +0100 +++ b/src/disco.py Wed Nov 06 21:49:27 2013 +0400 @@ -948,17 +948,17 @@ Set the window title based on agent info """ # Set the banner and window title - if len(identities) > 1: - # Check if an identity with server category is present - for i, _identity in enumerate(identities): - if _identity['category'] == 'server' and 'name' in _identity: - name = _identity['name'] - break - elif 'name' in identities[0]: - name = identities[0]['name'] + if len(identities) > 1: + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] - if name: - self.window._set_window_banner_text(self._get_agent_address(), name) + if name: + self.window._set_window_banner_text(self._get_agent_address(), name) # Add an icon to the banner. pix = self.cache.get_icon(identities, addr=self._get_agent_address())

1 0

gajim: fix variable initialization. Fixes #7551
by Gajim 30 Dec '13

30 Dec '13

changeset 18b184cfb517 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=18b184cfb517 description: fix variable initialization. Fixes #7551 diffstat: src/disco.py | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diffs (26 lines): diff -r 67aed483ecdc -r 18b184cfb517 src/disco.py --- a/src/disco.py Wed Nov 06 21:49:27 2013 +0400 +++ b/src/disco.py Wed Nov 06 19:02:37 2013 +0100 @@ -948,14 +948,15 @@ Set the window title based on agent info """ # Set the banner and window title + name = '' if len(identities) > 1: - # Check if an identity with server category is present - for i, _identity in enumerate(identities): - if _identity['category'] == 'server' and 'name' in _identity: - name = _identity['name'] - break - elif 'name' in identities[0]: - name = identities[0]['name'] + # Check if an identity with server category is present + for i, _identity in enumerate(identities): + if _identity['category'] == 'server' and 'name' in _identity: + name = _identity['name'] + break + elif 'name' in identities[0]: + name = identities[0]['name'] if name: self.window._set_window_banner_text(self._get_agent_address(), name)

1 0

gajim: prevent traceback. Fixes #7503
by Gajim 30 Dec '13

30 Dec '13

changeset 6a3beba4693b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6a3beba4693b description: prevent traceback. Fixes #7503 diffstat: src/common/stanza_session.py | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diffs (27 lines): diff -r 18b184cfb517 -r 6a3beba4693b src/common/stanza_session.py --- a/src/common/stanza_session.py Wed Nov 06 19:02:37 2013 +0100 +++ b/src/common/stanza_session.py Wed Nov 06 21:17:15 2013 +0100 @@ -810,7 +810,10 @@ # the offset of the group we chose (need it to match up with the dhhash) group_order = 0 - self.modp = int(form.getField('modp').getOptions()[group_order][1]) + modp_f = form.getField('modp') + if not modp_f: + return + self.modp = int(modp_f.getOptions()[group_order][1]) x.addChild(node=nbxmpp.DataField(name='modp', value=self.modp)) g = dh.generators[self.modp] @@ -818,7 +821,10 @@ self.n_o = base64.b64decode(form['my_nonce']) - dhhashes = form.getField('dhhashes').getValues() + dhhashes_f = form.getField('dhhashes') + if not dhhashes_f: + return + dhhashes = dhhashes_f.getValues() self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode( 'utf8'))

1 0

gajim: improve manage bookmark behaviour when copy/pasting room ...
by Gajim 30 Dec '13

30 Dec '13

changeset 6ae0d1789d9e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=6ae0d1789d9e description: improve manage bookmark behaviour when copy/pasting room JID. Fixes room jid checking. Fixes #7547 diffstat: src/config.py | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diffs (57 lines): diff -r 6a3beba4693b -r 6ae0d1789d9e src/config.py --- a/src/config.py Wed Nov 06 21:17:15 2013 +0100 +++ b/src/config.py Wed Nov 06 22:00:21 2013 +0100 @@ -3427,7 +3427,7 @@ nick = helpers.parse_resource(nick) except helpers.InvalidFormat: dialogs.ErrorDialog(_('Invalid nickname'), - _('Character not allowed')) + _('Character not allowed'), transient_for=self.window) self.nick_entry.set_text(model[iter_][6]) return True model[iter_][6] = nick @@ -3438,16 +3438,17 @@ return server = widget.get_text() if '@' in server: - dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed')) + dialogs.ErrorDialog(_('Invalid server'), + _('Character not allowed'), transient_for=self.window) widget.set_text(server.replace('@', '')) room_jid = self.room_entry.get_text().strip() + '@' + \ server.strip() try: - room_jid = helpers.parse_resource(room_jid) + room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat as e: dialogs.ErrorDialog(_('Invalid server'), - _('Character not allowed')) + _('Character not allowed'), transient_for=self.window) self.server_entry.set_text(model[iter_][2].split('@')[1]) return True model[iter_][2] = room_jid @@ -3458,16 +3459,18 @@ return room = widget.get_text() if '@' in room: - dialogs.ErrorDialog(_('Invalid server'), _('Character not allowed')) - widget.set_text(room.replace('@', '')) + room, server = room.split('@', 1) + widget.set_text(room) + if server: + self.server_entry.set_text(server) + self.server_entry.grab_focus() room_jid = room.strip() + '@' + \ self.server_entry.get_text().strip() try: - room_jid = helpers.parse_resource(room_jid) + room_jid = helpers.parse_jid(room_jid) except helpers.InvalidFormat: dialogs.ErrorDialog(_('Invalid room'), - _('Character not allowed')) - self.room_entry.set_text(model[iter_][2].split('@')[0]) + _('Character not allowed'), transient_for=self.window) return True model[iter_][2] = room_jid

1 0

gajim: Fix wrong import
by Gajim 30 Dec '13

30 Dec '13

changeset d06bb658d995 in /home/hg/repos/gajim author: Denis Fomin <fominde(a)gmail.com> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=d06bb658d995 description: Fix wrong import diffstat: src/htmltextview.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (19 lines): diff -r 6ae0d1789d9e -r d06bb658d995 src/htmltextview.py --- a/src/htmltextview.py Wed Nov 06 22:00:21 2013 +0100 +++ b/src/htmltextview.py Fri Nov 08 00:31:34 2013 +0400 @@ -55,7 +55,6 @@ import gtkgui_helpers from common import gajim from gtkgui_helpers import get_icon_pixmap -from gtkgui_helpers import get_gtk_builder from common import helpers import tooltips @@ -834,6 +833,7 @@ class HtmlTextView(Gtk.TextView): def __init__(self): + from gtkgui_helpers import get_gtk_builder GObject.GObject.__init__(self) self.set_wrap_mode(Gtk.WrapMode.CHAR) self.set_editable(False)

1 0

gajim: file_props.size is an integer
by Gajim 30 Dec '13

30 Dec '13

changeset b86d4bdf5e81 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=b86d4bdf5e81 description: file_props.size is an integer diffstat: src/common/connection_handlers_events.py | 4 ++-- src/common/jingle_content.py | 2 +- src/common/socks5.py | 6 +++--- src/filetransfers_window.py | 11 ++++++----- 4 files changed, 12 insertions(+), 11 deletions(-) diffs (119 lines): diff -r 328d9fefd742 -r b86d4bdf5e81 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/common/connection_handlers_events.py Sat Nov 02 09:00:16 2013 +0100 @@ -2072,7 +2072,7 @@ if name == 'name': self.file_props.name = val if name == 'size': - self.file_props.size = val + self.file_props.size = int(val) if name == 'hash': self.file_props.algo = child.getAttr('algo') self.file_props.hash_ = val @@ -2112,7 +2112,7 @@ if name == 'name': self.file_props.name = val if name == 'size': - self.file_props.size = val + self.file_props.size = int(val) mime_type = si.getAttr('mime-type') if mime_type is not None: self.file_props.mime_type = mime_type diff -r 328d9fefd742 -r b86d4bdf5e81 src/common/jingle_content.py --- a/src/common/jingle_content.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/common/jingle_content.py Sat Nov 02 09:00:16 2013 +0100 @@ -193,7 +193,7 @@ else: # if the file is less than 10 mb, then it is small # lets calculate it right away - if int(self.file_props.size) < 10000000 and not \ + if self.file_props.size < 10000000 and not \ self.file_props.hash_: h = self._calcHash() file_tag.addChild(node=h) diff -r 328d9fefd742 -r b86d4bdf5e81 src/common/socks5.py --- a/src/common/socks5.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/common/socks5.py Sat Nov 02 09:00:16 2013 +0100 @@ -646,7 +646,7 @@ self.file_props.last_time self.file_props.last_time = current_time self.file_props.received_len = self.size - if self.size >= int(self.file_props.size): + if self.size >= self.file_props.size: self.state = 8 # end connection self.file_props.error = 0 self.disconnect() @@ -688,7 +688,7 @@ self.file_props.last_time = current_time self.file_props.received_len += lenn self.remaining_buff = '' - if self.file_props.received_len == int(self.file_props.size): + if self.file_props.received_len == self.file_props.size: self.rem_fd(fd) self.disconnect() self.file_props.error = 0 @@ -728,7 +728,7 @@ self.disconnect() self.file_props.error = -6 # file system error return 0 - if self.file_props.received_len >= int(self.file_props.size): + if self.file_props.received_len >= self.file_props.size: # transfer completed self.rem_fd(fd) self.disconnect() diff -r 328d9fefd742 -r b86d4bdf5e81 src/filetransfers_window.py --- a/src/filetransfers_window.py Fri Nov 01 20:00:28 2013 +0100 +++ b/src/filetransfers_window.py Sat Nov 02 09:00:16 2013 +0100 @@ -407,6 +407,7 @@ propose_resume=not dl_finished, on_response=on_response, transient_for=dialog2) dialog.set_destroy_with_parent(True) + return else: dirname = os.path.dirname(file_path) if not os.access(dirname, os.W_OK) and os.name != 'nt': @@ -489,7 +490,7 @@ file_props.completed = True text = self._format_percent(100) received_size = int(file_props.received_len) - full_size = int(file_props.size) + full_size = file_props.size text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, C_PROGRESS, text) @@ -498,7 +499,7 @@ self.model.set(iter_, C_PULSE, 1) text = _('Checking file...') + '\n' received_size = int(file_props.received_len) - full_size = int(file_props.size) + full_size = file_props.size text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, C_PROGRESS, text) @@ -512,7 +513,7 @@ elif status == 'hash_error': text = _('File error') + '\n' received_size = int(file_props.received_len) - full_size = int(file_props.size) + full_size = file_props.size text += helpers.convert_bytes(received_size) + '/' + \ helpers.convert_bytes(full_size) self.model.set(iter_, C_PROGRESS, text) @@ -602,7 +603,7 @@ Change the progress of a transfer with new transfered size """ file_props = FilesProp.getFilePropByType(typ, sid) - full_size = int(file_props.size) + full_size = file_props.size if full_size == 0: percent = 0 else: @@ -711,7 +712,7 @@ file_props.type_ = 's' file_props.desc = file_desc file_props.elapsed_time = 0 - file_props.size = str(stat[6]) + file_props.size = stat[6] file_props.sender = account file_props.receiver = contact file_props.tt_account = account

1 0

gajim: fix computing hash once socket is correctly closed
by Gajim 30 Dec '13

30 Dec '13

changeset 574293a69d0e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=574293a69d0e description: fix computing hash once socket is correctly closed diffstat: src/common/socks5.py | 1 + src/gui_interface.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diffs (29 lines): diff -r b86d4bdf5e81 -r 574293a69d0e src/common/socks5.py --- a/src/common/socks5.py Sat Nov 02 09:00:16 2013 +0100 +++ b/src/common/socks5.py Sat Nov 02 16:09:12 2013 +0100 @@ -379,6 +379,7 @@ self.idlequeue.remove_timeout(reader.fd) if do_disconnect: reader.disconnect() + del self.readers[key] if not remove_all: break else: diff -r b86d4bdf5e81 -r 574293a69d0e src/gui_interface.py --- a/src/gui_interface.py Sat Nov 02 09:00:16 2013 +0100 +++ b/src/gui_interface.py Sat Nov 02 16:09:12 2013 +0100 @@ -996,13 +996,13 @@ return if file_props.type_ == 'r' and file_props.hash_: # we receive a file + gajim.socks5queue.remove_receiver(file_props.sid, True, True) # we compare hashes if file_props.session_type == 'jingle': # Compare hashes in a new thread self.hashThread = Thread(target=self.__compare_hashes, args=(account, file_props)) self.hashThread.start() - gajim.socks5queue.remove_receiver(file_props.sid, True, True) else: # we send a file jid = file_props.receiver gajim.socks5queue.remove_sender(file_props.sid, True, True)

1 0

gajim: use ―*20 instead of gajim-muc-separator.png. See #7476
by Gajim 30 Dec '13

30 Dec '13

changeset 5298b7793483 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=5298b7793483 description: use ―*20 instead of gajim-muc-separator.png. See #7476 diffstat: icons/hicolor/16x16/status/gajim-muc_separator.png | Bin src/conversation_textview.py | 12 +++--------- src/htmltextview.py | 15 ++------------- 3 files changed, 5 insertions(+), 22 deletions(-) diffs (81 lines): diff -r 574293a69d0e -r 5298b7793483 icons/hicolor/16x16/status/gajim-muc_separator.png Binary file icons/hicolor/16x16/status/gajim-muc_separator.png has changed diff -r 574293a69d0e -r 5298b7793483 src/conversation_textview.py --- a/src/conversation_textview.py Sat Nov 02 16:09:12 2013 +0100 +++ b/src/conversation_textview.py Sat Nov 02 17:06:21 2013 +0100 @@ -173,8 +173,6 @@ ) ) - FOCUS_OUT_LINE_PIXBUF = gtkgui_helpers.get_icon_pixmap( - 'gajim-muc_separator') MESSAGE_CORRECTED_PIXBUF = gtkgui_helpers.get_icon_pixmap('gtk-spell-check') # smooth scroll constants @@ -330,8 +328,6 @@ self.xep0184_warning_tooltip = tooltips.BaseTooltip() self.line_tooltip = tooltips.BaseTooltip() - # use it for hr too - self.tv.focus_out_line_pixbuf = ConversationTextview.FOCUS_OUT_LINE_PIXBUF self.smooth_id = None self.just_cleared = False @@ -587,7 +583,7 @@ self.focus_out_end_mark) begin_iter_for_previous_line = end_iter_for_previous_line.copy() # img_char+1 (the '\n') - begin_iter_for_previous_line.backward_chars(2) + begin_iter_for_previous_line.backward_chars(21) # remove focus out line buffer_.delete(begin_iter_for_previous_line, @@ -596,14 +592,12 @@ # add the new focus out line end_iter = buffer_.get_end_iter() - buffer_.insert(end_iter, '\n') - buffer_.insert_pixbuf(end_iter, - ConversationTextview.FOCUS_OUT_LINE_PIXBUF) + buffer_.insert(end_iter, '\n' + '―' * 20) end_iter = buffer_.get_end_iter() before_img_iter = end_iter.copy() # one char back (an image also takes one char) - before_img_iter.backward_char() + before_img_iter.backward_chars(20) buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) self.allow_focus_out_line = False diff -r 574293a69d0e -r 5298b7793483 src/htmltextview.py --- a/src/htmltextview.py Sat Nov 02 16:09:12 2013 +0100 +++ b/src/htmltextview.py Sat Nov 02 17:06:21 2013 +0100 @@ -796,15 +796,8 @@ elif name == 'hr': #FIXME: plenty of unused attributes (width, height,...) :) self._jump_line() - try: - if self.conv_textbuf: - self.textbuf.insert_pixbuf(self.iter, - self.textview.focus_out_line_pixbuf) - else: - self._insert_text('\u2550'*40) - self._jump_line() - except Exception as e: - log.debug('Error in hr' + str(e)) + self._insert_text('\u2015'*40) + self._jump_line() elif name in LIST_ELEMS: self.list_counters.pop() elif name == 'li': @@ -1142,10 +1135,6 @@ htmlview = ConversationTextview(None) - path = gtkgui_helpers.get_icon_path('gajim-muc_separator') - # use this for hr - htmlview.tv.focus_out_line_pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) - tooltip = tooltips.BaseTooltip() def on_textview_motion_notify_event(widget, event):

1 0

gajim: [fedor] prefer stronger hash algorithms. Fixes #7541
by Gajim 30 Dec '13

30 Dec '13

changeset 71f323a318a4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=71f323a318a4 description: [fedor] prefer stronger hash algorithms. Fixes #7541 diffstat: src/common/jingle.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (24 lines): diff -r 5298b7793483 -r 71f323a318a4 src/common/jingle.py --- a/src/common/jingle.py Sat Nov 02 17:06:21 2013 +0100 +++ b/src/common/jingle.py Sat Nov 02 21:22:41 2013 +0100 @@ -170,14 +170,14 @@ def __hash_support(self, contact): if contact.supports(nbxmpp.NS_HASHES): - if contact.supports(nbxmpp.NS_HASHES_MD5): - return 'md5' + if contact.supports(nbxmpp.NS_HASHES_SHA512): + return 'sha-512' + elif contact.supports(nbxmpp.NS_HASHES_SHA256): + return 'sha-256' elif contact.supports(nbxmpp.NS_HASHES_SHA1): return 'sha-1' - elif contact.supports(nbxmpp.NS_HASHES_SHA256): - return 'sha-256' - elif contact.supports(nbxmpp.NS_HASHES_SHA512): - return 'sha-512' + elif contact.supports(nbxmpp.NS_HASHES_MD5): + return 'md5' return None def iter_jingle_sessions(self, jid, sid=None, media=None):

1 0

gajim: ability to configure cipher list
by Gajim 30 Dec '13

30 Dec '13

changeset 2a5f51990344 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=2a5f51990344 description: ability to configure cipher list diffstat: src/common/config.py | 1 + src/common/connection.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletions(-) diffs (25 lines): diff -r 71f323a318a4 -r 2a5f51990344 src/common/config.py --- a/src/common/config.py Sat Nov 02 21:22:41 2013 +0100 +++ b/src/common/config.py Sun Nov 03 17:57:12 2013 +0100 @@ -349,6 +349,7 @@ 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], 'autonegotiate_esessions': [opt_bool, True, _('Should Gajim automatically start an encrypted session when possible?')], 'connection_types': [ opt_str, 'tls ssl plain', _('Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain')], + 'cipher_list': [ opt_str, 'HIGH:!aNULL:!eNULL:RC4-SHA', '' ], 'action_when_plaintext_connection': [ opt_str, 'warn', _('Show a warning dialog before sending password on an plaintext connection. Can be \'warn\', \'connect\', \'disconnect\'') ], 'warn_when_insecure_ssl_connection': [ opt_bool, True, _('Show a warning dialog before using standard SSL library.') ], 'warn_when_insecure_password': [ opt_bool, True, _('Show a warning dialog before sending PLAIN password over a plain connection.') ], diff -r 71f323a318a4 -r 2a5f51990344 src/common/connection.py --- a/src/common/connection.py Sat Nov 02 21:22:41 2013 +0100 +++ b/src/common/connection.py Sun Nov 03 17:57:12 2013 +0100 @@ -1236,7 +1236,9 @@ if not os.path.exists(cacerts): cacerts = '' mycerts = common.gajim.MY_CACERTS - secure_tuple = (self._current_type, cacerts, mycerts) + cipher_list = gajim.config.get_per('accounts', self.name, + 'cipher_list') + secure_tuple = (self._current_type, cacerts, mycerts, cipher_list) con = nbxmpp.NonBlockingClient( domain=self._hostname,

1 0

← Newer
1
2
3
4
5
6
7
8
...
16
Older →

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 December 2013