Commits May 2016

commits@gajim.org

1 participants
30 discussions

gajim: remember which speller language was use for each contact....
by Gajim 22 May '16

22 May '16

changeset c6f06623f074 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=c6f06623f074 description: remember which speller language was use for each contact. Fixes #8326 diffstat: src/chat_control.py | 26 ++++++++++++-------------- src/gtkspell.py | 15 +++++++++++++-- 2 files changed, 25 insertions(+), 16 deletions(-) diffs (101 lines): diff -r 3ebf1e2b8edf -r c6f06623f074 src/chat_control.py --- a/src/chat_control.py Sat May 21 18:56:01 2016 +0200 +++ b/src/chat_control.py Sun May 22 23:09:49 2016 +0200 @@ -441,11 +441,22 @@ lang = gajim.LANG if lang: try: - gtkspell.Spell(self.msg_textview, lang) + self.spell = gtkspell.Spell(self.msg_textview, lang) self.msg_textview.lang = lang + self.spell.connect('language_changed', self.on_language_changed) except (GObject.GError, RuntimeError, TypeError, OSError): dialogs.AspellDictError(lang) + def on_language_changed(self, spell, lang): + per_type = 'contacts' + if self.type_id == message_control.TYPE_GC: + per_type = 'rooms' + if not gajim.config.get_per(per_type, self.contact.jid): + gajim.config.add_per(per_type, self.contact.jid) + gajim.config.set_per(per_type, self.contact.jid, 'speller_language', + lang) + self.msg_textview.lang = lang + def on_banner_label_populate_popup(self, label, menu): """ Override the default context menu and add our own menutiems @@ -480,19 +491,6 @@ Override the default context menu and we prepend an option to switch languages """ - def _on_select_dictionary(widget, lang): - per_type = 'contacts' - if self.type_id == message_control.TYPE_GC: - per_type = 'rooms' - if not gajim.config.get_per(per_type, self.contact.jid): - gajim.config.add_per(per_type, self.contact.jid) - gajim.config.set_per(per_type, self.contact.jid, 'speller_language', - lang) - spell = gtkspell.get_from_text_view(self.msg_textview) - self.msg_textview.lang = lang - spell.set_language(lang) - widget.set_active(True) - item = Gtk.MenuItem.new_with_mnemonic(_('_Undo')) menu.prepend(item) id_ = item.connect('activate', self.msg_textview.undo) diff -r 3ebf1e2b8edf -r c6f06623f074 src/gtkspell.py --- a/src/gtkspell.py Sat May 21 18:56:01 2016 +0200 +++ b/src/gtkspell.py Sun May 22 23:09:49 2016 +0200 @@ -17,6 +17,7 @@ ## You should have received a copy of the GNU General Public License ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from gi.repository import GObject from gi.repository import Gtk import gi gi.require_version('GtkSpell', '3.0') @@ -31,9 +32,14 @@ return f -class Spell(object): +class Spell(GObject.GObject): + __gsignals__ = { + 'language_changed': (GObject.SignalFlags.RUN_FIRST, None, (str,)) + } - def __init__(self, textview, language=None, create=True): + def __init__(self, textview, language=None, create=True, jid=None, + per_type=None): + GObject.GObject.__init__(self) if not isinstance(textview, Gtk.TextView): raise TypeError("Textview must be derived from Gtk.TextView") spell = GtkSpell.Checker.get_from_text_view(textview) @@ -47,6 +53,7 @@ raise OSError("Unable to attach spell object.") if not self.spell.set_language(language): raise OSError("Unable to set language: '%s'" % language) + self.spell.connect('language-changed', self.on_language_changed) else: if spell: @@ -54,6 +61,9 @@ else: raise RuntimeError("Textview has no Spell object attached") + def on_language_changed(self, spell, lang): + self.emit('language_changed', lang) + @ensure_attached def set_language(self, language): if not self.spell.set_language(language): @@ -68,6 +78,7 @@ self.spell.detach() self.spell = None +GObject.type_register(Spell) def get_from_text_view(textview): return Spell(textview, create=False)

