Commits

commits@gajim.org

17632 discussions

python-nbxmpp: fix decoding traceback error
by Python-nbxmpp 28 Feb '15

28 Feb '15

changeset 7bd1e7d1b1a2 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=7bd1e7d1b1a2 description: fix decoding traceback error diffstat: nbxmpp/transports_nb.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diffs (40 lines): diff -r cce4e2196327 -r 7bd1e7d1b1a2 nbxmpp/transports_nb.py --- a/nbxmpp/transports_nb.py Sat Jan 31 15:17:54 2015 +0100 +++ b/nbxmpp/transports_nb.py Sat Feb 28 21:49:49 2015 +0100 @@ -38,6 +38,7 @@ import traceback import base64 import sys +import locale try: from urllib.parse import urlparse @@ -370,7 +371,8 @@ self._sock.setblocking(False) self._sock.connect((self.server, self.port)) except Exception as exc: - errnum, errstr = exc.errno, exc.strerror + errnum, errstr = exc.errno,\ + exc.strerror.decode(locale.getpreferredencoding()) if errnum in (errno.EINPROGRESS, errno.EALREADY, errno.EWOULDBLOCK): # connecting in progress @@ -473,7 +475,7 @@ self._sock.shutdown(socket.SHUT_RDWR) self._sock.close() except socket.error as e: - errstr = e.strerror + errstr = e.strerror.decode(locale.getpreferredencoding()) log.info('Error while disconnecting socket: %s' % errstr) self.fd = -1 NonBlockingTransport.disconnect(self, do_callback) @@ -601,7 +603,8 @@ except tls_nb.SSLWrapper.Error as e: log.info("_do_receive, caught SSL error, got %s:" % received, exc_info=True) - errnum, errstr = e.errno, e.strerror + errnum, errstr = e.errno, + e.strerror.decode(locale.getpreferredencoding()) if received == '': errstr = 'zero bytes on recv'

1 0

gajim: prepare 0.16.1 release
by Gajim 28 Feb '15

28 Feb '15

changeset 2a13c86246f0 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=2a13c86246f0 description: prepare 0.16.1 release diffstat: ChangeLog | 3 ++- autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diffs (36 lines): diff -r a18b3e4ca46d -r 2a13c86246f0 ChangeLog --- a/ChangeLog Sat Feb 28 15:47:51 2015 +0100 +++ b/ChangeLog Sat Feb 28 18:06:36 2015 +0100 @@ -1,8 +1,9 @@ -Gajim 0.16.1 () +Gajim 0.16.1 (28 February 2015) * Fix sending Zeroconf messages * Make ipython compatible to version >= 1.0 * Support XEP-0313 MAM + * Minor fixes and improvements Gajim 0.16 (04 October 2014) diff -r a18b3e4ca46d -r 2a13c86246f0 autogen.sh --- a/autogen.sh Sat Feb 28 15:47:51 2015 +0100 +++ b/autogen.sh Sat Feb 28 18:06:36 2015 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16" + gajimversion="0.16.1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r a18b3e4ca46d -r 2a13c86246f0 src/common/defs.py --- a/src/common/defs.py Sat Feb 28 15:47:51 2015 +0100 +++ b/src/common/defs.py Sat Feb 28 18:06:36 2015 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.0.1' +version = '0.16.1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: punyencode only the host part of the URL. Fixes #7981
by Gajim 28 Feb '15

28 Feb '15

