Commits February 2016

commits@gajim.org

1 participants
40 discussions

gajim: hide gajim-remote from system. Fixes #8212
by Gajim 22 Feb '16

22 Feb '16

changeset 1c2fba2fae78 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=1c2fba2fae78 description: hide gajim-remote from system. Fixes #8212 diffstat: data/gajim-remote.desktop.in.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (16 lines): diff -r 4a0bd3fea5e0 -r 1c2fba2fae78 data/gajim-remote.desktop.in.in --- a/data/gajim-remote.desktop.in.in Tue Dec 29 20:53:11 2015 +0100 +++ b/data/gajim-remote.desktop.in.in Sat Jan 02 16:26:22 2016 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; -_Name=Gajim Remote +_Name=Open URI using Gajim _Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; Version=1.0 Exec=gajim-remote handle_uri %u @@ -9,3 +9,4 @@ Terminal=false Type=Application MimeType=x-scheme-handler/xmpp; +NoDisplay=true

1 0

gajim: enable_esessions needs Gajim restart
by Gajim 21 Feb '16

21 Feb '16

changeset bb80a6a479d7 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=bb80a6a479d7 description: enable_esessions needs Gajim restart diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cf94a93437e8 -r bb80a6a479d7 src/common/config.py --- a/src/common/config.py Sun Feb 21 18:54:31 2016 +0100 +++ b/src/common/config.py Sun Feb 21 19:03:44 2016 +0100 @@ -347,7 +347,7 @@ 'keyid': [ opt_str, '', '', True ], 'gpg_sign_presence': [ opt_bool, True, _('If disabled, don\'t sign presences with GPG key, even if GPG is configured.') ], 'keyname': [ opt_str, '', '', True ], - 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.')], + 'enable_esessions': [opt_bool, True, _('Enable ESessions encryption for this account.'), True], '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')], 'tls_version': [ opt_str, '1.0', '' ],

1 0

gajim: added automatic_message flag to GcMessageOutgoingEvent (b...
by Gajim 21 Feb '16

21 Feb '16

changeset de72c20ba060 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=de72c20ba060 description: added automatic_message flag to GcMessageOutgoingEvent (bugfix) diffstat: src/common/connection_handlers_events.py | 1 + src/groupchat_control.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diffs (24 lines): diff -r bb80a6a479d7 -r de72c20ba060 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Feb 21 19:03:44 2016 +0100 +++ b/src/common/connection_handlers_events.py Sun Feb 21 16:45:31 2016 +0100 @@ -2695,6 +2695,7 @@ self.is_loggable = True self.control = None self.correction_msg = None + self.automatic_message = True def generate(self): return True diff -r bb80a6a479d7 -r de72c20ba060 src/groupchat_control.py --- a/src/groupchat_control.py Sun Feb 21 19:03:44 2016 +0100 +++ b/src/groupchat_control.py Sun Feb 21 16:45:31 2016 +0100 @@ -2021,7 +2021,8 @@ gajim.nec.push_outgoing_event(GcMessageOutgoingEvent(None, account=self.account, jid=self.room_jid, message=message, xhtml=xhtml, label=label, callback=_cb, - callback_args=[_cb] + [message], correction_msg=correction_msg)) + callback_args=[_cb] + [message], correction_msg=correction_msg, + automatic_message=False)) self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus()

1 0

gajim: make the choose_gpg_key working
by Gajim 21 Feb '16

21 Feb '16

changeset 11f067da78c6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=11f067da78c6 description: make the choose_gpg_key working diffstat: data/gui/choose_gpg_key_dialog.ui | 2 +- src/dialogs.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diffs (34 lines): diff -r 3b25f8dac5f6 -r 11f067da78c6 data/gui/choose_gpg_key_dialog.ui --- a/data/gui/choose_gpg_key_dialog.ui Sun Feb 21 11:07:04 2016 +0100 +++ b/data/gui/choose_gpg_key_dialog.ui Sun Feb 21 14:04:31 2016 +0100 @@ -100,7 +100,7 @@ </child> </object> <packing> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> <property name="position">2</property> </packing> diff -r 3b25f8dac5f6 -r 11f067da78c6 src/dialogs.py --- a/src/dialogs.py Sun Feb 21 11:07:04 2016 +0100 +++ b/src/dialogs.py Sun Feb 21 14:04:31 2016 +0100 @@ -302,12 +302,14 @@ self.keys_treeview.set_model(model) #columns renderer = Gtk.CellRendererText() - col = self.keys_treeview.insert_column_with_attributes(-1, _('KeyID'), - renderer, text=0) + self.keys_treeview.insert_column_with_attributes(-1, _('KeyID'), + renderer, text=0) + col = self.keys_treeview.get_column(0) col.set_sort_column_id(0) renderer = Gtk.CellRendererText() - col = self.keys_treeview.insert_column_with_attributes(-1, - _('Contact name'), renderer, text=1) + self.keys_treeview.insert_column_with_attributes(-1, _('Contact name'), + renderer, text=1) + col = self.keys_treeview.get_column(1) col.set_sort_column_id(1) self.keys_treeview.set_search_column(1) self.fill_tree(secret_keys, selected)