1 0

gajim: fix attribute name
by Gajim 21 May '16

21 May '16

changeset aab71c751b67 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=aab71c751b67 description: fix attribute name diffstat: src/common/events.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 5fca8868e23d -r aab71c751b67 src/common/events.py --- a/src/common/events.py Wed Apr 27 02:53:43 2016 +0300 +++ b/src/common/events.py Sat May 21 18:55:45 2016 +0200 @@ -129,7 +129,7 @@ class GcInvitationtEvent(Event): type_ = 'gc-invitation' - def __init__(self, room_jid, reason, password, is_continued, from_jid, + def __init__(self, room_jid, reason, password, is_continued, jid_from, time_=None, show_in_roster=False, show_in_systray=True): Event.__init__(self, time_, show_in_roster=show_in_roster, show_in_systray=show_in_systray) @@ -137,7 +137,7 @@ self.reason = reason self.password = password self.is_continued = is_continued - self.from_jid = from_jid + self.jid_from = jid_from class FileRequestEvent(Event): type_ = 'file-request'

1 0

gajim: fix listing GPG keys
by Gajim 21 May '16

21 May '16

changeset 3ebf1e2b8edf in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=3ebf1e2b8edf description: fix listing GPG keys diffstat: src/roster_window.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r aab71c751b67 -r 3ebf1e2b8edf src/roster_window.py --- a/src/roster_window.py Sat May 21 18:55:45 2016 +0200 +++ b/src/roster_window.py Sat May 21 18:56:01 2016 +0200 @@ -3213,7 +3213,7 @@ 'attached_gpg_keys').split() keys = {} keyID = _('None') - for i in list(range(len(attached_keys)/2)): + for i in list(range(int(len(attached_keys)/2))): keys[attached_keys[2*i]] = attached_keys[2*i+1] if attached_keys[2*i] == contact.jid: keyID = attached_keys[2*i+1]

1 0

gajim: fix some log calls
by Gajim 16 May '16

16 May '16

changeset d10220579f97 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=d10220579f97 description: fix some log calls diffstat: src/common/socks5.py | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diffs (49 lines): diff -r 7452dc852b30 -r d10220579f97 src/common/socks5.py --- a/src/common/socks5.py Wed May 11 21:40:30 2016 +0200 +++ b/src/common/socks5.py Mon May 16 20:24:53 2016 +0200 @@ -132,13 +132,19 @@ else: fp = fingerprint if receiving: - log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) + if 'cid' in streamhost: # jingle + log.debug('Trying to connect as receiver to cid ' + streamhost['cid']) + else: # SI + log.debug('Trying to connect as receiver to host ' + streamhost['host']) file_props.type_ = 'r' socks5obj = Socks5ReceiverClient(self.idlequeue, streamhost, sid, file_props, fingerprint=fp) self.add_sockobj(account, socks5obj) else: - log.debug('Trying to connect as sender to cid' + streamhost['cid']) + if 'cid' in streamhost: #jingle + log.debug('Trying to connect as sender to cid ' + streamhost['cid']) + else: # SI + log.debug('Trying to connect as sender to host ' + streamhost['host']) if file_props.sha_str: idx = file_props.sha_str else: @@ -165,7 +171,10 @@ Called when there is a host connected to one of the senders's streamhosts. Stop other attempts for connections """ - log.debug('Connected to cid ' + streamhost['cid']) + if 'cid' in streamhost: # jingle + log.debug('Connected to cid ' + streamhost['cid']) + else: # SI + log.debug('Connected to host ' + streamhost['host']) for host in file_props.streamhosts: if host != streamhost and 'idx' in host: if host['state'] == 1: @@ -227,7 +236,10 @@ """ Called when we loose connection during transfer """ - log.debug('Connection refused to cid ' + streamhost['cid']) + if 'cid' in streamhost: # jingle + log.debug('Connection refused to cid ' + streamhost['cid']) + else: # SI + log.debug('Connection refused to host ' + streamhost['host']) if file_props is None: return streamhost['state'] = -1

