Commits December 2015

commits@gajim.org

1 participants
53 discussions

gajim-plugins: [gotr] do not crash when Gajim version has 4 numb...
by Gajim Plugins 20 Dec '15

20 Dec '15

changeset f7925acd4aba in /home/hg/repos/gajim-plugins author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:gajim-plugins?cmd=changeset;node=f7925acd4aba description: [gotr] do not crash when Gajim version has 4 numbers (0.16.4.1) diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diffs (33 lines): diff -r 2dc8e77a80e5 -r f7925acd4aba gotr/manifest.ini --- a/gotr/manifest.ini Sat Dec 19 02:26:57 2015 +0100 +++ b/gotr/manifest.ini Sun Nov 22 16:59:48 2015 +0100 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9.1 +version: 1.9.2 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r 2dc8e77a80e5 -r f7925acd4aba gotr/otrmodule.py --- a/gotr/otrmodule.py Sat Dec 19 02:26:57 2015 +0100 +++ b/gotr/otrmodule.py Sun Nov 22 16:59:48 2015 +0100 @@ -66,7 +66,7 @@ import time import sys from pprint import pformat -from distutils.version import StrictVersion +from distutils.version import LooseVersion from common import gajim from common import ged @@ -279,7 +279,7 @@ self.handle_incoming_msg) self.events_handlers['before-change-show'] = (ged.PRECORE, self.handle_change_show) - if StrictVersion(gajim.config.get('version')) < StrictVersion(MINVERSION_OUTGOING_MSG_STAZA): + if LooseVersion(gajim.config.get('version')) < LooseVersion(MINVERSION_OUTGOING_MSG_STAZA): self.events_handlers['message-outgoing'] = (ged.OUT_PRECORE, self.handle_outgoing_msg) else:

1 0

gajim: Ignore roster pushes that are not from our JID or our ser...
by Gajim 20 Dec '15

20 Dec '15

changeset 725f1b5da2bf 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=725f1b5da2bf description: Ignore roster pushes that are not from our JID or our server. Ignore badly farmated roster pushes. diffstat: src/common/connection_handlers_events.py | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diffs (26 lines): diff -r 47d1d194e2d1 -r 725f1b5da2bf src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sat Dec 19 11:15:40 2015 +0100 +++ b/src/common/connection_handlers_events.py Sun Dec 20 20:42:38 2015 +0100 @@ -408,6 +408,10 @@ base_network_events = [] def generate(self): + frm = helpers.get_jid_from_iq(self.stanza) + our_jid = gajim.get_jid_from_account(self.conn.name) + if frm and frm != our_jid and frm != gajim.get_server_from_jid(our_jid): + return self.version = self.stanza.getTagAttr('query', 'ver') self.items = {} for item in self.stanza.getTag('query').getChildren(): @@ -424,6 +428,11 @@ groups.append(group.getData()) self.items[jid] = {'name': name, 'sub': sub, 'ask': ask, 'groups': groups} + if len(self.items) > 1: + reply = nbxmpp.Iq(typ='error', attrs={'id': self.stanza.getID()}, + to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None) + self.conn.connection.send(reply) + return if self.conn.connection and self.conn.connected > 1: reply = nbxmpp.Iq(typ='result', attrs={'id': self.stanza.getID()}, to=self.stanza.getFrom(), frm=self.stanza.getTo(), xmlns=None)

1 0

gajim: [tmolitor] add a way to sort emoticons in emoticon menu. ...
by Gajim 19 Dec '15

19 Dec '15

changeset 47d1d194e2d1 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=47d1d194e2d1 description: [tmolitor] add a way to sort emoticons in emoticon menu. Fixes #8204 diffstat: src/gui_interface.py | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diffs (54 lines): diff -r 5f460d7b8143 -r 47d1d194e2d1 src/gui_interface.py --- a/src/gui_interface.py Thu Dec 17 20:10:06 2015 +0100 +++ b/src/gui_interface.py Sat Dec 19 11:15:40 2015 +0100 @@ -1991,6 +1991,11 @@ # set reload(emoticons) emots = emoticons.emoticons + self.emoticons_sorting = None + try: + self.emoticons_sorting = emoticons.sorting + except: + pass except Exception, e: return True for emot_filename in emots: @@ -2009,6 +2014,12 @@ 16, 16) self.emoticons_images.append((emot, pix)) self.emoticons[emot.upper()] = emot_file + def emoticons_sorter(item): + try: + return self.emoticons_sorting.index(item[0]) + except: + return 0 + self.emoticons_images = sorted(self.emoticons_images, key=emoticons_sorter) del emoticons sys.path.remove(path) @@ -2073,7 +2084,7 @@ ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False): """ Join the room immediately """ @@ -2589,7 +2600,7 @@ # we are not already connected minimize = bm['minimize'] in ('1', 'true') self.join_gc_room(account, jid, bm['nick'], - bm['password'], minimize = minimize) + bm['password'], minimize = minimize) elif jid in self.minimized_controls[account]: # more or less a hack: # On disconnect the minimized gc contact instances @@ -2792,6 +2803,7 @@ self.emoticons = [] self.emoticons_animations = {} self.emoticons_images = {} + self.emoticons_sorting = None cfg_was_read = parser.read()

