}
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;
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 */
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
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:
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
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);
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);
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);
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,
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);
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"));
{
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);
}
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);
}
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);
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;
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);
}
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);
}