Kaydet (Commit) 35aa0360 authored tarafından Matúš Kukan's avatar Matúš Kukan

Revert "tubes: mangle service name into file description"

Hopefully, it will work now, and we can use description field for UUID.

This reverts commit 98411a76.

Change-Id: Ib6feeea861949c0cd316fda0295f13751de789e5
üst 6766c6a2
...@@ -921,7 +921,7 @@ ft_handler_populate_outgoing_request (EmpathyFTHandler *handler) ...@@ -921,7 +921,7 @@ ft_handler_populate_outgoing_request (EmpathyFTHandler *handler)
NULL); NULL);
if (priv->service_name != NULL) if (priv->service_name != NULL)
tp_asv_set_string (priv->request, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, priv->service_name); tp_asv_set_string (priv->request, TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, priv->service_name);
g_free (uri); g_free (uri);
} }
......
...@@ -613,7 +613,7 @@ bool TeleManager::registerClients() ...@@ -613,7 +613,7 @@ bool TeleManager::registerClients()
tp_asv_new( tp_asv_new(
TP_PROP_CHANNEL_CHANNEL_TYPE, G_TYPE_STRING, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, 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_TARGET_HANDLE_TYPE, G_TYPE_UINT, TP_HANDLE_TYPE_CONTACT,
TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_DESCRIPTION, G_TYPE_STRING, getFullServiceName().getStr(), TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, G_TYPE_STRING, getFullServiceName().getStr(),
NULL)); NULL));
if (!tp_base_client_register( pImpl->mpFileTransferClient, &pError)) if (!tp_base_client_register( pImpl->mpFileTransferClient, &pError))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment