Mercurial > pidgin.yaz
changeset 25423:5d726bb602bc
merge of '89cb8a5cf5210205e245047e7200484202e370a0'
and '9596c39b9cab71cd7a6e173209110fd3e3613636'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 27 Jan 2009 02:41:42 +0000 |
| parents | 903ed2de14bf (diff) d79827909ea3 (current diff) |
| children | a8c86e97d4f0 |
| files | .todo |
| diffstat | 5 files changed, 36 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.todo Mon Jan 26 11:02:24 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -<todo version="0.1.19"> - <title> - Gaim TODO List - </title> - <link filename="./libpurple/protocols/oscar/.todo" priority="medium" time="0"/> - <link filename="./libpurple/protocols/jabber/.todo" priority="medium" time="1176995038"/> -</todo>
--- a/ChangeLog.API Mon Jan 26 11:02:24 2009 +0000 +++ b/ChangeLog.API Tue Jan 27 02:41:42 2009 +0000 @@ -29,6 +29,17 @@ 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:
--- a/libpurple/notify.h Mon Jan 26 11:02:24 2009 +0000 +++ b/libpurple/notify.h Tue Jan 27 02:41:42 2009 +0000 @@ -291,6 +291,7 @@ */ 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_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 @@ * 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
--- a/libpurple/status.c Mon Jan 26 11:02:24 2009 +0000 +++ b/libpurple/status.c Tue Jan 27 02:41:42 2009 +0000 @@ -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"
--- a/libpurple/status.h Mon Jan 26 11:02:24 2009 +0000 +++ b/libpurple/status.h Tue Jan 27 02:41:42 2009 +0000 @@ -252,6 +252,7 @@ */ 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(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(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(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(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(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 @@ * @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_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(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(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(PurpleStatus *status, const char *id, const char *value); +#endif /** * Returns the status's type. @@ -798,6 +814,7 @@ */ 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 @@ * 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 @@ * @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.