Commits

commits@gajim.org

17632 discussions

gajim: add more arguments to paplay command. fixes #8192
by Gajim 21 Nov '15

21 Nov '15

changeset 939ae47ed473 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=939ae47ed473 description: add more arguments to paplay command. fixes #8192 diffstat: src/gui_interface.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r fada08d8a935 -r 939ae47ed473 src/gui_interface.py --- a/src/gui_interface.py Sat Nov 21 14:31:07 2015 +0100 +++ b/src/gui_interface.py Sat Nov 21 14:39:36 2015 +0100 @@ -3038,7 +3038,7 @@ for command in commands: if helpers.is_in_path(command): if command == 'paplay': - command += ' -n gajim' + command += ' -n gajim --property=media.role=event' if command in ('aplay', 'play'): command += ' -q' elif command == 'ossplay':

1 0

gajim: do not set <no-permanent-storage/> hint for GPG encrypted...
by Gajim 21 Nov '15

21 Nov '15

changeset fada08d8a935 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=fada08d8a935 description: do not set <no-permanent-storage/> hint for GPG encrypted messages. Fixes #8123 diffstat: src/common/connection.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 08e4601567a8 -r fada08d8a935 src/common/connection.py --- a/src/common/connection.py Tue Nov 17 21:33:30 2015 +0100 +++ b/src/common/connection.py Sat Nov 21 14:31:07 2015 +0100 @@ -426,8 +426,6 @@ if msgenc: msg_iq.setTag(nbxmpp.NS_ENCRYPTED + ' x').setData(msgenc) - msg_iq.addChild(name='no-permanent-store', - namespace=nbxmpp.NS_MSG_HINTS) if form_node: msg_iq.addChild(node=form_node)

1 0

gajim: better detection of local IPs. See #8191
by Gajim 17 Nov '15

17 Nov '15

changeset 08e4601567a8 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=08e4601567a8 description: better detection of local IPs. See #8191 diffstat: src/common/jingle_transport.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r b70cf4d2fff6 -r 08e4601567a8 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Tue Nov 17 21:16:26 2015 +0100 +++ b/src/common/jingle_transport.py Tue Nov 17 21:33:30 2015 +0100 @@ -198,7 +198,7 @@ try: for addrinfo in socket.getaddrinfo(socket.gethostname(), None): addr = addrinfo[4][0] - if not addr in hosts and not addr.startswith('127') and \ + if not addr in hosts and not addr.startswith('127.') and \ addr != '::1': c = {'host': addr, 'candidate_id': self.connection.connection.getAnID(),

1 0

gajim: do not send ::1 as peer address when sending a file. Fixe...
by Gajim 17 Nov '15

17 Nov '15

changeset b70cf4d2fff6 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=b70cf4d2fff6 description: do not send ::1 as peer address when sending a file. Fixes #8191 diffstat: src/common/jingle_transport.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (13 lines): diff -r c79771e52459 -r b70cf4d2fff6 src/common/jingle_transport.py --- a/src/common/jingle_transport.py Sun Nov 15 21:07:02 2015 +0100 +++ b/src/common/jingle_transport.py Tue Nov 17 21:16:26 2015 +0100 @@ -198,7 +198,8 @@ try: for addrinfo in socket.getaddrinfo(socket.gethostname(), None): addr = addrinfo[4][0] - if not addr in hosts and not addr.startswith('127'): + if not addr in hosts and not addr.startswith('127') and \ + addr != '::1': c = {'host': addr, 'candidate_id': self.connection.connection.getAnID(), 'port': port,

1 0

gajim: ignore vim swap files
by Gajim 16 Nov '15

16 Nov '15

changeset d1c06038fb3b in /home/hg/repos/gajim author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d1c06038fb3b description: ignore vim swap files diffstat: .hgignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (10 lines): diff -r 193495212d31 -r d1c06038fb3b .hgignore --- a/.hgignore Sun Oct 25 15:06:37 2015 +0100 +++ b/.hgignore Mon Nov 16 17:55:40 2015 -0400 @@ -1,5 +1,6 @@ syntax: glob *.orig +*.swp *.gmo *.in *.m4

1 0

gajim: pass byte string instead of string to ctx methods
by Gajim 16 Nov '15

16 Nov '15