changeset a18b3e4ca46d 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=a18b3e4ca46d description: punyencode only the host part of the URL. Fixes #7981 diffstat: src/common/helpers.py | 9 +++++++++ src/conversation_textview.py | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diffs (40 lines): diff -r e65be8537323 -r a18b3e4ca46d src/common/helpers.py --- a/src/common/helpers.py Sat Feb 28 15:12:11 2015 +0100 +++ b/src/common/helpers.py Sat Feb 28 15:47:51 2015 +0100 @@ -36,6 +36,7 @@ import subprocess import urllib import urllib2 +from urlparse import urlparse import webbrowser import errno import select @@ -136,6 +137,14 @@ converted_labels.append(idna.ToUnicode(label)) return ".".join(converted_labels) +def puny_encode_url(url): + _url = url + if '//' not in _url: + _url = '//' + _url + o = urlparse(_url) + p_loc = idn_to_ascii(o.netloc) + return url.replace(o.netloc, p_loc) + def parse_resource(resource): """ Perform stringprep on resource and return it diff -r e65be8537323 -r a18b3e4ca46d src/conversation_textview.py --- a/src/conversation_textview.py Sat Feb 28 15:12:11 2015 +0100 +++ b/src/conversation_textview.py Sat Feb 28 15:47:51 2015 +0100 @@ -1203,8 +1203,8 @@ all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] buffer_.insert_with_tags(end_iter, special_text, *all_tags) if 'url' in tags: - puny_text = puny_encode(special_text) - if not puny_text.endswith('-'): + puny_text = helpers.puny_encode_url(special_text) + if puny_text != special_text: puny_tags = [] if use_other_tags: puny_tags += other_tags

1 0

gajim: fix missing import
by Gajim 28 Feb '15

28 Feb '15

changeset 552893d68798 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=552893d68798 description: fix missing import diffstat: src/htmltextview.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r e4b211e92f94 -r 552893d68798 src/htmltextview.py --- a/src/htmltextview.py Tue Feb 10 12:57:49 2015 +0100 +++ b/src/htmltextview.py Sat Feb 28 15:11:09 2015 +0100 @@ -910,7 +910,7 @@ dialogs.AddNewContactWindow(self.account, jid) def make_link_menu(self, event, kind, text): - from gtkgui_helpers import get_gtk_builder + from gtkgui_helpers import get_gtk_builder, load_icon xml = get_gtk_builder('chat_context_menu.ui') menu = xml.get_object('chat_context_menu') childs = menu.get_children() @@ -927,7 +927,7 @@ else: # It's a mail or a JID # load muc icon join_group_chat_menuitem = xml.get_object('join_group_chat_menuitem') - muc_icon = gtkgui_helpers.load_icon('muc_active') + muc_icon = load_icon('muc_active') if muc_icon: join_group_chat_menuitem.set_image(muc_icon)

1 0

gajim: clean corretly opened window dict. Fixes #7983
by Gajim 28 Feb '15

28 Feb '15

changeset e65be8537323 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=e65be8537323 description: clean corretly opened window dict. Fixes #7983 diffstat: src/dialogs.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (32 lines): diff -r 552893d68798 -r e65be8537323 src/dialogs.py --- a/src/dialogs.py Sat Feb 28 15:11:09 2015 +0100 +++ b/src/dialogs.py Sat Feb 28 15:12:11 2015 +0100 @@ -2362,6 +2362,7 @@ this means room must be automaticaly configured and when done, invities must be automatically invited """ + self.window_account = None if account: if room_jid != '' and room_jid in gajim.gc_connected[account] and \ gajim.gc_connected[account][room_jid]: @@ -2373,6 +2374,7 @@ ErrorDialog(_('You are not connected to the server'), _('You can not join a group chat unless you are connected.')) raise GajimGeneralException, 'You must be connected to join a groupchat' + self.window_account = account self.xml = gtkgui_helpers.get_gtk_builder('join_groupchat_window.ui') @@ -2492,9 +2494,10 @@ self._nec_agent_info_received) gajim.ged.register_event_handler('agent-info-error-received', ged.GUI1, self._nec_agent_info_error_received) - if self.account and 'join_gc' in gajim.interface.instances[self.account]: + if self.window_account and 'join_gc' in gajim.interface.instances[ + self.window_account]: # remove us from open windows - del gajim.interface.instances[self.account]['join_gc'] + del gajim.interface.instances[self.window_account]['join_gc'] def on_join_groupchat_window_key_press_event(self, widget, event): if event.keyval == gtk.keysyms.Escape: # ESCAPE

1 0

gajim-plugins: Clients icons. Nick added Conversations, SecuGab ...
by Gajim Plugins 21 Feb '15

21 Feb '15

