Commits

commits@gajim.org

17632 discussions

gajim: fix getting vcard in rooms where JIDs are public. fixes #...
by Fomin Denis 25 Mar '12

25 Mar '12

changeset d2c63469b86e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d2c63469b86e description: fix getting vcard in rooms where JIDs are public. fixes #7131 diffstat: src/vcard.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r 9c4c03c63841 -r d2c63469b86e src/vcard.py --- a/src/vcard.py Sun Mar 25 14:32:30 2012 +0400 +++ b/src/vcard.py Sun Mar 25 16:15:25 2012 +0400 @@ -268,7 +268,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid: + if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: return i = 0 client = '' @@ -299,7 +299,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.contact.jid: + if obj.fjid != self.contact.jid and obj.fjid != self.real_jid: return i = 0 time_s = ''

1 0

gajim: fix getting vcard in rooms where JIDs are public. fixes #...
by Fomin Denis 25 Mar '12

25 Mar '12

changeset 9c4c03c63841 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c4c03c63841 description: fix getting vcard in rooms where JIDs are public. fixes #7131 diffstat: src/vcard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 7cb279a8149b -r 9c4c03c63841 src/vcard.py --- a/src/vcard.py Thu Mar 22 20:49:38 2012 +0100 +++ b/src/vcard.py Sun Mar 25 14:32:30 2012 +0400 @@ -268,7 +268,7 @@ return if self.xml.get_object('information_notebook').get_n_pages() < 5: return - if obj.fjid != self.real_jid: + if obj.fjid != self.contact.jid: return i = 0 client = ''

1 0

gajim: revert 515744029d22, there is no timeout for <r> requests...
by Yann Leboulanger 22 Mar '12

22 Mar '12

changeset 7cb279a8149b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7cb279a8149b description: revert 515744029d22, there is no timeout for <r> requests, so we never check if we have the result. see #7090 diffstat: src/common/connection.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diffs (13 lines): diff -r 455337f6a1fa -r 7cb279a8149b src/common/connection.py --- a/src/common/connection.py Wed Mar 21 14:29:25 2012 +0400 +++ b/src/common/connection.py Thu Mar 22 20:49:38 2012 +0100 @@ -1616,8 +1616,7 @@ if not gajim.account_is_connected(self.name): return self.connection.set_send_timeout(self.keepalives, self.send_keepalive) - self.connection.set_send_timeout2(self.pingalives, - self.sm.enabled and self.sm.request_ack or self.sendPing) + self.connection.set_send_timeout2(self.pingalives, self.sendPing) self.connection.onreceive(None) self.privacy_rules_requested = False

1 0

gajim: [Davide Pizzetti] updated italian translation
by Yann Leboulanger 22 Mar '12

22 Mar '12

changeset d0f31ee72397 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d0f31ee72397 description: [Davide Pizzetti] updated italian translation

1 0

gajim: [erpizzo] updated italian translation
by Yann Leboulanger 22 Mar '12

22 Mar '12

