summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2010-04-28 21:34:05 +0100
committerLouis-Francis Ratté-Boulianne <louis-francis.ratte-boulianne@collabora.co.uk>2010-06-03 16:42:31 -0400
commitf8349dad2ef6f26a9bc5e827d544de182885757d (patch)
treeeb85661dd77e3a3c6f30a20a73d016695fc0a519
parent01a387df54ad37e511b3be4f01e0a9527d847342 (diff)
file transfer: call ChannelTypeFileTransfer.__init__ first
Good practices and all that. Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-rw-r--r--butterfly/channel/file_transfer.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/butterfly/channel/file_transfer.py b/butterfly/channel/file_transfer.py
index 44e2536..6e3a2e1 100644
--- a/butterfly/channel/file_transfer.py
+++ b/butterfly/channel/file_transfer.py
@@ -43,6 +43,9 @@ logger = logging.getLogger('Butterfly.FileTransferChannel')
class ButterflyFileTransferChannel(telepathy.server.ChannelTypeFileTransfer):
def __init__(self, conn, manager, session, handle, props, object_path=None):
+ telepathy.server.ChannelTypeFileTransfer.__init__(self, conn, manager, props,
+ object_path=object_path)
+
self._handle = handle
self._conn_ref = weakref.ref(conn)
self._state = 0
@@ -52,9 +55,6 @@ class ButterflyFileTransferChannel(telepathy.server.ChannelTypeFileTransfer):
self.socket = None
self._tmpdir = None
- telepathy.server.ChannelTypeFileTransfer.__init__(self, conn, manager, props,
- object_path=object_path)
-
# Incoming.
if session is None:
type = telepathy.CHANNEL_TYPE_FILE_TRANSFER