Commits September 2009

commits@gajim.org

5 participants
120 discussions

gajim: Merge the commits I've made yesterday with asterik's ones
by Thibaut GIRKA 26 Sep '09

26 Sep '09

changeset 3c7b8691b0f9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3c7b8691b0f9 description: Merge the commits I've made yesterday with asterik's ones diffstat: data/glade/voip_call_received_dialog.glade | 2 +- src/chat_control.py | 2 +- src/common/events.py | 2 +- src/common/jingle.py | 5 +- src/dialogs.py | 61 +++++++++++++++++++++--------- src/gajim.py | 28 ++++++++----- 6 files changed, 66 insertions(+), 34 deletions(-) diffs (235 lines): diff -r 3b5ad0d50d8f -r 3c7b8691b0f9 data/glade/voip_call_received_dialog.glade --- a/data/glade/voip_call_received_dialog.glade Sat Sep 26 12:22:41 2009 +0200 +++ b/data/glade/voip_call_received_dialog.glade Sat Sep 26 12:25:36 2009 +0200 @@ -13,7 +13,7 @@ <property name="buttons">yes-no</property> <property name="text"><big>Incoming call</big></property> <property name="use_markup">True</property> - <property name="secondary_text">%(contact)s wants to start a voice chat with you. Do you want to answer the call?</property> + <signal name="destroy" handler="on_voip_call_received_messagedialog_destroy"/> <signal name="close" handler="on_voip_call_received_messagedialog_close"/> <signal name="response" handler="on_voip_call_received_messagedialog_response"/> <child internal-child="vbox"> diff -r 3b5ad0d50d8f -r 3c7b8691b0f9 src/chat_control.py --- a/src/chat_control.py Sat Sep 26 12:22:41 2009 +0200 +++ b/src/chat_control.py Sat Sep 26 12:25:36 2009 +0200 @@ -1831,7 +1831,7 @@ self.set_audio_state('connecting', sid) else: session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.video_sid) + self.contact.get_full_jid(), self.audio_sid) if session: content = session.get_content('audio') if content: diff -r 3b5ad0d50d8f -r 3c7b8691b0f9 src/common/events.py --- a/src/common/events.py Sat Sep 26 12:22:41 2009 +0200 +++ b/src/common/events.py Sat Sep 26 12:25:36 2009 +0200 @@ -46,7 +46,7 @@ gc-invitation: [room_jid, reason, password, is_continued] subscription_request: [text, nick] unsubscribed: contact - jingle-*: (fulljid, sessionid) + jingle-incoming: (fulljid, sessionid, content_types) ''' self.type_ = type_ self.time_ = time_ diff -r 3b5ad0d50d8f -r 3c7b8691b0f9 src/common/jingle.py --- a/src/common/jingle.py Sat Sep 26 12:22:41 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 12:25:36 2009 +0200 @@ -54,6 +54,7 @@ import gajim import xmpp +import helpers import farsight, gst @@ -91,7 +92,7 @@ # our full jid self.ourjid = gajim.get_jid_from_account(self.connection.name) + '/' + \ con.server_resource - self.peerjid = str(jid) # jid we connect to + self.peerjid = jid # jid we connect to # jid we use as the initiator self.initiator = weinitiate and self.ourjid or self.peerjid # jid we use as the responder @@ -1037,7 +1038,7 @@ route it adequatelly.''' # get data - jid = stanza.getFrom() + jid = helpers.get_full_jid_from_iq(stanza) id = stanza.getID() if (jid, id) in self.__iq_responses.keys(): diff -r 3b5ad0d50d8f -r 3c7b8691b0f9 src/dialogs.py --- a/src/dialogs.py Sat Sep 26 12:22:41 2009 +0200 +++ b/src/dialogs.py Sat Sep 26 12:25:36 2009 +0200 @@ -4443,14 +4443,14 @@ self.window.destroy() class VoIPCallReceivedDialog(object): - instances = WeakValueDictionary() - - def __init__(self, account, contact_jid, sid): + instances = {} + + def __init__(self, account, contact_jid, sid, content_types): + self.instances[(contact_jid, sid)] = self self.account = account self.fjid = contact_jid self.sid = sid - - self.instances[(contact_jid, sid)] = self + self.content_types = content_types xml = gtkgui_helpers.get_glade('voip_call_received_dialog.glade') xml.signal_autoconnect(self) @@ -4458,17 +4458,14 @@ jid = gajim.get_jid_without_resource(self.fjid) contact = gajim.contacts.get_first_contact_from_jid(account, jid) if contact and contact.name: - contact_text = '%s (%s)' % (contact.name, jid) - else: - contact_text = contact_jid - - # do the substitution - dialog = xml.get_widget('voip_call_received_messagedialog') - dialog.set_property('secondary-text', - dialog.get_property('secondary-text') % {'contact': contact_text}) - self._dialog = dialog - - dialog.show_all() + self.contact_text = '%s (%s)' % (contact.name, jid) + else: + self.contact_text = contact_jid + + self.dialog = xml.get_widget('voip_call_received_messagedialog') + self.set_secondary_text() + + self.dialog.show_all() @classmethod def get_dialog(cls, jid, sid): @@ -4477,6 +4474,29 @@ else: return None + def set_secondary_text(self): + if 'audio' in self.content_types and 'video' in self.content_types: + types_text = _('an audio and video') + elif 'audio' in self.content_types: + types_text = _('an audio') + elif 'video' in self.content_types: + types_text = _('a video') + + # do the substitution + self.dialog.set_property('secondary-text', + _('%(contact)s wants to start %(type)s session with you. Do you want ' + 'to answer the call?') % {'contact': self.contact_text, 'type': types_text}) + + def add_contents(self, content_types): + for type_ in content_types: + if type_ not in self.content_types: + self.content_types.append(type_) + self.set_secondary_text() + + def on_voip_call_received_messagedialog_destroy(self, dialog): + if (self.fjid, self.sid) in self.instances: + del self.instances[(self.fjid, self.sid)] + def on_voip_call_received_messagedialog_close(self, dialog): return self.on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) @@ -4485,8 +4505,13 @@ # we've got response from user, either stop connecting or accept the call session = gajim.connections[self.account].get_jingle_session(self.fjid, self.sid) - if response==gtk.RESPONSE_YES: - session.approve_session() + if not session: + return + if response == gtk.RESPONSE_YES: + if not session.accepted: + session.approve_session() + for content in self.content_types: + session.approve_content(content) jid = gajim.get_jid_without_resource(self.fjid) resource = gajim.get_resource_from_jid(self.fjid) ctrl = gajim.interface.msg_win_mgr.get_control(self.fjid, self.account) diff -r 3b5ad0d50d8f -r 3c7b8691b0f9 src/gajim.py --- a/src/gajim.py Sat Sep 26 12:22:41 2009 +0200 +++ b/src/gajim.py Sat Sep 26 12:25:36 2009 +0200 @@ -2098,7 +2098,7 @@ # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, # data...)) # TODO: conditional blocking if peer is not in roster - + # unpack data peerjid, sid, contents = data content_types = set(c[0] for c in contents) @@ -2124,11 +2124,17 @@ if 'video' in content_types: ctrl.set_video_state('connection_received', sid) - if helpers.allow_popup_window(account): - dialogs.VoIPCallReceivedDialog(account, peerjid, sid) + dlg = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) + if dlg: + dlg.add_contents(content_types) return - self.add_event(account, peerjid, 'voip-incoming', (peerjid, sid,)) + if helpers.allow_popup_window(account): + dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) + return + + self.add_event(account, peerjid, 'jingle-incoming', (peerjid, sid, + content_types)) if helpers.allow_showing_notification(account): # TODO: we should use another pixmap ;-) @@ -2138,7 +2144,7 @@ account, peerjid) path = gtkgui_helpers.get_path_to_generic_or_avatar(img) event_type = _('Voice Chat Request') - notify.popup(event_type, peerjid, account, 'voip-incoming', + notify.popup(event_type, peerjid, account, 'jingle-incoming', path_to_image = path, title = event_type, text = txt) def handle_event_jingle_connected(self, account, data): @@ -2169,7 +2175,7 @@ ctrl.set_video_state('stop', sid=sid, reason=reason) dialog = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) if dialog: - dialog._dialog.destroy() + dialog.dialog.destroy() def handle_event_jingle_error(self, account, data): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) @@ -2457,7 +2463,7 @@ jid = gajim.get_jid_without_resource(jid) no_queue = len(gajim.events.get_events(account, jid)) == 0 # type_ can be gc-invitation file-send-error file-error file-request-error - # file-request file-completed file-stopped voip-incoming + # file-request file-completed file-stopped jingle-incoming # event_type can be in advancedNotificationWindow.events_list event_types = {'file-request': 'ft_request', 'file-completed': 'ft_finished'} @@ -2617,10 +2623,10 @@ self.show_unsubscribed_dialog(account, contact) gajim.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) - elif type_ == 'voip-incoming': - event = gajim.events.get_first_event(account, jid, type_) - peerjid, sid = event.parameters - dialogs.VoIPCallReceivedDialog(account, peerjid, sid) + elif type_ == 'jingle-incoming': + event = gajim.events.get_first_event(account, jid, type_) + peerjid, sid, content_types = event.parameters + dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) gajim.events.remove_events(account, jid, event) if w: w.set_active_tab(ctrl)

