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);
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);
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_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);