#include "empathy-ft-manager.h"
-#include "extensions/extensions.h"
-
-/**
- * SECTION:empathy-ft-manager
- * @short_description: File transfer dialog
- * @see_also: #EmpathyTpFile, empathy_dispatcher_send_file()
- * @include: libempthy-gtk/empathy-ft-manager.h
- *
- * The #EmpathyFTManager object represents the file transfer dialog,
- * it can show multiple file transfers at the same time (added
- * with empathy_ft_manager_add_tp_file()).
- */
-
enum
{
COL_PERCENT,
COL_FT_OBJECT
};
-/**
- * EmpathyFTManagerPriv:
- *
- * Private fields of the #EmpathyFTManager class.
- */
typedef struct {
GtkTreeModel *model;
GHashTable *ft_handler_to_row_ref;
- GHashTable *cancellable_refs;
/* Widgets */
GtkWidget *window;
GtkWidget *treeview;
GtkWidget *open_button;
GtkWidget *abort_button;
+ GtkWidget *clear_button;
guint save_geometry_id;
} EmpathyFTManagerPriv;
static EmpathyFTManager *manager_singleton = NULL;
+static void ft_handler_hashing_started_cb (EmpathyFTHandler *handler,
+ EmpathyFTManager *manager);
+
static gchar *
-ft_manager_format_interval (gint interval)
+ft_manager_format_interval (guint interval)
{
gint hours, mins, secs;
}
static void
-ft_manager_update_buttons (EmpathyFTManager *ft_manager)
+ft_manager_update_buttons (EmpathyFTManager *manager)
{
GtkTreeSelection *selection;
GtkTreeModel *model;
GtkTreeIter iter;
- EmpathyTpFile *tp_file;
- TpFileTransferState state;
+ EmpathyFTHandler *handler;
gboolean open_enabled = FALSE;
gboolean abort_enabled = FALSE;
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ gboolean clear_enabled = FALSE;
+ gboolean is_completed, is_cancelled;
+ GHashTableIter hash_iter;
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (gtk_tree_selection_get_selected (selection, &model, &iter))
{
- gtk_tree_model_get (model, &iter, COL_FT_OBJECT, &tp_file, -1);
- state = empathy_tp_file_get_state (tp_file, NULL);
+ gtk_tree_model_get (model, &iter, COL_FT_OBJECT, &handler, -1);
+
+ is_completed = empathy_ft_handler_is_completed (handler);
+ is_cancelled = empathy_ft_handler_is_cancelled (handler);
/* I can open the file if the transfer is completed and was incoming */
- open_enabled = (state == TP_FILE_TRANSFER_STATE_COMPLETED &&
- empathy_tp_file_is_incoming (tp_file));
+ open_enabled = (is_completed && empathy_ft_handler_is_incoming (handler));
/* I can abort if the transfer is not already finished */
- abort_enabled = (state != TP_FILE_TRANSFER_STATE_CANCELLED &&
- state != TP_FILE_TRANSFER_STATE_COMPLETED);
+ abort_enabled = (is_cancelled == FALSE && is_completed == FALSE);
- g_object_unref (tp_file);
+ g_object_unref (handler);
}
- gtk_widget_set_sensitive (priv->open_button, open_enabled);
- gtk_widget_set_sensitive (priv->abort_button, abort_enabled);
-}
+ g_hash_table_iter_init (&hash_iter, priv->ft_handler_to_row_ref);
-static const gchar *
-ft_manager_state_change_reason_to_string (TpFileTransferStateChangeReason reason)
-{
- switch (reason)
+ while (g_hash_table_iter_next (&hash_iter, (gpointer *) &handler, NULL))
{
- case TP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE:
- return _("No reason was specified");
- case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REQUESTED:
- return _("The change in state was requested");
- case TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_STOPPED:
- return _("You canceled the file transfer");
- case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_STOPPED:
- return _("The other participant canceled the file transfer");
- case TP_FILE_TRANSFER_STATE_CHANGE_REASON_LOCAL_ERROR:
- return _("Error while trying to transfer the file");
- case TP_FILE_TRANSFER_STATE_CHANGE_REASON_REMOTE_ERROR:
- return _("The other participant is unable to transfer the file");
+ if (empathy_ft_handler_is_completed (handler) ||
+ empathy_ft_handler_is_cancelled (handler))
+ clear_enabled = TRUE;
+
+ if (clear_enabled)
+ break;
}
- return _("Unknown reason");
-}
-static void
-ft_manager_transferred_bytes_changed_cb (EmpathyTpFile *tp_file,
- GParamSpec *pspec,
- EmpathyFTManager *ft_manager)
-{
- ft_manager_update_ft_row (ft_manager, tp_file);
+ gtk_widget_set_sensitive (priv->open_button, open_enabled);
+ gtk_widget_set_sensitive (priv->abort_button, abort_enabled);
+
+ if (clear_enabled)
+ gtk_widget_set_sensitive (priv->clear_button, TRUE);
}
static void
ft_manager_selection_changed (GtkTreeSelection *selection,
- EmpathyFTManager *ft_manager)
+ EmpathyFTManager *manager)
{
- ft_manager_update_buttons (ft_manager);
+ ft_manager_update_buttons (manager);
}
static void
g_object_set (renderer, "text", text, "value", percent, NULL);
}
+static GtkTreeRowReference *
+ft_manager_get_row_from_handler (EmpathyFTManager *manager,
+ EmpathyFTHandler *handler)
+{
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
+ return g_hash_table_lookup (priv->ft_handler_to_row_ref, handler);
+}
+
static void
-ft_manager_remove_file_from_model (EmpathyFTManager *ft_manager,
- EmpathyTpFile *tp_file)
+ft_manager_remove_file_from_model (EmpathyFTManager *manager,
+ EmpathyFTHandler *handler)
{
GtkTreeRowReference *row_ref;
GtkTreeSelection *selection;
GtkTreePath *path = NULL;
GtkTreeIter iter;
gboolean update_selection;
- EmpathyFTManager *priv = GET_PRIV (ft_manager);
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
- row_ref = ft_manager_get_row_from_tp_file (ft_manager, tp_file);
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
g_return_if_fail (row_ref);
DEBUG ("Removing file transfer from window: contact=%s, filename=%s",
- empathy_contact_get_name (empathy_tp_file_get_contact (tp_file)),
- empathy_tp_file_get_filename (tp_file));
+ empathy_contact_get_name (empathy_ft_handler_get_contact (handler)),
+ empathy_ft_handler_get_filename (handler));
/* Get the iter from the row_ref */
path = gtk_tree_row_reference_get_path (row_ref);
if (update_selection)
gtk_tree_selection_select_iter (selection, &iter);
-
- empathy_tp_file_close (tp_file);
-}
-
-static void
-ft_manager_state_changed_cb (EmpathyTpFile *tp_file,
- GParamSpec *pspec,
- EmpathyFTManager *ft_manager)
-{
- if (empathy_tp_file_get_state (tp_file, NULL) ==
- EMP_FILE_TRANSFER_STATE_COMPLETED)
- {
- GtkRecentManager *manager;
- const gchar *uri;
-
- manager = gtk_recent_manager_get_default ();
- uri = g_object_get_data (G_OBJECT (tp_file), "uri");
- if (uri != NULL)
- gtk_recent_manager_add_item (manager, uri);
- }
-
- ft_manager_update_ft_row (ft_manager, tp_file);
}
static gboolean
{
EmpathyFTHandler *handler = key;
EmpathyFTManager *manager = user_data;
- EmpFileTransferState state;
- state = empathy_ft_handler_get_state (handler);
- if (state == EMP_FILE_TRANSFER_STATE_COMPLETED ||
- state == EMP_FILE_TRANSFER_STATE_CANCELLED)
+ if (empathy_ft_handler_is_completed (handler) ||
+ empathy_ft_handler_is_cancelled (handler))
{
ft_manager_remove_file_from_model (manager, handler);
return TRUE;
return FALSE;
}
-static GtkTreeRowReference *
-ft_manager_get_row_from_tp_file (EmpathyFTManager *ft_manager,
- EmpathyFTHandler *handler)
+static gchar *
+ft_manager_format_progress_bytes_and_percentage (guint64 current,
+ guint64 total,
+ gdouble speed,
+ int *percentage)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ char *total_str, *current_str, *retval;
+ char *speed_str = NULL;
+
+ total_str = g_format_size_for_display (total);
+ current_str = g_format_size_for_display (current);
+
+ if (speed > 0)
+ speed_str = g_format_size_for_display ((goffset) speed);
+
+ /* translators: first %s is the currently processed size, second %s is
+ * the total file size */
+ retval = speed_str ?
+ g_strdup_printf (_("%s of %s at %s/s"), current_str, total_str, speed_str) :
+ g_strdup_printf (_("%s of %s"), current_str, total_str);
- return g_hash_table_lookup (priv->ft_handler_to_row_ref, tp_file);
+ g_free (total_str);
+ g_free (current_str);
+ g_free (speed_str);
+
+ if (percentage != NULL)
+ {
+ if (total != 0)
+ *percentage = current * 100 / total;
+ else
+ *percentage = -1;
+ }
+
+ return retval;
}
-static void
-ft_manager_update_handler_row (EmpathyFTManager *ft_manager,
- EmpathyFTHandler *handler)
+static gchar *
+ft_manager_format_contact_info (EmpathyFTHandler *handler)
{
- GtkTreeRowReference *row_ref;
- GtkTreePath *path;
- GtkTreeIter iter;
- const gchar *filename;
- const gchar *contact_name;
- const gchar *msg;
- gchar *msg_dup = NULL;
- gchar *remaining_str = NULL;
- gchar *first_line_format;
- gchar *first_line = NULL;
- gchar *second_line = NULL;
- guint64 transferred_bytes;
- guint64 total_size;
- gint remaining = -1;
- gint percent;
- TpFileTransferState state;
- TpFileTransferStateChangeReason reason;
gboolean incoming;
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ const char *filename, *contact_name, *first_line_format;
+ char *retval;
- row_ref = ft_manager_get_row_from_handler (ft_manager, handler);
- g_return_if_fail (row_ref != NULL);
-
- filename = empathy_ft_handler_get_filename (handler);
+ incoming = empathy_ft_handler_is_incoming (handler);
contact_name = empathy_contact_get_name
(empathy_ft_handler_get_contact (handler));
- transferred_bytes = empathy_ft_handler_get_transferred_bytes (handler);
- total_size = empathy_tp_file_get_size (tp_file);
- state = empathy_tp_file_get_state (tp_file, &reason);
- incoming = empathy_tp_file_is_incoming (tp_file);
- speed = empathy_tp_file_get_speed (tp_file);
+ filename = empathy_ft_handler_get_filename (handler);
- switch (state)
- {
- case TP_FILE_TRANSFER_STATE_NONE:
- /* This should never happen, the CM is broken. But we avoid warning
- * because it's not our fault. */
- DEBUG ("State is NONE, probably a broken CM");
- break;
- case TP_FILE_TRANSFER_STATE_PENDING:
- case TP_FILE_TRANSFER_STATE_OPEN:
- case TP_FILE_TRANSFER_STATE_ACCEPTED:
- if (incoming)
- /* translators: first %s is filename, second %s is the contact name */
- first_line_format = _("Receiving \"%s\" from %s");
- else
- /* translators: first %s is filename, second %s is the contact name */
- first_line_format = _("Sending \"%s\" to %s");
-
- first_line = g_strdup_printf (first_line_format, filename, contact_name);
-
- if (state == TP_FILE_TRANSFER_STATE_OPEN || incoming)
- {
- gchar *total_size_str;
- gchar *transferred_bytes_str;
- gchar *speed_str;
-
- if (total_size == EMPATHY_TP_FILE_UNKNOWN_SIZE)
- total_size_str = g_strdup (C_("file size", "Unknown"));
- else
- total_size_str = g_format_size_for_display (total_size);
-
- transferred_bytes_str = g_format_size_for_display (transferred_bytes);
- speed_str = g_format_size_for_display (speed);
-
- /* translators: first %s is the transferred size, second %s is
- * the total file size */
- second_line = g_strdup_printf (_("%s of %s at %s/s"),
- transferred_bytes_str, total_size_str, speed_str);
- g_free (transferred_bytes_str);
- g_free (total_size_str);
- g_free (speed_str);
-
- }
- else
- second_line = g_strdup (_("Waiting for the other participant's response"));
-
- remaining = empathy_tp_file_get_remaining_time (tp_file);
- break;
-
- case TP_FILE_TRANSFER_STATE_COMPLETED:
- if (incoming)
- /* translators: first %s is filename, second %s
- * is the contact name */
- first_line = g_strdup_printf (
- _("\"%s\" received from %s"), filename,
- contact_name);
- else
- /* translators: first %s is filename, second %s
- * is the contact name */
- first_line = g_strdup_printf (
- _("\"%s\" sent to %s"), filename,
- contact_name);
-
- second_line = g_strdup (_("File transfer completed"));
-
- break;
-
- case TP_FILE_TRANSFER_STATE_CANCELLED:
- if (incoming)
- /* translators: first %s is filename, second %s
- * is the contact name */
- first_line = g_strdup_printf (
- _("\"%s\" receiving from %s"), filename,
- contact_name);
- else
- /* translators: first %s is filename, second %s
- * is the contact name */
- first_line = g_strdup_printf (
- _("\"%s\" sending to %s"), filename,
- contact_name);
+ if (incoming)
+ /* translators: first %s is filename, second %s is the contact name */
+ first_line_format = _("Receiving \"%s\" from %s");
+ else
+ /* translators: first %s is filename, second %s is the contact name */
+ first_line_format = _("Sending \"%s\" to %s");
- second_line = g_strdup_printf (_("File transfer canceled: %s"),
- ft_manager_state_change_reason_to_string (reason));
+ retval = g_strdup_printf (first_line_format, filename, contact_name);
- break;
- }
+ return retval;
+}
- if (total_size != EMPATHY_TP_FILE_UNKNOWN_SIZE && total_size != 0)
- percent = transferred_bytes * 100 / total_size;
- else
- percent = -1;
+static gchar *
+ft_manager_format_error_message (EmpathyFTHandler *handler,
+ const GError *error)
+{
+ const char *contact_name, *filename;
+ EmpathyContact *contact;
+ char *first_line, *message;
+ gboolean incoming;
- if (remaining < 0)
- {
- if (state == TP_FILE_TRANSFER_STATE_OPEN)
- remaining_str = g_strdup (C_("remaining time", "Stalled"));
- else if (state != TP_FILE_TRANSFER_STATE_COMPLETED &&
- state != TP_FILE_TRANSFER_STATE_CANCELLED)
- remaining_str = g_strdup (C_("remaining time", "Unknown"));
- }
- else
- remaining_str = ft_manager_format_interval (remaining);
+ contact_name = NULL;
+ incoming = empathy_ft_handler_is_incoming (handler);
+
+ contact = empathy_ft_handler_get_contact (handler);
+ if (contact)
+ contact_name = empathy_contact_get_name (contact);
- if (first_line != NULL && second_line != NULL)
- msg = msg_dup = g_strdup_printf ("%s\n%s", first_line, second_line);
+ filename = empathy_ft_handler_get_filename (handler);
+
+ if (incoming)
+ /* filename/contact_name here are either both NULL or both valid */
+ if (filename && contact_name)
+ /* translators: first %s is filename, second %s
+ * is the contact name */
+ first_line = g_strdup_printf (_("Error receiving \"%s\" from %s"), filename,
+ contact_name);
+ else
+ first_line = g_strdup (_("Error receiving a file"));
else
- msg = first_line ? first_line : second_line;
+ /* translators: first %s is filename, second %s
+ * is the contact name */
+ if (filename && contact_name)
+ first_line = g_strdup_printf (_("Error sending \"%s\" to %s"), filename,
+ contact_name);
+ else
+ first_line = g_strdup (_("Error sending a file"));
+
+ message = g_strdup_printf ("%s\n%s", first_line, error->message);
+
+ g_free (first_line);
+
+ return message;
+}
+
+static void
+ft_manager_update_handler_message (EmpathyFTManager *manager,
+ GtkTreeRowReference *row_ref,
+ const char *message)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
+ /* Set new value in the store */
+ path = gtk_tree_row_reference_get_path (row_ref);
+ gtk_tree_model_get_iter (priv->model, &iter, path);
+ gtk_list_store_set (GTK_LIST_STORE (priv->model),
+ &iter,
+ COL_MESSAGE, message ? message : "",
+ -1);
- /* Set new values in the store */
+ gtk_tree_path_free (path);
+}
+
+static void
+ft_manager_update_handler_progress (EmpathyFTManager *manager,
+ GtkTreeRowReference *row_ref,
+ int percentage)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
+ /* Set new value in the store */
path = gtk_tree_row_reference_get_path (row_ref);
gtk_tree_model_get_iter (priv->model, &iter, path);
gtk_list_store_set (GTK_LIST_STORE (priv->model),
&iter,
- COL_PERCENT, percent,
- COL_MESSAGE, msg ? msg : "",
- COL_REMAINING, remaining_str ? remaining_str : "",
+ COL_PERCENT, percentage,
-1);
gtk_tree_path_free (path);
- g_free (msg_dup);
- g_free (first_line);
- g_free (second_line);
+}
+
+static void
+ft_manager_update_handler_time (EmpathyFTManager *manager,
+ GtkTreeRowReference *row_ref,
+ guint remaining_time)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ char *remaining_str;
+
+ remaining_str = ft_manager_format_interval (remaining_time);
+
+ /* Set new value in the store */
+ path = gtk_tree_row_reference_get_path (row_ref);
+ gtk_tree_model_get_iter (priv->model, &iter, path);
+ gtk_list_store_set (GTK_LIST_STORE (priv->model),
+ &iter,
+ COL_REMAINING, remaining_str,
+ -1);
+
+ gtk_tree_path_free (path);
g_free (remaining_str);
+}
- ft_manager_update_buttons (ft_manager);
+static void
+ft_manager_clear_handler_time (EmpathyFTManager *manager,
+ GtkTreeRowReference *row_ref)
+{
+ GtkTreePath *path;
+ GtkTreeIter iter;
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
+ /* Set new value in the store */
+ path = gtk_tree_row_reference_get_path (row_ref);
+ gtk_tree_model_get_iter (priv->model, &iter, path);
+ gtk_list_store_set (GTK_LIST_STORE (priv->model),
+ &iter,
+ COL_REMAINING, NULL,
+ -1);
+
+ gtk_tree_path_free (path);
}
static void
GError *error,
EmpathyFTManager *manager)
{
- /* TODO: implement */
+ char *message;
+ GtkTreeRowReference *row_ref;
+
+ DEBUG ("Transfer error %s", error->message);
+
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
+ g_return_if_fail (row_ref != NULL);
+
+ message = ft_manager_format_error_message (handler, error);
+
+ ft_manager_update_handler_message (manager, row_ref, message);
+ ft_manager_clear_handler_time (manager, row_ref);
+ ft_manager_update_buttons (manager);
+
+ g_free (message);
}
static void
-ft_handler_hashing_started_cb (EmpathyFTHandler *handler,
- EmpathyFTManager *manager)
+do_real_transfer_done (EmpathyFTManager *manager,
+ EmpathyFTHandler *handler)
+{
+ const char *contact_name;
+ const char *filename;
+ char *first_line, *second_line, *message;
+ char *uri;
+ gboolean incoming;
+ GtkTreeRowReference *row_ref;
+ GtkRecentManager *recent_manager;
+ GFile *file;
+
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
+ g_return_if_fail (row_ref != NULL);
+
+ incoming = empathy_ft_handler_is_incoming (handler);
+ contact_name = empathy_contact_get_name
+ (empathy_ft_handler_get_contact (handler));
+ filename = empathy_ft_handler_get_filename (handler);
+
+ if (incoming)
+ /* translators: first %s is filename, second %s
+ * is the contact name */
+ first_line = g_strdup_printf (_("\"%s\" received from %s"), filename,
+ contact_name);
+ else
+ /* translators: first %s is filename, second %s
+ * is the contact name */
+ first_line = g_strdup_printf (_("\"%s\" sent to %s"), filename,
+ contact_name);
+
+ second_line = g_strdup (_("File transfer completed"));
+
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+ ft_manager_update_handler_message (manager, row_ref, message);
+ ft_manager_clear_handler_time (manager, row_ref);
+
+ /* update buttons */
+ ft_manager_update_buttons (manager);
+
+ g_free (message);
+ g_free (first_line);
+ g_free (second_line);
+
+ recent_manager = gtk_recent_manager_get_default ();
+ file = empathy_ft_handler_get_gfile (handler);
+ uri = g_file_get_uri (file);
+
+ gtk_recent_manager_add_item (recent_manager, uri);
+
+ g_free (uri);
+}
+
+static void
+ft_handler_transfer_done_cb (EmpathyFTHandler *handler,
+ EmpathyTpFile *tp_file,
+ EmpathyFTManager *manager)
{
- /* TODO: implement */
+ if (empathy_ft_handler_is_incoming (handler) &&
+ empathy_ft_handler_get_use_hash (handler))
+ {
+ DEBUG ("Transfer done, waiting for hashing-started");
+
+ /* connect to the signal and return early */
+ g_signal_connect (handler, "hashing-started",
+ G_CALLBACK (ft_handler_hashing_started_cb), manager);
+
+ return;
+ }
+
+ DEBUG ("Transfer done, no hashing");
+
+ do_real_transfer_done (manager, handler);
}
static void
ft_handler_transfer_progress_cb (EmpathyFTHandler *handler,
guint64 current_bytes,
guint64 total_bytes,
+ guint remaining_time,
+ gdouble speed,
EmpathyFTManager *manager)
{
- ft_manager_update_handler_progress (manager, handler,
- current_bytes, total_bytes);
+ char *first_line, *second_line, *message;
+ int percentage;
+ GtkTreeRowReference *row_ref;
+
+ DEBUG ("Transfer progress");
+
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
+ g_return_if_fail (row_ref != NULL);
+
+ first_line = ft_manager_format_contact_info (handler);
+ second_line = ft_manager_format_progress_bytes_and_percentage
+ (current_bytes, total_bytes, speed, &percentage);
+
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+
+ ft_manager_update_handler_message (manager, row_ref, message);
+ ft_manager_update_handler_progress (manager, row_ref, percentage);
+
+ if (remaining_time > 0)
+ ft_manager_update_handler_time (manager, row_ref, remaining_time);
+
+ g_free (message);
+ g_free (first_line);
+ g_free (second_line);
}
static void
EmpathyTpFile *tp_file,
EmpathyFTManager *manager)
{
+ guint64 transferred_bytes, total_bytes;
+
+ DEBUG ("Transfer started");
+
g_signal_connect (handler, "transfer-progress",
- G_CALLBACK (ft_handler_transfer_progress_cb), manager);
+ G_CALLBACK (ft_handler_transfer_progress_cb), manager);
+ g_signal_connect (handler, "transfer-done",
+ G_CALLBACK (ft_handler_transfer_done_cb), manager);
+
+ transferred_bytes = empathy_ft_handler_get_transferred_bytes (handler);
+ total_bytes = empathy_ft_handler_get_total_bytes (handler);
+
+ ft_handler_transfer_progress_cb (handler, transferred_bytes, total_bytes,
+ 0, -1, manager);
+}
+
+static void
+ft_handler_hashing_done_cb (EmpathyFTHandler *handler,
+ EmpathyFTManager *manager)
+{
+ GtkTreeRowReference *row_ref;
+ char *first_line, *second_line, *message;
+
+ DEBUG ("Hashing done");
+
+ /* update the message */
+ if (empathy_ft_handler_is_incoming (handler))
+ {
+ do_real_transfer_done (manager, handler);
+ return;
+ }
+
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
+ g_return_if_fail (row_ref != NULL);
+
+ first_line = ft_manager_format_contact_info (handler);
+ second_line = g_strdup (_("Waiting for the other participant's response"));
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+
+ ft_manager_update_handler_message (manager, row_ref, message);
+
+ g_free (message);
+ g_free (first_line);
+ g_free (second_line);
+
+ g_signal_connect (handler, "transfer-started",
+ G_CALLBACK (ft_handler_transfer_started_cb), manager);
+}
+
+static void
+ft_handler_hashing_progress_cb (EmpathyFTHandler *handler,
+ guint64 current_bytes,
+ guint64 total_bytes,
+ EmpathyFTManager *manager)
+{
+ char *first_line, *second_line, *message;
+ GtkTreeRowReference *row_ref;
+
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
+ g_return_if_fail (row_ref != NULL);
+
+ if (empathy_ft_handler_is_incoming (handler))
+ first_line = g_strdup_printf (_("Checking integrity of \"%s\""),
+ empathy_ft_handler_get_filename (handler));
+ else
+ first_line = g_strdup_printf (_("Hashing \"%s\""),
+ empathy_ft_handler_get_filename (handler));
+
+ second_line = ft_manager_format_progress_bytes_and_percentage
+ (current_bytes, total_bytes, -1, NULL);
+
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+
+ ft_manager_update_handler_message (manager, row_ref, message);
+
+ g_free (message);
+ g_free (first_line);
+ g_free (second_line);
+}
+
+static void
+ft_handler_hashing_started_cb (EmpathyFTHandler *handler,
+ EmpathyFTManager *manager)
+{
+ char *message, *first_line, *second_line;
+ GtkTreeRowReference *row_ref;
+
+ DEBUG ("Hashing started");
+
+ g_signal_connect (handler, "hashing-progress",
+ G_CALLBACK (ft_handler_hashing_progress_cb), manager);
+ g_signal_connect (handler, "hashing-done",
+ G_CALLBACK (ft_handler_hashing_done_cb), manager);
+
+ row_ref = ft_manager_get_row_from_handler (manager, handler);
+ g_return_if_fail (row_ref != NULL);
+
+ first_line = ft_manager_format_contact_info (handler);
- ft_manager_update_handler_row (manager, handler);
+ if (empathy_ft_handler_is_incoming (handler))
+ second_line = g_strdup_printf (_("Checking integrity of \"%s\""),
+ empathy_ft_handler_get_filename (handler));
+ else
+ second_line = g_strdup_printf (_("Hashing \"%s\""),
+ empathy_ft_handler_get_filename (handler));
+
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+
+ ft_manager_update_handler_message (manager, row_ref, message);
+
+ g_free (first_line);
+ g_free (second_line);
+ g_free (message);
}
static void
ft_manager_start_transfer (EmpathyFTManager *manager,
EmpathyFTHandler *handler)
{
- GCancellable *cancellable;
EmpathyFTManagerPriv *priv;
+ gboolean is_outgoing;
priv = GET_PRIV (manager);
- cancellable = g_cancellable_new ();
- g_hash_table_insert (priv->cancellable_refs, g_object_ref (handler),
- cancellable);
+ is_outgoing = !empathy_ft_handler_is_incoming (handler);
+
+ DEBUG ("Start transfer, is outgoing %s",
+ is_outgoing ? "True" : "False");
/* now connect the signals */
g_signal_connect (handler, "transfer-error",
G_CALLBACK (ft_handler_transfer_error_cb), manager);
- if (empathy_ft_handler_is_incoming (handler)) {
+ if (is_outgoing && empathy_ft_handler_get_use_hash (handler)) {
g_signal_connect (handler, "hashing-started",
G_CALLBACK (ft_handler_hashing_started_cb), manager);
} else {
+ /* either incoming or outgoing without hash */
g_signal_connect (handler, "transfer-started",
G_CALLBACK (ft_handler_transfer_started_cb), manager);
}
- empathy_ft_handler_start_transfer (handler, cancellable);
+ empathy_ft_handler_start_transfer (handler);
}
static void
-ft_manager_add_handler_to_list (EmpathyFTManager *ft_manager,
- EmpathyFTHandler *handler)
+ft_manager_add_handler_to_list (EmpathyFTManager *manager,
+ EmpathyFTHandler *handler,
+ const GError *error)
{
GtkTreeRowReference *row_ref;
GtkTreeIter iter;
GtkTreeSelection *selection;
GtkTreePath *path;
GIcon *icon;
- const char *content_type;
+ const char *content_type, *second_line;
+ char *first_line, *message;
EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ icon = NULL;
+
/* get the icon name from the mime-type of the file. */
content_type = empathy_ft_handler_get_content_type (handler);
- icon = g_content_type_get_icon (content_type);
+
+ if (content_type != NULL)
+ icon = g_content_type_get_icon (content_type);
/* append the handler in the store */
gtk_list_store_insert_with_values (GTK_LIST_STORE (priv->model),
- &iter, G_MAXINT, COL_FT_OBJECT, handler, COL_ICON, icon, -1);
- g_object_unref (icon);
+ &iter, G_MAXINT, COL_FT_OBJECT, handler,
+ COL_ICON, icon, -1);
+
+ if (icon != NULL)
+ g_object_unref (icon);
/* insert the new row_ref in the hash table */
path = gtk_tree_model_get_path (GTK_TREE_MODEL (priv->model), &iter);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
gtk_tree_selection_select_iter (selection, &iter);
+ if (error != NULL)
+ {
+ message = ft_manager_format_error_message (handler, error);
+ ft_manager_update_handler_message (manager, row_ref, message);
+
+ g_free (message);
+ return;
+ }
+
+ /* update the row with the initial values.
+ * the only case where we postpone this is in case we're managing
+ * an outgoing+hashing transfer, as the hashing started signal will
+ * take care of updating the information.
+ */
+ if (empathy_ft_handler_is_incoming (handler) ||
+ !empathy_ft_handler_get_use_hash (handler)) {
+ first_line = ft_manager_format_contact_info (handler);
+ second_line = _("Waiting for the other participant's response");
+ message = g_strdup_printf ("%s\n%s", first_line, second_line);
+
+ ft_manager_update_handler_message (manager, row_ref, message);
+
+ g_free (first_line);
+ g_free (message);
+ }
+
/* hook up the signals and start the transfer */
ft_manager_start_transfer (manager, handler);
-
- /* update the row with the initial values */
- ft_manager_update_ft_row (manager, handler);
}
static void
-ft_manager_clear (EmpathyFTManager *ft_manager)
+ft_manager_clear (EmpathyFTManager *manager)
{
EmpathyFTManagerPriv *priv;
DEBUG ("Clearing file transfer list");
- priv = GET_PRIV (ft_manager);
+ priv = GET_PRIV (manager);
/* Remove completed and cancelled transfers */
g_hash_table_foreach_remove (priv->ft_handler_to_row_ref,
- remove_finished_transfer_foreach, ft_manager);
+ remove_finished_transfer_foreach, manager);
+
+ /* set the clear button back to insensitive */
+ gtk_widget_set_sensitive (priv->clear_button, FALSE);
}
static void
-ft_manager_open (EmpathyFTManager *ft_manager)
+ft_manager_open (EmpathyFTManager *manager)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
EmpathyFTHandler *handler;
char *uri;
GFile *file;
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
}
static void
-ft_manager_stop (EmpathyFTManager *ft_manager)
+ft_manager_stop (EmpathyFTManager *manager)
{
GtkTreeSelection *selection;
GtkTreeIter iter;
GtkTreeModel *model;
EmpathyFTHandler *handler;
- GCancellable *cancellable;
EmpathyFTManagerPriv *priv;
- priv = GET_PRIV (ft_manager)
+ priv = GET_PRIV (manager);
+
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
empathy_contact_get_name (empathy_ft_handler_get_contact (handler)),
empathy_ft_handler_get_filename (handler));
- cancellable = g_hash_table_lookup (priv->cancellable_refs, handler);
- g_assert (cancellable != NULL);
+ empathy_ft_handler_cancel_transfer (handler);
- g_cancellable_cancel (cancellable);
+ g_object_unref (handler);
}
static gboolean
-ft_manager_save_geometry_timeout_cb (EmpathyFTManager *ft_manager)
+ft_manager_save_geometry_timeout_cb (EmpathyFTManager *manager)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
gint x, y, w, h;
gtk_window_get_size (GTK_WINDOW (priv->window), &w, &h);
static gboolean
ft_manager_configure_event_cb (GtkWidget *widget,
GdkEventConfigure *event,
- EmpathyFTManager *ft_manager)
+ EmpathyFTManager *manager)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
if (priv->save_geometry_id != 0)
g_source_remove (priv->save_geometry_id);
priv->save_geometry_id = g_timeout_add (500,
- (GSourceFunc) ft_manager_save_geometry_timeout_cb, ft_manager);
+ (GSourceFunc) ft_manager_save_geometry_timeout_cb, manager);
return FALSE;
}
static void
ft_manager_response_cb (GtkWidget *widget,
gint response,
- EmpathyFTManager *ft_manager)
+ EmpathyFTManager *manager)
{
switch (response)
{
case RESPONSE_CLEAR:
- ft_manager_clear (ft_manager);
+ ft_manager_clear (manager);
break;
case RESPONSE_OPEN:
- ft_manager_open (ft_manager);
+ ft_manager_open (manager);
break;
case RESPONSE_STOP:
- ft_manager_stop (ft_manager);
+ ft_manager_stop (manager);
break;
}
}
static gboolean
ft_manager_delete_event_cb (GtkWidget *widget,
GdkEvent *event,
- EmpathyFTManager *ft_manager)
+ EmpathyFTManager *manager)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
+ DEBUG ("%p", manager);
/* remove all the completed/cancelled/errored transfers */
- ft_manager_clear (ft_manager);
+ ft_manager_clear (manager);
if (g_hash_table_size (priv->ft_handler_to_row_ref) > 0)
{
static void
ft_manager_destroy_cb (GtkWidget *widget,
- EmpathyFTManager *ft_manager)
+ EmpathyFTManager *manager)
{
- ft_manager->priv->window = NULL;
- if (ft_manager->priv->save_geometry_id != 0)
- g_source_remove (ft_manager->priv->save_geometry_id);
- g_hash_table_remove_all (ft_manager->priv->tp_file_to_row_ref);
+ DEBUG ("%p", manager);
+
+ g_object_unref (manager);
}
static void
-ft_manager_build_ui (EmpathyFTManager *ft_manager)
+ft_manager_build_ui (EmpathyFTManager *manager)
{
GtkBuilder *gui;
gint x, y, w, h;
GtkCellRenderer *renderer;
GtkTreeSelection *selection;
gchar *filename;
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
filename = empathy_file_lookup ("empathy-ft-manager.ui", "src");
gui = empathy_builder_get_file (filename,
"ft_manager_dialog", &priv->window,
"ft_list", &priv->treeview,
+ "clear_button", &priv->clear_button,
"open_button", &priv->open_button,
"abort_button", &priv->abort_button,
NULL);
g_free (filename);
- empathy_builder_connect (gui, ft_manager,
+ empathy_builder_connect (gui, manager,
"ft_manager_dialog", "destroy", ft_manager_destroy_cb,
"ft_manager_dialog", "response", ft_manager_response_cb,
"ft_manager_dialog", "delete-event", ft_manager_delete_event_cb,
"ft_manager_dialog", "configure-event", ft_manager_configure_event_cb,
NULL);
- g_object_unref (gui);
+ empathy_builder_unref_and_keep_widget (gui, priv->window);
/* Window geometry. */
empathy_geometry_load ("ft-manager", &x, &y, &w, &h);
selection = gtk_tree_view_get_selection (view);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect (selection, "changed",
- G_CALLBACK (ft_manager_selection_changed), ft_manager);
+ G_CALLBACK (ft_manager_selection_changed), manager);
gtk_tree_view_set_headers_visible (view, TRUE);
gtk_tree_view_set_enable_search (view, FALSE);
gtk_tree_view_column_pack_start (column, renderer, FALSE);
gtk_tree_view_column_set_attributes (column, renderer,
"text", COL_REMAINING, NULL);
+
+ /* clear button should be sensitive only if there are completed/cancelled
+ * handlers in the store.
+ */
+ gtk_widget_set_sensitive (priv->clear_button, FALSE);
}
/* GObject method overrides */
{
EmpathyFTManagerPriv *priv = GET_PRIV (object);
- DEBUG ("%p", object);
+ DEBUG ("FT Manager %p", object);
g_hash_table_destroy (priv->ft_handler_to_row_ref);
}
static void
-empathy_ft_manager_init (EmpathyFTManager *ft_manager)
+empathy_ft_manager_init (EmpathyFTManager *manager)
{
EmpathyFTManagerPriv *priv;
- priv = G_TYPE_INSTANCE_GET_PRIVATE ((ft_manager), EMPATHY_TYPE_FT_MANAGER,
+ priv = G_TYPE_INSTANCE_GET_PRIVATE ((manager), EMPATHY_TYPE_FT_MANAGER,
EmpathyFTManagerPriv);
- ft_manager->priv = priv;
+ manager->priv = priv;
priv->ft_handler_to_row_ref = g_hash_table_new_full (g_direct_hash,
g_direct_equal, (GDestroyNotify) g_object_unref,
(GDestroyNotify) gtk_tree_row_reference_free);
- priv->cancellable_refs = g_hash_table_new_full (g_direct_hash, g_direct_equal,
- (GDestroyNotify) g_object_unref, (GDestroyNotify) g_object_unref);
- ft_manager_build_ui (ft_manager);
+ ft_manager_build_ui (manager);
}
static GObject *
if (manager_singleton)
{
- retval = g_object_ref (manager_singleton);
+ retval = G_OBJECT (manager_singleton);
}
else
{
/* public methods */
-/**
- * empathy_ft_manager_dup_singleton:
- *
- * Returns a reference to the #EmpathyFTManager singleton object.
- *
- * Returns: a #EmpathyFTManager
- */
-EmpathyFTManager *
-empathy_ft_manager_dup_singleton (void)
+void
+empathy_ft_manager_add_handler (EmpathyFTHandler *handler)
{
- return g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
-}
+ EmpathyFTManager *manager;
+ EmpathyFTManagerPriv *priv;
-/**
- * empathy_ft_manager_get_dialog:
- * @ft_manager: an #EmpathyFTManager
- *
- * Returns the #GtkWidget of @ft_manager.
- *
- * Returns: the dialog
- */
-GtkWidget *
-empathy_ft_manager_get_dialog (EmpathyFTManager *ft_manager)
-{
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ DEBUG ("Adding handler");
- g_return_val_if_fail (EMPATHY_IS_FT_MANAGER (ft_manager), NULL);
+ g_return_if_fail (EMPATHY_IS_FT_HANDLER (handler));
- return priv->window;
+ manager = g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
+ priv = GET_PRIV (manager);
+
+ ft_manager_add_handler_to_list (manager, handler, NULL);
+ gtk_window_present (GTK_WINDOW (priv->window));
}
void
-empathy_ft_manager_add_handler (EmpathyFTManager *ft_manager,
- EmpathyFTHandler *handler)
+empathy_ft_manager_display_error (EmpathyFTHandler *handler,
+ const GError *error)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (ft_manager);
+ EmpathyFTManager *manager;
+ EmpathyFTManagerPriv *priv;
- g_return_if_fail (EMPATHY_IS_FT_MANAGER (ft_manager));
g_return_if_fail (EMPATHY_IS_FT_HANDLER (handler));
+ g_return_if_fail (error != NULL);
+
+ manager = g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
+ priv = GET_PRIV (manager);
- ft_manager_add_handler_to_list (ft_manager, handler);
+ ft_manager_add_handler_to_list (manager, handler, error);
gtk_window_present (GTK_WINDOW (priv->window));
}
+void
+empathy_ft_manager_show (void)
+{
+ EmpathyFTManager *manager;
+ EmpathyFTManagerPriv *priv;
+
+ manager = g_object_new (EMPATHY_TYPE_FT_MANAGER, NULL);
+ priv = GET_PRIV (manager);
+
+ gtk_window_present (GTK_WINDOW (priv->window));
+}