changeset 36007a9ce420 in /home/hg/repos/gajim author: Jefry Lagrange <jefry.reyes(a)gmail.com> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=36007a9ce420 description: pass byte string instead of string to ctx methods diffstat: src/common/jingle_xtls.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diffs (29 lines): diff -r d1c06038fb3b -r 36007a9ce420 src/common/jingle_xtls.py --- a/src/common/jingle_xtls.py Mon Nov 16 17:55:40 2015 -0400 +++ b/src/common/jingle_xtls.py Mon Nov 16 17:58:18 2015 -0400 @@ -112,21 +112,21 @@ ctx.set_verify(SSL.VERIFY_PEER, verify_cb or default_callback) cert_name = os.path.join(gajim.MY_CERT_DIR, SELF_SIGNED_CERTIFICATE) - ctx.use_privatekey_file (cert_name + '.pkey') - ctx.use_certificate_file(cert_name + '.cert') + ctx.use_privatekey_file((cert_name + '.pkey').encode('utf-8')) + ctx.use_certificate_file((cert_name + '.cert').encode('utf-8')) # Try to load Diffie-Hellman parameters. # First try user DH parameters, if this fails load the default DH parameters dh_params_name = os.path.join(gajim.MY_CERT_DIR, DH_PARAMS) try: with open(dh_params_name, "r") as dh_params_file: - ctx.load_tmp_dh(str(dh_params_name)) + tx.load_tmp_dh(dh_params_name.encode('utf-8')) except FileNotFoundError as err: default_dh_params_name = os.path.join(gajim.DATA_DIR, 'other', DEFAULT_DH_PARAMS) try: with open(default_dh_params_name, "r") as default_dh_params_file: - ctx.load_tmp_dh(str(default_dh_params_name)) + ctx.load_tmp_dh(default_dh_params_name.encode('utf-8')) except FileNotFoundError as err: log.error('Unable to load default DH parameter file: %s , %s' % (default_dh_params_name, err))

1 0

gajim: do not crash when we remove a contact for which neerby co...
by Gajim 15 Nov '15

15 Nov '15

changeset c79771e52459 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=c79771e52459 description: do not crash when we remove a contact for which neerby contcts are not in the same accounts. Fixes #8157 diffstat: src/common/contacts.py | 2 ++ src/roster_window.py | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diffs (24 lines): diff -r 467341adb843 -r c79771e52459 src/common/contacts.py --- a/src/common/contacts.py Sun Nov 15 14:28:31 2015 +0100 +++ b/src/common/contacts.py Sun Nov 15 21:07:02 2015 +0100 @@ -836,6 +836,8 @@ # we want one nearby_family per account nearby_family = [data for data in family if account == data['account']] + if not nearby_family: + return (None, None, None) big_brother_data = self._get_metacontacts_big_brother(nearby_family) big_brother_jid = big_brother_data['jid'] big_brother_account = big_brother_data['account'] diff -r 467341adb843 -r c79771e52459 src/roster_window.py --- a/src/roster_window.py Sun Nov 15 14:28:31 2015 +0100 +++ b/src/roster_window.py Sun Nov 15 21:07:02 2015 +0100 @@ -476,6 +476,8 @@ nearby_family, big_brother_jid, big_brother_account = \ self._get_nearby_family_and_big_brother(family, account) + if not big_brother_jid: + return [] big_brother_contact = gajim.contacts.get_first_contact_from_jid( big_brother_account, big_brother_jid)

1 0

gajim: keep image tags when we replace the temporary image by th...
by Gajim 15 Nov '15

15 Nov '15

changeset 467341adb843 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=467341adb843 description: keep image tags when we replace the temporary image by the downloaded image. Fixes #8182 diffstat: src/htmltextview.py | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diffs (61 lines): diff -r d6d76868b184 -r 467341adb843 src/htmltextview.py --- a/src/htmltextview.py Wed Nov 04 21:54:24 2015 +0100 +++ b/src/htmltextview.py Sun Nov 15 14:28:31 2015 +0100 @@ -489,10 +489,10 @@ tag.title = title return tag - def _update_img(self, (mem, alt), attrs, img_mark): + def _update_img(self, (mem, alt), attrs, img_mark, tags): '''Callback function called after the function helpers.download_image. ''' - self._process_img(attrs, (mem, alt, img_mark)) + self._process_img(attrs, (mem, alt, img_mark, tags)) def _process_img(self, attrs, loaded=None): '''Process a img tag. @@ -501,6 +501,7 @@ update = False pixbuf = None replace_mark = None + replace_tags = None try: if attrs['src'].startswith('data:image/'): @@ -509,14 +510,14 @@ img = attrs['src'].split(',')[1] mem = base64.standard_b64decode(urllib2.unquote(img)) elif loaded is not None: - (mem, alt, replace_mark) = loaded + (mem, alt, replace_mark, replace_tags) = loaded update = True else: if self.conv_textview: img_mark = self.textbuf.create_mark(None, self.iter, True) gajim.thread_interface(helpers.download_image, [ self.conv_textview.account, attrs], self._update_img, - [attrs, img_mark]) + [attrs, img_mark, self._get_style_tags()]) alt = attrs.get('alt', '') if alt: alt += '\n' @@ -574,7 +575,10 @@ self.textbuf.delete(working_iter, next_iter) self.textbuf.delete_mark(replace_mark) if pixbuf is not None: - tags = self._get_style_tags() + if replace_mark: + tags = replace_tags + else: + tags = self._get_style_tags() if tags: tmpmark = self.textbuf.create_mark(None, working_iter, True) self.textbuf.insert_pixbuf(working_iter, pixbuf) @@ -1271,4 +1275,7 @@ w.set_default_size(400, 300) w.show_all() w.connect('destroy', lambda w: gtk.main_quit()) + gtk.gdk.threads_init() + gtk.gdk.threads_enter() gtk.main() + gtk.gdk.threads_leave()

