Commits

commits@gajim.org

17632 discussions

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

gajim: don't traceback when deleting an account. Fixes #8199
by Gajim 12 Dec '15

12 Dec '15

changeset c1b8ae2f7b5a 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=c1b8ae2f7b5a description: don't traceback when deleting an account. Fixes #8199 diffstat: src/roster_window.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (21 lines): diff -r 9633f40c8c9e -r c1b8ae2f7b5a src/roster_window.py --- a/src/roster_window.py Tue Dec 01 22:30:04 2015 +0100 +++ b/src/roster_window.py Sat Dec 12 13:52:18 2015 +0100 @@ -108,6 +108,8 @@ if self.regroup: name = 'MERGED' + if name not in self._iters: + return None it = self._iters[name]['account'] if model == self.model or it is None: @@ -135,6 +137,8 @@ if self.regroup: account = 'MERGED' + if account not in self._iters: + return None if name not in self._iters[account]['groups']: return None

1 0

gajim-plugins: Some minor bugfixes...
by Gajim Plugins 11 Dec '15

11 Dec '15

changeset 6549b16f8430 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=6549b16f8430 description: Some minor bugfixes... diffstat: httpupload/httpupload.py | 42 ++++++++++++++++++++++++------------------ httpupload/manifest.ini | 2 +- 2 files changed, 25 insertions(+), 19 deletions(-) diffs (92 lines): diff -r 0cb31e935c60 -r 6549b16f8430 httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Nov 12 22:35:42 2015 +0100 +++ b/httpupload/httpupload.py Fri Dec 11 03:57:10 2015 +0100 @@ -272,6 +272,21 @@ progress_messages = Queue(8) progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages) def upload_file(stanza): + slot = stanza.getTag("slot") + if not slot: + progress_window.close_dialog() + log.error("got unexpected stanza: "+str(stanza)) + error = stanza.getTag("error") + if error and error.getTag("text"): + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server: %s') % str(error.getTagData("text")), + transient_for=self.chat_control.parent_win.window) + else: + ErrorDialog(_('Could not request upload slot'), + _('Got unexpected response from server (protocol mismatch??)'), + transient_for=self.chat_control.parent_win.window) + return + try: open(path_to_file, "rb").read(1) # check for open/read errors (maybe this is not needed anymore) data = StreamFileWithProgress(path_to_file, "rb", progress_window.update_progress) @@ -282,20 +297,6 @@ transient_for=self.chat_control.parent_win.window) raise # fill error log with useful information - slot = stanza.getTag("slot") - if not slot: - progress_window.close_dialog() - log.error("got unexpected stanza: "+str(stanza)) - error = stanza.getTag("error") - if error and error.getTag("text"): - ErrorDialog(_('Could not request upload slot'), - _('Got unexpected response from server: ') + str(error.getTagData("text")), - transient_for=self.chat_control.parent_win.window) - else: - ErrorDialog(_('Could not request upload slot'), - _('Got unexpected response from server (protocol mismatch??)'), - transient_for=self.chat_control.parent_win.window) - return put = slot.getTag("put") get = slot.getTag("get") if not put or not get: @@ -318,7 +319,12 @@ progress_messages.put(_('Calculating (possible) image thumbnail...')) thumb = None quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) - if pil_available: + with open(path_to_file, 'rb') as content_file: + thumb = urllib2.quote(base64.standard_b64encode(content_file.read()), '') + if thumb and len(thumb) < max_thumbnail_size: + quality = 100 + log.info("Image small enough (%d bytes), not resampling" % len(thumb)) + elif pil_available: log.info("PIL available, using it for image downsampling") try: for quality in quality_steps: @@ -388,7 +394,7 @@ request = urllib2.Request(put.getData().encode("utf-8"), data=data, headers=headers) request.get_method = lambda: 'PUT' log.debug("opening urllib2 upload request...") - transfer = urllib2.urlopen(request) + transfer = urllib2.urlopen(request, timeout=30) log.debug("urllib2 upload request done, response code: " + str(transfer.getcode())) return transfer.getcode() except UploadAbortedException: @@ -401,8 +407,8 @@ raise # fill error log with useful information return 0 - log.info("Uploading file to " + str(put.getData())) - log.info("Please download from " + str(get.getData()) + " later") + log.info("Uploading file to '%s'..." % str(put.getData())) + log.info("Please download from '%s' later..." % str(get.getData())) gajim.thread_interface(uploader, [], upload_complete) diff -r 0cb31e935c60 -r 6549b16f8430 httpupload/manifest.ini --- a/httpupload/manifest.ini Thu Nov 12 22:35:42 2015 +0100 +++ b/httpupload/manifest.ini Fri Dec 11 03:57:10 2015 +0100 @@ -1,7 +1,7 @@ [info] name: HttpUpload short_name: httpupload -version: 0.3.2 +version: 0.3.3 description: This plugin is designed to send a file to a contact or muc by using httpupload. Your server must support <a href="http://xmpp.org/extensions/xep-0363.html">XEP-0363: HTTP Upload</a>. Conversations supported this.

1 0

gajim: correctly announce that we support XEP-0249
by Gajim 02 Dec '15

02 Dec '15

changeset 9b0eab55e1eb in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9b0eab55e1eb description: correctly announce that we support XEP-0249 diffstat: src/common/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e6319cf6cb06 -r 9b0eab55e1eb src/common/gajim.py --- a/src/common/gajim.py Tue Dec 01 22:30:04 2015 +0100 +++ b/src/common/gajim.py Wed Dec 02 23:04:13 2015 +0100 @@ -231,7 +231,7 @@ nbxmpp.NS_SSN, nbxmpp.NS_MOOD, nbxmpp.NS_ACTIVITY, nbxmpp.NS_NICK, nbxmpp.NS_ROSTERX, nbxmpp.NS_SECLABEL, nbxmpp.NS_HASHES, nbxmpp.NS_HASHES_MD5, nbxmpp.NS_HASHES_SHA1, nbxmpp.NS_HASHES_SHA256, - nbxmpp.NS_HASHES_SHA512] + nbxmpp.NS_HASHES_SHA512, nbxmpp.NS_CONFERENCE] # Optional features gajim supports per account gajim_optional_features = {}

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