diff options
| author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-08-07 10:46:36 (GMT) |
|---|---|---|
| committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-08-07 10:46:36 (GMT) |
| commit | 8d039486188d67be0d41cd291dc65d17b1a3aa8a (patch) | |
| tree | 07db8f1e2d69103975f16812ef1263690dcff570 /src | |
| parent | 7f90679c8453e3aefc42f8bf03b00694864db55f (diff) | |
Allow the user to dismiss the file transfer invitation when the other user cancelled it (garycmartin) #1093
Diffstat (limited to 'src')
| -rw-r--r-- | src/jarabe/frame/activitiestray.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/jarabe/frame/activitiestray.py b/src/jarabe/frame/activitiestray.py index 1e2b8e8..0025403 100644 --- a/src/jarabe/frame/activitiestray.py +++ b/src/jarabe/frame/activitiestray.py @@ -815,8 +815,9 @@ class OutgoingTransferPalette(BaseTransferPalette): self._update() def _update(self): - logging.debug('_update state: %r' % self.file_transfer.props.state) - if self.file_transfer.props.state == filetransfer.FT_STATE_PENDING: + new_state = self.file_transfer.props.state + logging.debug('_update state: %r' % new_state) + if new_state == filetransfer.FT_STATE_PENDING: menu_item = MenuItem(_('Cancel'), icon_name='dialog-cancel') menu_item.connect('activate', self.__cancel_activate_cb) @@ -840,8 +841,8 @@ class OutgoingTransferPalette(BaseTransferPalette): vbox.add(label) label.show() - elif self.file_transfer.props.state in \ - [filetransfer.FT_STATE_ACCEPTED, filetransfer.FT_STATE_OPEN]: + elif new_state in [filetransfer.FT_STATE_ACCEPTED, + filetransfer.FT_STATE_OPEN]: for item in self.menu.get_children(): self.menu.remove(item) @@ -865,7 +866,8 @@ class OutgoingTransferPalette(BaseTransferPalette): self.update_progress() - elif self.file_transfer.props.state == filetransfer.FT_STATE_COMPLETED: + elif new_state in [filetransfer.FT_STATE_COMPLETED, + filetransfer.FT_STATE_CANCELLED]: for item in self.menu.get_children(): self.menu.remove(item) |