1 0

gajim: make GPG work with gpg2 binary if present. Fixes #8268
by Gajim 21 Feb '16

21 Feb '16

changeset cf94a93437e8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=cf94a93437e8 description: make GPG work with gpg2 binary if present. Fixes #8268 diffstat: src/common/gajim.py | 17 ++++++++++++----- src/common/gpg.py | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diffs (55 lines): diff -r 11f067da78c6 -r cf94a93437e8 src/common/gajim.py --- a/src/common/gajim.py Sun Feb 21 14:04:31 2016 +0100 +++ b/src/common/gajim.py Sun Feb 21 18:54:31 2016 +0100 @@ -160,6 +160,7 @@ HAVE_PYCRYPTO = False HAVE_GPG = True +GPG_BINARY = 'gpg' try: __import__('common.gnupg', globals(), locals(), [], 0) except ImportError: @@ -167,11 +168,17 @@ else: import os import subprocess - if os.name == 'nt': - gpg_cmd = 'gpg -h >nul 2>&1' - else: - gpg_cmd = 'gpg -h >/dev/null 2>&1' - if subprocess.call(gpg_cmd, shell=True): + def test_gpg(binary='gpg'): + if os.name == 'nt': + gpg_cmd = binary + ' -h >nul 2>&1' + else: + gpg_cmd = binary + ' -h >/dev/null 2>&1' + if subprocess.call(gpg_cmd, shell=True): + return False + return True + if test_gpg(binary='gpg2'): + GPG_BINARY = 'gpg2' + if not test_gpg(binary='gpg'): HAVE_GPG = False HAVE_PYOPENSSL = True diff -r 11f067da78c6 -r cf94a93437e8 src/common/gpg.py --- a/src/common/gpg.py Sun Feb 21 14:04:31 2016 +0100 +++ b/src/common/gpg.py Sun Feb 21 18:54:31 2016 +0100 @@ -22,7 +22,7 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -from common.gajim import HAVE_GPG +from common.gajim import HAVE_GPG, GPG_BINARY import os if HAVE_GPG: @@ -30,7 +30,7 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): - gnupg.GPG.__init__(self) + gnupg.GPG.__init__(self, gpgbinary=GPG_BINARY) self.encoding = 'utf-8' self.decode_errors = 'replace' self.passphrase = None

1 0

gajim: add advanced option to put the roster on the right in sin...
by Gajim 21 Feb '16

21 Feb '16

changeset 3b25f8dac5f6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3b25f8dac5f6 description: add advanced option to put the roster on the right in single window mode. Fixes #4679 diffstat: src/common/config.py | 1 + src/message_window.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diffs (33 lines): diff -r b06b678cf767 -r 3b25f8dac5f6 src/common/config.py --- a/src/common/config.py Sun Feb 21 10:32:55 2016 +0100 +++ b/src/common/config.py Sun Feb 21 11:07:04 2016 +0100 @@ -164,6 +164,7 @@ 'roster_width': [ opt_int, 200 ], 'roster_height': [ opt_int, 400 ], 'roster_hpaned_position': [opt_int, 200], + 'roster_on_the_right': [opt_bool, False, _('Place the roster on the right in single window mode'), True], 'history_window_width': [ opt_int, 650 ], 'history_window_height': [ opt_int, 450 ], 'history_window_x-position': [ opt_int, 0 ], diff -r b06b678cf767 -r 3b25f8dac5f6 src/message_window.py --- a/src/message_window.py Sun Feb 21 10:32:55 2016 +0100 +++ b/src/message_window.py Sun Feb 21 11:07:04 2016 +0100 @@ -86,8 +86,16 @@ self.parent_paned = parent_paned old_parent = self.notebook.get_parent() old_parent.remove(self.notebook) - self.parent_paned.add(self.notebook) - self.parent_paned.pack2(self.notebook, resize=True, shrink=True) + if gajim.config.get('roster_on_the_right'): + child1 = self.parent_paned.get_child1() + self.parent_paned.remove(child1) + self.parent_paned.add(self.notebook) + self.parent_paned.pack1(self.notebook, resize=False, + shrink=True) + self.parent_paned.pack2(child1, resize=True, shrink=True) + else: + self.parent_paned.add(self.notebook) + self.parent_paned.pack2(self.notebook, resize=True, shrink=True) gajim.interface.roster.xml.get_object('show_roster_menuitem').\ set_sensitive(True) orig_window.destroy()

1 0

gajim: keep window size in single window mode even when no tab i...
by Gajim 21 Feb '16

21 Feb '16

