Commits January 2016

commits@gajim.org

1 participants
71 discussions

gajim: don't send error when receivinf a ringing jingle element
by Gajim 03 Jan '16

03 Jan '16

changeset 2eda022611f0 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2eda022611f0 description: don't send error when receivinf a ringing jingle element diffstat: src/common/jingle_session.py | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diffs (19 lines): diff -r e71e75fdbf37 -r 2eda022611f0 src/common/jingle_session.py --- a/src/common/jingle_session.py Sun Jan 03 16:14:44 2016 +0100 +++ b/src/common/jingle_session.py Sun Jan 03 20:43:32 2016 +0100 @@ -419,10 +419,13 @@ raise nbxmpp.NodeProcessed def __on_session_info(self, stanza, jingle, error, action): - # TODO: ringing, active, (un)hold, (un)mute + # TODO: active, (un)hold, (un)mute + payload = jingle.getPayload() + if payload[0].getName() == 'ringing': + # ignore ringing + raise nbxmpp.NodeProcessed if self.state != JingleStates.active: raise OutOfOrder - payload = jingle.getPayload() for p in payload: if p.getName() == 'checksum': hash_ = p.getTag('file').getTag(name='hash',

1 0

gajim: fix sending codec parameters
by Gajim 03 Jan '16

03 Jan '16

