/* The original file transfer manager code was copied from Epiphany */
#include "config.h"
-
-#include <string.h>
+#include "empathy-ft-manager.h"
#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-#define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-tp-file.h>
-#include <libempathy/empathy-utils.h>
+#include <tp-account-widgets/tpaw-builder.h>
-#include <libempathy-gtk/empathy-conf.h>
-#include <libempathy-gtk/empathy-ui-utils.h>
-#include <libempathy-gtk/empathy-geometry.h>
-#include <libempathy-gtk/empathy-images.h>
+#include "empathy-geometry.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
-#include "empathy-ft-manager.h"
+#define DEBUG_FLAG EMPATHY_DEBUG_FT
+#include "empathy-debug.h"
enum
{
GtkWidget *open_button;
GtkWidget *abort_button;
GtkWidget *clear_button;
-
- guint save_geometry_id;
} EmpathyFTManagerPriv;
enum
{
RESPONSE_OPEN = 1,
RESPONSE_STOP = 2,
- RESPONSE_CLEAR = 3
+ RESPONSE_CLEAR = 3,
+ RESPONSE_CLOSE = 4
};
G_DEFINE_TYPE (EmpathyFTManager, empathy_ft_manager, G_TYPE_OBJECT);
g_return_if_fail (row_ref);
DEBUG ("Removing file transfer from window: contact=%s, filename=%s",
- empathy_contact_get_name (empathy_ft_handler_get_contact (handler)),
+ empathy_contact_get_alias (empathy_ft_handler_get_contact (handler)),
empathy_ft_handler_get_filename (handler));
/* Get the iter from the row_ref */
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);
+ total_str = g_format_size (total);
+ current_str = g_format_size (current);
if (speed > 0)
- speed_str = g_format_size_for_display ((goffset) speed);
+ speed_str = g_format_size ((goffset) speed);
/* translators: first %s is the currently processed size, second %s is
* the total file size */
char *retval;
incoming = empathy_ft_handler_is_incoming (handler);
- contact_name = empathy_contact_get_name
+ contact_name = empathy_contact_get_alias
(empathy_ft_handler_get_contact (handler));
filename = empathy_ft_handler_get_filename (handler);
contact = empathy_ft_handler_get_contact (handler);
if (contact)
- contact_name = empathy_contact_get_name (contact);
+ contact_name = empathy_contact_get_alias (contact);
filename = empathy_ft_handler_get_filename (handler);
g_free (remaining_str);
}
+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
ft_handler_transfer_error_cb (EmpathyFTHandler *handler,
GError *error,
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);
g_return_if_fail (row_ref != NULL);
incoming = empathy_ft_handler_is_incoming (handler);
- contact_name = empathy_contact_get_name
+ contact_name = empathy_contact_get_alias
(empathy_ft_handler_get_contact (handler));
filename = 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);
+ ft_manager_clear_handler_time (manager, row_ref);
/* update buttons */
ft_manager_update_buttons (manager);
static void
ft_handler_transfer_done_cb (EmpathyFTHandler *handler,
- EmpathyTpFile *tp_file,
+ TpFileTransferChannel *channel,
EmpathyFTManager *manager)
{
if (empathy_ft_handler_is_incoming (handler) &&
static void
ft_handler_transfer_started_cb (EmpathyFTHandler *handler,
- EmpathyTpFile *tp_file,
+ TpFileTransferChannel *channel,
EmpathyFTManager *manager)
{
guint64 transferred_bytes, total_bytes;
ft_handler_hashing_started_cb (EmpathyFTHandler *handler,
EmpathyFTManager *manager)
{
- char *message;
+ char *message, *first_line, *second_line;
GtkTreeRowReference *row_ref;
DEBUG ("Hashing started");
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);
+
if (empathy_ft_handler_is_incoming (handler))
- message = g_strdup_printf (_("Checking integrity of \"%s\""),
+ second_line = g_strdup_printf (_("Checking integrity of \"%s\""),
empathy_ft_handler_get_filename (handler));
else
- message = g_strdup_printf (_("Hashing \"%s\""),
+ 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);
}
ft_manager_start_transfer (EmpathyFTManager *manager,
EmpathyFTHandler *handler)
{
- EmpathyFTManagerPriv *priv;
gboolean is_outgoing;
- priv = GET_PRIV (manager);
-
is_outgoing = !empathy_ft_handler_is_incoming (handler);
DEBUG ("Start transfer, is outgoing %s",
GtkTreeIter iter;
GtkTreeModel *model;
EmpathyFTHandler *handler;
- char *uri;
- GFile *file;
EmpathyFTManagerPriv *priv = GET_PRIV (manager);
selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
gtk_tree_model_get (model, &iter, COL_FT_OBJECT, &handler, -1);
- file = empathy_ft_handler_get_gfile (handler);
- uri = g_file_get_uri (file);
+ if (empathy_ft_handler_is_completed (handler)){
+ char *uri;
+ GFile *file;
+
+ file = empathy_ft_handler_get_gfile (handler);
+ uri = g_file_get_uri (file);
- DEBUG ("Opening URI: %s", uri);
- empathy_url_show (GTK_WIDGET (priv->window), uri);
+ DEBUG ("Opening URI: %s", uri);
+ empathy_url_show (GTK_WIDGET (priv->window), uri);
+ g_free (uri);
+ }
g_object_unref (handler);
- g_free (uri);
}
static void
g_return_if_fail (handler != NULL);
DEBUG ("Stopping file transfer: contact=%s, filename=%s",
- empathy_contact_get_name (empathy_ft_handler_get_contact (handler)),
+ empathy_contact_get_alias (empathy_ft_handler_get_contact (handler)),
empathy_ft_handler_get_filename (handler));
empathy_ft_handler_cancel_transfer (handler);
}
static gboolean
-ft_manager_save_geometry_timeout_cb (EmpathyFTManager *manager)
+close_window (EmpathyFTManager *manager)
{
EmpathyFTManagerPriv *priv = GET_PRIV (manager);
- gint x, y, w, h;
-
- gtk_window_get_size (GTK_WINDOW (priv->window), &w, &h);
- gtk_window_get_position (GTK_WINDOW (priv->window), &x, &y);
-
- empathy_geometry_save ("ft-manager", x, y, w, h);
-
- priv->save_geometry_id = 0;
-
- return FALSE;
-}
-static gboolean
-ft_manager_configure_event_cb (GtkWidget *widget,
- GdkEventConfigure *event,
- EmpathyFTManager *manager)
-{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ DEBUG ("%p", manager);
- if (priv->save_geometry_id != 0)
- g_source_remove (priv->save_geometry_id);
+ /* remove all the completed/cancelled/errored transfers */
+ ft_manager_clear (manager);
- priv->save_geometry_id = g_timeout_add (500,
- (GSourceFunc) ft_manager_save_geometry_timeout_cb, manager);
+ if (g_hash_table_size (priv->ft_handler_to_row_ref) > 0)
+ {
+ /* There is still FTs on flight, just hide the window */
+ DEBUG ("Hiding window");
+ gtk_widget_hide (priv->window);
+ return TRUE;
+ }
return FALSE;
}
gint response,
EmpathyFTManager *manager)
{
+ EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+
switch (response)
{
case RESPONSE_CLEAR:
case RESPONSE_STOP:
ft_manager_stop (manager);
break;
+ case RESPONSE_CLOSE:
+ if (!close_window (manager))
+ gtk_widget_destroy (priv->window);
+ break;
+ case GTK_RESPONSE_NONE:
+ case GTK_RESPONSE_DELETE_EVENT:
+ /* Do nothing */
+ break;
+ default:
+ g_assert_not_reached ();
}
}
GdkEvent *event,
EmpathyFTManager *manager)
{
- EmpathyFTManagerPriv *priv = GET_PRIV (manager);
+ return close_window (manager);
+}
+static void
+ft_manager_destroy_cb (GtkWidget *widget,
+ EmpathyFTManager *manager)
+{
DEBUG ("%p", manager);
- /* remove all the completed/cancelled/errored transfers */
- ft_manager_clear (manager);
+ g_object_unref (manager);
+}
- if (g_hash_table_size (priv->ft_handler_to_row_ref) > 0)
- {
- /* There is still FTs on flight, just hide the window */
- DEBUG ("Hiding window");
- gtk_widget_hide (widget);
- return TRUE;
- }
+static gboolean
+ft_view_button_press_event_cb (GtkWidget *widget,
+ GdkEventKey *event,
+ EmpathyFTManager *manager)
+{
+
+ if (event->type != GDK_2BUTTON_PRESS)
+ return FALSE;
+
+ ft_manager_open (manager);
return FALSE;
}
-static void
-ft_manager_destroy_cb (GtkWidget *widget,
- EmpathyFTManager *manager)
+static gboolean
+ft_manager_key_press_event_cb (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data)
{
- DEBUG ("%p", manager);
+ if ((event->state & GDK_CONTROL_MASK && event->keyval == GDK_KEY_w)
+ || event->keyval == GDK_KEY_Escape)
+ {
+ gtk_widget_destroy (widget);
+ return TRUE;
+ }
- g_object_unref (manager);
+ return FALSE;
}
static void
ft_manager_build_ui (EmpathyFTManager *manager)
{
GtkBuilder *gui;
- gint x, y, w, h;
GtkTreeView *view;
GtkListStore *liststore;
GtkTreeViewColumn *column;
EmpathyFTManagerPriv *priv = GET_PRIV (manager);
filename = empathy_file_lookup ("empathy-ft-manager.ui", "src");
- gui = empathy_builder_get_file (filename,
+ gui = tpaw_builder_get_file (filename,
"ft_manager_dialog", &priv->window,
"ft_list", &priv->treeview,
"clear_button", &priv->clear_button,
NULL);
g_free (filename);
- empathy_builder_connect (gui, manager,
+ tpaw_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,
+ "ft_manager_dialog", "key-press-event", ft_manager_key_press_event_cb,
NULL);
- g_object_unref (gui);
+ tpaw_builder_unref_and_keep_widget (gui, priv->window);
/* Window geometry. */
- empathy_geometry_load ("ft-manager", &x, &y, &w, &h);
-
- if (x >= 0 && y >= 0)
- {
- /* Let the window manager position it if we don't have
- * good x, y coordinates. */
- gtk_window_move (GTK_WINDOW (priv->window), x, y);
- }
-
- if (w > 0 && h > 0)
- {
- /* Use the defaults from the ui file if we don't have
- * good w, h geometry. */
- gtk_window_resize (GTK_WINDOW (priv->window), w, h);
- }
+ empathy_geometry_bind (GTK_WINDOW (priv->window), "ft-manager");
/* Setup the tree view */
view = GTK_TREE_VIEW (priv->treeview);
gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
g_signal_connect (selection, "changed",
G_CALLBACK (ft_manager_selection_changed), manager);
+ g_signal_connect (view, "button-press-event",
+ G_CALLBACK (ft_view_button_press_event_cb),
+ manager);
gtk_tree_view_set_headers_visible (view, TRUE);
gtk_tree_view_set_enable_search (view, FALSE);
DEBUG ("FT Manager %p", object);
- g_hash_table_destroy (priv->ft_handler_to_row_ref);
-
- if (priv->save_geometry_id != 0)
- g_source_remove (priv->save_geometry_id);
+ g_hash_table_unref (priv->ft_handler_to_row_ref);
G_OBJECT_CLASS (empathy_ft_manager_parent_class)->finalize (object);
}