Commits February 2016

commits@gajim.org

1 participants
40 discussions

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

22 Feb '16

changeset e17722234947 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=e17722234947 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 50e8466b3f03 -r e17722234947 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 @@ -2277,6 +2277,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 50e8466b3f03 -r e17722234947 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 @@ -81,7 +81,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 @@ -995,6 +995,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: make GPG work with gpg2 binary if present. Fixes #8268
by Gajim 22 Feb '16

22 Feb '16

changeset ae24ac4fa716 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=ae24ac4fa716 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 e17722234947 -r ae24ac4fa716 src/common/gajim.py --- a/src/common/gajim.py Sat Feb 20 21:36:24 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__('gnupg', globals(), locals(), [], -1) 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 e17722234947 -r ae24ac4fa716 src/common/gpg.py --- a/src/common/gpg.py Sat Feb 20 21:36:24 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 gajim import HAVE_GPG +from 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: enable_esessions needs Gajim restart
by Gajim 22 Feb '16

22 Feb '16

changeset e523ae54f39f 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=e523ae54f39f description: enable_esessions needs Gajim restart diffstat: src/common/config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r ae24ac4fa716 -r e523ae54f39f 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 @@ -345,7 +345,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: [Bahtiar `kalkin-` Gadimov]
by Gajim 22 Feb '16

22 Feb '16

changeset 5ca3426c7dce 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=5ca3426c7dce description: [Bahtiar `kalkin-` Gadimov] Shorten name of a gc entry in "Join GC" submenu Some XMPP clients save the subject of a group chat as the bookmark name. The subject can be very long thus the MenuItems can get also very long. This simple patch shortens the name to a carefully chosen value. Fixes #8218 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r f32fb7e1628c -r 5ca3426c7dce src/roster_window.py --- a/src/roster_window.py Tue Jan 05 20:53:54 2016 +0100 +++ b/src/roster_window.py Sat Jan 16 14:18:16 2016 +0100 @@ -6216,6 +6216,10 @@ # No name was given for this bookmark. # Use the first part of JID instead... name = bookmark['jid'].split("@")[0] + + # Shorten long names + name = (name[:42] + '..') if len(name) > 42 else name + # Do not use underline. item = gtk.MenuItem(name, False) item.connect('activate', self.on_bookmark_menuitem_activate,

1 0

gajim: correctly store and restore single message subject. Fixes...
by Gajim 22 Feb '16

22 Feb '16

changeset 230d35d42d71 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=230d35d42d71 description: correctly store and restore single message subject. Fixes #8251 diffstat: src/chat_control.py | 12 ++++++++---- src/common/connection.py | 5 +---- src/common/logger.py | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diffs (74 lines): diff -r 5ca3426c7dce -r 230d35d42d71 src/chat_control.py --- a/src/chat_control.py Sat Jan 16 14:18:16 2016 +0100 +++ b/src/chat_control.py Sun Jan 31 19:58:51 2016 +0100 @@ -3011,7 +3011,8 @@ local_old_kind = None self.conv_textview.just_cleared = True for row in rows: # row[0] time, row[1] has kind, row[2] the message - if not row[2]: # message is empty, we don't print it + msg = row[2] + if not msg: # message is empty, we don't print it continue if row[1] in (constants.KIND_CHAT_MSG_SENT, constants.KIND_SINGLE_MSG_SENT): @@ -3032,9 +3033,12 @@ else: small_attr = [] xhtml = None - if row[2].startswith('<body '): - xhtml = row[2] - ChatControlBase.print_conversation_line(self, row[2], kind, name, + if msg.startswith('<body '): + xhtml = msg + if row[3]: + msg = _('Subject: %(subject)s\n%(message)s') % \ + {'subject': row[3], 'message': msg} + ChatControlBase.print_conversation_line(self, msg, kind, name, tim, small_attr, small_attr + ['restored_message'], small_attr + ['restored_message'], False, old_kind=local_old_kind, xhtml=xhtml) diff -r 5ca3426c7dce -r 230d35d42d71 src/common/connection.py --- a/src/common/connection.py Sat Jan 16 14:18:16 2016 +0100 +++ b/src/common/connection.py Sun Jan 31 19:58:51 2016 +0100 @@ -521,9 +521,6 @@ log_msg = msg if original_message is not None: log_msg = original_message - if subject: - log_msg = _('Subject: %(subject)s\n%(message)s') % \ - {'subject': subject, 'message': log_msg} if log_msg: if type_ == 'chat': kind = 'chat_msg_sent' @@ -533,7 +530,7 @@ if xhtml and gajim.config.get('log_xhtml_messages'): log_msg = '<body xmlns="%s">%s</body>' % ( nbxmpp.NS_XHTML, xhtml) - gajim.logger.write(kind, jid, log_msg) + gajim.logger.write(kind, jid, log_msg, subject=subject) except exceptions.PysqliteOperationalError, e: self.dispatch('DB_ERROR', (_('Disk Write Error'), str(e))) diff -r 5ca3426c7dce -r 230d35d42d71 src/common/logger.py --- a/src/common/logger.py Sat Jan 16 14:18:16 2016 +0100 +++ b/src/common/logger.py Sun Jan 31 19:58:51 2016 +0100 @@ -585,8 +585,8 @@ Accept how many rows to restore and when to time them out (in minutes) (mark them as too old) and number of messages that are in queue and are already logged but pending to be viewed, returns a list of tupples - containg time, kind, message, list with empty tupple if nothing found to - meet our demands + containg time, kind, message, sibject list with empty tupple if nothing + found to meet our demands """ try: self.get_jid_id(jid) @@ -601,7 +601,7 @@ # 3 - 8 (we avoid the last 2 lines but we still return 5 asked) try: self.cur.execute(''' - SELECT time, kind, message FROM logs + SELECT time, kind, message, subject FROM logs WHERE (%s) AND kind IN (%d, %d, %d, %d, %d) AND time > %d ORDER BY time DESC LIMIT %d OFFSET %d ''' % (where_sql, constants.KIND_SINGLE_MSG_RECV,

