]> git.0d.be Git - empathy.git/commitdiff
Renamed EmpathyFile to EmpathyTpFile. (Jonny Lamb)
authorJonny Lamb <jonny.lamb@collabora.co.uk>
Fri, 21 Nov 2008 16:16:18 +0000 (16:16 +0000)
committerXavier Claessens <xclaesse@src.gnome.org>
Fri, 21 Nov 2008 16:16:18 +0000 (16:16 +0000)
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=1776

12 files changed:
libempathy-gtk/empathy-ft-manager.c
libempathy-gtk/empathy-ft-manager.h
libempathy-gtk/empathy-ui-utils.c
libempathy-gtk/empathy-ui-utils.h
libempathy/Makefile.am
libempathy/empathy-file.c [deleted file]
libempathy/empathy-file.h [deleted file]
libempathy/empathy-tp-file.c [new file with mode: 0644]
libempathy/empathy-tp-file.h [new file with mode: 0644]
libempathy/empathy-utils.c
libempathy/empathy-utils.h
src/empathy-event-manager.c

index 1fdb56ede7c12a6598c3e8760610fb36be4c31b8..949a797eadd8759fbb6f30a1bbd60d301313b560 100644 (file)
@@ -32,8 +32,7 @@
 
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
 #include <libempathy/empathy-debug.h>
-#include <libempathy/empathy-file.h>
-#include <libempathy/empathy-file.h>
+#include <libempathy/empathy-tp-file.h>
 #include <libempathy/empathy-utils.h>
 
 #include "empathy-conf.h"
 /**
  * SECTION:empathy-ft-manager
  * @short_description: File transfer dialog
- * @see_also: #EmpathyTpFile, #EmpathyFile, empathy_send_file(),
+ * @see_also: #EmpathyTpFile, empathy_send_file(),
  * empathy_send_file_from_stream()
  * @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_file()).
+ * with empathy_ft_manager_add_tp_file()).
  */
 
 enum
@@ -81,7 +80,7 @@ enum
 struct _EmpathyFTManagerPriv
 {
   GtkTreeModel *model;
-  GHashTable *file_to_row_ref;
+  GHashTable *tp_file_to_row_ref;
 
   /* Widgets */
   GtkWidget *window;
@@ -106,12 +105,12 @@ static void empathy_ft_manager_finalize (GObject *object);
 static void ft_manager_build_ui (EmpathyFTManager *ft_manager);
 static void ft_manager_response_cb (GtkWidget *dialog, gint response,
     EmpathyFTManager *ft_manager);
-static void ft_manager_add_file_to_list (EmpathyFTManager *ft_manager,
-    EmpathyFile *file);
+static void ft_manager_add_tp_file_to_list (EmpathyFTManager *ft_manager,
+    EmpathyTpFile *tp_file);
 static void ft_manager_remove_file_from_list (EmpathyFTManager *ft_manager,
-    EmpathyFile *file);
+    EmpathyTpFile *tp_file);
 static void ft_manager_display_accept_dialog (EmpathyFTManager *ft_manager,
-    EmpathyFile *file);
+    EmpathyTpFile *tp_file);
 
 G_DEFINE_TYPE (EmpathyFTManager, empathy_ft_manager, G_TYPE_OBJECT);
 
@@ -134,7 +133,7 @@ empathy_ft_manager_init (EmpathyFTManager *ft_manager)
 
   priv = GET_PRIV (ft_manager);
 
-  priv->file_to_row_ref = g_hash_table_new_full (g_direct_hash,
+  priv->tp_file_to_row_ref = g_hash_table_new_full (g_direct_hash,
       g_direct_equal, NULL, (GDestroyNotify) gtk_tree_row_reference_free);
 
   ft_manager_build_ui (ft_manager);
@@ -149,7 +148,7 @@ empathy_ft_manager_finalize (GObject *object)
 
   priv = GET_PRIV (object);
 
-  g_hash_table_destroy (priv->file_to_row_ref);
+  g_hash_table_destroy (priv->tp_file_to_row_ref);
 
   if (priv->save_geometry_id != 0)
     g_source_remove (priv->save_geometry_id);
@@ -177,7 +176,7 @@ empathy_ft_manager_get_default (void)
 }
 
 /**
- * empathy_ft_manager_add_file:
+ * empathy_ft_manager_add_tp_file:
  * @ft_manager: an #EmpathyFTManager
  * @ft: an #EmpathyFT
  *
@@ -186,24 +185,24 @@ empathy_ft_manager_get_default (void)
  * @ft.
  */
 void
-empathy_ft_manager_add_file (EmpathyFTManager *ft_manager,
-                             EmpathyFile *file)
+empathy_ft_manager_add_tp_file (EmpathyFTManager *ft_manager,
+                                EmpathyTpFile *tp_file)
 {
   EmpFileTransferState state;
 
   g_return_if_fail (EMPATHY_IS_FT_MANAGER (ft_manager));
-  g_return_if_fail (EMPATHY_IS_FILE (file));
+  g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
 
   DEBUG ("Adding a file transfer: contact=%s, filename=%s",
-      empathy_contact_get_name (empathy_file_get_contact (file)),
-      empathy_file_get_filename (file));
+      empathy_contact_get_name (empathy_tp_file_get_contact (tp_file)),
+      empathy_tp_file_get_filename (tp_file));
 
-  state = empathy_file_get_state (file);
+  state = empathy_tp_file_get_state (tp_file);
 
   if (state == EMP_FILE_TRANSFER_STATE_LOCAL_PENDING)
-    ft_manager_display_accept_dialog (ft_manager, file);
+    ft_manager_display_accept_dialog (ft_manager, tp_file);
   else
-    ft_manager_add_file_to_list (ft_manager, file);
+    ft_manager_add_tp_file_to_list (ft_manager, tp_file);
 }
 
 /**
@@ -244,14 +243,14 @@ format_interval (gint interval)
 }
 
 static GtkTreeRowReference *
-get_row_from_file (EmpathyFTManager *ft_manager,
-                   EmpathyFile *file)
+get_row_from_tp_file (EmpathyFTManager *ft_manager,
+                      EmpathyTpFile *tp_file)
 {
   EmpathyFTManagerPriv *priv;
 
   priv = GET_PRIV (ft_manager);
 
-  return g_hash_table_lookup (priv->file_to_row_ref, file);
+  return g_hash_table_lookup (priv->tp_file_to_row_ref, tp_file);
 }
 
 static void
@@ -262,7 +261,7 @@ update_buttons (EmpathyFTManager *ft_manager)
   GtkTreeModel *model;
   GtkTreeIter iter;
   GValue val = {0, };
-  EmpathyFile *file;
+  EmpathyTpFile *tp_file;
   gboolean open_enabled = FALSE;
   gboolean abort_enabled = FALSE;
 
@@ -272,12 +271,12 @@ update_buttons (EmpathyFTManager *ft_manager)
   if (gtk_tree_selection_get_selected (selection, &model, &iter))
     {
       gtk_tree_model_get_value (model, &iter, COL_FT_OBJECT, &val);
-      file = g_value_get_object (&val);
+      tp_file = g_value_get_object (&val);
       g_value_unset (&val);
 
-      if (empathy_file_get_state (file) == EMP_FILE_TRANSFER_STATE_COMPLETED)
+      if (empathy_tp_file_get_state (tp_file) == EMP_FILE_TRANSFER_STATE_COMPLETED)
         {
-          if (empathy_file_get_direction (file) ==
+          if (empathy_tp_file_get_direction (tp_file) ==
               EMP_FILE_TRANSFER_DIRECTION_INCOMING)
             open_enabled = TRUE;
           else
@@ -286,7 +285,7 @@ update_buttons (EmpathyFTManager *ft_manager)
           abort_enabled = FALSE;
 
         }
-      else if (empathy_file_get_state (file) ==
+      else if (empathy_tp_file_get_state (tp_file) ==
         EMP_FILE_TRANSFER_STATE_CANCELED)
         {
           open_enabled = FALSE;
@@ -325,7 +324,7 @@ get_state_change_reason_description (EmpFileTransferStateChangeReason reason)
 
 static void
 update_ft_row (EmpathyFTManager *ft_manager,
-               EmpathyFile *file)
+               EmpathyTpFile *tp_file)
 {
   EmpathyFTManagerPriv *priv;
   GtkTreeRowReference  *row_ref;
@@ -347,15 +346,15 @@ update_ft_row (EmpathyFTManager *ft_manager,
 
   priv = GET_PRIV (ft_manager);
 
-  row_ref = get_row_from_file (ft_manager, file);
+  row_ref = get_row_from_tp_file (ft_manager, tp_file);
   g_return_if_fail (row_ref != NULL);
 
-  filename = empathy_file_get_filename (file);
-  contact_name = empathy_contact_get_name (empathy_file_get_contact (file));
-  transferred_bytes = empathy_file_get_transferred_bytes (file);
-  total_size = empathy_file_get_size (file);
-  state = empathy_file_get_state (file);
-  reason = empathy_file_get_state_change_reason (file);
+  filename = empathy_tp_file_get_filename (tp_file);
+  contact_name = empathy_contact_get_name (empathy_tp_file_get_contact (tp_file));
+  transferred_bytes = empathy_tp_file_get_transferred_bytes (tp_file);
+  total_size = empathy_tp_file_get_size (tp_file);
+  state = empathy_tp_file_get_state (tp_file);
+  reason = empathy_tp_file_get_state_change_reason (tp_file);
 
   /* The state is changed asynchronously, so we can get local pending
    * transfers just before their state is changed to open.
@@ -367,7 +366,7 @@ update_ft_row (EmpathyFTManager *ft_manager,
     {
       case EMP_FILE_TRANSFER_STATE_REMOTE_PENDING:
       case EMP_FILE_TRANSFER_STATE_OPEN:
-        if (empathy_file_get_direction (file) ==
+        if (empathy_tp_file_get_direction (tp_file) ==
             EMP_FILE_TRANSFER_DIRECTION_INCOMING)
           /* translators: first %s is filename, second %s is the contact name */
           first_line_format = _("Receiving \"%s\" from %s");
