X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy%2Fempathy-tp-file.c;h=41f319b314270acd2a23aa40f5c682789fe98d78;hp=377fa5bd395c3222200d2ad83944e075f97e8118;hb=b7498633ac98de869c86dd113027b059e1cdc691;hpb=dc95d64cc9cc83a2e499d667bad90e99c33dcf5e diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c index 377fa5bd..41f319b3 100644 --- a/libempathy/empathy-tp-file.c +++ b/libempathy/empathy-tp-file.c @@ -29,20 +29,23 @@ #include #include -#include +#include #include #include #include #include +#include #include "empathy-tp-file.h" -#include "empathy-contact-factory.h" +#include "empathy-tp-contact-factory.h" #include "empathy-marshal.h" #include "empathy-time.h" #include "empathy-utils.h" +#include "extensions/extensions.h" + #define DEBUG_FLAG EMPATHY_DEBUG_FT #include "empathy-debug.h" @@ -274,27 +277,29 @@ copy_stream (GInputStream *in, /* EmpathyTpFile object */ struct _EmpathyTpFilePriv { - EmpathyContactFactory *factory; - gchar *id; + EmpathyTpContactFactory *factory; MissionControl *mc; TpChannel *channel; + gboolean ready; EmpathyContact *contact; - GFile *gfile; GInputStream *in_stream; GOutputStream *out_stream; - gboolean incoming; + + /* org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties */ + TpFileTransferState state; + gchar *content_type; gchar *filename; - EmpFileTransferState state; - EmpFileTransferStateChangeReason state_change_reason; guint64 size; - guint64 transferred_bytes; - time_t start_time; - gchar *unix_socket_path; + TpFileHashType content_hash_type; gchar *content_hash; - EmpFileHashType content_hash_type; - gchar *content_type; gchar *description; + guint64 transferred_bytes; + + gboolean incoming; + TpFileTransferStateChangeReason state_change_reason; + time_t start_time; + GValue *socket_address; GCancellable *cancellable; }; @@ -303,6 +308,7 @@ enum { PROP_CHANNEL, PROP_STATE, PROP_INCOMING, + PROP_READY, PROP_FILENAME, PROP_SIZE, PROP_CONTENT_TYPE, @@ -325,30 +331,36 @@ empathy_tp_file_init (EmpathyTpFile *tp_file) } static void -tp_file_destroy_cb (TpChannel *file_channel, - EmpathyTpFile *tp_file) +tp_file_invalidated_cb (TpProxy *proxy, + guint domain, + gint code, + gchar *message, + EmpathyTpFile *tp_file) { - DEBUG ("Channel Closed or CM crashed"); + DEBUG ("Channel invalidated: %s", message); - g_object_unref (tp_file->priv->channel); - tp_file->priv->channel = NULL; + 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 = TP_FILE_TRANSFER_STATE_CANCELLED; + tp_file->priv->state_change_reason = + TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR; + g_object_notify (G_OBJECT (tp_file), "state"); + } } static void tp_file_finalize (GObject *object) { - EmpathyTpFile *tp_file; - - tp_file = EMPATHY_TP_FILE (object); + EmpathyTpFile *tp_file = EMPATHY_TP_FILE (object); if (tp_file->priv->channel) { - DEBUG ("Closing channel.."); g_signal_handlers_disconnect_by_func (tp_file->priv->channel, - tp_file_destroy_cb, object); - tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, - NULL, NULL); + tp_file_invalidated_cb, object); g_object_unref (tp_file->priv->channel); + tp_file->priv->channel = NULL; } if (tp_file->priv->factory) @@ -360,16 +372,13 @@ tp_file_finalize (GObject *object) g_object_unref (tp_file->priv->mc); } - g_free (tp_file->priv->id); g_free (tp_file->priv->filename); - g_free (tp_file->priv->unix_socket_path); + if (tp_file->priv->socket_address != NULL) + tp_g_value_slice_free (tp_file->priv->socket_address); g_free (tp_file->priv->description); g_free (tp_file->priv->content_hash); g_free (tp_file->priv->content_type); - if (tp_file->priv->gfile) - g_object_unref (tp_file->priv->gfile); - if (tp_file->priv->in_stream) g_object_unref (tp_file->priv->in_stream); @@ -386,119 +395,84 @@ tp_file_finalize (GObject *object) } static void -tp_file_closed_cb (TpChannel *file_channel, - EmpathyTpFile *tp_file, - GObject *weak_object) -{ - /* The channel is closed, do just like if the proxy was destroyed */ - g_signal_handlers_disconnect_by_func (tp_file->priv->channel, - tp_file_destroy_cb, - tp_file); - tp_file_destroy_cb (file_channel, tp_file); -} - -static gint -_get_local_socket (EmpathyTpFile *tp_file) +tp_file_start_transfer (EmpathyTpFile *tp_file) { gint fd; - size_t path_len; struct sockaddr_un addr; - - if (G_STR_EMPTY (tp_file->priv->unix_socket_path)) - return -1; + GArray *array; fd = socket (PF_UNIX, SOCK_STREAM, 0); if (fd < 0) - return -1; - - memset (&addr, 0, sizeof (addr)); - addr.sun_family = AF_UNIX; - path_len = strlen (tp_file->priv->unix_socket_path); - strncpy (addr.sun_path, tp_file->priv->unix_socket_path, path_len); - - if (connect (fd, (struct sockaddr*) &addr, - sizeof (addr)) < 0) { - close (fd); - return -1; + DEBUG ("Failed to create socket, closing channel"); + empathy_tp_file_cancel (tp_file); + return; } - return fd; -} - -static void -send_tp_file (EmpathyTpFile *tp_file) -{ - gint socket_fd; - GOutputStream *socket_stream; + array = g_value_get_boxed (tp_file->priv->socket_address); - DEBUG ("Sending file content: filename=%s", - tp_file->priv->filename); - - g_return_if_fail (tp_file->priv->in_stream); + memset (&addr, 0, sizeof (addr)); + addr.sun_family = AF_UNIX; + strncpy (addr.sun_path, array->data, array->len); - socket_fd = _get_local_socket (tp_file); - if (socket_fd < 0) + if (connect (fd, (struct sockaddr*) &addr, sizeof (addr)) < 0) { - DEBUG ("failed to get local socket fd"); + DEBUG ("Failed to connect socket, closing channel"); + empathy_tp_file_cancel (tp_file); + close (fd); return; } - DEBUG ("got local socket fd"); - socket_stream = g_unix_output_stream_new (socket_fd, TRUE); - tp_file->priv->cancellable = g_cancellable_new (); - - copy_stream (tp_file->priv->in_stream, socket_stream, - tp_file->priv->cancellable); - - g_object_unref (socket_stream); -} - -static void -receive_tp_file (EmpathyTpFile *tp_file) -{ - GInputStream *socket_stream; - gint socket_fd; - - socket_fd = _get_local_socket (tp_file); - - if (socket_fd < 0) - return; - - socket_stream = g_unix_input_stream_new (socket_fd, TRUE); + DEBUG ("Start the transfer"); + tp_file->priv->start_time = empathy_time_get_current (); tp_file->priv->cancellable = g_cancellable_new (); + if (tp_file->priv->incoming) + { + GInputStream *socket_stream; - copy_stream (socket_stream, tp_file->priv->out_stream, - tp_file->priv->cancellable); + socket_stream = g_unix_input_stream_new (fd, TRUE); + copy_stream (socket_stream, tp_file->priv->out_stream, + tp_file->priv->cancellable); + g_object_unref (socket_stream); + } + else + { + GOutputStream *socket_stream; - g_object_unref (socket_stream); + socket_stream = g_unix_output_stream_new (fd, TRUE); + copy_stream (tp_file->priv->in_stream, socket_stream, + tp_file->priv->cancellable); + g_object_unref (socket_stream); + } } static void -tp_file_state_changed_cb (DBusGProxy *tp_file_iface, - EmpFileTransferState state, - EmpFileTransferStateChangeReason reason, - EmpathyTpFile *tp_file) +tp_file_state_changed_cb (TpChannel *channel, + guint state, + guint reason, + gpointer user_data, + GObject *weak_object) { - DEBUG ("File transfer state changed: filename=%s, " - "old state=%u, state=%u, reason=%u", - tp_file->priv->filename, tp_file->priv->state, state, reason); + EmpathyTpFile *tp_file = EMPATHY_TP_FILE (weak_object); - if (state == EMP_FILE_TRANSFER_STATE_OPEN) - tp_file->priv->start_time = empathy_time_get_current (); + if (state == tp_file->priv->state) + return; - DEBUG ("state = %u, incoming = %s, in_stream = %s, out_stream = %s", - state, tp_file->priv->incoming ? "yes" : "no", + DEBUG ("File transfer state changed:\n" + "\tfilename = %s, old state = %u, state = %u, reason = %u\n" + "\tincoming = %s, in_stream = %s, out_stream = %s", + tp_file->priv->filename, tp_file->priv->state, state, reason, + tp_file->priv->incoming ? "yes" : "no", tp_file->priv->in_stream ? "present" : "not present", tp_file->priv->out_stream ? "present" : "not present"); - if (state == EMP_FILE_TRANSFER_STATE_OPEN && !tp_file->priv->incoming && - tp_file->priv->in_stream) - send_tp_file (tp_file); - else if (state == EMP_FILE_TRANSFER_STATE_OPEN && tp_file->priv->incoming && - tp_file->priv->out_stream) - receive_tp_file (tp_file); + /* 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 == TP_FILE_TRANSFER_STATE_OPEN && + tp_file->priv->socket_address != NULL) + tp_file_start_transfer (tp_file); tp_file->priv->state = state; tp_file->priv->state_change_reason = reason; @@ -507,96 +481,168 @@ tp_file_state_changed_cb (DBusGProxy *tp_file_iface, } static void -tp_file_transferred_bytes_changed_cb (TpProxy *proxy, +tp_file_transferred_bytes_changed_cb (TpChannel *channel, guint64 count, - EmpathyTpFile *tp_file, + gpointer user_data, GObject *weak_object) { + EmpathyTpFile *tp_file = EMPATHY_TP_FILE (weak_object); + if (tp_file->priv->transferred_bytes == count) return; tp_file->priv->transferred_bytes = count; - g_object_notify (G_OBJECT (tp_file), "transferred-bytes"); } -static GObject * -tp_file_constructor (GType type, - guint n_props, - GObjectConstructParam *props) +static void +tp_file_check_if_ready (EmpathyTpFile *tp_file) { - GObject *file_obj; - EmpathyTpFile *tp_file; - TpHandle handle; - GHashTable *properties; - McAccount *account; - GValue *requested; - - file_obj = G_OBJECT_CLASS (empathy_tp_file_parent_class)->constructor (type, - n_props, props); - - tp_file = EMPATHY_TP_FILE (file_obj); - - tp_file->priv->factory = empathy_contact_factory_new (); - tp_file->priv->mc = empathy_mission_control_new (); - - tp_cli_channel_connect_to_closed (tp_file->priv->channel, - (tp_cli_channel_signal_callback_closed) tp_file_closed_cb, - tp_file, - NULL, NULL, NULL); + if (tp_file->priv->ready || tp_file->priv->contact == NULL || + tp_file->priv->state == 0) + return; - emp_cli_channel_type_file_transfer_connect_to_file_transfer_state_changed ( - TP_PROXY (tp_file->priv->channel), - (emp_cli_channel_type_file_transfer_signal_callback_file_transfer_state_changed) - tp_file_state_changed_cb, - tp_file, - NULL, NULL, NULL); + tp_file->priv->ready = TRUE; + g_object_notify (G_OBJECT (tp_file), "ready"); +} - emp_cli_channel_type_file_transfer_connect_to_transferred_bytes_changed ( - TP_PROXY (tp_file->priv->channel), - (emp_cli_channel_type_file_transfer_signal_callback_transferred_bytes_changed) - tp_file_transferred_bytes_changed_cb, - tp_file, - NULL, NULL, NULL); +static void +tp_file_got_contact_cb (EmpathyTpContactFactory *factory, + EmpathyContact *contact, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + EmpathyTpFile *tp_file = EMPATHY_TP_FILE (weak_object); - account = empathy_channel_get_account (tp_file->priv->channel); + if (error) + { + DEBUG ("Error: %s", error->message); + empathy_tp_file_close (tp_file); + return; + } - handle = tp_channel_get_handle (tp_file->priv->channel, NULL); - tp_file->priv->contact = empathy_contact_factory_get_from_handle ( - tp_file->priv->factory, account, (guint) handle); + tp_file->priv->contact = g_object_ref (contact); + tp_file_check_if_ready (tp_file); +} - tp_cli_dbus_properties_run_get_all (tp_file->priv->channel, - -1, EMP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, &properties, NULL, NULL); +static void +tp_file_get_all_cb (TpProxy *proxy, + GHashTable *properties, + const GError *error, + gpointer user_data, + GObject *file_obj) +{ + EmpathyTpFile *tp_file = EMPATHY_TP_FILE (file_obj); - tp_cli_dbus_properties_run_get (tp_file->priv->channel, - -1, TP_IFACE_CHANNEL, "Requested", &requested, NULL, NULL); + if (error) + { + DEBUG ("Error: %s", error->message); + tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, + NULL); + return; + } tp_file->priv->size = g_value_get_uint64 ( g_hash_table_lookup (properties, "Size")); + g_object_notify (file_obj, "size"); tp_file->priv->state = g_value_get_uint ( g_hash_table_lookup (properties, "State")); - - tp_file->priv->state_change_reason = - EMP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE; + g_object_notify (file_obj, "state"); tp_file->priv->transferred_bytes = g_value_get_uint64 ( g_hash_table_lookup (properties, "TransferredBytes")); + g_object_notify (file_obj, "transferred-bytes"); tp_file->priv->filename = g_value_dup_string ( g_hash_table_lookup (properties, "Filename")); + g_object_notify (file_obj, "filename"); tp_file->priv->content_hash = g_value_dup_string ( g_hash_table_lookup (properties, "ContentHash")); + g_object_notify (file_obj, "content-hash"); + + tp_file->priv->content_hash_type = g_value_get_uint ( + g_hash_table_lookup (properties, "ContentHashType")); + g_object_notify (file_obj, "content-hash-type"); + + tp_file->priv->content_type = g_value_dup_string ( + g_hash_table_lookup (properties, "ContentType")); + g_object_notify (file_obj, "content-type"); tp_file->priv->description = g_value_dup_string ( g_hash_table_lookup (properties, "Description")); + tp_file_check_if_ready (tp_file); +} + +static void +tp_file_get_requested_cb (TpProxy *proxy, + const GValue *requested, + const GError *error, + gpointer user_data, + GObject *weak_object) +{ + EmpathyTpFile *tp_file = EMPATHY_TP_FILE (weak_object); + + if (error) + { + DEBUG ("Error: %s", error->message); + tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, + NULL); + return; + } + tp_file->priv->incoming = !g_value_get_boolean (requested); + g_object_notify (G_OBJECT (tp_file), "incoming"); + + tp_file_check_if_ready (tp_file); +} + +static GObject * +tp_file_constructor (GType type, + guint n_props, + GObjectConstructParam *props) +{ + GObject *file_obj; + EmpathyTpFile *tp_file; + TpHandle handle; + TpConnection *connection; - g_hash_table_destroy (properties); - g_object_unref (account); - g_value_unset (requested); + file_obj = G_OBJECT_CLASS (empathy_tp_file_parent_class)->constructor (type, + n_props, props); + + tp_file = EMPATHY_TP_FILE (file_obj); + + connection = tp_channel_borrow_connection (tp_file->priv->channel); + tp_file->priv->factory = empathy_tp_contact_factory_dup_singleton (connection); + tp_file->priv->mc = empathy_mission_control_dup_singleton (); + tp_file->priv->state_change_reason = + TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE; + + g_signal_connect (tp_file->priv->channel, "invalidated", + G_CALLBACK (tp_file_invalidated_cb), tp_file); + + 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); + + 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); + + tp_cli_dbus_properties_call_get (tp_file->priv->channel, -1, + TP_IFACE_CHANNEL, "Requested", + tp_file_get_requested_cb, NULL, NULL, file_obj); + + tp_cli_dbus_properties_call_get_all (tp_file->priv->channel, -1, + TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, + tp_file_get_all_cb, NULL, NULL, file_obj); + + handle = tp_channel_get_handle (tp_file->priv->channel, NULL); + empathy_tp_contact_factory_get_from_handle (tp_file->priv->factory, + handle, tp_file_got_contact_cb, NULL, NULL, file_obj); return file_obj; } @@ -616,6 +662,33 @@ tp_file_get_property (GObject *object, case PROP_CHANNEL: g_value_set_object (value, tp_file->priv->channel); break; + case PROP_INCOMING: + g_value_set_boolean (value, tp_file->priv->incoming); + break; + case PROP_STATE: + g_value_set_uint (value, tp_file->priv->state); + break; + case PROP_CONTENT_TYPE: + g_value_set_string (value, tp_file->priv->content_type); + break; + case PROP_FILENAME: + g_value_set_string (value, tp_file->priv->filename); + break; + case PROP_SIZE: + g_value_set_uint64 (value, tp_file->priv->size); + break; + case PROP_CONTENT_HASH_TYPE: + g_value_set_uint (value, tp_file->priv->content_hash_type); + break; + case PROP_CONTENT_HASH: + g_value_set_string (value, tp_file->priv->content_hash); + break; + case PROP_TRANSFERRED_BYTES: + g_value_set_uint64 (value, tp_file->priv->transferred_bytes); + break; + case PROP_READY: + g_value_set_boolean (value, tp_file->priv->ready); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; @@ -629,11 +702,10 @@ 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); } - static void tp_file_set_property (GObject *object, guint param_id, @@ -675,44 +747,59 @@ tp_file_set_property (GObject *object, g_free (tp_file->priv->content_hash); tp_file->priv->content_hash = g_value_dup_string (value); break; + case PROP_READY: + tp_file->priv->ready = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); break; }; } +static GHashTable *ft_table = NULL; + +static void +tp_file_weak_notify_cb (gpointer channel, + GObject *tp_file) +{ + g_hash_table_remove (ft_table, channel); +} + /** * empathy_tp_file_new: * @channel: a Telepathy channel * - * Creates a new #EmpathyTpFile wrapping @channel. + * Creates a new #EmpathyTpFile wrapping @channel, or return a new ref to an + * existing #EmpathyTpFile for that channel. * * Returns: a new #EmpathyTpFile */ EmpathyTpFile * empathy_tp_file_new (TpChannel *channel) { + EmpathyTpFile *tp_file; + g_return_val_if_fail (TP_IS_CHANNEL (channel), NULL); - return g_object_new (EMPATHY_TYPE_TP_FILE, + if (ft_table != NULL) + { + tp_file = g_hash_table_lookup (ft_table, channel); + if (tp_file != NULL) { + return g_object_ref (tp_file); + } + } + else + ft_table = g_hash_table_new_full (empathy_proxy_hash, + empathy_proxy_equal, (GDestroyNotify) g_object_unref, NULL); + + tp_file = g_object_new (EMPATHY_TYPE_TP_FILE, "channel", channel, NULL); -} -/** - * empathy_tp_file_get_id: - * @tp_file: an #EmpathyTpFile - * - * Returns the ID of @tp_file. - * - * Returns: the ID - */ -const gchar * -empathy_tp_file_get_id (EmpathyTpFile *tp_file) -{ - g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL); + g_hash_table_insert (ft_table, g_object_ref (channel), tp_file); + g_object_weak_ref (G_OBJECT (tp_file), tp_file_weak_notify_cb, channel); - return tp_file->priv->id; + return tp_file; } /** @@ -732,78 +819,122 @@ 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, GObject *weak_object) { - EmpathyTpFile *tp_file = (EmpathyTpFile *) user_data; + EmpathyTpFile *tp_file = (EmpathyTpFile *) weak_object; + GArray *array; if (error) { DEBUG ("Error: %s", error->message); + empathy_tp_file_cancel (tp_file); return; } - if (tp_file->priv->unix_socket_path) - g_free (tp_file->priv->unix_socket_path); + if (G_VALUE_TYPE (address) == DBUS_TYPE_G_UCHAR_ARRAY) + { + tp_file->priv->socket_address = tp_g_value_slice_dup (address); + } + else if (G_VALUE_TYPE (address) == G_TYPE_STRING) + { + /* Old bugged version of telepathy-salut used to store the address + * as a 's' instead of an 'ay' */ + const gchar *path; - tp_file->priv->unix_socket_path = g_value_dup_string (address); + path = g_value_get_string (address); + array = g_array_sized_new (TRUE, FALSE, sizeof (gchar), strlen (path)); + g_array_insert_vals (array, 0, path, strlen (path)); - DEBUG ("Got unix socket path: %s", tp_file->priv->unix_socket_path); -} + tp_file->priv->socket_address = tp_g_value_slice_new ( + DBUS_TYPE_G_UCHAR_ARRAY); + g_value_set_boxed (tp_file->priv->socket_address, array); + g_array_free (array, TRUE); + } + else + { + DEBUG ("Wrong address type: %s", G_VALUE_TYPE_NAME (address)); + empathy_tp_file_cancel (tp_file); + return; + } + + array = g_value_get_boxed (tp_file->priv->socket_address); + DEBUG ("Got unix socket path: %s", array->data); + + if (tp_file->priv->state == TP_FILE_TRANSFER_STATE_OPEN) + tp_file_start_transfer (tp_file); +} /** * empathy_tp_file_accept: * @tp_file: an #EmpathyTpFile + * @offset: position where to start the transfer + * @gfile: a #GFile where to write transfered data + * @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, - guint64 offset) + guint64 offset, + GFile *gfile, + GError **error) { GValue nothing = { 0 }; g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file)); + g_return_if_fail (G_IS_FILE (gfile)); + + tp_file->priv->out_stream = G_OUTPUT_STREAM (g_file_replace (gfile, NULL, + FALSE, 0, NULL, error)); + if (error && *error) + return; - g_return_if_fail (tp_file->priv->out_stream != NULL); + g_free (tp_file->priv->filename); + tp_file->priv->filename = g_file_get_basename (gfile); + g_object_notify (G_OBJECT (tp_file), "filename"); DEBUG ("Accepting file: filename=%s", tp_file->priv->filename); g_value_init (¬hing, G_TYPE_STRING); - g_value_set_string (¬hing, ""); + g_value_set_static_string (¬hing, ""); - 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, - ¬hing, offset, tp_file_method_cb, tp_file, NULL, NULL); + ¬hing, offset, tp_file_method_cb, NULL, NULL, G_OBJECT (tp_file)); } /** * empathy_tp_file_offer: * @tp_file: an #EmpathyTpFile + * @gfile: a #GFile where to read the data to transfer + * @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) +empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile, GError **error) { GValue nothing = { 0 }; g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file)); + tp_file->priv->in_stream = G_INPUT_STREAM (g_file_read (gfile, NULL, error)); + if (error && *error) + return; + g_value_init (¬hing, G_TYPE_STRING); - g_value_set_string (¬hing, ""); + g_value_set_static_string (¬hing, ""); - 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, - ¬hing, tp_file_method_cb, tp_file, NULL, NULL); + tp_cli_channel_type_file_transfer_call_provide_file (tp_file->priv->channel, + -1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST, + ¬hing, tp_file_method_cb, NULL, NULL, G_OBJECT (tp_file)); } EmpathyContact * @@ -813,13 +944,6 @@ empathy_tp_file_get_contact (EmpathyTpFile *tp_file) return tp_file->priv->contact; } -GFile * -empathy_tp_file_get_gfile (EmpathyTpFile *tp_file) -{ - g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL); - return g_object_ref (tp_file->priv->gfile); -} - const gchar * empathy_tp_file_get_filename (EmpathyTpFile *tp_file) { @@ -828,27 +952,23 @@ empathy_tp_file_get_filename (EmpathyTpFile *tp_file) } gboolean -empathy_tp_file_get_incoming (EmpathyTpFile *tp_file) +empathy_tp_file_is_incoming (EmpathyTpFile *tp_file) { g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), FALSE); return tp_file->priv->incoming; } -EmpFileTransferState -empathy_tp_file_get_state (EmpathyTpFile *tp_file) +TpFileTransferState +empathy_tp_file_get_state (EmpathyTpFile *tp_file, + TpFileTransferStateChangeReason *reason) { g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), - EMP_FILE_TRANSFER_STATE_NONE); - return tp_file->priv->state; -} + TP_FILE_TRANSFER_STATE_NONE); -EmpFileTransferStateChangeReason -empathy_tp_file_get_state_change_reason (EmpathyTpFile *tp_file) -{ - g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), - EMP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE); + if (reason != NULL) + *reason = tp_file->priv->state_change_reason; - return tp_file->priv->state_change_reason; + return tp_file->priv->state; } guint64 @@ -891,81 +1011,38 @@ empathy_tp_file_get_remaining_time (EmpathyTpFile *tp_file) return (gint) remaining_time; } -void -empathy_tp_file_cancel (EmpathyTpFile *tp_file) +const gchar * +empathy_tp_file_get_content_type (EmpathyTpFile *tp_file) { - g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file)); - - tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL); - - g_cancellable_cancel (tp_file->priv->cancellable); + g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL); + return tp_file->priv->content_type; } void -empathy_tp_file_set_gfile (EmpathyTpFile *tp_file, - GFile *gfile, - GError **error) +empathy_tp_file_cancel (EmpathyTpFile *tp_file) { g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file)); - g_return_if_fail (gfile); - - if (tp_file->priv->gfile == gfile) - return; - - tp_file->priv->gfile = g_object_ref (gfile); - - if (!tp_file->priv->incoming) - { - GInputStream *in_stream; - in_stream = G_INPUT_STREAM (g_file_read (gfile, NULL, NULL)); + DEBUG ("Closing channel.."); + tp_cli_channel_call_close (tp_file->priv->channel, -1, + NULL, NULL, NULL, NULL); - if (tp_file->priv->in_stream) - g_object_unref (tp_file->priv->in_stream); - - tp_file->priv->in_stream = g_object_ref (in_stream); - } - else - { - GOutputStream *out_stream; - gchar *filename; - - out_stream = G_OUTPUT_STREAM (g_file_replace (gfile, NULL, FALSE, - 0, NULL, error)); - - if (*error) - return; - - if (tp_file->priv->out_stream == out_stream) - return; - - if (tp_file->priv->out_stream) - g_object_unref (tp_file->priv->out_stream); - - tp_file->priv->out_stream = g_object_ref (out_stream); - - filename = g_file_get_basename (gfile); - empathy_tp_file_set_filename (tp_file, filename); - - g_free (filename); - } + if (tp_file->priv->cancellable != NULL) + g_cancellable_cancel (tp_file->priv->cancellable); } void -empathy_tp_file_set_filename (EmpathyTpFile *tp_file, - const gchar *filename) +empathy_tp_file_close (EmpathyTpFile *tp_file) { - g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file)); - g_return_if_fail (filename != NULL); - - if (tp_file->priv->filename && strcmp (filename, - tp_file->priv->filename) == 0) - return; + empathy_tp_file_cancel (tp_file); +} - g_free (tp_file->priv->filename); - tp_file->priv->filename = g_strdup (filename); +gboolean +empathy_tp_file_is_ready (EmpathyTpFile *tp_file) +{ + g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), FALSE); - g_object_notify (G_OBJECT (tp_file), "filename"); + return tp_file->priv->ready; } static void @@ -1008,6 +1085,15 @@ empathy_tp_file_class_init (EmpathyTpFileClass *klass) G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, + PROP_READY, + g_param_spec_boolean ("ready", + "ready", + "Whether the object is ready", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, PROP_FILENAME, g_param_spec_string ("filename", @@ -1064,3 +1150,4 @@ empathy_tp_file_class_init (EmpathyTpFileClass *klass) g_type_class_add_private (object_class, sizeof (EmpathyTpFilePriv)); } +