--- a/libpurple/blist.h Mon Aug 22 22:46:08 2011 +0000
+++ b/libpurple/blist.h Fri Dec 23 08:21:58 2011 +0000
@@ -75,9 +75,6 @@
} PurpleBlistNodeFlags;
-/**
- * @since 2.6.0
- */
#define PURPLE_BLIST_NODE(obj) ((PurpleBlistNode *)(obj))
#define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (purple_blist_node_get_flags((PurpleBlistNode*)(b)) & (f))
@@ -86,24 +83,12 @@
#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)
-/**
- * @since 2.6.0
- */
#define PURPLE_GROUP(obj) ((PurpleGroup *)(obj))
-/**
- * @since 2.6.0
- */
#define PURPLE_CONTACT(obj) ((PurpleContact *)(obj))
-/**
- * @since 2.6.0
- */
#define PURPLE_BUDDY(obj) ((PurpleBuddy *)(obj))
-/**
- * @since 2.6.0
- */
#define PURPLE_CHAT(obj) ((PurpleChat *)(obj))
#include "account.h"
@@ -226,8 +211,6 @@
* previous libpurple versions.
*
* @param node The node which has been modified.
- *
- * @since 2.6.0.
*/
void (*save_node)(PurpleBlistNode *node);
@@ -241,7 +224,6 @@
* previous libpurple versions.
*
* @param node The node which has been modified.
- * @since 2.6.0.
*/
void (*remove_node)(PurpleBlistNode *node);
@@ -256,7 +238,6 @@
*
* @param account The account whose data to save. If NULL, save all data
* for all accounts.
- * @since 2.6.0.
*/
void (*save_account)(PurpleAccount *account);
@@ -311,7 +292,6 @@
* freeing the list.
*
* @see purple_find_buddies
- * @since 2.6.0
*/
GSList *purple_blist_get_buddies(void);
@@ -319,8 +299,6 @@
* Returns the UI data for the list.
*
* @return The UI data for the list.
- *
- * @since 2.6.0
*/
gpointer purple_blist_get_ui_data(void);
@@ -328,8 +306,6 @@
* Sets the UI data for the list.
*
* @param ui_data The UI data for the list.
- *
- * @since 2.6.0
*/
void purple_blist_set_ui_data(gpointer ui_data);
@@ -352,7 +328,7 @@
*
* @param node A node.
* @return The parent node.
- * @since 2.4.0
+ *
* @see purple_blist_node_get_first_child
* @see purple_blist_node_get_sibling_next
* @see purple_blist_node_get_sibling_prev
@@ -365,7 +341,7 @@
*
* @param node A node.
* @return The child node.
- * @since 2.4.0
+ *
* @see purple_blist_node_get_parent
* @see purple_blist_node_get_sibling_next
* @see purple_blist_node_get_sibling_prev
@@ -378,7 +354,7 @@
*
* @param node A node.
* @return The sibling node.
- * @since 2.4.0
+ *
* @see purple_blist_node_get_parent
* @see purple_blist_node_get_first_child
* @see purple_blist_node_get_sibling_prev
@@ -391,7 +367,7 @@
*
* @param node A node.
* @return The sibling node.
- * @since 2.4.0
+ *
* @see purple_blist_node_get_parent
* @see purple_blist_node_get_first_child
* @see purple_blist_node_get_sibling_next
@@ -404,7 +380,6 @@
*
* @param node The node.
* @return The UI data.
- * @since 2.6.0
*/
gpointer purple_blist_node_get_ui_data(const PurpleBlistNode *node);
@@ -413,8 +388,6 @@
*
* @param node The node.
* @param ui_data The UI data.
- *
- * @since 2.6.0
*/
void purple_blist_node_set_ui_data(PurpleBlistNode *node, gpointer ui_data);
@@ -454,21 +427,9 @@
* Updates a node's custom icon.
*
* @param node The PurpleBlistNode whose custom icon has changed.
- *
- * @since 2.5.0
*/
void purple_blist_update_node_icon(PurpleBlistNode *node);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_)
-/**
- * Updates a buddy's icon.
- *
- * @param buddy The buddy whose buddy icon has changed
- * @deprecated Use purple_blist_update_node_icon() instead.
- */
-void purple_blist_update_buddy_icon(PurpleBuddy *buddy);
-#endif
-
/**
* Renames a buddy in the buddy list.
*
@@ -623,7 +584,6 @@
* @return The protocol data.
*
* @see purple_buddy_set_protocol_data()
- * @since 2.6.0
*/
gpointer purple_buddy_get_protocol_data(const PurpleBuddy *buddy);
@@ -636,7 +596,6 @@
* @param data The data.
*
* @see purple_buddy_get_protocol_data()
- * @since 2.6.0
*/
void purple_buddy_set_protocol_data(PurpleBuddy *buddy, gpointer data);
@@ -663,8 +622,6 @@
*
* @param buddy The buddy.
* @return The media caps.
- *
- * @since 2.7.0
*/
PurpleMediaCaps purple_buddy_get_media_caps(const PurpleBuddy *buddy);
@@ -739,8 +696,6 @@
*
* @param contact The contact
* @return The group
- *
- * @since 2.7.0
*/
PurpleGroup *purple_contact_get_group(const PurpleContact *contact);
@@ -774,18 +729,6 @@
*/
PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_)
-/**
- * Sets the alias for a contact.
- *
- * @param contact The contact
- * @param alias The alias to set, or NULL to unset
- *
- * @deprecated Use purple_blist_alias_contact() instead.
- */
-void purple_contact_set_alias(PurpleContact *contact, const char *alias);
-#endif
-
/**
* Gets the alias for a contact.
*
@@ -813,6 +756,15 @@
void purple_contact_invalidate_priority_buddy(PurpleContact *contact);
/**
+ * Determines the total size of a contact.
+ *
+ * @param contact The contact
+ * @param offline Count buddies in offline accounts
+ * @return The number of buddies in the contact
+ */
+int purple_contact_get_contact_size(PurpleContact *contact, gboolean offline);
+
+/**
* Removes a buddy from the buddy list and frees the memory allocated to it.
* This doesn't actually try to remove the buddy from the server list.
*
@@ -876,19 +828,6 @@
*/
const char *purple_buddy_get_contact_alias(PurpleBuddy *buddy);
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_)
-/**
- * Returns the correct alias for this user, ignoring server aliases. Used
- * when a user-recognizable name is required. In order: buddy's alias; buddy's
- * contact alias; buddy's user name.
- *
- * @param buddy The buddy whose alias will be returned.
- * @return The appropriate name or alias.
- * @deprecated Try purple_buddy_get_alias(), if server aliases are okay.
- */
-const char *purple_buddy_get_local_alias(PurpleBuddy *buddy);
-#endif
-
/**
* Returns the correct name to display for a buddy. In order of precedence:
* the buddy's alias; the buddy's server alias; the buddy's contact alias;
@@ -904,8 +843,6 @@
*
* @param buddy The buddy
* @return The local alias for the buddy
- *
- * @since 2.6.0
*/
const char *purple_buddy_get_local_buddy_alias(PurpleBuddy *buddy);
@@ -981,8 +918,6 @@
* @param chat The chat.
*
* @return The account the chat belongs to.
- *
- * @since 2.4.0
*/
PurpleAccount *purple_chat_get_account(PurpleChat *chat);
@@ -992,8 +927,6 @@
* @param chat The chat.
*
* @constreturn The hashtable.
- *
- * @since 2.4.0
*/
GHashTable *purple_chat_get_components(PurpleChat *chat);
@@ -1211,8 +1144,6 @@
* @param node The node.
*
* @return The type of the node.
- *
- * @since 2.1.0
*/
PurpleBlistNodeType purple_blist_node_get_type(PurpleBlistNode *node);
