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],