Commits April 2015

commits@gajim.org

1 participants
3 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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2015