Mercurial > pidgin.yaz
changeset 21190:34de8ef19294
Honor a PURPLE_DISABLE_DEPRECATED define to allow plugins to catch
deprecated functions earlier rather than later.
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 06 Oct 2007 22:59:09 +0000 |
| parents | d05f79920d50 |
| children | 992d520224f7 |
| files | ChangeLog libpurple/blist.h libpurple/notify.h libpurple/plugin.h libpurple/sslconn.h |
| diffstat | 5 files changed, 26 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Oct 06 22:47:38 2007 +0000 +++ b/ChangeLog Sat Oct 06 22:59:09 2007 +0000 @@ -8,6 +8,8 @@ libpurple: * Real usernames are now shown in the system log. + * We now honor a PURPLE_DISABLE_DEPRECATED define to allow plugins to + catch deprecated functions earlier rather than later. Pidgin: * If you alias a buddy to an alias that is already present within
--- a/libpurple/blist.h Sat Oct 06 22:47:38 2007 +0000 +++ b/libpurple/blist.h Sat Oct 06 22:59:09 2007 +0000 @@ -483,6 +483,7 @@ */ PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact); +#ifndef PURPLE_DISABLE_DEPRECATED /** * Sets the alias for a contact. * @@ -492,6 +493,7 @@ * @deprecated Use purple_blist_alias_contact() instead. */ void purple_contact_set_alias(PurpleContact *contact, const char *alias); +#endif /** * Gets the alias for a contact.
--- a/libpurple/notify.h Sat Oct 06 22:47:38 2007 +0000 +++ b/libpurple/notify.h Sat Oct 06 22:59:09 2007 +0000 @@ -290,7 +290,7 @@ */ void purple_notify_searchresults_row_add(PurpleNotifySearchResults *results, GList *row); - +#ifndef PURPLE_DISABLE_DEPRECATED /** * Returns a number of the rows in the search results object. * @@ -309,7 +309,9 @@ * @return Number of the result rows. */ guint purple_notify_searchresults_get_rows_count(PurpleNotifySearchResults *results); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Returns a number of the columns in the search results object. * @@ -328,7 +330,9 @@ * @return Number of the columns. */ guint purple_notify_searchresults_get_columns_count(PurpleNotifySearchResults *results); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Returns a row of the results from the search results object. * @@ -349,7 +353,9 @@ */ GList *purple_notify_searchresults_row_get(PurpleNotifySearchResults *results, unsigned int row_id); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Returns a title of the search results object's column. * @@ -368,6 +374,7 @@ */ char *purple_notify_searchresults_column_get_title(PurpleNotifySearchResults *results, unsigned int column_id); +#endif /*@}*/
--- a/libpurple/plugin.h Sat Oct 06 22:47:38 2007 +0000 +++ b/libpurple/plugin.h Sat Oct 06 22:59:09 2007 +0000 @@ -526,6 +526,7 @@ */ gboolean purple_plugins_enabled(void); +#ifndef PURPLE_DISABLE_DEPRECATED /** * Registers a function that will be called when probing is finished. * @@ -534,7 +535,9 @@ * @deprecated If you need this, ask for a plugin-probe signal to be added. */ void purple_plugins_register_probe_notify_cb(void (*func)(void *), void *data); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Unregisters a function that would be called when probing is finished. * @@ -542,7 +545,9 @@ * @deprecated If you need this, ask for a plugin-probe signal to be added. */ void purple_plugins_unregister_probe_notify_cb(void (*func)(void *)); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Registers a function that will be called when a plugin is loaded. * @@ -552,7 +557,9 @@ */ void purple_plugins_register_load_notify_cb(void (*func)(PurplePlugin *, void *), void *data); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Unregisters a function that would be called when a plugin is loaded. * @@ -560,7 +567,9 @@ * @deprecated Use the plugin-load signal instead. */ void purple_plugins_unregister_load_notify_cb(void (*func)(PurplePlugin *, void *)); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Registers a function that will be called when a plugin is unloaded. * @@ -570,7 +579,9 @@ */ void purple_plugins_register_unload_notify_cb(void (*func)(PurplePlugin *, void *), void *data); +#endif +#ifndef PURPLE_DISABLE_DEPRECATED /** * Unregisters a function that would be called when a plugin is unloaded. * @@ -579,6 +590,7 @@ */ void purple_plugins_unregister_unload_notify_cb(void (*func)(PurplePlugin *, void *)); +#endif /** * Finds a plugin with the specified name.
--- a/libpurple/sslconn.h Sat Oct 06 22:47:38 2007 +0000 +++ b/libpurple/sslconn.h Sat Oct 06 22:59:09 2007 +0000 @@ -185,6 +185,7 @@ PurpleSslErrorFunction error_func, void *data); +#ifndef PURPLE_DISABLE_DEPRECATED /** * Makes a SSL connection using an already open file descriptor. * @@ -202,6 +203,7 @@ PurpleSslInputFunction func, PurpleSslErrorFunction error_func, void *data); +#endif /** * Makes a SSL connection using an already open file descriptor.