Commits

commits@gajim.org

17632 discussions

gajim: link-local: on error after connect(), try next address
by Gajim 15 Jul '15

15 Jul '15

changeset 9e4291659c93 in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9e4291659c93 description: link-local: on error after connect(), try next address diffstat: src/common/zeroconf/client_zeroconf.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diffs (28 lines): diff -r c8f8fcd1a239 -r 9e4291659c93 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Mon Apr 06 16:33:10 2015 +0200 +++ b/src/common/zeroconf/client_zeroconf.py Mon Apr 06 18:55:23 2015 +0200 @@ -376,8 +376,8 @@ def connect_to_next_ip(self): if len(self.ais) == 0: + log.error('Connection failure to %s', str(self.host), exc_info=True) if len(self.addresses_) > 0: return self.get_next_addrinfo() - log.error('Connection failure to %s', str(self.host), exc_info=True) self.disconnect() return ai = self.ais.pop(0) @@ -489,8 +489,12 @@ self._do_send() def pollend(self): - self.state = -1 - self.disconnect() + if self.state == 0: # error in connect()? + #self.disconnect() + self.connect_to_next_ip() + else: + self.state = -1 + self.disconnect() def pollin(self): """

1 0

gajim: some cleanup
by Gajim 15 Jul '15

15 Jul '15

changeset f036110b4740 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f036110b4740 description: some cleanup diffstat: src/common/zeroconf/connection_handlers_zeroconf.py | 3 --- src/common/zeroconf/connection_zeroconf.py | 1 + 2 files changed, 1 insertions(+), 3 deletions(-) diffs (24 lines): diff -r db3fc384697e -r f036110b4740 src/common/zeroconf/connection_handlers_zeroconf.py --- a/src/common/zeroconf/connection_handlers_zeroconf.py Mon Apr 06 19:14:33 2015 +0200 +++ b/src/common/zeroconf/connection_handlers_zeroconf.py Sun May 10 20:54:26 2015 +0200 @@ -24,9 +24,6 @@ ## import time -import socket - -from calendar import timegm import nbxmpp diff -r db3fc384697e -r f036110b4740 src/common/zeroconf/connection_zeroconf.py --- a/src/common/zeroconf/connection_zeroconf.py Mon Apr 06 19:14:33 2015 +0200 +++ b/src/common/zeroconf/connection_zeroconf.py Sun May 10 20:54:26 2015 +0200 @@ -32,6 +32,7 @@ import os +import socket import random random.seed()

1 0

gajim: stop sending chatstates when we get an error message from...
by Gajim 15 Jul '15

15 Jul '15

changeset 09e725f382f9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=09e725f382f9 description: stop sending chatstates when we get an error message from a contact. Fixes #8010 diffstat: src/chat_control.py | 2 ++ src/gui_interface.py | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diffs (23 lines): diff -r f036110b4740 -r 09e725f382f9 src/chat_control.py --- a/src/chat_control.py Sun May 10 20:54:26 2015 +0200 +++ b/src/chat_control.py Sun May 10 20:56:41 2015 +0200 @@ -2746,6 +2746,8 @@ if not contact.supports(NS_CHATSTATES): return + if contact.our_chatstate == False: + return # if the new state we wanna send (state) equals # the current state (contact.our_chatstate) then return diff -r f036110b4740 -r 09e725f382f9 src/gui_interface.py --- a/src/gui_interface.py Sun May 10 20:54:26 2015 +0200 +++ b/src/gui_interface.py Sun May 10 20:56:41 2015 +0200 @@ -416,6 +416,7 @@ account=account, name=nick, show=show) ctrl = self.new_private_chat(gc_c, account, session) + ctrl.contact.our_chatstate = False ctrl.print_conversation(_('Error %(code)s: %(msg)s') % { 'code': obj.error_code, 'msg': obj.error_msg}, 'status') return

1 0

gajim: link-local: adjust Windows/Bonjour support to new data fo...
by Gajim 15 Jul '15

15 Jul '15