1 0

gajim-plugins: Corrected the min version setting in the manifest...
by Gajim Plugins 12 Nov '15

12 Nov '15

changeset ac71ceebd883 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=ac71ceebd883 description: Corrected the min version setting in the manifest file... diffstat: httpupload/manifest.ini | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (10 lines): diff -r 3019b29339f6 -r ac71ceebd883 httpupload/manifest.ini --- a/httpupload/manifest.ini Sun Oct 25 21:08:42 2015 +0100 +++ b/httpupload/manifest.ini Thu Nov 12 22:34:38 2015 +0100 @@ -11,5 +11,5 @@ authors: Thilo Molitor <thilo(a)eightysoft.de> Anders Sandblad <runeson(a)gmail.com> homepage: https://trac-plugins.gajim.org/wiki/HttpUploadPlugin -min_gajim_version: 0.16.0 +min_gajim_version: 0.16.4 max_gajim_version: 0.16.9

1 0

gajim-plugins: merged remote changes...
by Gajim Plugins 12 Nov '15

12 Nov '15

changeset 0cb31e935c60 in /home/hg/repos/gajim-plugins author: tmolitor <thilo(a)eightysoft.de> branches: details:gajim-plugins?cmd=changeset;node=0cb31e935c60 description: merged remote changes... diffstat: gotr/otrmodule.py | 14 +++----------- juick/plugin.py | 7 ------- whiteboard/plugin.py | 6 +----- whiteboard/whiteboard_widget.py | 8 +------- 4 files changed, 5 insertions(+), 30 deletions(-) diffs (94 lines): diff -r ac71ceebd883 -r 0cb31e935c60 gotr/otrmodule.py --- a/gotr/otrmodule.py Thu Nov 12 22:34:38 2015 +0100 +++ b/gotr/otrmodule.py Thu Nov 12 22:35:42 2015 +0100 @@ -68,7 +68,6 @@ from pprint import pformat from distutils.version import StrictVersion -import common.xmpp from common import gajim from common import ged from common.connection_handlers_events import MessageOutgoingEvent @@ -93,11 +92,7 @@ except ImportError: HAS_CRYPTO = False -nb_xmpp = False -import common.xmpp -if not dir(common.xmpp): - import nbxmpp - nb_xmpp = True +import nbxmpp HAS_POTR = True try: @@ -133,10 +128,7 @@ msg = unicode(msg) account = self.user.accountname - if not nb_xmpp: - stanza = common.xmpp.Message(to=self.peer, body=msg, typ='chat') - else: - stanza = nbxmpp.Message(to=self.peer, body=msg, typ='chat') + stanza = nbxmpp.Message(to=self.peer, body=msg, typ='chat') if appdata is not None: session = appdata.get('session', None) if session is not None: @@ -741,4 +733,4 @@ def add_message_processing_hints(stanza): stanza.addChild(name='private', namespace=nbxmpp.NS_CARBONS) stanza.addChild(name='no-permanent-store', namespace=nbxmpp.NS_MSG_HINTS) - stanza.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS) \ No newline at end of file + stanza.addChild(name='no-copy', namespace=nbxmpp.NS_MSG_HINTS) diff -r ac71ceebd883 -r 0cb31e935c60 juick/plugin.py --- a/juick/plugin.py Thu Nov 12 22:34:38 2015 +0100 +++ b/juick/plugin.py Thu Nov 12 22:35:42 2015 +0100 @@ -21,13 +21,6 @@ from conversation_textview import TextViewImage import gtkgui_helpers -nb_xmpp = False -import common.xmpp -if not dir(common.xmpp): - import nbxmpp - nb_xmpp = True - - class JuickPlugin(GajimPlugin): @log_calls('JuickPlugin') def init(self): diff -r ac71ceebd883 -r 0cb31e935c60 whiteboard/plugin.py --- a/whiteboard/plugin.py Thu Nov 12 22:34:38 2015 +0100 +++ b/whiteboard/plugin.py Thu Nov 12 22:35:42 2015 +0100 @@ -34,11 +34,7 @@ from plugins.plugin import GajimPluginException from plugins.helpers import log_calls, log from common import gajim -ver = list(gajim.config.get('version').split('.')) -if ver < [0, 15, 3, 0]: - from common.xmpp import Message -else: - from nbxmpp import Message +from nbxmpp import Message import gtk import chat_control from common import ged diff -r ac71ceebd883 -r 0cb31e935c60 whiteboard/whiteboard_widget.py --- a/whiteboard/whiteboard_widget.py Thu Nov 12 22:34:38 2015 +0100 +++ b/whiteboard/whiteboard_widget.py Thu Nov 12 22:35:42 2015 +0100 @@ -25,13 +25,7 @@ HAS_GOOCANVAS = True except: HAS_GOOCANVAS = False -from common import gajim -ver = list(gajim.config.get('version').split('.')) -if ver < [0, 15, 3, 0]: - from common.xmpp import Node -else: - from nbxmpp import Node - +from nbxmpp import Node from dialogs import FileChooserDialog '''

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