Commits

commits@gajim.org

17632 discussions

gajim-plugins: EmoticonsPackPlugin. remove tmp dir
by Gajim Plugins 06 Apr '15

06 Apr '15

changeset 61639c5a7019 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=61639c5a7019 description: EmoticonsPackPlugin. remove tmp dir diffstat: emoticons_pack/emoticons_pack.py | 2 ++ emoticons_pack/manifest.ini | 2 +- 2 файлов изменено, 3 вставок(+), 1 удалений(-) различия (24 строк): diff -r 8ca1724182ab -r 61639c5a7019 emoticons_pack/emoticons_pack.py --- a/emoticons_pack/emoticons_pack.py Tue Mar 31 17:52:31 2015 +0300 +++ b/emoticons_pack/emoticons_pack.py Mon Apr 06 19:17:39 2015 +0300 @@ -250,6 +250,8 @@ def on_win_destroy(self, widget): if hasattr(self, 'page_num'): del self.page_num + if os.path.isdir(self.tmp_dir): + rmtree(self.tmp_dir, True) def available_emoticons_toggled_cb(self, cell, path): is_active = self.model[path][C_UPGRADE] diff -r 8ca1724182ab -r 61639c5a7019 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Tue Mar 31 17:52:31 2015 +0300 +++ b/emoticons_pack/manifest.ini Mon Apr 06 19:17:39 2015 +0300 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.0.6 +version: 0.0.7 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim: bind session to a resource when negociating e2e encryptio...
by Gajim 05 Apr '15

05 Apr '15

changeset 91357cbaf125 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=91357cbaf125 description: bind session to a resource when negociating e2e encryption. Fixes #7993 diffstat: src/chat_control.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 7e6386987471 -r 91357cbaf125 src/chat_control.py --- a/src/chat_control.py Sun Apr 05 21:26:16 2015 +0200 +++ b/src/chat_control.py Sun Apr 05 21:49:39 2015 +0200 @@ -3231,6 +3231,7 @@ def begin_e2e_negotiation(self): self.begin_negotiation() + self.session.resource = self.contact.resource self.session.negotiate_e2e(False) def begin_archiving_negotiation(self):

1 0

gajim: [noonien] Fix using receiver candidate when sending a fil...
by Gajim 05 Apr '15

05 Apr '15

changeset 7e6386987471 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=7e6386987471 description: [noonien] Fix using receiver candidate when sending a file via jingle. Fixes #7987 diffstat: src/common/socks5.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (26 lines): diff -r a5065b1c7a5a -r 7e6386987471 src/common/socks5.py --- a/src/common/socks5.py Sun Mar 29 14:38:10 2015 +0200 +++ b/src/common/socks5.py Sun Apr 05 21:26:16 2015 +0200 @@ -149,7 +149,9 @@ socks5obj = Socks5SenderClient(self.idlequeue, idx, self, _sock=None,host=str(streamhost['host']), port=int(streamhost['port']),fingerprint=fp, - connected=False, file_props=file_props) + connected=False, file_props=file_props, + initiator=streamhost['initiator'], + target=streamhost['target']) socks5obj.streamhost = streamhost self.add_sockobj(account, socks5obj) @@ -1321,8 +1323,9 @@ class Socks5SenderClient(Socks5Client, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, - port=None, fingerprint = None, connected=True, file_props=None): - Socks5Client.__init__(self, idlequeue, host, port, None, None, + port=None, fingerprint = None, connected=True, file_props=None, + initiator=None, target=None): + Socks5Client.__init__(self, idlequeue, host, port, initiator, target, file_props.sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, host, port, fingerprint , connected, file_props)

1 0

gajim-plugins: Clients icons. Add sawim
by Gajim Plugins 31 Mar '15

31 Mar '15