@@ -403,11 +402,11 @@ update_ft_row (EmpathyFTManager *ft_manager,
         else
           second_line = g_strdup (_("Wating the other participant's response"));
 
-      remaining = empathy_file_get_remaining_time (file);
+      remaining = empathy_tp_file_get_remaining_time (tp_file);
       break;
 
     case EMP_FILE_TRANSFER_STATE_COMPLETED:
-      if (empathy_file_get_direction (file) ==
+      if (empathy_tp_file_get_direction (tp_file) ==
           EMP_FILE_TRANSFER_DIRECTION_INCOMING)
         /* translators: first %s is filename, second %s
          * is the contact name */
@@ -426,7 +425,7 @@ update_ft_row (EmpathyFTManager *ft_manager,
       break;
 
     case EMP_FILE_TRANSFER_STATE_CANCELED:
-      if (empathy_file_get_direction (file) ==
+      if (empathy_tp_file_get_direction (tp_file) ==
           EMP_FILE_TRANSFER_DIRECTION_INCOMING)
         /* translators: first %s is filename, second %s
          * is the contact name */
@@ -491,15 +490,15 @@ update_ft_row (EmpathyFTManager *ft_manager,
 }
 
 static void
-transferred_bytes_changed_cb (EmpathyFile *file,
+transferred_bytes_changed_cb (EmpathyTpFile *tp_file,
                               GParamSpec *pspec,
                               EmpathyFTManager *ft_manager)
 {
-  update_ft_row (ft_manager, file);
+  update_ft_row (ft_manager, tp_file);
 }
 
 static void
-state_changed_cb (EmpathyFile *file,
+state_changed_cb (EmpathyTpFile *tp_file,
                   GParamSpec *pspec,
                   EmpathyFTManager *ft_manager)
 {
@@ -508,17 +507,17 @@ state_changed_cb (EmpathyFile *file,
 
   priv = GET_PRIV (ft_manager);
 
-  switch (empathy_file_get_state (file))
+  switch (empathy_tp_file_get_state (tp_file))
     {
       case EMP_FILE_TRANSFER_STATE_COMPLETED:
-        if (empathy_file_get_direction (file) ==
+        if (empathy_tp_file_get_direction (tp_file) ==
             EMP_FILE_TRANSFER_DIRECTION_INCOMING)
           {
             GtkRecentManager *manager;
             const gchar *uri;
 
             manager = gtk_recent_manager_get_default ();
-            uri = g_object_get_data (G_OBJECT (file), "uri");
+            uri = g_object_get_data (G_OBJECT (tp_file), "uri");
             gtk_recent_manager_add_item (manager, uri);
          }
 
@@ -536,14 +535,14 @@ state_changed_cb (EmpathyFile *file,
     }
 
   if (remove)
-    ft_manager_remove_file_from_list (ft_manager, file);
+    ft_manager_remove_file_from_list (ft_manager, tp_file);
   else
-    update_ft_row (ft_manager, file);
+    update_ft_row (ft_manager, tp_file);
 }
 
 static void
-ft_manager_add_file_to_list (EmpathyFTManager *ft_manager,
-                             EmpathyFile *file)
+ft_manager_add_tp_file_to_list (EmpathyFTManager *ft_manager,
+                             EmpathyTpFile *tp_file)
 {
   EmpathyFTManagerPriv *priv;
   GtkTreeRowReference  *row_ref;
@@ -562,27 +561,27 @@ ft_manager_add_file_to_list (EmpathyFTManager *ft_manager,
 
   gtk_list_store_append (GTK_LIST_STORE (priv->model), &iter);
   gtk_list_store_set (GTK_LIST_STORE (priv->model), &iter, COL_FT_OBJECT,
-      file, -1);
+      tp_file, -1);
 
   path =  gtk_tree_model_get_path (GTK_TREE_MODEL (priv->model), &iter);
   row_ref = gtk_tree_row_reference_new (GTK_TREE_MODEL (priv->model), path);
   gtk_tree_path_free (path);
 
-  g_object_ref (file);
-  g_hash_table_insert (priv->file_to_row_ref, file, row_ref);
+  g_object_ref (tp_file);
+  g_hash_table_insert (priv->tp_file_to_row_ref, tp_file, row_ref);
 
-  update_ft_row (ft_manager, file);
+  update_ft_row (ft_manager, tp_file);
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->treeview));
   gtk_tree_selection_unselect_all (selection);
   gtk_tree_selection_select_iter (selection, &iter);
 
-  g_signal_connect (file, "notify::state",
+  g_signal_connect (tp_file, "notify::state",
       G_CALLBACK (state_changed_cb), ft_manager);
-  g_signal_connect (file, "notify::transferred-bytes",
+  g_signal_connect (tp_file, "notify::transferred-bytes",
       G_CALLBACK (transferred_bytes_changed_cb), ft_manager);
 
-  mime = gnome_vfs_get_mime_type_for_name (empathy_file_get_filename (file));
+  mime = gnome_vfs_get_mime_type_for_name (empathy_tp_file_get_filename (tp_file));
   theme = gtk_icon_theme_get_default ();
   /* FIXME remove the dependency on libgnomeui replacing this function
    * with gio/gvfs or copying the code from gtk-recent */
@@ -649,13 +648,13 @@ ft_manager_clear_foreach_cb (gpointer key,
                              gpointer user_data)
 {
   GSList **list = user_data;
-  EmpathyFile *file = key;
+  EmpathyTpFile *tp_file = key;
 
-  switch (empathy_file_get_state (file))
+  switch (empathy_tp_file_get_state (tp_file))
     {
       case EMP_FILE_TRANSFER_STATE_COMPLETED:
       case EMP_FILE_TRANSFER_STATE_CANCELED:
-        *list = g_slist_append (*list, file);
+        *list = g_slist_append (*list, tp_file);
         break;
       default:
         break;
@@ -673,7 +672,7 @@ ft_manager_clear (EmpathyFTManager *ft_manager)
 
   DEBUG ("Clearing file transfer list");
 
-  g_hash_table_foreach (priv->file_to_row_ref, ft_manager_clear_foreach_cb,
+  g_hash_table_foreach (priv->tp_file_to_row_ref, ft_manager_clear_foreach_cb,
       &closed_files);
 
   for (l = closed_files; l; l = l->next)
@@ -694,7 +693,7 @@ ft_manager_delete_event_cb (GtkWidget *widget,
   priv = GET_PRIV (ft_manager);
 
   ft_manager_clear (ft_manager);
-  if (g_hash_table_size (priv->file_to_row_ref) == 0)
+  if (g_hash_table_size (priv->tp_file_to_row_ref) == 0)
     {
       DEBUG ("Destroying window");
       empathy_ft_manager_finalize (G_OBJECT (ft_manager));
@@ -868,7 +867,7 @@ ft_manager_build_ui (EmpathyFTManager *ft_manager)
 
 static void
 ft_manager_remove_file_from_list (EmpathyFTManager *ft_manager,
-                                  EmpathyFile *file)
+                                  EmpathyTpFile *tp_file)
 {
   EmpathyFTManagerPriv *priv;
   GtkTreeRowReference *row_ref;
@@ -877,12 +876,12 @@ ft_manager_remove_file_from_list (EmpathyFTManager *ft_manager,
 
   priv = GET_PRIV (ft_manager);
 
-  row_ref = get_row_from_file (ft_manager, file);
+  row_ref = get_row_from_tp_file (ft_manager, tp_file);
   g_return_if_fail (row_ref);
 
   DEBUG ("Removing file transfer from window: contact=%s, filename=%s",
-      empathy_contact_get_name (empathy_file_get_contact (file)),
-      empathy_file_get_filename (file));
+      empathy_contact_get_name (empathy_tp_file_get_contact (tp_file)),
+      empathy_tp_file_get_filename (tp_file));
 
   /* Get the row we'll select after removal ("smart" selection) */
 
@@ -912,8 +911,8 @@ ft_manager_remove_file_from_list (EmpathyFTManager *ft_manager,
   /* Removal */
 
   gtk_list_store_remove (GTK_LIST_STORE (priv->model), &iter2);
-  g_hash_table_remove (priv->file_to_row_ref, file);
-  g_object_unref (file);
+  g_hash_table_remove (priv->tp_file_to_row_ref, tp_file);
+  g_object_unref (tp_file);
 
   /* Actual selection */
 
@@ -939,7 +938,7 @@ ft_manager_open (EmpathyFTManager *ft_manager)
   GtkTreeSelection *selection;
   GtkTreeIter iter;
   GtkTreeModel *model;
-  EmpathyFile *file;
+  EmpathyTpFile *tp_file;
   const gchar *uri;
 
   priv = GET_PRIV (ft_manager);
@@ -951,10 +950,10 @@ ft_manager_open (EmpathyFTManager *ft_manager)
 
   gtk_tree_model_get_value (model, &iter, COL_FT_OBJECT, &val);
 
-  file = g_value_get_object (&val);
-  g_return_if_fail (file != NULL);
+  tp_file = g_value_get_object (&val);
+  g_return_if_fail (tp_file != NULL);
 
-  uri = g_object_get_data (G_OBJECT (file), "uri");
+  uri = g_object_get_data (G_OBJECT (tp_file), "uri");
   DEBUG ("Opening URI: %s", uri);
   empathy_url_show (uri);
 }
@@ -963,11 +962,11 @@ static void
 ft_manager_stop (EmpathyFTManager *ft_manager)
 {
   EmpathyFTManagerPriv *priv;
-  GValue                val = {0, };
-  GtkTreeSelection     *selection;
-  GtkTreeIter           iter;
-  GtkTreeModel         *model;
-  EmpathyFile          *file;
+  GValue val = {0, };
+  GtkTreeSelection *selection;
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+  EmpathyTpFile *tp_file;
 
   priv = GET_PRIV (ft_manager);
 
@@ -978,14 +977,14 @@ ft_manager_stop (EmpathyFTManager *ft_manager)
 
   gtk_tree_model_get_value (model, &iter, COL_FT_OBJECT, &val);
 
-  file = g_value_get_object (&val);
-  g_return_if_fail (file != NULL);
+  tp_file = g_value_get_object (&val);
+  g_return_if_fail (tp_file != NULL);
 
   DEBUG ("Stopping file transfer: contact=%s, filename=%s",
-      empathy_contact_get_name (empathy_file_get_contact (file)),
-      empathy_file_get_filename (file));
+      empathy_contact_get_name (empathy_tp_file_get_contact (tp_file)),
+      empathy_tp_file_get_filename (tp_file));
 
-  empathy_file_cancel (file);
+  empathy_tp_file_cancel (tp_file);
 
   g_value_unset (&val);
 }
@@ -1015,7 +1014,7 @@ ft_manager_response_cb (GtkWidget *dialog,
 
 typedef struct {
   EmpathyFTManager *ft_manager;
-  EmpathyFile      *file;
+  EmpathyTpFile *tp_file;
 } ReceiveResponseData;
 
 static void
@@ -1024,7 +1023,7 @@ free_receive_response_data (ReceiveResponseData *response_data)
   if (!response_data)
     return;
 
-  g_object_unref (response_data->file);
+  g_object_unref (response_data->tp_file);
   g_object_unref (response_data->ft_manager);
   g_free (response_data);
 }
@@ -1060,18 +1059,18 @@ ft_manager_save_dialog_response_cb (GtkDialog *widget,
               return;
             }
 
-          empathy_file_set_output_stream (response_data->file, out_stream);
+          empathy_tp_file_set_output_stream (response_data->tp_file, out_stream);
 
-          g_object_set_data_full (G_OBJECT (response_data->file),
+          g_object_set_data_full (G_OBJECT (response_data->tp_file),
               "uri", uri, g_free);
 
           filename = g_file_get_basename (file);
-          empathy_file_set_filename (response_data->file, filename);
+          empathy_tp_file_set_filename (response_data->tp_file, filename);
 
-          empathy_file_accept (response_data->file);
+          empathy_tp_file_accept (response_data->tp_file);
 
-          ft_manager_add_file_to_list (response_data->ft_manager,
-              response_data->file);
+          ft_manager_add_tp_file_to_list (response_data->ft_manager,
+              response_data->tp_file);
 
           g_free (filename);
           g_object_unref (file);
@@ -1119,7 +1118,7 @@ ft_manager_create_save_dialog (ReceiveResponseData *response_data)
     gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (widget), folder);
 
   gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (widget),
-      empathy_file_get_filename (response_data->file));
+      empathy_tp_file_get_filename (response_data->tp_file));
 
   gtk_dialog_add_buttons (GTK_DIALOG (widget),
       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -1153,7 +1152,7 @@ ft_manager_receive_file_response_cb (GtkWidget *dialog,
     ft_manager_create_save_dialog (response_data);
   else
     {
-      channel = empathy_file_get_channel (response_data->file);
+      channel = empathy_tp_file_get_channel (response_data->tp_file);
       tp_cli_channel_run_close (channel, -1, NULL, NULL);
       free_receive_response_data (response_data);
     }
@@ -1163,7 +1162,7 @@ ft_manager_receive_file_response_cb (GtkWidget *dialog,
 
 void
 ft_manager_display_accept_dialog (EmpathyFTManager *ft_manager,
-                                  EmpathyFile *file)
+                                  EmpathyTpFile *tp_file)
 {
   GtkWidget *dialog;
   GtkWidget *image;
@@ -1175,15 +1174,15 @@ ft_manager_display_accept_dialog (EmpathyFTManager *ft_manager,
   ReceiveResponseData *response_data;
 
   g_return_if_fail (EMPATHY_IS_FT_MANAGER (ft_manager));
-  g_return_if_fail (EMPATHY_IS_FILE (file));
+  g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
 
   DEBUG ("Creating accept dialog");
 
-  contact_name = empathy_contact_get_name (empathy_file_get_contact (file));
-  filename = empathy_file_get_filename (file);
+  contact_name = empathy_contact_get_name (empathy_tp_file_get_contact (tp_file));
+  filename = empathy_tp_file_get_filename (tp_file);
 
-  size = empathy_file_get_size (file);
-  if (size == EMPATHY_FILE_UNKNOWN_SIZE)
+  size = empathy_tp_file_get_size (tp_file);
+  if (size == EMPATHY_TP_FILE_UNKNOWN_SIZE)
     size_str = g_strdup (_("unknown size"));
   else
     size_str = g_format_size_for_display (size);
@@ -1225,7 +1224,7 @@ ft_manager_display_accept_dialog (EmpathyFTManager *ft_manager,
 
   response_data = g_new0 (ReceiveResponseData, 1);
   response_data->ft_manager = g_object_ref (ft_manager);
-  response_data->file = g_object_ref (file);
+  response_data->tp_file = g_object_ref (tp_file);
 
   g_signal_connect (dialog, "response",
       G_CALLBACK (ft_manager_receive_file_response_cb), response_data);
index b254c098869f782def0daf50f007860916023b86..ddfb08373526f441fcfe8547d44aedafd418accc 100644 (file)
@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <glib.h>
 
-#include <libempathy/empathy-file.h>
+#include <libempathy/empathy-tp-file.h>
 #include <libempathy/empathy-contact.h>
 
 G_BEGIN_DECLS
@@ -54,7 +54,7 @@ struct _EmpathyFTManagerClass
 GType empathy_ft_manager_get_type (void);
 
 EmpathyFTManager *empathy_ft_manager_get_default (void);
-void empathy_ft_manager_add_file (EmpathyFTManager *ft_manager, EmpathyFile *file);
+void empathy_ft_manager_add_tp_file (EmpathyFTManager *ft_manager, EmpathyTpFile *tp_file);
 GtkWidget *empathy_ft_manager_get_dialog (EmpathyFTManager *ft_manager);
 
 G_END_DECLS
index 19bc078f2b9f9e7953334b1928a4c5be40c2f506..ab4696271f22b9c9e715502e1a629d08696b02eb 100644 (file)
@@ -1473,23 +1473,23 @@ file_manager_send_file_response_cb (GtkDialog               *widget,
                        for (l = list; l; l = l->next) {
                                gchar            *uri;
                                GFile            *gfile;
-                               EmpathyFile      *file;
+                               EmpathyTpFile    *tp_file;
                                GtkRecentManager *manager;
 
                                uri = l->data;
                                gfile = g_file_new_for_uri (uri);
 
                                DEBUG ("\t%s", uri);
-                               file = empathy_send_file (response_data->contact,
-                                                         gfile);
+                               tp_file = empathy_send_file (response_data->contact,
+                                                            gfile);
                                if (response_data->callback)
-                                       response_data->callback (file,
+                                       response_data->callback (tp_file,
                                                                 response_data->user_data);
 
                                manager = gtk_recent_manager_get_default ();
                                gtk_recent_manager_add_item (manager, uri);
 
-                               if (file) ;
+                               if (tp_file) ;
                                        /* TODO: This should be unrefed, but
                                         * it's not referenced anywhere else,
                                         * so the transfer just ends. Uncomment
@@ -1571,10 +1571,10 @@ empathy_send_file_with_file_chooser (EmpathyContact             *contact,
 }
 
 static void
-add_file_to_manager (EmpathyFile      *file,
+add_file_to_manager (EmpathyTpFile    *tp_file,
                     EmpathyFTManager *ft_manager)
 {
-       empathy_ft_manager_add_file (ft_manager, file);
+       empathy_ft_manager_add_tp_file (ft_manager, tp_file);
 }
 
 void
index bb1d45f924560d1c59a582cd99ae3ec95dcd9356..f838c7d1f174361b32c0a13c07527e6b3fb6fed8 100644 (file)
@@ -115,8 +115,8 @@ GtkTextTag *empathy_text_buffer_tag_set                 (GtkTextBuffer *buffer,
                                                         const gchar   *first_property_name,
                                                         ...);
 
-typedef gboolean (*EmpathyFileChooserCallback)          (EmpathyFile *file,
-                                                        gpointer   user_data);
+typedef gboolean (*EmpathyFileChooserCallback)          (EmpathyTpFile *tp_file,
+                                                        gpointer       user_data);
 
 void        empathy_send_file_with_file_chooser         (EmpathyContact             *contact,
                                                         EmpathyFileChooserCallback  callback,
index 94ee1b1038466c1a712df17bbaed81000bbd13a5..cd9a52ff7b717061134761ee43b99e977bf4d71d 100644 (file)
@@ -25,7 +25,6 @@ libempathy_la_SOURCES =                                       \
        empathy-contact-manager.c                       \
        empathy-debug.c                                 \
        empathy-dispatcher.c                            \
-       empathy-file.c                                  \
        empathy-idle.c                                  \
        empathy-irc-network.c                           \
        empathy-irc-network-manager.c                   \
@@ -68,7 +67,6 @@ libempathy_headers =                          \
        empathy-contact-manager.h               \
        empathy-debug.h                         \
        empathy-dispatcher.h                    \
-       empathy-file.h                          \
        empathy-idle.h                          \
        empathy-irc-network.h                   \
        empathy-irc-network-manager.h           \
diff --git a/libempathy/empathy-file.c b/libempathy/empathy-file.c
deleted file mode 100644 (file)
index 80f19f6..0000000
+++ /dev/null
@@ -1,1178 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007 Collabora Ltd.
- *   @author: Xavier Claessens <xclaesse@gmail.com>
- * Copyright (C) 2007 Marco Barisione <marco@barisione.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-
-#include <glib/gi18n.h>
-
-#include <gio/gio.h>
-#include <gio/gunixinputstream.h>
-#include <gio/gunixoutputstream.h>
-
-#include <libtelepathy/tp-conn.h>
-#include <libtelepathy/tp-helpers.h>
-#include <libtelepathy/tp-props-iface.h>
-
-#include <telepathy-glib/proxy-subclass.h>
-
-#include "empathy-file.h"
-#include "empathy-contact-factory.h"
-#include "empathy-marshal.h"
-#include "empathy-time.h"
-#include "empathy-utils.h"
-
-#define DEBUG_FLAG EMPATHY_DEBUG_FT
-#include "empathy-debug.h"
-
-/**
- * SECTION:empathy-file
- * @short_description: File channel
- * @see_also: #EmpathyFile, #EmpathyContact, empathy_send_file()
- * @include: libempthy/empathy-file.h
- *
- * The #EmpathyFile object represents a Telepathy file channel.
- */
-
-/**
- * EMPATHY_FILE_UNKNOWN_SIZE:
- *
- * Value used for the "size" or "estimated-size" properties when the size of
- * the transferred file is unknown.
- */
-
-static void empathy_file_class_init (EmpathyFileClass *klass);
-static void empathy_file_init (EmpathyFile *file);
-static void file_finalize (GObject *object);
-static GObject *file_constructor (GType type, guint n_props,
-    GObjectConstructParam *props);
-static void file_get_property (GObject *object, guint param_id, GValue *value,
-    GParamSpec *pspec);
-static void file_set_property (GObject *object, guint param_id, const GValue *value,
-    GParamSpec *pspec);
-static void file_destroy_cb (TpChannel *file_chan, EmpathyFile *file);
-static void file_closed_cb (TpChannel *file_chan, EmpathyFile *file,
-    GObject *weak_object);
-static void file_state_changed_cb (DBusGProxy *file_iface, guint state,
-    guint reason, EmpathyFile *file);
-static void file_transferred_bytes_changed_cb (TpProxy *proxy, guint64 count,
-    EmpathyFile *file, GObject *weak_object);
-static void copy_stream (GInputStream *in, GOutputStream *out,
-    GCancellable *cancellable);
-
-/* EmpathyFile object */
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-           EMPATHY_TYPE_FILE, EmpathyFilePriv))
-
-typedef struct _EmpathyFilePriv  EmpathyFilePriv;
-
-struct _EmpathyFilePriv {
-  EmpathyContactFactory *factory;
-  McAccount *account;
-  gchar *id;
-  MissionControl *mc;
-  TpChannel *channel;
-
-  EmpathyFile *cached_empathy_file;
-  EmpathyContact *contact;
-  GInputStream *in_stream;
-  GOutputStream *out_stream;
-  gchar *filename;
-  EmpFileTransferDirection direction;
-  EmpFileTransferState state;
-  EmpFileTransferStateChangeReason state_change_reason;
-  guint64 size;
-  guint64 transferred_bytes;
-  gint64 start_time;
-  gchar *unix_socket_path;
-  gchar *content_md5;
-  gchar *content_type;
-  gchar *description;
-  GCancellable *cancellable;
-};
-
-enum {
-  PROP_0,
-  PROP_ACCOUNT,
-  PROP_CHANNEL,
-  PROP_STATE,
-  PROP_DIRECTION,
-  PROP_FILENAME,
-  PROP_SIZE,
-  PROP_CONTENT_TYPE,
-  PROP_TRANSFERRED_BYTES,
-  PROP_CONTENT_MD5,
-  PROP_IN_STREAM,
-};
-
-G_DEFINE_TYPE (EmpathyFile, empathy_file, G_TYPE_OBJECT);
-
-static void
-empathy_file_class_init (EmpathyFileClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = file_finalize;
-  object_class->constructor = file_constructor;
-  object_class->get_property = file_get_property;
-  object_class->set_property = file_set_property;
-
-  /* Construct-only properties */
-  g_object_class_install_property (object_class,
-      PROP_ACCOUNT,
-      g_param_spec_object ("account",
-          "channel Account",
-          "The account associated with the channel",
-          MC_TYPE_ACCOUNT,
-          G_PARAM_READWRITE |
-          G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class,
-      PROP_CHANNEL,
-      g_param_spec_object ("channel",
-          "telepathy channel",
-          "The file transfer channel",
-          TP_TYPE_CHANNEL,
-          G_PARAM_READWRITE |
-          G_PARAM_CONSTRUCT_ONLY));
-
-  g_object_class_install_property (object_class,
-      PROP_STATE,
-      g_param_spec_uint ("state",
-          "state of the transfer",
-          "The file transfer state",
-          0,
-          G_MAXUINT,
-          G_MAXUINT,
-          G_PARAM_READWRITE |
-          G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (object_class,
-      PROP_DIRECTION,
-      g_param_spec_uint ("direction",
-          "direction of the transfer",
-          "The file transfer direction",
-          0,
-          G_MAXUINT,
-          G_MAXUINT,
-          G_PARAM_READWRITE |
-          G_PARAM_CONSTRUCT));
-
-  g_object_class_install_property (object_class,
-      PROP_FILENAME,
-      g_param_spec_string ("filename",
-          "name of the transfer",
-          "The file transfer filename",
-          "",
-          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-      PROP_SIZE,
-      g_param_spec_uint64 ("size",
-          "size of the file",
-          "The file transfer size",
-          0,
-          G_MAXUINT64,
-          G_MAXUINT64,
-          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-      PROP_CONTENT_TYPE,
-      g_param_spec_string ("content-type",
-          "file transfer content-type",
-          "The file transfer content-type",
-          "",
-          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-      PROP_CONTENT_MD5,
-      g_param_spec_string ("content-md5",
-          "file transfer md5sum",
-          "The md5 sum of the transfer's contents",
-          "",
-          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-      PROP_TRANSFERRED_BYTES,
-      g_param_spec_uint64 ("transferred-bytes",
-          "bytes transferred",
-          "The number of bytes transferred",
-          0,
-          G_MAXUINT64,
-          0,
-          G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-      PROP_IN_STREAM,
-      g_param_spec_object ("in-stream",
-          "transfer input stream",
-          "The input stream for file transfer",
-          G_TYPE_INPUT_STREAM,
-          G_PARAM_READWRITE));
-
-  g_type_class_add_private (object_class, sizeof (EmpathyFilePriv));
-}
-
-static void
-empathy_file_init (EmpathyFile *file)
-{
-}
-
-static void
-file_finalize (GObject *object)
-{
-  EmpathyFilePriv *priv;
-  EmpathyFile *file;
-
-  file = EMPATHY_FILE (object);
-  priv = GET_PRIV (file);
-
-  if (priv->channel)
-    {
-      DEBUG ("Closing channel..");
-      g_signal_handlers_disconnect_by_func (priv->channel,
-          file_destroy_cb, object);
-      tp_cli_channel_run_close (priv->channel, -1, NULL, NULL);
-      if (G_IS_OBJECT (priv->channel))
-        g_object_unref (priv->channel);
-    }
-
-  if (priv->factory)
-    {
-      g_object_unref (priv->factory);
-    }
-  if (priv->account)
-    {
-      g_object_unref (priv->account);
-    }
-  if (priv->mc)
-    {
-      g_object_unref (priv->mc);
-    }
-
-  g_free (priv->id);
-  g_free (priv->filename);
-  g_free (priv->unix_socket_path);
-  g_free (priv->description);
-  g_free (priv->content_md5);
-  g_free (priv->content_type);
-
-  if (priv->in_stream)
-    g_object_unref (priv->in_stream);
-
-  if (priv->out_stream)
-    g_object_unref (priv->out_stream);
-
-  if (priv->contact)
-    g_object_unref (priv->contact);
-
-  if (priv->cancellable)
-    g_object_unref (priv->cancellable);
-
-  G_OBJECT_CLASS (empathy_file_parent_class)->finalize (object);
-}
-
-static GObject *
-file_constructor (GType type,
-                  guint n_props,
-                  GObjectConstructParam *props)
-{
-  GObject *file;
-  EmpathyFilePriv *priv;
-  GError *error = NULL;
-  GHashTable *properties;
-  TpHandle handle;
-
-  file = G_OBJECT_CLASS (empathy_file_parent_class)->constructor (type, n_props,
-      props);
-
-  priv = GET_PRIV (file);
-
-  priv->factory = empathy_contact_factory_new ();
-  priv->mc = empathy_mission_control_new ();
-
-  tp_cli_channel_connect_to_closed (priv->channel,
-      (tp_cli_channel_signal_callback_closed) file_closed_cb,
-      file,
-      NULL, NULL, NULL);
-
-  emp_cli_channel_type_file_connect_to_file_transfer_state_changed (
-      TP_PROXY (priv->channel),
-      (emp_cli_channel_type_file_signal_callback_file_transfer_state_changed)
-          file_state_changed_cb,
-      file,
-      NULL, NULL, NULL);
-
-  emp_cli_channel_type_file_connect_to_transferred_bytes_changed (
-      TP_PROXY (priv->channel),
-      (emp_cli_channel_type_file_signal_callback_transferred_bytes_changed)
-          file_transferred_bytes_changed_cb,
-      file,
-      NULL, NULL, NULL);
-
-
-  handle = tp_channel_get_handle (priv->channel, NULL);
-  priv->contact = empathy_contact_factory_get_from_handle (priv->factory,
-      priv->account,
-      (guint) handle);
-
-  if (!tp_cli_dbus_properties_run_get_all (priv->channel,
-      -1, EMP_IFACE_CHANNEL_TYPE_FILE, &properties, &error, NULL))
-    {
-      DEBUG ("Failed to get properties: %s",
-          error ? error->message : "No error given");
-      g_clear_error (&error);
-      return NULL;
-    }
-
-  priv->size = g_value_get_uint64 (g_hash_table_lookup (properties, "Size"));
-
-  priv->state = g_value_get_uint (g_hash_table_lookup (properties, "State"));
-
-  /* Invalid reason, so empathy_file_get_state_change_reason() can give
-   * a warning if called for a not closed file transfer. */
-  priv->state_change_reason = -1;
-
-  priv->transferred_bytes = g_value_get_uint64 (g_hash_table_lookup (
-      properties, "TransferredBytes"));
-
-  priv->filename = g_value_dup_string (g_hash_table_lookup (properties,
-      "Filename"));
-
-  priv->content_md5 = g_value_dup_string (g_hash_table_lookup (properties,
-      "ContentMD5"));
-
-  priv->description = g_value_dup_string (g_hash_table_lookup (properties,
-      "Description"));
-
-  priv->unix_socket_path = g_value_dup_string (g_hash_table_lookup (properties,
-      "SocketPath"));
-
-  priv->direction = g_value_get_uint (g_hash_table_lookup (properties,
-      "Direction"));
-
-  g_hash_table_destroy (properties);
-
-  return file;
-}
-
-static void
-file_get_property (GObject *object,
-                   guint param_id,
-                   GValue *value,
-                   GParamSpec *pspec)
-{
-  EmpathyFilePriv *priv;
-  EmpathyFile *file;
-
-  priv = GET_PRIV (object);
-  file = EMPATHY_FILE (object);
-
-  switch (param_id)
-    {
-      case PROP_ACCOUNT:
-        g_value_set_object (value, priv->account);
-        break;
-      case PROP_CHANNEL:
-        g_value_set_object (value, priv->channel);
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    };
-}
-
-static void
-file_channel_set_dbus_property (gpointer proxy,
-                                const gchar *property,
-                                const GValue *value)
-{
-        DEBUG ("Setting %s property", property);
-        tp_cli_dbus_properties_run_set (TP_PROXY (proxy),
-            -1,
-            EMP_IFACE_CHANNEL_TYPE_FILE,
-            property,
-            value,
-            NULL, NULL);
-        DEBUG ("done");
-}
-
-
-static void
-file_set_property (GObject *object,
-                   guint param_id,
-                   const GValue *value,
-                   GParamSpec *pspec)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (object);
-
-  switch (param_id)
-    {
-      case PROP_ACCOUNT:
-        priv->account = g_object_ref (g_value_get_object (value));
-        break;
-      case PROP_CHANNEL:
-        priv->channel = g_object_ref (g_value_get_object (value));
-        break;
-      case PROP_STATE:
-        priv->state = g_value_get_uint (value);
-        break;
-      case PROP_DIRECTION:
-        priv->direction = g_value_get_uint (value);
-        break;
-      case PROP_FILENAME:
-        g_free (priv->filename);
-        priv->filename = g_value_dup_string (value);
-        file_channel_set_dbus_property (priv->channel, "Filename", value);
-        break;
-      case PROP_SIZE:
-        priv->size = g_value_get_uint64 (value);
-        file_channel_set_dbus_property (priv->channel, "Size", value);
-        break;
-      case PROP_CONTENT_TYPE:
-        file_channel_set_dbus_property (priv->channel, "ContentType", value);
-        g_free (priv->content_type);
-        priv->content_type = g_value_dup_string (value);
-        break;
-      case PROP_CONTENT_MD5:
-        file_channel_set_dbus_property (priv->channel, "ContentMD5", value);
-        g_free (priv->content_md5);
-        priv->content_md5 = g_value_dup_string (value);
-        break;
-      case PROP_IN_STREAM:
-        if (priv->in_stream)
-          g_object_unref (priv->in_stream);
-        priv->in_stream = g_object_ref (g_value_get_object (value));
-        break;
-      default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
-        break;
-    };
-}
-
-/**
- * empathy_file_new:
- * @account: the #McAccount for the channel
- * @channel: a Telepathy channel
- *
- * Creates a new #EmpathyFile wrapping @channel.
- *
- * Returns: a new #EmpathyFile
- */
-EmpathyFile *
-empathy_file_new (McAccount *account,
-                  TpChannel *channel)
-{
-  return g_object_new (EMPATHY_TYPE_FILE,
-      "account", account,
-      "channel", channel,
-      NULL);
-}
-
-/**
- * empathy_file_get_id:
- * @tp_file: an #EmpathyFile
- *
- * Returns the ID of @file.
- *
- * Returns: the ID
- */
-const gchar *
-empathy_file_get_id (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_FILE (file), NULL);
-
-  priv = GET_PRIV (file);
-
-  return priv->id;
-}
-
-/**
- * empathy_file_get_channel
- * @file: an #EmpathyFile
- *
- * Returns the Telepathy file transfer channel
- *
- * Returns: the #TpChannel
- */
-TpChannel *
-empathy_file_get_channel (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  g_return_val_if_fail (EMPATHY_IS_FILE (file), NULL);
-
-  priv = GET_PRIV (file);
-
-  return priv->channel;
-}
-
-static void
-file_destroy_cb (TpChannel *file_channel,
-                 EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  DEBUG ("Channel Closed or CM crashed");
-
-  g_object_unref (priv->channel);
-  priv->channel = NULL;
-}
-
-static void
-file_closed_cb (TpChannel *file_channel,
-                EmpathyFile *file,
-                GObject *weak_object)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  /* The channel is closed, do just like if the proxy was destroyed */
-  g_signal_handlers_disconnect_by_func (priv->channel,
-      file_destroy_cb,
-      file);
-  file_destroy_cb (file_channel, file);
-}
-
-static gint64
-get_time_msec (void)
-{
-  GTimeVal tv;
-
-  g_get_current_time (&tv);
-  return ((gint64) tv.tv_sec) * 1000 + tv.tv_usec / 1000;
-}
-
-static gint
-_get_local_socket (EmpathyFile *file)
-{
-  gint fd;
-  size_t path_len;
-  struct sockaddr_un addr;
-  EmpathyFilePriv *priv;
-  GValue *socket_path;
-
-  priv = GET_PRIV (file);
-
-  /* TODO: This could probably be a little nicer. */
-  tp_cli_dbus_properties_run_get (priv->channel,
-      -1,
-      EMP_IFACE_CHANNEL_TYPE_FILE,
-      "SocketPath",
-      &socket_path,
-      NULL,
-      NULL);
-
-  if (priv->unix_socket_path)
-    g_free (priv->unix_socket_path);
-
-  priv->unix_socket_path = g_value_dup_string (socket_path);
-  g_value_unset (socket_path);
-
-  if (G_STR_EMPTY (priv->unix_socket_path))
-    return -1;
-
-  fd = socket (PF_UNIX, SOCK_STREAM, 0);
-  if (fd < 0)
-    return -1;
-
-  memset (&addr, 0, sizeof (addr));
-  addr.sun_family = AF_UNIX;
-  path_len = strlen (priv->unix_socket_path);
-  strncpy (addr.sun_path, priv->unix_socket_path, path_len);
-
-  if (connect (fd, (struct sockaddr*) &addr,
-      sizeof (addr)) < 0)
-    {
-      close (fd);
-      return -1;
-    }
-
-  return fd;
-}
-
-/**
- * empathy_file_accept:
- * @file: an #EmpathyFile
- *
- * Accepts a file transfer that's in the "local pending" state (i.e.
- * EMP_FILE_TRANSFER_STATE_LOCAL_PENDING).
- */
-void
-empathy_file_accept (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-  GValue *address;
-  GValue nothing = { 0 };
-  GError *error = NULL;
-
-  g_return_if_fail (EMPATHY_IS_FILE (file));
-
-  priv = GET_PRIV (file);
-
-  g_return_if_fail (priv->out_stream != NULL);
-
-  DEBUG ("Accepting file: filename=%s", priv->filename);
-
-  g_value_init (&nothing, G_TYPE_STRING);
-  g_value_set_string (&nothing, "");
-
-  if (!emp_cli_channel_type_file_run_accept_file (TP_PROXY (priv->channel),
-      -1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
-      &nothing, &address, &error, NULL))
-    {
-      DEBUG ("Accept error: %s",
-          error ? error->message : "No message given");
-      g_clear_error (&error);
-    }
-
-  if (priv->unix_socket_path)
-    g_free (priv->unix_socket_path);
-
-  priv->unix_socket_path = g_value_dup_string (address);
-  g_value_unset (address);
-
-  DEBUG ("Got unix socket path: %s", priv->unix_socket_path);
-}
-
-static void
-receive_file (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-  GInputStream *socket_stream;
-  gint socket_fd;
-
-  priv = GET_PRIV (file);
-
-  socket_fd = _get_local_socket (file);
-
-  if (socket_fd < 0)
-    return;
-
-  socket_stream = g_unix_input_stream_new (socket_fd, TRUE);
-
-  priv->cancellable = g_cancellable_new ();
-
-  copy_stream (socket_stream, priv->out_stream, priv->cancellable);
-
-  g_object_unref (socket_stream);
-}
-
-
-static void
-send_file (EmpathyFile *file)
-{
-  gint socket_fd;
-  GOutputStream *socket_stream;
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  DEBUG ("Sending file content: filename=%s",
-           priv->filename);
-
-  g_return_if_fail (priv->in_stream);
-
-  socket_fd = _get_local_socket (file);
-  if (socket_fd < 0)
-    {
-      DEBUG ("failed to get local socket fd");
-      return;
-    }
-  DEBUG ("got local socket fd");
-  socket_stream = g_unix_output_stream_new (socket_fd, TRUE);
-
-  priv->cancellable = g_cancellable_new ();
-
-  copy_stream (priv->in_stream, socket_stream, priv->cancellable);
-
-  g_object_unref (socket_stream);
-}
-
-static void
-file_state_changed_cb (DBusGProxy *file_iface,
-                       EmpFileTransferState state,
-                       EmpFileTransferStateChangeReason reason,
-                       EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  DEBUG ("File transfer state changed: filename=%s, "
-      "old state=%u, state=%u, reason=%u",
-      priv->filename, priv->state, state, reason);
-
-  if (state == EMP_FILE_TRANSFER_STATE_OPEN)
-    priv->start_time = get_time_msec ();
-
-  DEBUG ("state = %u, direction = %u, in_stream = %s, out_stream = %s",
-      state, priv->direction,
-      priv->in_stream ? "present" : "not present",
-      priv->out_stream ? "present" : "not present");
-
-  if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
-      priv->direction == EMP_FILE_TRANSFER_DIRECTION_OUTGOING &&
-      priv->in_stream)
-    send_file (file);
-  else if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
-      priv->direction == EMP_FILE_TRANSFER_DIRECTION_INCOMING &&
-      priv->out_stream)
-      receive_file (file);
-
-  priv->state = state;
-  priv->state_change_reason = reason;
-
-  g_object_notify (G_OBJECT (file), "state");
-}
-
-static void
-file_transferred_bytes_changed_cb (TpProxy *proxy,
-                                   guint64 count,
-                                   EmpathyFile *file, 
-                                   GObject *weak_object)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  if (priv->transferred_bytes == count)
-    return;
-
-  priv->transferred_bytes = count;
-
-  g_object_notify (G_OBJECT (file), "transferred-bytes");
-}
-
-EmpathyContact *
-empathy_file_get_contact (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->contact;
-}
-
-GInputStream *
-empathy_file_get_input_stream (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->in_stream;
-}
-
-GOutputStream *
-empathy_file_get_output_stream (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->out_stream;
-}
-
-const gchar *
-empathy_file_get_filename (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->filename;
-}
-
-EmpFileTransferDirection
-empathy_file_get_direction (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->direction;
-}
-
-EmpFileTransferState
-empathy_file_get_state (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->state;
-}
-
-EmpFileTransferStateChangeReason
-empathy_file_get_state_change_reason (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  g_return_val_if_fail (priv->state_change_reason >= 0,
-      EMP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
-
-  return priv->state_change_reason;
-}
-
-guint64
-empathy_file_get_size (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->size;
-}
-
-guint64
-empathy_file_get_transferred_bytes (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  return priv->transferred_bytes;
-}
-
-gint
-empathy_file_get_remaining_time (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-  gint64 curr_time, elapsed_time;
-  gdouble time_per_byte;
-  gdouble remaining_time;
-
-  priv = GET_PRIV (file);
-
-  if (priv->size == EMPATHY_FILE_UNKNOWN_SIZE)
-    return -1;
-
-  if (priv->transferred_bytes == priv->size)
-    return 0;
-
-  curr_time = get_time_msec ();
-  elapsed_time = curr_time - priv->start_time;
-  time_per_byte = (gdouble) elapsed_time / (gdouble) priv->transferred_bytes;
-  remaining_time = (time_per_byte * (priv->size - priv->transferred_bytes)) / 1000;
-
-  return (gint) (remaining_time + 0.5);
-}
-
-void
-empathy_file_cancel (EmpathyFile *file)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  tp_cli_channel_run_close (priv->channel, -1, NULL, NULL);
-
-  g_cancellable_cancel (priv->cancellable);
-}
-
-void
-empathy_file_set_input_stream (EmpathyFile *file,
-                               GInputStream *in_stream)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  if (priv->in_stream == in_stream)
-    return;
-
-  if (priv->direction == EMP_FILE_TRANSFER_DIRECTION_INCOMING)
-    g_warning ("Setting an input stream for incoming file "
-         "transfers is useless");
-
-  if (priv->in_stream)
-    g_object_unref (priv->in_stream);
-
-  if (in_stream)
-    g_object_ref (in_stream);
-
-  priv->in_stream = in_stream;
-
-  g_object_notify (G_OBJECT (file), "in-stream");
-}
-
-void
-empathy_file_set_output_stream (EmpathyFile *file,
-                                GOutputStream *out_stream)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  if (priv->out_stream == out_stream)
-    return;
-
-  if (priv->direction == EMP_FILE_TRANSFER_DIRECTION_OUTGOING)
-    g_warning ("Setting an output stream for outgoing file "
-         "transfers is useless");
-
-  if (priv->out_stream)
-    g_object_unref (priv->out_stream);
-
-  if (out_stream)
-    g_object_ref (out_stream);
-
-  priv->out_stream = out_stream;
-}
-
-void
-empathy_file_set_filename (EmpathyFile *file,
-                           const gchar *filename)
-{
-  EmpathyFilePriv *priv;
-
-  priv = GET_PRIV (file);
-
-  g_return_if_fail (filename != NULL);
-
-  if (priv->filename && strcmp (filename, priv->filename) == 0)
-    return;
-
-  g_free (priv->filename);
-  priv->filename = g_strdup (filename);
-
-  g_object_notify (G_OBJECT (file), "filename");
-}
-
-/* Functions to copy the content of a GInputStream to a GOutputStream */
-
-#define N_BUFFERS 2
-#define BUFFER_SIZE 4096
-
-typedef struct {
-  GInputStream *in;
-  GOutputStream *out;
-  GCancellable  *cancellable;
-  char *buff[N_BUFFERS]; /* the temporary buffers */
-  gsize count[N_BUFFERS]; /* how many bytes are used in the buffers */
-  gboolean is_full[N_BUFFERS]; /* whether the buffers contain data */
-  gint curr_read; /* index of the buffer used for reading */
-  gint curr_write; /* index of the buffer used for writing */
-  gboolean is_reading; /* we are reading */
-  gboolean is_writing; /* we are writing */
-  guint n_closed; /* number of streams that have been closed */
-} CopyData;
-
-static void schedule_next (CopyData *copy);
-
-static void
-free_copy_data_if_closed (CopyData *copy)
-{
-  gint i;
-
-  /* Free the data only if both the input and output streams have
-   * been closed. */
-  copy->n_closed++;
-  if (copy->n_closed < 2)
-    return;
-
-  if (copy->in != NULL)
-    g_object_unref (copy->in);
-
-  if (copy->out != NULL)
-    g_object_unref (copy->out);
-
-  for (i = 0; i < N_BUFFERS; i++)
-    g_free (copy->buff[i]);
-
-  g_object_unref (copy->cancellable);
-  g_free (copy);
-}
-
-static void
-io_error (CopyData *copy,
-          GError *error)
-{
-  g_cancellable_cancel (copy->cancellable);
-
-  if (error == NULL)
-    g_warning ("I/O error");
-  else if (error->domain == G_IO_ERROR && error->code == G_IO_ERROR_CANCELLED)
-    ; /* Ignore cancellations */
-  else
-    g_warning ("I/O error: %d: %s\n", error->code, error->message);
-
-  if (copy->in != NULL)
-    g_input_stream_close (copy->in, NULL, NULL);
-
-  if (copy->out != NULL)
-    g_output_stream_close (copy->out, NULL, NULL);
-
-  free_copy_data_if_closed (copy);
-}
-
-static void
-close_done (GObject *source_object,
-            GAsyncResult *res,
-            gpointer user_data)
-{
-  CopyData *copy = user_data;
-
-  g_object_unref (source_object);
-  free_copy_data_if_closed (copy);
-}
-
-static void
-write_done_cb (GObject *source_object,
-               GAsyncResult *res,
-               gpointer user_data)
-{
-  CopyData *copy = user_data;
-  gssize count_write;
-  GError *error = NULL;
-
-  count_write = g_output_stream_write_finish (copy->out, res, &error);
-
-  if (count_write <= 0)
-    {
-      io_error (copy, error);
-      g_error_free (error);
-      return;
-    }
-
-  copy->is_full[copy->curr_write] = FALSE;
-  copy->curr_write = (copy->curr_write + 1) % N_BUFFERS;
-  copy->is_writing = FALSE;
-
-  schedule_next (copy);
-}
-
-static void
-read_done_cb (GObject *source_object,
-              GAsyncResult *res,
-              gpointer user_data)
-{
-  CopyData *copy = user_data;
-  gssize count_read;
-  GError *error = NULL;
-
-  count_read = g_input_stream_read_finish (copy->in, res, &error);
-
-  if (count_read == 0)
-    {
-      g_input_stream_close_async (copy->in, 0, copy->cancellable,
-          close_done, copy);
-      copy->in = NULL;
-    }
-  else if (count_read < 0)
-    {
-      io_error (copy, error);
-      g_error_free (error);
-      return;
-    }
-
-  copy->count[copy->curr_read] = count_read;
-  copy->is_full[copy->curr_read] = TRUE;
-  copy->curr_read = (copy->curr_read + 1) % N_BUFFERS;
-  copy->is_reading = FALSE;
-
-  schedule_next (copy);
-}
-
-static void
-schedule_next (CopyData *copy)
-{
-  if (copy->in != NULL &&
-      !copy->is_reading &&
-      !copy->is_full[copy->curr_read])
-    {
-      /* We are not reading and the current buffer is empty, so
-       * start an async read. */
-      copy->is_reading = TRUE;
-      g_input_stream_read_async (copy->in,
-          copy->buff[copy->curr_read],
-          BUFFER_SIZE, 0, copy->cancellable,
-          read_done_cb, copy);
-    }
-
-  if (!copy->is_writing &&
-      copy->is_full[copy->curr_write])
-    {
-      if (copy->count[copy->curr_write] == 0)
-        {
-          /* The last read on the buffer read 0 bytes, this
-           * means that we got an EOF, so we can close
-           * the output channel. */
-          g_output_stream_close_async (copy->out, 0,
-              copy->cancellable,
-              close_done, copy);
-      copy->out = NULL;
-        }
-      else
-        {
-          /* We are not writing and the current buffer contains
-           * data, so start an async write. */
-          copy->is_writing = TRUE;
-          g_output_stream_write_async (copy->out,
-              copy->buff[copy->curr_write],
-              copy->count[copy->curr_write],
-              0, copy->cancellable,
-              write_done_cb, copy);
-        }
-    }
-}
-
-static void
-copy_stream (GInputStream *in,
-             GOutputStream *out,
-             GCancellable *cancellable)
-{
-  CopyData *copy;
-  gint i;
-
-  g_return_if_fail (in != NULL);
-  g_return_if_fail (out != NULL);
-
-  copy = g_new0 (CopyData, 1);
-  copy->in = g_object_ref (in);
-  copy->out = g_object_ref (out);
-
-  if (cancellable != NULL)
-    copy->cancellable = g_object_ref (cancellable);
-  else
-    copy->cancellable = g_cancellable_new ();
-
-  for (i = 0; i < N_BUFFERS; i++)
-    copy->buff[i] = g_malloc (BUFFER_SIZE);
-
-  schedule_next (copy);
-}
diff --git a/libempathy/empathy-file.h b/libempathy/empathy-file.h
deleted file mode 100644 (file)
index ef1cc3d..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2007 Marco Barisione <marco@barisione.org>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef __EMPATHY_FILE_H__
-#define __EMPATHY_FILE_H__
-
-#include <gio/gio.h>
-#include <glib.h>
-
-#include <telepathy-glib/channel.h>
-#include <libtelepathy/tp-constants.h>
-
-#include <extensions/extensions.h>
-
-#include "empathy-contact.h"
-
-#include <libmissioncontrol/mc-account.h>
-
-/* Forward-declaration to resolve cyclic dependencies */
-typedef struct _EmpathyFile      EmpathyFile;
-
-#include "empathy-file.h"
-
-G_BEGIN_DECLS
-
-#define EMPATHY_FILE_UNKNOWN_SIZE G_MAXUINT64
-
-#define EMPATHY_TYPE_FILE         (empathy_file_get_type ())
-#define EMPATHY_FILE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_FILE, EmpathyFile))
-#define EMPATHY_FILE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_FILE, EmpathyFileClass))
-#define EMPATHY_IS_FILE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_FILE))
-#define EMPATHY_IS_FILE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_FILE))
-#define EMPATHY_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_FILE, EmpathyFileClass))
-
-typedef struct _EmpathyFileClass EmpathyFileClass;
-
-struct _EmpathyFile
-{
-  GObject      parent;
-};
-
-struct _EmpathyFileClass
-{
-  GObjectClass parent_class;
-};
-
-GType empathy_file_get_type (void) G_GNUC_CONST;
-
-EmpathyFile *empathy_file_new (McAccount *account, TpChannel *channel);
-
-TpChannel *empathy_file_get_channel (EmpathyFile *file);
-void empathy_file_accept (EmpathyFile *file);
-void empathy_file_cancel (EmpathyFile *file);
-
-const gchar *empathy_file_get_id (EmpathyFile *file);
-guint64 empathy_file_get_transferred_bytes (EmpathyFile *file);
-EmpathyContact *empathy_file_get_contact (EmpathyFile *file);
-GInputStream *empathy_file_get_input_stream (EmpathyFile *file);
-GOutputStream *empathy_file_get_output_stream (EmpathyFile *file);
-const gchar *empathy_file_get_filename (EmpathyFile *file);
-EmpFileTransferDirection empathy_file_get_direction (EmpathyFile *file);
-EmpFileTransferState empathy_file_get_state (EmpathyFile *file);
-EmpFileTransferStateChangeReason empathy_file_get_state_change_reason (EmpathyFile *file);
-guint64 empathy_file_get_size (EmpathyFile *file);
-guint64 empathy_file_get_transferred_bytes (EmpathyFile *file);
-gint empathy_file_get_remaining_time (EmpathyFile *file);
-
-void empathy_file_set_input_stream (EmpathyFile *file, GInputStream *uri);
-void empathy_file_set_output_stream (EmpathyFile *file, GOutputStream *uri);
-void empathy_file_set_filename (EmpathyFile *file, const gchar *filename);
-
-G_END_DECLS
-
-#endif /* __EMPATHY_FILE_H__ */
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
new file mode 100644 (file)
index 0000000..ff3eff6
--- /dev/null
@@ -0,0 +1,1178 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007 Collabora Ltd.
+ *   @author: Xavier Claessens <xclaesse@gmail.com>
+ * Copyright (C) 2007 Marco Barisione <marco@barisione.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <config.h>
+
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include <glib/gi18n.h>
+
+#include <gio/gio.h>
+#include <gio/gunixinputstream.h>
+#include <gio/gunixoutputstream.h>
+
+#include <libtelepathy/tp-conn.h>
+#include <libtelepathy/tp-helpers.h>
+#include <libtelepathy/tp-props-iface.h>
+
+#include <telepathy-glib/proxy-subclass.h>
+
+#include "empathy-tp-file.h"
+#include "empathy-contact-factory.h"
+#include "empathy-marshal.h"
+#include "empathy-time.h"
+#include "empathy-utils.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_FT
+#include "empathy-debug.h"
+
+/**
+ * SECTION:empathy-tp-file
+ * @short_description: File channel
+ * @see_also: #EmpathyTpFile, #EmpathyContact, empathy_send_file()
+ * @include: libempthy/empathy-tp-file.h
+ *
+ * The #EmpathyTpFile object represents a Telepathy file channel.
+ */
+
+/**
+ * EMPATHY_TP_FILE_UNKNOWN_SIZE:
+ *
+ * Value used for the "size" or "estimated-size" properties when the size of
+ * the transferred file is unknown.
+ */
+
+static void empathy_tp_file_class_init (EmpathyTpFileClass *klass);
+static void empathy_tp_file_init (EmpathyTpFile *tp_file);
+static void tp_file_finalize (GObject *object);
+static GObject *tp_file_constructor (GType type, guint n_props,
+    GObjectConstructParam *props);
+static void tp_file_get_property (GObject *object, guint param_id,
+    GValue *value, GParamSpec *pspec);
+static void tp_file_set_property (GObject *object, guint param_id,
+    const GValue *value, GParamSpec *pspec);
+static void tp_file_destroy_cb (TpChannel *file_chan, EmpathyTpFile *tp_file);
+static void tp_file_closed_cb (TpChannel *file_chan, EmpathyTpFile *tp_file,
+    GObject *weak_object);
+static void tp_file_state_changed_cb (DBusGProxy *file_iface, guint state,
+    guint reason, EmpathyTpFile *tp_file);
+static void tp_file_transferred_bytes_changed_cb (TpProxy *proxy,
+    guint64 count, EmpathyTpFile *tp_file, GObject *weak_object);
+static void copy_stream (GInputStream *in, GOutputStream *out,
+    GCancellable *cancellable);
+
+/* EmpathyTpFile object */
+
+#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
+           EMPATHY_TYPE_TP_FILE, EmpathyTpFilePriv))
+
+typedef struct _EmpathyTpFilePriv  EmpathyTpFilePriv;
+
+struct _EmpathyTpFilePriv {
+  EmpathyContactFactory *factory;
+  McAccount *account;
+  gchar *id;
+  MissionControl *mc;
+  TpChannel *channel;
+
+  EmpathyTpFile *cached_empathy_file;
+  EmpathyContact *contact;
+  GInputStream *in_stream;
+  GOutputStream *out_stream;
+  gchar *filename;
+  EmpFileTransferDirection direction;
+  EmpFileTransferState state;
+  EmpFileTransferStateChangeReason state_change_reason;
+  guint64 size;
+  guint64 transferred_bytes;
+  gint64 start_time;
+  gchar *unix_socket_path;
+  gchar *content_md5;
+  gchar *content_type;
+  gchar *description;
+  GCancellable *cancellable;
+};
+
+enum {
+  PROP_0,
+  PROP_ACCOUNT,
+  PROP_CHANNEL,
+  PROP_STATE,
+  PROP_DIRECTION,
+  PROP_FILENAME,
+  PROP_SIZE,
+  PROP_CONTENT_TYPE,
+  PROP_TRANSFERRED_BYTES,
+  PROP_CONTENT_MD5,
+  PROP_IN_STREAM,
+};
+
+G_DEFINE_TYPE (EmpathyTpFile, empathy_tp_file, G_TYPE_OBJECT);
+
+static void
+empathy_tp_file_class_init (EmpathyTpFileClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = tp_file_finalize;
+  object_class->constructor = tp_file_constructor;
+  object_class->get_property = tp_file_get_property;
+  object_class->set_property = tp_file_set_property;
+
+  /* Construct-only properties */
+  g_object_class_install_property (object_class,
+      PROP_ACCOUNT,
+      g_param_spec_object ("account",
+          "channel Account",
+          "The account associated with the channel",
+          MC_TYPE_ACCOUNT,
+          G_PARAM_READWRITE |
+          G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class,
+      PROP_CHANNEL,
+      g_param_spec_object ("channel",
+          "telepathy channel",
+          "The file transfer channel",
+          TP_TYPE_CHANNEL,
+          G_PARAM_READWRITE |
+          G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (object_class,
+      PROP_STATE,
+      g_param_spec_uint ("state",
+          "state of the transfer",
+          "The file transfer state",
+          0,
+          G_MAXUINT,
+          G_MAXUINT,
+          G_PARAM_READWRITE |
+          G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class,
+      PROP_DIRECTION,
+      g_param_spec_uint ("direction",
+          "direction of the transfer",
+          "The file transfer direction",
+          0,
+          G_MAXUINT,
+          G_MAXUINT,
+          G_PARAM_READWRITE |
+          G_PARAM_CONSTRUCT));
+
+  g_object_class_install_property (object_class,
+      PROP_FILENAME,
+      g_param_spec_string ("filename",
+          "name of the transfer",
+          "The file transfer filename",
+          "",
+          G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+      PROP_SIZE,
+      g_param_spec_uint64 ("size",
+          "size of the file",
+          "The file transfer size",
+          0,
+          G_MAXUINT64,
+          G_MAXUINT64,
+          G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+      PROP_CONTENT_TYPE,
+      g_param_spec_string ("content-type",
+          "file transfer content-type",
+          "The file transfer content-type",
+          "",
+          G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+      PROP_CONTENT_MD5,
+      g_param_spec_string ("content-md5",
+          "file transfer md5sum",
+          "The md5 sum of the transfer's contents",
+          "",
+          G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+      PROP_TRANSFERRED_BYTES,
+      g_param_spec_uint64 ("transferred-bytes",
+          "bytes transferred",
+          "The number of bytes transferred",
+          0,
+          G_MAXUINT64,
+          0,
+          G_PARAM_READWRITE));
+
+  g_object_class_install_property (object_class,
+      PROP_IN_STREAM,
+      g_param_spec_object ("in-stream",
+          "transfer input stream",
+          "The input stream for file transfer",
+          G_TYPE_INPUT_STREAM,
+          G_PARAM_READWRITE));
+
+  g_type_class_add_private (object_class, sizeof (EmpathyTpFilePriv));
+}
+
+static void
+empathy_tp_file_init (EmpathyTpFile *tp_file)
+{
+}
+
+static void
+tp_file_finalize (GObject *object)
+{
+  EmpathyTpFilePriv *priv;
+  EmpathyTpFile *tp_file;
+
+  tp_file = EMPATHY_TP_FILE (object);
+  priv = GET_PRIV (tp_file);
+
+  if (priv->channel)
+    {
+      DEBUG ("Closing channel..");
+      g_signal_handlers_disconnect_by_func (priv->channel,
+          tp_file_destroy_cb, object);
+      tp_cli_channel_run_close (priv->channel, -1, NULL, NULL);
+      if (G_IS_OBJECT (priv->channel))
+        g_object_unref (priv->channel);
+    }
+
+  if (priv->factory)
+    {
+      g_object_unref (priv->factory);
+    }
+  if (priv->account)
+    {
+      g_object_unref (priv->account);
+    }
+  if (priv->mc)
+    {
+      g_object_unref (priv->mc);
+    }
+
+  g_free (priv->id);
+  g_free (priv->filename);
+  g_free (priv->unix_socket_path);
+  g_free (priv->description);
+  g_free (priv->content_md5);
+  g_free (priv->content_type);
+
+  if (priv->in_stream)
+    g_object_unref (priv->in_stream);
+
+  if (priv->out_stream)
+    g_object_unref (priv->out_stream);
+
+  if (priv->contact)
+    g_object_unref (priv->contact);
+
+  if (priv->cancellable)
+    g_object_unref (priv->cancellable);
+
+  G_OBJECT_CLASS (empathy_tp_file_parent_class)->finalize (object);
+}
+
+static GObject *
+tp_file_constructor (GType type,
+                     guint n_props,
+                     GObjectConstructParam *props)
+{
+  GObject *tp_file;
+  EmpathyTpFilePriv *priv;
+  GError *error = NULL;
+  GHashTable *properties;
+  TpHandle handle;
+
+  tp_file = G_OBJECT_CLASS (empathy_tp_file_parent_class)->constructor (type,
+      n_props, props);
+
+  priv = GET_PRIV (tp_file);
+
+  priv->factory = empathy_contact_factory_new ();
+  priv->mc = empathy_mission_control_new ();
+
+  tp_cli_channel_connect_to_closed (priv->channel,
+      (tp_cli_channel_signal_callback_closed) tp_file_closed_cb,
+      tp_file,
+      NULL, NULL, NULL);
+
+  emp_cli_channel_type_file_connect_to_file_transfer_state_changed (
+      TP_PROXY (priv->channel),
+      (emp_cli_channel_type_file_signal_callback_file_transfer_state_changed)
+          tp_file_state_changed_cb,
+      tp_file,
+      NULL, NULL, NULL);
+
+  emp_cli_channel_type_file_connect_to_transferred_bytes_changed (
+      TP_PROXY (priv->channel),
+      (emp_cli_channel_type_file_signal_callback_transferred_bytes_changed)
+          tp_file_transferred_bytes_changed_cb,
+      tp_file,
+      NULL, NULL, NULL);
+
+
+  handle = tp_channel_get_handle (priv->channel, NULL);
+  priv->contact = empathy_contact_factory_get_from_handle (priv->factory,
+      priv->account,
+      (guint) handle);
+
+  if (!tp_cli_dbus_properties_run_get_all (priv->channel,
+      -1, EMP_IFACE_CHANNEL_TYPE_FILE, &properties, &error, NULL))
+    {
+      DEBUG ("Failed to get properties: %s",
+          error ? error->message : "No error given");
+      g_clear_error (&error);
+      return NULL;
+    }
+
+  priv->size = g_value_get_uint64 (g_hash_table_lookup (properties, "Size"));
+
+  priv->state = g_value_get_uint (g_hash_table_lookup (properties, "State"));
+
+  /* Invalid reason, so empathy_file_get_state_change_reason() can give
+   * a warning if called for a not closed file transfer. */
+  priv->state_change_reason = -1;
+
+  priv->transferred_bytes = g_value_get_uint64 (g_hash_table_lookup (
+      properties, "TransferredBytes"));
+
+  priv->filename = g_value_dup_string (g_hash_table_lookup (properties,
+      "Filename"));
+
+  priv->content_md5 = g_value_dup_string (g_hash_table_lookup (properties,
+      "ContentMD5"));
+
+  priv->description = g_value_dup_string (g_hash_table_lookup (properties,
+      "Description"));
+
+  priv->unix_socket_path = g_value_dup_string (g_hash_table_lookup (properties,
+      "SocketPath"));
+
+  priv->direction = g_value_get_uint (g_hash_table_lookup (properties,
+      "Direction"));
+
+  g_hash_table_destroy (properties);
+
+  return tp_file;
+}
+
+static void
+tp_file_get_property (GObject *object,
+                      guint param_id,
+                      GValue *value,
+                      GParamSpec *pspec)
+{
+  EmpathyTpFilePriv *priv;
+  EmpathyTpFile *tp_file;
+
+  priv = GET_PRIV (object);
+  tp_file = EMPATHY_TP_FILE (object);
+
+  switch (param_id)
+    {
+      case PROP_ACCOUNT:
+        g_value_set_object (value, priv->account);
+        break;
+      case PROP_CHANNEL:
+        g_value_set_object (value, priv->channel);
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+        break;
+    };
+}
+
+static void
+tp_file_channel_set_dbus_property (gpointer proxy,
+                                   const gchar *property,
+                                   const GValue *value)
+{
+        DEBUG ("Setting %s property", property);
+        tp_cli_dbus_properties_run_set (TP_PROXY (proxy),
+            -1,
+            EMP_IFACE_CHANNEL_TYPE_FILE,
+            property,
+            value,
+            NULL, NULL);
+        DEBUG ("done");
+}
+
+
+static void
+tp_file_set_property (GObject *object,
+                      guint param_id,
+                      const GValue *value,
+                      GParamSpec *pspec)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (object);
+
+  switch (param_id)
+    {
+      case PROP_ACCOUNT:
+        priv->account = g_object_ref (g_value_get_object (value));
+        break;
+      case PROP_CHANNEL:
+        priv->channel = g_object_ref (g_value_get_object (value));
+        break;
+      case PROP_STATE:
+        priv->state = g_value_get_uint (value);
+        break;
+      case PROP_DIRECTION:
+        priv->direction = g_value_get_uint (value);
+        break;
+      case PROP_FILENAME:
+        g_free (priv->filename);
+        priv->filename = g_value_dup_string (value);
+        tp_file_channel_set_dbus_property (priv->channel, "Filename", value);
+        break;
+      case PROP_SIZE:
+        priv->size = g_value_get_uint64 (value);
+        tp_file_channel_set_dbus_property (priv->channel, "Size", value);
+        break;
+      case PROP_CONTENT_TYPE:
+        tp_file_channel_set_dbus_property (priv->channel, "ContentType", value);
+        g_free (priv->content_type);
+        priv->content_type = g_value_dup_string (value);
+        break;
+      case PROP_CONTENT_MD5:
+        tp_file_channel_set_dbus_property (priv->channel, "ContentMD5", value);
+        g_free (priv->content_md5);
+        priv->content_md5 = g_value_dup_string (value);
+        break;
+      case PROP_IN_STREAM:
+        if (priv->in_stream)
+          g_object_unref (priv->in_stream);
+        priv->in_stream = g_object_ref (g_value_get_object (value));
+        break;
+      default:
+        G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
+        break;
+    };
+}
+
+/**
+ * empathy_tp_file_new:
+ * @account: the #McAccount for the channel
+ * @channel: a Telepathy channel
+ *
+ * Creates a new #EmpathyTpFile wrapping @channel.
+ *
+ * Returns: a new #EmpathyTpFile
+ */
+EmpathyTpFile *
+empathy_tp_file_new (McAccount *account,
+                  TpChannel *channel)
+{
+  return g_object_new (EMPATHY_TYPE_TP_FILE,
+      "account", account,
+      "channel", channel,
+      NULL);
+}
+
+/**
+ * empathy_tp_file_get_id:
+ * @tp_file: an #EmpathyTpFile
+ *
+ * Returns the ID of @tp_file.
+ *
+ * Returns: the ID
+ */
+const gchar *
+empathy_tp_file_get_id (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->id;
+}
+
+/**
+ * empathy_tp_file_get_channel
+ * @tp_file: an #EmpathyTpFile
+ *
+ * Returns the Telepathy file transfer channel
+ *
+ * Returns: the #TpChannel
+ */
+TpChannel *
+empathy_tp_file_get_channel (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file), NULL);
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->channel;
+}
+
+static void
+tp_file_destroy_cb (TpChannel *file_channel,
+                    EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  DEBUG ("Channel Closed or CM crashed");
+
+  g_object_unref (priv->channel);
+  priv->channel = NULL;
+}
+
+static void
+tp_file_closed_cb (TpChannel *file_channel,
+                   EmpathyTpFile *tp_file,
+                   GObject *weak_object)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  /* The channel is closed, do just like if the proxy was destroyed */
+  g_signal_handlers_disconnect_by_func (priv->channel,
+      tp_file_destroy_cb,
+      tp_file);
+  tp_file_destroy_cb (file_channel, tp_file);
+}
+
+static gint64
+get_time_msec (void)
+{
+  GTimeVal tv;
+
+  g_get_current_time (&tv);
+  return ((gint64) tv.tv_sec) * 1000 + tv.tv_usec / 1000;
+}
+
+static gint
+_get_local_socket (EmpathyTpFile *tp_file)
+{
+  gint fd;
+  size_t path_len;
+  struct sockaddr_un addr;
+  EmpathyTpFilePriv *priv;
+  GValue *socket_path;
+
+  priv = GET_PRIV (tp_file);
+
+  /* TODO: This could probably be a little nicer. */
+  tp_cli_dbus_properties_run_get (priv->channel,
+      -1,
+      EMP_IFACE_CHANNEL_TYPE_FILE,
+      "SocketPath",
+      &socket_path,
+      NULL,
+      NULL);
+
+  if (priv->unix_socket_path)
+    g_free (priv->unix_socket_path);
+
+  priv->unix_socket_path = g_value_dup_string (socket_path);
+  g_value_unset (socket_path);
+
+  if (G_STR_EMPTY (priv->unix_socket_path))
+    return -1;
+
+  fd = socket (PF_UNIX, SOCK_STREAM, 0);
+  if (fd < 0)
+    return -1;
+
+  memset (&addr, 0, sizeof (addr));
+  addr.sun_family = AF_UNIX;
+  path_len = strlen (priv->unix_socket_path);
+  strncpy (addr.sun_path, priv->unix_socket_path, path_len);
+
+  if (connect (fd, (struct sockaddr*) &addr,
+      sizeof (addr)) < 0)
+    {
+      close (fd);
+      return -1;
+    }
+
+  return fd;
+}
+
+/**
+ * empathy_tp_file_accept:
+ * @tp_file: an #EmpathyTpFile
+ *
+ * Accepts a file transfer that's in the "local pending" state (i.e.
+ * EMP_FILE_TRANSFER_STATE_LOCAL_PENDING).
+ */
+void
+empathy_tp_file_accept (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+  GValue *address;
+  GValue nothing = { 0 };
+  GError *error = NULL;
+
+  g_return_if_fail (EMPATHY_IS_TP_FILE (tp_file));
+
+  priv = GET_PRIV (tp_file);
+
+  g_return_if_fail (priv->out_stream != NULL);
+
+  DEBUG ("Accepting file: filename=%s", priv->filename);
+
+  g_value_init (&nothing, G_TYPE_STRING);
+  g_value_set_string (&nothing, "");
+
+  if (!emp_cli_channel_type_file_run_accept_file (TP_PROXY (priv->channel),
+      -1, TP_SOCKET_ADDRESS_TYPE_UNIX, TP_SOCKET_ACCESS_CONTROL_LOCALHOST,
+      &nothing, &address, &error, NULL))
+    {
+      DEBUG ("Accept error: %s",
+          error ? error->message : "No message given");
+      g_clear_error (&error);
+    }
+
+  if (priv->unix_socket_path)
+    g_free (priv->unix_socket_path);
+
+  priv->unix_socket_path = g_value_dup_string (address);
+  g_value_unset (address);
+
+  DEBUG ("Got unix socket path: %s", priv->unix_socket_path);
+}
+
+static void
+receive_tp_file (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+  GInputStream *socket_stream;
+  gint socket_fd;
+
+  priv = GET_PRIV (tp_file);
+
+  socket_fd = _get_local_socket (tp_file);
+
+  if (socket_fd < 0)
+    return;
+
+  socket_stream = g_unix_input_stream_new (socket_fd, TRUE);
+
+  priv->cancellable = g_cancellable_new ();
+
+  copy_stream (socket_stream, priv->out_stream, priv->cancellable);
+
+  g_object_unref (socket_stream);
+}
+
+
+static void
+send_tp_file (EmpathyTpFile *tp_file)
+{
+  gint socket_fd;
+  GOutputStream *socket_stream;
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  DEBUG ("Sending file content: filename=%s",
+           priv->filename);
+
+  g_return_if_fail (priv->in_stream);
+
+  socket_fd = _get_local_socket (tp_file);
+  if (socket_fd < 0)
+    {
+      DEBUG ("failed to get local socket fd");
+      return;
+    }
+  DEBUG ("got local socket fd");
+  socket_stream = g_unix_output_stream_new (socket_fd, TRUE);
+
+  priv->cancellable = g_cancellable_new ();
+
+  copy_stream (priv->in_stream, socket_stream, priv->cancellable);
+
+  g_object_unref (socket_stream);
+}
+
+static void
+tp_file_state_changed_cb (DBusGProxy *tp_file_iface,
+                          EmpFileTransferState state,
+                          EmpFileTransferStateChangeReason reason,
+                          EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  DEBUG ("File transfer state changed: filename=%s, "
+      "old state=%u, state=%u, reason=%u",
+      priv->filename, priv->state, state, reason);
+
+  if (state == EMP_FILE_TRANSFER_STATE_OPEN)
+    priv->start_time = get_time_msec ();
+
+  DEBUG ("state = %u, direction = %u, in_stream = %s, out_stream = %s",
+      state, priv->direction,
+      priv->in_stream ? "present" : "not present",
+      priv->out_stream ? "present" : "not present");
+
+  if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
+      priv->direction == EMP_FILE_TRANSFER_DIRECTION_OUTGOING &&
+      priv->in_stream)
+    send_tp_file (tp_file);
+  else if (state == EMP_FILE_TRANSFER_STATE_OPEN &&
+      priv->direction == EMP_FILE_TRANSFER_DIRECTION_INCOMING &&
+      priv->out_stream)
+      receive_tp_file (tp_file);
+
+  priv->state = state;
+  priv->state_change_reason = reason;
+
+  g_object_notify (G_OBJECT (tp_file), "state");
+}
+
+static void
+tp_file_transferred_bytes_changed_cb (TpProxy *proxy,
+                                      guint64 count,
+                                      EmpathyTpFile *tp_file,
+                                      GObject *weak_object)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  if (priv->transferred_bytes == count)
+    return;
+
+  priv->transferred_bytes = count;
+
+  g_object_notify (G_OBJECT (tp_file), "transferred-bytes");
+}
+
+EmpathyContact *
+empathy_tp_file_get_contact (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->contact;
+}
+
+GInputStream *
+empathy_tp_file_get_input_stream (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->in_stream;
+}
+
+GOutputStream *
+empathy_tp_file_get_output_stream (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->out_stream;
+}
+
+const gchar *
+empathy_tp_file_get_filename (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->filename;
+}
+
+EmpFileTransferDirection
+empathy_tp_file_get_direction (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->direction;
+}
+
+EmpFileTransferState
+empathy_tp_file_get_state (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->state;
+}
+
+EmpFileTransferStateChangeReason
+empathy_tp_file_get_state_change_reason (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  g_return_val_if_fail (priv->state_change_reason >= 0,
+      EMP_FILE_TRANSFER_STATE_CHANGE_REASON_NONE);
+
+  return priv->state_change_reason;
+}
+
+guint64
+empathy_tp_file_get_size (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->size;
+}
+
+guint64
+empathy_tp_file_get_transferred_bytes (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  return priv->transferred_bytes;
+}
+
+gint
+empathy_tp_file_get_remaining_time (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+  gint64 curr_time, elapsed_time;
+  gdouble time_per_byte;
+  gdouble remaining_time;
+
+  priv = GET_PRIV (tp_file);
+
+  if (priv->size == EMPATHY_TP_FILE_UNKNOWN_SIZE)
+    return -1;
+
+  if (priv->transferred_bytes == priv->size)
+    return 0;
+
+  curr_time = get_time_msec ();
+  elapsed_time = curr_time - priv->start_time;
+  time_per_byte = (gdouble) elapsed_time / (gdouble) priv->transferred_bytes;
+  remaining_time = (time_per_byte * (priv->size - priv->transferred_bytes)) / 1000;
+
+  return (gint) (remaining_time + 0.5);
+}
+
+void
+empathy_tp_file_cancel (EmpathyTpFile *tp_file)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  tp_cli_channel_run_close (priv->channel, -1, NULL, NULL);
+
+  g_cancellable_cancel (priv->cancellable);
+}
+
+void
+empathy_tp_file_set_input_stream (EmpathyTpFile *tp_file,
+                                  GInputStream *in_stream)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  if (priv->in_stream == in_stream)
+    return;
+
+  if (priv->direction == EMP_FILE_TRANSFER_DIRECTION_INCOMING)
+    g_warning ("Setting an input stream for incoming file "
+         "transfers is useless");
+
+  if (priv->in_stream)
+    g_object_unref (priv->in_stream);
+
+  if (in_stream)
+    g_object_ref (in_stream);
+
+  priv->in_stream = in_stream;
+
+  g_object_notify (G_OBJECT (tp_file), "in-stream");
+}
+
+void
+empathy_tp_file_set_output_stream (EmpathyTpFile *tp_file,
+                                   GOutputStream *out_stream)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  if (priv->out_stream == out_stream)
+    return;
+
+  if (priv->direction == EMP_FILE_TRANSFER_DIRECTION_OUTGOING)
+    g_warning ("Setting an output stream for outgoing file "
+         "transfers is useless");
+
+  if (priv->out_stream)
+    g_object_unref (priv->out_stream);
+
+  if (out_stream)
+    g_object_ref (out_stream);
+
+  priv->out_stream = out_stream;
+}
+
+void
+empathy_tp_file_set_filename (EmpathyTpFile *tp_file,
+                              const gchar *filename)
+{
+  EmpathyTpFilePriv *priv;
+
+  priv = GET_PRIV (tp_file);
+
+  g_return_if_fail (filename != NULL);
+
+  if (priv->filename && strcmp (filename, priv->filename) == 0)
+    return;
+
+  g_free (priv->filename);
+  priv->filename = g_strdup (filename);
+
+  g_object_notify (G_OBJECT (tp_file), "filename");
+}
+
+/* Functions to copy the content of a GInputStream to a GOutputStream */
+
+#define N_BUFFERS 2
+#define BUFFER_SIZE 4096
+
+typedef struct {
+  GInputStream *in;
+  GOutputStream *out;
+  GCancellable  *cancellable;
+  char *buff[N_BUFFERS]; /* the temporary buffers */
+  gsize count[N_BUFFERS]; /* how many bytes are used in the buffers */
+  gboolean is_full[N_BUFFERS]; /* whether the buffers contain data */
+  gint curr_read; /* index of the buffer used for reading */
+  gint curr_write; /* index of the buffer used for writing */
+  gboolean is_reading; /* we are reading */
+  gboolean is_writing; /* we are writing */
+  guint n_closed; /* number of streams that have been closed */
+} CopyData;
+
+static void schedule_next (CopyData *copy);
+
+static void
+free_copy_data_if_closed (CopyData *copy)
+{
+  gint i;
+
+  /* Free the data only if both the input and output streams have
+   * been closed. */
+  copy->n_closed++;
+  if (copy->n_closed < 2)
+    return;
+
+  if (copy->in != NULL)
+    g_object_unref (copy->in);
+
+  if (copy->out != NULL)
+    g_object_unref (copy->out);
+
+  for (i = 0; i < N_BUFFERS; i++)
+    g_free (copy->buff[i]);
+
+  g_object_unref (copy->cancellable);
+  g_free (copy);
+}
+
+static void
+io_error (CopyData *copy,
+          GError *error)
+{
+  g_cancellable_cancel (copy->cancellable);
+
+  if (error == NULL)
+    g_warning ("I/O error");
+  else if (error->domain == G_IO_ERROR && error->code == G_IO_ERROR_CANCELLED)
+    ; /* Ignore cancellations */
+  else
+    g_warning ("I/O error: %d: %s\n", error->code, error->message);
+
+  if (copy->in != NULL)
+    g_input_stream_close (copy->in, NULL, NULL);
+
+  if (copy->out != NULL)
+    g_output_stream_close (copy->out, NULL, NULL);
+
+  free_copy_data_if_closed (copy);
+}
+
+static void
+close_done (GObject *source_object,
+            GAsyncResult *res,
+            gpointer user_data)
+{
+  CopyData *copy = user_data;
+
+  g_object_unref (source_object);
+  free_copy_data_if_closed (copy);
+}
+
+static void
+write_done_cb (GObject *source_object,
+               GAsyncResult *res,
+               gpointer user_data)
+{
+  CopyData *copy = user_data;
+  gssize count_write;
+  GError *error = NULL;
+
+  count_write = g_output_stream_write_finish (copy->out, res, &error);
+
+  if (count_write <= 0)
+    {
+      io_error (copy, error);
+      g_error_free (error);
+      return;
+    }
+
+  copy->is_full[copy->curr_write] = FALSE;
+  copy->curr_write = (copy->curr_write + 1) % N_BUFFERS;
+  copy->is_writing = FALSE;
+
+  schedule_next (copy);
+}
+
+static void
+read_done_cb (GObject *source_object,
+              GAsyncResult *res,
+              gpointer user_data)
+{
+  CopyData *copy = user_data;
+  gssize count_read;
+  GError *error = NULL;
+
+  count_read = g_input_stream_read_finish (copy->in, res, &error);
+
+  if (count_read == 0)
+    {
+      g_input_stream_close_async (copy->in, 0, copy->cancellable,
+          close_done, copy);
+      copy->in = NULL;
+    }
+  else if (count_read < 0)
+    {
+      io_error (copy, error);
+      g_error_free (error);
+      return;
+    }
+
+  copy->count[copy->curr_read] = count_read;
+  copy->is_full[copy->curr_read] = TRUE;
+  copy->curr_read = (copy->curr_read + 1) % N_BUFFERS;
+  copy->is_reading = FALSE;
+
+  schedule_next (copy);
+}
+
+static void
+schedule_next (CopyData *copy)
+{
+  if (copy->in != NULL &&
+      !copy->is_reading &&
+      !copy->is_full[copy->curr_read])
+    {
+      /* We are not reading and the current buffer is empty, so
+       * start an async read. */
+      copy->is_reading = TRUE;
+      g_input_stream_read_async (copy->in,
+          copy->buff[copy->curr_read],
+          BUFFER_SIZE, 0, copy->cancellable,
+          read_done_cb, copy);
+    }
+
+  if (!copy->is_writing &&
+      copy->is_full[copy->curr_write])
+    {
+      if (copy->count[copy->curr_write] == 0)
+        {
+          /* The last read on the buffer read 0 bytes, this
+           * means that we got an EOF, so we can close
+           * the output channel. */
+          g_output_stream_close_async (copy->out, 0,
+              copy->cancellable,
+              close_done, copy);
+      copy->out = NULL;
+        }
+      else
+        {
+          /* We are not writing and the current buffer contains
+           * data, so start an async write. */
+          copy->is_writing = TRUE;
+          g_output_stream_write_async (copy->out,
+              copy->buff[copy->curr_write],
+              copy->count[copy->curr_write],
+              0, copy->cancellable,
+              write_done_cb, copy);
+        }
+    }
+}
+
+static void
+copy_stream (GInputStream *in,
+             GOutputStream *out,
+             GCancellable *cancellable)
+{
+  CopyData *copy;
+  gint i;
+
+  g_return_if_fail (in != NULL);
+  g_return_if_fail (out != NULL);
+
+  copy = g_new0 (CopyData, 1);
+  copy->in = g_object_ref (in);
+  copy->out = g_object_ref (out);
+
+  if (cancellable != NULL)
+    copy->cancellable = g_object_ref (cancellable);
+  else
+    copy->cancellable = g_cancellable_new ();
+
+  for (i = 0; i < N_BUFFERS; i++)
+    copy->buff[i] = g_malloc (BUFFER_SIZE);
+
+  schedule_next (copy);
+}
diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
new file mode 100644 (file)
index 0000000..008f3a9
--- /dev/null
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007 Marco Barisione <marco@barisione.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef __EMPATHY_TP_FILE_H__
+#define __EMPATHY_TP_FILE_H__
+
+#include <gio/gio.h>
+#include <glib.h>
+
+#include <telepathy-glib/channel.h>
+#include <libtelepathy/tp-constants.h>
+
+#include <extensions/extensions.h>
+
+#include "empathy-contact.h"
+
+#include <libmissioncontrol/mc-account.h>
+
+/* Forward-declaration to resolve cyclic dependencies */
+typedef struct _EmpathyTpFile      EmpathyTpFile;
+
+#include "empathy-tp-file.h"
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TP_FILE_UNKNOWN_SIZE G_MAXUINT64
+
+#define EMPATHY_TYPE_TP_FILE         (empathy_tp_file_get_type ())
+#define EMPATHY_TP_FILE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_TP_FILE, EmpathyTpFile))
+#define EMPATHY_TP_FILE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_TP_FILE, EmpathyTpFileClass))
+#define EMPATHY_IS_TP_FILE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_TP_FILE))
+#define EMPATHY_IS_TP_FILE_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_TP_FILE))
+#define EMPATHY_TP_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_TP_FILE, EmpathyTpFileClass))
+
+typedef struct _EmpathyTpFileClass EmpathyTpFileClass;
+
+struct _EmpathyTpFile
+{
+  GObject      parent;
+};
+
+struct _EmpathyTpFileClass
+{
+  GObjectClass parent_class;
+};
+
+GType empathy_tp_file_get_type (void) G_GNUC_CONST;
+
+EmpathyTpFile *empathy_tp_file_new (McAccount *account, TpChannel *channel);
+
+TpChannel *empathy_tp_file_get_channel (EmpathyTpFile *tp_file);
+void empathy_tp_file_accept (EmpathyTpFile *tp_file);
+void empathy_tp_file_cancel (EmpathyTpFile *tp_file);
+
+const gchar *empathy_tp_file_get_id (EmpathyTpFile *tp_file);
+guint64 empathy_tp_file_get_transferred_bytes (EmpathyTpFile *tp_file);
+EmpathyContact *empathy_tp_file_get_contact (EmpathyTpFile *tp_file);
+GInputStream *empathy_tp_file_get_input_stream (EmpathyTpFile *tp_file);
+GOutputStream *empathy_tp_file_get_output_stream (EmpathyTpFile *tp_file);
+const gchar *empathy_tp_file_get_filename (EmpathyTpFile *tp_file);
+EmpFileTransferDirection empathy_tp_file_get_direction (EmpathyTpFile *tp_file);
+EmpFileTransferState empathy_tp_file_get_state (EmpathyTpFile *tp_file);
+EmpFileTransferStateChangeReason empathy_tp_file_get_state_change_reason (EmpathyTpFile *tp_file);
+guint64 empathy_tp_file_get_size (EmpathyTpFile *tp_file);
+guint64 empathy_tp_file_get_transferred_bytes (EmpathyTpFile *tp_file);
+gint empathy_tp_file_get_remaining_time (EmpathyTpFile *tp_file);
+
+void empathy_tp_file_set_input_stream (EmpathyTpFile *tp_file, GInputStream *uri);
+void empathy_tp_file_set_output_stream (EmpathyTpFile *tp_file, GOutputStream *uri);
+void empathy_tp_file_set_filename (EmpathyTpFile *tp_file, const gchar *filename);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_TP_FILE_H__ */
index b62c834facf43081465ba15278e32fce2c9921e3..ac84953a9d4c972a75f67a2359fa2c655c280b8c 100644 (file)
@@ -777,7 +777,7 @@ empathy_connection_request_channel (TpConnection *connection,
                                                weak_object);
 }
 
-EmpathyFile *
+EmpathyTpFile *
 empathy_send_file (EmpathyContact *contact,
                   GFile          *gfile)
 {
@@ -790,7 +790,7 @@ empathy_send_file (EmpathyContact *contact,
        guint           handle;
        gchar          *object_path;
        TpChannel      *channel;
-       EmpathyFile    *file;
+       EmpathyTpFile  *tp_file;
        GError         *error = NULL;
        GValue          value = { 0 };
        gchar          *filename;
@@ -807,7 +807,7 @@ empathy_send_file (EmpathyContact *contact,
                                  G_FILE_ATTRIBUTE_STANDARD_SIZE ","
                                  G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
                                  0, NULL, NULL);
-       size = info ? g_file_info_get_size (info) : EMPATHY_FILE_UNKNOWN_SIZE;
+       size = info ? g_file_info_get_size (info) : EMPATHY_TP_FILE_UNKNOWN_SIZE;
        filename = g_file_get_basename (gfile);
        in_stream = G_INPUT_STREAM (g_file_read (gfile, NULL, NULL));
        mc = empathy_mission_control_new ();
@@ -889,10 +889,10 @@ empathy_send_file (EmpathyContact *contact,
                &value, NULL, NULL);
        g_value_unset (&value);
 
-       file = empathy_file_new (account, channel);
+       tp_file = empathy_tp_file_new (account, channel);
 
-       if (file) {
-               empathy_file_set_input_stream (file, in_stream);
+       if (tp_file) {
+               empathy_tp_file_set_input_stream (tp_file, in_stream);
        }
 
        g_object_unref (mc);
@@ -900,6 +900,6 @@ empathy_send_file (EmpathyContact *contact,
        g_object_unref (channel);
        g_free (object_path);
 
-       return file;
+       return tp_file;
 }
 
index 2d4734febca697cd02bb2a0cb486215350dde6aa..277a8a3ea32aec99217ce0a0dad3c37ab8446c2d 100644 (file)
@@ -36,7 +36,7 @@
 #include <libmissioncontrol/mission-control.h>
 
 #include "empathy-contact.h"
-#include "empathy-file.h"
+#include "empathy-tp-file.h"
 
 G_BEGIN_DECLS
 
@@ -130,8 +130,8 @@ EmpathyFile *  empathy_send_file_from_stream        (EmpathyContact  *contact,
 EmpathyFile *  empathy_send_file                    (EmpathyContact  *contact,
                                                      GFile           *file);
 /* File transfer */
-EmpathyFile *empathy_send_file                      (EmpathyContact  *contact,
-                                                    GFile           *file);
+EmpathyTpFile *empathy_send_file                      (EmpathyContact  *contact,
+                                                      GFile           *file);
 
 G_END_DECLS
 
index 712b33b5c6911dcd31bb648c00949ec9fcfdaef4..3d4ec5e99b05e225e51c991a8b234b96039d64bc 100644 (file)
@@ -31,7 +31,7 @@
 #include <libempathy/empathy-tp-chat.h>
 #include <libempathy/empathy-tp-group.h>
 #include <libempathy/empathy-utils.h>
-#include <libempathy/empathy-file.h>
+#include <libempathy/empathy-tp-file.h>
 
 #include <libempathy-gtk/empathy-ft-manager.h>
 #include <libempathy-gtk/empathy-images.h>
@@ -230,14 +230,14 @@ event_manager_filter_channel_cb (EmpathyDispatcher   *dispatcher,
                if (g_value_get_uint (direction) == EMP_FILE_TRANSFER_DIRECTION_INCOMING) {
                        EmpathyFTManager *manager;
                        McAccount        *account;
-                       EmpathyFile      *file;
+                       EmpathyTpFile    *tp_file;
 
                        manager = empathy_ft_manager_get_default ();
                        account = empathy_channel_get_account (channel);
 
-                       file = empathy_file_new (account, channel);
+                       tp_file = empathy_tp_file_new (account, channel);
 
-                       empathy_ft_manager_add_file (manager, file);
+                       empathy_ft_manager_add_tp_file (manager, tp_file);
                }
 
                g_value_unset (direction);