1 0

gajim: Rewritten contentAddCB in order to ask the user about new...
by Thibaut GIRKA 26 Sep '09

26 Sep '09

changeset 3b5ad0d50d8f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3b5ad0d50d8f description: Rewritten contentAddCB in order to ask the user about new contents diffstat: src/common/jingle.py | 96 ++++++++++++++++++++++++++--------------------- 1 files changed, 53 insertions(+), 43 deletions(-) diffs (127 lines): diff -r ca1a9400d580 -r 3b5ad0d50d8f src/common/jingle.py --- a/src/common/jingle.py Fri Sep 25 23:52:39 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 12:22:41 2009 +0200 @@ -384,22 +384,20 @@ #TODO: Needs to be rewritten if self.state == JingleStates.ended: raise OutOfOrder - for element in jingle.iterTags('content'): - # checking what kind of session this will be - desc_ns = element.getTag('description').getNamespace() - media = element.getTag('description')['media'] - tran_ns = element.getTag('transport').getNamespace() - if desc_ns == xmpp.NS_JINGLE_RTP and media in ('audio', 'video') \ - and tran_ns == xmpp.NS_JINGLE_ICE_UDP: - if media == 'audio': - self.add_content(element['name'], JingleVoIP(self), 'peer') - else: - self.add_content(element['name'], JingleVideo(self), 'peer') - else: - content = JingleContent() - self.add_content(element['name'], content, 'peer') - self.__content_reject(content) - self.contents[(content.creator, content.name)].destroy() + + parse_result = self.__parse_contents(jingle) + contents = parse_result[2] + rejected_contents = parse_result[3] + + for name, creator in rejected_contents: + #TODO: + content = JingleContent() + self.add_content(name, content, creator) + self.__content_reject(content) + self.contents[(content.creator, content.name)].destroy() + + self.connection.dispatch('JINGLE_INCOMING', (self.initiator, self.sid, + contents)) def __sessionInitiateCB(self, stanza, jingle, error, action): ''' We got a jingle session request from other entity, @@ -419,24 +417,7 @@ # error. # Lets check what kind of jingle session does the peer want - contents = [] - contents_ok = False - transports_ok = False - for element in jingle.iterTags('content'): - # checking what kind of session this will be - desc_ns = element.getTag('description').getNamespace() - media = element.getTag('description')['media'] - tran_ns = element.getTag('transport').getNamespace() - if desc_ns == xmpp.NS_JINGLE_RTP and media in ('audio', 'video'): - contents_ok = True - if tran_ns == xmpp.NS_JINGLE_ICE_UDP: - # we've got voip content - if media == 'audio': - self.add_content(element['name'], JingleVoIP(self), 'peer') - else: - self.add_content(element['name'], JingleVideo(self), 'peer') - contents.append((media,)) - transports_ok = True + contents_ok, transports_ok, contents, pouet = self.__parse_contents(jingle) # If there's no content we understand... if not contents_ok: @@ -485,15 +466,34 @@ for content in self.contents.itervalues(): content.stanzaCB(stanza, None, error, action) - def __send_error(self, stanza, error, jingle_error=None, text=None): - err = xmpp.Error(stanza, error) - err.setNamespace(xmpp.NS_STANZAS) - if jingle_error: - err.setTag(jingle_error, namespace=xmpp.NS_JINGLE_ERRORS) - if text: - err.setTagData('text', text) - self.connection.connection.send(err) - self.__dispatch_error(error, jingle_error, text) + ''' Internal methods. ''' + def __parse_contents(self, jingle): + #TODO: WIP + contents = [] + contents_rejected = [] + contents_ok = False + transports_ok = False + + for element in jingle.iterTags('content'): + desc = element.getTag('description') + desc_ns = desc.getNamespace() + tran_ns = element.getTag('transport').getNamespace() + if desc_ns == xmpp.NS_JINGLE_RTP and desc['media'] in ('audio', 'video'): + contents_ok = True + #TODO: Everything here should be moved somewhere else + if tran_ns == xmpp.NS_JINGLE_ICE_UDP: + if desc['media'] == 'audio': + self.add_content(element['name'], JingleVoIP(self), 'peer') + else: + self.add_content(element['name'], JingleVideo(self), 'peer') + contents.append((desc['media'],)) + transports_ok = True + else: + contents_rejected.append((element['name'], 'peer')) + else: + contents_rejected.append((element['name'], 'peer')) + + return (contents_ok, transports_ok, contents, contents_rejected) def __dispatch_error(self, error, jingle_error=None, text=None): if jingle_error: @@ -533,6 +533,16 @@ jingle = stanza.addChild('jingle', attrs=attrs, namespace=xmpp.NS_JINGLE) return stanza, jingle + def __send_error(self, stanza, error, jingle_error=None, text=None): + err = xmpp.Error(stanza, error) + err.setNamespace(xmpp.NS_STANZAS) + if jingle_error: + err.setTag(jingle_error, namespace=xmpp.NS_JINGLE_ERRORS) + if text: + err.setTagData('text', text) + self.connection.connection.send(err) + self.__dispatch_error(error, jingle_error, text) + def __append_content(self, jingle, content): ''' Append <content/> element to <jingle/> element, with (full=True) or without (full=False) <content/>

