Commits December 2015

commits@gajim.org

1 participants
53 discussions

gajim: once we are connected to a server with starttls, don't tr...
by Gajim 02 Dec '15

02 Dec '15

changeset a3e180cba574 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a3e180cba574 description: once we are connected to a server with starttls, don't try to connect with the legacy port diffstat: src/common/connection.py | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diffs (27 lines): diff -r eb4e9d62cc3f -r a3e180cba574 src/common/connection.py --- a/src/common/connection.py Sun Nov 22 20:09:54 2015 +0100 +++ b/src/common/connection.py Sun Nov 22 20:10:33 2015 +0100 @@ -1215,7 +1215,7 @@ self._connection_types = gajim.config.get_per('accounts', self.name, 'connection_types').split() else: - self._connection_types = ['tls', 'ssl', 'plain'] + self._connection_types = ['tls', 'ssl'] if self.last_connection_type: if self.last_connection_type in self._connection_types: self._connection_types.remove(self.last_connection_type) @@ -1420,6 +1420,14 @@ self._current_host['host'], self._current_host['port'], con_type)) self.last_connection_type = con_type + if con_type == 'tls' and 'ssl' in self._connection_types: + # we were about to try ssl after tls, but tls succeed, so + # definitively stop trying ssl + con_types = gajim.config.get_per('accounts', self.name, + 'connection_types').split() + con_types.remove('ssl') + gajim.config.set_per('accounts', self.name, 'connection_types', + ' '.join(con_types)) if gajim.config.get_per('accounts', self.name, 'anonymous_auth'): name = None else:

1 0

gajim: set the focus on message textview in chat control only fo...
by Gajim 02 Dec '15

02 Dec '15

changeset da37486e4f49 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=da37486e4f49 description: set the focus on message textview in chat control only for the first opened tab. Fixes #7903 diffstat: src/message_window.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a3e180cba574 -r da37486e4f49 src/message_window.py --- a/src/message_window.py Sun Nov 22 20:10:33 2015 +0100 +++ b/src/message_window.py Mon Nov 23 22:05:19 2015 +0100 @@ -315,7 +315,8 @@ # NOTE: we do not call set_control_active(True) since we don't know # whether the tab is the active one. self.show_title() - GLib.timeout_add(500, control.msg_textview.grab_focus) + if self.get_num_controls() == 1: + GLib.timeout_add(500, control.msg_textview.grab_focus) def on_tab_eventbox_button_press_event(self, widget, event, child): if event.button == 3: # right click

1 0

gajim: remove debug print
by Gajim 02 Dec '15

02 Dec '15

changeset c352fb5668bb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c352fb5668bb description: remove debug print diffstat: src/common/optparser.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r da37486e4f49 -r c352fb5668bb src/common/optparser.py --- a/src/common/optparser.py Mon Nov 23 22:05:19 2015 +0100 +++ b/src/common/optparser.py Tue Nov 24 20:16:00 2015 +0100 @@ -928,7 +928,6 @@ 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()

1 0

gajim: do not traceback when we receive a corboned message sent ...
by Gajim 02 Dec '15

02 Dec '15

changeset 44fc9372982c in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=44fc9372982c description: do not traceback when we receive a corboned message sent without a to attribute. Fixes #8194 diffstat: src/common/connection_handlers_events.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r c352fb5668bb -r 44fc9372982c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Nov 24 20:16:00 2015 +0100 +++ b/src/common/connection_handlers_events.py Tue Nov 24 21:07:59 2015 +0100 @@ -1147,6 +1147,8 @@ if not frm: frm = gajim.get_jid_from_account(account) self.stanza.setTo(frm) + if not to: + to = gajim.get_jid_from_account(account) self.stanza.setFrom(to) self.sent = True try:

1 0

gajim: correctly install gajim-remote.desktop file.
by Gajim 02 Dec '15

02 Dec '15

