aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy/empathy-dispatch-operation.c2
-rw-r--r--libempathy/empathy-tp-file.c6
-rw-r--r--libempathy/empathy-tp-file.h5
-rw-r--r--src/empathy-ft-manager.c2
-rw-r--r--src/empathy.c2
5 files changed, 11 insertions, 6 deletions
diff --git a/libempathy/empathy-dispatch-operation.c b/libempathy/empathy-dispatch-operation.c
index b9710dc0e..ee5b64d96 100644
--- a/libempathy/empathy-dispatch-operation.c
+++ b/libempathy/empathy-dispatch-operation.c
@@ -30,6 +30,8 @@
#include "empathy-marshal.h"
+#include "extensions/extensions.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
#include <libempathy/empathy-debug.h>
diff --git a/libempathy/empathy-tp-file.c b/libempathy/empathy-tp-file.c
index 96d8c8887..d02c052e3 100644
--- a/libempathy/empathy-tp-file.c
+++ b/libempathy/empathy-tp-file.c
@@ -43,6 +43,8 @@
#include "empathy-time.h"
#include "empathy-utils.h"
+#include "extensions/extensions.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_FT
#include "empathy-debug.h"
@@ -846,9 +848,9 @@ empathy_tp_file_is_incoming (EmpathyTpFile *tp_file)
return tp_file->priv->incoming;
}
-EmpFileTransferState
+guint
empathy_tp_file_get_state (EmpathyTpFile *tp_file,
- EmpFileTransferStateChangeReason *reason)
+ guint *reason)
{
g_return_val_if_fail (EMPATHY_IS_TP_FILE (tp_file),
EMP_FILE_TRANSFER_STATE_NONE);
diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index ad25eb275..966663f90 100644
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -29,8 +29,6 @@
#include <telepathy-glib/channel.h>
-#include <extensions/extensions.h>
-
#include "empathy-contact.h"
#include <libmissioncontrol/mc-account.h>
@@ -77,8 +75,7 @@ void empathy_tp_file_offer (EmpathyTpFile *tp_file, GFile *gfile,
EmpathyContact *empathy_tp_file_get_contact (EmpathyTpFile *tp_file);
const gchar *empathy_tp_file_get_filename (EmpathyTpFile *tp_file);
gboolean empathy_tp_file_is_incoming (EmpathyTpFile *tp_file);
-EmpFileTransferState empathy_tp_file_get_state (EmpathyTpFile *tp_file,
- EmpFileTransferStateChangeReason *reason);
+guint empathy_tp_file_get_state (EmpathyTpFile *tp_file, guint *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);
diff --git a/src/empathy-ft-manager.c b/src/empathy-ft-manager.c
index e84495079..3036e5121 100644
--- a/src/empathy-ft-manager.c
+++ b/src/empathy-ft-manager.c
@@ -46,6 +46,8 @@
#include "empathy-ft-manager.h"
+#include "extensions/extensions.h"
+
/**
* SECTION:empathy-ft-manager
* @short_description: File transfer dialog
diff --git a/src/empathy.c b/src/empathy.c
index fae4611a7..1676eb282 100644
--- a/src/empathy.c
+++ b/src/empathy.c
@@ -56,6 +56,8 @@
#include "empathy-ft-manager.h"
#include "bacon-message-connection.h"
+#include "extensions/extensions.h"
+
#define DEBUG_FLAG EMPATHY_DEBUG_OTHER
#include <libempathy/empathy-debug.h>