1 0

gajim: Auto-accept contents we have created (it would make no se...
by Thibaut GIRKA 26 Sep '09

26 Sep '09

changeset ca1a9400d580 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca1a9400d580 description: Auto-accept contents we have created (it would make no sense to refuse it...) diffstat: src/common/jingle.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diffs (14 lines): diff -r a7bb24c5fe6e -r ca1a9400d580 src/common/jingle.py --- a/src/common/jingle.py Fri Sep 25 23:05:14 2009 +0200 +++ b/src/common/jingle.py Fri Sep 25 23:52:39 2009 +0200 @@ -200,6 +200,10 @@ content.name = name self.contents[(creator, name)] = content + if (creator == 'initiator') == self.weinitiate: + # The content is from us, accept it + content.accepted = True + def remove_content(self, creator, name): ''' We do not need this now ''' #TODO:

1 0

gajim: merge bug4293 branch
by Yann Leboulanger 26 Sep '09

26 Sep '09

changeset 6eecfdb97a5a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=6eecfdb97a5a description: merge bug4293 branch diffstat: src/common/i18n.py | 14 ++++++++++++++ src/roster_window.py | 4 +++- 2 files changed, 17 insertions(+), 1 deletions(-) diffs (45 lines): diff -r f69ddcfb9bcb -r 6eecfdb97a5a src/common/i18n.py --- a/src/common/i18n.py Thu Sep 24 11:26:46 2009 +0200 +++ b/src/common/i18n.py Sat Sep 26 11:55:49 2009 +0200 @@ -5,6 +5,7 @@ ## Copyright (C) 2004 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2004-2007 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2009 Benjamin Richter ## ## This file is part of Gajim. ## @@ -25,6 +26,19 @@ import gettext import os import defs +import unicodedata + +def paragraph_direction_mark(text): + """Determine paragraph writing direction according to + http://www.unicode.org/reports/tr9/#The_Paragraph_Level + + Returns either Unicode LTR mark or RTL mark.""" + for c in text: + bidi = unicodedata.bidirectional(c) + if bidi == 'L': return u'\u200E' + elif bidi == 'AL' or bidi == 'R': return u'\u200F' + + return u'\u200E' APP = 'gajim' DIR = defs.localedir diff -r f69ddcfb9bcb -r 6eecfdb97a5a src/roster_window.py --- a/src/roster_window.py Thu Sep 24 11:26:46 2009 +0200 +++ b/src/roster_window.py Sat Sep 26 11:55:49 2009 +0200 @@ -1113,7 +1113,9 @@ if c.show not in ('error', 'offline'): nb_connected_contact += 1 if nb_connected_contact > 1: - name += ' (' + unicode(nb_connected_contact) + ')' + # switch back to default writing direction + name += i18n.paragraph_direction_mark(unicode(name)) + name += u' (%d)' % nb_connected_contact # show (account_name) if there are 2 contact with same jid # in merged mode

1 0

gajim: Improved handling of RTL nicknames in roster. Fixes #4293
by Benjamin Richter 26 Sep '09

26 Sep '09

changeset d787a442999a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d787a442999a description: Improved handling of RTL nicknames in roster. Fixes #4293 If the number of connected resources is appended in parentheses, the appropriate ltr or rtl mark is inserted before, so that the writing direction at the end of the nickname matches the writing direction of the whole displayed string as determined by http://www.unicode.org/reports/tr9/#The_Paragraph_Level diffstat: src/common/i18n.py | 14 ++++++++++++++ src/roster_window.py | 4 +++- 2 files changed, 17 insertions(+), 1 deletions(-) diffs (45 lines): diff -r f69ddcfb9bcb -r d787a442999a src/common/i18n.py --- a/src/common/i18n.py Thu Sep 24 11:26:46 2009 +0200 +++ b/src/common/i18n.py Fri Sep 25 17:11:38 2009 +0200 @@ -5,6 +5,7 @@ ## Copyright (C) 2004 Vincent Hanquez <tab AT snarc.org> ## Copyright (C) 2004-2007 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem AT gmail.com> +## Copyright (C) 2009 Benjamin Richter ## ## This file is part of Gajim. ## @@ -25,6 +26,19 @@ import gettext import os import defs +import unicodedata + +def paragraph_direction_mark(text): + """Determine paragraph writing direction according to + http://www.unicode.org/reports/tr9/#The_Paragraph_Level + + Returns either Unicode LTR mark or RTL mark.""" + for c in text: + bidi = unicodedata.bidirectional(c) + if bidi == 'L': return u'\u200E' + elif bidi == 'AL' or bidi == 'R': return u'\u200F' + + return u'\u200E' APP = 'gajim' DIR = defs.localedir diff -r f69ddcfb9bcb -r d787a442999a src/roster_window.py --- a/src/roster_window.py Thu Sep 24 11:26:46 2009 +0200 +++ b/src/roster_window.py Fri Sep 25 17:11:38 2009 +0200 @@ -1113,7 +1113,9 @@ if c.show not in ('error', 'offline'): nb_connected_contact += 1 if nb_connected_contact > 1: - name += ' (' + unicode(nb_connected_contact) + ')' + # switch back to default writing direction + name += i18n.paragraph_direction_mark(unicode(name)) + name += u' (%d)' % nb_connected_contact # show (account_name) if there are 2 contact with same jid # in merged mode

1 0

gajim: ability to accept contents and not only session
by Yann Leboulanger 26 Sep '09

26 Sep '09

changeset 70b4dae787b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=70b4dae787b9 description: ability to accept contents and not only session diffstat: data/glade/voip_call_received_dialog.glade | 2 +- src/common/events.py | 2 +- src/common/jingle.py | 1 + src/dialogs.py | 61 +++++++++++++++++++++--------- src/gajim.py | 28 ++++++++----- 5 files changed, 63 insertions(+), 31 deletions(-) diffs (205 lines): diff -r c6f5fd41e667 -r 70b4dae787b9 data/glade/voip_call_received_dialog.glade --- a/data/glade/voip_call_received_dialog.glade Fri Sep 25 20:41:22 2009 +0200 +++ b/data/glade/voip_call_received_dialog.glade Sat Sep 26 10:29:08 2009 +0200 @@ -13,7 +13,7 @@ <property name="buttons">yes-no</property> <property name="text"><big>Incoming call</big></property> <property name="use_markup">True</property> - <property name="secondary_text">%(contact)s wants to start a voice chat with you. Do you want to answer the call?</property> + <signal name="destroy" handler="on_voip_call_received_messagedialog_destroy"/> <signal name="close" handler="on_voip_call_received_messagedialog_close"/> <signal name="response" handler="on_voip_call_received_messagedialog_response"/> <child internal-child="vbox"> diff -r c6f5fd41e667 -r 70b4dae787b9 src/common/events.py --- a/src/common/events.py Fri Sep 25 20:41:22 2009 +0200 +++ b/src/common/events.py Sat Sep 26 10:29:08 2009 +0200 @@ -46,7 +46,7 @@ gc-invitation: [room_jid, reason, password, is_continued] subscription_request: [text, nick] unsubscribed: contact - jingle-*: (fulljid, sessionid) + jingle-incoming: (fulljid, sessionid, content_types) ''' self.type_ = type_ self.time_ = time_ diff -r c6f5fd41e667 -r 70b4dae787b9 src/common/jingle.py --- a/src/common/jingle.py Fri Sep 25 20:41:22 2009 +0200 +++ b/src/common/jingle.py Sat Sep 26 10:29:08 2009 +0200 @@ -54,6 +54,7 @@ import gajim import xmpp +import helpers import farsight, gst diff -r c6f5fd41e667 -r 70b4dae787b9 src/dialogs.py --- a/src/dialogs.py Fri Sep 25 20:41:22 2009 +0200 +++ b/src/dialogs.py Sat Sep 26 10:29:08 2009 +0200 @@ -4443,14 +4443,14 @@ self.window.destroy() class VoIPCallReceivedDialog(object): - instances = WeakValueDictionary() - - def __init__(self, account, contact_jid, sid): + instances = {} + + def __init__(self, account, contact_jid, sid, content_types): + self.instances[(contact_jid, sid)] = self self.account = account self.fjid = contact_jid self.sid = sid - - self.instances[(contact_jid, sid)] = self + self.content_types = content_types xml = gtkgui_helpers.get_glade('voip_call_received_dialog.glade') xml.signal_autoconnect(self) @@ -4458,17 +4458,14 @@ jid = gajim.get_jid_without_resource(self.fjid) contact = gajim.contacts.get_first_contact_from_jid(account, jid) if contact and contact.name: - contact_text = '%s (%s)' % (contact.name, jid) - else: - contact_text = contact_jid - - # do the substitution - dialog = xml.get_widget('voip_call_received_messagedialog') - dialog.set_property('secondary-text', - dialog.get_property('secondary-text') % {'contact': contact_text}) - self._dialog = dialog - - dialog.show_all() + self.contact_text = '%s (%s)' % (contact.name, jid) + else: + self.contact_text = contact_jid + + self.dialog = xml.get_widget('voip_call_received_messagedialog') + self.set_secondary_text() + + self.dialog.show_all() @classmethod def get_dialog(cls, jid, sid): @@ -4477,6 +4474,29 @@ else: return None + def set_secondary_text(self): + if 'audio' in self.content_types and 'video' in self.content_types: + types_text = _('an audio and video') + elif 'audio' in self.content_types: + types_text = _('an audio') + elif 'video' in self.content_types: + types_text = _('a video') + + # do the substitution + self.dialog.set_property('secondary-text', + _('%(contact)s wants to start %(type)s session with you. Do you want ' + 'to answer the call?') % {'contact': self.contact_text, 'type': types_text}) + + def add_contents(self, content_types): + for type_ in content_types: + if type_ not in self.content_types: + self.content_types.append(type_) + self.set_secondary_text() + + def on_voip_call_received_messagedialog_destroy(self, dialog): + if (self.fjid, self.sid) in self.instances: + del self.instances[(self.fjid, self.sid)] + def on_voip_call_received_messagedialog_close(self, dialog): return self.on_voip_call_received_messagedialog_response(dialog, gtk.RESPONSE_NO) @@ -4485,8 +4505,13 @@ # we've got response from user, either stop connecting or accept the call session = gajim.connections[self.account].get_jingle_session(self.fjid, self.sid) - if response==gtk.RESPONSE_YES: - session.approve_session() + if not session: + return + if response == gtk.RESPONSE_YES: + if not session.accepted: + session.approve_session() + for content in self.content_types: + session.approve_content(content) jid = gajim.get_jid_without_resource(self.fjid) resource = gajim.get_resource_from_jid(self.fjid) ctrl = gajim.interface.msg_win_mgr.get_control(self.fjid, self.account) diff -r c6f5fd41e667 -r 70b4dae787b9 src/gajim.py --- a/src/gajim.py Fri Sep 25 20:41:22 2009 +0200 +++ b/src/gajim.py Sat Sep 26 10:29:08 2009 +0200 @@ -2098,7 +2098,7 @@ # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, # data...)) # TODO: conditional blocking if peer is not in roster - + # unpack data peerjid, sid, contents = data content_types = set(c[0] for c in contents) @@ -2124,11 +2124,17 @@ if 'video' in content_types: ctrl.set_video_state('connection_received', sid) - if helpers.allow_popup_window(account): - dialogs.VoIPCallReceivedDialog(account, peerjid, sid) + dlg = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) + if dlg: + dlg.add_contents(content_types) return - self.add_event(account, peerjid, 'voip-incoming', (peerjid, sid,)) + if helpers.allow_popup_window(account): + dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) + return + + self.add_event(account, peerjid, 'jingle-incoming', (peerjid, sid, + content_types)) if helpers.allow_showing_notification(account): # TODO: we should use another pixmap ;-) @@ -2138,7 +2144,7 @@ account, peerjid) path = gtkgui_helpers.get_path_to_generic_or_avatar(img) event_type = _('Voice Chat Request') - notify.popup(event_type, peerjid, account, 'voip-incoming', + notify.popup(event_type, peerjid, account, 'jingle-incoming', path_to_image = path, title = event_type, text = txt) def handle_event_jingle_connected(self, account, data): @@ -2169,7 +2175,7 @@ ctrl.set_video_state('stop', sid=sid, reason=reason) dialog = dialogs.VoIPCallReceivedDialog.get_dialog(peerjid, sid) if dialog: - dialog._dialog.destroy() + dialog.dialog.destroy() def handle_event_jingle_error(self, account, data): # ('JINGLE_ERROR', account, (peerjid, sid, reason)) @@ -2457,7 +2463,7 @@ jid = gajim.get_jid_without_resource(jid) no_queue = len(gajim.events.get_events(account, jid)) == 0 # type_ can be gc-invitation file-send-error file-error file-request-error - # file-request file-completed file-stopped voip-incoming + # file-request file-completed file-stopped jingle-incoming # event_type can be in advancedNotificationWindow.events_list event_types = {'file-request': 'ft_request', 'file-completed': 'ft_finished'} @@ -2617,10 +2623,10 @@ self.show_unsubscribed_dialog(account, contact) gajim.events.remove_events(account, jid, event) self.roster.draw_contact(jid, account) - elif type_ == 'voip-incoming': - event = gajim.events.get_first_event(account, jid, type_) - peerjid, sid = event.parameters - dialogs.VoIPCallReceivedDialog(account, peerjid, sid) + elif type_ == 'jingle-incoming': + event = gajim.events.get_first_event(account, jid, type_) + peerjid, sid, content_types = event.parameters + dialogs.VoIPCallReceivedDialog(account, peerjid, sid, content_types) gajim.events.remove_events(account, jid, event) if w: w.set_active_tab(ctrl)

1 0

gajim: use a str instance instead of a xmpp.JID instance
by Yann Leboulanger 26 Sep '09

26 Sep '09

changeset c6f5fd41e667 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c6f5fd41e667 description: use a str instance instead of a xmpp.JID instance diffstat: src/common/jingle.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r e19751d38357 -r c6f5fd41e667 src/common/jingle.py --- a/src/common/jingle.py Fri Sep 25 20:40:53 2009 +0200 +++ b/src/common/jingle.py Fri Sep 25 20:41:22 2009 +0200 @@ -91,7 +91,7 @@ # our full jid self.ourjid = gajim.get_jid_from_account(self.connection.name) + '/' + \ con.server_resource - self.peerjid = str(jid) # jid we connect to + self.peerjid = jid # jid we connect to # jid we use as the initiator self.initiator = weinitiate and self.ourjid or self.peerjid # jid we use as the responder @@ -1023,7 +1023,7 @@ route it adequatelly.''' # get data - jid = stanza.getFrom() + jid = helpers.get_full_jid_from_iq(stanza) id = stanza.getID() if (jid, id) in self.__iq_responses.keys():

1 0

gajim: fix typo
by Yann Leboulanger 26 Sep '09

26 Sep '09

changeset e19751d38357 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e19751d38357 description: fix typo diffstat: src/chat_control.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r a7bb24c5fe6e -r e19751d38357 src/chat_control.py --- a/src/chat_control.py Fri Sep 25 23:05:14 2009 +0200 +++ b/src/chat_control.py Fri Sep 25 20:40:53 2009 +0200 @@ -1831,7 +1831,7 @@ self.set_audio_state('connecting', sid) else: session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.video_sid) + self.contact.get_full_jid(), self.audio_sid) if session: content = session.get_content('audio') if content:

1 0

gajim: Added approve_content and decline_content methods.
by Thibaut GIRKA 25 Sep '09

25 Sep '09

changeset a7bb24c5fe6e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a7bb24c5fe6e description: Added approve_content and decline_content methods. A content has now to be accepted (user-side) before {content,session}-accept diffstat: src/common/jingle.py | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diffs (49 lines): diff -r 1b61572222a0 -r a7bb24c5fe6e src/common/jingle.py --- a/src/common/jingle.py Fri Sep 25 19:32:13 2009 +0200 +++ b/src/common/jingle.py Fri Sep 25 23:05:14 2009 +0200 @@ -147,6 +147,18 @@ reason.addChild('decline') self._session_terminate(reason) + def approve_content(self, media): + content = self.get_content(media) + if content: + content.accepted = True + self.on_session_state_changed(content) + + def reject_content(self, media): + content = self.get_content(media) + if content: + content.destroy() + self.on_session_state_changed() + def end_session(self): ''' Called when user stops or cancel session in UI. ''' reason = xmpp.Node('reason') @@ -623,7 +635,7 @@ # (a JingleContent not added to session shouldn't send anything) #self.creator = None #self.name = None - self.negotiated = False # is this content already negotiated? + self.accepted = False self.candidates = [] # Local transport candidates self.senders = 'both' #FIXME @@ -653,7 +665,8 @@ def is_ready(self): #print '[%s] %s, %s' % (self.media, self.candidates_ready, # self.p2psession.get_property('codecs-ready')) - return self.candidates_ready and self.p2psession.get_property('codecs-ready') + return (self.accepted and self.candidates_ready + and self.p2psession.get_property('codecs-ready')) def stanzaCB(self, stanza, content, error, action): ''' Called when something related to our content was sent by peer. ''' @@ -843,7 +856,6 @@ reason.setTag('failed-transport') self.session._session_terminate(reason) elif state == farsight.STREAM_STATE_READY: - self.negotiated = True #TODO: farsight.DIRECTION_BOTH only if senders='both' self.p2pstream.set_property('direction', farsight.DIRECTION_BOTH) self.session.content_negociated(self.media)