1 0

gajim-plugins: Added new (better) sorting to the twemoji resized...
by Gajim Plugins 19 Dec '15

19 Dec '15

changeset 2dc8e77a80e5 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=2dc8e77a80e5 description: Added new (better) sorting to the twemoji resized package diffstat: emoticons_pack/contents.ini | 1 + emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 3 files changed, 2 insertions(+), 1 deletions(-) diffs (25 lines): diff -r e43eec160b86 -r 2dc8e77a80e5 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Thu Dec 17 00:28:18 2015 +0100 +++ b/emoticons_pack/contents.ini Sat Dec 19 02:26:57 2015 +0100 @@ -114,6 +114,7 @@ description: <body xmlns='http://www.w3.org/1999/xhtml'> Twemoji (Twitter Emoji for Gajim) The size of this Emojis is 24px and thus a bit more usable than those of the Twemoji packet (having a size of 48px) + Also the sorting is more intuitive (displaying all important emojis at the top of the emoticons dropdown). <img src="preview.image"/> </body> homepage: https://trac.gajim.org/wiki/TwemojiResized diff -r e43eec160b86 -r 2dc8e77a80e5 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r e43eec160b86 -r 2dc8e77a80e5 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Thu Dec 17 00:28:18 2015 +0100 +++ b/emoticons_pack/manifest.ini Sat Dec 19 02:26:57 2015 +0100 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.1.2 +version: 0.1.3 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: [tmolitor] use uuid instead of plain counting integers fo...
by Gajim 17 Dec '15

17 Dec '15

changeset 5f460d7b8143 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=5f460d7b8143 description: [tmolitor] use uuid instead of plain counting integers for stanza ids. Fixes #8202 diffstat: src/common/gajim.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (24 lines): diff -r c1b8ae2f7b5a -r 5f460d7b8143 src/common/gajim.py --- a/src/common/gajim.py Sat Dec 12 13:52:18 2015 +0100 +++ b/src/common/gajim.py Thu Dec 17 20:10:06 2015 +0100 @@ -31,6 +31,7 @@ import os import logging import locale +import uuid import config import nbxmpp @@ -238,11 +239,8 @@ import caps_cache caps_cache.initialize(logger) -global_id = 0 def get_an_id(): - global global_id - global_id += 1 - return global_id + return str(uuid.uuid4()) def get_nick_from_jid(jid): pos = jid.find('@')

1 0

python-nbxmpp: [tmolitor] use uuid instead of plain counting int...
by Python-nbxmpp 17 Dec '15

17 Dec '15

