diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-01-17 01:02:31 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-17 01:02:31 +0800 |
| commit | f542337fdadd7d15e3e0de27e1b4650078f38301 (patch) | |
| tree | 1f9b989e2955293599ef48b7ab9631032051bfec | |
| parent | 8c64c693c7c50c546c6fceb538904a774f0a53da (diff) | |
| download | gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.tar gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.tar.gz gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.tar.bz2 gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.tar.lz gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.tar.xz gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.tar.zst gsoc2013-empathy-f542337fdadd7d15e3e0de27e1b4650078f38301.zip | |
Removed extensions.h inclusion in public API.
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
svn path=/trunk/; revision=2236
| -rw-r--r-- | libempathy/empathy-dispatch-operation.c | 2 | ||||
| -rw-r--r-- | libempathy/empathy-tp-file.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-tp-file.h | 5 | ||||
| -rw-r--r-- | src/empathy-ft-manager.c | 2 | ||||
| -rw-r--r-- | src/empathy.c | 2 |
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> |