changeset b06b678cf767 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=b06b678cf767 description: keep window size in single window mode even when no tab is opened. Fixes #7823 diffstat: src/gui_interface.py | 5 +++++ src/message_window.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletions(-) diffs (37 lines): diff -r 6ba965049384 -r b06b678cf767 src/gui_interface.py --- a/src/gui_interface.py Sun Feb 21 10:25:45 2016 +0100 +++ b/src/gui_interface.py Sun Feb 21 10:32:55 2016 +0100 @@ -64,6 +64,7 @@ from chat_control import ChatControl from groupchat_control import GroupchatControl from groupchat_control import PrivateChatControl +from message_window import MessageWindowMgr from atom_window import AtomWindow from session import ChatControlSession @@ -2710,6 +2711,10 @@ self.show_systray() self.roster = roster_window.RosterWindow() + if self.msg_win_mgr.mode == \ + MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: + self.msg_win_mgr.create_window(None, None, None) + # Creating plugin manager import plugins gajim.plugin_manager = plugins.PluginManager() diff -r 6ba965049384 -r b06b678cf767 src/message_window.py --- a/src/message_window.py Sun Feb 21 10:25:45 2016 +0100 +++ b/src/message_window.py Sun Feb 21 10:32:55 2016 +0100 @@ -601,7 +601,10 @@ ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) def check_tabs(self): - if self.get_num_controls() == 0: + if self.parent_paned: + # Do nothing in single window mode + pass + elif self.get_num_controls() == 0: # These are not called when the window is destroyed like this, fake it gajim.interface.msg_win_mgr._on_window_delete(self.window, None) gajim.interface.msg_win_mgr._on_window_destroy(self.window)

1 0

gajim: prevent crash when a plugin is wrong.
by Gajim 21 Feb '16

21 Feb '16

changeset 6ba965049384 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6ba965049384 description: prevent crash when a plugin is wrong. diffstat: src/plugins/pluginmanager.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (16 lines): diff -r 54c4649f14d3 -r 6ba965049384 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Feb 20 21:28:34 2016 +0100 +++ b/src/plugins/pluginmanager.py Sun Feb 21 10:25:45 2016 +0100 @@ -480,10 +480,8 @@ continue try: module = __import__(module_name) - except ValueError as value_error: - log.debug(str(value_error)) - except ImportError as import_error: - log.debug(str(import_error)) + except (ValueError, ImportError, AttributeError) as error: + log.debug(str(error)) if module is None: continue

1 0

gajim: ignore wrong stanza. Fixes #8205
by Gajim 20 Feb '16

20 Feb '16

changeset 54c4649f14d3 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=54c4649f14d3 description: ignore wrong stanza. Fixes #8205 diffstat: src/common/connection_handlers_events.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r c7c3d91ea83e -r 54c4649f14d3 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Feb 20 21:36:24 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Feb 20 21:28:34 2016 +0100 @@ -1243,6 +1243,8 @@ feature = self.stanza.getTag(name='feature', namespace=nbxmpp.NS_FEATURE) form = nbxmpp.DataForm(node=feature.getTag('x')) + if not form: + return if form['FORM_TYPE'] == 'urn:xmpp:ssn': self.session.handle_negotiation(form)

1 0

gajim: [gdr_gdr] Add a file transfer completed event. Fixes # 8266
by Gajim 20 Feb '16

20 Feb '16

changeset c7c3d91ea83e in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c7c3d91ea83e description: [gdr_gdr] Add a file transfer completed event. Fixes # 8266 diffstat: src/common/connection_handlers_events.py | 9 +++++++++ src/gui_interface.py | 4 +++- 2 files changed, 12 insertions(+), 1 deletions(-) diffs (40 lines): diff -r f2c55663bef2 -r c7c3d91ea83e src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Feb 20 21:16:16 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Feb 20 21:36:24 2016 +0100 @@ -2310,6 +2310,15 @@ self.jid = gajim.get_jid_without_resource(self.jid) return True +class FileTransferCompletedEvent(nec.NetworkIncomingEvent): + name = 'file-transfer-completed' + base_network_events = [] + + def generate(self): + jid = unicode(self.file_props.receiver) + self.jid = gajim.get_jid_without_resource(jid) + return True + class GatewayPromptReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'gateway-prompt-received' base_network_events = [] diff -r f2c55663bef2 -r c7c3d91ea83e src/gui_interface.py --- a/src/gui_interface.py Sat Feb 20 21:16:16 2016 +0100 +++ b/src/gui_interface.py Sat Feb 20 21:36:24 2016 +0100 @@ -82,7 +82,7 @@ from common import passwords from common import logging_helpers from common.connection_handlers_events import OurShowEvent, \ - FileRequestErrorEvent, InformationEvent + FileRequestErrorEvent, FileTransferCompletedEvent, InformationEvent from common.connection import Connection from common import jingle from common.file_props import FilesProp @@ -996,6 +996,8 @@ if file_props.error == 0: ft.set_progress(file_props.type_, file_props.sid, file_props.received_len) + gajim.nec.push_incoming_event(FileTransferCompletedEvent(None, + file_props=file_props)) else: ft.set_status(file_props, 'stop') if file_props.stalled or file_props.paused:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2016