dnssrv.h   dnssrv.h 
skipping to change at line 136 skipping to change at line 136
* *
* @deprecated Use purple_srv_resolve_account instead * @deprecated Use purple_srv_resolve_account instead
*/ */
PurpleSrvTxtQueryData *purple_srv_resolve(const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata); PurpleSrvTxtQueryData *purple_srv_resolve(const char *protocol, const char *transport, const char *domain, PurpleSrvCallback cb, gpointer extradata);
#endif #endif
/** /**
* Cancel an SRV or DNS query. * Cancel an SRV or DNS query.
* *
* @param query_data The request to cancel. * @param query_data The request to cancel.
*
* @deprecated Use purple_srv_txt_query_destroy instead
*/ */
void purple_srv_cancel(PurpleSrvTxtQueryData *query_data); void purple_srv_cancel(PurpleSrvTxtQueryData *query_data);
/** /**
* Queries an TXT record. * Queries an TXT record.
* *
* @param account the account that the query is being done for (or NULL) * @param account the account that the query is being done for (or NULL)
* @param owner Name of the protocol (e.g. "_xmppconnect") * @param owner Name of the protocol (e.g. "_xmppconnect")
* @param domain Domain name to query (e.g. "blubb.com") * @param domain Domain name to query (e.g. "blubb.com")
* @param cb A callback which will be called with the results * @param cb A callback which will be called with the results
skipping to change at line 173 skipping to change at line 175
* @since 2.6.0 * @since 2.6.0
*/ */
PurpleSrvTxtQueryData *purple_txt_resolve(const char *owner, const char *do main, PurpleTxtCallback cb, gpointer extradata); PurpleSrvTxtQueryData *purple_txt_resolve(const char *owner, const char *do main, PurpleTxtCallback cb, gpointer extradata);
#endif #endif
/** /**
* Cancel an TXT DNS query. * Cancel an TXT DNS query.
* *
* @param query_data The request to cancel. * @param query_data The request to cancel.
* @since 2.6.0 * @since 2.6.0
*
* @deprecated Use purple_srv_txt_query_destroy instead
*/ */
void purple_txt_cancel(PurpleSrvTxtQueryData *query_data); void purple_txt_cancel(PurpleSrvTxtQueryData *query_data);
/** /**
* Get the value of the current TXT record. * Get the value of the current TXT record.
* *
* @param response The TXT response record * @param response The TXT response record
* @returns The value of the current TXT record. * @returns The value of the current TXT record.
* @since 2.6.0 * @since 2.6.0
*/ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 4 lines changed or added


 gtkdialogs.h   gtkdialogs.h 
skipping to change at line 39 skipping to change at line 39
#include "account.h" #include "account.h"
#include "conversation.h" #include "conversation.h"
/* Functions in gtkdialogs.c (these should actually stay in this file) */ /* Functions in gtkdialogs.c (these should actually stay in this file) */
void pidgin_dialogs_destroy_all(void); void pidgin_dialogs_destroy_all(void);
void pidgin_dialogs_about(void); void pidgin_dialogs_about(void);
void pidgin_dialogs_buildinfo(void); void pidgin_dialogs_buildinfo(void);
void pidgin_dialogs_developers(void); void pidgin_dialogs_developers(void);
void pidgin_dialogs_translators(void); void pidgin_dialogs_translators(void);
void pidgin_dialogs_plugins_info(void);
void pidgin_dialogs_im(void); void pidgin_dialogs_im(void);
void pidgin_dialogs_im_with_user(PurpleAccount *, const char *); void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
void pidgin_dialogs_info(void); void pidgin_dialogs_info(void);
void pidgin_dialogs_log(void); void pidgin_dialogs_log(void);
#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKDIALOGS_C_) #if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKDIALOGS_C_)
/** /**
* @deprecated This function is no longer used and will be removed in * @deprecated This function is no longer used and will be removed in
* Pidgin 3.0.0 unless there is sufficient demand to keep it. * Pidgin 3.0.0 unless there is sufficient demand to keep it.
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 version.h   version.h 
skipping to change at line 30 skipping to change at line 30
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_VERSION_H_ #ifndef _PURPLE_VERSION_H_
#define _PURPLE_VERSION_H_ #define _PURPLE_VERSION_H_
/** The major version of the running libpurple. */ /** The major version of the running libpurple. */
#define PURPLE_MAJOR_VERSION (2) #define PURPLE_MAJOR_VERSION (2)
/** The minor version of the running libpurple. */ /** The minor version of the running libpurple. */
#define PURPLE_MINOR_VERSION (9) #define PURPLE_MINOR_VERSION (10)
/** The micro version of the running libpurple. */ /** The micro version of the running libpurple. */
#define PURPLE_MICRO_VERSION (0) #define PURPLE_MICRO_VERSION (0)
#define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \ #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \
((y ) < PURPLE_MINOR_VERSION || \ ((y ) < PURPLE_MINOR_VERSION || \
(( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) (( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION)))
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/