Commits December 2015

commits@gajim.org

1 participants
53 discussions

gajim: don't traceback when deleting an account. Fixes #8199
by Gajim 12 Dec '15

12 Dec '15

changeset c1b8ae2f7b5a 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=c1b8ae2f7b5a description: don't traceback when deleting an account. Fixes #8199 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (21 lines): diff -r 9633f40c8c9e -r c1b8ae2f7b5a src/roster_window.py --- a/src/roster_window.py Tue Dec 01 22:30:04 2015 +0100 +++ b/src/roster_window.py Sat Dec 12 13:52:18 2015 +0100 @@ -108,6 +108,8 @@ if self.regroup: name = 'MERGED' + if name not in self._iters: + return None it = self._iters[name]['account'] if model == self.model or it is None: @@ -135,6 +137,8 @@ if self.regroup: account = 'MERGED' + if account not in self._iters: + return None if name not in self._iters[account]['groups']: return None

1 0

gajim-plugins: Some minor bugfixes...
by Gajim Plugins 11 Dec '15

11 Dec '15

changeset 6549b16f8430 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=6549b16f8430 description: Some minor bugfixes... diffstat: httpupload/httpupload.py | 42 ++++++++++++++++++++++++------------------ httpupload/manifest.ini | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diffs (92 lines): diff -r 0cb31e935c60 -r 6549b16f8430 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Nov 12 22:35:42 2015 +0100 +++ b/httpupload/httpupload.py Fri Dec 11 03:57:10 2015 +0100 @@ -272,6 +272,21 @@ progress_messages = Queue(8) progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages) def upload_file(stanza): + slot = stanza.getTag("slot") + if not slot: + progress_window.close_dialog() + log.error("got unexpected stanza: "+str(stanza)) + error = stanza.getTag("error") + if error and error.getTag("text"): + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server: %s') % str(error.getTagData("text")), + transient_for=self.chat_control.parent_win.window) + else: + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server (protocol mismatch??)'), + transient_for=self.chat_control.parent_win.window) + return + try: open(path_to_file, "rb").read(1) # check for open/read errors (maybe this is not needed anymore) data = StreamFileWithProgress(path_to_file, "rb", progress_window.update_progress) @@ -282,20 +297,6 @@ transient_for=self.chat_control.parent_win.window) raise # fill error log with useful information - slot = stanza.getTag("slot") - if not slot: - progress_window.close_dialog() - log.error("got unexpected stanza: "+str(stanza)) - error = stanza.getTag("error") - if error and error.getTag("text"): - ErrorDialog(_('Could not request upload slot'), - _('Got unexpected response from server: ') + str(error.getTagData("text")), - transient_for=self.chat_control.parent_win.window) - else: - ErrorDialog(_('Could not request upload slot'), - _('Got unexpected response from server (protocol mismatch??)'), - transient_for=self.chat_control.parent_win.window) - return put = slot.getTag("put") get = slot.getTag("get") if not put or not get: @@ -318,7 +319,12 @@ progress_messages.put(_('Calculating (possible) image thumbnail...')) thumb = None quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) - if pil_available: + with open(path_to_file, 'rb') as content_file: + thumb = urllib2.quote(base64.standard_b64encode(content_file.read()), '') + if thumb and len(thumb) < max_thumbnail_size: + quality = 100 + log.info("Image small enough (%d bytes), not resampling" % len(thumb)) + elif pil_available: log.info("PIL available, using it for image downsampling") try: for quality in quality_steps: @@ -388,7 +394,7 @@ request = urllib2.Request(put.getData().encode("utf-8"), data=data, headers=headers) request.get_method = lambda: 'PUT' log.debug("opening urllib2 upload request...") - transfer = urllib2.urlopen(request) + transfer = urllib2.urlopen(request, timeout=30) log.debug("urllib2 upload request done, response code: " + str(transfer.getcode())) return transfer.getcode() except UploadAbortedException: @@ -401,8 +407,8 @@ raise # fill error log with useful information return 0 - log.info("Uploading file to " + str(put.getData())) - log.info("Please download from " + str(get.getData()) + " later") + log.info("Uploading file to '%s'..." % str(put.getData())) + log.info("Please download from '%s' later..." % str(get.getData())) gajim.thread_interface(uploader, [], upload_complete) diff -r 0cb31e935c60 -r 6549b16f8430 httpupload/manifest.ini --- a/httpupload/manifest.ini Thu Nov 12 22:35:42 2015 +0100 +++ b/httpupload/manifest.ini Fri Dec 11 03:57:10 2015 +0100 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.3.2 +version: 0.3.3 description: This plugin is designed to send a file to a contact or muc by using httpupload.<br/> Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>.<br/> Conversations supported this.<br/>

