[empathy: 91/148] Move the error declaration in empathy-tp-file.h



commit 181c2a5ab6417c2e745e507d64b66f4c6ba261f6
Author: Cosimo Cecchi <cosimo cecchi collabora co uk>
Date:   Fri May 15 18:39:38 2009 +0200

    Move the error declaration in empathy-tp-file.h
---
 libempathy/empathy-tp-file.h |   10 ++++++++++
 libempathy/empathy-utils.h   |   10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libempathy/empathy-tp-file.h b/libempathy/empathy-tp-file.h
index 85d693b..f120558 100644
--- a/libempathy/empathy-tp-file.h
+++ b/libempathy/empathy-tp-file.h
@@ -45,6 +45,16 @@ G_BEGIN_DECLS
 #define EMPATHY_TP_FILE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), \
     EMPATHY_TYPE_TP_FILE, EmpathyTpFileClass))
 
+#define EMPATHY_FT_ERROR_QUARK g_quark_from_static_string ("EmpathyFTError")
+
+typedef enum {
+	EMPATHY_FT_ERROR_FAILED,
+	EMPATHY_FT_ERROR_HASH_MISMATCH,
+	EMPATHY_FT_ERROR_TP_ERROR,
+	EMPATHY_FT_ERROR_SOCKET,
+	EMPATHY_FT_ERROR_NOT_SUPPORTED
+} EmpathyFTErrorEnum;
+
 typedef struct _EmpathyTpFile EmpathyTpFile;
 typedef struct _EmpathyTpFileClass EmpathyTpFileClass;
 
diff --git a/libempathy/empathy-utils.h b/libempathy/empathy-utils.h
index fc3df4b..d36503c 100644
--- a/libempathy/empathy-utils.h
+++ b/libempathy/empathy-utils.h
@@ -40,18 +40,8 @@
 #define EMPATHY_GET_PRIV(obj,type) ((type##Priv *) ((type *) obj)->priv)
 #define EMP_STR_EMPTY(x) ((x) == NULL || (x)[0] == '\0')
 
-#define EMPATHY_FT_ERROR_QUARK g_quark_from_static_string ("EmpathyFTError")
-
 G_BEGIN_DECLS
 
-typedef enum {
-	EMPATHY_FT_ERROR_FAILED,
-	EMPATHY_FT_ERROR_HASH_MISMATCH,
-	EMPATHY_FT_ERROR_TP_ERROR,
-	EMPATHY_FT_ERROR_SOCKET,
-	EMPATHY_FT_ERROR_NOT_SUPPORTED
-} EmpathyFTErrorEnum;
-
 void         empathy_init                           (void);
 /* Strings */
 gchar *      empathy_substring                      (const gchar     *str,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]