Commits November 2015

commits@gajim.org

1 participants
24 discussions

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

24 Nov '15

changeset 9117874b200f 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=9117874b200f 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 9649c5ef5ec2 -r 9117874b200f 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: remove debug print
by Gajim 24 Nov '15

24 Nov '15

changeset 9649c5ef5ec2 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=9649c5ef5ec2 description: remove debug print diffstat: src/common/optparser.py | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r ad1009135fb6 -r 9649c5ef5ec2 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 @@ -938,7 +938,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

python-nbxmpp: Fixes error loading non-ascii characters in cert ...
by Python-nbxmpp 23 Nov '15

23 Nov '15

changeset 2b837401ad95 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=2b837401ad95 description: Fixes error loading non-ascii characters in cert name diffstat: nbxmpp/tls_nb.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 60c341b966b1 -r 2b837401ad95 nbxmpp/tls_nb.py --- a/nbxmpp/tls_nb.py Sun Sep 13 15:14:31 2015 +0200 +++ b/nbxmpp/tls_nb.py Mon Nov 23 17:33:14 2015 -0400 @@ -350,7 +350,7 @@ cert = ''.join(lines[begin:i+2]) try: x509cert = OpenSSL.crypto.load_certificate( - OpenSSL.crypto.FILETYPE_PEM, cert) + OpenSSL.crypto.FILETYPE_PEM, cert.encode('ascii', 'ignore')) cert_store.add_cert(x509cert) except OpenSSL.crypto.Error as exception_obj: if logg:

1 0

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

23 Nov '15

changeset ad1009135fb6 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=ad1009135fb6 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 2a3a87de386a -r ad1009135fb6 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 @@ -311,7 +311,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() - gobject.timeout_add(500, control.msg_textview.grab_focus) + if self.get_num_controls() == 1: + gobject.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: fix a few minor GTK3 things
by Gajim 23 Nov '15

23 Nov '15

changeset dd2895ccf0e3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=dd2895ccf0e3 description: fix a few minor GTK3 things diffstat: data/gui/accounts_window.ui | 4 +++- data/gui/change_status_message_dialog.ui | 1 - src/gajim.py | 2 +- src/gtkgui_helpers.py | 2 +- src/history_manager.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diffs (70 lines): diff -r 1ed738505694 -r dd2895ccf0e3 data/gui/accounts_window.ui --- a/data/gui/accounts_window.ui Mon Nov 23 20:41:29 2015 +0100 +++ b/data/gui/accounts_window.ui Mon Nov 23 20:45:21 2015 +0100 @@ -192,6 +192,7 @@ <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="border_width">6</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> @@ -586,9 +587,10 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="active">True</property> <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_sync_logs_with_server_checkbutton_toggled"/> + <signal name="toggled" handler="on_sync_logs_with_server_checkbutton_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> diff -r 1ed738505694 -r dd2895ccf0e3 data/gui/change_status_message_dialog.ui --- a/data/gui/change_status_message_dialog.ui Mon Nov 23 20:41:29 2015 +0100 +++ b/data/gui/change_status_message_dialog.ui Mon Nov 23 20:45:21 2015 +0100 @@ -71,7 +71,6 @@ <object class="GtkBox" id="vbox112"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_left">12</property> <property name="border_width">6</property> <property name="orientation">vertical</property> <property name="spacing">6</property> diff -r 1ed738505694 -r dd2895ccf0e3 src/gajim.py --- a/src/gajim.py Mon Nov 23 20:41:29 2015 +0100 +++ b/src/gajim.py Mon Nov 23 20:45:21 2015 +0100 @@ -459,7 +459,7 @@ pixs.append(pix) if pixs: # set the icon to all windows - Gtk.Window.set_default_icon_list(*pixs) + Gtk.Window.set_default_icon_list(pixs) pritext = _('Gajim is already running') sectext = _('Another instance of Gajim seems to be running\nRun anyway?') dialog = dialogs.YesNoDialog(pritext, sectext) diff -r 1ed738505694 -r dd2895ccf0e3 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Mon Nov 23 20:41:29 2015 +0100 +++ b/src/gtkgui_helpers.py Mon Nov 23 20:45:21 2015 +0100 @@ -139,7 +139,7 @@ x = window_x + button_x y = window_y + button_y - menu_height = menu.size_request().height + menu_height = menu.get_preferred_size()[0].height ## should we pop down or up? if (y + alloc.height + menu_height < Gdk.Screen.height()): diff -r 1ed738505694 -r dd2895ccf0e3 src/history_manager.py --- a/src/history_manager.py Mon Nov 23 20:41:29 2015 +0100 +++ b/src/history_manager.py Mon Nov 23 20:45:21 2015 +0100 @@ -121,7 +121,7 @@ pixs.append(pix) if pixs: # set the icon to all windows - Gtk.Window.set_default_icon_list(*pixs) + Gtk.Window.set_default_icon_list(pixs) if not os.path.exists(LOG_DB_PATH): dialogs.ErrorDialog(_('Cannot find history logs database'),

1 0

gajim: fix FT window
by Gajim 23 Nov '15

23 Nov '15

changeset 1ed738505694 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=1ed738505694 description: fix FT window diffstat: data/gui/filetransfers.ui | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 88e065a27a6a -r 1ed738505694 data/gui/filetransfers.ui --- a/data/gui/filetransfers.ui Sun Nov 22 17:23:58 2015 -0400 +++ b/data/gui/filetransfers.ui Mon Nov 23 20:41:29 2015 +0100 @@ -84,6 +84,7 @@ <object class="GtkBox" id="vbox1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="transfers_scrolledwindow">

1 0

gajim: remove unnecessary argument in new_with_label call
by Gajim 22 Nov '15

22 Nov '15

changeset 88e065a27a6a in /home/hg/repos/gajim author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=88e065a27a6a description: remove unnecessary argument in new_with_label call diffstat: src/statusicon.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 36007a9ce420 -r 88e065a27a6a src/statusicon.py --- a/src/statusicon.py Mon Nov 16 17:58:18 2015 -0400 +++ b/src/statusicon.py Sun Nov 22 17:23:58 2015 -0400 @@ -324,7 +324,7 @@ # join gc gc_item = Gtk.MenuItem.new_with_label( - _('using account %s') % account, use_underline=False) + _('using account %s') % account) gc_sub_menu.append(gc_item) gc_menuitem_menu = Gtk.Menu() gajim.interface.roster.add_bookmarks_list(gc_menuitem_menu,

1 0

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

22 Nov '15

changeset e2baee0d3132 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=e2baee0d3132 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 41a51066b56f -r e2baee0d3132 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 41a51066b56f -r e2baee0d3132 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 @@ -76,8 +76,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') @@ -234,6 +239,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() @@ -929,3 +936,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

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

22 Nov '15

changeset 2a3a87de386a 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=2a3a87de386a 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 e2baee0d3132 -r 2a3a87de386a 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 @@ -1214,7 +1214,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) @@ -1419,6 +1419,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: do not loop requesting vcard when opening a chat window w...
by Gajim 22 Nov '15

22 Nov '15

changeset 41a51066b56f 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=41a51066b56f 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 939ae47ed473 -r 41a51066b56f 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 @@ -511,7 +511,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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2015