#include <gio/gunixoutputstream.h>
#include <telepathy-glib/proxy-subclass.h>
+#include <telepathy-glib/util.h>
#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"
/* EmpathyTpFile object */
struct _EmpathyTpFilePriv {
- EmpathyContactFactory *factory;
+ EmpathyTpContactFactory *factory;
MissionControl *mc;
TpChannel *channel;
+ gboolean ready;
EmpathyContact *contact;
GInputStream *in_stream;
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;
+ GValue *socket_address;
GCancellable *cancellable;
};
PROP_CHANNEL,
PROP_STATE,
PROP_INCOMING,
+ PROP_READY,
PROP_FILENAME,
PROP_SIZE,
PROP_CONTENT_TYPE,
{
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");
}
}
if (tp_file->priv->channel)
{
- DEBUG ("Closing channel..");
g_signal_handlers_disconnect_by_func (tp_file->priv->channel,
tp_file_invalidated_cb, object);
- tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL,
- NULL, NULL);
g_object_unref (tp_file->priv->channel);
+ tp_file->priv->channel = NULL;
}
if (tp_file->priv->factory)
}
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);
tp_file_start_transfer (EmpathyTpFile *tp_file)
{
gint fd;
- size_t path_len;
struct sockaddr_un addr;
+ GArray *array;
fd = socket (PF_UNIX, SOCK_STREAM, 0);
if (fd < 0)
return;
}
+ array = g_value_get_boxed (tp_file->priv->socket_address);
+
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);
+ strncpy (addr.sun_path, array->data, array->len);
if (connect (fd, (struct sockaddr*) &addr, sizeof (addr)) < 0)
{
}
static void
-tp_file_state_changed_cb (TpProxy *proxy,
+tp_file_state_changed_cb (TpChannel *channel,
guint state,
guint reason,
gpointer user_data,
/* 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 &&
- tp_file->priv->unix_socket_path != NULL)
+ if (state == TP_FILE_TRANSFER_STATE_OPEN &&
+ tp_file->priv->socket_address != NULL)
tp_file_start_transfer (tp_file);
tp_file->priv->state = state;
}
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)
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 ();
-
- g_signal_connect (tp_file->priv->channel, "invalidated",
- G_CALLBACK (tp_file_invalidated_cb), tp_file);
+ 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), tp_file_state_changed_cb, NULL, NULL,
- G_OBJECT (tp_file), 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), tp_file_transferred_bytes_changed_cb,
- NULL, NULL, G_OBJECT (tp_file), 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");
- g_hash_table_destroy (properties);
- g_object_unref (account);
- g_value_unset (requested);
+ 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;
+
+ 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;
}
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;
{
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);
}
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 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 *) weak_object;
+ GArray *array;
if (error)
{
return;
}
- tp_file->priv->unix_socket_path = g_value_dup_string (address);
+ 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;
+
+ 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));
+
+ 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;
+ }
- DEBUG ("Got unix socket path: %s", tp_file->priv->unix_socket_path);
+ array = g_value_get_boxed (tp_file->priv->socket_address);
+ DEBUG ("Got unix socket path: %s", array->data);
- 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);
}
* @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,
if (error && *error)
return;
+ g_free (tp_file->priv->filename);
tp_file->priv->filename = g_file_get_basename (gfile);
g_object_notify (G_OBJECT (tp_file), "filename");
g_value_init (¬hing, G_TYPE_STRING);
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, NULL, NULL, G_OBJECT (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)
g_value_init (¬hing, G_TYPE_STRING);
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,
+ 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));
}
return tp_file->priv->incoming;
}
-EmpFileTransferState
+TpFileTransferState
empathy_tp_file_get_state (EmpathyTpFile *tp_file,
- EmpFileTransferStateChangeReason *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;
{
g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
- tp_cli_channel_call_close (tp_file->priv->channel, -1, NULL, NULL, NULL, NULL);
+ DEBUG ("Closing channel..");
+ tp_cli_channel_call_close (tp_file->priv->channel, -1,
+ NULL, NULL, NULL, NULL);
if (tp_file->priv->cancellable != NULL)
g_cancellable_cancel (tp_file->priv->cancellable);
}
+void
+empathy_tp_file_close (EmpathyTpFile *tp_file)
+{
+ empathy_tp_file_cancel (tp_file);
+}
+
+gboolean
+empathy_tp_file_is_ready (EmpathyTpFile *tp_file)
+{
+ g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), FALSE);
+
+ return tp_file->priv->ready;
+}
+
static void
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",
projects / empathy.git / blobdiff