1 0

gajim: correctly announce that we support XEP-0249
by Gajim 02 Dec '15

02 Dec '15

changeset 9b0eab55e1eb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9b0eab55e1eb description: correctly announce that we support XEP-0249 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e6319cf6cb06 -r 9b0eab55e1eb src/common/gajim.py --- a/src/common/gajim.py Tue Dec 01 22:30:04 2015 +0100 +++ b/src/common/gajim.py Wed Dec 02 23:04:13 2015 +0100 @@ -231,7 +231,7 @@ nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512] + nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] # Optional features gajim supports per account gajim_optional_features = {}

1 0

gajim: send password of the room when we invite a contact in it....
by Gajim 02 Dec '15

02 Dec '15

changeset 428e281255a2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=428e281255a2 description: send password of the room when we invite a contact in it. Fixes #8197 diffstat: src/common/connection.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 9b0eab55e1eb -r 428e281255a2 src/common/connection.py --- a/src/common/connection.py Wed Dec 02 23:04:13 2015 +0100 +++ b/src/common/connection.py Wed Dec 02 23:05:10 2015 +0100 @@ -2982,6 +2982,9 @@ attrs['reason'] = reason if continue_tag: attrs['continue'] = 'true' + password = gajim.gc_passwords.get(room, '') + if password: + attrs['password'] = password c = message.addChild(name='x', attrs=attrs, namespace=nbxmpp.NS_CONFERENCE) self.connection.send(message)

1 0

gajim: correcly use the received password when we're invited to ...
by Gajim 02 Dec '15

02 Dec '15

changeset 671501e62f12 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=671501e62f12 description: correcly use the received password when we're invited to a password protected room diffstat: src/dialogs.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (17 lines): diff -r 428e281255a2 -r 671501e62f12 src/dialogs.py --- a/src/dialogs.py Wed Dec 02 23:05:10 2015 +0100 +++ b/src/dialogs.py Wed Dec 02 23:05:33 2015 +0100 @@ -4652,9 +4652,11 @@ try: if self.is_continued: gajim.interface.join_gc_room(self.account, self.room_jid, - gajim.nicks[self.account], None, is_continued=True) + gajim.nicks[self.account], self.password, + is_continued=True) else: - JoinGroupchatWindow(self.account, self.room_jid) + JoinGroupchatWindow(self.account, self.room_jid, + password=self.password) except GajimGeneralException: pass

1 0

gajim: Minor GUI fix
by Gajim 02 Dec '15

02 Dec '15

changeset cabbc6e03e90 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cabbc6e03e90 description: Minor GUI fix diffstat: data/gui/data_form_window.ui | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 671501e62f12 -r cabbc6e03e90 data/gui/data_form_window.ui --- a/data/gui/data_form_window.ui Wed Dec 02 23:05:33 2015 +0100 +++ b/data/gui/data_form_window.ui Wed Dec 02 23:05:54 2015 +0100 @@ -374,7 +374,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing>

1 0

gajim: do not set <no-permanent-storage/> hint for GPG encrypted...
by Gajim 02 Dec '15

02 Dec '15

changeset 7c5a5c4fa89d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=7c5a5c4fa89d description: do not set <no-permanent-storage/> hint for GPG encrypted messages. Fixes #8123 diffstat: src/common/connection.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 1afdd8382f0c -r 7c5a5c4fa89d src/common/connection.py --- a/src/common/connection.py Tue Nov 17 21:33:30 2015 +0100 +++ b/src/common/connection.py Sat Nov 21 14:31:07 2015 +0100 @@ -427,8 +427,6 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - msg_iq.addChild(name='no-permanent-store', - namespace=nbxmpp.NS_MSG_HINTS) if form_node: msg_iq.addChild(node=form_node)

