changeset a39c323da8bd in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a39c323da8bd description: Fix content reject
diffstat:
src/common/jingle.py | 2 ++ src/dialogs.py | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-)
diffs (28 lines):
diff -r 3c7b8691b0f9 -r a39c323da8bd src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 12:25:36 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 12:31:56 2009 +0200 @@ -157,6 +157,8 @@ def reject_content(self, media): content = self.get_content(media) if content: + if self.state == JingleStates.active: + self.__content_reject(content) content.destroy() self.on_session_state_changed()
diff -r 3c7b8691b0f9 -r a39c323da8bd src/dialogs.py --- a/src/dialogs.py Sat Sep 26 12:25:36 2009 +0200 +++ b/src/dialogs.py Sat Sep 26 12:31:56 2009 +0200 @@ -4530,7 +4530,11 @@ if session.get_content('video'): ctrl.set_video_state('connecting', self.sid) else: # response==gtk.RESPONSE_NO - session.decline_session() + if not session.accepted: + session.decline_session() + else: + for content in self.content_types: + session.reject_content(content)
dialog.destroy()