changeset 8ca1724182ab in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=8ca1724182ab description: Clients icons. Add sawim diffstat: clients_icons/clients_icons.py | 1 + clients_icons/icons/sawim.png | Bin clients_icons/manifest.ini | 2 +- 3 файлов изменено, 2 вставок(+), 1 удалений(-) различия (25 строк): diff -r 9f4f8b6c3120 -r 8ca1724182ab clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Mon Mar 30 13:25:11 2015 +0200 +++ b/clients_icons/clients_icons.py Tue Mar 31 17:52:31 2015 +0300 @@ -142,6 +142,7 @@ 'http://miranda-ng.org/caps' :['miranda_ng.png', 'Miranda NG'], 'http://monal.im/caps': ['monal.png', 'Monal'], 'http://leechcraft.org/': ['leechcraft.png', 'Leechcraft'], + 'http://sawim.ru/caps': ['sawim.png', 'Sawim'], # 'Poezio' :['poezio.png', 'Poezio'], 'Emacs' :['emacs.png', ''], diff -r 9f4f8b6c3120 -r 8ca1724182ab clients_icons/icons/sawim.png Binary file clients_icons/icons/sawim.png has changed diff -r 9f4f8b6c3120 -r 8ca1724182ab clients_icons/manifest.ini --- a/clients_icons/manifest.ini Mon Mar 30 13:25:11 2015 +0200 +++ b/clients_icons/manifest.ini Tue Mar 31 17:52:31 2015 +0300 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 5.5 +version: 5.6 description: Shows the client icons in the roster and in groupchats. authors: Denis Fomin <fominde(a)gmail.com> Artem Klyop <art.klyop(a)gmail.com>

1 0

gajim-plugins: emoticons_pack: Fix Twemoji’s preview icon
by Gajim Plugins 30 Mar '15

30 Mar '15

changeset 9f4f8b6c3120 in /home/hg/repos/gajim-plugins author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:gajim-plugins?cmd=changeset;node=9f4f8b6c3120 description: emoticons_pack: Fix Twemoji’s preview icon diffstat: emoticons_pack/contents.ini | 2 +- emoticons_pack/emoticons_pack.zip | Bin 2 files changed, 1 insertions(+), 1 deletions(-) diffs (14 lines): diff -r 1542dc245c7d -r 9f4f8b6c3120 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Mon Mar 30 12:40:08 2015 +0200 +++ b/emoticons_pack/contents.ini Mon Mar 30 13:25:11 2015 +0200 @@ -98,7 +98,7 @@ homepage: https://github.com/sagargp/trollicons/blob/master/readme.md#downloads [Twemoji] -icon: preview.svg +icon: 1f600.svg authors: Twitter, Inc. and other contributors converter: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> description: <body xmlns='http://www.w3.org/1999/xhtml'> diff -r 1542dc245c7d -r 9f4f8b6c3120 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed

1 0

gajim-plugins: emoticons_pack: Add Twemoji and bump version to 0...
by Gajim Plugins 30 Mar '15

30 Mar '15

changeset 1542dc245c7d in /home/hg/repos/gajim-plugins author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:gajim-plugins?cmd=changeset;node=1542dc245c7d description: emoticons_pack: Add Twemoji and bump version to 0.0.6 diffstat: emoticons_pack/contents.ini | 10 ++++++++++ emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 3 files changed, 11 insertions(+), 1 deletions(-) diffs (31 lines): diff -r d63a1bfa2a79 -r 1542dc245c7d emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Sat Feb 21 18:15:10 2015 +0300 +++ b/emoticons_pack/contents.ini Mon Mar 30 12:40:08 2015 +0200 @@ -96,3 +96,13 @@ <img src="preview.image"/> </body> homepage: https://github.com/sagargp/trollicons/blob/master/readme.md#downloads + +[Twemoji] +icon: preview.svg +authors: Twitter, Inc. and other contributors +converter: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> +description: <body xmlns='http://www.w3.org/1999/xhtml'> + Twemoji (Twitter Emoji for Gajim)<br/> + <img src="preview.image"/> + </body> +homepage: https://trac.gajim.org/wiki/Twemoji diff -r d63a1bfa2a79 -r 1542dc245c7d emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r d63a1bfa2a79 -r 1542dc245c7d emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Sat Feb 21 18:15:10 2015 +0300 +++ b/emoticons_pack/manifest.ini Mon Mar 30 12:40:08 2015 +0200 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.0.5 +version: 0.0.6 description: Install, update and view detailed legend of emoticons authors: Denis Fomin <fominde(a)gmail.com> homepage: http://trac-plugins.gajim.org/wiki/