1 0

gajim: search_keys result is always utf-8 encoded because of --w...
by Gajim 11 May '16

11 May '16

changeset 7452dc852b30 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=7452dc852b30 description: search_keys result is always utf-8 encoded because of --with-colons option. diffstat: src/common/gnupg.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f8b7c305f177 -r 7452dc852b30 src/common/gnupg.py --- a/src/common/gnupg.py Tue May 03 22:50:02 2016 +0200 +++ b/src/common/gnupg.py Wed May 11 21:40:30 2016 +0200 @@ -1225,7 +1225,7 @@ # Get the response information result = self.result_map['search'](self) self._collect_output(p, result, stdin=p.stdin) - lines = result.data.decode(self.encoding, + lines = result.data.decode('utf-8', self.decode_errors).splitlines() valid_keywords = ['pub', 'uid'] for line in lines:

1 0

gajim-website: update debian keyring link
by Gajim Website 10 May '16

10 May '16

changeset 62fc24244a08 in /home/hg/repos/gajim-website author: Yann Leboulanger <asterix(a)lagaule.org> details:http://hg.gajim.org/gajim-website?cmd=changeset;node=62fc24244a08 description: update debian keyring link diffstat: downloads.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 21dac983644e -r 62fc24244a08 downloads.php --- a/downloads.php Sat Apr 16 00:09:47 2016 +0200 +++ b/downloads.php Tue May 10 21:30:28 2016 +0200 @@ -136,7 +136,7 @@ print (" deb ftp://ftp.gajim.org/debian unstable main\n"); print (" \n"); print _("and install it by doing")." apt-get install gajim-nightly.\n"; -print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository (or via") . " <a href='https://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim-dev-keyri…'>https</a>). " . _("Just do")." apt-get install gajim-dev-keyring.\n"; +print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository (or via") . " <a href='https://ftp.gajim.org/debian/dists/unstable/main/binary-all/gajim-dev-keyri…'>https</a>). " . _("Just do")." apt-get install gajim-dev-keyring.\n"; print "</div>\n"; #4)Fedora

1 0