changeset d63a1bfa2a79 in /home/hg/repos/gajim-plugins author: Denis Fomin <fominde(a)gmail.com> branches: details:gajim-plugins?cmd=changeset;node=d63a1bfa2a79 description: Clients icons. Nick added Conversations, SecuGab and Chatsecure icons. diffstat: clients_icons/clients_icons.py | 3 +++ clients_icons/icons/chatsecure.png | Bin clients_icons/icons/conversations.png | Bin clients_icons/icons/secugab.png | Bin clients_icons/manifest.ini | 2 +- 5 файлов изменено, 4 вставок(+), 1 удалений(-) различия (31 строк): diff -r 3f4c7c5955ae -r d63a1bfa2a79 clients_icons/clients_icons.py --- a/clients_icons/clients_icons.py Thu Oct 09 12:01:28 2014 +0200 +++ b/clients_icons/clients_icons.py Sat Feb 21 18:15:10 2015 +0300 @@ -151,6 +151,9 @@ 'Adium' :['adium.png', ''], 'Pidgin': ['pidgin.png', ''], 'Leechcraft': ['leechcraft.png', ''], + 'Conversations': ['conversations.png', 'Conversations'], + 'ChatSecure': ['chatsecure.png', 'ChatSecure'], + 'SecuGab': ['secugab.png', 'Secugab'], } diff -r 3f4c7c5955ae -r d63a1bfa2a79 clients_icons/icons/chatsecure.png Binary file clients_icons/icons/chatsecure.png has changed diff -r 3f4c7c5955ae -r d63a1bfa2a79 clients_icons/icons/conversations.png Binary file clients_icons/icons/conversations.png has changed diff -r 3f4c7c5955ae -r d63a1bfa2a79 clients_icons/icons/secugab.png Binary file clients_icons/icons/secugab.png has changed diff -r 3f4c7c5955ae -r d63a1bfa2a79 clients_icons/manifest.ini --- a/clients_icons/manifest.ini Thu Oct 09 12:01:28 2014 +0200 +++ b/clients_icons/manifest.ini Sat Feb 21 18:15:10 2015 +0300 @@ -1,7 +1,7 @@ [info] name: Clients icons short_name: clients_icons -version: 5.4 +version: 5.5 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: Fix search button / server entry in join groupchat dialog
by Gajim 18 Feb '15

18 Feb '15

changeset be295ef9643c in /home/hg/repos/gajim author: Sam Whited <sam(a)samwhited.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=be295ef9643c description: Fix search button / server entry in join groupchat dialog diffstat: data/gui/join_groupchat_window.ui | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r 757a8517669e -r be295ef9643c data/gui/join_groupchat_window.ui --- a/data/gui/join_groupchat_window.ui Mon Jan 19 13:39:11 2015 +0100 +++ b/data/gui/join_groupchat_window.ui Wed Feb 18 12:53:37 2015 -0500 @@ -207,7 +207,8 @@ <property name="has_entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <signal name="changed" handler="on_server_entry_changed" swapped="no"/> </object> </child> </object>

1 0

gajim: Use bare JID when checking MAM message recipient. Fixes #...
by Gajim 16 Feb '15

16 Feb '15

changeset e4b211e92f94 in /home/hg/repos/gajim author: Holger Weiss <holger(a)zedat.fu-berlin.de> branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=e4b211e92f94 description: Use bare JID when checking MAM message recipient. Fixes #7973 diffstat: src/common/connection_handlers_events.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4c997d752bae -r e4b211e92f94 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Feb 16 13:11:17 2015 +0100 +++ b/src/common/connection_handlers_events.py Tue Feb 10 12:57:49 2015 +0100 @@ -1103,7 +1103,7 @@ msg_ = forwarded.getTag('message') to_ = msg_.getAttr('to') if to_: - gajim.get_jid_without_resource(to_) + to_ = gajim.get_jid_without_resource(to_) else: to_ = gajim.get_jid_from_account(account) frm_ = gajim.get_jid_without_resource(msg_.getAttr('from'))

1 0

gajim: don't use mutable arguments as default value. Fixes #7971
by Gajim 16 Feb '15

16 Feb '15

