Merge branch 'master' into tp-tube

[empathy.git] / libempathy / empathy-tp-file.h

diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index f412f847b405708c6b65f5ae5d4344ac98ba4407..5f239c8e0df5a999935ad734f412a15605ad36b4 100644 (file)
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -29,14 +29,10 @@
 
 #include <telepathy-glib/channel.h>
 
-#include <extensions/extensions.h>
-
 #include "empathy-contact.h"
 
 #include <libmissioncontrol/mc-account.h>
 
-#include "empathy-tp-file.h"
-
 G_BEGIN_DECLS
 
 #define EMPATHY_TP_FILE_UNKNOWN_SIZE G_MAXUINT64
@@ -69,26 +65,23 @@ GType empathy_tp_file_get_type (void) G_GNUC_CONST;
 EmpathyTpFile *empathy_tp_file_new (TpChannel *channel);
 
 TpChannel *empathy_tp_file_get_channel (EmpathyTpFile *tp_file);
-void empathy_tp_file_accept (EmpathyTpFile *tp_file, guint64 offset);
+void empathy_tp_file_accept (EmpathyTpFile *tp_file, guint64 offset,
+  GFile *gfile, GError **error);
 void empathy_tp_file_cancel (EmpathyTpFile *tp_file);
-void empathy_tp_file_offer (EmpathyTpFile *tp_file);
+void empathy_tp_file_close (EmpathyTpFile *tp_file);
+void empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile,
+  GError **error);
 
-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);
-gboolean empathy_tp_file_get_incoming (EmpathyTpFile *tp_file);
-EmpFileTransferState empathy_tp_file_get_state (EmpathyTpFile *tp_file);
-EmpFileTransferStateChangeReason empathy_tp_file_get_state_change_reason (EmpathyTpFile *tp_file);
+gboolean empathy_tp_file_is_incoming (EmpathyTpFile *tp_file);
+TpFileTransferState empathy_tp_file_get_state (
+  EmpathyTpFile *tp_file, TpFileTransferStateChangeReason *reason);
 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);
+const gchar *empathy_tp_file_get_content_type (EmpathyTpFile *tp_file);
+gboolean empathy_tp_file_is_ready (EmpathyTpFile *tp_file);
 
 G_END_DECLS