#include <sys/socket.h>
#include <sys/un.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <gio/gio.h>
#include <gio/gunixinputstream.h>
#include "empathy-time.h"
#include "empathy-utils.h"
+#include "extensions/extensions.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_FT
#include "empathy-debug.h"
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;
{
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");
}
}
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_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)
}
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 &&
+ if (state == TP_FILE_TRANSFER_STATE_OPEN &&
tp_file->priv->unix_socket_path != NULL)
tp_file_start_transfer (tp_file);
}
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)
tp_file = EMPATHY_TP_FILE (file_obj);
- tp_file->priv->factory = empathy_contact_factory_new ();
- tp_file->priv->mc = empathy_mission_control_new ();
+ tp_file->priv->factory = empathy_contact_factory_dup_singleton ();
+ tp_file->priv->mc = empathy_mission_control_dup_singleton ();
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);
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);
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"));
{
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 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);
+
+ 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;
}
/**
}
static void
-tp_file_method_cb (TpProxy *proxy,
+tp_file_method_cb (TpChannel *channel,
const GValue *address,
const GError *error,
gpointer user_data,
tp_file->priv->unix_socket_path = g_value_dup_string (address);
DEBUG ("Got unix socket path: %s", tp_file->priv->unix_socket_path);
+
+ 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,
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;
return (gint) remaining_time;
}
+const gchar *
+empathy_tp_file_get_content_type (EmpathyTpFile *tp_file)
+{
+ g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
+ return tp_file->priv->content_type;
+}
+
void
empathy_tp_file_cancel (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);
+ 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);
+}
+
static void
empathy_tp_file_class_init (EmpathyTpFileClass *klass)
{
projects / empathy.git / blobdiff