fix FT client side code as the generated code changed

svn path=/trunk/; revision=1843

5 files changed, 23 insertions, 22 deletions

diff --git a/libempathy-gtk/empathy-ft-manager.c b/libempathy-gtk/empathy-ft-manager.c
index 53b69fb48..9064a518d 100644
--- a/libempathy-gtk/empathy-ft-manager.c
+++ b/libempathy-gtk/empathy-ft-manager.c
@@ -189,7 +189,7 @@ ft_manager_update_buttons (EmpathyFTManager *ft_manager)
 
         }
       else if (empathy_tp_file_get_state (tp_file) ==
-        EMP_FILE_TRANSFER_STATE_CANCELED)
+        EMP_FILE_TRANSFER_STATE_CANCELLED)
         {
           open_enabled = FALSE;
           abort_enabled = FALSE;
@@ -323,7 +323,7 @@ ft_manager_update_ft_row (EmpathyFTManager *ft_manager,
 
       break;
 
-    case EMP_FILE_TRANSFER_STATE_CANCELED:
+    case EMP_FILE_TRANSFER_STATE_CANCELLED:
       if (empathy_tp_file_get_incoming (tp_file))
         /* translators: first %s is filename, second %s
          * is the contact name */
@@ -355,7 +355,7 @@ ft_manager_update_ft_row (EmpathyFTManager *ft_manager,
   if (remaining < 0)
     {
       if (state == EMP_FILE_TRANSFER_STATE_COMPLETED ||
-          state == EMP_FILE_TRANSFER_STATE_CANCELED)
+          state == EMP_FILE_TRANSFER_STATE_CANCELLED)
         remaining_str = g_strdup ("");
       else
         /* translators: the text before the "|" is context to
@@ -528,7 +528,7 @@ ft_manager_clear_foreach_cb (gpointer key,
   switch (empathy_tp_file_get_state (tp_file))
     {
       case EMP_FILE_TRANSFER_STATE_COMPLETED:
-      case EMP_FILE_TRANSFER_STATE_CANCELED:
+      case EMP_FILE_TRANSFER_STATE_CANCELLED:
         *list = g_slist_append (*list, tp_file);
         break;
       default:
@@ -575,7 +575,7 @@ ft_manager_state_changed_cb (EmpathyTpFile *tp_file,
             gtk_recent_manager_add_item (manager, uri);
          }
 
-      case EMP_FILE_TRANSFER_STATE_CANCELED:
+      case EMP_FILE_TRANSFER_STATE_CANCELLED:
         /* Automatically remove file transfers if the
          * window if not visible. */
         /* FIXME how do the user know if the file transfer
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 (&nothing, G_TYPE_STRING);
   g_value_set_string (&nothing, "");
 
-  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,
       &nothing, offset, tp_file_method_cb, tp_file, NULL, NULL);
 }
@@ -795,7 +796,7 @@ empathy_tp_file_offer (EmpathyTpFile *tp_file)
   g_value_init (&nothing, G_TYPE_STRING);
   g_value_set_string (&nothing, "");
 
-  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,
       &nothing, tp_file_method_cb, tp_file, NULL, NULL);
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 9a2cf579d..94204794d 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -216,7 +216,7 @@ event_manager_filter_channel_cb (EmpathyDispatcher   *dispatcher,
 		g_object_unref (contact);
 		g_object_unref (tp_group);
 	}
-	else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE)) {
+	else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
 		EmpathyContact        *contact;
 		gchar                 *msg;
 		TpHandle               handle;
diff --git a/src/empathy.c b/src/empathy.c
index bc89d451e..a8ff7e2a6 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -102,7 +102,7 @@ file_channel_get_state_cb (TpProxy      *proxy,
 		return;
 	}
 
-	emp_cli_channel_type_file_connect_to_file_transfer_state_changed (
+	emp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
 		proxy, file_channel_state_changed_cb, NULL, NULL, NULL, NULL);
 }
 
@@ -151,9 +151,9 @@ dispatch_channel_cb (EmpathyDispatcher *dispatcher,
 	else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
 		empathy_call_window_new (channel);
 	}
-	else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE)) {
+	else if (!tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
 		tp_cli_dbus_properties_call_get (g_object_ref (channel), -1,
-			EMP_IFACE_CHANNEL_TYPE_FILE,
+			EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER,
 			"State", file_channel_get_state_cb,
 			NULL, NULL, NULL);
 	}