changeset bc70413e1872 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=bc70413e1872 description: [erpizzo] updated italian translation diffstat: po/it.po | 1432 +++++++++++++++++++++++++++++-------------------------------- 1 files changed, 674 insertions(+), 758 deletions(-) diffs (truncated from 4017 to 300 lines): diff -r 235b31eeb0e7 -r bc70413e1872 po/it.po --- a/po/it.po Sun Mar 18 13:52:33 2012 +0100 +++ b/po/it.po Thu Mar 22 08:22:01 2012 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Gajim 2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-02-14 20:47+0100\n" +"POT-Creation-Date: 2012-03-22 08:21+0100\n" "PO-Revision-Date: 2009-08-19 23:53+0200\n" "Last-Translator: neoex <neoex.dc(a)gmail.com>\n" "Language-Team: Italian <>\n" @@ -26,7 +26,7 @@ #: ../data/gui/account_context_menu.ui.h:2 msgid "_Add Contact..." -msgstr "_Aggiungi Contatto..." +msgstr "_Aggiungi un contatto..." #: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19 msgid "_Discover Services" @@ -34,7 +34,7 @@ #: ../data/gui/account_context_menu.ui.h:4 msgid "_Execute Command..." -msgstr "_Esegui comando..." +msgstr "_Esegui un comando..." #: ../data/gui/account_context_menu.ui.h:5 msgid "_Modify Account" @@ -42,7 +42,7 @@ #: ../data/gui/account_context_menu.ui.h:6 msgid "_Open Gmail Inbox" -msgstr "_Apri posta ricevuta" +msgstr "_Apri la posta ricevuta di Gmail" #: ../data/gui/account_context_menu.ui.h:7 #, fuzzy @@ -51,7 +51,7 @@ #: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24 msgid "_Start Chat..." -msgstr "_Inizia chat..." +msgstr "_Inizia conversazione..." #: ../data/gui/account_context_menu.ui.h:9 #: ../data/gui/zeroconf_context_menu.ui.h:2 @@ -90,7 +90,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:10 #, fuzzy msgid "Anon_ymous authentication" -msgstr "Usa autenticazione" +msgstr "Autenticazione anon_ima" #: ../data/gui/account_creation_wizard_window.ui.h:11 msgid "Connect when I press Finish" @@ -123,10 +123,10 @@ #: ../src/config.py:1265 ../src/config.py:1279 ../src/config.py:1284 #: ../src/config.py:1332 ../src/config.py:1435 ../src/config.py:1746 #: ../src/config.py:1751 ../src/config.py:2327 ../src/config.py:2406 -#: ../src/config.py:2419 ../src/config.py:3699 ../src/config.py:3774 +#: ../src/config.py:2419 ../src/config.py:3703 ../src/config.py:3778 #: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519 -#: ../src/dialogs.py:532 ../src/roster_window.py:3139 -#: ../src/roster_window.py:3145 ../src/roster_window.py:3150 +#: ../src/dialogs.py:532 ../src/roster_window.py:3133 +#: ../src/roster_window.py:3139 ../src/roster_window.py:3144 msgid "None" msgstr "Nessuno" @@ -203,7 +203,7 @@ #: ../data/gui/accounts_window.ui.h:4 #, fuzzy msgid "Proxy" -msgstr "Privacy" +msgstr "Proxy" #: ../data/gui/accounts_window.ui.h:5 #, fuzzy @@ -241,7 +241,7 @@ #: ../data/gui/accounts_window.ui.h:12 #, fuzzy msgid "Browse..." -msgstr "C_onsulta" +msgstr "Sfoglia..." #: ../data/gui/accounts_window.ui.h:13 msgid "C_onnect on Gajim startup" @@ -278,7 +278,7 @@ #: ../data/gui/accounts_window.ui.h:20 #, fuzzy msgid "Client certificate" -msgstr "Nome utente non valido" +msgstr "Certificato del client" #: ../data/gui/accounts_window.ui.h:21 #, fuzzy @@ -298,7 +298,7 @@ #: ../data/gui/accounts_window.ui.h:24 #: ../data/gui/zeroconf_information_window.ui.h:2 msgid "E-Mail:" -msgstr "E-Mail:" +msgstr "E-mail:" #: ../data/gui/accounts_window.ui.h:25 #: ../data/gui/zeroconf_information_window.ui.h:3 @@ -319,8 +319,8 @@ #. General group cannot be changed #: ../data/gui/accounts_window.ui.h:27 ../data/gui/preferences_window.ui.h:57 #: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124 -#: ../src/roster_window.py:3081 ../src/roster_window.py:4148 -#: ../src/roster_window.py:5738 +#: ../src/roster_window.py:3075 ../src/roster_window.py:4142 +#: ../src/roster_window.py:5732 msgid "General" msgstr "Generale" @@ -420,7 +420,7 @@ msgstr "La priorità cambierà automaticamente in funzione del tuo stato." #. Rename -#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5688 +#: ../data/gui/accounts_window.ui.h:46 ../src/roster_window.py:5682 msgid "Re_name" msgstr "Ri_nomina" @@ -463,7 +463,7 @@ #: ../data/gui/accounts_window.ui.h:54 #, fuzzy msgid "Synchronize contacts" -msgstr "Sincronizza contatti" +msgstr "Sincronizza i contatti" #: ../data/gui/accounts_window.ui.h:55 msgid "Use G_PG Agent" @@ -485,18 +485,18 @@ #: ../data/gui/accounts_window.ui.h:59 msgid "_Client Cert File:" -msgstr "" +msgstr "File del certificato del _client" #: ../data/gui/accounts_window.ui.h:60 #, fuzzy msgid "_Edit Personal Information..." -msgstr "Modifica informazioni personali..." +msgstr "_Modifica le informazioni personali..." #. XML Console enable checkbutton #: ../data/gui/accounts_window.ui.h:61 ../data/gui/xml_console_window.ui.h:11 #, fuzzy msgid "_Enable" -msgstr "Abilita" +msgstr "_Abilita" #: ../data/gui/accounts_window.ui.h:62 #, fuzzy @@ -506,7 +506,7 @@ #: ../data/gui/accounts_window.ui.h:64 ../data/gui/preferences_window.ui.h:133 #, fuzzy msgid "_Manage..." -msgstr "Gestisci..." +msgstr "_Gestisci..." #: ../data/gui/accounts_window.ui.h:66 #, fuzzy @@ -515,7 +515,7 @@ #: ../data/gui/accounts_window.ui.h:67 msgid "_Warn before using an insecure connection" -msgstr "" +msgstr "_Avvisa prima di utilizzare una connessione non sicura" #: ../data/gui/accounts_window.ui.h:68 msgid "_use HTTP__PROXY environment variable" @@ -758,8 +758,8 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:25 -#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5707 -#: ../src/roster_window.py:5834 ../src/roster_window.py:5967 +#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5701 +#: ../src/roster_window.py:5828 ../src/roster_window.py:5961 msgid "_Unblock" msgstr "_Sblocca" @@ -934,12 +934,12 @@ msgstr "Aggiunge il contatto alla lista" #: ../data/gui/chat_control.ui.h:20 -#: ../src/command_system/implementation/standard.py:208 +#: ../src/command_system/implementation/standard.py:214 msgid "Toggle audio session" msgstr "" #: ../data/gui/chat_control.ui.h:21 -#: ../src/command_system/implementation/standard.py:218 +#: ../src/command_system/implementation/standard.py:224 msgid "Toggle video session" msgstr "" @@ -1001,8 +1001,8 @@ #. Invite to #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:6 -#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5643 -#: ../src/roster_window.py:5802 +#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5637 +#: ../src/roster_window.py:5796 msgid "In_vite to" msgstr "In_vita a " @@ -1021,8 +1021,8 @@ msgid "Remo_ve" msgstr "_Elimina" -#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5653 -#: ../src/roster_window.py:5891 +#: ../data/gui/contact_context_menu.ui.h:10 ../src/roster_window.py:5647 +#: ../src/roster_window.py:5885 msgid "Send Cus_tom Status" msgstr "Invia s_tato personalizzato" @@ -1055,8 +1055,8 @@ msgstr "Permetti di _vedere il mio stato" #: ../data/gui/contact_context_menu.ui.h:19 -#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5715 -#: ../src/roster_window.py:5840 ../src/roster_window.py:5970 +#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5709 +#: ../src/roster_window.py:5834 ../src/roster_window.py:5964 msgid "_Block" msgstr "_Blocca" @@ -1067,7 +1067,7 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_control_popup_menu.ui.h:6 #: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23 -#: ../src/roster_window.py:6041 +#: ../src/roster_window.py:6035 msgid "_History" msgstr "_Cronologia" @@ -1202,7 +1202,7 @@ msgid "Account row" msgstr "Account" -#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1041 +#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1039 msgid "Bold" msgstr "Grassetto" @@ -1240,7 +1240,7 @@ msgid "Inactive" msgstr "Inattivo" -#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1042 +#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1040 msgid "Italic" msgstr "Corsivo" @@ -1426,7 +1426,7 @@ #: ../data/gui/history_window.ui.h:1 #, fuzzy msgid "All Chat Histories" -msgstr "Vecchie storie" +msgstr "Tutte le cronologie delle conversazioni" #: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323 msgid "Conversation History" @@ -1440,25 +1440,25 @@ #: ../data/gui/history_window.ui.h:4 #, fuzzy msgid "Groupchat Histories" -msgstr "Chat di gruppo" +msgstr "Cronologia delle conversazioni di gruppo" #: ../data/gui/history_window.ui.h:5 #, fuzzy msgid "Search:" -msgstr "Cerca" +msgstr "Cerca:" #: ../data/gui/history_window.ui.h:6 #: ../data/gui/zeroconf_information_window.ui.h:10 msgid "_Log conversation history" -msgstr "_Memorizza cronologia conversazione" +msgstr "_Memorizza la cronologia della conversazione" #: ../data/gui/item_archiving_preferences_window.ui.h:1 msgid "approve" -msgstr "" +msgstr "approva" #: ../data/gui/item_archiving_preferences_window.ui.h:2 msgid "body" -msgstr "" +msgstr "corpo"

