Commits

commits@gajim.org

17632 discussions

gajim: dont connect to local host if ip is the same or if is loo...
by Jefry Lagrange 28 Aug '12

28 Aug '12

changeset 3a718170c531 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3a718170c531 description: dont connect to local host if ip is the same or if is loopback diffstat: src/common/jingle_transport.py | 3 ++- src/common/socks5.py | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diffs (40 lines): diff -r aa7ec6ee7ff4 -r 3a718170c531 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Tue Aug 28 19:10:13 2012 +0200 +++ b/src/common/jingle_transport.py Tue Aug 28 15:10:19 2012 -0400 @@ -177,7 +177,8 @@ return local_ip_cand = [] port = int(gajim.config.get('file_transfers_port')) - type_preference = 126 #type preference of connection type. XEP-0260 section 2.2 + #type preference of connection type. XEP-0260 section 2.2 + type_preference = 126 c = {'host': self.connection.peerhost[0]} c['candidate_id'] = self.connection.connection.getAnID() c['port'] = port diff -r aa7ec6ee7ff4 -r 3a718170c531 src/common/socks5.py --- a/src/common/socks5.py Tue Aug 28 19:10:13 2012 +0200 +++ b/src/common/socks5.py Tue Aug 28 15:10:19 2012 -0400 @@ -34,6 +34,7 @@ from errno import EAFNOSUPPORT from xmpp.idlequeue import IdleObject from file_props import FilesProp +from common import gajim import jingle_xtls if jingle_xtls.PYOPENSSL_PRESENT: import OpenSSL @@ -116,10 +117,15 @@ self.on_failure[sid] = on_failure file_props = FilesProp.getFileProp(account, sid) file_props.failure_cb = on_failure + con = gajim.connections[account] if not file_props.streamhosts: on_failure(file_props.sid) # add streamhosts to the queue for streamhost in file_props.streamhosts: + if streamhost['host'] == '127.0.0.1' or \ + streamhost['host'] == '::1' or \ + streamhost['host'] == con.peerhost[0]: + continue if 'type' in streamhost and streamhost['type'] == 'proxy': fp = None else:

1 0

