/soc/2013/ankitkv/gobjectification: bb14fc0e9a87: Removed declar...

[Ankit Vani]

Changeset: bb14fc0e9a87bf420ba65be540bc674266f0fece
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-07-21 02:04 +0530
Branch:	 soc.2013.gobjectification
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/bb14fc0e9a87

Description:

Removed declaration of PurplePresence from status.h

diffstat:

 libpurple/presences.h |  6 ++++--
 libpurple/status.h    |  6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diffs (46 lines):

diff --git a/libpurple/presences.h b/libpurple/presences.h
--- a/libpurple/presences.h
+++ b/libpurple/presences.h
@@ -26,8 +26,6 @@
 #ifndef _PURPLE_PRESENCE_H_
 #define _PURPLE_PRESENCE_H_
 
-#include "status.h"
-
 #define PURPLE_TYPE_PRESENCE             (purple_presence_get_type())
 #define PURPLE_PRESENCE(obj)             (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_PRESENCE, PurplePresence))
 #define PURPLE_PRESENCE_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST((klass), PURPLE_TYPE_PRESENCE, PurplePresenceClass))
@@ -64,6 +62,10 @@ typedef struct _PurpleBuddyPresence  Pur
 /** @copydoc _PurpleBuddyPresenceClass */
 typedef struct _PurpleBuddyPresenceClass  PurpleBuddyPresenceClass;
 
+#include "account.h"
+#include "buddylist.h"
+#include "status.h"
+
 /**
  * A PurplePresence is like a collection of PurpleStatuses (plus some
  * other random info).  For any buddy, or for any one of your accounts,
diff --git a/libpurple/status.h b/libpurple/status.h
--- a/libpurple/status.h
+++ b/libpurple/status.h
@@ -83,8 +83,6 @@ typedef struct _PurpleStatus    PurpleSt
 typedef struct _PurpleStatusType  PurpleStatusType;
 typedef struct _PurpleStatusAttr  PurpleStatusAttr;
 
-typedef struct _PurplePresence  PurplePresence;
-
 typedef struct _PurpleMood {
 	const char *mood;
 	const char *description;
@@ -113,9 +111,7 @@ typedef enum
 	PURPLE_STATUS_NUM_PRIMITIVES
 } PurpleStatusPrimitive;
 
-#include "account.h"
-#include "buddylist.h"
-#include "conversation.h"
+#include "presences.h"
 
 #define PURPLE_TUNE_ARTIST	"tune_artist"
 #define PURPLE_TUNE_TITLE	"tune_title"