1 0

gajim: fix handling file transfer cancel properly
by Jefry Lagrange 22 Mar '12

22 Mar '12

changeset c75a03d9cdf9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c75a03d9cdf9 description: fix handling file transfer cancel properly diffstat: src/common/jingle.py | 2 ++ src/common/jingle_session.py | 10 +++++++--- src/gui_interface.py | 1 - 3 files changed, 9 insertions(+), 4 deletions(-) diffs (50 lines): diff -r 7ab56b693f40 -r c75a03d9cdf9 src/common/jingle.py --- a/src/common/jingle.py Wed Mar 21 15:54:46 2012 -0400 +++ b/src/common/jingle.py Thu Mar 22 00:56:11 2012 -0400 @@ -149,6 +149,8 @@ return use_security = contact.supports(xmpp.NS_JINGLE_XTLS) jingle = JingleSession(self, weinitiate=True, jid=jid) + # this is a file transfer + jingle.session_type_FT = True self._sessions[jingle.sid] = jingle file_props['sid'] = jingle.sid if contact.supports(xmpp.NS_JINGLE_BYTESTREAM): diff -r 7ab56b693f40 -r c75a03d9cdf9 src/common/jingle_session.py --- a/src/common/jingle_session.py Wed Mar 21 15:54:46 2012 -0400 +++ b/src/common/jingle_session.py Thu Mar 22 00:56:11 2012 -0400 @@ -102,6 +102,8 @@ # file. Could be 'md5', 'sha-1', etc... self.hash_algo = None self.file_hash = None + # Tells whether this session is a file transfer or not + self.session_type_FT = False # callbacks to call on proper contents # use .prepend() to add new callbacks, especially when you're going # to send error instead of ack @@ -585,9 +587,11 @@ else: # TODO text = reason - gajim.nec.push_incoming_event(JingleTransferCancelledEvent(None, - conn=self.connection, jingle_session=self, media=None, - reason=text)) + + if reason == 'cancel' and self.session_type_FT: + gajim.nec.push_incoming_event(JingleTransferCancelledEvent(None, + conn=self.connection, jingle_session=self, media=None, + reason=text)) def __broadcast_all(self, stanza, jingle, error, action): """ diff -r 7ab56b693f40 -r c75a03d9cdf9 src/gui_interface.py --- a/src/gui_interface.py Wed Mar 21 15:54:46 2012 -0400 +++ b/src/gui_interface.py Thu Mar 22 00:56:11 2012 -0400 @@ -1166,7 +1166,6 @@ ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' + 'the transfer') - obj.conn.delete_jingle_session(obj.sid) def handle_event_jingle_incoming(self, obj): # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type,

