diff options
| author | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2010-11-09 15:45:24 -0500 |
|---|---|---|
| committer | Louis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk> | 2010-12-03 15:50:39 -0500 |
| commit | 68e6aa2dd7f1adcb2f0741db2b5d9b9d71f070aa (patch) | |
| tree | 6581edba988903e0d1e78df22cf0e3f4a4afdd9d | |
| parent | b57867b794a7e7a8ae6671bac5e1d76303b82ba8 (diff) | |
channel: tp-python will remove channel from connection when closed
| -rw-r--r-- | butterfly/channel/file_transfer.py | 1 | ||||
| -rw-r--r-- | butterfly/channel/media.py | 1 | ||||
| -rw-r--r-- | butterfly/channel/text.py | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/butterfly/channel/file_transfer.py b/butterfly/channel/file_transfer.py index 3062953..6891a29 100644 --- a/butterfly/channel/file_transfer.py +++ b/butterfly/channel/file_transfer.py @@ -180,7 +180,6 @@ class ButterflyFileTransferChannel(telepathy.server.ChannelTypeFileTransfer): telepathy.server.ChannelTypeFileTransfer.Close(self) self.cleanup() - self.remove_from_connection() def cancel(self): if self._receiving and self.state == telepathy.FILE_TRANSFER_STATE_PENDING: diff --git a/butterfly/channel/media.py b/butterfly/channel/media.py index dc98ed1..3ffb2fd 100644 --- a/butterfly/channel/media.py +++ b/butterfly/channel/media.py @@ -189,7 +189,6 @@ class ButterflyMediaChannel( def on_call_ended(self): logger.info("Call has ended") telepathy.server.ChannelTypeStreamedMedia.Close(self) - self.remove_from_connection() self._session_handler.remove_from_connection() #papyon.event.media.MediaSessionEventInterface diff --git a/butterfly/channel/text.py b/butterfly/channel/text.py index 7e5821b..2673c04 100644 --- a/butterfly/channel/text.py +++ b/butterfly/channel/text.py @@ -206,7 +206,6 @@ class ButterflyTextChannel( self._conversation.leave() self._remove_typing_timeouts() telepathy.server.ChannelTypeText.Close(self) - self.remove_from_connection() def GetPendingMessageContent(self, message_id, parts): # We don't support pending message |