1 0

gajim: add more arguments to paplay command. fixes #8192
by Gajim 02 Dec '15

02 Dec '15

changeset 8bacc6cd7994 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8bacc6cd7994 description: add more arguments to paplay command. fixes #8192 diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7c5a5c4fa89d -r 8bacc6cd7994 src/gui_interface.py --- a/src/gui_interface.py Sat Nov 21 14:31:07 2015 +0100 +++ b/src/gui_interface.py Sat Nov 21 14:39:36 2015 +0100 @@ -3019,7 +3019,7 @@ for command in commands: if helpers.is_in_path(command): if command == 'paplay': - command += ' -n gajim' + command += ' -n gajim --property=media.role=event' if command in ('aplay', 'play'): command += ' -q' elif command == 'ossplay':

1 0

gajim: do not loop requesting vcard when opening a chat window w...
by Gajim 02 Dec '15

02 Dec '15

changeset 6969902c82e4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6969902c82e4 description: do not loop requesting vcard when opening a chat window with ourself and we don't have a vcard stored on server diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 8bacc6cd7994 -r 6969902c82e4 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Nov 21 14:39:36 2015 +0100 +++ b/src/common/connection_handlers.py Sun Nov 22 15:14:07 2015 +0100 @@ -510,7 +510,7 @@ if id_ in self.groupchat_jids: frm = self.groupchat_jids[id_] del self.groupchat_jids[id_] - if frm and frm != our_jid: + if frm: # Write an empty file self._save_vcard_to_hd(frm, '') jid, resource = gajim.get_room_and_nick_from_fjid(frm)

1 0

gajim: do not try to connect to server over a plain (unencrypted...
by Gajim 02 Dec '15

02 Dec '15

changeset eb4e9d62cc3f in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=eb4e9d62cc3f description: do not try to connect to server over a plain (unencrypted) connexion by default. see #8193 diffstat: src/common/defs.py | 2 +- src/common/optparser.py | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletions(-) diffs (53 lines): diff -r 6969902c82e4 -r eb4e9d62cc3f src/common/defs.py --- a/src/common/defs.py Sun Nov 22 15:14:07 2015 +0100 +++ b/src/common/defs.py Sun Nov 22 20:09:54 2015 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.4' +version = '0.16.4.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, diff -r 6969902c82e4 -r eb4e9d62cc3f src/common/optparser.py --- a/src/common/optparser.py Sun Nov 22 15:14:07 2015 +0100 +++ b/src/common/optparser.py Sun Nov 22 20:09:54 2015 +0100 @@ -73,8 +73,13 @@ gajim.config.set(optname, value) else: if (optname, key) not in seen: + if optname in self.old_values: + self.old_values[optname][key] = {} + else: + self.old_values[optname] = {key: {}} gajim.config.add_per(optname, key) seen.add((optname, key)) + self.old_values[optname][key][subname] = value gajim.config.set_per(optname, key, subname, value) old_version = gajim.config.get('version') @@ -224,6 +229,8 @@ self.update_config_to_014900() if old < [0, 16, 0, 1] and new >= [0, 16, 0, 1]: self.update_config_to_01601() + if old < [0, 16, 4, 1] and new >= [0, 16, 4, 1]: + self.update_config_to_01641() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -919,3 +926,14 @@ gajim.config.set_per('accounts', account, 'last_mam_id', last_mam_id) gajim.config.set('version', '0.16.0.1') + + def update_config_to_01641(self): + print self.old_values['accounts'].keys() + for account in self.old_values['accounts'].keys(): + connection_types = self.old_values['accounts'][account][ + 'connection_types'].split() + if 'plain' in connection_types and len(connection_types) > 1: + connection_types.remove('plain') + gajim.config.set_per('accounts', account, 'connection_types', + ' '.join(connection_types)) + gajim.config.set('version', '0.16.4.1')

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2015