1 0

gajim: handles file transfer cancel properly
by Jefry Lagrange 21 Mar '12

21 Mar '12

changeset 7ab56b693f40 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7ab56b693f40 description: handles file transfer cancel properly diffstat: src/common/connection_handlers_events.py | 10 ++++++++++ src/common/jingle_session.py | 2 +- src/gui_interface.py | 19 +++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletions(-) diffs (68 lines): diff -r e1ed14c80fe3 -r 7ab56b693f40 src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Mar 19 15:52:33 2012 -0400 +++ b/src/common/connection_handlers_events.py Wed Mar 21 15:54:46 2012 -0400 @@ -1399,6 +1399,16 @@ self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) self.sid = self.jingle_session.sid return True + +class JingleTransferCancelledEvent(nec.NetworkIncomingEvent): + name = 'jingleFT-cancelled-received' + base_network_events = [] + + def generate(self): + self.fjid = self.jingle_session.peerjid + self.jid, self.resource = gajim.get_room_and_nick_from_fjid(self.fjid) + self.sid = self.jingle_session.sid + return True class JingleErrorReceivedEvent(nec.NetworkIncomingEvent): name = 'jingle-error-received' diff -r e1ed14c80fe3 -r 7ab56b693f40 src/common/jingle_session.py --- a/src/common/jingle_session.py Mon Mar 19 15:52:33 2012 -0400 +++ b/src/common/jingle_session.py Wed Mar 21 15:54:46 2012 -0400 @@ -585,7 +585,7 @@ else: # TODO text = reason - gajim.nec.push_incoming_event(JingleDisconnectedReceivedEvent(None, + gajim.nec.push_incoming_event(JingleTransferCancelledEvent(None, conn=self.connection, jingle_session=self, media=None, reason=text)) diff -r e1ed14c80fe3 -r 7ab56b693f40 src/gui_interface.py --- a/src/gui_interface.py Mon Mar 19 15:52:33 2012 -0400 +++ b/src/gui_interface.py Wed Mar 21 15:54:46 2012 -0400 @@ -1150,6 +1150,24 @@ 'resource. Please type a new one'), resource=proposed_resource, ok_handler=on_ok) + def handle_event_jingleft_cancel(self, obj): + ft = self.instances['file_transfers'] + file_props = None + + # get the file_props of our session + for sid in obj.conn.files_props: + fp = obj.conn.files_props[sid] + if fp['session-sid'] == obj.sid: + file_props = fp + break + + ft.set_status(file_props['type'], file_props['sid'], 'stop') + file_props['error'] = -4 # is it the right error code? + + ft.show_stopped(obj.jid, file_props, 'Peer cancelled ' + + 'the transfer') + obj.conn.delete_jingle_session(obj.sid) + def handle_event_jingle_incoming(self, obj): # ('JINGLE_INCOMING', account, peer jid, sid, tuple-of-contents==(type, # data...)) @@ -1486,6 +1504,7 @@ self.handle_event_jingle_disconnected], 'jingle-error-received': [self.handle_event_jingle_error], 'jingle-request-received': [self.handle_event_jingle_incoming], + 'jingleFT-cancelled-received': [self.handle_event_jingleft_cancel], 'last-result-received': [self.handle_event_last_status_time], 'message-error': [self.handle_event_msgerror], 'message-not-sent': [self.handle_event_msgnotsent],