gajim: Fix IBB (don't send several time the close for a given tr...
by Gajim 03 May '16

03 May '16

changeset f8b7c305f177 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=f8b7c305f177 description: Fix IBB (don't send several time the close for a given transfert) diffstat: src/common/protocol/bytestream.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diffs (25 lines): diff -r 57f171136f0d -r f8b7c305f177 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sun May 01 20:55:21 2016 +0200 +++ b/src/common/protocol/bytestream.py Tue May 03 22:50:02 2016 +0200 @@ -869,6 +869,8 @@ if not file_props.direction: # it's socks5 bytestream continue + if file_props.completed: + continue sid = file_props.sid if file_props.direction[:2] == '|>': # We waitthat other part accept stream @@ -897,6 +899,12 @@ file_props.received_len += len(chunk) gajim.socks5queue.progress_transfer_cb(self.name, file_props) + if file_props.completed: # set in progress_transfer_cd() + # notify the other side about stream closing + self.connection.send(nbxmpp.Protocol('iq', + file_props.direction[1:], 'set', + payload=[nbxmpp.Node(nbxmpp.NS_IBB + ' close', + {'sid': file_props.transport_sid})])) else: # notify the other side about stream closing # notify the local user about sucessfull send

1 0

gajim-plugins: Add the GitHub wiki docs as a submodule
by Gajim Plugins 03 May '16

03 May '16

changeset 51fb05923dc3 in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=51fb05923dc3 description: Add the GitHub wiki docs as a submodule diffstat: omemo/.gitmodules | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (7 lines): diff -r eb475e715cbd -r 51fb05923dc3 omemo/.gitmodules --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/.gitmodules Tue Jan 26 15:42:04 2016 +0100 @@ -0,0 +1,3 @@ +[submodule "doc"] + path = doc + url = https://github.com/omemo/gajim-omemo.wiki.git

1 0

gajim-plugins: Fix delay when sending messages - #13
by Gajim Plugins 03 May '16

03 May '16

changeset 074793624d8a in /home/hg/repos/gajim-plugins author: Bahtiar `kalkin-` Gadimov <bahtiar(a)gadimov.de> branches: details:gajim-plugins?cmd=changeset;node=074793624d8a description: Fix delay when sending messages - #13 Use threading for encryption when sending diffstat: omemo/__init__.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diffs (29 lines): diff -r b6c7e89ac38d -r 074793624d8a omemo/__init__.py --- a/omemo/__init__.py Wed Jan 27 09:58:02 2016 +0100 +++ b/omemo/__init__.py Thu Jan 28 16:55:52 2016 +0100 @@ -452,14 +452,17 @@ if not state.encryption.is_active(to_jid): return False try: - msg_dict = state.create_msg(gajim.get_jid_from_account(account), - to_jid, plaintext) - if not msg_dict: - return True - encrypted_node = OmemoMessage(msg_dict) - event.msg_iq.delChild('body') - event.msg_iq.addChild(node=encrypted_node) - log.debug(account + ' → ' + str(event.msg_iq)) + from_jid = gajim.get_jid_from_account(account) + def _encrypt_thread(from_jid, to_jid, plaintext): + msg_dict = state.create_msg(from_jid, + to_jid, plaintext) + if not msg_dict: + return True + encrypted_node = OmemoMessage(msg_dict) + event.msg_iq.delChild('body') + event.msg_iq.addChild(node=encrypted_node) + log.debug(account + ' → ' + str(event.msg_iq)) + gajim.thread_interface(_encrypt_thread, [from_jid, to_jid, plaintext]) except: return True

1 0

gajim-plugins: Update archlinux PKGBUILD to 0.4
by Gajim Plugins 03 May '16

03 May '16

changeset b6c7e89ac38d in /home/hg/repos/gajim-plugins author: cippaciong <lacapannadelloziotom(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=b6c7e89ac38d description: Update archlinux PKGBUILD to 0.4 diffstat: omemo/pkgs/PKGBUILD | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (25 lines): diff -r 51fb05923dc3 -r b6c7e89ac38d omemo/pkgs/PKGBUILD --- a/omemo/pkgs/PKGBUILD Tue Jan 26 15:42:04 2016 +0100 +++ b/omemo/pkgs/PKGBUILD Wed Jan 27 09:58:02 2016 +0100 @@ -2,17 +2,17 @@ pkgname=gajim-plugin-omemo _pkgname=gajim-omemo -pkgver=0.3 +pkgver=0.4 pkgrel=1 pkgdesc="Gajim plugin for OMEMO Multi-End Message and Object Encryption." arch=(any) -url="https://github.com/kalkin/${_pkgname}" +url="https://github.com/omemo/${_pkgname}" license=('GPL') depends=("gajim" "python2-axolotl-git") provides=('gajim-plugin-omemo') conflicts=('gajim-plugin-omemo-git') -source=("https://github.com/kalkin/${_pkgname}/archive/${pkgver}.tar.gz") -sha512sums=('0f4f1c1d6b799c3a6c159d33b4c65367da038db75f169793f13d2710b93d3651489cccd17b3782093a3a76324d701dbf9facacd373526f70e9c274e21f9f2b57') +source=("https://github.com/omemo/${_pkgname}/archive/${pkgver}.tar.gz") +sha512sums=('2ab28e40153bbcb37d1ba7993265ecf1747ffc54d1f617e074aef5bfb416aab2e864b72f2c0b073f4e3fb2bc0c926f63497c0fc7b18d48cf9e1333db0e268279') package() { cd $srcdir/gajim-omemo-${pkgver}

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2016