pidgin: e088be63: Remove deprecated buddy icon functions a...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: e088be63d0be5c2a471bf1f58423823ec2413a82
Parent:   9466536e56be876a18ea5d8d5f2bfcfc609a4ef1
Author:   qulogic at pidgin.im
Date:     09/02/11 00:25:04
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e088be63d0be5c2a471bf1f58423823ec2413a82

Changelog: 

Remove deprecated buddy icon functions and @since tags.

Changes against parent 9466536e56be876a18ea5d8d5f2bfcfc609a4ef1

  patched  ChangeLog.API
  patched  libpurple/buddyicon.c
  patched  libpurple/buddyicon.h

-------------- next part --------------
============================================================
--- libpurple/buddyicon.c	125bc4c1e95593c9219b287fd84278a6544265f0
+++ libpurple/buddyicon.c	99032cc8b1655f707616bfbefb8e1eafe884c19e
@@ -955,25 +955,6 @@ purple_buddy_icons_node_set_custom_icon_
 	return purple_buddy_icons_node_set_custom_icon(node, data, len);
 }
 
-gboolean
-purple_buddy_icons_has_custom_icon(PurpleContact *contact)
-{
-	return purple_buddy_icons_node_has_custom_icon((PurpleBlistNode*)contact);
-}
-
-PurpleStoredImage *
-purple_buddy_icons_find_custom_icon(PurpleContact *contact)
-{
-	return purple_buddy_icons_node_find_custom_icon((PurpleBlistNode*)contact);
-}
-
-PurpleStoredImage *
-purple_buddy_icons_set_custom_icon(PurpleContact *contact, guchar *icon_data,
-                                   size_t icon_len)
-{
-	return purple_buddy_icons_node_set_custom_icon((PurpleBlistNode*)contact, icon_data, icon_len);
-}
-
 static void
 delete_buddy_icon_settings(PurpleBlistNode *node, const char *setting_name)
 {
============================================================
--- libpurple/buddyicon.h	19598cbb463e5a2df486ad0aa60f994601dedabf
+++ libpurple/buddyicon.h	1bfd811e67d43946eeb9354158d7c9edeba41655
@@ -275,7 +275,6 @@ purple_buddy_icons_get_account_icon_time
  * @param node The blist node.
  *
  * @return A boolean indicating if @a node has a custom buddy icon.
- * @since 2.5.0
  */
 gboolean
 purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node);
@@ -293,7 +292,6 @@ purple_buddy_icons_node_has_custom_icon(
  * @param node The node.
  *
  * @return The custom buddy icon.
- * @since 2.5.0
  */
 PurpleStoredImage *
 purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node);
@@ -311,7 +309,6 @@ purple_buddy_icons_node_find_custom_icon
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
  *         and must call purple_imgstore_ref() if it wants one.
- * @since 2.5.0
  */
 PurpleStoredImage *
 purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
@@ -329,46 +326,12 @@ purple_buddy_icons_node_set_custom_icon(
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
  *         and must call purple_imgstore_ref() if it wants one.
- * @since 2.5.0
  */
 PurpleStoredImage *
 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename);
 
-#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BUDDYICON_C_)
 /**
- * PurpleContact version of purple_buddy_icons_node_has_custom_icon.
- *
- * @copydoc purple_buddy_icons_node_has_custom_icon()
- *
- * @deprecated Use purple_buddy_icons_node_has_custom_icon instead.
- */
-gboolean
-purple_buddy_icons_has_custom_icon(PurpleContact *contact);
-
-/**
- * PurpleContact version of purple_buddy_icons_node_find_custom_icon.
- *
- * @copydoc purple_buddy_icons_node_find_custom_icon()
- *
- * @deprecated Use purple_buddy_icons_node_find_custom_icon instead.
- */
-PurpleStoredImage *
-purple_buddy_icons_find_custom_icon(PurpleContact *contact);
-
-/**
- * PurpleContact version of purple_buddy_icons_node_set_custom_icon.
- *
- * @copydoc purple_buddy_icons_node_set_custom_icon()
- *
- * @deprecated Use purple_buddy_icons_node_set_custom_icon instead.
- */
-PurpleStoredImage *
-purple_buddy_icons_set_custom_icon(PurpleContact *contact,
-                                   guchar *icon_data, size_t icon_len);
-#endif
-
-/**
  * Sets whether or not buddy icon caching is enabled.
  *
  * @param caching TRUE of buddy icon caching should be enabled, or
============================================================
--- ChangeLog.API	151d68d26e53bac8b80a7ed085d6248a1dabbd00
+++ ChangeLog.API	0d107126049c21b761622bcbebebf42eb5ed3913
@@ -99,6 +99,9 @@ version 3.0.0 (??/??/????):
 		* pidgin_set_custom_buddy_icon
 		* pidgin_setup_screenname_autocomplete
 		* PidginConversation.sg
+		* purple_buddy_icons_has_custom_icon
+		* purple_buddy_icons_find_custom_icon
+		* purple_buddy_icons_set_custom_icon
 		* purple_connection_error_reason
 		* purple_core_migrate
 		* purple_dnsquery_a_account