Commits August 2010

commits@gajim.org

6 participants
151 discussions

gajim: merged local changes
by Thibaut Girka 26 Aug '10

26 Aug '10

changeset 86508b573578 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=86508b573578 description: merged local changes diffstat: po/kk.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r c105a89bedc7 -r 86508b573578 po/kk.po --- a/po/kk.po Thu Aug 26 16:59:29 2010 +0200 +++ b/po/kk.po Thu Aug 26 17:19:39 2010 +0200 @@ -824,11 +824,11 @@ #: ../data/gui/change_activity_dialog.ui.h:2 msgid "Set Activity" -msgstr "Айналасуыңызды орнату" +msgstr "Айналысқан ісіңізді орнату" #: ../data/gui/change_activity_dialog.ui.h:3 msgid "Set an activity" -msgstr "Айналасқан ісіңізді көрсету" +msgstr "Айналысқан ісіңізді көрсету" #: ../data/gui/change_mood_dialog.ui.h:1 msgid "<b>Message:</b>"

1 0

gajim: [Jingle] Move on_negotiated callback to JingleContent
by Thibaut Girka 26 Aug '10

26 Aug '10

changeset c105a89bedc7 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c105a89bedc7 description: [Jingle] Move on_negotiated callback to JingleContent diffstat: src/common/jingle_content.py | 15 +++++++++++---- src/common/jingle_rtp.py | 12 ++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diffs (81 lines): diff -r be31d22c35fd -r c105a89bedc7 src/common/jingle_content.py --- a/src/common/jingle_content.py Thu Aug 26 13:52:00 2010 +0200 +++ b/src/common/jingle_content.py Thu Aug 26 16:59:29 2010 +0200 @@ -55,14 +55,16 @@ self.callbacks = { # these are called when *we* get stanzas - 'content-accept': [self.__on_transport_info], + 'content-accept': [self.__on_transport_info, + self.__on_content_accept], 'content-add': [self.__on_transport_info], 'content-modify': [], 'content-reject': [], 'content-remove': [], 'description-info': [], 'security-info': [], - 'session-accept': [self.__on_transport_info], + 'session-accept': [self.__on_transport_info, + self.__on_content_accept], 'session-info': [], 'session-initiate': [self.__on_transport_info], 'session-terminate': [], @@ -73,16 +75,21 @@ 'iq-result': [], 'iq-error': [], # these are called when *we* sent these stanzas - 'content-accept-sent': [self.__fill_jingle_stanza], + 'content-accept-sent': [self.__fill_jingle_stanza, + self.__on_content_accept], 'content-add-sent': [self.__fill_jingle_stanza], 'session-initiate-sent': [self.__fill_jingle_stanza], - 'session-accept-sent': [self.__fill_jingle_stanza], + 'session-accept-sent': [self.__fill_jingle_stanza, + self.__on_content_accept], 'session-terminate-sent': [], } def is_ready(self): return self.accepted and not self.sent + def __on_content_accept(self, stanza, content, error, action): + self.on_negotiated() + def on_negotiated(self): if self.accepted: self.negotiated = True diff -r be31d22c35fd -r c105a89bedc7 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Thu Aug 26 13:52:00 2010 +0200 +++ b/src/common/jingle_rtp.py Thu Aug 26 16:59:29 2010 +0200 @@ -53,12 +53,8 @@ self.callbacks['session-initiate'] += [self.__on_remote_codecs] self.callbacks['content-add'] += [self.__on_remote_codecs] self.callbacks['description-info'] += [self.__on_remote_codecs] - self.callbacks['content-accept'] += [self.__on_remote_codecs, - self.__on_content_accept] - self.callbacks['session-accept'] += [self.__on_remote_codecs, - self.__on_content_accept] - self.callbacks['session-accept-sent'] += [self.__on_content_accept] - self.callbacks['content-accept-sent'] += [self.__on_content_accept] + self.callbacks['content-accept'] += [self.__on_remote_codecs] + self.callbacks['session-accept'] += [self.__on_remote_codecs] self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] @@ -234,14 +230,14 @@ def get_fallback_src(self): return gst.element_factory_make('fakesrc') - def __on_content_accept(self, stanza, content, error, action): + def on_negotiated(self): if self.accepted: if self.transport.remote_candidates: self.p2pstream.set_remote_candidates(self.transport.remote_candidates) self.transport.remote_candidates = [] # TODO: farsight.DIRECTION_BOTH only if senders='both' self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) - self.on_negotiated() + JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action): """

1 0

gajim: [Jingle] Don't wait for all contents to be ready to accep...
by Thibaut Girka 26 Aug '10

26 Aug '10

changeset be31d22c35fd in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be31d22c35fd description: [Jingle] Don't wait for all contents to be ready to accept a session diffstat: src/common/jingle_session.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diffs (22 lines): diff -r b9926e6d6599 -r be31d22c35fd src/common/jingle_session.py --- a/src/common/jingle_session.py Tue Aug 24 11:43:16 2010 +0200 +++ b/src/common/jingle_session.py Thu Aug 26 13:52:00 2010 +0200 @@ -229,7 +229,7 @@ """ Return True when all codecs and candidates are ready (for all contents) """ - return (all((content.is_ready() for content in self.contents.itervalues())) + return (any((content.is_ready() for content in self.contents.itervalues())) and self.accepted) def accept_session(self): @@ -592,7 +592,8 @@ # TODO: integrate with __appendContent? # TODO: parameters 'name', 'content'? for content in self.contents.values(): - self.__append_content(jingle, content) + if content.is_ready(): + self.__append_content(jingle, content) def __session_initiate(self): assert self.state == JingleStates.ended

1 0

gajim: send content-remove when a filetranfer is finished but ot...
by Yann Leboulanger 26 Aug '10

26 Aug '10

changeset 0c8aedd47e68 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0c8aedd47e68 description: send content-remove when a filetranfer is finished but other are still running diffstat: src/gui_interface.py | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diffs (33 lines): diff -r 2c64c483cc02 -r 0c8aedd47e68 src/gui_interface.py --- a/src/gui_interface.py Thu Aug 26 16:56:08 2010 +0200 +++ b/src/gui_interface.py Thu Aug 26 16:56:46 2010 +0200 @@ -1417,7 +1417,15 @@ if file_props['session-type'] == 'jingle' and file_props['type'] == 'r': session = gajim.connections[account].get_jingle_session(jid, sid=file_props['session-sid']) - session.end_session() + # get content: + content = None + for c in session.contents.values(): + if c.file_props['sid'] == file_props['sid']: + content = c + break + if not content: + return + session.remove_content('initiator', c.name) if helpers.allow_popup_window(account): if file_props['error'] == 0: @@ -1484,12 +1492,6 @@ txt = _('File transfer of %(filename)s to %(name)s ' 'stopped.') % {'filename': filename, 'name': name} img_name = 'gajim-ft_stopped' - # if we are the sender of the file and the file transfer was initiated with jingle - # send session-terminate stanza - if 'session-type' in file_props and file_props['session-type'] == 'jingle': - sender = gajim.get_jid_without_resource(file_props['sender']) - jingle_session = gajim.connections[account].get_jingle_session(sender, file_props['sid']) - jingle_session.end_session() path = gtkgui_helpers.get_icon_path(img_name, 48) else: txt = ''

1 0

gajim: [Thibg] handle negociated variable correctly and use it f...
by Yann Leboulanger 26 Aug '10

26 Aug '10

changeset 2c64c483cc02 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2c64c483cc02 description: [Thibg] handle negociated variable correctly and use it for file transfer. diffstat: src/common/jingle_content.py | 15 +++++++++++---- src/common/jingle_ft.py | 2 +- src/common/jingle_rtp.py | 12 ++++-------- 3 files changed, 16 insertions(+), 13 deletions(-) diffs (93 lines): diff -r 301d7169b571 -r 2c64c483cc02 src/common/jingle_content.py --- a/src/common/jingle_content.py Thu Aug 26 13:52:53 2010 +0200 +++ b/src/common/jingle_content.py Thu Aug 26 16:56:08 2010 +0200 @@ -55,14 +55,16 @@ self.callbacks = { # these are called when *we* get stanzas - 'content-accept': [self.__on_transport_info], + 'content-accept': [self.__on_transport_info, + self.__on_content_accept], 'content-add': [self.__on_transport_info], 'content-modify': [], 'content-reject': [], 'content-remove': [], 'description-info': [], 'security-info': [], - 'session-accept': [self.__on_transport_info], + 'session-accept': [self.__on_transport_info, + self.__on_content_accept], 'session-info': [], 'session-initiate': [self.__on_transport_info], 'session-terminate': [], @@ -73,16 +75,21 @@ 'iq-result': [], 'iq-error': [], # these are called when *we* sent these stanzas - 'content-accept-sent': [self.__fill_jingle_stanza], + 'content-accept-sent': [self.__fill_jingle_stanza, + self.__on_content_accept], 'content-add-sent': [self.__fill_jingle_stanza], 'session-initiate-sent': [self.__fill_jingle_stanza], - 'session-accept-sent': [self.__fill_jingle_stanza], + 'session-accept-sent': [self.__fill_jingle_stanza, + self.__on_content_accept], 'session-terminate-sent': [], } def is_ready(self): return self.accepted and not self.sent + def __on_content_accept(self, stanza, content, error, action): + self.on_negotiated() + def on_negotiated(self): if self.accepted: self.negotiated = True diff -r 301d7169b571 -r 2c64c483cc02 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Aug 26 13:52:53 2010 +0200 +++ b/src/common/jingle_ft.py Thu Aug 26 16:56:08 2010 +0200 @@ -223,7 +223,7 @@ # send error message, notify the user elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result - if not self.sent: + if not self.negotiated: return self.state = STATE_ACCEPTED if not gajim.socks5queue.get_file_props( diff -r 301d7169b571 -r 2c64c483cc02 src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Thu Aug 26 13:52:53 2010 +0200 +++ b/src/common/jingle_rtp.py Thu Aug 26 16:56:08 2010 +0200 @@ -53,12 +53,8 @@ self.callbacks['session-initiate'] += [self.__on_remote_codecs] self.callbacks['content-add'] += [self.__on_remote_codecs] self.callbacks['description-info'] += [self.__on_remote_codecs] - self.callbacks['content-accept'] += [self.__on_remote_codecs, - self.__on_content_accept] - self.callbacks['session-accept'] += [self.__on_remote_codecs, - self.__on_content_accept] - self.callbacks['session-accept-sent'] += [self.__on_content_accept] - self.callbacks['content-accept-sent'] += [self.__on_content_accept] + self.callbacks['content-accept'] += [self.__on_remote_codecs] + self.callbacks['session-accept'] += [self.__on_remote_codecs] self.callbacks['session-terminate'] += [self.__stop] self.callbacks['session-terminate-sent'] += [self.__stop] @@ -234,14 +230,14 @@ def get_fallback_src(self): return gst.element_factory_make('fakesrc') - def __on_content_accept(self, stanza, content, error, action): + def on_negotiated(self): if self.accepted: if self.transport.remote_candidates: self.p2pstream.set_remote_candidates(self.transport.remote_candidates) self.transport.remote_candidates = [] # TODO: farsight.DIRECTION_BOTH only if senders='both' self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) - self.on_negotiated() + JingleContent.on_negotiated(self) def __on_remote_codecs(self, stanza, content, error, action): """

1 0

gajim: nicer code
by Yann Leboulanger 26 Aug '10

26 Aug '10

changeset 301d7169b571 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=301d7169b571 description: nicer code diffstat: src/common/jingle_session.py | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diffs (15 lines): diff -r d2b7fe3b41d5 -r 301d7169b571 src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Aug 26 13:52:40 2010 +0200 +++ b/src/common/jingle_session.py Thu Aug 26 13:52:53 2010 +0200 @@ -247,10 +247,7 @@ """ Return True when all codecs and candidates are ready (for all contents) """ - for c in self.contents.itervalues(): - if c.is_ready(): - return True - return (all((content.is_ready() for content in self.contents.itervalues())) + return (any((content.is_ready() for content in self.contents.itervalues())) and self.accepted) def accept_session(self):

1 0

gajim: prevent traceback
by Yann Leboulanger 26 Aug '10

26 Aug '10

changeset d2b7fe3b41d5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2b7fe3b41d5 description: prevent traceback diffstat: src/common/socks5.py | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diffs (16 lines): diff -r 17c95fb022ad -r d2b7fe3b41d5 src/common/socks5.py --- a/src/common/socks5.py Thu Aug 26 13:31:29 2010 +0200 +++ b/src/common/socks5.py Thu Aug 26 13:52:40 2010 +0200 @@ -304,8 +304,10 @@ if account in self.files_props: fl_props = self.files_props[account] if sid in fl_props: - del self.on_success[sid] - del self.on_failure[sid] + if sid in self.on_success: + del self.on_success[sid] + if sid in self.on_failure: + del self.on_failure[sid] del(fl_props[sid]) if len(self.files_props) == 0:

1 0

gajim: minor fix for jingle audio / video
by Yann Leboulanger 26 Aug '10

26 Aug '10

changeset 17c95fb022ad in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=17c95fb022ad description: minor fix for jingle audio / video diffstat: src/common/jingle_rtp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7f331eb60f74 -r 17c95fb022ad src/common/jingle_rtp.py --- a/src/common/jingle_rtp.py Thu Aug 26 13:18:16 2010 +0200 +++ b/src/common/jingle_rtp.py Thu Aug 26 13:31:29 2010 +0200 @@ -37,7 +37,7 @@ class JingleRTPContent(JingleContent): def __init__(self, session, media, transport=None): if transport is None: - transport = JingleTransportICEUDP() + transport = JingleTransportICEUDP(None) JingleContent.__init__(self, session, transport) self.media = media self._dtmf_running = False

1 0

gajim: accept session as soon as one content is accepted
by Yann Leboulanger 26 Aug '10

26 Aug '10

changeset 7f331eb60f74 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7f331eb60f74 description: accept session as soon as one content is accepted diffstat: src/common/jingle_ft.py | 2 ++ src/common/jingle_session.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-) diffs (35 lines): diff -r 592973e9c3a4 -r 7f331eb60f74 src/common/jingle_ft.py --- a/src/common/jingle_ft.py Thu Aug 26 11:56:12 2010 +0200 +++ b/src/common/jingle_ft.py Thu Aug 26 13:18:16 2010 +0200 @@ -223,6 +223,8 @@ # send error message, notify the user elif not self.weinitiate and self.state == STATE_NOT_STARTED: # session-accept iq-result + if not self.sent: + return self.state = STATE_ACCEPTED if not gajim.socks5queue.get_file_props( self.session.connection.name, self.file_props['sid']): diff -r 592973e9c3a4 -r 7f331eb60f74 src/common/jingle_session.py --- a/src/common/jingle_session.py Thu Aug 26 11:56:12 2010 +0200 +++ b/src/common/jingle_session.py Thu Aug 26 13:18:16 2010 +0200 @@ -247,6 +247,9 @@ """ Return True when all codecs and candidates are ready (for all contents) """ + for c in self.contents.itervalues(): + if c.is_ready(): + return True return (all((content.is_ready() for content in self.contents.itervalues())) and self.accepted) @@ -623,7 +626,8 @@ # TODO: integrate with __appendContent? # TODO: parameters 'name', 'content'? for content in self.contents.values(): - self.__append_content(jingle, content) + if content.is_ready(): + self.__append_content(jingle, content) def __session_initiate(self): assert self.state == JingleStates.ended

1 0

gajim: l10n: Updated Kazakh (kk) translation to 100%
by Baurzhan Muftakhidinov 26 Aug '10

26 Aug '10

changeset 73841ab0bf8a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=73841ab0bf8a description: l10n: Updated Kazakh (kk) translation to 100% New status: 2103 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (www.transifex.net). diffstat: po/kk.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (17 lines): diff -r b9926e6d6599 -r 73841ab0bf8a po/kk.po --- a/po/kk.po Tue Aug 24 11:43:16 2010 +0200 +++ b/po/kk.po Thu Aug 26 10:30:49 2010 +0000 @@ -824,11 +824,11 @@ #: ../data/gui/change_activity_dialog.ui.h:2 msgid "Set Activity" -msgstr "Айналасуыңызды орнату" +msgstr "Айналысқан ісіңізді орнату" #: ../data/gui/change_activity_dialog.ui.h:3 msgid "Set an activity" -msgstr "Айналасқан ісіңізді көрсету" +msgstr "Айналысқан ісіңізді көрсету" #: ../data/gui/change_mood_dialog.ui.h:1 msgid "<b>Message:</b>"

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 August 2010