gajim: fixsending through a proxy
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset aa7ec6ee7ff4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aa7ec6ee7ff4 description: fixsending through a proxy diffstat: src/common/protocol/bytestream.py | 19 +++++++++++------ src/common/socks5.py | 42 ++++++++++++++++++-------------------- 2 files changed, 32 insertions(+), 29 deletions(-) diffs (99 lines): diff -r 79eb12e6534a -r aa7ec6ee7ff4 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Tue Aug 28 15:46:52 2012 +0200 +++ b/src/common/protocol/bytestream.py Tue Aug 28 19:10:13 2012 +0200 @@ -41,7 +41,7 @@ from common import ged from common import jingle_xtls from common.file_props import FilesProp -from common.socks5 import Socks5ReceiverClient +from common.socks5 import Socks5SenderClient import logging log = logging.getLogger('gajim.c.p.bytestream') @@ -581,8 +581,8 @@ """ if not self.connection or self.connected < 2: return - file_props = FilesProp.getFileProp(self.connection, proxy['sid']) - iq = xmpp.Iq(to=proxy['initiator'], typ='set') + file_props = FilesProp.getFileProp(self.name, proxy['sid']) + iq = xmpp.Iq(to=proxy['initiator'], typ='set') auth_id = "au_" + proxy['sid'] iq.setID(auth_id) query = iq.setTag('query', namespace=xmpp.NS_BYTESTREAM) @@ -721,10 +721,15 @@ file_props.streamhost_used = True file_props.streamhosts.append(proxy) file_props.is_a_proxy = True - receiver = Socks5ReceiverClient(gajim.idlequeue, proxy, - file_props.sid, file_props) - proxy['idx'] = receiver.queue_idx - gajim.socks5queue.on_success = self._proxy_auth_ok + idx = gajim.socks5queue.idx + sender = Socks5SenderClient(gajim.idlequeue, idx, + gajim.socks5queue, _sock=None, host=str(proxy['host']), + port=int(proxy['port']), fingerprint=None, + connected=False, file_props=file_props) + sender.streamhost = proxy + gajim.socks5queue.add_sockobj(self.name, sender, 'sender') + proxy['idx'] = sender.queue_idx + gajim.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise xmpp.NodeProcessed else: diff -r 79eb12e6534a -r aa7ec6ee7ff4 src/common/socks5.py --- a/src/common/socks5.py Tue Aug 28 15:46:52 2012 +0200 +++ b/src/common/socks5.py Tue Aug 28 19:10:13 2012 +0200 @@ -263,32 +263,30 @@ props[0](props[1], idx) def activate_proxy(self, idx): - if not self.isHashInSockObjs(self.readers, idx): + if not self.isHashInSockObjs(self.senders, idx): return - for key in self.readers.keys(): + for key in self.senders.keys(): if idx in key: - reader = self.readers[key] - if reader.file_props.type_ != 's': + sender = self.senders[key] + if sender.file_props.type_ != 's': return - if reader.state != 5: - return - reader.state = 6 - if reader.connected: - reader.file_props.error = 0 - reader.file_props.disconnect_cb = reader.disconnect - reader.file_props.started = True - reader.file_props.completed = False - reader.file_props.paused = False - reader.file_props.stalled = False - reader.file_props.elapsed_time = 0 - reader.file_props.last_time = self.idlequeue.current_time() - reader.file_props.received_len = 0 - reader.pauses = 0 + sender.state = 6 + if sender.connected: + sender.file_props.error = 0 + sender.file_props.disconnect_cb = sender.disconnect + sender.file_props.started = True + sender.file_props.completed = False + sender.file_props.paused = False + sender.file_props.stalled = False + sender.file_props.elapsed_time = 0 + sender.file_props.last_time = self.idlequeue.current_time() + sender.file_props.received_len = 0 + sender.pauses = 0 # start sending file to proxy - self.idlequeue.set_read_timeout(reader.fd, STALLED_TIMEOUT) - self.idlequeue.plug_idle(reader, True, False) - result = reader.write_next() - self.process_result(result, reader) + self.idlequeue.set_read_timeout(sender.fd, STALLED_TIMEOUT) + self.idlequeue.plug_idle(sender, True, False) + result = sender.write_next() + self.process_result(result, sender) def send_file(self, file_props, account, mode): for key in self.senders.keys():

1 0

gajim: fix attribute name
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 79eb12e6534a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=79eb12e6534a description: fix attribute name diffstat: src/common/file_props.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 484318a0df19 -r 79eb12e6534a src/common/file_props.py --- a/src/common/file_props.py Tue Aug 28 12:23:36 2012 +0200 +++ b/src/common/file_props.py Tue Aug 28 15:46:52 2012 +0200 @@ -116,7 +116,7 @@ # full file path self.file_name = None self.name = None - self.file_desc = None + self.desc = None self.offset = None self.sender = None self.receiver = None

1 0

gajim-website: fix RTL
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 265abbe71a64 in /home/hg/repos/gajim-website details:http://hg.gajim.org/gajim-website?cmd=changeset;node=265abbe71a64 description: fix RTL diffstat: css/main-rtl.css | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 171df4207619 -r 265abbe71a64 css/main-rtl.css --- a/css/main-rtl.css Fri Aug 17 17:04:36 2012 +0200 +++ b/css/main-rtl.css Tue Aug 28 15:06:29 2012 +0200 @@ -1,3 +1,8 @@ +.main { + text-align:right; + margin: 50px; +} + #image_index { float: left; }

1 0

gajim: include needed modules for OTR plugin to work
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 62f14435ff6e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=62f14435ff6e description: include needed modules for OTR plugin to work diffstat: gajim.nsi | 2 -- setup_win32.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diffs (32 lines): diff -r 89318b51ee3d -r 62f14435ff6e gajim.nsi --- a/gajim.nsi Tue Aug 28 13:15:53 2012 +0200 +++ b/gajim.nsi Tue Aug 28 14:11:58 2012 +0200 @@ -159,7 +159,6 @@ File "bin\Crypto.Hash.SHA256.pyd" File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" File "bin\gajim.exe" File "bin\gio._gio.pyd" File "bin\glib._glib.pyd" @@ -533,7 +532,6 @@ Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" - Delete "$INSTDIR\bin\Crypto.Util.strxor.pyd" Delete "$INSTDIR\bin\gajim.exe" Delete "$INSTDIR\bin\gio._gio.pyd" Delete "$INSTDIR\bin\glib._glib.pyd" diff -r 89318b51ee3d -r 62f14435ff6e setup_win32.py --- a/setup_win32.py Tue Aug 28 13:15:53 2012 +0200 +++ b/setup_win32.py Tue Aug 28 14:11:58 2012 +0200 @@ -32,7 +32,8 @@ options = { 'build_exe': { 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', - 'goocanvas'], + 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', + 'numbers'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',

1 0

gajim: potr is no more needed, it is in the OTR plugin itself
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 89318b51ee3d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=89318b51ee3d description: potr is no more needed, it is in the OTR plugin itself diffstat: setup_win32.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 69d16aa63b24 -r 89318b51ee3d setup_win32.py --- a/setup_win32.py Tue Aug 28 13:11:09 2012 +0200 +++ b/setup_win32.py Tue Aug 28 13:15:53 2012 +0200 @@ -31,7 +31,7 @@ options = { 'build_exe': { - 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'potr', + 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'goocanvas'], 'base': 'Win32GUI', 'bin_excludes': [

1 0

gajim: next windows build will be 0.15.1
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 69d16aa63b24 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=69d16aa63b24 description: next windows build will be 0.15.1 diffstat: gajim.nsi | 2 +- setup_win32.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diffs (24 lines): diff -r 671f7413314e -r 69d16aa63b24 gajim.nsi --- a/gajim.nsi Tue Aug 28 13:08:10 2012 +0200 +++ b/gajim.nsi Tue Aug 28 13:11:09 2012 +0200 @@ -192,7 +192,7 @@ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff -r 671f7413314e -r 69d16aa63b24 setup_win32.py --- a/setup_win32.py Tue Aug 28 13:08:10 2012 +0200 +++ b/setup_win32.py Tue Aug 28 13:11:09 2012 +0200 @@ -50,7 +50,7 @@ setup( name='Gajim', - version='0.15', + version='0.15.1', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/',

1 0

gajim: correctly close tmppng file
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 671f7413314e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=671f7413314e description: correctly close tmppng file diffstat: src/common/latex.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r a570008a3ed9 -r 671f7413314e src/common/latex.py --- a/src/common/latex.py Tue Aug 28 12:23:36 2012 +0200 +++ b/src/common/latex.py Tue Aug 28 13:08:10 2012 +0200 @@ -130,7 +130,8 @@ try: tmpdir = mkdtemp(prefix='gajimtex') - tmppng = mkstemp(prefix='gajim_tex', suffix='.png')[1] + tmpfd, tmppng = mkstemp(prefix='gajim_tex', suffix='.png') + tmpfd.close() except Exception: raise LatexError('could not securely create one or more temporary files' ' for LaTeX conversion')

1 0

gajim: fix some icon sizes
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset a570008a3ed9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a570008a3ed9 description: fix some icon sizes diffstat: icons/hicolor/16x16/actions/gajim-receipt_missing.png | Bin icons/hicolor/32x32/actions/gajim-security_high.png | Bin icons/hicolor/32x32/actions/gajim-security_low.png | Bin icons/hicolor/48x48/actions/gajim-security_high.png | Bin icons/hicolor/48x48/actions/gajim-security_low.png | Bin icons/hicolor/48x48/actions/gajim-subscription_request.png | Bin 6 files changed, 0 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 0fff72bd8521 -r a570008a3ed9 icons/hicolor/16x16/actions/gajim-receipt_missing.png Binary file icons/hicolor/16x16/actions/gajim-receipt_missing.png has changed diff -r 0fff72bd8521 -r a570008a3ed9 icons/hicolor/32x32/actions/gajim-security_high.png Binary file icons/hicolor/32x32/actions/gajim-security_high.png has changed diff -r 0fff72bd8521 -r a570008a3ed9 icons/hicolor/32x32/actions/gajim-security_low.png Binary file icons/hicolor/32x32/actions/gajim-security_low.png has changed diff -r 0fff72bd8521 -r a570008a3ed9 icons/hicolor/48x48/actions/gajim-security_high.png Binary file icons/hicolor/48x48/actions/gajim-security_high.png has changed diff -r 0fff72bd8521 -r a570008a3ed9 icons/hicolor/48x48/actions/gajim-security_low.png Binary file icons/hicolor/48x48/actions/gajim-security_low.png has changed diff -r 0fff72bd8521 -r a570008a3ed9 icons/hicolor/48x48/actions/gajim-subscription_request.png Binary file icons/hicolor/48x48/actions/gajim-subscription_request.png has changed

1 0

gajim: update debian package
by Yann Leboulanger 28 Aug '12

28 Aug '12

changeset 0fff72bd8521 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0fff72bd8521 description: update debian package diffstat: debian/changelog | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diffs (17 lines): diff -r c5ff3f7dc4b9 -r 0fff72bd8521 debian/changelog --- a/debian/changelog Tue Aug 28 11:10:42 2012 +0200 +++ b/debian/changelog Tue Aug 28 11:46:25 2012 +0200 @@ -1,3 +1,13 @@ +gajim (0.15.1-1) unstable; urgency=low + + * New upstream release. + * change python-farsight to python-farstream in suggests list. Closes: #682598 + * Add python-gupnp-igd to suggests list. Closes: #668194 + * Fix shortcut behaviour in roster window. Closes: #667870 + * Improve GPG status handling. Closes: #670243 + + -- Yann Leboulanger <asterix(a)lagaule.org> Tue, 28 Aug 2012 11:42:26 +0200 + gajim (0.15-1) unstable; urgency=low * New upstream release.

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