[Libreoffice-commits] .: Branch 'feature/tubes2' - tubes/source

[Will Thompson]

 tubes/source/file-transfer-helper.c |    2 +-
 tubes/source/manager.cxx            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 87055630c7c0b7cd5b30da94e93a2ae50a305c86
Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Fri Mar 23 11:42:10 2012 +0000

    tubes: mangle service name into file description
    
    The version of Gabble that Michael and Eike are using doesn't support
    the Metadata interface that we're using to direct this channel to
    LibreOffice.
    
    Perhaps putting something magic into the mime type would be a better
    temporary workaround but hey.

diff --git a/tubes/source/file-transfer-helper.c b/tubes/source/file-transfer-helper.c
index 15e3dfd..8ee092e 100644
--- a/tubes/source/file-transfer-helper.c
+++ b/tubes/source/file-transfer-helper.c
@@ -917,7 +917,7 @@ ft_handler_populate_outgoing_request (EmpathyFTHandler *handler)
       NULL);
 
   if (priv->service_name != NULL)
-    tp_asv_set_string (priv->request, TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, priv->service_name);
+    tp_asv_set_string (priv->request, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, priv->service_name);
 
   g_free (uri);
 }
diff --git a/tubes/source/manager.cxx b/tubes/source/manager.cxx
index 25f879d..74145ec 100644
--- a/tubes/source/manager.cxx
+++ b/tubes/source/manager.cxx
@@ -489,7 +489,7 @@ bool TeleManager::connect()
             tp_asv_new(
                 TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
                 TP_PROP_CHANNEL_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
-                TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, G_TYPE_STRING, getFullServiceName().getStr(),
+                TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, getFullServiceName().getStr(),
                 NULL));
 
     if (!tp_base_client_register( pImpl->mpFileTransferClient, &pError))