1 0

gajim: improve pasting xmpp uri in join groupchat dialogs. Fixes...
by Gajim 29 Mar '15

29 Mar '15

changeset a5065b1c7a5a 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=a5065b1c7a5a description: improve pasting xmpp uri in join groupchat dialogs. Fixes #7905 diffstat: src/dialogs.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (20 lines): diff -r 7ff6c8bcae13 -r a5065b1c7a5a src/dialogs.py --- a/src/dialogs.py Thu Mar 26 20:58:51 2015 +0100 +++ b/src/dialogs.py Sun Mar 29 14:38:10 2015 +0200 @@ -2513,11 +2513,16 @@ if not self._empty_required_widgets and self.account: self.xml.get_object('join_button').set_sensitive(True) text = self._room_jid_entry.get_text() + if widget == self._room_jid_entry and text.startswith('xmpp:'): + text = text[5:] + self._room_jid_entry.set_text(text) if widget == self._room_jid_entry and '@' in text: # Don't allow @ char in room entry room_jid, server = text.split('@', 1) self._room_jid_entry.set_text(room_jid) if server: + if '?' in server: + server = server.split('?')[0] self.server_comboboxentry.child.set_text(server) self.server_comboboxentry.grab_focus()

1 0

gajim: Don’t crash when the config file is malformed.
by Gajim 26 Mar '15

26 Mar '15

changeset 7ff6c8bcae13 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=7ff6c8bcae13 description: Don’t crash when the config file is malformed. diffstat: src/common/optparser.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diffs (26 lines): diff -r e0e36580b786 -r 7ff6c8bcae13 src/common/optparser.py --- a/src/common/optparser.py Wed Mar 25 10:05:29 2015 +0100 +++ b/src/common/optparser.py Thu Mar 26 20:58:51 2015 +0100 @@ -38,6 +38,9 @@ import sqlite3 as sqlite import logger +import logging +log = logging.getLogger('gajim.c.optparser') + class OptionsParser: def __init__(self, filename): self.__filename = filename @@ -63,7 +66,11 @@ line = line.decode('utf-8') except UnicodeDecodeError: line = line.decode(locale.getpreferredencoding()) - optname, key, subname, value = regex.match(line).groups() + match = regex.match(line) + if match is None: + log.warn('Invalid configuration line, ignoring it: %s', line) + continue + optname, key, subname, value = match.groups() if key is None: self.old_values[optname] = value gajim.config.set(optname, value)

1 0

gajim: prevent error when converting idn to ascii strings. Fixes...
by Gajim 25 Mar '15

25 Mar '15

changeset e0e36580b786 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=e0e36580b786 description: prevent error when converting idn to ascii strings. Fixes #7995 diffstat: src/common/helpers.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 92f45cb54a82 -r e0e36580b786 src/common/helpers.py --- a/src/common/helpers.py Tue Mar 17 22:06:36 2015 +0100 +++ b/src/common/helpers.py Wed Mar 25 10:05:29 2015 +0100 @@ -122,7 +122,10 @@ labels = idna.dots.split(host) converted_labels = [] for label in labels: - converted_labels.append(idna.ToASCII(label)) + if label: + converted_labels.append(idna.ToASCII(label)) + else: + converted_labels.append('') return ".".join(converted_labels) def ascii_to_idn(host):

1 0

gajim: fix GPG encoding issues. Fixes #7988
by Gajim 17 Mar '15

17 Mar '15

changeset 92f45cb54a82 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=92f45cb54a82 description: fix GPG encoding issues. Fixes #7988 diffstat: src/common/gpg.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r dcad0e19d3b8 -r 92f45cb54a82 src/common/gpg.py --- a/src/common/gpg.py Tue Mar 10 20:45:05 2015 +0100 +++ b/src/common/gpg.py Tue Mar 17 22:06:36 2015 +0100 @@ -31,6 +31,7 @@ class GnuPG(gnupg.GPG): def __init__(self, use_agent=False): gnupg.GPG.__init__(self) + self.encoding = 'utf-8' self.decode_errors = 'replace' self.passphrase = None self.use_agent = use_agent

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