changeset e6319cf6cb06 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e6319cf6cb06 description: correctly install gajim-remote.desktop file. diffstat: autogen.sh | 2 +- configure.ac | 1 + data/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diffs (43 lines): diff -r 44fc9372982c -r e6319cf6cb06 autogen.sh --- a/autogen.sh Tue Nov 24 21:07:59 2015 +0100 +++ b/autogen.sh Tue Dec 01 22:30:04 2015 +0100 @@ -14,7 +14,7 @@ echo "[encoding: UTF-8]" > po/POTFILES.in \ && for p in `ls data/gui/*.ui`; do echo "[type: gettext/glade]$p" >> \ po/POTFILES.in; done \ - && ls -1 data/gajim.desktop.in.in \ + && ls -1 data/gajim.desktop.in.in data/gajim-remote.desktop.in.in \ src/*.py src/common/*.py src/command_system/*.py src/command_system/implementation/*.py src/common/zeroconf/*.py src/plugins/*.py | grep -v ipython_view.py >> \ po/POTFILES.in \ && echo -e "data/gajim.desktop.in\nsrc/ipython_view.py" > po/POTFILES.skip || exit 1 diff -r 44fc9372982c -r e6319cf6cb06 configure.ac --- a/configure.ac Tue Nov 24 21:07:59 2015 +0100 +++ b/configure.ac Tue Dec 01 22:30:04 2015 +0100 @@ -73,6 +73,7 @@ data/activities/Makefile icons/Makefile data/gajim.desktop.in + data/gajim-remote.desktop.in data/defs.py src/Makefile scripts/gajim diff -r 44fc9372982c -r e6319cf6cb06 data/Makefile.am --- a/data/Makefile.am Tue Nov 24 21:07:59 2015 +0100 +++ b/data/Makefile.am Tue Dec 01 22:30:04 2015 +0100 @@ -2,7 +2,7 @@ @INTLTOOL_DESKTOP_RULE@ desktopdir = $(datadir)/applications -desktop_in_files = gajim.desktop.in.in +desktop_in_files = gajim.desktop.in.in gajim-remote.desktop.in.in desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop) installdefsdir = $(gajim_srcdir)/common @@ -29,6 +29,6 @@ DISTCLEANFILES = $(desktop_DATA) \ $(installdefs_DATA) -CLEANFILES = gajim.desktop +CLEANFILES = gajim.desktop gajim-remote.desktop MAINTAINERCLEANFILES = Makefile.in

1 0

gajim: stop requesting MAM archive when we get the complete='tru...
by Gajim 02 Dec '15

02 Dec '15

changeset 4af81ddbeddb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4af81ddbeddb description: stop requesting MAM archive when we get the complete='true' attribute. Fixes #8170 diffstat: src/common/message_archiving.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (14 lines): diff -r dd2895ccf0e3 -r 4af81ddbeddb src/common/message_archiving.py --- a/src/common/message_archiving.py Mon Nov 23 20:45:21 2015 +0100 +++ b/src/common/message_archiving.py Sat Oct 24 13:32:07 2015 +0200 @@ -103,7 +103,9 @@ last = set_.getTagData('last') if last: gajim.config.set_per('accounts', self.name, 'last_mam_id', last) - self.request_archive(after=last) + complete = fin_.getAttr('complete') + if complete != 'true': + self.request_archive(after=last) del self.awaiting_answers[queryid_]

1 0

gajim: Correctly check and handle the case when we don't trust o...
by Gajim 02 Dec '15

02 Dec '15

changeset 0a2b25d73301 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0a2b25d73301 description: Correctly check and handle the case when we don't trust our own key. Fixes #8122 diffstat: src/common/connection.py | 5 +++-- src/common/gpg.py | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diffs (45 lines): diff -r 4af81ddbeddb -r 0a2b25d73301 src/common/connection.py --- a/src/common/connection.py Sat Oct 24 13:32:07 2015 +0200 +++ b/src/common/connection.py Sun Nov 01 16:30:27 2015 +0100 @@ -321,7 +321,7 @@ always_trust) def _on_encrypted(output): msgenc, error = output - if error == 'NOT_TRUSTED': + if error.startswith( 'NOT_TRUSTED'): def _on_always_trust(answer): if answer: gajim.thread_interface(encrypt_thread, [msg, keyID, @@ -334,7 +334,8 @@ form_node, user_nick, keyID, attention, correction_msg, callback) gajim.nec.push_incoming_event(GPGTrustKeyEvent(None, - conn=self, keyID=keyID, callback=_on_always_trust)) + conn=self, keyID=error.split(' ')[-1], + callback=_on_always_trust)) else: self._message_encrypted_cb(output, type_, msg, msgtxt, original_message, fjid, resource, jid, xhtml, diff -r 4af81ddbeddb -r 0a2b25d73301 src/common/gpg.py --- a/src/common/gpg.py Sat Oct 24 13:32:07 2015 +0200 +++ b/src/common/gpg.py Sun Nov 01 16:30:27 2015 +0100 @@ -50,6 +50,7 @@ def encrypt(self, str_, recipients, always_trust=False): trust = always_trust if not trust: + # check if we trust all keys trust = True for key in recipients: if key not in self.always_trust: @@ -59,7 +60,10 @@ result = super(GnuPG, self).list_keys(keys=recipients) for key in result: if key['trust'] not in ('f', 'u'): - return '', 'NOT_TRUSTED' + if key['keyid'][-8:] not in self.always_trust: + return '', 'NOT_TRUSTED ' + key['keyid'][-8:] + else: + trust = True result = super(GnuPG, self).encrypt(str_, recipients, always_trust=trust, passphrase=self.passphrase)

1 0

gajim: do not delay the import of libxml2, it's needed by gst. F...
by Gajim 02 Dec '15

02 Dec '15

changeset cca8b38830cf in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cca8b38830cf description: do not delay the import of libxml2, it's needed by gst. Fixes #7836 diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0a2b25d73301 -r cca8b38830cf src/gajim.py --- a/src/gajim.py Sun Nov 01 16:30:27 2015 +0100 +++ b/src/gajim.py Wed Nov 04 21:54:24 2015 +0100 @@ -96,7 +96,7 @@ # 'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto', # 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', # 'Crypto.PublicKey', 'IPython', 'contextlib', 'imp', 'monotonic', -# 'gtkexcepthook'] +# 'gtkexcepthook', 'libxml2', 'libxml2mod'] if os.name == 'nt': import locale

1 0

gajim: keep image tags when we replace the temporary image by th...
by Gajim 02 Dec '15

02 Dec '15

changeset d784a98d301a in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d784a98d301a description: keep image tags when we replace the temporary image by the downloaded image. Fixes #8182 diffstat: src/htmltextview.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diffs (54 lines): diff -r cca8b38830cf -r d784a98d301a src/htmltextview.py --- a/src/htmltextview.py Wed Nov 04 21:54:24 2015 +0100 +++ b/src/htmltextview.py Sun Nov 15 14:28:31 2015 +0100 @@ -521,11 +521,11 @@ tag.title = title return tag - def _update_img(self, output, attrs, img_mark): + def _update_img(self, output, attrs, img_mark, tags): '''Callback function called after the function helpers.download_image. ''' mem, alt = output - self._process_img(attrs, (mem, alt, img_mark)) + self._process_img(attrs, (mem, alt, img_mark, tags)) def _process_img(self, attrs, loaded=None): '''Process a img tag. @@ -534,6 +534,7 @@ update = False pixbuf = None replace_mark = None + replace_tags = None try: if attrs['src'].startswith('data:image/'): @@ -543,14 +544,14 @@ mem = base64.standard_b64decode(urllib.parse.unquote( img).encode('utf-8')) elif loaded is not None: - (mem, alt, replace_mark) = loaded + (mem, alt, replace_mark, replace_tags) = loaded update = True else: if self.conv_textview: img_mark = self.textbuf.create_mark(None, self.iter, True) gajim.thread_interface(helpers.download_image, [ self.conv_textview.account, attrs], self._update_img, - [attrs, img_mark]) + [attrs, img_mark, self._get_style_tags()]) alt = attrs.get('alt', '') if alt: alt += '\n' @@ -608,7 +609,10 @@ self.textbuf.delete(working_iter, next_iter) self.textbuf.delete_mark(replace_mark) if pixbuf is not None: - tags = self._get_style_tags() + if replace_mark: + tags = replace_tags + else: + tags = self._get_style_tags() if tags: tmpmark = self.textbuf.create_mark(None, working_iter, True) self.textbuf.insert_pixbuf(working_iter, pixbuf)

1 0

gajim: do not crash when we remove a contact for which neerby co...
by Gajim 02 Dec '15

02 Dec '15

changeset fe0edaff4d8d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=fe0edaff4d8d description: do not crash when we remove a contact for which neerby contcts are not in the same accounts. Fixes #8157 diffstat: src/common/contacts.py | 2 ++ src/roster_window.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diffs (24 lines): diff -r d784a98d301a -r fe0edaff4d8d src/common/contacts.py --- a/src/common/contacts.py Sun Nov 15 14:28:31 2015 +0100 +++ b/src/common/contacts.py Sun Nov 15 21:07:02 2015 +0100 @@ -840,6 +840,8 @@ # we want one nearby_family per account nearby_family = [data for data in family if account == data['account']] + if not nearby_family: + return (None, None, None) big_brother_data = self._get_metacontacts_big_brother(nearby_family) big_brother_jid = big_brother_data['jid'] big_brother_account = big_brother_data['account'] diff -r d784a98d301a -r fe0edaff4d8d src/roster_window.py --- a/src/roster_window.py Sun Nov 15 14:28:31 2015 +0100 +++ b/src/roster_window.py Sun Nov 15 21:07:02 2015 +0100 @@ -491,6 +491,8 @@ nearby_family, big_brother_jid, big_brother_account = \ self._get_nearby_family_and_big_brother(family, account) + if not big_brother_jid: + return [] big_brother_contact = gajim.contacts.get_first_contact_from_jid( big_brother_account, big_brother_jid)

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