gobjectification: 363d0ea4: Removed BLIST_HELPERS and moved the meth...

[aluink at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 363d0ea4442154df24c0d91764b182435991af2b
Ancestor: 6f9be33a608e464755ac57be1cff12357e7f84e0
Author: aluink at soc.pidgin.im
Date: 2009-08-12T14:31:05
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/363d0ea4442154df24c0d91764b182435991af2b

Modified files:
        libpurple/blist-node.c libpurple/blist-node.h
        libpurple/blist.h libpurple/buddy.c libpurple/buddy.h
        libpurple/contact.c libpurple/contact.h libpurple/group.c
        libpurple/group.h

ChangeLog: 

Removed BLIST_HELPERS and moved the methods to their respective headers

-------------- next part --------------
============================================================
--- libpurple/blist-node.c	5aa7e2504fd38020dbfd728cfb5e91c433928ba9
+++ libpurple/blist-node.c	f377b88702d3b3843e4991ffb1bc55dd787534a7
@@ -21,7 +21,6 @@
  *
  */
 #define _PURPLE_BLIST_NODE_C_
-#define _BLIST_HELPERS_
 
 #include "internal.h"
 #include "blist-node.h"
============================================================
--- libpurple/blist-node.h	d82169908c865459768f14a165f22531d65fee6c
+++ libpurple/blist-node.h	f7dff5b4c076c14cfdaf95f0267916f7d78db6bb
@@ -371,5 +371,8 @@ GType purple_blist_node_get_gtype(void);
  */
 GType purple_blist_node_get_gtype(void);
 
+void purple_blist_node_destroy(PurpleBlistNode* node);
+void purple_blist_node_initialize_settings(PurpleBlistNode *node);
+PurpleBlistNode *purple_blist_get_last_sibling(PurpleBlistNode *node);
 PurpleBlistNode *purple_blist_get_last_child(PurpleBlistNode *node);
 #endif
============================================================
--- libpurple/blist.h	b9239d35cd23485b947558429925d2793132d236
+++ libpurple/blist.h	ee05d80989b4f25d94d93b14202be7636ffe9671
@@ -121,17 +121,6 @@ gboolean purple_strings_are_different(co
 void value_to_xmlnode(gpointer key, gpointer hvalue, gpointer user_data);
 gboolean purple_strings_are_different(const char *one, const char *two);
 
-#ifdef _BLIST_HELPERS_
-
-xmlnode *contact_to_xmlnode(PurpleBlistNode *cnode);
-xmlnode *buddy_to_xmlnode(PurpleBlistNode *bnode);
-xmlnode *group_to_xmlnode(PurpleBlistNode *bnode);
-PurpleBlistNode *purple_blist_get_last_sibling(PurpleBlistNode *node);
-void parse_contact(PurpleGroup *group, xmlnode *cnode);
-void parse_buddy(PurpleGroup *group, PurpleContact *contact, xmlnode *bnode);
-void parse_group(xmlnode *groupnode);
-void purple_contact_compute_priority_buddy(PurpleContact *contact);
-
 /* The global static members */
 struct _list_account_buddies {
 	GSList *list;
@@ -144,11 +133,7 @@ struct _purple_hbuddy {
 	PurpleBlistNode *group;
 };
 
-void purple_blist_node_initialize_settings(PurpleBlistNode *node);
-void purple_blist_node_destroy(PurpleBlistNode* node);
 
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
============================================================
--- libpurple/buddy.c	3598cc1bfc250ec71b0d243a654563f6576429ff
+++ libpurple/buddy.c	0a9c1dbf8aea8e6e3cd5dee999da3dd66c825b4d
@@ -21,7 +21,6 @@
  *
  */
 #define _PURPLE_BUDDY_C_
-#define _BLIST_HELPERS_
 
 #include "internal.h"
 #include "dbus-maybe.h"
============================================================
--- libpurple/buddy.h	11e489c4a1cb01c9fa49a3ddc8390da0bb22a937
+++ libpurple/buddy.h	67daa5de3d6958fa8a30943b169b3db50db329c5
@@ -57,6 +57,8 @@ struct _PurpleBuddyClass {
 	PurpleBlistNodeClass parent;
 };
 
+xmlnode *buddy_to_xmlnode(PurpleBlistNode *bnode);
+void parse_buddy(PurpleGroup *group, PurpleContact *contact, xmlnode *bnode);
 /**
  * Creates a new buddy.
  *
============================================================
--- libpurple/contact.c	dd47d7fdd45a6aae9c132fce1be88575839b9d7d
+++ libpurple/contact.c	8d0ca9ba03589ec400d1f670e38fbc74974c1f4f
@@ -21,7 +21,6 @@
  *
  */
 #define _PURPLE_CHAT_C_
-#define _BLIST_HELPERS_
 
 #include "internal.h"
 #include "contact.h"
============================================================
--- libpurple/contact.h	a8f8ce46f2525925c278bc2fde196828aee338b6
+++ libpurple/contact.h	ac6beea113177a8c9eebf9335d280152fd5555f8
@@ -92,6 +92,9 @@ void purple_contact_destroy(PurpleContac
  */
 void purple_contact_destroy(PurpleContact *contact);
 
+xmlnode *contact_to_xmlnode(PurpleBlistNode *cnode);
+void parse_contact(PurpleGroup *group, xmlnode *cnode);
+void purple_contact_compute_priority_buddy(PurpleContact *contact);
 /**
  * Returns the highest priority buddy for a given contact.
  *
============================================================
--- libpurple/group.c	151bb38b0aa4a4190d955f24b0adb1bf62a5db22
+++ libpurple/group.c	ac5be9aa9bfdc2aac6001708a751165ca86de26d
@@ -21,7 +21,6 @@
  *
  */
 #define _PURPLE_GROUP_C_
-#define _BLIST_HELPERS_
 
 #include "internal.h"
 #include "group.h"
============================================================
--- libpurple/group.h	17fba2a72df6431b96ad600e38928c31501b7d5c
+++ libpurple/group.h	bf4f8e9c94260fc911781aff457a67aebe353c0a
@@ -58,6 +58,8 @@ struct _PurpleGroupClass {
 	PurpleBlistNodeClass parent;
 };
 
+xmlnode *group_to_xmlnode(PurpleBlistNode *bnode);
+void parse_group(xmlnode *groupnode);
 /**
  * Creates a new group
  *