aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy')
-rw-r--r--libempathy/empathy-dispatch-operation.c2
-rw-r--r--libempathy/empathy-dispatcher.c14
-rw-r--r--libempathy/empathy-tp-contact-factory.c2
-rw-r--r--libempathy/empathy-tp-file.c56
-rw-r--r--libempathy/empathy-tp-file.h3
5 files changed, 38 insertions, 39 deletions
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index ee5b64d96..1786e4169 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -403,7 +403,7 @@ empathy_dispatch_operation_channel_ready_cb (TpChannel *channel,
priv->channel_wrapper = G_OBJECT (call);
}
- else if (channel_type == EMP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
+ else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_FILE_TRANSFER)
{
EmpathyTpFile *file = empathy_tp_file_new (channel);
priv->channel_wrapper = G_OBJECT (file);
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index ab00503c8..38eb71a9e 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -543,7 +543,7 @@ dispatcher_connection_new_channel (EmpathyDispatcher *dispatcher,
* doesn't make sense to handle it if we didn't request it. The same goes
* for channels we discovered by the Channels property or ListChannels */
if (!incoming && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)
- && tp_strdiff (channel_type, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
+ && tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER))
{
DEBUG ("Ignoring incoming channel of type %s on %s",
channel_type, object_path);
@@ -1469,7 +1469,7 @@ empathy_dispatcher_send_file_to_contact (EmpathyContact *contact,
/* org.freedesktop.Telepathy.Channel.ChannelType */
value = tp_g_value_slice_new (G_TYPE_STRING);
- g_value_set_string (value, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
+ g_value_set_string (value, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER);
g_hash_table_insert (request, TP_IFACE_CHANNEL ".ChannelType", value);
/* org.freedesktop.Telepathy.Channel.TargetHandleType */
@@ -1481,30 +1481,30 @@ empathy_dispatcher_send_file_to_contact (EmpathyContact *contact,
value = tp_g_value_slice_new (G_TYPE_STRING);
g_value_set_string (value, content_type);
g_hash_table_insert (request,
- EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType", value);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentType", value);
/* org.freedesktop.Telepathy.Channel.Type.FileTransfer.Filename */
value = tp_g_value_slice_new (G_TYPE_STRING);
g_value_set_string (value, filename);
g_hash_table_insert (request,
- EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename", value);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Filename", value);
/* org.freedesktop.Telepathy.Channel.Type.FileTransfer.Size */
value = tp_g_value_slice_new (G_TYPE_UINT64);
g_value_set_uint64 (value, size);
g_hash_table_insert (request,
- EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size", value);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Size", value);
/* org.freedesktop.Telepathy.Channel.Type.FileTransfer.Date */
value = tp_g_value_slice_new (G_TYPE_UINT64);
g_value_set_uint64 (value, date);
g_hash_table_insert (request,
- EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date", value);
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".Date", value);
/* The contact handle might not be known yet */
request_data = new_dispatcher_request_data (dispatcher, connection,
- EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT, 0, request,
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, TP_HANDLE_TYPE_CONTACT, 0, request,
contact, callback, user_data);
connection_data->outstanding_requests = g_list_prepend
(connection_data->outstanding_requests, request_data);
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c
index 9fe143e43..d83ba12a8 100644
--- a/libempathy/empathy-tp-contact-factory.c
+++ b/libempathy/empathy-tp-contact-factory.c
@@ -856,7 +856,7 @@ get_requestable_channel_classes_cb (TpProxy *connection,
TP_IFACE_CHANNEL ".ChannelType");
if (chan_type == NULL ||
tp_strdiff (g_value_get_string (chan_type),
- EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER)) {
continue;
}
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index d02c052e3..2d43cbba6 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -285,17 +285,17 @@ struct _EmpathyTpFilePriv {
GOutputStream *out_stream;
/* org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties */
- EmpFileTransferState state;
+ TpFileTransferState state;
gchar *content_type;
gchar *filename;
guint64 size;
- EmpFileHashType content_hash_type;
+ TpFileHashType content_hash_type;
gchar *content_hash;
gchar *description;
guint64 transferred_bytes;
gboolean incoming;
- EmpFileTransferStateChangeReason state_change_reason;
+ TpFileTransferStateChangeReason state_change_reason;
time_t start_time;
gchar *unix_socket_path;
GCancellable *cancellable;
@@ -336,13 +336,13 @@ tp_file_invalidated_cb (TpProxy *proxy,
{
DEBUG ("Channel invalidated: %s", message);
- if (tp_file->priv->state != EMP_FILE_TRANSFER_STATE_COMPLETED &&
- tp_file->priv->state != EMP_FILE_TRANSFER_STATE_CANCELLED)
+ if (tp_file->priv->state != TP_FILE_TRANSFER_STATE_COMPLETED &&
+ tp_file->priv->state != TP_FILE_TRANSFER_STATE_CANCELLED)
{
/* The channel is not in a finished state, an error occured */
- tp_file->priv->state = EMP_FILE_TRANSFER_STATE_CANCELLED;
+ tp_file->priv->state = TP_FILE_TRANSFER_STATE_CANCELLED;
tp_file->priv->state_change_reason =
- EMP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR;
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR;
g_object_notify (G_OBJECT (tp_file), "state");
}
}
@@ -443,7 +443,7 @@ tp_file_start_transfer (EmpathyTpFile *tp_file)
}
static void
-tp_file_state_changed_cb (TpProxy *proxy,
+tp_file_state_changed_cb (TpChannel *channel,
guint state,
guint reason,
gpointer user_data,
@@ -465,7 +465,7 @@ tp_file_state_changed_cb (TpProxy *proxy,
/* If the channel is open AND we have the socket path, we can start the
* transfer. The socket path could be NULL if we are not doing the actual
* data transfer but are just an observer for the channel. */
- if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
+ if (state == TP_FILE_TRANSFER_STATE_OPEN &&
tp_file->priv->unix_socket_path != NULL)
tp_file_start_transfer (tp_file);
@@ -476,7 +476,7 @@ tp_file_state_changed_cb (TpProxy *proxy,
}
static void
-tp_file_transferred_bytes_changed_cb (TpProxy *proxy,
+tp_file_transferred_bytes_changed_cb (TpChannel *channel,
guint64 count,
gpointer user_data,
GObject *weak_object)
@@ -513,12 +513,12 @@ tp_file_constructor (GType type,
g_signal_connect (tp_file->priv->channel, "invalidated",
G_CALLBACK (tp_file_invalidated_cb), tp_file);
- emp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
- TP_PROXY (tp_file->priv->channel), tp_file_state_changed_cb, NULL, NULL,
+ tp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed (
+ tp_file->priv->channel, tp_file_state_changed_cb, NULL, NULL,
G_OBJECT (tp_file), NULL);
- emp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed (
- TP_PROXY (tp_file->priv->channel), tp_file_transferred_bytes_changed_cb,
+ tp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed (
+ tp_file->priv->channel, tp_file_transferred_bytes_changed_cb,
NULL, NULL, G_OBJECT (tp_file), NULL);
account = empathy_channel_get_account (tp_file->priv->channel);
@@ -528,7 +528,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_TRANSFER, &properties, NULL, NULL);
+ -1, TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, &properties, NULL, NULL);
tp_cli_dbus_properties_run_get (tp_file->priv->channel,
-1, TP_IFACE_CHANNEL, "Requested", &requested, NULL, NULL);
@@ -540,7 +540,7 @@ tp_file_constructor (GType type,
g_hash_table_lookup (properties, "State"));
tp_file->priv->state_change_reason =
- EMP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE;
+ TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE;
tp_file->priv->transferred_bytes = g_value_get_uint64 (
g_hash_table_lookup (properties, "TransferredBytes"));
@@ -621,7 +621,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_TRANSFER, property, value,
+ TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, property, value,
NULL, NULL, NULL, NULL);
}
@@ -735,7 +735,7 @@ empathy_tp_file_get_channel (EmpathyTpFile *tp_file)
}
static void
-tp_file_method_cb (TpProxy *proxy,
+tp_file_method_cb (TpChannel *channel,
const GValue *address,
const GError *error,
gpointer user_data,
@@ -754,7 +754,7 @@ tp_file_method_cb (TpProxy *proxy,
DEBUG ("Got unix socket path: %s", tp_file->priv->unix_socket_path);
- if (tp_file->priv->state == EMP_FILE_TRANSFER_STATE_OPEN)
+ if (tp_file->priv->state == TP_FILE_TRANSFER_STATE_OPEN)
tp_file_start_transfer (tp_file);
}
@@ -766,7 +766,7 @@ tp_file_method_cb (TpProxy *proxy,
* @error: a #GError set if there is an error when opening @gfile
*
* Accepts a file transfer that's in the "local pending" state (i.e.
- * EMP_FILE_TRANSFER_STATE_LOCAL_PENDING).
+ * TP_FILE_TRANSFER_STATE_LOCAL_PENDING).
*/
void
empathy_tp_file_accept (EmpathyTpFile *tp_file,
@@ -792,8 +792,7 @@ empathy_tp_file_accept (EmpathyTpFile *tp_file,
g_value_init (&nothing, G_TYPE_STRING);
g_value_set_static_string (&nothing, "");
- emp_cli_channel_type_file_transfer_call_accept_file (TP_PROXY (
- tp_file->priv->channel),
+ tp_cli_channel_type_file_transfer_call_accept_file (tp_file->priv->channel,
-1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
&nothing, offset, tp_file_method_cb, NULL, NULL, G_OBJECT (tp_file));
}
@@ -805,7 +804,7 @@ empathy_tp_file_accept (EmpathyTpFile *tp_file,
* @error: a #GError set if there is an error when opening @gfile
*
* Offers a file transfer that's in the "not offered" state (i.e.
- * EMP_FILE_TRANSFER_STATE_NOT_OFFERED).
+ * TP_FILE_TRANSFER_STATE_NOT_OFFERED).
*/
void
empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile, GError **error)
@@ -821,9 +820,8 @@ empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile, GError **error)
g_value_init (&nothing, G_TYPE_STRING);
g_value_set_static_string (&nothing, "");
- emp_cli_channel_type_file_transfer_call_provide_file (
- TP_PROXY (tp_file->priv->channel), -1,
- TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
+ tp_cli_channel_type_file_transfer_call_provide_file (tp_file->priv->channel,
+ -1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
&nothing, tp_file_method_cb, NULL, NULL, G_OBJECT (tp_file));
}
@@ -848,12 +846,12 @@ empathy_tp_file_is_incoming (EmpathyTpFile *tp_file)
return tp_file->priv->incoming;
}
-guint
+TpFileTransferState
empathy_tp_file_get_state (EmpathyTpFile *tp_file,
- guint *reason)
+ TpFileTransferStateChangeReason *reason)
{
g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file),
- EMP_FILE_TRANSFER_STATE_NONE);
+ TP_FILE_TRANSFER_STATE_NONE);
if (reason != NULL)
*reason = tp_file->priv->state_change_reason;
diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index 966663f90..42c54e4f0 100644
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -75,7 +75,8 @@ void empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile,
EmpathyContact *empathy_tp_file_get_contact (EmpathyTpFile *tp_file);
const gchar *empathy_tp_file_get_filename (EmpathyTpFile *tp_file);
gboolean empathy_tp_file_is_incoming (EmpathyTpFile *tp_file);
-guint empathy_tp_file_get_state (EmpathyTpFile *tp_file, guint *reason);
+TpFileTransferState empathy_tp_file_get_state (
+ EmpathyTpFile *tp_file, TpFileTransferStateChangeReason *reason);
guint64 empathy_tp_file_get_size (EmpathyTpFile *tp_file);
guint64 empathy_tp_file_get_transferred_bytes (EmpathyTpFile *tp_file);
gint empathy_tp_file_get_remaining_time (EmpathyTpFile *tp_file);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 02:52:27 +0800