diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-11-15 09:01:01 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-11-15 09:01:01 +0000 |
| commit | fc23a8623e7ec3ab9e7f39381367c7d46dc73c7f (patch) | |
| tree | 3793a71c4dd15d2493db28bc04ec94c5c596e255 /src/ft-manager.c | |
| parent | 20b6d3c332d5bf1acaa928aba0be06853cc19783 (diff) | |
| download | telepathy-salut-fc23a8623e7ec3ab9e7f39381367c7d46dc73c7f.tar.gz | |
ft metadata: use tp-glib generated code rather than using the draft interface
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/ft-manager.c')
| -rw-r--r-- | src/ft-manager.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/ft-manager.c b/src/ft-manager.c index b7fa7492..f1b6bb6d 100644 --- a/src/ft-manager.c +++ b/src/ft-manager.c @@ -33,7 +33,6 @@ #include <salut/caps-channel-manager.h> -#include <extensions/_gen/gtypes.h> #include "file-transfer-channel.h" #include "contact-manager.h" #include "presence-cache.h" @@ -402,11 +401,11 @@ salut_ft_manager_handle_request (TpChannelManager *manager, TP_PROP_CHANNEL_TYPE_FILE_TRANSFER_URI); service_name = tp_asv_get_string (request_properties, - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".ServiceName"); + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME); metadata = tp_asv_get_boxed (request_properties, - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".Metadata", - SALUT_HASH_TYPE_METADATA); + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA, + TP_HASH_TYPE_METADATA); if (metadata != NULL && g_hash_table_lookup ((GHashTable *) metadata, "FORM_TYPE")) { @@ -501,15 +500,15 @@ static const gchar * const file_transfer_channel_allowed_properties[] = static const gchar * const file_transfer_channel_allowed_properties_with_metadata_prop[] = { STANDARD_PROPERTIES, - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".Metadata", + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA, NULL }; static const gchar * const file_transfer_channel_allowed_properties_with_both_metadata_props[] = { STANDARD_PROPERTIES, - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".ServiceName", - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".Metadata", + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_METADATA, NULL }; @@ -613,7 +612,7 @@ add_file_transfer_channel_class (GPtrArray *arr, { service_name_value = tp_g_value_slice_new_string (service_name_str); g_hash_table_insert (fixed_properties, - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".ServiceName", + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME, service_name_value); } @@ -715,7 +714,7 @@ salut_ft_manager_represent_client ( continue; service_name = tp_asv_get_string (channel_class, - SALUT_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA ".ServiceName"); + TP_PROP_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA_SERVICE_NAME); if (service_name == NULL) continue; |