Commits

commits@gajim.org

17632 discussions

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

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

20 Feb '16

changeset 55cc03b5b157 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=55cc03b5b157 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 a43f0fa77a26 -r 55cc03b5b157 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 17 20:54:20 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] Prevent traceback. Fixes #8265
by Gajim 20 Feb '16

20 Feb '16

changeset f2c55663bef2 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f2c55663bef2 description: [gdr_gdr] Prevent traceback. Fixes #8265 diffstat: src/common/protocol/bytestream.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (15 lines): diff -r 8ae55b949235 -r f2c55663bef2 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Feb 20 20:04:47 2016 +0100 +++ b/src/common/protocol/bytestream.py Sat Feb 20 21:16:16 2016 +0100 @@ -199,8 +199,9 @@ if not self.connection or self.connected < 2: return if file_props.session_type == 'jingle': - jingle = self._sessions[file_props.sid] - jingle.cancel_session() + if file_props.sid in self._sessions: + jingle = self._sessions[file_props.sid] + jingle.cancel_session() return iq = nbxmpp.Iq(to=file_props.sender, typ='error') iq.setAttr('id', file_props.request_id)

1 0

gajim: reply to message receipt only when we are the recipient o...
by Gajim 20 Feb '16

20 Feb '16

changeset 8ae55b949235 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8ae55b949235 description: reply to message receipt only when we are the recipient of the message. see #7548. [tmolitor] display message receipt (xep 0184) for carbon copied messages. Fixes #8258 diffstat: src/common/connection_handlers.py | 12 ++++++++++-- src/common/connection_handlers_events.py | 3 +++ src/roster_window.py | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diffs (62 lines): diff -r dc4cdb3dd133 -r 8ae55b949235 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Feb 20 15:59:01 2016 +0100 +++ b/src/common/connection_handlers.py Sat Feb 20 20:04:47 2016 +0100 @@ -1169,12 +1169,20 @@ contact = gajim.contacts.get_contact(self.name, obj.jid) nick = obj.resource gc_contact = gajim.contacts.get_gc_contact(self.name, obj.jid, nick) + jid_to = obj.stanza.getTo() + reply = False + if not jid_to: + reply = True + else: + fjid_to = helpers.parse_jid(str(jid_to)) + jid_to = gajim.get_jid_without_resource(fjid_to) + if jid_to == gajim.get_jid_from_account(self.name): + reply = True if obj.receipt_request_tag and gajim.config.get_per('accounts', self.name, 'answer_receipts') and ((contact and contact.sub \ not in ('to', 'none')) or gc_contact) and obj.mtype != 'error' and \ - not obj.forwarded: + reply: receipt = nbxmpp.Message(to=obj.fjid, typ='chat') - receipt.setID(obj.id_) receipt.setTag('received', namespace='urn:xmpp:receipts', attrs={'id': obj.id_}) diff -r dc4cdb3dd133 -r 8ae55b949235 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Feb 20 15:59:01 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Feb 20 20:04:47 2016 +0100 @@ -2349,6 +2349,9 @@ self.control_focused = True def handle_incoming_msg_event(self, msg_obj): + # don't alert for carbon copied messages from ourselves + if msg_obj.sent: + return if not msg_obj.msgtxt: return self.jid = msg_obj.jid diff -r dc4cdb3dd133 -r 8ae55b949235 src/roster_window.py --- a/src/roster_window.py Sat Feb 20 15:59:01 2016 +0100 +++ b/src/roster_window.py Sat Feb 20 20:04:47 2016 +0100 @@ -2756,15 +2756,18 @@ return if obj.session.control and obj.mtype == 'chat': typ = '' + xep0184_id = None if obj.mtype == 'error': typ = 'error' if obj.forwarded and obj.sent: typ = 'out' + xep0184_id = obj.id_ obj.session.control.print_conversation(obj.msgtxt, typ, tim=obj.timestamp, encrypted=obj.encrypted, subject=obj.subject, xhtml=obj.xhtml, displaymarking=obj.displaymarking, - msg_id=obj.msg_id, correct_id=(obj.id_, obj.correct_id)) + msg_id=obj.msg_id, correct_id=(obj.id_, obj.correct_id), + xep0184_id=xep0184_id) if obj.msg_id: pw = obj.session.control.parent_win end = obj.session.control.was_at_the_end

1 0

gajim: fix computing hashes for duplicate messages. See #8258
by Gajim 20 Feb '16

20 Feb '16

changeset dc4cdb3dd133 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=dc4cdb3dd133 description: fix computing hashes for duplicate messages. See #8258 diffstat: src/common/connection_handlers_events.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diffs (26 lines): diff -r 65d9193e5b68 -r dc4cdb3dd133 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 08 23:08:26 2016 +0100 +++ b/src/common/connection_handlers_events.py Sat Feb 20 15:59:01 2016 +0100 @@ -1449,15 +1449,16 @@ # ignore message duplicates if self.msgtxt and self.id_ and self.jid: - self.msghash = hashlib.sha256("%s|%s|%s" % ( - hashlib.sha256(str(self.msgtxt)).hexdigest(), - hashlib.sha256(str(self.id_)).hexdigest(), - hashlib.sha256(str(self.jid)).hexdigest())).digest() + self.msghash = hashlib.sha256(("%s|%s|%s" % ( + hashlib.sha256(self.msgtxt.encode('utf-8')).hexdigest(), + hashlib.sha256(self.id_.encode('utf-8')).hexdigest(), + hashlib.sha256(self.jid.encode('utf-8')).hexdigest())).encode( + 'utf-8')).digest() if self.msghash in self.conn.received_message_hashes: - log.info("Ignoring duplicated message from '%s' with id '%s'" % (str(self.jid), str(self.id_))) + log.info("Ignoring duplicated message from '%s' with id '%s'" % (self.jid, self.id_)) return False else: - log.debug("subhashes: msgtxt, id_, jid = ('%s', '%s', '%s')" % (hashlib.sha256(str(self.msgtxt)).hexdigest(), hashlib.sha256(str(self.id_)).hexdigest(), hashlib.sha256(str(self.jid)).hexdigest())) + log.debug("subhashes: msgtxt, id_, jid = ('%s', '%s', '%s')" % (hashlib.sha256(self.msgtxt.encode('utf-8')).hexdigest(), hashlib.sha256(self.id_.encode('utf-8')).hexdigest(), hashlib.sha256(self.jid.encode('utf-8')).hexdigest())) self.conn.received_message_hashes.append(self.msghash) # only record the last 20000 hashes (should be about 1MB [32 bytes per hash] # and about 24 hours if you receive a message every 5 seconds)

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