diff options
Diffstat (limited to 'libpurple/blist.h')
| -rw-r--r-- | libpurple/blist.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libpurple/blist.h b/libpurple/blist.h index a10dcd58eb..e9b04aeea5 100644 --- a/libpurple/blist.h +++ b/libpurple/blist.h @@ -75,11 +75,11 @@ typedef enum } PurpleBlistNodeFlags; -#define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (((PurpleBlistNode*)(b))->flags & (f)) +#define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (purple_blist_node_get_flags((PurpleBlistNode*)(b)) & (f)) #define PURPLE_BLIST_NODE_SHOULD_SAVE(b) (! PURPLE_BLIST_NODE_HAS_FLAG(b, PURPLE_BLIST_NODE_FLAG_NO_SAVE)) -#define PURPLE_BLIST_NODE_NAME(n) ((n)->type == PURPLE_BLIST_CHAT_NODE ? purple_chat_get_name((PurpleChat*)n) : \ - (n)->type == PURPLE_BLIST_BUDDY_NODE ? purple_buddy_get_name((PurpleBuddy*)n) : NULL) +#define PURPLE_BLIST_NODE_NAME(n) (purple_blist_node_get_type(n) == PURPLE_BLIST_CHAT_NODE ? purple_chat_get_name((PurpleChat*)n) : \ + purple_blist_node_get_type(n) == PURPLE_BLIST_BUDDY_NODE ? purple_buddy_get_name((PurpleBuddy*)n) : NULL) #include "account.h" #include "buddyicon.h" @@ -89,6 +89,8 @@ typedef enum /* Data Structures */ /**************************************************************************/ +#if !(defined PURPLE_HIDE_STRUCTS) || (defined _PURPLE_BLIST_C_) + /** * A Buddy list node. This can represent a group, a buddy, or anything else. * This is a base class for struct buddy and struct group and for anything @@ -154,6 +156,8 @@ struct _PurpleChat { PurpleAccount *account; /**< The account this chat is attached to */ }; +#endif /* PURPLE_HIDE_STRUCTS && PURPLE_BLIST_STRUCTS */ + /** * The Buddy List @@ -331,7 +335,7 @@ void purple_blist_update_buddy_status(PurpleBuddy *buddy, PurpleStatus *old_stat */ void purple_blist_update_node_icon(PurpleBlistNode *node); -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_) /** * Updates a buddy's icon. * @@ -557,7 +561,7 @@ void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node); */ PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact); -#ifndef PURPLE_DISABLE_DEPRECATED +#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_) /** * Sets the alias for a contact. * |