diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | libpurple/blist.h | 2 | ||||
| -rw-r--r-- | libpurple/notify.h | 9 | ||||
| -rw-r--r-- | libpurple/plugin.h | 12 | ||||
| -rw-r--r-- | libpurple/sslconn.h | 2 |
5 files changed, 26 insertions, 1 deletions
@@ -8,6 +8,8 @@ version 2.2.2: 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 diff --git a/libpurple/blist.h b/libpurple/blist.h index 5464b4fe9b..af48e775b3 100644 --- a/libpurple/blist.h +++ b/libpurple/blist.h @@ -483,6 +483,7 @@ void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *node); */ PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact); +#ifndef PURPLE_DISABLE_DEPRECATED /** * Sets the alias for a contact. * @@ -492,6 +493,7 @@ PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact); * @deprecated Use purple_blist_alias_contact() instead. */ void purple_contact_set_alias(PurpleContact *contact, const char *alias); +#endif /** * Gets the alias for a contact. diff --git a/libpurple/notify.h b/libpurple/notify.h index 55f88e2e1c..0b5fd0d8c6 100644 --- a/libpurple/notify.h +++ b/libpurple/notify.h @@ -290,7 +290,7 @@ void purple_notify_searchresults_column_add(PurpleNotifySearchResults *results, */ 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 @@ void purple_notify_searchresults_row_add(PurpleNotifySearchResults *results, * @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 @@ guint purple_notify_searchresults_get_rows_count(PurpleNotifySearchResults *resu * @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 @@ guint purple_notify_searchresults_get_columns_count(PurpleNotifySearchResults *r */ 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 @@ GList *purple_notify_searchresults_row_get(PurpleNotifySearchResults *results, */ char *purple_notify_searchresults_column_get_title(PurpleNotifySearchResults *results, unsigned int column_id); +#endif /*@}*/ diff --git a/libpurple/plugin.h b/libpurple/plugin.h index 76bab519c4..a514b4aef5 100644 --- a/libpurple/plugin.h +++ b/libpurple/plugin.h @@ -526,6 +526,7 @@ void purple_plugins_probe(const char *ext); */ gboolean purple_plugins_enabled(void); +#ifndef PURPLE_DISABLE_DEPRECATED /** * Registers a function that will be called when probing is finished. * @@ -534,7 +535,9 @@ gboolean purple_plugins_enabled(void); * @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 @@ void purple_plugins_register_probe_notify_cb(void (*func)(void *), void *data); * @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_unregister_probe_notify_cb(void (*func)(void *)); */ 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 @@ void purple_plugins_register_load_notify_cb(void (*func)(PurplePlugin *, void *) * @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_unregister_load_notify_cb(void (*func)(PurplePlugin *, void */ 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_register_unload_notify_cb(void (*func)(PurplePlugin *, void */ void purple_plugins_unregister_unload_notify_cb(void (*func)(PurplePlugin *, void *)); +#endif /** * Finds a plugin with the specified name. diff --git a/libpurple/sslconn.h b/libpurple/sslconn.h index 6d4ea92e92..a28f72b22a 100644 --- a/libpurple/sslconn.h +++ b/libpurple/sslconn.h @@ -185,6 +185,7 @@ PurpleSslConnection *purple_ssl_connect(PurpleAccount *account, const char *host PurpleSslErrorFunction error_func, void *data); +#ifndef PURPLE_DISABLE_DEPRECATED /** * Makes a SSL connection using an already open file descriptor. * @@ -202,6 +203,7 @@ PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, PurpleSslInputFunction func, PurpleSslErrorFunction error_func, void *data); +#endif /** * Makes a SSL connection using an already open file descriptor. |