libgnt: headers diff between 2.4.3 and 2.5.0 versions

	accountopt.h	accountopt.h

	skipping to change at line 142	skipping to change at line 142
	*/	*/
	PurpleAccountOption purple_account_option_string_new(const char text,	PurpleAccountOption purple_account_option_string_new(const char text,
	const char pref_name, const char default_value);	const char pref_name, const char default_value);

	/**	/**
	* Creates a new list account option.	* Creates a new list account option.
	*	*
	* The list passed will be owned by the account option, and the	* The list passed will be owned by the account option, and the
	* strings inside will be freed automatically.	* strings inside will be freed automatically.
	*	*

	* The list is a list of PurpleKeyValuePair items. The key is the ID stored	* The list is a list of #PurpleKeyValuePair items. The key is the label th
	and	at
	* used internally, and the <tt>(const char *)</tt> value is the label disp	* should be displayed to the user, and the <tt>(const char *)</tt> value i
	layed.	s
		* the internal ID that should be passed to purple_account_set_string() to
		* choose that value.
	*	*
	* @param text The text of the option.	* @param text The text of the option.
	* @param pref_name The account preference name for the option.	* @param pref_name The account preference name for the option.
	* @param list The key, value list.	* @param list The key, value list.
	*	*
	* @return The account option.	* @return The account option.
	*/	*/
	PurpleAccountOption purple_account_option_list_new(const char text,	PurpleAccountOption purple_account_option_list_new(const char text,
	const char pref_name, GList list);	const char pref_name, GList list);


	skipping to change at line 307	skipping to change at line 309
	* @return %TRUE if the option's value should be obscured.	* @return %TRUE if the option's value should be obscured.
	*/	*/
	gboolean	gboolean
	purple_account_option_get_masked(const PurpleAccountOption *option);	purple_account_option_get_masked(const PurpleAccountOption *option);

	/**	/**
	* Returns the list values for an account option.	* Returns the list values for an account option.
	*	*
	* @param option The account option.	* @param option The account option.
	*	*

	* @constreturn The list values.	* @constreturn A list of #PurpleKeyValuePair, mapping the human-readable
		* description of the value to the <tt>(const char *)</tt> tha
		t
		* should be passed to purple_account_set_string() to set the
		* option.
	*/	*/
	GList purple_account_option_get_list(const PurpleAccountOption option);	GList purple_account_option_get_list(const PurpleAccountOption option);

	/@}/	/@}/

	/************************************************************************** /	/************************************************************************** /
	/** @name Account User Split API * /	/** @name Account User Split API * /
	/************************************************************************** /	/************************************************************************** /
	/@{/	/@{/


End of changes. 2 change blocks.
	5 lines changed or deleted	11 lines changed or added

	blist.h	blist.h

	skipping to change at line 34	skipping to change at line 34
	* 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_BLIST_H_	#ifndef _PURPLE_BLIST_H_
	#define _PURPLE_BLIST_H_	#define _PURPLE_BLIST_H_

	/* I can't believe I let ChipX86 inspire me to write good code. -Sean */	/* I can't believe I let ChipX86 inspire me to write good code. -Sean */

	#include <glib.h>	#include <glib.h>


		/** @copydoc _PurpleBuddyList */
	typedef struct _PurpleBuddyList PurpleBuddyList;	typedef struct _PurpleBuddyList PurpleBuddyList;

		/** @copydoc _PurpleBlistUiOps */
	typedef struct _PurpleBlistUiOps PurpleBlistUiOps;	typedef struct _PurpleBlistUiOps PurpleBlistUiOps;

		/** @copydoc _PurpleBlistNode */
	typedef struct _PurpleBlistNode PurpleBlistNode;	typedef struct _PurpleBlistNode PurpleBlistNode;


		/** @copydoc _PurpleChat */
	typedef struct _PurpleChat PurpleChat;	typedef struct _PurpleChat PurpleChat;

		/** @copydoc _PurpleGroup */
	typedef struct _PurpleGroup PurpleGroup;	typedef struct _PurpleGroup PurpleGroup;

		/** @copydoc _PurpleContact */
	typedef struct _PurpleContact PurpleContact;	typedef struct _PurpleContact PurpleContact;

		/** @copydoc _PurpleBuddy */
	typedef struct _PurpleBuddy PurpleBuddy;	typedef struct _PurpleBuddy PurpleBuddy;

	/************************************************************************** /	/************************************************************************** /
	/* Enumerations * /	/* Enumerations * /
	/************************************************************************** /	/************************************************************************** /
	typedef enum	typedef enum
	{	{
	PURPLE_BLIST_GROUP_NODE,	PURPLE_BLIST_GROUP_NODE,
	PURPLE_BLIST_CONTACT_NODE,	PURPLE_BLIST_CONTACT_NODE,
	PURPLE_BLIST_BUDDY_NODE,	PURPLE_BLIST_BUDDY_NODE,

	skipping to change at line 317	skipping to change at line 324

	/**	/**
	* Updates a buddy's status.	* Updates a buddy's status.
	*	*
	* @param buddy The buddy whose status has changed.	* @param buddy The buddy whose status has changed.
	* @param old_status The status from which we are changing.	* @param old_status The status from which we are changing.
	*/	*/
	void purple_blist_update_buddy_status(PurpleBuddy buddy, PurpleStatus old _status);	void purple_blist_update_buddy_status(PurpleBuddy buddy, PurpleStatus old _status);

	/**	/**

		* Updates a node's custom icon.
		*
		* @param node The PurpleBlistNode whose custom icon has changed.
		* @since 2.5.0
		*/
		void purple_blist_update_node_icon(PurpleBlistNode *node);

		#ifndef PURPLE_DISABLE_DEPRECATED
		/**
	* Updates a buddy's icon.	* Updates a buddy's icon.
	*	*
	* @param buddy The buddy whose buddy icon has changed	* @param buddy The buddy whose buddy icon has changed

		* @deprecated Use purple_blist_update_node_icon() instead.
	*/	*/
	void purple_blist_update_buddy_icon(PurpleBuddy *buddy);	void purple_blist_update_buddy_icon(PurpleBuddy *buddy);

		#endif

	/**	/**
	* Renames a buddy in the buddy list.	* Renames a buddy in the buddy list.
	*	*
	* @param buddy The buddy whose name will be changed.	* @param buddy The buddy whose name will be changed.
	* @param name The new name of the buddy.	* @param name The new name of the buddy.
	*/	*/
	void purple_blist_rename_buddy(PurpleBuddy buddy, const char name);	void purple_blist_rename_buddy(PurpleBuddy buddy, const char name);

	/**	/**

End of changes. 10 change blocks.
	0 lines changed or deleted	18 lines changed or added

	buddyicon.h	buddyicon.h

	skipping to change at line 29	skipping to change at line 29
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* 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_BUDDYICON_H_	#ifndef _PURPLE_BUDDYICON_H_
	#define _PURPLE_BUDDYICON_H_	#define _PURPLE_BUDDYICON_H_


		/** An opaque structure representing a buddy icon for a particular user on
		a
		* particular #PurpleAccount. Instances are reference-counted; use
		* purple_buddy_icon_ref() and purple_buddy_icon_unref() to take and relea
		se
		* references.
		*/
	typedef struct _PurpleBuddyIcon PurpleBuddyIcon;	typedef struct _PurpleBuddyIcon PurpleBuddyIcon;

	#include "account.h"	#include "account.h"
	#include "blist.h"	#include "blist.h"
	#include "imgstore.h"	#include "imgstore.h"
	#include "prpl.h"	#include "prpl.h"
	#include "util.h"	#include "util.h"

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {

	skipping to change at line 220	skipping to change at line 225
	* @param account The account the user is on.	* @param account The account the user is on.
	* @param username The username of the user.	* @param username The username of the user.
	*	*
	* @return The icon (with a reference for the caller) if found, or @c NULL if	* @return The icon (with a reference for the caller) if found, or @c NULL if
	* not found.	* not found.
	*/	*/
	PurpleBuddyIcon *	PurpleBuddyIcon *
	purple_buddy_icons_find(PurpleAccount account, const char username);	purple_buddy_icons_find(PurpleAccount account, const char username);

	/**	/**

	* Returns a boolean indicating if a given contact has a custom buddy icon.
	*
	* @param contact The contact
	*
	* @return A boolean indicating if @a contact has a custom buddy icon.
	*/
	gboolean
	purple_buddy_icons_has_custom_icon(PurpleContact *contact);

	/**
	* Returns the buddy icon image for an account.	* Returns the buddy icon image for an account.
	*	*
	* The caller owns a reference to the image in the store, and must derefere nce	* The caller owns a reference to the image in the store, and must derefere nce
	* the image with purple_imgstore_unref() for it to be freed.	* the image with purple_imgstore_unref() for it to be freed.
	*	*
	* This function deals with loading the icon from the cache, if	* This function deals with loading the icon from the cache, if
	* needed, so it should be called in any case where you want the	* needed, so it should be called in any case where you want the
	* appropriate icon.	* appropriate icon.
	*	*
	* @param account The account	* @param account The account

	skipping to change at line 279	skipping to change at line 274
	* buddy icon update reasons.	* buddy icon update reasons.
	*	*
	* @param account The account	* @param account The account
	*	*
	* @return The time the icon was set, or 0 if an error occurred.	* @return The time the icon was set, or 0 if an error occurred.
	*/	*/
	time_t	time_t
	purple_buddy_icons_get_account_icon_timestamp(PurpleAccount *account);	purple_buddy_icons_get_account_icon_timestamp(PurpleAccount *account);

	/**	/**

	* Returns the custom buddy icon image for a contact.	* Returns a boolean indicating if a given blist node has a custom buddy ic
		on.
		*
		* @param node The blist node.
		*
		* @return A boolean indicating if @a node has a custom buddy icon.
		* @since 2.5.0
		*/
		gboolean
		purple_buddy_icons_node_has_custom_icon(PurpleBlistNode *node);

		/**
		* Returns the custom buddy icon image for a blist node.
	*	*
	* The caller owns a reference to the image in the store, and must derefere nce	* The caller owns a reference to the image in the store, and must derefere nce
	* the image with purple_imgstore_unref() for it to be freed.	* the image with purple_imgstore_unref() for it to be freed.
	*	*
	* This function deals with loading the icon from the cache, if	* This function deals with loading the icon from the cache, if
	* needed, so it should be called in any case where you want the	* needed, so it should be called in any case where you want the
	* appropriate icon.	* appropriate icon.
	*	*

	* @param contact The contact	* @param node The node.
	*	*

	* @return The custom buddy icon image.	* @return The custom buddy icon.
		* @since 2.5.0
	*/	*/
	PurpleStoredImage *	PurpleStoredImage *

	purple_buddy_icons_find_custom_icon(PurpleContact *contact);	purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node);

	/**	/**

	* Sets a custom buddy icon for a user.	* Sets a custom buddy icon for a blist node.
	*	*

	* This function will deal with saving a record of the icon,	* This function will deal with saving a record of the icon, caching the da
	* caching the data, etc.	ta,
		* etc.
	*	*

	* @param contact The contact for which to set a custom icon.	* @param node The blist node for which to set a custom icon.
	* @param icon_data The image data of the icon, which the	* @param icon_data The image data of the icon, which the buddy icon code w
	* buddy icon code will free.	ill
		* free.
	* @param icon_len The length of the data in @a icon_data.	* @param icon_len The length of the data in @a icon_data.
	*	*

	* @return The icon that was set. The caller does NOT own	* @return The icon that was set. The caller does NOT own a reference to th
	* a reference to this, and must call purple_imgstore_ref()	is,
	* if it wants one.	* and must call purple_imgstore_ref() if it wants one.
		* @since 2.5.0
		*/
		PurpleStoredImage *
		purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
		guchar *icon_data, size_t icon_len)
		;

		/**
		* Sets a custom buddy icon for a blist node.
		*
		* Convenience wrapper around purple_buddy_icons_node_set_custom_icon.
		* @see purple_buddy_icons_node_set_custom_icon()
		*
		* @param node The blist node for which to set a custom icon.
		* @param filename The path to the icon to set for the blist node.
		*
		* @return The icon that was set. The caller does NOT own a reference to th
		is,
		* and must call purple_imgstore_ref() if it wants one.
		* @since 2.5.0
		*/
		PurpleStoredImage *
		purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
		const gchar *filename);

		#ifndef PURPLE_DISABLE_DEPRECATED
		/**
		* PurpleContact version of purple_buddy_icons_node_has_custom_icon.
		*
		* @copydoc purple_buddy_icons_node_has_custom_icon()
		*
		* @deprecated Use purple_buddy_icons_node_has_custom_icon instead.
		*/
		gboolean
		purple_buddy_icons_has_custom_icon(PurpleContact *contact);

		/**
		* PurpleContact version of purple_buddy_icons_node_find_custom_icon.
		*
		* @copydoc purple_buddy_icons_node_find_custom_icon()
		*
		* @deprecated Use purple_buddy_icons_node_find_custom_icon instead.
		*/
		PurpleStoredImage *
		purple_buddy_icons_find_custom_icon(PurpleContact *contact);

		/**
		* PurpleContact version of purple_buddy_icons_node_set_custom_icon.
		*
		* @copydoc purple_buddy_icons_node_set_custom_icon()
		*
		* @deprecated Use purple_buddy_icons_node_set_custom_icon instead.
	*/	*/
	PurpleStoredImage *	PurpleStoredImage *
	purple_buddy_icons_set_custom_icon(PurpleContact *contact,	purple_buddy_icons_set_custom_icon(PurpleContact *contact,
	guchar *icon_data, size_t icon_len);	guchar *icon_data, size_t icon_len);

		#endif

	/**	/**
	* Sets whether or not buddy icon caching is enabled.	* Sets whether or not buddy icon caching is enabled.
	*	*
	* @param caching TRUE of buddy icon caching should be enabled, or	* @param caching TRUE of buddy icon caching should be enabled, or
	* FALSE otherwise.	* FALSE otherwise.
	*/	*/
	void purple_buddy_icons_set_caching(gboolean caching);	void purple_buddy_icons_set_caching(gboolean caching);

	/**	/**

End of changes. 11 change blocks.
	23 lines changed or deleted	88 lines changed or added

	cmds.h	cmds.h
	/**	/**
	* @file cmds.h Commands API	* @file cmds.h Commands API
	* @ingroup core	* @ingroup core

		* @see @ref cmd-signals
	*/	*/

	/* Copyright (C) 2003 Timothy Ringenbach <omarvo@hotmail.com>	/* Copyright (C) 2003 Timothy Ringenbach <omarvo@hotmail.com>
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,

	skipping to change at line 33	skipping to change at line 34
	#ifndef _PURPLE_CMDS_H_	#ifndef _PURPLE_CMDS_H_
	#define _PURPLE_CMDS_H_	#define _PURPLE_CMDS_H_

	#include "conversation.h"	#include "conversation.h"

	/************************************************************************** /	/************************************************************************** /
	/** @name Structures * /	/** @name Structures * /
	/************************************************************************** /	/************************************************************************** /
	/@{/	/@{/


		/** The possible results of running a command with purple_cmd_do_command(). */
	typedef enum _PurpleCmdStatus {	typedef enum _PurpleCmdStatus {
	PURPLE_CMD_STATUS_OK,	PURPLE_CMD_STATUS_OK,
	PURPLE_CMD_STATUS_FAILED,	PURPLE_CMD_STATUS_FAILED,
	PURPLE_CMD_STATUS_NOT_FOUND,	PURPLE_CMD_STATUS_NOT_FOUND,
	PURPLE_CMD_STATUS_WRONG_ARGS,	PURPLE_CMD_STATUS_WRONG_ARGS,
	PURPLE_CMD_STATUS_WRONG_PRPL,	PURPLE_CMD_STATUS_WRONG_PRPL,
	PURPLE_CMD_STATUS_WRONG_TYPE,	PURPLE_CMD_STATUS_WRONG_TYPE,
	} PurpleCmdStatus;	} PurpleCmdStatus;


		/** Commands registered with the core return one of these values when run.
		* Normally, a command will want to return one of the first two; in some
		* unusual cases, you might want to have several functions called for a
		* particular command; in this case, they should return
		* #PURPLE_CMD_RET_CONTINUE to cause the core to fall through to other
		* commands with the same name.
		*/
	typedef enum _PurpleCmdRet {	typedef enum _PurpleCmdRet {

	PURPLE_CMD_RET_OK, /*< Everything's okay. Don't look for anot her command to call. /	PURPLE_CMD_RET_OK, /*< Everything's okay; Don't look for anot her command to call. /
	PURPLE_CMD_RET_FAILED, /*< The command failed, but stop looking. /	PURPLE_CMD_RET_FAILED, /*< The command failed, but stop looking. /
	PURPLE_CMD_RET_CONTINUE, /*< Continue, looking for other commands w ith the same name to call. /	PURPLE_CMD_RET_CONTINUE, /*< Continue, looking for other commands w ith the same name to call. /
	} PurpleCmdRet;	} PurpleCmdRet;

	#define PURPLE_CMD_FUNC(func) ((PurpleCmdFunc)func)	#define PURPLE_CMD_FUNC(func) ((PurpleCmdFunc)func)


		/** A function implementing a command, as passed to purple_cmd_register().
		*
		* @todo document the arguments to these functions.
		* */
	typedef PurpleCmdRet (PurpleCmdFunc)(PurpleConversation , const gchar *cm d,	typedef PurpleCmdRet (PurpleCmdFunc)(PurpleConversation , const gchar *cm d,
	gchar args, gchar error, void *data);	gchar args, gchar error, void *data);

		/** A unique integer representing a command registered with
		* purple_cmd_register(), which can subsequently be passed to
		* purple_cmd_unregister() to unregister that command.
		*/
	typedef guint PurpleCmdId;	typedef guint PurpleCmdId;

	typedef enum _PurpleCmdPriority {	typedef enum _PurpleCmdPriority {
	PURPLE_CMD_P_VERY_LOW = -1000,	PURPLE_CMD_P_VERY_LOW = -1000,
	PURPLE_CMD_P_LOW = 0,	PURPLE_CMD_P_LOW = 0,
	PURPLE_CMD_P_DEFAULT = 1000,	PURPLE_CMD_P_DEFAULT = 1000,
	PURPLE_CMD_P_PRPL = 2000,	PURPLE_CMD_P_PRPL = 2000,
	PURPLE_CMD_P_PLUGIN = 3000,	PURPLE_CMD_P_PLUGIN = 3000,
	PURPLE_CMD_P_ALIAS = 4000,	PURPLE_CMD_P_ALIAS = 4000,
	PURPLE_CMD_P_HIGH = 5000,	PURPLE_CMD_P_HIGH = 5000,

	skipping to change at line 173	skipping to change at line 190
	* @param conv The conversation the command was typed in.	* @param conv The conversation the command was typed in.
	* @param cmdline The command the user typed (including all arguments) as a single string.	* @param cmdline The command the user typed (including all arguments) as a single string.
	* The caller doesn't have to do any parsing, except removing th e command	* The caller doesn't have to do any parsing, except removing th e command
	* prefix, which the core has no knowledge of. cmd should not co ntain any	* prefix, which the core has no knowledge of. cmd should not co ntain any
	* formatting, and should be in plain text (no html entities).	* formatting, and should be in plain text (no html entities).
	* @param markup This is the same as cmd, but is the formatted version. It should be in	* @param markup This is the same as cmd, but is the formatted version. It should be in
	* HTML, with < > and &, at least, escaped to html entities, and should	* HTML, with < > and &, at least, escaped to html entities, and should
	* include both the default formatting and any extra manual f ormatting.	* include both the default formatting and any extra manual f ormatting.
	* @param errormsg If the command failed errormsg is filled in with the app ropriate error	* @param errormsg If the command failed errormsg is filled in with the app ropriate error
	* message. It must be freed by the caller with g_free().	* message. It must be freed by the caller with g_free().

	* @return A #PurpleCmdStatus indicated if the command succeeded or failed.	* @return A #PurpleCmdStatus indicating if the command succeeded or failed .
	*/	*/
	PurpleCmdStatus purple_cmd_do_command(PurpleConversation conv, const gchar cmdline,	PurpleCmdStatus purple_cmd_do_command(PurpleConversation conv, const gchar cmdline,
	const gchar markup, gchar *errormsg);	const gchar markup, gchar *errormsg);

	/**	/**
	* List registered commands.	* List registered commands.
	*	*
	* Returns a <tt>GList</tt> (which must be freed by the caller) of all comm ands	* Returns a <tt>GList</tt> (which must be freed by the caller) of all comm ands
	* that are valid in the context of @a conv, or all commands, if @a conv is @c	* that are valid in the context of @a conv, or all commands, if @a conv is @c
	* NULL. Don't keep this list around past the main loop, or anything else that	* NULL. Don't keep this list around past the main loop, or anything else that

	skipping to change at line 207	skipping to change at line 224
	* one node for each matching command.	* one node for each matching command.
	*	*
	* @param conv The conversation, or @c NULL for no context.	* @param conv The conversation, or @c NULL for no context.
	* @param cmd The command. No wildcards accepted, but returns help for all	* @param cmd The command. No wildcards accepted, but returns help for all
	* commands if @c NULL.	* commands if @c NULL.
	* @return A <tt>GList</tt> of <tt>const char *</tt>s, which is the help st ring	* @return A <tt>GList</tt> of <tt>const char *</tt>s, which is the help st ring
	* for that command.	* for that command.
	*/	*/
	GList purple_cmd_help(PurpleConversation conv, const gchar *cmd);	GList purple_cmd_help(PurpleConversation conv, const gchar *cmd);


		/**
		* Get the handle for the commands API
		* @return The handle
		* @since 2.5.0
		*/
		gpointer purple_cmds_get_handle(void);

		/**
		* Initialize the commands subsystem.
		* @since 2.5.0
		*/
		void purple_cmds_init(void);

		/**
		* Uninitialize the commands subsystem.
		* @since 2.5.0
		*/
		void purple_cmds_uninit(void);

	/@}/	/@}/

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _PURPLE_CMDS_H_ */	#endif /* _PURPLE_CMDS_H_ */

End of changes. 8 change blocks.
	2 lines changed or deleted	38 lines changed or added

	conversation.h	conversation.h

	skipping to change at line 34	skipping to change at line 34
	* 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_CONVERSATION_H_	#ifndef _PURPLE_CONVERSATION_H_
	#define _PURPLE_CONVERSATION_H_	#define _PURPLE_CONVERSATION_H_

	/************************************************************************** /	/************************************************************************** /
	/** Data Structures * /	/** Data Structures * /
	/************************************************************************** /	/************************************************************************** /


		/** @copydoc _PurpleConversationUiOps */
	typedef struct _PurpleConversationUiOps PurpleConversationUiOps;	typedef struct _PurpleConversationUiOps PurpleConversationUiOps;

		/** @copydoc _PurpleConversation */
	typedef struct _PurpleConversation PurpleConversation;	typedef struct _PurpleConversation PurpleConversation;

		/** @copydoc _PurpleConvIm */
	typedef struct _PurpleConvIm PurpleConvIm;	typedef struct _PurpleConvIm PurpleConvIm;

		/** @copydoc _PurpleConvChat */
	typedef struct _PurpleConvChat PurpleConvChat;	typedef struct _PurpleConvChat PurpleConvChat;

		/** @copydoc _PurpleConvChatBuddy */
	typedef struct _PurpleConvChatBuddy PurpleConvChatBuddy;	typedef struct _PurpleConvChatBuddy PurpleConvChatBuddy;

		/** @copydoc _PurpleConvMessage */
	typedef struct _PurpleConvMessage PurpleConvMessage;	typedef struct _PurpleConvMessage PurpleConvMessage;

	/**	/**
	* A type of conversation.	* A type of conversation.
	*/	*/
	typedef enum	typedef enum
	{	{
	PURPLE_CONV_TYPE_UNKNOWN = 0, /*< Unknown conversation type. /	PURPLE_CONV_TYPE_UNKNOWN = 0, /*< Unknown conversation type. /
	PURPLE_CONV_TYPE_IM, /*< Instant Message. /	PURPLE_CONV_TYPE_IM, /*< Instant Message. /
	PURPLE_CONV_TYPE_CHAT, /*< Chat room. /	PURPLE_CONV_TYPE_CHAT, /*< Chat room. /

	skipping to change at line 281	skipping to change at line 287
	char nick; /< Your nick in this chat. /	char nick; /< Your nick in this chat. /

	gboolean left; /*< We left the chat and kept the window open /	gboolean left; /*< We left the chat and kept the window open /
	};	};

	/**	/**
	* Data for "Chat Buddies"	* Data for "Chat Buddies"
	*/	*/
	struct _PurpleConvChatBuddy	struct _PurpleConvChatBuddy
	{	{

	char name; /*< The name	char name; /*< The chat participant's name in
	*/	the chat. */
	char alias; /*< The alias	char alias; /*< The chat participant's alias,
	*/	if known;
	char alias_key; /*< The alias key	* @a NULL otherwise.
	*/	*/
	gboolean buddy; /**< ChatBuddy is o	char alias_key; /*< A string by which this buddy w
	n the blist */	ill be sorted,
	PurpleConvChatBuddyFlags flags; /**< Flags (ops, voice etc.)	* or @c NULL if the buddy should
	*/	be sorted by
		* its @c name. (This is current
		ly always @c
		* NULL.)
		*/
		gboolean buddy; /**< @a TRUE if this chat participa
		nt is on the
		* buddy list; @a FALSE otherwise
		.
		*/
		PurpleConvChatBuddyFlags flags; /**< A bitwise OR of flags for this
		participant,
		* such as whether they are a cha
		nnel operator.
		*/
	};	};

	/**	/**
	* Description of a conversation message	* Description of a conversation message
	*	*
	* @since 2.2.0	* @since 2.2.0
	*/	*/
	struct _PurpleConvMessage	struct _PurpleConvMessage
	{	{
	char *who;	char *who;

End of changes. 7 change blocks.
	10 lines changed or deleted	30 lines changed or added

	core.h	core.h
	/**	/**

		* @file core.h Startup and shutdown of libpurple
	* @defgroup core libpurple	* @defgroup core libpurple
	* @see @ref core-signals	* @see @ref core-signals
	*/	*/

	/* purple	/* purple
	*	*
	* Purple is the legal property of its developers, whose names are too nume rous	* Purple is the legal property of its developers, whose names are too nume rous
	* to list here. Please refer to the COPYRIGHT file distributed with this	* to list here. Please refer to the COPYRIGHT file distributed with this
	* source distribution.	* source distribution.
	*	*

	skipping to change at line 31	skipping to change at line 32
	*	*
	* 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_CORE_H_	#ifndef _PURPLE_CORE_H_
	#define _PURPLE_CORE_H_	#define _PURPLE_CORE_H_

	typedef struct PurpleCore PurpleCore;	typedef struct PurpleCore PurpleCore;


		/** Callbacks that fire at different points of the initialization and teard
		own
		* of libpurple, along with a hook to return descriptive information about
		the
		* UI.
		*/
	typedef struct	typedef struct
	{	{

		/** Called just after the preferences subsystem is initialized; the
		UI
		* could use this callback to add some preferences it needs to be i
		n
		* place when other subsystems are initialized.
		*/
	void (*ui_prefs_init)(void);	void (*ui_prefs_init)(void);

	void (debug_ui_init)(void); / Unfortunate necessity. */	/** Called just after the debug subsystem is initialized, but before
		* just about every other component's initialization. The UI shoul
		d
		* use this hook to call purple_debug_set_ui_ops() so that debuggin
		g
		* information for other components can be logged during their
		* initialization.
		*/
		void (*debug_ui_init)(void);
		/** Called after all of libpurple has been initialized. The UI shou
		ld
		* use this hook to set all other necessary UiOps structures.
		*
		* @see @ref ui-ops
		*/
	void (*ui_init)(void);	void (*ui_init)(void);

		/** Called after most of libpurple has been uninitialized. */
	void (*quit)(void);	void (*quit)(void);


		/** Called by purple_core_get_ui_info(); should return the informati
		on
		* documented there.
		*/
	GHashTable* (*get_ui_info)(void);	GHashTable* (*get_ui_info)(void);

	void (*_purple_reserved1)(void);	void (*_purple_reserved1)(void);
	void (*_purple_reserved2)(void);	void (*_purple_reserved2)(void);
	void (*_purple_reserved3)(void);	void (*_purple_reserved3)(void);
	} PurpleCoreUiOps;	} PurpleCoreUiOps;

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif

	skipping to change at line 67	skipping to change at line 92
	*/	*/
	gboolean purple_core_init(const char *ui);	gboolean purple_core_init(const char *ui);

	/**	/**
	* Quits the core of purple, which, depending on the UI, may quit the	* Quits the core of purple, which, depending on the UI, may quit the
	* application using the purple core.	* application using the purple core.
	*/	*/
	void purple_core_quit(void);	void purple_core_quit(void);

	/**	/**

		* <p>
	* Calls purple_core_quit(). This can be used as the function	* Calls purple_core_quit(). This can be used as the function
	* passed to purple_timeout_add() when you want to shutdown Purple	* passed to purple_timeout_add() when you want to shutdown Purple
	* in a specified amount of time. When shutting down Purple	* in a specified amount of time. When shutting down Purple
	* from a plugin, you must use this instead of purple_core_quit();	* from a plugin, you must use this instead of purple_core_quit();
	* for an immediate exit, use a timeout value of 0:	* for an immediate exit, use a timeout value of 0:

	* purple_timeout_add(0, purple_core_quitcb, NULL);	* </p>
		*
		* <code>purple_timeout_add(0, purple_core_quitcb, NULL);</code>
		*
		* <p>
	* This is ensures that code from your plugin is not being	* This is ensures that code from your plugin is not being
	* executed when purple_core_quit() is called. If the plugin	* executed when purple_core_quit() is called. If the plugin
	* called purple_core_quit() directly, you would get a core dump	* called purple_core_quit() directly, you would get a core dump
	* after purple_core_quit() executes and control returns to your	* after purple_core_quit() executes and control returns to your
	* plugin because purple_core_quit() frees all plugins.	* plugin because purple_core_quit() frees all plugins.

		* </p>
	*/	*/
	gboolean purple_core_quit_cb(gpointer unused);	gboolean purple_core_quit_cb(gpointer unused);

	/**	/**
	* Returns the version of the core library.	* Returns the version of the core library.
	*	*
	* @return The version of the core library.	* @return The version of the core library.
	*/	*/
	const char *purple_core_get_version(void);	const char *purple_core_get_version(void);

	/**	/**

	* Returns the ID of the UI that is using the core.	* Returns the ID of the UI that is using the core, as passed to
		* purple_core_init().
	*	*
	* @return The ID of the UI that is currently using the core.	* @return The ID of the UI that is currently using the core.
	*/	*/
	const char *purple_core_get_ui(void);	const char *purple_core_get_ui(void);

	/**	/**
	* Returns a handle to the purple core.	* Returns a handle to the purple core.
	*	*

	* This is used for such things as signals.	* This is used to connect to @ref core-signals "core signals".
	*/	*/
	PurpleCore *purple_get_core(void);	PurpleCore *purple_get_core(void);

	/**	/**
	* Sets the UI ops for the core.	* Sets the UI ops for the core.
	*	*
	* @param ops A UI ops structure for the core.	* @param ops A UI ops structure for the core.
	*/	*/
	void purple_core_set_ui_ops(PurpleCoreUiOps *ops);	void purple_core_set_ui_ops(PurpleCoreUiOps *ops);

	/**	/**
	* Returns the UI ops for the core.	* Returns the UI ops for the core.
	*	*
	* @return The core's UI ops structure.	* @return The core's UI ops structure.
	*/	*/
	PurpleCoreUiOps *purple_core_get_ui_ops(void);	PurpleCoreUiOps *purple_core_get_ui_ops(void);

	/**	/**

	* Migrates from .gaim to .purple.	* Migrates from <tt>.gaim</tt> to <tt>.purple</tt>.
	*	*

	* UIs MUST NOT call this if they have been told to use a custom	* UIs <strong>must not</strong> call this if they have been told to use a
	* user directory.	* custom user directory.
	*	*
	* @return A boolean indicating success or migration failure. On failure,	* @return A boolean indicating success or migration failure. On failure,
	* the application must display an error to the user and then exit.	* the application must display an error to the user and then exit.
	*/	*/
	gboolean purple_core_migrate(void);	gboolean purple_core_migrate(void);

	/**	/**

	* Ensures that only one instance is running.	* Ensures that only one instance is running. If libpurple is built with D
		-Bus
		* support, this checks if another process owns the libpurple bus name and
		if
		* so whether that process is using the same configuration directory as thi
		s
		* process.
	*	*

	* @return A boolean such that @c TRUE indicates that this is the first ins	* @return @c TRUE if this is the first instance of libpurple running;
	tance,	* @c FALSE if there is another instance running.
	* whereas @c FALSE indicates that there is another instance runnin
	g.
	*	*
	* @since 2.1.0	* @since 2.1.0
	*/	*/
	gboolean purple_core_ensure_single_instance(void);	gboolean purple_core_ensure_single_instance(void);

	/**	/**

	* Returns a hashtable containing various information about the UI	* Returns a hash table containing various information about the UI. The
		* following well-known entries may be in the table (along with any others
		the
		* UI might choose to include):
		*
		* <dl>
		* <dt><tt>name</tt></dt>
		* <dd>the user-readable name for the UI.</dd>
		*
		* <dt><tt>version</tt></dt>
		* <dd>a user-readable description of the current version of the UI.</dd>
		*
		* <dt><tt>website</tt></dt>
		* <dd>the UI's website, such as http://pidgin.im.</dd>
		*
		* <dt><tt>dev_website</tt></dt>
		* <dd>the UI's development/support website, such as http://developer.pid
		gin.im.</dd>
		* </dl>
	*	*
	* @return A GHashTable with strings for keys and values. This	* @return A GHashTable with strings for keys and values. This

	* hash table must not be freed.	* hash table must not be freed and should not be modified.
	*	*
	* @since 2.1.0	* @since 2.1.0
	*	*
	*/	*/
	GHashTable* purple_core_get_ui_info(void);	GHashTable* purple_core_get_ui_info(void);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif


End of changes. 17 change blocks.
	14 lines changed or deleted	76 lines changed or added

	eventloop.h	eventloop.h

	skipping to change at line 70	skipping to change at line 70
	struct _PurpleEventLoopUiOps	struct _PurpleEventLoopUiOps
	{	{
	/**	/**
	* Should create a callback timer with an interval measured in	* Should create a callback timer with an interval measured in
	* milliseconds. The supplied @a function should be called every @a	* milliseconds. The supplied @a function should be called every @a
	* interval seconds until it returns @c FALSE, after which it should not	* interval seconds until it returns @c FALSE, after which it should not
	* be called again.	* be called again.
	*	*
	* Analogous to g_timeout_add in glib.	* Analogous to g_timeout_add in glib.
	*	*

		* Note: On Win32, this function may be called from a thread other t
		han
		* the libpurple thread. You should make sure to detect this situat
		ion
		* and to only call "function" from the libpurple thread.
		*
	* @param interval the interval in <em>milliseconds</em> between cal ls	* @param interval the interval in <em>milliseconds</em> between cal ls
	* to @a function.	* to @a function.
	* @param data arbitrary data to be passed to @a function at eac h	* @param data arbitrary data to be passed to @a function at eac h
	* call.	* call.
	* @todo Who is responsible for freeing @a data?	* @todo Who is responsible for freeing @a data?
	*	*
	* @return a handle for the timeout, which can be passed to	* @return a handle for the timeout, which can be passed to
	* #timeout_remove.	* #timeout_remove.
	*	*
	* @see purple_timeout_add	* @see purple_timeout_add

End of changes. 1 change blocks.
	0 lines changed or deleted	6 lines changed or added

	gntblist.h	gntblist.h

	skipping to change at line 37	skipping to change at line 37
	#define _GNT_BLIST_H	#define _GNT_BLIST_H

	#include "blist.h"	#include "blist.h"
	#include "gnttree.h"	#include "gnttree.h"

	/**********************************************************************	/**********************************************************************
	* @name GNT BuddyList API	* @name GNT BuddyList API
	**********************************************************************/	**********************************************************************/
	/@{/	/@{/


		/**
		* Buddylist manager for finch. This decides the visility, ordering and hie
		rarchy
		* of the buddylist nodes. This also manages the creation of tooltips.
		*/
	typedef struct	typedef struct
	{	{
	const char id; /< An identifie r for the manager. /	const char id; /< An identifie r for the manager. /
	const char name; /< Displayable name for the manager. /	const char name; /< Displayable name for the manager. /
	gboolean (init)(void); /< Called right before it's being used. /	gboolean (init)(void); /< Called right before it's being used. /
	gboolean (uninit)(void); /< Called right after it's not being used any more. /	gboolean (uninit)(void); /< Called right after it's not being used any more. /
	gboolean (can_add_node)(PurpleBlistNode node); /*< Whether a no de should be added to the view. /	gboolean (can_add_node)(PurpleBlistNode node); /*< Whether a no de should be added to the view. /
	gpointer (find_parent)(PurpleBlistNode node); /*< Find the par ent row for a node. /	gpointer (find_parent)(PurpleBlistNode node); /*< Find the par ent row for a node. /
	gboolean (create_tooltip)(gpointer selected_row, GString body, ch ar title); /< Create tooltip for a selected row. /	gboolean (create_tooltip)(gpointer selected_row, GString body, ch ar title); /< Create tooltip for a selected row. /
	gpointer reserved[4];	gpointer reserved[4];

End of changes. 1 change blocks.
	0 lines changed or deleted	5 lines changed or added

	gntcolors.h	gntcolors.h

	skipping to change at line 94	skipping to change at line 94
	*	*
	* @param kfile The file containing the color-pair information.	* @param kfile The file containing the color-pair information.
	*/	*/
	void gnt_color_pairs_parse(GKeyFile *kfile);	void gnt_color_pairs_parse(GKeyFile *kfile);

	/**	/**
	* Parse a string color	* Parse a string color
	*	*
	* @param kfile The string value	* @param kfile The string value
	*	*

	* @return A color	* @return A color. For an unknown color name, returns -EINVAL.
	*	*
	* @since 2.4.0	* @since 2.4.0
	*/	*/
	int gnt_colors_get_color(char *key);	int gnt_colors_get_color(char *key);
	#endif	#endif

	/**	/**
	* Return the appropriate character attribute for a specified color.	* Return the appropriate character attribute for a specified color.
	* If the terminal doesn't have color support, this returns A_STANDOUT	* If the terminal doesn't have color support, this returns A_STANDOUT
	* when deemed appropriate.	* when deemed appropriate.

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	gtkimhtml.h	gtkimhtml.h

	skipping to change at line 79	skipping to change at line 79
	GTK_IMHTML_SHRINK = 1 << 4,	GTK_IMHTML_SHRINK = 1 << 4,
	GTK_IMHTML_FACE = 1 << 5,	GTK_IMHTML_FACE = 1 << 5,
	GTK_IMHTML_FORECOLOR = 1 << 6,	GTK_IMHTML_FORECOLOR = 1 << 6,
	GTK_IMHTML_BACKCOLOR = 1 << 7,	GTK_IMHTML_BACKCOLOR = 1 << 7,
	GTK_IMHTML_BACKGROUND = 1 << 8,	GTK_IMHTML_BACKGROUND = 1 << 8,
	GTK_IMHTML_LINK = 1 << 9,	GTK_IMHTML_LINK = 1 << 9,
	GTK_IMHTML_IMAGE = 1 << 10,	GTK_IMHTML_IMAGE = 1 << 10,
	GTK_IMHTML_SMILEY = 1 << 11,	GTK_IMHTML_SMILEY = 1 << 11,
	GTK_IMHTML_LINKDESC = 1 << 12,	GTK_IMHTML_LINKDESC = 1 << 12,
	GTK_IMHTML_STRIKE = 1 << 13,	GTK_IMHTML_STRIKE = 1 << 13,

		/** Show custom smileys when appropriate. @since 2.5.0 */
		GTK_IMHTML_CUSTOM_SMILEY = 1 << 14,
	GTK_IMHTML_ALL = -1	GTK_IMHTML_ALL = -1
	} GtkIMHtmlButtons;	} GtkIMHtmlButtons;

	typedef enum {	typedef enum {
	GTK_IMHTML_SMILEY_CUSTOM = 1 << 0	GTK_IMHTML_SMILEY_CUSTOM = 1 << 0
	} GtkIMHtmlSmileyFlags;	} GtkIMHtmlSmileyFlags;

	struct _GtkIMHtml {	struct _GtkIMHtml {
	GtkTextView text_view;	GtkTextView text_view;
	GtkTextBuffer *text_buffer;	GtkTextBuffer *text_buffer;

	skipping to change at line 854	skipping to change at line 856
	/**	/**
	* Setup formatting for an imhtml depending on the flags specified.	* Setup formatting for an imhtml depending on the flags specified.
	*	*
	* @param imhtml The GTK+ IM/HTML.	* @param imhtml The GTK+ IM/HTML.
	* @param flags The connection flag which describes the allowed types of formatting.	* @param flags The connection flag which describes the allowed types of formatting.
	*	*
	* @since 2.1.0	* @since 2.1.0
	*/	*/
	void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags) ;	void gtk_imhtml_setup_entry(GtkIMHtml *imhtml, PurpleConnectionFlags flags) ;


		/**
		* Create a new GtkIMHtmlSmiley.
		*
		* @param file The image file for the smiley
		* @param shortcut The key shortcut for the smiley
		* @param hide @c TRUE if the smiley should be hidden in the smiley d
		ialog, @c FALSE otherwise
		* @param flags The smiley flags
		*
		* @return The newly created smiley
		* @since 2.5.0
		*/
		GtkIMHtmlSmiley gtk_imhtml_smiley_create(const char file, const char *sho
		rtcut, gboolean hide,
		GtkIMHtmlSmileyFlags flags);

		/**
		* Reload the image data for the smiley.
		*
		* @param smiley The smiley to reload
		*
		* @since 2.5.0
		*/
		void gtk_imhtml_smiley_reload(GtkIMHtmlSmiley *smiley);

		/**
		* Destroy a GtkIMHtmlSmiley.
		*
		* @param smiley The smiley to destroy
		*
		* @since 2.5.0
		*/
		void gtk_imhtml_smiley_destroy(GtkIMHtmlSmiley *smiley);
	/@}/	/@}/

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _PIDGINIMHTML_H_ */	#endif /* _PIDGINIMHTML_H_ */

End of changes. 2 change blocks.
	0 lines changed or deleted	35 lines changed or added

	gtkthemes.h	gtkthemes.h

	skipping to change at line 54	skipping to change at line 54

	extern struct smiley_theme *current_smiley_theme;	extern struct smiley_theme *current_smiley_theme;
	extern GSList *smiley_themes;	extern GSList *smiley_themes;

	void pidgin_themes_init(void);	void pidgin_themes_init(void);

	gboolean pidgin_themes_smileys_disabled(void);	gboolean pidgin_themes_smileys_disabled(void);

	void pidgin_themes_smiley_themeize(GtkWidget *);	void pidgin_themes_smiley_themeize(GtkWidget *);


		/**
		* @since 2.5.0
		*/
		void pidgin_themes_smiley_themeize_custom(GtkWidget *);

	void pidgin_themes_smiley_theme_probe(void);	void pidgin_themes_smiley_theme_probe(void);

	void pidgin_themes_load_smiley_theme(const char *file, gboolean load);	void pidgin_themes_load_smiley_theme(const char *file, gboolean load);

	/**	/**
	* @since 2.1.0	* @since 2.1.0
	*/	*/
	void pidgin_themes_remove_smiley_theme(const char *file);	void pidgin_themes_remove_smiley_theme(const char *file);

	GSList pidgin_themes_get_proto_smileys(const char id);	GSList pidgin_themes_get_proto_smileys(const char id);

End of changes. 1 change blocks.
	0 lines changed or deleted	5 lines changed or added

	imgstore.h	imgstore.h

	skipping to change at line 66	skipping to change at line 66
	* image or, more commonly, the filename of the image	* image or, more commonly, the filename of the image
	* without any directory information. It can also be	* without any directory information. It can also be
	* NULL, if you don't need to keep track of a filename.	* NULL, if you don't need to keep track of a filename.
	*	*
	* @return The stored image.	* @return The stored image.
	*/	*/
	PurpleStoredImage *	PurpleStoredImage *
	purple_imgstore_add(gpointer data, size_t size, const char *filename);	purple_imgstore_add(gpointer data, size_t size, const char *filename);

	/**	/**

		* Create an image and add it to the store.
		*
		* @param path The path to the image.
		*
		* @return The stored image.
		* @since 2.X.X
		*/
		PurpleStoredImage *
		purple_imgstore_new_from_file(const char *path);

		/**
	* Add an image to the store, allocating an ID.	* Add an image to the store, allocating an ID.
	*	*
	* The caller owns a reference to the image in the store, and must derefere nce	* The caller owns a reference to the image in the store, and must derefere nce
	* the image with purple_imgstore_unref_by_id() or purple_imgstore_unref()	* the image with purple_imgstore_unref_by_id() or purple_imgstore_unref()
	* for it to be freed.	* for it to be freed.
	*	*
	* @param data Pointer to the image data, which the imgstore will t ake	* @param data Pointer to the image data, which the imgstore will t ake
	* ownership of and free as appropriate. If you want a	* ownership of and free as appropriate. If you want a
	* copy of the data, make it before calling this funct ion.	* copy of the data, make it before calling this funct ion.
	* @param size Image data's size.	* @param size Image data's size.

End of changes. 1 change blocks.
	0 lines changed or deleted	11 lines changed or added

	prpl.h	prpl.h

	skipping to change at line 34	skipping to change at line 34
	* 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
	*/	*/

	/* this file should be all that prpls need to include. therefore, by includ ing	/* this file should be all that prpls need to include. therefore, by includ ing
	* this file, they should get glib, proxy, purple_connection, prpl, etc. */	* this file, they should get glib, proxy, purple_connection, prpl, etc. */

	#ifndef _PURPLE_PRPL_H_	#ifndef _PURPLE_PRPL_H_
	#define _PURPLE_PRPL_H_	#define _PURPLE_PRPL_H_

	typedef struct _PurplePluginProtocolInfo PurplePluginProtocolInfo;	typedef struct _PurplePluginProtocolInfo PurplePluginProtocolInfo;

		/** @copydoc _PurpleAttentionType */
	typedef struct _PurpleAttentionType PurpleAttentionType;	typedef struct _PurpleAttentionType PurpleAttentionType;

	/************************************************************************** /	/************************************************************************** /
	/** @name Basic Protocol Information * /	/** @name Basic Protocol Information * /
	/************************************************************************** /	/************************************************************************** /

	typedef enum {	typedef enum {
	PURPLE_ICON_SCALE_DISPLAY = 0x01, /*< We scale the ic on when we display it /	PURPLE_ICON_SCALE_DISPLAY = 0x01, /*< We scale the ic on when we display it /
	PURPLE_ICON_SCALE_SEND = 0x02 /*< We scale the ic on before we send it to the server /	PURPLE_ICON_SCALE_SEND = 0x02 /*< We scale the ic on before we send it to the server /
	} PurpleIconScaleRules;	} PurpleIconScaleRules;

	skipping to change at line 73	skipping to change at line 74
	#include "conversation.h"	#include "conversation.h"
	#include "ft.h"	#include "ft.h"
	#include "imgstore.h"	#include "imgstore.h"
	#include "notify.h"	#include "notify.h"
	#include "proxy.h"	#include "proxy.h"
	#include "plugin.h"	#include "plugin.h"
	#include "roomlist.h"	#include "roomlist.h"
	#include "status.h"	#include "status.h"
	#include "whiteboard.h"	#include "whiteboard.h"


		/** @copydoc PurpleBuddyIconSpec */
	struct _PurpleBuddyIconSpec {	struct _PurpleBuddyIconSpec {

	char format; /*< This is a comma-delimited l	/** This is a comma-delimited list of image formats or @c NULL if ic
	ist of image formats or NULL if icons are not supported.	ons
	* Neither the core nor the prpl	* are not supported. Neither the core nor the prpl will actually
	will actually check to see if the data it's given matches this; it's	* check to see if the data it's given matches this; it's entirely
	* entirely up to the UI to do w	up
	hat it wants */	* to the UI to do what it wants
	int min_width; /**< The minimum width of th	*/
	is icon */	char *format;
	int min_height; /**< The minimum height of t
	his icon */	int min_width; /**< Minimum width of this icon
	int max_width; /**< The maximum width of th	*/
	is icon */	int min_height; /**< Minimum height of this icon
	int max_height; /**< The maximum height of t	*/
	his icon */	int max_width; /**< Maximum width of this icon
	size_t max_filesize; /**< The maximum number of	*/
	bytes */	int max_height; /**< Maximum height of this icon
	PurpleIconScaleRules scale_rules; /**< How to stretch	*/
	this icon */	size_t max_filesize; /*< Maximum size in bytes /
		PurpleIconScaleRules scale_rules; /*< How to stretch this icon /
	};	};

	struct proto_chat_entry {	struct proto_chat_entry {
	const char *label;	const char *label;
	const char *identifier;	const char *identifier;
	gboolean required;	gboolean required;
	gboolean is_int;	gboolean is_int;
	int min;	int min;
	int max;	int max;
	gboolean secret;	gboolean secret;
	};	};


		/** Represents "nudges" and "buzzes" that you may send to a buddy to attrac
		t
		* their attention (or vice-versa).
		*/
	struct _PurpleAttentionType	struct _PurpleAttentionType
	{	{
	const char name; /< Shown in GUI elements /	const char name; /< Shown in GUI elements /
	const char incoming_description; /< Shown when sent /	const char incoming_description; /< Shown when sent /
	const char outgoing_description; /< Shown when receied /	const char outgoing_description; /< Shown when receied /
	const char icon_name; /< Icon to display (optional) /	const char icon_name; /< Icon to display (optional) /
	const char unlocalized_name; /< Unlocalized name for UIs nee ding it /	const char unlocalized_name; /< Unlocalized name for UIs nee ding it /

	/* Reserved fields for future purposes */	/* Reserved fields for future purposes */
	gpointer _reserved2;	gpointer _reserved2;

	skipping to change at line 401	skipping to change at line 410
	*/	*/
	/* This is here rather than next to register_user for API compatibil ity	/* This is here rather than next to register_user for API compatibil ity
	* reasons.	* reasons.
	*/	*/
	void (unregister_user)(PurpleAccount , PurpleAccountUnregistration Cb cb, void *user_data);	void (unregister_user)(PurpleAccount , PurpleAccountUnregistration Cb cb, void *user_data);

	/* Attention API for sending & receiving zaps/nudges/buzzes etc. */	/* Attention API for sending & receiving zaps/nudges/buzzes etc. */
	gboolean (send_attention)(PurpleConnection gc, const char *usernam e, guint type);	gboolean (send_attention)(PurpleConnection gc, const char *usernam e, guint type);
	GList (get_attention_types)(PurpleAccount *acct);	GList (get_attention_types)(PurpleAccount *acct);


	void (*_purple_reserved4)(void);	/**
		* The size of the PurplePluginProtocolInfo. This should always be s
		izeof(PurplePluginProtocolInfo).
		* This allows adding more functions to this struct without requirin
		g a major version bump.
		*/
		unsigned long struct_size;

		/* NOTE:
		* If more functions are added, they should accessed using the follo
		wing syntax:
		*
		* if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, new_functi
		on))
		* prpl->new_function(...);
		*
		* instead of
		*
		* if (prpl->new_function != NULL)
		* prpl->new_function(...);
		*
		* The PURPLE_PROTOCOL_PLUGIN_HAS_FUNC macro can be used for the old
		er member
		* functions (e.g. login, send_im etc.) too.
		*/

		/** This allows protocols to specify additional strings to be used f
		or
		* various purposes. The idea is to stuff a bunch of strings in thi
		s hash
		* table instead of expanding the struct for every addition. This h
		ash
		* table is allocated every call and MUST be unrefed by the caller.
		*
		* @param account The account to specify. This can be NULL.
		* @return The protocol's string hash table. The hash table should b
		e
		* destroyed by the caller when it's no longer needed.
		*/
		GHashTable (get_account_text_table)(PurpleAccount *account);
	};	};


		#define PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl, member) \
		(((G_STRUCT_OFFSET(PurplePluginProtocolInfo, member) < G_STRUCT_OFFS
		ET(PurplePluginProtocolInfo, struct_size)) \
		\|\| (G_STRUCT_OFFSET(PurplePluginProtocolInfo, member) < prpl->stru
		ct_size)) && \
		prpl->member != NULL)

	#define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \	#define PURPLE_IS_PROTOCOL_PLUGIN(plugin) \
	((plugin)->info->type == PURPLE_PLUGIN_PROTOCOL)	((plugin)->info->type == PURPLE_PLUGIN_PROTOCOL)

	#define PURPLE_PLUGIN_PROTOCOL_INFO(plugin) \	#define PURPLE_PLUGIN_PROTOCOL_INFO(plugin) \
	((PurplePluginProtocolInfo *)(plugin)->info->extra_info)	((PurplePluginProtocolInfo *)(plugin)->info->extra_info)

	#ifdef __cplusplus	#ifdef __cplusplus
	extern "C" {	extern "C" {
	#endif	#endif


	skipping to change at line 649	skipping to change at line 693
	/**	/**
	* Retrieves the list of stock status types from a prpl.	* Retrieves the list of stock status types from a prpl.
	*	*
	* @param account The account the user is on.	* @param account The account the user is on.
	* @param presence The presence for which we're going to get statuses	* @param presence The presence for which we're going to get statuses
	*	*
	* @return List of statuses	* @return List of statuses
	*/	*/
	GList purple_prpl_get_statuses(PurpleAccount account, PurplePresence *pre sence);	GList purple_prpl_get_statuses(PurpleAccount account, PurplePresence *pre sence);


		/** Send an attention request message.
		*
		* @param gc The connection to send the message on.
		* @param who Whose attention to request.
		* @param type_code An index into the prpl's attention_types list determini
		ng the type
		* of the attention request command to send. 0 if prpl only defines one
		* (for example, Yahoo and MSN), but some protocols define more (MySpac
		eIM).
		*
		* Note that you can't send arbitrary PurpleAttentionType's, because there
		is
		* only a fixed set of attention commands.
		* @since 2.5.0
		*/
		void purple_prpl_send_attention(PurpleConnection gc, const char who, guin
		t type_code);

		/** Process an incoming attention message.
		*
		* @param gc The connection that received the attention message.
		* @param who Who requested your attention.
		* @param type_code An index into the prpl's attention_types list determini
		ng the type
		* of the attention request command to send.
		* @since 2.5.0
		*/
		void purple_prpl_got_attention(PurpleConnection gc, const char who, guint
		type_code);

		/** Process an incoming attention message in a chat.
		*
		* @param gc The connection that received the attention message.
		* @param id The chat id.
		* @param who Who requested your attention.
		* @param type_code An index into the prpl's attention_types list determini
		ng the type
		* of the attention request command to send.
		* @since 2.5.0
		*/
		void purple_prpl_got_attention_in_chat(PurpleConnection *gc, int id, const
		char *who, guint type_code);

	/@}/	/@}/

	/************************************************************************** /	/************************************************************************** /
	/** @name Protocol Plugin Subsystem API * /	/** @name Protocol Plugin Subsystem API * /
	/************************************************************************** /	/************************************************************************** /
	/@{/	/@{/

	/**	/**
	* Finds a protocol plugin structure of the specified type.	* Finds a protocol plugin structure of the specified type.
	*	*

End of changes. 7 change blocks.
	19 lines changed or deleted	115 lines changed or added

	roomlist.h	roomlist.h

	skipping to change at line 33	skipping to change at line 33
	* 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_ROOMLIST_H_	#ifndef _PURPLE_ROOMLIST_H_
	#define _PURPLE_ROOMLIST_H_	#define _PURPLE_ROOMLIST_H_

	typedef struct _PurpleRoomlist PurpleRoomlist;	typedef struct _PurpleRoomlist PurpleRoomlist;
	typedef struct _PurpleRoomlistRoom PurpleRoomlistRoom;	typedef struct _PurpleRoomlistRoom PurpleRoomlistRoom;
	typedef struct _PurpleRoomlistField PurpleRoomlistField;	typedef struct _PurpleRoomlistField PurpleRoomlistField;

		/** @copydoc _PurpleRoomlistUiOps */
	typedef struct _PurpleRoomlistUiOps PurpleRoomlistUiOps;	typedef struct _PurpleRoomlistUiOps PurpleRoomlistUiOps;

	/**	/**
	* The types of rooms.	* The types of rooms.
	*	*
	* These are ORable flags.	* These are ORable flags.
	*/	*/
	typedef enum	typedef enum
	{	{
	PURPLE_ROOMLIST_ROOMTYPE_CATEGORY = 0x01, /*< It's a category, but not a room you can join. /	PURPLE_ROOMLIST_ROOMTYPE_CATEGORY = 0x01, /*< It's a category, but not a room you can join. /

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	util.h	util.h

	skipping to change at line 231	skipping to change at line 231

	/************************************************************************** /	/************************************************************************** /
	/** @name Quoted Printable Functions * /	/** @name Quoted Printable Functions * /
	/************************************************************************** /	/************************************************************************** /
	/@{/	/@{/

	/**	/**
	* Converts a quoted printable string back to its readable equivalent.	* Converts a quoted printable string back to its readable equivalent.
	* What is a quoted printable string, you ask? It's an encoding used	* What is a quoted printable string, you ask? It's an encoding used
	* to transmit binary data as ASCII. It's intended purpose is to send	* to transmit binary data as ASCII. It's intended purpose is to send

	* e-mails containing non-ASCII characters. Wikipedia has a pretty good	* emails containing non-ASCII characters. Wikipedia has a pretty good
	* explanation. Also see RFC 2045.	* explanation. Also see RFC 2045.
	*	*
	* @param str The quoted printable ASCII string to convert to raw data.	* @param str The quoted printable ASCII string to convert to raw data.
	* @param ret_len The length of the returned data.	* @param ret_len The length of the returned data.
	*	*
	* @return The readable string. Must be g_free'd when no longer needed.	* @return The readable string. Must be g_free'd when no longer needed.
	*/	*/
	guchar purple_quotedp_decode(const char str, gsize *ret_len);	guchar purple_quotedp_decode(const char str, gsize *ret_len);

	/@}/	/@}/

	skipping to change at line 704	skipping to change at line 704
	*	*
	* @param data A pointer to the image data	* @param data A pointer to the image data
	* @param len The length of the image data	* @param len The length of the image data
	*	*
	* @return The appropriate extension, or "icon" if unknown.	* @return The appropriate extension, or "icon" if unknown.
	*/	*/
	const char *	const char *
	purple_util_get_image_extension(gconstpointer data, size_t len);	purple_util_get_image_extension(gconstpointer data, size_t len);

	/**	/**

		* Returns a SHA-1 hash string of the data passed in.
		*/
		char *purple_util_get_image_checksum(gconstpointer image_data, size_t image
		_len);

		/**
	* @return A hex encoded version of the SHA-1 hash of the data passed	* @return A hex encoded version of the SHA-1 hash of the data passed
	* in with the correct file extention appended. The file	* in with the correct file extention appended. The file
	* extension is determined by calling	* extension is determined by calling
	* purple_util_get_image_extension(). This return value must	* purple_util_get_image_extension(). This return value must
	* be g_freed by the caller.	* be g_freed by the caller.
	*/	*/
	char *purple_util_get_image_filename(gconstpointer image_data, size_t image _len);	char *purple_util_get_image_filename(gconstpointer image_data, size_t image _len);

	/@}/	/@}/


	skipping to change at line 1028	skipping to change at line 1033
	FALSE, cb, data);	FALSE, cb, data);

	/**	/**
	* Fetches the data from a URL, and passes it to a callback function.	* Fetches the data from a URL, and passes it to a callback function.
	*	*
	* @param url The URL.	* @param url The URL.
	* @param full TRUE if this is the full URL, or FALSE if it's a	* @param full TRUE if this is the full URL, or FALSE if it's a
	* partial URL.	* partial URL.
	* @param user_agent The user agent field to use, or NULL.	* @param user_agent The user agent field to use, or NULL.
	* @param http11 TRUE if HTTP/1.1 should be used to download the file.	* @param http11 TRUE if HTTP/1.1 should be used to download the file.

		* @param max_len The maximum number of bytes to retrieve (-1 for unlimi
		ted)
		* @param cb The callback function.
		* @param data The user data to pass to the callback function.
		* @deprecated In 3.0.0, we'll rename this to "purple_util_fetch_url"
		and get rid of the old one
		*/
		#define purple_util_fetch_url_len(url, full, user_agent, http11, max_len, c
		b, data) \
		purple_util_fetch_url_request_len(url, full, user_agent, http11, NUL
		L, \
		FALSE, max_len, cb, data);

		/**
		* Fetches the data from a URL, and passes it to a callback function.
		*
		* @param url The URL.
		* @param full TRUE if this is the full URL, or FALSE if it's a
		* partial URL.
		* @param user_agent The user agent field to use, or NULL.
		* @param http11 TRUE if HTTP/1.1 should be used to download the file.
	* @param request A HTTP request to send to the server instead of the	* @param request A HTTP request to send to the server instead of the
	* standard GET	* standard GET
	* @param include_headers	* @param include_headers
	* If TRUE, include the HTTP headers in the response.	* If TRUE, include the HTTP headers in the response.
	* @param callback The callback function.	* @param callback The callback function.
	* @param data The user data to pass to the callback function.	* @param data The user data to pass to the callback function.
	*/	*/
	PurpleUtilFetchUrlData purple_util_fetch_url_request(const gchar url,	PurpleUtilFetchUrlData purple_util_fetch_url_request(const gchar url,
	gboolean full, const gchar *user_agent, gboolean http11,	gboolean full, const gchar *user_agent, gboolean http11,
	const gchar *request, gboolean include_headers,	const gchar *request, gboolean include_headers,
	PurpleUtilFetchUrlCallback callback, gpointer data);	PurpleUtilFetchUrlCallback callback, gpointer data);

	/**	/**

		* Fetches the data from a URL, and passes it to a callback function.
		*
		* @param url The URL.
		* @param full TRUE if this is the full URL, or FALSE if it's a
		* partial URL.
		* @param user_agent The user agent field to use, or NULL.
		* @param http11 TRUE if HTTP/1.1 should be used to download the file.
		* @param request A HTTP request to send to the server instead of the
		* standard GET
		* @param include_headers
		* If TRUE, include the HTTP headers in the response.
		* @param max_len The maximum number of bytes to retrieve (-1 for unlimi
		ted)
		* @param callback The callback function.
		* @param data The user data to pass to the callback function.
		* @deprecated In 3.0.0, we'll rename this to "purple_util_fetch_url_
		request" and get rid of the old one
		*/
		PurpleUtilFetchUrlData purple_util_fetch_url_request_len(const gchar url,
		gboolean full, const gchar *user_agent, gboolean http11,
		const gchar *request, gboolean include_headers, gssize max_l
		en,
		PurpleUtilFetchUrlCallback callback, gpointer data);

		/**
	* Cancel a pending URL request started with either	* Cancel a pending URL request started with either
	* purple_util_fetch_url_request() or purple_util_fetch_url().	* purple_util_fetch_url_request() or purple_util_fetch_url().
	*	*
	* @param url_data The data returned when you initiated the URL fetch.	* @param url_data The data returned when you initiated the URL fetch.
	*/	*/
	void purple_util_fetch_url_cancel(PurpleUtilFetchUrlData *url_data);	void purple_util_fetch_url_cancel(PurpleUtilFetchUrlData *url_data);

	/**	/**
	* Decodes a URL into a plain string.	* Decodes a URL into a plain string.
	*	*

	skipping to change at line 1258	skipping to change at line 1302
	*/	*/
	const char _purple_oscar_convert(const char act, const char *protocol);	const char _purple_oscar_convert(const char act, const char *protocol);

	/**	/**
	* Restore default signal handlers for signals which might reasonably have	* Restore default signal handlers for signals which might reasonably have
	* handlers. This should be called by a fork()'d child process, since child processes	* handlers. This should be called by a fork()'d child process, since child processes
	* inherit the handlers of the parent.	* inherit the handlers of the parent.
	*/	*/
	void purple_restore_default_signal_handlers(void);	void purple_restore_default_signal_handlers(void);


		/**
		* Gets the host name of the machine. If it not possible to determine the
		* host name, "localhost" is returned
		*
		* @constreturn The hostname
		*/
		const gchar *purple_get_host_name(void);

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _PURPLE_UTIL_H_ */	#endif /* _PURPLE_UTIL_H_ */

End of changes. 5 change blocks.
	1 lines changed or deleted	61 lines changed or added

	version.h	version.h

	skipping to change at line 28	skipping to change at line 28
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* 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_

	#define PURPLE_MAJOR_VERSION (2)	#define PURPLE_MAJOR_VERSION (2)

	#define PURPLE_MINOR_VERSION (4)	#define PURPLE_MINOR_VERSION (5)
	#define PURPLE_MICRO_VERSION (3)	#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.
	2 lines changed or deleted	2 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/

	connection.h	connection.h

	skipping to change at line 30	skipping to change at line 30
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* 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_CONNECTION_H_	#ifndef _PURPLE_CONNECTION_H_
	#define _PURPLE_CONNECTION_H_	#define _PURPLE_CONNECTION_H_


		/** @copydoc _PurpleConnection */
	typedef struct _PurpleConnection PurpleConnection;	typedef struct _PurpleConnection PurpleConnection;

	/**	/**
	* Flags to change behavior of the client for a given connection.	* Flags to change behavior of the client for a given connection.
	*/	*/
	typedef enum	typedef enum
	{	{
	PURPLE_CONNECTION_HTML = 0x0001, /*< Connection sends/receive s in 'HTML'. /	PURPLE_CONNECTION_HTML = 0x0001, /*< Connection sends/receive s in 'HTML'. /
	PURPLE_CONNECTION_NO_BGCOLOR = 0x0002, /**< Connection does not send /receive	PURPLE_CONNECTION_NO_BGCOLOR = 0x0002, /**< Connection does not send /receive
	background colors. */	background colors. */
	PURPLE_CONNECTION_AUTO_RESP = 0x0004, /*< Send auto responses whe n away. /	PURPLE_CONNECTION_AUTO_RESP = 0x0004, /*< Send auto responses whe n away. /
	PURPLE_CONNECTION_FORMATTING_WBFO = 0x0008, /*< The text buffer mus t be formatted as a whole /	PURPLE_CONNECTION_FORMATTING_WBFO = 0x0008, /*< The text buffer mus t be formatted as a whole /
	PURPLE_CONNECTION_NO_NEWLINES = 0x0010, /*< No new lines are allowe d in outgoing messages /	PURPLE_CONNECTION_NO_NEWLINES = 0x0010, /*< No new lines are allowe d in outgoing messages /
	PURPLE_CONNECTION_NO_FONTSIZE = 0x0020, /*< Connection does not sen d/receive font sizes /	PURPLE_CONNECTION_NO_FONTSIZE = 0x0020, /*< Connection does not sen d/receive font sizes /
	PURPLE_CONNECTION_NO_URLDESC = 0x0040, /*< Connection does not sup port descriptions with links /	PURPLE_CONNECTION_NO_URLDESC = 0x0040, /*< Connection does not sup port descriptions with links /
	PURPLE_CONNECTION_NO_IMAGES = 0x0080, /*< Connection does not supp ort sending of images /	PURPLE_CONNECTION_NO_IMAGES = 0x0080, /*< Connection does not supp ort sending of images /

		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY = 0x0100, /*< Connection supp orts sending and receiving custom smileys /

	} PurpleConnectionFlags;	} PurpleConnectionFlags;

	typedef enum	typedef enum
	{	{
	PURPLE_DISCONNECTED = 0, /*< Disconnected. /	PURPLE_DISCONNECTED = 0, /*< Disconnected. /
	PURPLE_CONNECTED, /*< Connected. /	PURPLE_CONNECTED, /*< Connected. /
	PURPLE_CONNECTING /*< Connecting. /	PURPLE_CONNECTING /*< Connecting. /

	} PurpleConnectionState;	} PurpleConnectionState;

	skipping to change at line 123	skipping to change at line 125
	/** The server's SSL certificate does not have the expected	/** The server's SSL certificate does not have the expected
	* fingerprint.	* fingerprint.
	*/	*/
	PURPLE_CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH = 13,	PURPLE_CONNECTION_ERROR_CERT_FINGERPRINT_MISMATCH = 13,
	/** The server's SSL certificate is self-signed. */	/** The server's SSL certificate is self-signed. */
	PURPLE_CONNECTION_ERROR_CERT_SELF_SIGNED = 14,	PURPLE_CONNECTION_ERROR_CERT_SELF_SIGNED = 14,
	/** There was some other error validating the server's SSL certifica te.	/** There was some other error validating the server's SSL certifica te.
	*/	*/
	PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR = 15,	PURPLE_CONNECTION_ERROR_CERT_OTHER_ERROR = 15,


	/** Some other error occured which fits into none of the other	/** Some other error occurred which fits into none of the other
	* categories.	* categories.
	*/	*/
	/* purple_connection_error_reason() in connection.c uses the fact th at	/* purple_connection_error_reason() in connection.c uses the fact th at
	* this is the last member of the enum when sanity-checking; if othe r	* this is the last member of the enum when sanity-checking; if othe r
	* reasons are added after it, the check must be updated.	* reasons are added after it, the check must be updated.
	*/	*/
	PURPLE_CONNECTION_ERROR_OTHER_ERROR = 16	PURPLE_CONNECTION_ERROR_OTHER_ERROR = 16
	} PurpleConnectionError;	} PurpleConnectionError;

	/** Holds the type of an error along with its description. */	/** Holds the type of an error along with its description. */

	skipping to change at line 225	skipping to change at line 227
	*/	*/
	void (report_disconnect_reason)(PurpleConnection gc,	void (report_disconnect_reason)(PurpleConnection gc,
	PurpleConnectionError reason,	PurpleConnectionError reason,
	const char *text);	const char *text);

	void (*_purple_reserved1)(void);	void (*_purple_reserved1)(void);
	void (*_purple_reserved2)(void);	void (*_purple_reserved2)(void);
	void (*_purple_reserved3)(void);	void (*_purple_reserved3)(void);
	} PurpleConnectionUiOps;	} PurpleConnectionUiOps;


		/* Represents an active connection on an account. */
	struct _PurpleConnection	struct _PurpleConnection
	{	{
	PurplePlugin prpl; /< The protocol plugin. /	PurplePlugin prpl; /< The protocol plugin. /
	PurpleConnectionFlags flags; /*< Connection flags. /	PurpleConnectionFlags flags; /*< Connection flags. /

	PurpleConnectionState state; /*< The connection state. /	PurpleConnectionState state; /*< The connection state. /

	PurpleAccount account; /< The account being connected to. /	PurpleAccount account; /< The account being connected to. /
	char password; /< The password used. /	char password; /< The password used. /
	int inpa; /*< The input watcher. /	int inpa; /*< The input watcher. /

End of changes. 4 change blocks.
	1 lines changed or deleted	4 lines changed or added

	dbus-types.h	dbus-types.h

	skipping to change at line 78	skipping to change at line 78
	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestFields)	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestFields)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestFieldGroup)	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestFieldGroup)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestField)	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestField)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestUiOps)	PURPLE_DBUS_DECLARE_TYPE(PurpleRequestUiOps)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlist)	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlist)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlistRoom)	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlistRoom)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlistField)	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlistField)
	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlistUiOps)	PURPLE_DBUS_DECLARE_TYPE(PurpleRoomlistUiOps)
	PURPLE_DBUS_DECLARE_TYPE(PurpleSavedStatus)	PURPLE_DBUS_DECLARE_TYPE(PurpleSavedStatus)
	PURPLE_DBUS_DECLARE_TYPE(PurpleSavedStatusSub)	PURPLE_DBUS_DECLARE_TYPE(PurpleSavedStatusSub)

		PURPLE_DBUS_DECLARE_TYPE(PurpleSmiley)
		PURPLE_DBUS_DECLARE_TYPE(PurpleSmileyClass)
	PURPLE_DBUS_DECLARE_TYPE(PurpleDnsQueryData)	PURPLE_DBUS_DECLARE_TYPE(PurpleDnsQueryData)
	PURPLE_DBUS_DECLARE_TYPE(PurpleDnsQueryUiOps)	PURPLE_DBUS_DECLARE_TYPE(PurpleDnsQueryUiOps)
	PURPLE_DBUS_DECLARE_TYPE(PurpleSrvResponse)	PURPLE_DBUS_DECLARE_TYPE(PurpleSrvResponse)
	PURPLE_DBUS_DECLARE_TYPE(PurpleSrvQueryData)	PURPLE_DBUS_DECLARE_TYPE(PurpleSrvQueryData)
	PURPLE_DBUS_DECLARE_TYPE(PurpleStatusType)	PURPLE_DBUS_DECLARE_TYPE(PurpleStatusType)
	PURPLE_DBUS_DECLARE_TYPE(PurpleStatusAttr)	PURPLE_DBUS_DECLARE_TYPE(PurpleStatusAttr)
	PURPLE_DBUS_DECLARE_TYPE(PurplePresence)	PURPLE_DBUS_DECLARE_TYPE(PurplePresence)
	PURPLE_DBUS_DECLARE_TYPE(PurpleStatus)	PURPLE_DBUS_DECLARE_TYPE(PurpleStatus)
	PURPLE_DBUS_DECLARE_TYPE(PurpleStringref)	PURPLE_DBUS_DECLARE_TYPE(PurpleStringref)
	PURPLE_DBUS_DECLARE_TYPE(PurpleStunNatDiscovery)	PURPLE_DBUS_DECLARE_TYPE(PurpleStunNatDiscovery)

End of changes. 1 change blocks.
	0 lines changed or deleted	2 lines changed or added

	gtkutils.h	gtkutils.h

	skipping to change at line 635	skipping to change at line 635
	/**	/**
	* Creates a new pixbuf by loading an image from a file. The image will	* Creates a new pixbuf by loading an image from a file. The image will
	* be scaled to fit in the requested size, optionally preserving the image' s	* be scaled to fit in the requested size, optionally preserving the image' s
	* aspect ratio.	* aspect ratio.
	*/	*/
	GdkPixbuf gdk_pixbuf_new_from_file_at_scale(const char filename, int widt h, int height,	GdkPixbuf gdk_pixbuf_new_from_file_at_scale(const char filename, int widt h, int height,
	gboolean preserve_aspect_ratio,	gboolean preserve_aspect_ratio,
	GError **error);	GError **error);
	#endif	#endif


		#ifndef PURPLE_DISABLE_DEPRECATED
	/**	/**
	* Set or unset a custom buddyicon for a user.	* Set or unset a custom buddyicon for a user.
	*	*
	* @param account The account the user belongs to.	* @param account The account the user belongs to.
	* @param who The name of the user.	* @param who The name of the user.
	* @param filename The path of the custom icon. If this is @c NULL, then a ny	* @param filename The path of the custom icon. If this is @c NULL, then a ny
	* previously set custom buddy icon for the user is remove d.	* previously set custom buddy icon for the user is remove d.

		* @deprecated See purple_buddy_icons_node_set_custom_icon_from_file()
	*/	*/
	void pidgin_set_custom_buddy_icon(PurpleAccount account, const char who, const char *filename);	void pidgin_set_custom_buddy_icon(PurpleAccount account, const char who, const char *filename);

		#endif

	/**	/**
	* Converts "->" and "<-" in strings to Unicode arrow characters, for use i n referencing	* Converts "->" and "<-" in strings to Unicode arrow characters, for use i n referencing
	* menu items.	* menu items.
	*	*
	* @param str The text to convert	* @param str The text to convert
	* @return A newly allocated string with unicode arrow characters	* @return A newly allocated string with unicode arrow characters
	*/	*/
	char pidgin_make_pretty_arrows(const char str);	char pidgin_make_pretty_arrows(const char str);


	skipping to change at line 686	skipping to change at line 689
	* second argument, or be @c NULL to take no action w hen	* second argument, or be @c NULL to take no action w hen
	* the corresponding button is pressed.) When a butto n is	* the corresponding button is pressed.) When a butto n is
	* pressed, the callback (if any) will be called; whe n	* pressed, the callback (if any) will be called; whe n
	* the callback returns the dialog will be destroyed.	* the callback returns the dialog will be destroyed.
	* @return A #PidginMiniDialog, suitable for passing to	* @return A #PidginMiniDialog, suitable for passing to
	* pidgin_blist_add_alert().	* pidgin_blist_add_alert().
	* @see pidginstock.h	* @see pidginstock.h
	*/	*/
	GtkWidget pidgin_make_mini_dialog(PurpleConnection handle,	GtkWidget pidgin_make_mini_dialog(PurpleConnection handle,
	const char* stock_id, const char primary, const char secondary,	const char* stock_id, const char primary, const char secondary,

	void *user_data, ...);	void *user_data, ...) G_GNUC_NULL_TERMINATED;

	/**	/**
	* This is a callback function to be used for Ctrl+F searching in treeviews .	* This is a callback function to be used for Ctrl+F searching in treeviews .
	* Sample Use:	* Sample Use:
	* gtk_tree_view_set_search_equal_func(treeview,	* gtk_tree_view_set_search_equal_func(treeview,
	* pidgin_tree_view_search_equal_func,	* pidgin_tree_view_search_equal_func,
	* search_data, search_data_destroy_cb);	* search_data, search_data_destroy_cb);
	*	*
	*/	*/
	gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint colum n,	gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint colum n,

	skipping to change at line 806	skipping to change at line 809
	* @param sg The GtkSizeGroup to add the label to, can be @c NULL .	* @param sg The GtkSizeGroup to add the label to, can be @c NULL .
	* @param widget The GtkWidget to add.	* @param widget The GtkWidget to add.
	* @param expand Whether to expand the widget horizontally.	* @param expand Whether to expand the widget horizontally.
	* @param p_label Place to store a pointer to the GtkLabel, or @c NULL if you don't care.	* @param p_label Place to store a pointer to the GtkLabel, or @c NULL if you don't care.
	*	*
	* @return A GtkHBox already added to the GtkVBox containing the GtkLabel and the GtkWidget.	* @return A GtkHBox already added to the GtkVBox containing the GtkLabel and the GtkWidget.
	* @since 2.4.0	* @since 2.4.0
	*/	*/
	GtkWidget pidgin_add_widget_to_vbox(GtkBox vbox, const char widget_label , GtkSizeGroup sg, GtkWidget widget, gboolean expand, GtkWidget *p_label );	GtkWidget pidgin_add_widget_to_vbox(GtkBox vbox, const char widget_label , GtkSizeGroup sg, GtkWidget widget, gboolean expand, GtkWidget *p_label );


		/**
		* Create a GdkPixbuf from a PurpleStoredImage.
		*
		* @param image A PurpleStoredImage.
		*
		* @return A GdkPixbuf created from the stored image.
		* @since 2.5.0
		*/
		GdkPixbuf * pidgin_pixbuf_from_imgstore(PurpleStoredImage *image);

	#endif /* _PIDGINUTILS_H_ */	#endif /* _PIDGINUTILS_H_ */

End of changes. 5 change blocks.
	1 lines changed or deleted	14 lines changed or added

	notify.h	notify.h

	skipping to change at line 50	skipping to change at line 50
	* Notification close callbacks.	* Notification close callbacks.
	*/	*/
	typedef void (*PurpleNotifyCloseCallback) (gpointer user_data);	typedef void (*PurpleNotifyCloseCallback) (gpointer user_data);

	/**	/**
	* Notification types.	* Notification types.
	*/	*/
	typedef enum	typedef enum
	{	{
	PURPLE_NOTIFY_MESSAGE = 0, /*< Message notification. /	PURPLE_NOTIFY_MESSAGE = 0, /*< Message notification. /

	PURPLE_NOTIFY_EMAIL, /*< Single e-mail notification. /	PURPLE_NOTIFY_EMAIL, /*< Single email notification. /
	PURPLE_NOTIFY_EMAILS, /*< Multiple e-mail notification. /	PURPLE_NOTIFY_EMAILS, /*< Multiple email notification. /
	PURPLE_NOTIFY_FORMATTED, /*< Formatted text. /	PURPLE_NOTIFY_FORMATTED, /*< Formatted text. /
	PURPLE_NOTIFY_SEARCHRESULTS, /*< Buddy search results. /	PURPLE_NOTIFY_SEARCHRESULTS, /*< Buddy search results. /
	PURPLE_NOTIFY_USERINFO, /*< Formatted userinfo text. /	PURPLE_NOTIFY_USERINFO, /*< Formatted userinfo text. /
	PURPLE_NOTIFY_URI /*< URI notification or display. /	PURPLE_NOTIFY_URI /*< URI notification or display. /

	} PurpleNotifyType;	} PurpleNotifyType;

	/**	/**
	* Notification message types.	* Notification message types.
	*/	*/

	skipping to change at line 393	skipping to change at line 393
	* @param user_data The data to pass to the callback.	* @param user_data The data to pass to the callback.
	*	*
	* @return A UI-specific handle.	* @return A UI-specific handle.
	*/	*/
	void purple_notify_message(void handle, PurpleNotifyMsgType type,	void purple_notify_message(void handle, PurpleNotifyMsgType type,
	const char title, const c har primary,	const char title, const c har primary,
	const char *secondary, Pur pleNotifyCloseCallback cb,	const char *secondary, Pur pleNotifyCloseCallback cb,
	gpointer user_data);	gpointer user_data);

	/**	/**

	* Displays a single e-mail notification to the user.	* Displays a single email notification to the user.
	*	*
	* @param handle The plugin or connection handle.	* @param handle The plugin or connection handle.

	* @param subject The subject of the e-mail.	* @param subject The subject of the email.
	* @param from The from address.	* @param from The from address.
	* @param to The destination address.	* @param to The destination address.
	* @param url The URL where the message can be read.	* @param url The URL where the message can be read.
	* @param cb The callback to call when the user closes	* @param cb The callback to call when the user closes
	* the notification.	* the notification.
	* @param user_data The data to pass to the callback.	* @param user_data The data to pass to the callback.
	*	*
	* @return A UI-specific handle.	* @return A UI-specific handle.
	*/	*/
	void purple_notify_email(void handle, const char *subject,	void purple_notify_email(void handle, const char *subject,
	const char from, const char to,	const char from, const char to,
	const char *url, PurpleNotif yCloseCallback cb,	const char *url, PurpleNotif yCloseCallback cb,
	gpointer user_data);	gpointer user_data);

	/**	/**

	* Displays a notification for multiple e-mails to the user.	* Displays a notification for multiple emails to the user.
	*	*
	* @param handle The plugin or connection handle.	* @param handle The plugin or connection handle.

	* @param count The number of e-mails.	* @param count The number of emails.
	* @param detailed @c TRUE if there is information for each e-mail in the	* @param detailed @c TRUE if there is information for each email in the
	* arrays.	* arrays.
	* @param subjects The array of subjects.	* @param subjects The array of subjects.
	* @param froms The array of from addresses.	* @param froms The array of from addresses.
	* @param tos The array of destination addresses.	* @param tos The array of destination addresses.
	* @param urls The URLs where the messages can be read.	* @param urls The URLs where the messages can be read.
	* @param cb The callback to call when the user closes	* @param cb The callback to call when the user closes
	* the notification.	* the notification.
	* @param user_data The data to pass to the callback.	* @param user_data The data to pass to the callback.
	*	*
	* @return A UI-specific handle.	* @return A UI-specific handle.

	skipping to change at line 568	skipping to change at line 568
	PurpleNotifyUserInfoEntry purple_notify_user_info_entry_new(const char la bel, const char *value);	PurpleNotifyUserInfoEntry purple_notify_user_info_entry_new(const char la bel, const char *value);

	/**	/**
	* Add a section break. A UI might display this as a horizontal line.	* Add a section break. A UI might display this as a horizontal line.
	*	*
	* @param user_info The PurpleNotifyUserInfo	* @param user_info The PurpleNotifyUserInfo
	*/	*/
	void purple_notify_user_info_add_section_break(PurpleNotifyUserInfo *user_i nfo);	void purple_notify_user_info_add_section_break(PurpleNotifyUserInfo *user_i nfo);

	/**	/**

		* Prepend a section break. A UI might display this as a horizontal line.
		*
		* @param user_info The PurpleNotifyUserInfo
		* @since 2.5.0
		*/
		void purple_notify_user_info_prepend_section_break(PurpleNotifyUserInfo *us
		er_info);

		/**
	* Add a section header. A UI might display this in a different font from other text.	* Add a section header. A UI might display this in a different font from other text.
	*	*
	* @param user_info The PurpleNotifyUserInfo	* @param user_info The PurpleNotifyUserInfo
	* @param label The name of the section	* @param label The name of the section
	*/	*/
	void purple_notify_user_info_add_section_header(PurpleNotifyUserInfo user_ info, const char label);	void purple_notify_user_info_add_section_header(PurpleNotifyUserInfo user_ info, const char label);

	/**	/**

		* Prepend a section header. A UI might display this in a different font f
		rom other text.
		*
		* @param user_info The PurpleNotifyUserInfo
		* @param label The name of the section
		* @since 2.5.0
		*/
		void purple_notify_user_info_prepend_section_header(PurpleNotifyUserInfo *u
		ser_info, const char *label);

		/**
	* Remove the last item which was added to a PurpleNotifyUserInfo. This cou ld be used to remove a section header which is not needed.	* Remove the last item which was added to a PurpleNotifyUserInfo. This cou ld be used to remove a section header which is not needed.
	*/	*/
	void purple_notify_user_info_remove_last_item(PurpleNotifyUserInfo *user_in fo);	void purple_notify_user_info_remove_last_item(PurpleNotifyUserInfo *user_in fo);

	/**	/**
	* Get the label for a PurpleNotifyUserInfoEntry	* Get the label for a PurpleNotifyUserInfoEntry
	*	*
	* @param user_info_entry The PurpleNotifyUserInfoEntry	* @param user_info_entry The PurpleNotifyUserInfoEntry
	*	*
	* @result The label	* @result The label

End of changes. 7 change blocks.
	7 lines changed or deleted	27 lines changed or added

	pidginstock.h	pidginstock.h

	skipping to change at line 132	skipping to change at line 132
	#define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image"	#define PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE "pidgin-insert-image"
	#define PIDGIN_STOCK_TOOLBAR_INSERT_LINK "pidgin-insert-link"	#define PIDGIN_STOCK_TOOLBAR_INSERT_LINK "pidgin-insert-link"
	#define PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW "pidgin-message-new"	#define PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW "pidgin-message-new"
	#define PIDGIN_STOCK_TOOLBAR_PENDING "pidgin-pending"	#define PIDGIN_STOCK_TOOLBAR_PENDING "pidgin-pending"
	#define PIDGIN_STOCK_TOOLBAR_PLUGINS "pidgin-plugins"	#define PIDGIN_STOCK_TOOLBAR_PLUGINS "pidgin-plugins"
	#define PIDGIN_STOCK_TOOLBAR_TYPING "pidgin-typing"	#define PIDGIN_STOCK_TOOLBAR_TYPING "pidgin-typing"
	#define PIDGIN_STOCK_TOOLBAR_USER_INFO "pidgin-info"	#define PIDGIN_STOCK_TOOLBAR_USER_INFO "pidgin-info"
	#define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock"	#define PIDGIN_STOCK_TOOLBAR_UNBLOCK "pidgin-unblock"
	#define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"	#define PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR "pidgin-select-avatar"
	#define PIDGIN_STOCK_TOOLBAR_SEND_FILE "pidgin-send-file"	#define PIDGIN_STOCK_TOOLBAR_SEND_FILE "pidgin-send-file"

		#define PIDGIN_STOCK_TOOLBAR_TRANSFER "pidgin-transfer"

	/* Tray icons */	/* Tray icons */
	#define PIDGIN_STOCK_TRAY_AVAILABLE "pidgin-tray-available"	#define PIDGIN_STOCK_TRAY_AVAILABLE "pidgin-tray-available"
	#define PIDGIN_STOCK_TRAY_INVISIBLE "pidgin-tray-invisible"	#define PIDGIN_STOCK_TRAY_INVISIBLE "pidgin-tray-invisible"
	#define PIDGIN_STOCK_TRAY_AWAY "pidgin-tray-away"	#define PIDGIN_STOCK_TRAY_AWAY "pidgin-tray-away"
	#define PIDGIN_STOCK_TRAY_BUSY "pidgin-tray-busy"	#define PIDGIN_STOCK_TRAY_BUSY "pidgin-tray-busy"
	#define PIDGIN_STOCK_TRAY_XA "pidgin-tray-xa"	#define PIDGIN_STOCK_TRAY_XA "pidgin-tray-xa"
	#define PIDGIN_STOCK_TRAY_OFFLINE "pidgin-tray-offline"	#define PIDGIN_STOCK_TRAY_OFFLINE "pidgin-tray-offline"
	#define PIDGIN_STOCK_TRAY_CONNECT "pidgin-tray-connect"	#define PIDGIN_STOCK_TRAY_CONNECT "pidgin-tray-connect"
	#define PIDGIN_STOCK_TRAY_PENDING "pidgin-tray-pending"	#define PIDGIN_STOCK_TRAY_PENDING "pidgin-tray-pending"

End of changes. 1 change blocks.
	0 lines changed or deleted	1 lines changed or added

	plugin.h	plugin.h

	skipping to change at line 200	skipping to change at line 200
	((plugin)->info != NULL && (plugin)->info->actions != NULL)	((plugin)->info != NULL && (plugin)->info->actions != NULL)

	#define PURPLE_PLUGIN_ACTIONS(plugin, context) \	#define PURPLE_PLUGIN_ACTIONS(plugin, context) \
	(PURPLE_PLUGIN_HAS_ACTIONS(plugin)? \	(PURPLE_PLUGIN_HAS_ACTIONS(plugin)? \
	(plugin)->info->actions(plugin, context): NULL)	(plugin)->info->actions(plugin, context): NULL)

	/**	/**
	* Handles the initialization of modules.	* Handles the initialization of modules.
	*/	*/
	#if !defined(PURPLE_PLUGINS) \|\| defined(PURPLE_STATIC_PRPL)	#if !defined(PURPLE_PLUGINS) \|\| defined(PURPLE_STATIC_PRPL)

		# define _FUNC_NAME(x) purple_init_##x##_plugin
	# define PURPLE_INIT_PLUGIN(pluginname, initfunc, plugininfo) \	# define PURPLE_INIT_PLUGIN(pluginname, initfunc, plugininfo) \

	gboolean purple_init_##pluginname##_plugin(void);\	gboolean _FUNC_NAME(pluginname)(void);\
	gboolean purple_init_##pluginname##_plugin(void) { \	gboolean _FUNC_NAME(pluginname)(void) { \
	PurplePlugin *plugin = purple_plugin_new(TRUE, NULL); \	PurplePlugin *plugin = purple_plugin_new(TRUE, NULL); \
	plugin->info = &(plugininfo); \	plugin->info = &(plugininfo); \
	initfunc((plugin)); \	initfunc((plugin)); \
	purple_plugin_load((plugin)); \	purple_plugin_load((plugin)); \
	return purple_plugin_register(plugin); \	return purple_plugin_register(plugin); \
	}	}
	#else /* PURPLE_PLUGINS && !PURPLE_STATIC_PRPL */	#else /* PURPLE_PLUGINS && !PURPLE_STATIC_PRPL */
	# define PURPLE_INIT_PLUGIN(pluginname, initfunc, plugininfo) \	# define PURPLE_INIT_PLUGIN(pluginname, initfunc, plugininfo) \
	G_MODULE_EXPORT gboolean purple_init_plugin(PurplePlugin *plugin); \	G_MODULE_EXPORT gboolean purple_init_plugin(PurplePlugin *plugin); \
	G_MODULE_EXPORT gboolean purple_init_plugin(PurplePlugin *plugin) { \	G_MODULE_EXPORT gboolean purple_init_plugin(PurplePlugin *plugin) { \

End of changes. 2 change blocks.
	2 lines changed or deleted	3 lines changed or added

	proxy.h	proxy.h

	skipping to change at line 241	skipping to change at line 241
	* function.	* function.
	* @param account The account making the connection.	* @param account The account making the connection.
	* @param host The destination host.	* @param host The destination host.
	* @param port The destination port.	* @param port The destination port.
	* @param connect_cb The function to call when the connection is	* @param connect_cb The function to call when the connection is
	* established. If the connection failed then	* established. If the connection failed then
	* fd will be -1 and error message will be set	* fd will be -1 and error message will be set
	* to something descriptive (hopefully).	* to something descriptive (hopefully).
	* @param data User-defined data.	* @param data User-defined data.
	*	*

	* @return NULL if there was an error, or a reference to a data	* @return NULL if there was an error, or a reference to an
	* structure that can be used to cancel the pending	* opaque data structure that can be used to cancel
	* connection, if needed.	* the pending connection, if needed.
	*/	*/
	PurpleProxyConnectData purple_proxy_connect(void handle,	PurpleProxyConnectData purple_proxy_connect(void handle,
	PurpleAccount *account,	PurpleAccount *account,
	const char *host, int port,	const char *host, int port,
	PurpleProxyConnectFunction connect_cb, gpointer data );	PurpleProxyConnectFunction connect_cb, gpointer data );

	/**	/**
	* Makes a connection through a SOCKS5 proxy.	* Makes a connection through a SOCKS5 proxy.
	*	*
	* @param handle A handle that should be associated with this	* @param handle A handle that should be associated with this

	skipping to change at line 267	skipping to change at line 267
	* function.	* function.
	* @param gpi The PurpleProxyInfo specifying the proxy settings	* @param gpi The PurpleProxyInfo specifying the proxy settings
	* @param host The destination host.	* @param host The destination host.
	* @param port The destination port.	* @param port The destination port.
	* @param connect_cb The function to call when the connection is	* @param connect_cb The function to call when the connection is
	* established. If the connection failed then	* established. If the connection failed then
	* fd will be -1 and error message will be set	* fd will be -1 and error message will be set
	* to something descriptive (hopefully).	* to something descriptive (hopefully).
	* @param data User-defined data.	* @param data User-defined data.
	*	*

	* @return NULL if there was an error, or a reference to a data	* @return NULL if there was an error, or a reference to an
	* structure that can be used to cancel the pending	* opaque data structure that can be used to cancel
	* connection, if needed.	* the pending connection, if needed.
	*/	*/
	PurpleProxyConnectData purple_proxy_connect_socks5(void handle,	PurpleProxyConnectData purple_proxy_connect_socks5(void handle,
	PurpleProxyInfo *gpi,	PurpleProxyInfo *gpi,
	const char *host, int port,	const char *host, int port,
	PurpleProxyConnectFunction connect_cb, gpointer data );	PurpleProxyConnectFunction connect_cb, gpointer data );

	/**	/**
	* Cancel an in-progress connection attempt. This should be called	* Cancel an in-progress connection attempt. This should be called
	* by the PRPL if the user disables an account while it is still	* by the PRPL if the user disables an account while it is still
	* performing the initial sign on. Or when establishing a file	* performing the initial sign on. Or when establishing a file

End of changes. 2 change blocks.
	6 lines changed or deleted	6 lines changed or added

	server.h	server.h

	skipping to change at line 66	skipping to change at line 66
	int serv_send_im(PurpleConnection , const char , const char *, PurpleMes sageFlags flags);	int serv_send_im(PurpleConnection , const char , const char *, PurpleMes sageFlags flags);

	/** Get information about an account's attention commands, from the prpl.	/** Get information about an account's attention commands, from the prpl.
	*	*
	* @return The attention command numbered 'code' from the prpl's attention_ types, or NULL.	* @return The attention command numbered 'code' from the prpl's attention_ types, or NULL.
	*/	*/
	PurpleAttentionType purple_get_attention_type_from_code(PurpleAccount acc ount, guint type_code);	PurpleAttentionType purple_get_attention_type_from_code(PurpleAccount acc ount, guint type_code);

	/** Send an attention request message.	/** Send an attention request message.
	*	*

		* @deprecated Use purple_prpl_send_attention() instead.
		*
	* @param gc The connection to send the message on.	* @param gc The connection to send the message on.
	* @param who Whose attention to request.	* @param who Whose attention to request.
	* @param type_code An index into the prpl's attention_types list determini ng the type	* @param type_code An index into the prpl's attention_types list determini ng the type
	* of the attention request command to send. 0 if prpl only defines one	* of the attention request command to send. 0 if prpl only defines one
	* (for example, Yahoo and MSN), but some protocols define more (MySpac eIM).	* (for example, Yahoo and MSN), but some protocols define more (MySpac eIM).
	*	*
	* Note that you can't send arbitrary PurpleAttentionType's, because there is	* Note that you can't send arbitrary PurpleAttentionType's, because there is
	* only a fixed set of attention commands.	* only a fixed set of attention commands.
	*/	*/
	void serv_send_attention(PurpleConnection gc, const char who, guint type_ code);	void serv_send_attention(PurpleConnection gc, const char who, guint type_ code);

	/** Process an incoming attention message.	/** Process an incoming attention message.
	*	*

		* @deprecated Use purple_prpl_got_attention() instead.
		*
	* @param gc The connection that received the attention message.	* @param gc The connection that received the attention message.
	* @param who Who requested your attention.	* @param who Who requested your attention.
	* @param type_code An index into the prpl's attention_types list determini ng the type	* @param type_code An index into the prpl's attention_types list determini ng the type
	* of the attention request command to send.	* of the attention request command to send.
	*/	*/
	void serv_got_attention(PurpleConnection gc, const char who, guint type_c ode);	void serv_got_attention(PurpleConnection gc, const char who, guint type_c ode);

	void serv_get_info(PurpleConnection , const char );	void serv_get_info(PurpleConnection , const char );
	void serv_set_info(PurpleConnection , const char );	void serv_set_info(PurpleConnection , const char );


	skipping to change at line 168	skipping to change at line 172
	* @param data The components necessary if you want to call serv_join_ch at().	* @param data The components necessary if you want to call serv_join_ch at().
	* The hash function should be g_str_hash() and the equal	* The hash function should be g_str_hash() and the equal
	* function should be g_str_equal().	* function should be g_str_equal().
	*/	*/
	void serv_got_chat_invite(PurpleConnection gc, const char name,	void serv_got_chat_invite(PurpleConnection gc, const char name,
	const char who, const cha r message,	const char who, const cha r message,
	GHashTable *data);	GHashTable *data);

	PurpleConversation serv_got_joined_chat(PurpleConnection gc,	PurpleConversation serv_got_joined_chat(PurpleConnection gc,
	i nt id, const char *name);	i nt id, const char *name);

		/**
		* Called by a prpl when an attempt to join a chat via serv_join_chat()
		* fails.
		*
		* @param gc The connection on which chat joining failed
		* @param data The components passed to serv_join_chat() originally.
		* The hash function should be g_str_hash() and the equal
		* function should be g_str_equal().
		*/
		void purple_serv_got_join_chat_failed(PurpleConnection gc, GHashTable dat
		a);

	void serv_got_chat_left(PurpleConnection *g, int id);	void serv_got_chat_left(PurpleConnection *g, int id);
	void serv_got_chat_in(PurpleConnection g, int id, const char who,	void serv_got_chat_in(PurpleConnection g, int id, const char who,
	PurpleMessageFlags flags, const ch ar *message, time_t mtime);	PurpleMessageFlags flags, const ch ar *message, time_t mtime);
	void serv_send_file(PurpleConnection gc, const char who, const char *file );	void serv_send_file(PurpleConnection gc, const char who, const char *file );

	#ifdef __cplusplus	#ifdef __cplusplus
	}	}
	#endif	#endif

	#endif /* _PURPLE_SERVER_H_ */	#endif /* _PURPLE_SERVER_H_ */

End of changes. 3 change blocks.
	0 lines changed or deleted	16 lines changed or added

	sound.h	sound.h

	skipping to change at line 57	skipping to change at line 57
	PURPLE_SOUND_CHAT_JOIN, /*< Someone joins a chat. /	PURPLE_SOUND_CHAT_JOIN, /*< Someone joins a chat. /
	PURPLE_SOUND_CHAT_LEAVE, /*< Someone leaves a chat. /	PURPLE_SOUND_CHAT_LEAVE, /*< Someone leaves a chat. /
	PURPLE_SOUND_CHAT_YOU_SAY, /*< You say something in a chat. /	PURPLE_SOUND_CHAT_YOU_SAY, /*< You say something in a chat. /
	PURPLE_SOUND_CHAT_SAY, /*< Someone else says somthing in a chat. /	PURPLE_SOUND_CHAT_SAY, /*< Someone else says somthing in a chat. /
	PURPLE_SOUND_POUNCE_DEFAULT, /*< Default sound for a buddy pounce . /	PURPLE_SOUND_POUNCE_DEFAULT, /*< Default sound for a buddy pounce . /
	PURPLE_SOUND_CHAT_NICK, /*< Someone says your name in a chat . /	PURPLE_SOUND_CHAT_NICK, /*< Someone says your name in a chat . /
	PURPLE_NUM_SOUNDS /*< Total number of sounds. /	PURPLE_NUM_SOUNDS /*< Total number of sounds. /

	} PurpleSoundEventID;	} PurpleSoundEventID;


		/** Operations used by the core to request that particular sound files, or
		the
		* sound associated with a particular event, should be played.
		*/
	typedef struct _PurpleSoundUiOps	typedef struct _PurpleSoundUiOps
	{	{
	void (*init)(void);	void (*init)(void);
	void (*uninit)(void);	void (*uninit)(void);
	void (play_file)(const char filename);	void (play_file)(const char filename);
	void (*play_event)(PurpleSoundEventID event);	void (*play_event)(PurpleSoundEventID event);

	void (*_purple_reserved1)(void);	void (*_purple_reserved1)(void);
	void (*_purple_reserved2)(void);	void (*_purple_reserved2)(void);
	void (*_purple_reserved3)(void);	void (*_purple_reserved3)(void);

End of changes. 1 change blocks.
	0 lines changed or deleted	4 lines changed or added