Commits

commits@gajim.org

17632 discussions

gajim: prevent crash when a plugin is wrong.
by Gajim 29 Apr '16

29 Apr '16

changeset ba135dfc0f5a 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=ba135dfc0f5a description: prevent crash when a plugin is wrong. diffstat: src/plugins/pluginmanager.py | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diffs (17 lines): diff -r 34318236c9b8 -r ba135dfc0f5a src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Jan 03 22:26:15 2016 +0100 +++ b/src/plugins/pluginmanager.py Sun Feb 21 10:25:45 2016 +0100 @@ -452,11 +452,8 @@ file_path += os.path.sep try: module = __import__(module_name) - except ValueError, value_error: - log.debug(value_error) - except ImportError, import_error: - log.debug(import_error) - + except (ValueError, ImportError, AttributeError) as error: + log.debug(error) if module is None: continue

1 0

gajim: Fix file chooser dialog on Windows
by Gajim 28 Apr '16

28 Apr '16

changeset f092ab1bd74b in /home/hg/repos/gajim author: Nathalie Rud <nathalier(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=f092ab1bd74b description: Fix file chooser dialog on Windows Dropped decode_filechooser_file_paths() as with Python 3 it raised AttributeError: 'str' object has no attribute 'decode' on Windows, and silently handled exceptions effectively doing nothing on *nix systems. diffstat: src/dialogs.py | 9 --------- src/filetransfers_window.py | 4 ---- src/gtkgui_helpers.py | 25 ------------------------- 3 files changed, 0 insertions(+), 38 deletions(-) diffs (103 lines): diff -r 756d78be6ab2 -r f092ab1bd74b src/dialogs.py --- a/src/dialogs.py Tue Apr 19 23:48:10 2016 +0200 +++ b/src/dialogs.py Wed Apr 27 02:44:13 2016 +0300 @@ -4712,9 +4712,6 @@ check if file exists and call callback ''' path_to_clientcert_file = self.get_filename() - path_to_clientcert_file = \ - gtkgui_helpers.decode_filechooser_file_paths( - (path_to_clientcert_file,))[0] if os.path.exists(path_to_clientcert_file): callback(widget, path_to_clientcert_file) @@ -4757,8 +4754,6 @@ Check if file exists and call callback """ path_to_snd_file = self.get_filename() - path_to_snd_file = gtkgui_helpers.decode_filechooser_file_paths( - (path_to_snd_file,))[0] if os.path.exists(path_to_snd_file): callback(widget, path_to_snd_file) @@ -4799,8 +4794,6 @@ path_to_file = self.get_filename() if not path_to_file: return - path_to_file = gtkgui_helpers.decode_filechooser_file_paths( - (path_to_file,))[0] if os.path.exists(path_to_file): if isinstance(callback, tuple): callback[0](widget, path_to_file, *callback[1:]) @@ -4892,8 +4885,6 @@ path_to_file = self.get_filename() if not path_to_file: return - path_to_file = gtkgui_helpers.decode_filechooser_file_paths( - (path_to_file,))[0] if os.path.exists(path_to_file): if isinstance(callback, tuple): callback[0](path_to_file, *callback[1:]) diff -r 756d78be6ab2 -r f092ab1bd74b src/filetransfers_window.py --- a/src/filetransfers_window.py Tue Apr 19 23:48:10 2016 +0200 +++ b/src/filetransfers_window.py Wed Apr 27 02:44:13 2016 +0300 @@ -297,8 +297,6 @@ def on_ok(widget): file_dir = None files_path_list = dialog.get_filenames() - files_path_list = gtkgui_helpers.decode_filechooser_file_paths( - files_path_list) text_buffer = desc_entry.get_buffer() desc = text_buffer.get_text(text_buffer.get_start_iter(), text_buffer.get_end_iter(), True) @@ -379,8 +377,6 @@ def on_file_request_accepted(self, account, contact, file_props): def on_ok(widget, account, contact, file_props): file_path = dialog2.get_filename() - file_path = gtkgui_helpers.decode_filechooser_file_paths( - (file_path,))[0] if os.path.exists(file_path): # check if we have write permissions if not os.access(file_path, os.W_OK): diff -r 756d78be6ab2 -r f092ab1bd74b src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Tue Apr 19 23:48:10 2016 +0200 +++ b/src/gtkgui_helpers.py Wed Apr 27 02:44:13 2016 +0300 @@ -679,30 +679,6 @@ pixbuf.saturate_and_pixelate(pixbuf2, 0.0, False) return pixbuf2 -def decode_filechooser_file_paths(file_paths): - """ - Decode as UTF-8 under Windows and ask sys.getfilesystemencoding() in POSIX - file_paths MUST be LIST - """ - file_paths_list = list() - - if os.name == 'nt': # decode as UTF-8 under Windows - for file_path in file_paths: - file_path = file_path.decode('utf8') - file_paths_list.append(file_path) - else: - for file_path in file_paths: - try: - file_path = file_path.decode(sys.getfilesystemencoding()) - except Exception: - try: - file_path = file_path - except Exception: - pass - file_paths_list.append(file_path) - - return file_paths_list - def escape_underscore(s): """ Escape underlines to prevent them from being interpreted as keyboard @@ -771,7 +747,6 @@ def on_ok(widget): file_path = dialog.get_filename() - file_path = decode_filechooser_file_paths((file_path,))[0] if os.path.exists(file_path): # check if we have write permissions if not os.access(file_path, os.W_OK):

1 0

gajim: Fix exception in _parse_srv_result_nt() (on Windows)
by Gajim 28 Apr '16

28 Apr '16

changeset 5fca8868e23d in /home/hg/repos/gajim author: Nathalie Rud <nathalier(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=5fca8868e23d description: Fix exception in _parse_srv_result_nt() (on Windows) Sometimes 'result' parameter is byte[] which causes exception: TypeError: 'str' does not support the buffer interface diffstat: src/common/resolver.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r f092ab1bd74b -r 5fca8868e23d src/common/resolver.py --- a/src/common/resolver.py Wed Apr 27 02:44:13 2016 +0300 +++ b/src/common/resolver.py Wed Apr 27 02:53:43 2016 +0300 @@ -198,7 +198,7 @@ if not result: return [] hosts = [] - lines = result.replace('\r', '').split('\n') + lines = str(result).replace('\r', '').split('\n') current_host = None for line in lines: line = line.lstrip()

1 0

gajim: Cleaner version of the mam message timestamp fix. Fixes #...
by Gajim 19 Apr '16

19 Apr '16

changeset a5a4f8c23b5e in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a5a4f8c23b5e description: Cleaner version of the mam message timestamp fix. Fixes #8277 diffstat: src/common/connection_handlers_events.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diffs (28 lines): diff -r b19bd9be4a87 -r a5a4f8c23b5e src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Apr 18 01:59:20 2016 +0200 +++ b/src/common/connection_handlers_events.py Tue Apr 19 23:43:01 2016 +0200 @@ -1029,19 +1029,17 @@ if not self.stanza: return account = self.conn.name + self.msg_ = self.stanza.getTag('message') + # use timestamp of archived message, if available and archive timestamp otherwise delay = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) + delay2 = self.msg_.getTag('delay', namespace=nbxmpp.NS_DELAY2) + if delay2: + delay = delay2 if not delay: return tim = delay.getAttr('stamp') tim = helpers.datetime_tuple(tim) self.tim = localtime(timegm(tim)) - self.msg_ = self.stanza.getTag('message') - # use delay of archived message, if possible - delay = self.msg_.getTag('delay', namespace=nbxmpp.NS_DELAY2) - if delay: - tim = delay.getAttr('stamp') - tim = helpers.datetime_tuple(tim) - self.tim = localtime(timegm(tim)) to_ = self.msg_.getAttr('to') if to_: to_ = gajim.get_jid_without_resource(to_)

1 0

gajim: merge
by Gajim 19 Apr '16

19 Apr '16

changeset 756d78be6ab2 in /home/hg/repos/gajim author: tmolitor <thilo(a)eightysoft.de> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=756d78be6ab2 description: merge diffstat: data/emoticons/animated/emoticons.py | 100 ++++++++++++++++--------------- data/emoticons/static-big/emoticons.py | 86 +++++++++++++------------- data/emoticons/static/emoticons.py | 86 +++++++++++++------------- data/emoticons/tango/emoticons.py | 104 ++++++++++++++++---------------- src/common/connection.py | 2 +- src/common/gnupg.py | 4 +- src/common/protocol/bytestream.py | 27 +++---- src/config.py | 4 +- src/history_window.py | 11 ++- src/roster_window.py | 3 - 10 files changed, 219 insertions(+), 208 deletions(-) diffs (truncated from 562 to 300 lines): diff -r a5a4f8c23b5e -r 756d78be6ab2 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Tue Apr 19 23:43:01 2016 +0200 +++ b/data/emoticons/animated/emoticons.py Tue Apr 19 23:48:10 2016 +0200 @@ -1,50 +1,52 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['B-)', '(H)']), + ('wink.gif', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.gif', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.gif', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('pussy.png', ['(@)']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('cigarette.gif', ['(ci)']), + ('cake.gif', ['(^)']), + ('dontknow.gif', [':^)']), + ('eyeroll.gif', ['8-)']), + ('lightning.gif', ['(li)']), + ('party.gif', ['<:o)']), + ('sleepy.gif', ['|-)']), + ('think.gif', ['*-)']), + ('puke.gif', [':-!']), +)) diff -r a5a4f8c23b5e -r 756d78be6ab2 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Tue Apr 19 23:43:01 2016 +0200 +++ b/data/emoticons/static-big/emoticons.py Tue Apr 19 23:48:10 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r a5a4f8c23b5e -r 756d78be6ab2 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Tue Apr 19 23:43:01 2016 +0200 +++ b/data/emoticons/static/emoticons.py Tue Apr 19 23:48:10 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r a5a4f8c23b5e -r 756d78be6ab2 data/emoticons/tango/emoticons.py --- a/data/emoticons/tango/emoticons.py Tue Apr 19 23:43:01 2016 +0200 +++ b/data/emoticons/tango/emoticons.py Tue Apr 19 23:48:10 2016 +0200 @@ -1,52 +1,54 @@ # coding=utf-8 -emoticons = { - 'angel.png': ['O:-)', 'o:-)', '0:-)'], - 'curl-lip.png': [':-)', ':)', '=)'], - 'sarcastic.png': [';D', ';-D'], - 'sad.png': [':-(', ':(', '=('], - 'wink.png': [';-)', ';)'], - 'tongue.png': [':-P', ':P', ':-p', ':p'], - 'glasses-cool': ['8-)', 'B-)', '(H)'],

1 0

gajim: prevent traceback. Fixes #7978
by Gajim 18 Apr '16

18 Apr '16

changeset 835e31812849 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=835e31812849 description: prevent traceback. Fixes #7978 diffstat: src/common/connection.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 4c8fcf026ff1 -r 835e31812849 src/common/connection.py --- a/src/common/connection.py Sun Apr 03 16:42:21 2016 +0200 +++ b/src/common/connection.py Sun Apr 03 21:32:53 2016 +0200 @@ -2755,7 +2755,7 @@ msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', xhtml=obj.xhtml) if obj.label is not None: - msg_iq.addChild(node=label) + msg_iq.addChild(node=obj.label) obj.msg_id = self.connection.send(msg_iq) gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, jid=obj.jid, message=obj.message, keyID=None, chatstate=None,

1 0

gajim: print timestamp as invisible in history window when we do...
by Gajim 18 Apr '16

18 Apr '16

changeset 37571844b8f6 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=37571844b8f6 description: print timestamp as invisible in history window when we don't want to see it so we can search for it. See #3939 diffstat: src/history_window.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diffs (35 lines): diff -r 835e31812849 -r 37571844b8f6 src/history_window.py --- a/src/history_window.py Sun Apr 03 21:32:53 2016 +0200 +++ b/src/history_window.py Sun Apr 17 20:31:19 2016 +0200 @@ -74,6 +74,7 @@ scrolledwindow.add(self.history_textview.tv) self.history_buffer = self.history_textview.tv.get_buffer() self.history_buffer.create_tag('highlight', background = 'yellow') + self.history_buffer.create_tag('invisible', invisible=True) self.checkbutton = xml.get_object('log_history_checkbutton') self.checkbutton.connect('toggled', self.on_log_history_checkbutton_toggled) @@ -429,6 +430,12 @@ tim = time.strftime('%X ', time.localtime(float(tim))) buf.insert_with_tags_by_name(end_iter, tim + '\n', 'time_sometimes') + else: # don't print time. So we print it as invisible to be able to + # search for it + timestamp_str = gajim.config.get('time_stamp') + timestamp_str = helpers.from_one_line(timestamp_str) + tim = time.strftime(timestamp_str, time.localtime(float(tim))) + buf.insert_with_tags_by_name(end_iter, tim, 'invisible') tag_name = '' tag_msg = '' @@ -605,8 +612,8 @@ timestamp_str = gajim.config.get('time_stamp') timestamp_str = helpers.from_one_line(timestamp_str) tim = time.strftime(timestamp_str, local_time) - result = start_iter.forward_search(tim, Gtk.TextSearchFlags.VISIBLE_ONLY, - None) + result = start_iter.forward_search(tim, Gtk.TextSearchFlags.TEXT_ONLY, + None) if result is not None: match_start_iter, match_end_iter = result match_start_iter.backward_char() # include '[' or other character before time

1 0

gajim: call gpg with LANG=C to prevent decoding issues
by Gajim 18 Apr '16

18 Apr '16

changeset e89d125d0505 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e89d125d0505 description: call gpg with LANG=C to prevent decoding issues diffstat: src/common/gnupg.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 37571844b8f6 -r e89d125d0505 src/common/gnupg.py --- a/src/common/gnupg.py Sun Apr 17 20:31:19 2016 +0200 +++ b/src/common/gnupg.py Mon Apr 18 22:38:17 2016 +0200 @@ -741,8 +741,10 @@ si = STARTUPINFO() si.dwFlags = STARTF_USESHOWWINDOW si.wShowWindow = SW_HIDE + env = os.environ + env['LANG'] = 'C' return Popen(cmd, shell=False, stdin=PIPE, stdout=PIPE, stderr=PIPE, - startupinfo=si) + env=env, startupinfo=si) def _read_response(self, stream, result): # Internal method: reads all the stderr output from GPG, taking notice

1 0

gajim: fix error reply when S5B cannot be established. Fixes #8315
by Gajim 18 Apr '16

18 Apr '16

changeset 9b5a48e7b0ee in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=9b5a48e7b0ee description: fix error reply when S5B cannot be established. Fixes #8315 diffstat: src/common/protocol/bytestream.py | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diffs (66 lines): diff -r b19bd9be4a87 -r 9b5a48e7b0ee src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Mon Apr 18 01:59:20 2016 +0200 +++ b/src/common/protocol/bytestream.py Mon Mar 28 20:52:24 2016 +0200 @@ -364,8 +364,8 @@ from common.connection_handlers_events import FileRequestErrorEvent gajim.nec.push_incoming_event(FileRequestErrorEvent(None, conn=self, jid=receiver, file_props=file_props, error_msg='')) - self._connect_error(receiver, file_props.sid, - file_props.sid, code=406) + self._connect_error(file_props.sid, error='not-acceptable', + error_type='modify') else: iq = nbxmpp.Iq(to=receiver, typ='set') file_props.request_id = 'id_' + file_props.sid @@ -557,7 +557,7 @@ file_props.hash_ = hash_id return - def _connect_error(self,sid, code=404): + def _connect_error(self, sid, error, error_type, msg=None): """ Called when there is an error establishing BS connection, or when connection is rejected @@ -568,23 +568,17 @@ if file_props is None: log.error('can not send iq error on failed transfer') return - msg_dict = { - 404: 'Could not connect to given hosts', - 405: 'Cancel', - 406: 'Not acceptable', - } - msg = msg_dict[code] if file_props.type_ == 's': to = file_props.receiver else: to = file_props.sender - iq = nbxmpp.Iq(to=to, typ='error') - iq.setAttr('id', file_props.sid) + iq = nbxmpp.Iq(to=to, typ='error') + iq.setAttr('id', file_props.request_id) err = iq.setTag('error') - err.setAttr('code', str(code)) - err.setData(msg) + err.setAttr('type', error_type) + err.setTag(error, namespace=nbxmpp.NS_STANZAS) self.connection.send(iq) - if code == 404: + if msg: self.disconnect_transfer(file_props) file_props.error = -3 from common.connection_handlers_events import \ @@ -667,9 +661,12 @@ raise nbxmpp.NodeProcessed file_props.streamhosts = streamhosts + def _connection_error(sid): + self._connect_error(sid, 'item-not-found', 'cancel', + msg='Could not connect to given hosts') if file_props.type_ == 'r': gajim.socks5queue.connect_to_hosts(self.name, sid, - self.send_success_connect_reply, self._connect_error) + self.send_success_connect_reply, _connection_error) raise nbxmpp.NodeProcessed def _ResultCB(self, con, iq_obj):

1 0

gajim: Use OrderedDict to maintain emoticons order in packs.
by Gajim 18 Apr '16

18 Apr '16

changeset 72f8389c90f2 in /home/hg/repos/gajim author: Anaël Verrier <elghinn(a)free.fr> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=72f8389c90f2 description: Use OrderedDict to maintain emoticons order in packs. diffstat: data/emoticons/animated/emoticons.py | 100 ++++++++++++++++--------------- data/emoticons/static-big/emoticons.py | 86 +++++++++++++------------- data/emoticons/static/emoticons.py | 86 +++++++++++++------------- data/emoticons/tango/emoticons.py | 104 ++++++++++++++++---------------- 4 files changed, 192 insertions(+), 184 deletions(-) diffs (truncated from 396 to 300 lines): diff -r 9b5a48e7b0ee -r 72f8389c90f2 data/emoticons/animated/emoticons.py --- a/data/emoticons/animated/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/animated/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,50 +1,52 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['B-)', '(H)'], - 'wink.gif': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.gif': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.gif': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'pussy.png': ['(@)'], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'cigarette.gif': ['(ci)'], - 'cake.gif': ['(^)'], - 'dontknow.gif': [':^)'], - 'eyeroll.gif': ['8-)'], - 'lightning.gif': ['(li)'], - 'party.gif': ['<:o)'], - 'sleepy.gif': ['|-)'], - 'think.gif': ['*-)'], - 'puke.gif': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['B-)', '(H)']), + ('wink.gif', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.gif', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.gif', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('pussy.png', ['(@)']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('cigarette.gif', ['(ci)']), + ('cake.gif', ['(^)']), + ('dontknow.gif', [':^)']), + ('eyeroll.gif', ['8-)']), + ('lightning.gif', ['(li)']), + ('party.gif', ['<:o)']), + ('sleepy.gif', ['|-)']), + ('think.gif', ['*-)']), + ('puke.gif', [':-!']), +)) diff -r 9b5a48e7b0ee -r 72f8389c90f2 data/emoticons/static-big/emoticons.py --- a/data/emoticons/static-big/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/static-big/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r 9b5a48e7b0ee -r 72f8389c90f2 data/emoticons/static/emoticons.py --- a/data/emoticons/static/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/static/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,43 +1,45 @@ # coding=utf-8 -emoticons = { - 'smile.png': [':-)', ':)'], - 'coolglasses.png': ['8-)', 'B-)', '(H)'], - 'wink.png': [';-)', ';)'], - 'biggrin.png': [':-D', ':D'], - 'unhappy.png': [':-(', ':('], - 'cry.png': [":'-(", ":'(", ';-(', ';(', ";'-("], - 'frowning.png': [':-/', ':/', ':-\\', ':\\', ':-S', ':S'], - 'blush.png': [':-$', ':$'], - 'angry.png': [':-@', ':@'], - 'bat.png': [':-[', ':['], - 'kiss.png': [':-{}', ':-*', ':*', '(K)'], - 'stare.png': [':-|', ':|'], - 'devil.png': [']:->', '>:-)', '>:)', '(6)'], - 'tongue.png': [':-P', ':P', ':-þ', ':þ'], - 'oh.png': ['=-O', ':-O', ':O'], - 'heart.png': ['<3', '(L)', '*IN LOVE*'], - 'lion.png': [':3', '>:3'], - 'pussy.png': ['(@)', '=^.^='], - 'cuffs.png': ['(%)'], - 'moon.png': ['(S)'], - 'lamp.png': ['(I)'], - 'music.png': ['(8)'], - 'beer.png': ['(B)', '*DRINK*'], - 'brflower.png': ['(W)'], - 'boy.png': ['(Z)'], - 'girl.png': ['(X)'], - 'mail.png': ['(E)'], - 'thumbdown.png': ['(N)'], - 'photo.png': ['(P)'], - 'thumbup.png': ['(Y)', '*THUMBS UP*'], - 'hugleft.png': ['(})'], - 'brheart.png': ['</3', '(U)'], - 'flower.png': ['@}->--', '(F)'], - 'drink.png': ['(D)'], - 'phone.png': ['(T)'], - 'coffee.png': ['(C)'], - 'hugright.png': ['({)'], - 'star.png': ['(*)'], - 'rainbow.png': ['(R)'], - 'puke.png': [':-!'], -} +from collections import OrderedDict + +emoticons = OrderedDict(( + ('smile.png', [':-)', ':)']), + ('coolglasses.png', ['8-)', 'B-)', '(H)']), + ('wink.png', [';-)', ';)']), + ('biggrin.png', [':-D', ':D']), + ('unhappy.png', [':-(', ':(']), + ('cry.png', [":'-(", ":'(", ';-(', ';(', ";'-("]), + ('frowning.png', [':-/', ':/', ':-\\', ':\\', ':-S', ':S']), + ('blush.png', [':-$', ':$']), + ('angry.png', [':-@', ':@']), + ('bat.png', [':-[', ':[']), + ('kiss.png', [':-{}', ':-*', ':*', '(K)']), + ('stare.png', [':-|', ':|']), + ('devil.png', [']:->', '>:-)', '>:)', '(6)']), + ('tongue.png', [':-P', ':P', ':-þ', ':þ']), + ('oh.png', ['=-O', ':-O', ':O']), + ('heart.png', ['<3', '(L)', '*IN LOVE*']), + ('lion.png', [':3', '>:3']), + ('pussy.png', ['(@)', '=^.^=']), + ('cuffs.png', ['(%)']), + ('moon.png', ['(S)']), + ('lamp.png', ['(I)']), + ('music.png', ['(8)']), + ('beer.png', ['(B)', '*DRINK*']), + ('brflower.png', ['(W)']), + ('boy.png', ['(Z)']), + ('girl.png', ['(X)']), + ('mail.png', ['(E)']), + ('thumbdown.png', ['(N)']), + ('photo.png', ['(P)']), + ('thumbup.png', ['(Y)', '*THUMBS UP*']), + ('hugleft.png', ['(})']), + ('brheart.png', ['</3', '(U)']), + ('flower.png', ['@}->--', '(F)']), + ('drink.png', ['(D)']), + ('phone.png', ['(T)']), + ('coffee.png', ['(C)']), + ('hugright.png', ['({)']), + ('star.png', ['(*)']), + ('rainbow.png', ['(R)']), + ('puke.png', [':-!']), +)) diff -r 9b5a48e7b0ee -r 72f8389c90f2 data/emoticons/tango/emoticons.py --- a/data/emoticons/tango/emoticons.py Mon Mar 28 20:52:24 2016 +0200 +++ b/data/emoticons/tango/emoticons.py Sun Mar 27 18:09:21 2016 +0200 @@ -1,52 +1,54 @@ # coding=utf-8 -emoticons = { - 'angel.png': ['O:-)', 'o:-)', '0:-)'], - 'curl-lip.png': [':-)', ':)', '=)'], - 'sarcastic.png': [';D', ';-D'], - 'sad.png': [':-(', ':(', '=('], - 'wink.png': [';-)', ';)'], - 'tongue.png': [':-P', ':P', ':-p', ':p'], - 'glasses-cool': ['8-)', 'B-)', '(H)'],

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