soc.2010.detachablepurple: d7d5defa: Moved the chat and buddy properties enum...

[gillux at soc.pidgin.im]

----------------------------------------------------------------------
Revision: d7d5defab1d263ef7b696d4b4c24d44bd3c24b8a
Parent:   e472622e50534666f2f95b6759baec286cb1cfe1
Author:   gillux at soc.pidgin.im
Date:     08/08/10 20:06:13
Branch:   im.pidgin.soc.2010.detachablepurple
URL: http://d.pidgin.im/viewmtn/revision/info/d7d5defab1d263ef7b696d4b4c24d44bd3c24b8a

Changelog: 

Moved the chat and buddy properties enumerations from the end of the files to
the beginning, so that we can use them in the middle.

Changes against parent e472622e50534666f2f95b6759baec286cb1cfe1

  patched  libpurple/buddy.c
  patched  libpurple/chat.c

-------------- next part --------------
============================================================
--- libpurple/buddy.c	cd6d85a7b73b3d7f419e21e2265db20ee9451691
+++ libpurple/buddy.c	a2e529a6f13c4e1f6ddcb5fdeebe5e6d53f1ce0a
@@ -48,6 +48,18 @@ struct _PurpleBuddyPrivate {
 	PurpleMediaCaps media_caps;             /**< The media capabilities of the buddy. */
 };
 
+enum {
+	PROP_0,
+	PROP_ACCOUNT,
+	PROP_NAME,
+	PROP_ALIAS,
+	PROP_LAST
+};
+
+#define PROP_ACCOUNT_S "account"
+#define PROP_NAME_S "name"
+#define PROP_ALIAS_S "alias"
+
 void
 parse_buddy(PurpleGroup *group, PurpleContact *contact, xmlnode *bnode)
 {
@@ -511,18 +523,6 @@ purple_buddy_is_online(PurpleBlistNode *
 /*  GObject Code  */
 /******************/
 
-enum {
-	PROP_0,
-	PROP_ACCOUNT,
-	PROP_NAME,
-	PROP_ALIAS,
-	PROP_LAST
-};
-
-#define PROP_ACCOUNT_S "account"
-#define PROP_NAME_S "name"
-#define PROP_ALIAS_S "alias"
-
 PurpleBuddy *purple_buddy_new(PurpleAccount *account, const char *name,
 		const char *alias, PurpleBlistNode *parent)
 {
============================================================
--- libpurple/chat.c	be54890dbd017ca9c06e0429cbab5a4177767321
+++ libpurple/chat.c	1106a3433f241ae8e00d46138f6ca8cc6d0b4da9
@@ -39,6 +39,18 @@ struct _PurpleChatPrivate {
 	PurpleAccount *account; /**< The account this chat is attached to */
 };
 
+enum {
+	PROP_0,
+	PROP_ALIAS,
+	PROP_ACCOUNT,
+	PROP_COMPONENTS,
+	PROP_LAST
+};
+
+#define PROP_ALIAS_S "alias"
+#define PROP_ACCOUNT_S "account"
+#define PROP_COMPONENTS_S "components"
+
 static void
 chat_component_to_xmlnode(gpointer key, gpointer value, gpointer user_data)
 {
@@ -273,18 +285,6 @@ purple_chat_is_online(PurpleBlistNode *n
 /*  GObject Code  */
 /******************/
 
-enum {
-	PROP_0,
-	PROP_ALIAS,
-	PROP_ACCOUNT,
-	PROP_COMPONENTS,
-	PROP_LAST
-};
-
-#define PROP_ALIAS_S "alias"
-#define PROP_ACCOUNT_S "account"
-#define PROP_COMPONENTS_S "components"
-
 static PurpleBlistNodeClass *parent_class = NULL;
 
 PurpleChat *purple_chat_new(PurpleAccount *account, const char *alias, GHashTable *components)