From 9de705f0c9be2f3b92871f2a8f381e27846f3bdb Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 21 Nov 2008 16:20:32 +0000 Subject: fix FT client side code as the generated code changed svn path=/trunk/; revision=1843 --- libempathy/empathy-dispatcher.c | 10 +++++----- libempathy/empathy-tp-file.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'libempathy') diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 433a9f19c..641975b24 100644 --- a/libempathy/empathy-dispatcher.c +++ b/libempathy/empathy-dispatcher.c @@ -967,7 +967,7 @@ file_channel_request_cb (TpConnection *connection, channel = tp_channel_new (connection, object_path, - EMP_IFACE_CHANNEL_TYPE_FILE, + EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT, request->handle, NULL); @@ -976,13 +976,13 @@ file_channel_request_cb (TpConnection *connection, g_value_init (&value, G_TYPE_STRING); g_value_set_string (&value, g_filename_display_basename (filename)); tp_cli_dbus_properties_call_set (TP_PROXY (channel), -1, - EMP_IFACE_CHANNEL_TYPE_FILE, "Filename", + EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Filename", &value, NULL, NULL, NULL, NULL); g_value_reset (&value); g_value_set_string (&value, g_file_info_get_content_type (info)); tp_cli_dbus_properties_call_set (TP_PROXY (channel), -1, - EMP_IFACE_CHANNEL_TYPE_FILE, "ContentType", + EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "ContentType", &value, NULL, NULL, NULL, NULL); g_value_unset (&value); @@ -990,7 +990,7 @@ file_channel_request_cb (TpConnection *connection, g_value_init (&value, G_TYPE_UINT64); g_value_set_uint64 (&value, size); tp_cli_dbus_properties_call_set (TP_PROXY (channel), -1, - EMP_IFACE_CHANNEL_TYPE_FILE, "Size", + EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "Size", &value, NULL, NULL, NULL, NULL); g_value_unset (&value); @@ -1032,7 +1032,7 @@ empathy_dispatcher_send_file (EmpathyContact *contact, request->contact = contact; tp_cli_connection_call_request_channel (connection, -1, - EMP_IFACE_CHANNEL_TYPE_FILE, + EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT, handle, TRUE, diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index af3ac5cde..b2e7d8be6 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -544,16 +544,16 @@ tp_file_constructor (GType type, tp_file, NULL, NULL, NULL); - emp_cli_channel_type_file_connect_to_file_transfer_state_changed ( + emp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed ( TP_PROXY (tp_file->priv->channel), - (emp_cli_channel_type_file_signal_callback_file_transfer_state_changed) + (emp_cli_channel_type_file_transfer_signal_callback_file_transfer_state_changed) tp_file_state_changed_cb, tp_file, NULL, NULL, NULL); - emp_cli_channel_type_file_connect_to_transferred_bytes_changed ( + emp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed ( TP_PROXY (tp_file->priv->channel), - (emp_cli_channel_type_file_signal_callback_transferred_bytes_changed) + (emp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_changed) tp_file_transferred_bytes_changed_cb, tp_file, NULL, NULL, NULL); @@ -565,7 +565,7 @@ tp_file_constructor (GType type, tp_file->priv->factory, account, (guint) handle); tp_cli_dbus_properties_run_get_all (tp_file->priv->channel, - -1, EMP_IFACE_CHANNEL_TYPE_FILE, &properties, NULL, NULL); + -1, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, &properties, NULL, NULL); tp_file->priv->size = g_value_get_uint64 ( g_hash_table_lookup (properties, "Size")); @@ -625,7 +625,7 @@ tp_file_channel_set_dbus_property (gpointer proxy, { DEBUG ("Setting %s property", property); tp_cli_dbus_properties_call_set (TP_PROXY (proxy), -1, - EMP_IFACE_CHANNEL_TYPE_FILE, property, value, + EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, property, value, NULL, NULL, NULL, NULL); } @@ -773,7 +773,8 @@ empathy_tp_file_accept (EmpathyTpFile *tp_file, g_value_init (¬hing, G_TYPE_STRING); g_value_set_string (¬hing, ""); - emp_cli_channel_type_file_call_accept_file (TP_PROXY (tp_file->priv->channel), + emp_cli_channel_type_file_transfer_call_accept_file (TP_PROXY ( + tp_file->priv->channel), -1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, ¬hing, offset, tp_file_method_cb, tp_file, NULL, NULL); } @@ -795,7 +796,7 @@ empathy_tp_file_offer (EmpathyTpFile *tp_file) g_value_init (¬hing, G_TYPE_STRING); g_value_set_string (¬hing, ""); - emp_cli_channel_type_file_call_offer_file ( + emp_cli_channel_type_file_transfer_call_offer_file ( TP_PROXY (tp_file->priv->channel), -1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, ¬hing, tp_file_method_cb, tp_file, NULL, NULL); -- cgit v1.2.3