changeset f72456b0e7e2 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=f72456b0e7e2 description: don't use mutable arguments as default value. Fixes #7971 diffstat: src/common/socks5.py | 10 +++++----- src/common/zeroconf/client_zeroconf.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (60 lines): diff -r 404acc5097c9 -r f72456b0e7e2 src/common/socks5.py --- a/src/common/socks5.py Sun Feb 15 21:29:06 2015 +0100 +++ b/src/common/socks5.py Mon Feb 16 12:55:10 2015 +0100 @@ -914,7 +914,7 @@ Class for sending file to socket over socks5 """ def __init__(self, idlequeue, sock_hash, parent, _sock, host=None, - port=None, fingerprint = None, connected=True, file_props={}): + port=None, fingerprint = None, connected=True, file_props=None): self.fingerprint = fingerprint self.queue_idx = sock_hash self.queue = parent @@ -1321,7 +1321,7 @@ class Socks5SenderClient(Socks5Client, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, - port=None, fingerprint = None, connected=True, file_props={}): + port=None, fingerprint = None, connected=True, file_props=None): Socks5Client.__init__(self, idlequeue, host, port, None, None, file_props.sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent,_sock, @@ -1331,7 +1331,7 @@ class Socks5SenderServer(Socks5Server, Socks5Sender): def __init__(self, idlequeue, sock_hash, parent,_sock, host=None, - port=None, fingerprint = None, connected=True, file_props={}): + port=None, fingerprint = None, connected=True, file_props=None): Socks5Server.__init__(self, idlequeue, host, port, None, None, file_props.sid) Socks5Sender.__init__(self,idlequeue, sock_hash, parent, _sock, @@ -1339,7 +1339,7 @@ class Socks5ReceiverClient(Socks5Client, Socks5Receiver): - def __init__(self, idlequeue, streamhost, sid, file_props = None, + def __init__(self, idlequeue, streamhost, sid, file_props=None, fingerprint=None): Socks5Client.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], @@ -1350,7 +1350,7 @@ class Socks5ReceiverServer(Socks5Server, Socks5Receiver): - def __init__(self, idlequeue, streamhost, sid, file_props = None, + def __init__(self, idlequeue, streamhost, sid, file_props=None, fingerprint=None): Socks5Server.__init__(self, idlequeue, streamhost['host'], int(streamhost['port']), streamhost['initiator'], diff -r 404acc5097c9 -r f72456b0e7e2 src/common/zeroconf/client_zeroconf.py --- a/src/common/zeroconf/client_zeroconf.py Sun Feb 15 21:29:06 2015 +0100 +++ b/src/common/zeroconf/client_zeroconf.py Mon Feb 16 12:55:10 2015 +0100 @@ -128,7 +128,7 @@ return _sock class P2PClient(IdleObject): - def __init__(self, _sock, host, port, conn_holder, stanzaqueue=[], to=None, + def __init__(self, _sock, host, port, conn_holder, stanzaqueue, to=None, on_ok=None, on_not_ok=None): self._owner = self self.Namespace = 'jabber:client'

1 0

gajim: correctly use getter / setter. Fixes #7970
by Gajim 16 Feb '15

16 Feb '15

changeset 4c997d752bae 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=4c997d752bae description: correctly use getter / setter. Fixes #7970 diffstat: src/disco.py | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diffs (30 lines): diff -r f72456b0e7e2 -r 4c997d752bae src/disco.py --- a/src/disco.py Mon Feb 16 12:55:10 2015 +0100 +++ b/src/disco.py Mon Feb 16 13:11:17 2015 +0100 @@ -506,7 +506,7 @@ def __init__(self, account, jid='', node='', address_entry=False, parent=None, initial_identities=None): - self.account = account + self._account = account self.parent = parent if not jid: jid = gajim.config.get_per('accounts', account, 'hostname') @@ -588,12 +588,12 @@ self.window.show_all() @property - def _get_account(self): - return self.account + def account(self): + return self._account - @property - def _set_account(self, value): - self.account = value + @account.setter + def account(self, value): + self._account = value self.cache.account = value if self.browser: self.browser.account = value

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