changeset db3fc384697e in /home/hg/repos/gajim author: Fabian Pietsch <fabian(a)canvon.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=db3fc384697e description: link-local: adjust Windows/Bonjour support to new data format. Fixes #8025 diffstat: src/common/zeroconf/zeroconf_bonjour.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 9e4291659c93 -r db3fc384697e src/common/zeroconf/zeroconf_bonjour.py --- a/src/common/zeroconf/zeroconf_bonjour.py Mon Apr 06 18:55:23 2015 +0200 +++ b/src/common/zeroconf/zeroconf_bonjour.py Mon Apr 06 19:14:33 2015 +0200 @@ -133,7 +133,8 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) + resolved_info = [(interfaceIndex, protocol, hosttarget, -1, port)] + self.contacts[name] = (name, domain, resolved_info, bare_name, txtRecord) self.new_serviceCB(name) else: @@ -141,7 +142,7 @@ # In case this is not our own record but of another # gajim instance on the same machine, # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) + self.invalid_self_contact[name] = (name, domain, (interfaceIndex, protocol, hosttarget, -1, port), bare_name, txtRecord) # count services self.resolved.append(True) @@ -168,7 +169,9 @@ # we don't want to see ourselves in the list if name != self.name: - self.contacts[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) + # update TXT data only, as intended according to resolve_all comment + old_contact = self.contacts[name] + self.contacts[name] = old_contact[0:C_TXT] + (txt,) + old_contact[C_TXT+1:] def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain):

1 0

gajim: fix translation typo
by Gajim 15 Jul '15

15 Jul '15

changeset 0418e2532902 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0418e2532902 description: fix translation typo diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4f2c3b099efe -r 0418e2532902 po/fr.po --- a/po/fr.po Sat Mar 07 21:03:25 2015 +0100 +++ b/po/fr.po Tue Mar 10 20:45:05 2015 +0100 @@ -9343,7 +9343,7 @@ #: ../src/groupchat_control.py:1519 msgid "The server has assigned or modified your roomnick" -msgstr "Le serveur à défini ou midifié votre Surnom de salon" +msgstr "Le serveur à défini ou modifié votre Surnom de salon" #. do not print 'kicked by None' #: ../src/groupchat_control.py:1525

1 0

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

15 Jul '15

changeset ea47b61e6741 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ea47b61e6741 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 0418e2532902 -r ea47b61e6741 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

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

15 Jul '15

changeset ba35febd92db in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=ba35febd92db 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 ea47b61e6741 -r ba35febd92db 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 @@ -123,7 +123,10 @@ labels = idna.dots.split(host) converted_labels = [] for label in labels: - converted_labels.append(idna.ToASCII(label).decode('utf-8')) + if label: + converted_labels.append(idna.ToASCII(label).decode('utf-8')) + else: + converted_labels.append('') return ".".join(converted_labels) def ascii_to_idn(host):

1 0

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

15 Jul '15

changeset 4649da14ae77 in /home/hg/repos/gajim author: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=4649da14ae77 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 ba35febd92db -r 4649da14ae77 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 from common import logger +import logging +log = logging.getLogger('gajim.c.optparser') + class OptionsParser: def __init__(self, filename): self.__filename = filename @@ -60,7 +63,11 @@ regex = re.compile(r"(?P<optname>[^.=]+)(?:(?:\.(?P<key>.+))?\.(?P<subname>[^.=]+))?\s=\s(?P<value>.*)") for line in fd: - 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: improve pasting xmpp uri in join groupchat dialogs. Fixes...
by Gajim 15 Jul '15

15 Jul '15

changeset 6c40c9c4d0ae in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6c40c9c4d0ae 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 4649da14ae77 -r 6c40c9c4d0ae 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 @@ -2533,11 +2533,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_comboboxtext.get_child().set_text(server) self.server_comboboxtext.grab_focus()

1 0

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

15 Jul '15

changeset 8be22cc843f9 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=8be22cc843f9 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 6c40c9c4d0ae -r 8be22cc843f9 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) @@ -1331,8 +1333,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

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