# HG changeset patch # User Richard Laager # Date 1225396705 0 # Node ID 716048e4fbbd0fbbc4f16a0808d0ad388daeb0bc # Parent 3324f099a212c2aa7f79f68ec7443965d5bedf04 Fix some macros to work with hidden structs. diff -r 3324f099a212 -r 716048e4fbbd libpurple/blist.h --- a/libpurple/blist.h Thu Oct 30 19:57:47 2008 +0000 +++ b/libpurple/blist.h Thu Oct 30 19:58:25 2008 +0000 @@ -75,11 +75,11 @@ } 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"