From c5483fef77ce5e3c48a38090632efd82b16507b7 Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Date: Tue, 17 Mar 2009 13:53:17 +0000
Subject: pass byte_arrays=True to {Accept,Provide}File

The unix socket address is supposed to be an 'ay' and not a 's'
according to the spec. This change make the code works with both so it
can be used with old bugged CM's and new ones.
---
(limited to 'src')

diff --git a/src/jarabe/model/filetransfer.py b/src/jarabe/model/filetransfer.py
index 964b6b4..ab5cd4f 100644
--- a/src/jarabe/model/filetransfer.py
+++ b/src/jarabe/model/filetransfer.py
@@ -204,7 +204,7 @@ class IncomingFileTransfer(BaseFileTransfer):
 
         channel_ft = self.channel[CHANNEL_TYPE_FILE_TRANSFER]
         self._socket_address = channel_ft.AcceptFile(SOCKET_ADDRESS_TYPE_UNIX,
-                SOCKET_ACCESS_CONTROL_LOCALHOST, '', 0)
+                SOCKET_ACCESS_CONTROL_LOCALHOST, '', 0, byte_arrays=True)
 
     def __notify_state_cb(self, file_transfer, pspec):
         logging.debug('__notify_state_cb %r' % self.props.state)
@@ -266,7 +266,8 @@ class OutgoingFileTransfer(BaseFileTransfer):
         
         channel_file_transfer = self.channel[CHANNEL_TYPE_FILE_TRANSFER]
         self._socket_address = channel_file_transfer.ProvideFile(
-                SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ACCESS_CONTROL_LOCALHOST, '')
+                SOCKET_ADDRESS_TYPE_UNIX, SOCKET_ACCESS_CONTROL_LOCALHOST, '',
+                byte_arrays=True)
 
     def _get_buddy_handle(self):
         object_path = self.buddy.object_path()
--
cgit v0.9.1