1 0

gajim: typo in french. Fixes #7128
by Fomin Denis 21 Mar '12

21 Mar '12

changeset 455337f6a1fa in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=455337f6a1fa description: typo in french. Fixes #7128 diffstat: po/fr.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 253c0d61f881 -r 455337f6a1fa po/fr.po --- a/po/fr.po Mon Mar 19 17:37:05 2012 -0400 +++ b/po/fr.po Wed Mar 21 14:29:25 2012 +0400 @@ -1759,7 +1759,7 @@ #: ../data/gui/preferences_window.ui.h:22 msgid "(example: stunserver.org)" -msgstr "(exemple: stunserver.org)>/i>" +msgstr "(exemple: stunserver.org)" #: ../data/gui/preferences_window.ui.h:23 msgid "Advanced"

1 0

gajim: re-enable SM when resuming
by Jefry Lagrange 19 Mar '12

19 Mar '12

changeset 253c0d61f881 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=253c0d61f881 description: re-enable SM when resuming diffstat: src/common/xmpp/smacks.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r eacd6c5f4a7a -r 253c0d61f881 src/common/xmpp/smacks.py --- a/src/common/xmpp/smacks.py Sun Mar 18 23:53:11 2012 +0400 +++ b/src/common/xmpp/smacks.py Mon Mar 19 17:37:05 2012 -0400 @@ -103,6 +103,7 @@ self.uqueue.pop(0) if stanza.getName() == 'resumed': + self.enabled = True self.resuming = True self.con.set_oldst() if self.uqueue != []:

1 0

gajim: decline jingleFT correctly
by Jefry Lagrange 19 Mar '12

19 Mar '12

changeset e1ed14c80fe3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e1ed14c80fe3 description: decline jingleFT correctly diffstat: src/common/jingle_session.py | 9 ++++++++- src/common/protocol/bytestream.py | 4 ++++ 2 files changed, 12 insertions(+), 1 deletions(-) diffs (40 lines): diff -r d7c0c10fce32 -r e1ed14c80fe3 src/common/jingle_session.py --- a/src/common/jingle_session.py Sat Feb 18 21:21:00 2012 +0100 +++ b/src/common/jingle_session.py Mon Mar 19 15:52:33 2012 -0400 @@ -148,6 +148,14 @@ reason = xmpp.Node('reason') reason.addChild('decline') self._session_terminate(reason) + + def cancel_session(self): + """ + Called when user declines session in UI (when we aren't the initiator) + """ + reason = xmpp.Node('reason') + reason.addChild('cancel') + self._session_terminate(reason) def approve_content(self, media, name=None): content = self.get_content(media, name) @@ -730,7 +738,6 @@ self.__session_info(p) def _session_terminate(self, reason=None): - assert self.state != JingleStates.ended stanza, jingle = self.__make_jingle('session-terminate', reason=reason) self.__broadcast_all(stanza, jingle, None, 'session-terminate-sent') if self.connection.connection and self.connection.connected >= 2: diff -r d7c0c10fce32 -r e1ed14c80fe3 src/common/protocol/bytestream.py --- a/src/common/protocol/bytestream.py Sat Feb 18 21:21:00 2012 +0100 +++ b/src/common/protocol/bytestream.py Mon Mar 19 15:52:33 2012 -0400 @@ -195,6 +195,10 @@ # user response to ConfirmationDialog may come after we've disconneted if not self.connection or self.connected < 2: return + if file_props['session-type'] == 'jingle': + jingle = self._sessions[file_props['session-sid']] + jingle.cancel_session() + return iq = xmpp.Iq(to=unicode(file_props['sender']), typ='error') iq.setAttr('id', file_props['request-id']) if code == '400' and typ in ('stream', 'profile'):

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