Commits

commits@gajim.org

17632 discussions

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

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

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