1 0

gajim: support for content-{add,reject,accept}, new helpers, and...
by Thibaut GIRKA 25 Sep '09

25 Sep '09

changeset 1b61572222a0 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1b61572222a0 description: support for content-{add,reject,accept}, new helpers, and other few things diffstat: src/chat_control.py | 18 +++- src/common/jingle.py | 223 ++++++++++++++++++++++++++++++++++++++----------------- src/dialogs.py | 18 ++++- src/gajim.py | 16 +++- 4 files changed, 195 insertions(+), 80 deletions(-) diffs (truncated from 602 to 300 lines): diff -r cbd3eacacb0c -r 1b61572222a0 src/chat_control.py --- a/src/chat_control.py Fri Sep 25 15:47:43 2009 +0200 +++ b/src/chat_control.py Fri Sep 25 19:32:13 2009 +0200 @@ -1579,14 +1579,17 @@ elif state == 'connecting': self.audio_state = self.JINGLE_STATE_CONNECTING self.audio_sid = sid + self._audio_button.set_active(True) elif state == 'connection_received': self.audio_state = self.JINGLE_STATE_CONNECTION_RECEIVED self.audio_sid = sid + self._audio_button.set_active(True) elif state == 'connected': self.audio_state = self.JINGLE_STATE_CONNECTED elif state == 'stop': self.audio_state = self.JINGLE_STATE_AVAILABLE self.audio_sid = None + self._audio_button.set_active(False) elif state == 'error': self.audio_state = self.JINGLE_STATE_ERROR self.update_audio() @@ -1605,15 +1608,18 @@ self.video_sid = None elif state == 'connecting': self.video_state = self.JINGLE_STATE_CONNECTING + self._video_button.set_active(True) self.video_sid = sid elif state == 'connection_received': self.video_state = self.JINGLE_STATE_CONNECTION_RECEIVED + self._video_button.set_active(True) self.video_sid = sid elif state == 'connected': self.video_state = self.JINGLE_STATE_CONNECTED elif state == 'stop': self.video_state = self.JINGLE_STATE_AVAILABLE self.video_sid = None + self._video_button.set_active(False) elif state == 'error': self.video_state = self.JINGLE_STATE_ERROR self.update_video() @@ -1825,10 +1831,11 @@ self.set_audio_state('connecting', sid) else: session = gajim.connections[self.account].get_jingle_session( - self.contact.get_full_jid(), self.audio_sid) + self.contact.get_full_jid(), self.video_sid) if session: - # TODO: end only audio - session.end_session() + content = session.get_content('audio') + if content: + session.remove_content(content.creator, content.name) def on_video_button_toggled(self, widget): if widget.get_active(): @@ -1839,8 +1846,9 @@ session = gajim.connections[self.account].get_jingle_session( self.contact.get_full_jid(), self.video_sid) if session: - # TODO: end only video - session.end_session() + content = session.get_content('video') + if content: + session.remove_content(content.creator, content.name) def _toggle_gpg(self): if not self.gpg_is_active and not self.contact.keyID: diff -r cbd3eacacb0c -r 1b61572222a0 src/common/jingle.py --- a/src/common/jingle.py Fri Sep 25 15:47:43 2009 +0200 +++ b/src/common/jingle.py Fri Sep 25 19:32:13 2009 +0200 @@ -17,7 +17,10 @@ # - 'senders' attribute of 'content' element # - security preconditions # * actions: -# - content-accept, content-reject, content-add, content-modify +# - content-accept: see content-add +# - content-reject: sending it ; receiving is ok +# - content-add: handling ; sending is ok +# - content-modify: both # - description-info, session-info # - security-info # - transport-accept, transport-reject @@ -88,7 +91,7 @@ # our full jid self.ourjid = gajim.get_jid_from_account(self.connection.name) + '/' + \ con.server_resource - self.peerjid = jid # jid we connect to + self.peerjid = str(jid) # jid we connect to # jid we use as the initiator self.initiator = weinitiate and self.ourjid or self.peerjid # jid we use as the responder @@ -107,10 +110,12 @@ # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack self.callbacks = { - 'content-accept': [self.__contentAcceptCB, self.__defaultCB], - 'content-add': [self.__defaultCB], #TODO + 'content-accept': [self.__contentAcceptCB, self.__broadcastCB, + self.__defaultCB], + 'content-add': [self.__contentAddCB, self.__broadcastCB, + self.__defaultCB], #TODO 'content-modify': [self.__defaultCB], #TODO - 'content-reject': [self.__defaultCB], #TODO + 'content-reject': [self.__defaultCB, self.__contentRemoveCB], #TODO 'content-remove': [self.__defaultCB, self.__contentRemoveCB], 'description-info': [self.__defaultCB], #TODO 'security-info': [self.__defaultCB], #TODO @@ -133,7 +138,6 @@ def approve_session(self): ''' Called when user accepts session in UI (when we aren't the initiator). ''' - self.accepted = True self.accept_session() def decline_session(self): @@ -154,10 +158,23 @@ ''' Middle-level functions to manage contents. Handle local content cache and send change notifications. ''' + def get_content(self, media=None): + if media == 'audio': + cls = JingleVoIP + elif media == 'video': + cls = JingleVideo + #elif media == None: + # cls = JingleContent + else: + return None + + for content in self.contents.values(): + if isinstance(content, cls): + return content + def add_content(self, name, content, creator='we'): ''' Add new content to session. If the session is active, this will send proper stanza to update session. - The protocol prohibits changing that when pending. Creator must be one of ('we', 'peer', 'initiator', 'responder')''' assert creator in ('we', 'peer', 'initiator', 'responder') @@ -171,34 +188,53 @@ content.name = name self.contents[(creator, name)] = content - if self.state == JingleStates.active: - pass # TODO: send proper stanza, shouldn't be needed now - def remove_content(self, creator, name): ''' We do not need this now ''' - pass + #TODO: + if (creator, name) in self.contents: + content = self.contents[(creator, name)] + if len(self.contents) > 1: + self.__content_remove(content) + self.contents[(creator, name)].destroy() + if len(self.contents) == 0: + self.end_session() def modify_content(self, creator, name, *someother): ''' We do not need this now ''' pass - def accept_session(self): - ''' Check if all contents and user agreed to start session. ''' - if not self.weinitiate and self.accepted and \ - self.state == JingleStates.pending and self.is_ready(): - self.__session_accept() + def on_session_state_changed(self, content=None): + if self.state == JingleStates.active and self.accepted: + if not content: + return + if (content.creator == 'initiator') == self.weinitiate: + # We initiated this content. It's a pending content-add. + self.__content_add(content) + else: + # The other side created this content, we accept it. + self.__content_accept(content) + elif self.is_ready(): + if not self.weinitiate and self.state == JingleStates.pending: + self.__session_accept() + elif self.weinitiate and self.state == JingleStates.ended: + self.__session_initiate() def is_ready(self): ''' Returns True when all codecs and candidates are ready (for all contents). ''' - return all((content.is_ready() for content in self.contents.itervalues())) + return (all((content.is_ready() for content in self.contents.itervalues())) + and self.accepted) ''' Middle-level function to do stanza exchange. ''' + def accept_session(self): + ''' Mark the session as accepted. ''' + self.accepted = True + self.on_session_state_changed() + def start_session(self): - ''' Start session. ''' - #FIXME: Start only once - if self.weinitiate and self.state == JingleStates.ended and self.is_ready(): - self.__session_initiate() + ''' Mark the session as ready to be started. ''' + self.accepted = True + self.on_session_state_changed() def send_session_info(self): pass @@ -309,10 +345,10 @@ creator = content['creator'] name = content['name'] if (creator, name) in self.contents: - del self.contents[(creator, name)] + self.contents[(creator, name)].destroy() if len(self.contents) == 0: reason = xmpp.Node('reason') - reason.setTag('success') #FIXME: Is it the good one? + reason.setTag('success') self._session_terminate(reason) def __sessionAcceptCB(self, stanza, jingle, error, action): @@ -328,6 +364,27 @@ creator = content['creator'] name = content['name']#TODO... + def __contentAddCB(self, stanza, jingle, error, action): + #TODO: Needs to be rewritten + if self.state == JingleStates.ended: + raise OutOfOrder + for element in jingle.iterTags('content'): + # checking what kind of session this will be + desc_ns = element.getTag('description').getNamespace() + media = element.getTag('description')['media'] + tran_ns = element.getTag('transport').getNamespace() + if desc_ns == xmpp.NS_JINGLE_RTP and media in ('audio', 'video') \ + and tran_ns == xmpp.NS_JINGLE_ICE_UDP: + if media == 'audio': + self.add_content(element['name'], JingleVoIP(self), 'peer') + else: + self.add_content(element['name'], JingleVideo(self), 'peer') + else: + content = JingleContent() + self.add_content(element['name'], content, 'peer') + self.__content_reject(content) + self.contents[(content.creator, content.name)].destroy() + def __sessionInitiateCB(self, stanza, jingle, error, action): ''' We got a jingle session request from other entity, therefore we are the receiver... Unpack the data, @@ -511,20 +568,40 @@ text = '%s (%s)' % (reason, text) else: text = reason + self.connection.delete_jingle(self) self.connection.dispatch('JINGLE_DISCONNECTED', (self.peerjid, self.sid, text)) - self.connection.delete_jingle(self) - def __content_add(self): - assert self.state == JingleStates.active + def __content_add(self, content): + #TODO: test + assert self.state != JingleStates.ended + stanza, jingle = self.__make_jingle('content-add') + self.__append_content(jingle, content) + self.__broadcastCB(stanza, jingle, None, 'content-add-sent') + self.connection.connection.send(stanza) - def __content_accept(self): + def __content_accept(self, content): + #TODO: test assert self.state != JingleStates.ended + stanza, jingle = self.__make_jingle('content-accept') + self.__append_content(jingle, content) + self.__broadcastCB(stanza, jingle, None, 'content-accept-sent') + self.connection.connection.send(stanza) + + def __content_reject(self, content): + assert self.state != JingleStates.ended + stanza, jingle = self.__make_jingle('content-reject') + self.__append_content(jingle, content) + self.connection.connection.send(stanza) def __content_modify(self): assert self.state != JingleStates.ended - def __content_remove(self): + def __content_remove(self, content): assert self.state != JingleStates.ended + stanza, jingle = self.__make_jingle('content-remove') + self.__append_content(jingle, content) + self.connection.connection.send(stanza) + #TODO: dispatch something? def content_negociated(self, media): self.connection.dispatch('JINGLE_CONNECTED', (self.peerjid, self.sid, @@ -554,8 +631,8 @@ self.callbacks = { # these are called when *we* get stanzas - 'content-accept': [],

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009