changeset a3d3f11a2cd4 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a3d3f11a2cd4 description: fix sending codec parameters diffstat: src/common/jingle_rtp.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diffs (25 lines): diff -r 2eda022611f0 -r a3d3f11a2cd4 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Sun Jan 03 20:43:32 2016 +0100 +++ b/src/common/jingle_rtp.py Sun Jan 03 20:44:03 2016 +0100 @@ -100,7 +100,7 @@ params['stun-ip'] = ip self.p2pstream = self.p2psession.new_stream(participant, - Farstream.StreamDirection.RECV) + Farstream.StreamDirection.BOTH) self.p2pstream.connect('src-pad-added', on_src_pad_added) self.p2pstream.set_transmitter_ht('nice', params) @@ -297,10 +297,10 @@ if codec.clock_rate: attrs['clockrate'] = codec.clock_rate if codec.optional_params: - payload = (nbxmpp.Node('parameter', {'name': p.name, + payload = list(nbxmpp.Node('parameter', {'name': p.name, 'value': p.value}) for p in codec.optional_params) else: - payload = () + payload = [] yield nbxmpp.Node('payload-type', attrs, payload) def __stop(self, *things):

1 0

gajim: version for gtk3 branch is 0.16.10
by Gajim 03 Jan '16

03 Jan '16

changeset 0f45e0edad1d in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=0f45e0edad1d description: version for gtk3 branch is 0.16.10 diffstat: src/common/defs.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r e026f8514822 -r 0f45e0edad1d src/common/defs.py --- a/src/common/defs.py Sun Jan 03 16:02:27 2016 +0100 +++ b/src/common/defs.py Sun Jan 03 16:13:39 2016 +0100 @@ -27,7 +27,7 @@ basedir = '../' localedir = '../po' -version = '0.16.5' +version = '0.16.10' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,

1 0

gajim: fix printing help
by Gajim 03 Jan '16

03 Jan '16

changeset e71e75fdbf37 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e71e75fdbf37 description: fix printing help diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 0f45e0edad1d -r e71e75fdbf37 src/gajim.py --- a/src/gajim.py Sun Jan 03 16:13:39 2016 +0100 +++ b/src/gajim.py Sun Jan 03 16:14:44 2016 +0100 @@ -175,7 +175,7 @@ _('Set configuration directory') + \ '\n -l, --loglevel ' + \ _('Configure logging system') + '\n' - print(out.encode(locale.getpreferredencoding())) + print(out) sys.exit() elif o in ('-q', '--quiet'): logging_helpers.set_quiet()

1 0

gajim: re-enable metacontacts. Fixes #7295
by Gajim 03 Jan '16

03 Jan '16

changeset e026f8514822 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=e026f8514822 description: re-enable metacontacts. Fixes #7295 diffstat: src/common/connection_handlers_events.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 12b0a37f1606 -r e026f8514822 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Sun Jan 03 14:51:54 2016 +0100 +++ b/src/common/connection_handlers_events.py Sun Jan 03 16:02:27 2016 +0100 @@ -1992,8 +1992,6 @@ # Metacontact tags # http://www.xmpp.org/extensions/xep-0209.html self.meta_list = {} - # FIXME: disable metacontacts until they work correctly - return True query = self.stanza.getTag('query') storage = query.getTag('storage') metas = storage.getTags('meta')

1 0

gajim: correctly draw images in roster.
by Gajim 03 Jan '16

03 Jan '16

changeset 12b0a37f1606 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=12b0a37f1606 description: correctly draw images in roster. diffstat: src/cell_renderer_image.py | 53 ++++++++++++++++++++++++++++++--------------- 1 files changed, 35 insertions(+), 18 deletions(-) diffs (76 lines): diff -r d8baa5e950f8 -r 12b0a37f1606 src/cell_renderer_image.py --- a/src/cell_renderer_image.py Sun Jan 03 13:02:22 2016 +0100 +++ b/src/cell_renderer_image.py Sun Jan 03 14:51:54 2016 +0100 @@ -104,19 +104,26 @@ else: return - Gdk.cairo_set_source_pixbuf(ctx, pix, cell_area.x, cell_area.y) + calc_width = self.get_property('xpad') * 2 + pix.get_width() + calc_height = self.get_property('ypad') * 2 + pix.get_height() + + x_pos = cell_area.x + self.get_property('xalign') * \ + (cell_area.width - calc_width - self.get_property('xpad')) + y_pos = cell_area.y + self.get_property('yalign') * \ + (cell_area.height - calc_height - self.get_property('ypad')) + Gdk.cairo_set_source_pixbuf(ctx, pix, x_pos, y_pos) ctx.paint() - def do_get_size(self, widget, cell_area): + def do_get_preferred_height(self, widget): """ - Return the size we need for this cell. + Return the height we need for this cell. Each cell is drawn individually and is only as wide as it needs to be, we let the TreeViewColumn take care of making them all line up. """ if not self.image: - return 0, 0, 0, 0 + return 0, 0 if self.image.get_storage_type() == Gtk.ImageType.ANIMATION: animation = self.image.get_animation() timeval = GLib.TimeVal() @@ -126,17 +133,27 @@ pix = self.image.get_pixbuf() else: return 0, 0, 0, 0 - pixbuf_width = pix.get_width() - pixbuf_height = pix.get_height() - calc_width = self.get_property('xpad') * 2 + pixbuf_width - calc_height = self.get_property('ypad') * 2 + pixbuf_height - x_offset = 0 - y_offset = 0 - if cell_area and pixbuf_width > 0 and pixbuf_height > 0: - x_offset = self.get_property('xalign') * \ - (cell_area.width - calc_width - \ - self.get_property('xpad')) - y_offset = self.get_property('yalign') * \ - (cell_area.height - calc_height - \ - self.get_property('ypad')) - return x_offset, y_offset, calc_width, calc_height + calc_height = self.get_property('ypad') * 2 + pix.get_height() + return calc_height, calc_height + + def do_get_preferred_width(self, widget): + """ + Return the width we need for this cell. + + Each cell is drawn individually and is only as wide as it needs + to be, we let the TreeViewColumn take care of making them all + line up. + """ + if not self.image: + return 0, 0 + if self.image.get_storage_type() == Gtk.ImageType.ANIMATION: + animation = self.image.get_animation() + timeval = GLib.TimeVal() + timeval.tv_sec = GLib.get_monotonic_time() / 1000000 + pix = animation.get_iter(timeval).get_pixbuf() + elif self.image.get_storage_type() == Gtk.ImageType.PIXBUF: + pix = self.image.get_pixbuf() + else: + return 0, 0, 0, 0 + calc_width = self.get_property('xpad') * 2 + pix.get_width() + return calc_width, calc_width

1 0

gajim: do not allow to drop a group on itself or a subgroup of i...
by Gajim 03 Jan '16

03 Jan '16

changeset d8baa5e950f8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=d8baa5e950f8 description: do not allow to drop a group on itself or a subgroup of itself. Fixes #8211 diffstat: src/roster_window.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diffs (18 lines): diff -r 197296583ae8 -r d8baa5e950f8 src/roster_window.py --- a/src/roster_window.py Sun Jan 03 11:07:44 2016 +0100 +++ b/src/roster_window.py Sun Jan 03 13:02:22 2016 +0100 @@ -4800,8 +4800,12 @@ if type_dest == 'account': new_grp = grp_source_list[-1] elif type_dest == 'group': - new_grp = model[iter_dest][C_JID] + delimiter +\ - grp_source_list[-1] + grp_dest = model[iter_dest][C_JID] + grp_dest_list = grp_dest.split(delimiter) + # Do not allow to drop on a subgroup of source group + if grp_source_list[0] != grp_dest_list[0]: + new_grp = model[iter_dest][C_JID] + delimiter + \ + grp_source_list[-1] if new_grp: self.move_group(grp_source, new_grp, account_source)

1 0

gajim: fix opening secrets file
by Gajim 03 Jan '16

03 Jan '16

changeset 197296583ae8 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=197296583ae8 description: fix opening secrets file diffstat: src/secrets.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 76263d14fe4b -r 197296583ae8 src/secrets.py --- a/src/secrets.py Sat Jan 02 16:26:22 2016 +0100 +++ b/src/secrets.py Sun Jan 03 11:07:44 2016 +0100 @@ -95,7 +95,7 @@ return pk def load_secrets(filename): - f = open(filename, 'r') + f = open(filename, 'rb') try: secrets = pickle.load(f, encoding='latin1')

1 0

gajim: Added tag gajim-0.16.5 for changeset 0fa274dd1e5c
by Gajim 02 Jan '16

02 Jan '16

changeset a20c92f1eb47 in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=a20c92f1eb47 description: Added tag gajim-0.16.5 for changeset 0fa274dd1e5c diffstat: .hgtags | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (8 lines): diff -r afb3e9a6f95c -r a20c92f1eb47 .hgtags --- a/.hgtags Mon Dec 28 13:45:43 2015 +0100 +++ b/.hgtags Mon Dec 28 14:21:41 2015 +0100 @@ -17,3 +17,4 @@ 9b5eaf71e26776b12eac7f2e11b7d1afd3d78fe7 gajim-0.16.2 412182ce8274ea938638b4d5b2bd373a7fe21ce7 gajim-0.16.3 5253377a8628abfe2b4438460c2a8a3a51de989c gajim-0.16.4 +0fa274dd1e5cdbb0457eb57be0be19d21c064a00 gajim-0.16.5

1 0

gajim: hide gajim-remote from system. Fixes #8212
by Gajim 02 Jan '16

02 Jan '16

changeset 76263d14fe4b in /home/hg/repos/gajim author: Yann Leboulanger <asterix(a)lagaule.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=76263d14fe4b description: hide gajim-remote from system. Fixes #8212 diffstat: data/gajim-remote.desktop.in.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diffs (16 lines): diff -r a20c92f1eb47 -r 76263d14fe4b data/gajim-remote.desktop.in.in --- a/data/gajim-remote.desktop.in.in Mon Dec 28 14:21:41 2015 +0100 +++ b/data/gajim-remote.desktop.in.in Sat Jan 02 16:26:22 2016 +0100 @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Network;InstantMessaging;RemoteAccess;ConsoleOnly; -_Name=Gajim Remote +_Name=Open URI using Gajim _Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; Version=1.0 Exec=gajim-remote handle_uri %u @@ -9,3 +9,4 @@ Terminal=false Type=Application MimeType=x-scheme-handler/xmpp; +NoDisplay=true

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits January 2016