pidgin.next.minor: 80734037: Slap some PURPLE_DISABLE_DEPRECATED chec...

rlaager at pidgin.im rlaager at pidgin.im
Mon Jan 26 06:15:27 EST 2009


-----------------------------------------------------------------
Revision: 807340376710777c81c04b56a05dbc3fd639cd3e
Ancestor: a515a270e1782f14b92ccfef56e731de38407ac6
Author: rlaager at pidgin.im
Date: 2009-01-26T11:11:39
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/807340376710777c81c04b56a05dbc3fd639cd3e

Modified files:
        ChangeLog.API libpurple/notify.h libpurple/status.c
        libpurple/status.h

ChangeLog: 

Slap some PURPLE_DISABLE_DEPRECATED checks around the functions Mark just
deprecated and add them to the ChangeLog.API file.

-------------- next part --------------
============================================================
--- ChangeLog.API	d43aa13127a4416b11f8e9221ced2e0b6a83aec0
+++ ChangeLog.API	ad6dfbba26938faec68d65d0d3e284c9a0c4ce11
@@ -29,6 +29,17 @@ version 2.6.0 (??/??/????):
 
 		Deprecated:
 		* purple_buddy_get_local_alias
+		* purple_notify_user_info_remove_entry
+		* purple_status_type_set_primary_attr
+		* purple_status_type_add_attr
+		* purple_status_type_add_attrs
+		* purple_status_type_add_attrs_vargs
+		* purple_status_type_get_primary_attr
+		* purple_status_set_attr_boolean
+		* purple_status_set_attr_int
+		* purple_status_set_attr_string
+		* purple_presence_add_status
+		* purple_presence_add_list
 
 	pidgin:
 		Added:
============================================================
--- libpurple/notify.h	c7a15efc6760d0d6526aea97907432e30d44f334
+++ libpurple/notify.h	a1e4170e9df67a42eaf9db3491e39a3e257387c2
@@ -291,6 +291,7 @@ void purple_notify_searchresults_row_add
  */
 void purple_notify_searchresults_row_add(PurpleNotifySearchResults *results,
 									   GList *row);
+
 #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_NOTIFY_C_)
 /**
  * Returns a number of the rows in the search results object.
@@ -558,6 +559,7 @@ void purple_notify_user_info_prepend_pai
  */
 void purple_notify_user_info_prepend_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_NOTIFY_C_)
 /**
  * Remove a PurpleNotifyUserInfoEntry from a PurpleNotifyUserInfo object
  * without freeing the entry.
@@ -571,6 +573,7 @@ void purple_notify_user_info_remove_entr
  *             public so that entries can be free'd after they're removed.
  */
 void purple_notify_user_info_remove_entry(PurpleNotifyUserInfo *user_info, PurpleNotifyUserInfoEntry *user_info_entry);
+#endif
 
 /**
  * Create a new PurpleNotifyUserInfoEntry
============================================================
--- libpurple/status.c	0d46838dd62442f876543e783e69c80e861c487b
+++ libpurple/status.c	c724f9a15ba36254f22584583ff339a3400a8e3c
@@ -23,6 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#define _PURPLE_STATUS_C_
+
 #include "internal.h"
 
 #include "blist.h"
============================================================
--- libpurple/status.h	fc1a06b17a40bf3375a777efa6fc2f9d1e8e8204
+++ libpurple/status.h	867e95f5725b4421c6ccc5adf5e94d25624dc0b8
@@ -252,6 +252,7 @@ void purple_status_type_destroy(PurpleSt
  */
 void purple_status_type_destroy(PurpleStatusType *status_type);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Sets a status type's primary attribute.
  *
@@ -266,7 +267,9 @@ void purple_status_type_set_primary_attr
  */
 void purple_status_type_set_primary_attr(PurpleStatusType *status_type,
 									   const char *attr_id);
+#endif
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Adds an attribute to a status type.
  *
@@ -281,7 +284,9 @@ void purple_status_type_add_attr(PurpleS
  */
 void purple_status_type_add_attr(PurpleStatusType *status_type, const char *id,
 							   const char *name, PurpleValue *value);
+#endif
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Adds multiple attributes to a status type.
  *
@@ -297,7 +302,9 @@ void purple_status_type_add_attrs(Purple
  */
 void purple_status_type_add_attrs(PurpleStatusType *status_type, const char *id,
 								const char *name, PurpleValue *value, ...) G_GNUC_NULL_TERMINATED;
+#endif
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Adds multiple attributes to a status type using a va_list.
  *
@@ -310,6 +317,7 @@ void purple_status_type_add_attrs_vargs(
  */
 void purple_status_type_add_attrs_vargs(PurpleStatusType *status_type,
 									  va_list args);
+#endif
 
 /**
  * Returns the primitive type of a status type.
@@ -392,6 +400,7 @@ gboolean purple_status_type_is_available
  */
 gboolean purple_status_type_is_available(const PurpleStatusType *status_type);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Returns a status type's primary attribute ID.
  *
@@ -402,6 +411,7 @@ const char *purple_status_type_get_prima
  * @deprecated This function isn't used and should be removed in 3.0.0.
  */
 const char *purple_status_type_get_primary_attr(const PurpleStatusType *type);
+#endif
 
 /**
  * Returns the attribute with the specified ID.
@@ -553,6 +563,7 @@ void purple_status_set_active_with_attrs
 void purple_status_set_active_with_attrs_list(PurpleStatus *status, gboolean active,
 											GList *attrs);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Sets the boolean value of an attribute in a status with the specified ID.
  *
@@ -565,7 +576,9 @@ void purple_status_set_attr_boolean(Purp
  */
 void purple_status_set_attr_boolean(PurpleStatus *status, const char *id,
 								  gboolean value);
+#endif
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Sets the integer value of an attribute in a status with the specified ID.
  *
@@ -578,7 +591,9 @@ void purple_status_set_attr_int(PurpleSt
  */
 void purple_status_set_attr_int(PurpleStatus *status, const char *id,
 							  int value);
+#endif
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Sets the string value of an attribute in a status with the specified ID.
  *
@@ -591,6 +606,7 @@ void purple_status_set_attr_string(Purpl
  */
 void purple_status_set_attr_string(PurpleStatus *status, const char *id,
 								 const char *value);
+#endif
 
 /**
  * Returns the status's type.
@@ -798,6 +814,7 @@ void purple_presence_destroy(PurplePrese
  */
 void purple_presence_destroy(PurplePresence *presence);
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Adds a status to a presence.
  *
@@ -808,7 +825,9 @@ void purple_presence_add_status(PurplePr
  *             and both should be removed in 3.0.0.
  */
 void purple_presence_add_status(PurplePresence *presence, PurpleStatus *status);
+#endif
 
+#if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_STATUS_C_)
 /**
  * Adds a list of statuses to the presence.
  *
@@ -819,6 +838,7 @@ void purple_presence_add_list(PurplePres
  * @deprecated This function isn't used and should be removed in 3.0.0.
  */
 void purple_presence_add_list(PurplePresence *presence, GList *source_list);
+#endif
 
 /**
  * Sets the active state of a status in a presence.


More information about the Commits mailing list