changeset 06830be9dcec in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=06830be9dcec description: [tmolitor] use uuid instead of plain counting integers for stanza ids diffstat: nbxmpp/dispatcher_nb.py | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diffs (30 lines): diff -r 8c4514e0a423 -r 06830be9dcec nbxmpp/dispatcher_nb.py --- a/nbxmpp/dispatcher_nb.py Thu Dec 17 19:45:59 2015 +0100 +++ b/nbxmpp/dispatcher_nb.py Thu Dec 17 19:47:36 2015 +0100 @@ -25,6 +25,7 @@ import sys import locale import re +import uuid from xml.parsers.expat import ExpatError from .plugin import PlugIn from .protocol import (NS_STREAMS, NS_XMPP_STREAMS, NS_HTTP_BIND, Iq, Presence, @@ -38,7 +39,6 @@ #: default timeout to wait for response for our id DEFAULT_TIMEOUT_SECONDS = 25 -outgoingID = 0 XML_DECLARATION = '<?xml version=\'1.0\'?>' @@ -120,9 +120,7 @@ self.invalid_chars_re = re.compile(r) def getAnID(self): - global outgoingID - outgoingID += 1 - return repr(outgoingID) + return str(uuid.uuid4()) def dumpHandlers(self): """

1 0

python-nbxmpp: [tmolitor] fixes the race condition and provides ...
by Python-nbxmpp 17 Dec '15

17 Dec '15

changeset 8c4514e0a423 in /home/hg/repos/python-nbxmpp details:http://hg.gajim.org/python-nbxmpp?cmd=changeset;node=8c4514e0a423 description: [tmolitor] fixes the race condition and provides a better handling of server h > our h as well. Fixes #36 diffstat: nbxmpp/smacks.py | 53 +++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 10 deletions(-) diffs (95 lines): diff -r 2b837401ad95 -r 8c4514e0a423 nbxmpp/smacks.py --- a/nbxmpp/smacks.py Mon Nov 23 17:33:14 2015 -0400 +++ b/nbxmpp/smacks.py Thu Dec 17 19:45:59 2015 +0100 @@ -17,6 +17,7 @@ self.out_h = 0 # Outgoing stanzas handled self.in_h = 0 # Incoming stanzas handled self.uqueue = [] # Unhandled stanzas queue + self.old_uqueue = [] # Unhandled stanzas queue of the last session self.session_id = None self.resumption = False # If server supports resume # Max number of stanzas in queue before making a request @@ -38,7 +39,7 @@ xmlns=NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('a', self.check_ack, xmlns=NS_STREAM_MGMT) - owner.Dispatcher.RegisterHandler('resumed', self.check_ack, + owner.Dispatcher.RegisterHandler('resumed', self.check_resume, xmlns=NS_STREAM_MGMT) owner.Dispatcher.RegisterHandler('failed', self.error_handling, xmlns=NS_STREAM_MGMT) @@ -61,6 +62,7 @@ # Every time we attempt to negociate, we must erase all previous info # about any previous session self.uqueue = [] + self.old_uqueue = [] self.in_h = 0 self.out_h = 0 self.session_id = None @@ -75,6 +77,8 @@ self.resuming = False log.error('Attempted to resume without a valid session id ') return + self.old_uqueue = self.uqueue #save old messages in an extra "queue" to avoid race conditions + self.uqueue = [] resume = Acks() resume.buildResume(self.in_h, self.session_id) self._owner.Connection.send(resume, False) @@ -102,19 +106,48 @@ h = int(h) diff = self.out_h - h - if len(self.uqueue) < diff or diff < 0: - log.error('Server and client number of stanzas handled mismatch ') + if diff < 0: + log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d)' % (self.out_h, h)) + while (len(self.uqueue)): #don't accumulate all messages in this case (they would otherwise all be resent on the next reconnect) + self.uqueue.pop(0) + elif len(self.uqueue) < diff: + log.error('Server and client number of stanzas handled mismatch (our h: %d, server h: %d)' % (self.out_h, h)) else: + log.debug('Got ack for outgoing stanzas (our h: %d, server h: %d), removing %d messages from queue...' % (self.out_h, h, len(self.uqueue) - diff)) while (len(self.uqueue) > diff): self.uqueue.pop(0) + + def check_resume(self, disp, stanza): + ''' + Checks if the number of stanzas sent are the same as the + number of stanzas received by the server. Resends stanzas not received + by the server in the last session. + ''' + h = stanza.getAttr('h') + if not h: + log.error('Server did not send h attribute') + return + h = int(h) + diff = self.out_h - h - if stanza.getName() == 'resumed': - self.enabled = True - self.resuming = True - self.con.set_oldst() - if self.uqueue != []: - for i in self.uqueue: - self._owner.Connection.send(i, False) + if diff < 0: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) + self.old_uqueue = [] #that's weird, but we don't resend this stanzas if the server says we don't need to + elif len(self.old_uqueue) < diff: + log.error('Server and client number of stanzas handled mismatch on session resumption (our h: %d, server h: %d)' % (self.out_h, h)) + else: + log.info('Removing %d already received stanzas from old outgoing queue (our h: %d, server h: %d, remaining in queue: %d)' % (len(self.old_uqueue) - diff, self.out_h, h, diff)) + while (len(self.old_uqueue) > diff): + self.old_uqueue.pop(0) + + self.enabled = True + self.resuming = True + self.con.set_oldst() + if self.old_uqueue != []: + log.info('Session resumed, replaying %s stanzas...' % len(self.old_uqueue)) + for i in self.old_uqueue: + self._owner.Connection.send(i, False) + self.old_uqueue = [] def error_handling(self, disp, stanza): # If the server doesn't recognize previd, forget about resuming

1 0

gajim-plugins: Fixed a naming bug in the new Twemoji resized ico...
by Gajim Plugins 16 Dec '15

16 Dec '15

changeset e43eec160b86 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=e43eec160b86 description: Fixed a naming bug in the new Twemoji resized icon pack. diffstat: emoticons_pack/contents.ini | 2 +- emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diffs (26 lines): diff -r 05bd522ba016 -r e43eec160b86 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Thu Dec 17 00:18:28 2015 +0100 +++ b/emoticons_pack/contents.ini Thu Dec 17 00:28:18 2015 +0100 @@ -113,7 +113,7 @@ converter: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr>, Thilo Molitor <thilo(a)eightysoft.de> description: <body xmlns='http://www.w3.org/1999/xhtml'> Twemoji (Twitter Emoji for Gajim) - The size of this Emojis is 24px and thus a bit more usable than those of the Twemoji packet (having a size of 48px) + The size of this Emojis is 24px and thus a bit more usable than those of the Twemoji packet (having a size of 48px) <img src="preview.image"/> </body> homepage: https://trac.gajim.org/wiki/TwemojiResized diff -r 05bd522ba016 -r e43eec160b86 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r 05bd522ba016 -r e43eec160b86 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Thu Dec 17 00:18:28 2015 +0100 +++ b/emoticons_pack/manifest.ini Thu Dec 17 00:28:18 2015 +0100 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.1.1 +version: 0.1.2 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-plugins: Added resized Twemoji pack and bump version to 0.1.1
by Gajim Plugins 16 Dec '15

16 Dec '15

changeset 05bd522ba016 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=05bd522ba016 description: Added resized Twemoji pack and bump version to 0.1.1 diffstat: emoticons_pack/contents.ini | 11 +++++++++++ emoticons_pack/emoticons_pack.zip | Bin emoticons_pack/manifest.ini | 2 +- 3 files changed, 12 insertions(+), 1 deletions(-) diffs (32 lines): diff -r 6549b16f8430 -r 05bd522ba016 emoticons_pack/contents.ini --- a/emoticons_pack/contents.ini Fri Dec 11 03:57:10 2015 +0100 +++ b/emoticons_pack/contents.ini Thu Dec 17 00:18:28 2015 +0100 @@ -106,3 +106,14 @@ <img src="preview.image"/> </body> homepage: https://trac.gajim.org/wiki/Twemoji + +[Twemoji resized] +icon: 1f600.png +authors: Twitter, Inc. and other contributors +converter: Emmanuel Gil Peyrot <linkmauve(a)linkmauve.fr>, Thilo Molitor <thilo(a)eightysoft.de> +description: <body xmlns='http://www.w3.org/1999/xhtml'> + Twemoji (Twitter Emoji for Gajim) + The size of this Emojis is 24px and thus a bit more usable than those of the Twemoji packet (having a size of 48px) + <img src="preview.image"/> + </body> +homepage: https://trac.gajim.org/wiki/TwemojiResized diff -r 6549b16f8430 -r 05bd522ba016 emoticons_pack/emoticons_pack.zip Binary file emoticons_pack/emoticons_pack.zip has changed diff -r 6549b16f8430 -r 05bd522ba016 emoticons_pack/manifest.ini --- a/emoticons_pack/manifest.ini Fri Dec 11 03:57:10 2015 +0100 +++ b/emoticons_pack/manifest.ini Thu Dec 17 00:18:28 2015 +0100 @@ -1,7 +1,7 @@ [info] name: Emoticons pack short_name: emoticons_pack -version: 0.1 +version: 0.1.1 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: don't try to use GUPnP-IGD when we use an IPv6 address
by Gajim 15 Dec '15

15 Dec '15

changeset 44024cd39584 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=44024cd39584 description: don't try to use GUPnP-IGD when we use an IPv6 address diffstat: src/common/protocol/bytestream.py | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diffs (38 lines): diff -r cabbc6e03e90 -r 44024cd39584 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Wed Dec 02 23:05:54 2015 +0100 +++ b/src/common/protocol/bytestream.py Tue Dec 15 22:25:39 2015 +0100 @@ -421,6 +421,15 @@ self.connection.send(iq) return + my_ip = self.peerhost[0] + + # check if we are connected with an IPv4 address + try: + socket.inet_aton(my_ip) + except socket.error as e: + self.connection.send(iq) + return + def ip_is_local(ip): if '.' not in ip: # it's an IPv6 @@ -439,9 +448,6 @@ return True return False - - my_ip = self.peerhost[0] - if not ip_is_local(my_ip): self.connection.send(iq) return @@ -475,7 +481,7 @@ cleanup_gupnp() def fail(s, error, proto, ext_ip, local_ip, local_port, desc): - log.debug('Got GUPnP-IGD error : %s', str(error)) + log.debug('Got GUPnP-IGD error') self.connection.send(iq) cleanup_gupnp()

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2015