Total FileTransfer draft spec exorcism

diff --git a/libempathy/empathy-ft-handler.c b/libempathy/empathy-ft-handler.c
index 93232b18709823bde4d46f594a7f1106a87f1d2e..765de8bbd8cb0efa1bea938d92b00cbb1456a984 100644 (file)
--- a/libempathy/empathy-ft-handler.c
+++ b/libempathy/empathy-ft-handler.c
@@ -21,7 +21,6 @@
  
 /* empathy-ft-handler.c */
 
-#include <extensions/extensions.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <telepathy-glib/util.h>
@@ -94,8 +93,8 @@ typedef struct {
   guint64 transferred_bytes;
   guint64 mtime;
   gchar *content_hash;
-  EmpFileHashType content_hash_type;
-  EmpFileTransferState current_state;
+  TpFileHashType content_hash_type;
+  TpFileTransferState current_state;
 
   gboolean is_completed;
   gboolean is_cancelled;
@@ -684,7 +683,7 @@ ft_handler_read_async_cb (GObject *source,
 
   /* org.freedesktop.Telepathy.Channel.Type.FileTransfer.ContentHashType */
   value = tp_g_value_slice_new (G_TYPE_UINT);
-  g_value_set_uint (value, EMP_FILE_HASH_TYPE_MD5);
+  g_value_set_uint (value, TP_FILE_HASH_TYPE_MD5);
   g_hash_table_insert (priv->request,
       TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER ".ContentHashType", value);
 
@@ -1011,7 +1010,7 @@ empathy_ft_handler_get_gfile (EmpathyFTHandler *handler)
   return priv->gfile;
 }
 
-EmpFileTransferState
+TpFileTransferState
 empathy_ft_handler_get_state (EmpathyFTHandler *handler,
                               char **state_string)
 {

diff --git a/libempathy/empathy-ft-handler.h b/libempathy/empathy-ft-handler.h
index 085abab52cbbecaca6e36c07aef71725dd4e1bca..c561fe29f1cf07528edfa46de8c2f5bff852dafe 100644 (file)
--- a/libempathy/empathy-ft-handler.h
+++ b/libempathy/empathy-ft-handler.h
@@ -77,7 +77,7 @@ const char * empathy_ft_handler_get_filename (EmpathyFTHandler *handler);
 const char * empathy_ft_handler_get_content_type (EmpathyFTHandler *handler);
 EmpathyContact * empathy_ft_handler_get_contact (EmpathyFTHandler *handler);
 GFile * empathy_ft_handler_get_gfile (EmpathyFTHandler *handler);
-EmpFileTransferState empathy_ft_handler_get_state (EmpathyFTHandler *handler,
+TpFileTransferState empathy_ft_handler_get_state (EmpathyFTHandler *handler,
                                                    char **state_string);
 gboolean empathy_ft_handler_is_incoming (EmpathyFTHandler *handler);
 guint64 empathy_ft_handler_get_transferred_bytes (EmpathyFTHandler *handler);

diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index cd28c541b5526e092676c8a1ad5ea2b408250686..098440a42845c2cdbf684a04ed79849b6f3a0458 100644 (file)
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -44,8 +44,6 @@
 #include "empathy-time.h"
 #include "empathy-utils.h"
 
-#include "extensions/extensions.h"
-
 #define DEBUG_FLAG EMPATHY_DEBUG_FT
 #include "empathy-debug.h"
 
@@ -82,8 +80,8 @@ typedef struct {
   GOutputStream *out_stream;
 
   /* org.freedesktop.Telepathy.Channel.Type.FileTransfer D-Bus properties */
-  EmpFileTransferState state;
-  EmpFileTransferStateChangeReason state_change_reason;
+  TpFileTransferState state;
+  TpFileTransferStateChangeReason state_change_reason;
 
   /* transfer properties */
   gboolean incoming;

diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index db928e86f0f29378ba1cafcae5ea026840e909e9..04da254c12243b7d01df01d3005d5ce37750040a 100644 (file)
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -28,8 +28,6 @@
 #include <gio/gio.h>
 #include <glib.h>
 
-#include "extensions/extensions.h"
-
 #include <telepathy-glib/channel.h>
 
 G_BEGIN_DECLS
@@ -95,7 +93,7 @@ void empathy_tp_file_close (EmpathyTpFile *tp_file);
 
 gboolean empathy_tp_file_is_incoming (EmpathyTpFile *tp_file);
 
-EmpFileTransferState empathy_tp_file_get_state (EmpathyTpFile *tp_file, guint *reason);
+TpFileTransferState empathy_tp_file_get_state (EmpathyTpFile *tp_file, guint *reason);
 
 G_END_DECLS
 

diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index 6048cac70bd8760b813de2f40a2a2c95d9c569b0..5424e057b379c7c39a502322aa56592fc29f6de9 100644 (file)
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -46,7 +46,6 @@
 
 #include "empathy-ft-manager.h"
 
-#include "extensions/extensions.h"
 
 /**
  * SECTION:empathy-ft-manager