1 0

gajim: [gdr_gdr] Prevent traceback. Fixes #8265
by Gajim 22 Feb '16

22 Feb '16

changeset 50e8466b3f03 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=50e8466b3f03 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 230d35d42d71 -r 50e8466b3f03 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun Jan 31 19:58:51 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=unicode(file_props.sender), typ='error') iq.setAttr('id', file_props.request_id)

1 0

gajim: do not allow to drop a group on itself or a subgroup of i...
by Gajim 22 Feb '16

22 Feb '16

changeset 80c2f82f7ed0 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=80c2f82f7ed0 description: do not allow to drop a group on itself or a subgroup of itself. Fixes #8211 diffstat: src/roster_window.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 1c2fba2fae78 -r 80c2f82f7ed0 src/roster_window.py --- a/src/roster_window.py Sat Jan 02 16:26:22 2016 +0100 +++ b/src/roster_window.py Sun Jan 03 13:02:22 2016 +0100 @@ -4781,8 +4781,12 @@ if type_dest == 'account': new_grp = grp_source_list[-1] elif type_dest == 'group': - new_grp = model[iter_dest][C_JID].decode('utf-8') + delimiter +\ - grp_source_list[-1] + grp_dest = model[iter_dest][C_JID].decode('utf-8') + grp_dest_list = grp_dest.split(delimiter) + # Do not allow to drop on a subgroup of source group + if grp_source_list[0] != grp_dest_list[0]: + new_grp = model[iter_dest][C_JID].decode('utf-8') + \ + delimiter + grp_source_list[-1] if new_grp: self.move_group(grp_source, new_grp, account_source)

1 0

gajim: don't send error when receivinf a ringing jingle element
by Gajim 22 Feb '16

22 Feb '16

changeset db6f0edb0002 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=db6f0edb0002 description: don't send error when receivinf a ringing jingle element diffstat: src/common/jingle_session.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (19 lines): diff -r 80c2f82f7ed0 -r db6f0edb0002 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Jan 03 13:02:22 2016 +0100 +++ b/src/common/jingle_session.py Sun Jan 03 20:43:32 2016 +0100 @@ -420,10 +420,13 @@ raise nbxmpp.NodeProcessed def __on_session_info(self, stanza, jingle, error, action): - # TODO: ringing, active, (un)hold, (un)mute + # TODO: active, (un)hold, (un)mute + payload = jingle.getPayload() + if payload[0].getName() == 'ringing': + # ignore ringing + raise nbxmpp.NodeProcessed if self.state != JingleStates.active: raise OutOfOrder - payload = jingle.getPayload() for p in payload: if p.getName() == 'checksum': hash_ = p.getTag('file').getTag(name='hash',

1 0

gajim: correctly raise change nick dialog. Fixes #8215
by Gajim 22 Feb '16

22 Feb '16

changeset f32fb7e1628c 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=f32fb7e1628c description: correctly raise change nick dialog. Fixes #8215 diffstat: src/groupchat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r db6f0edb0002 -r f32fb7e1628c src/groupchat_control.py --- a/src/groupchat_control.py Sun Jan 03 20:43:32 2016 +0100 +++ b/src/groupchat_control.py Tue Jan 05 20:53:54 2016 +0100 @@ -2216,7 +2216,7 @@ def _on_change_nick_menuitem_activate(self, widget): if 'change_nick_dialog' in gajim.interface.instances: - gajim.interface.instances['change_nick_dialog'].present() + gajim.interface.instances['change_nick_dialog'].dialog.present() else: title = _('Changing Nickname') prompt = _('Please specify the new nickname you want to use:')

1 0

gajim: [Justin Lecher] fix desktop files
by Gajim 22 Feb '16

22 Feb '16

changeset 4a0bd3fea5e0 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=4a0bd3fea5e0 description: [Justin Lecher] fix desktop files diffstat: data/gajim-remote.desktop.in.in | 4 ++-- data/gajim.desktop.in.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (29 lines): diff -r 55cc03b5b157 -r 4a0bd3fea5e0 data/gajim-remote.desktop.in.in --- a/data/gajim-remote.desktop.in.in Sat Feb 20 21:28:34 2016 +0100 +++ b/data/gajim-remote.desktop.in.in Tue Dec 29 20:53:11 2015 +0100 @@ -1,11 +1,11 @@ [Desktop Entry] Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; _Name=Gajim Remote -_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip +_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; Version=1.0 Exec=gajim-remote handle_uri %u TryExec=gajim-remote StartupNotify=false Terminal=false Type=Application -MimeType=x-scheme-handler/xmpp +MimeType=x-scheme-handler/xmpp; diff -r 55cc03b5b157 -r 4a0bd3fea5e0 data/gajim.desktop.in.in --- a/data/gajim.desktop.in.in Sat Feb 20 21:28:34 2016 +0100 +++ b/data/gajim.desktop.in.in Tue Dec 29 20:53:11 2015 +0100 @@ -3,7 +3,7 @@ _Name=Gajim _GenericName=Jabber IM Client _Comment=A GTK+ Jabber client -_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip +_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; Version=1.0 Exec=gajim Icon=gajim

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