blist.h   blist.h 
skipping to change at line 74 skipping to change at line 74
#define PURPLE_BLIST_NODE_IS_BUDDY(n) (purple_blist_node_get_type(n) == P URPLE_BLIST_BUDDY_NODE) #define PURPLE_BLIST_NODE_IS_BUDDY(n) (purple_blist_node_get_type(n) == P URPLE_BLIST_BUDDY_NODE)
#define PURPLE_BLIST_NODE_IS_CONTACT(n) (purple_blist_node_get_type(n) == P URPLE_BLIST_CONTACT_NODE) #define PURPLE_BLIST_NODE_IS_CONTACT(n) (purple_blist_node_get_type(n) == P URPLE_BLIST_CONTACT_NODE)
#define PURPLE_BLIST_NODE_IS_GROUP(n) (purple_blist_node_get_type(n) == P URPLE_BLIST_GROUP_NODE) #define PURPLE_BLIST_NODE_IS_GROUP(n) (purple_blist_node_get_type(n) == P URPLE_BLIST_GROUP_NODE)
#define PURPLE_BUDDY_IS_ONLINE(b) \ #define PURPLE_BUDDY_IS_ONLINE(b) \
((b) != NULL && purple_account_is_connected(purple_buddy_get_account (b)) && \ ((b) != NULL && purple_account_is_connected(purple_buddy_get_account (b)) && \
purple_presence_is_online(purple_buddy_get_presence(b))) purple_presence_is_online(purple_buddy_get_presence(b)))
typedef enum typedef enum
{ {
PURPLE_BLIST_NODE_FLAG_NO_SAVE = 1 << 0, /**< node should not b e saved with the buddy list */ PURPLE_BLIST_NODE_FLAG_NO_SAVE = 1 << 0 /**< node should not be saved with the buddy list */
} PurpleBlistNodeFlags; } PurpleBlistNodeFlags;
#define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (((PurpleBlistNode*)(b))->flags & (f)) #define PURPLE_BLIST_NODE_HAS_FLAG(b, f) (purple_blist_node_get_flags((Purp leBlistNode*)(b)) & (f))
#define PURPLE_BLIST_NODE_SHOULD_SAVE(b) (! PURPLE_BLIST_NODE_HAS_FLAG(b, P URPLE_BLIST_NODE_FLAG_NO_SAVE)) #define PURPLE_BLIST_NODE_SHOULD_SAVE(b) (! PURPLE_BLIST_NODE_HAS_FLAG(b, P URPLE_BLIST_NODE_FLAG_NO_SAVE))
#define PURPLE_BLIST_NODE_NAME(n) ((n)->type == PURPLE_BLIST_CHAT_NODE ? p #define PURPLE_BLIST_NODE_NAME(n) (purple_blist_node_get_type(n) == PURPLE_
urple_chat_get_name((PurpleChat*)n) : \ BLIST_CHAT_NODE ? purple_chat_get_name((PurpleChat*)n) : \
(n)->type == PURPLE_BLIST_BUDDY_NODE ? purple_blist_node_get_type(n) == PURPLE
purple_buddy_get_name((PurpleBuddy*)n) : NULL) _BLIST_BUDDY_NODE ? purple_buddy_get_name((PurpleBuddy*)n) : NULL)
#include "account.h" #include "account.h"
#include "buddyicon.h" #include "buddyicon.h"
#include "status.h" #include "status.h"
/************************************************************************** / /************************************************************************** /
/* Data Structures * / /* Data Structures * /
/************************************************************************** / /************************************************************************** /
#if !(defined PURPLE_HIDE_STRUCTS) || (defined _PURPLE_BLIST_C_)
/** /**
* A Buddy list node. This can represent a group, a buddy, or anything els e. * A Buddy list node. This can represent a group, a buddy, or anything els e.
* This is a base class for struct buddy and struct group and for anything * This is a base class for struct buddy and struct group and for anything
* else that wants to put itself in the buddy list. */ * else that wants to put itself in the buddy list. */
struct _PurpleBlistNode { struct _PurpleBlistNode {
PurpleBlistNodeType type; /**< The type of node this is */ PurpleBlistNodeType type; /**< The type of node this is */
PurpleBlistNode *prev; /**< The sibling before this b uddy. */ PurpleBlistNode *prev; /**< The sibling before this b uddy. */
PurpleBlistNode *next; /**< The sibling after this bu ddy. */ PurpleBlistNode *next; /**< The sibling after this bu ddy. */
PurpleBlistNode *parent; /**< The parent of this node */ PurpleBlistNode *parent; /**< The parent of this node */
PurpleBlistNode *child; /**< The child of this node */ PurpleBlistNode *child; /**< The child of this node */
skipping to change at line 156 skipping to change at line 158
* A chat. This contains everything Purple needs to put a chat room in the * A chat. This contains everything Purple needs to put a chat room in the
* buddy list. * buddy list.
*/ */
struct _PurpleChat { struct _PurpleChat {
PurpleBlistNode node; /**< The node that this chat inherits fro m */ PurpleBlistNode node; /**< The node that this chat inherits fro m */
char *alias; /**< The display name of this chat. */ char *alias; /**< The display name of this chat. */
GHashTable *components; /**< the stuff the protocol needs to know t o join the chat */ GHashTable *components; /**< the stuff the protocol needs to know t o join the chat */
PurpleAccount *account; /**< The account this chat is attached to */ PurpleAccount *account; /**< The account this chat is attached to */
}; };
#endif /* PURPLE_HIDE_STRUCTS && PURPLE_BLIST_STRUCTS */
/** /**
* The Buddy List * The Buddy List
*/ */
struct _PurpleBuddyList { struct _PurpleBuddyList {
PurpleBlistNode *root; /**< The first node in the buddy lis t */ PurpleBlistNode *root; /**< The first node in the buddy lis t */
GHashTable *buddies; /**< Every buddy in this list */ GHashTable *buddies; /**< Every buddy in this list */
void *ui_data; /**< UI-specific data. */ void *ui_data; /**< UI-specific data. */
}; };
/** /**
skipping to change at line 331 skipping to change at line 335
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. * Updates a node's custom icon.
* *
* @param node The PurpleBlistNode whose custom icon has changed. * @param node The PurpleBlistNode whose custom icon has changed.
* @since 2.5.0 * @since 2.5.0
*/ */
void purple_blist_update_node_icon(PurpleBlistNode *node); void purple_blist_update_node_icon(PurpleBlistNode *node);
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_)
/** /**
* 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. * @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 #endif
/** /**
skipping to change at line 557 skipping to change at line 561
void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *nod e); void purple_blist_merge_contact(PurpleContact *source, PurpleBlistNode *nod e);
/** /**
* Returns the highest priority buddy for a given contact. * Returns the highest priority buddy for a given contact.
* *
* @param contact The contact * @param contact The contact
* @return The highest priority buddy * @return The highest priority buddy
*/ */
PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact); PurpleBuddy *purple_contact_get_priority_buddy(PurpleContact *contact);
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BLIST_C_)
/** /**
* Sets the alias for a contact. * Sets the alias for a contact.
* *
* @param contact The contact * @param contact The contact
* @param alias The alias to set, or NULL to unset * @param alias The alias to set, or NULL to unset
* *
* @deprecated Use purple_blist_alias_contact() instead. * @deprecated Use purple_blist_alias_contact() instead.
*/ */
void purple_contact_set_alias(PurpleContact *contact, const char *alias); void purple_contact_set_alias(PurpleContact *contact, const char *alias);
#endif #endif
 End of changes. 7 change blocks. 
8 lines changed or deleted 12 lines changed or added


 buddyicon.h   buddyicon.h 
skipping to change at line 339 skipping to change at line 339
* to unset the custom icon. * to unset the custom icon.
* *
* @return The icon that was set. The caller does NOT own a reference to th is, * @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. * and must call purple_imgstore_ref() if it wants one.
* @since 2.5.0 * @since 2.5.0
*/ */
PurpleStoredImage * PurpleStoredImage *
purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node, purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
const gchar *filename); const gchar *filename);
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_BUDDYICON_C_)
/** /**
* PurpleContact version of purple_buddy_icons_node_has_custom_icon. * PurpleContact version of purple_buddy_icons_node_has_custom_icon.
* *
* @copydoc 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. * @deprecated Use purple_buddy_icons_node_has_custom_icon instead.
*/ */
gboolean gboolean
purple_buddy_icons_has_custom_icon(PurpleContact *contact); purple_buddy_icons_has_custom_icon(PurpleContact *contact);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 cmds.h   cmds.h 
skipping to change at line 41 skipping to change at line 41
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
/** The possible results of running a command with purple_cmd_do_command(). */ /** 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. /** 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 * 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 * unusual cases, you might want to have several functions called for a
* particular command; in this case, they should return * particular command; in this case, they should return
* #PURPLE_CMD_RET_CONTINUE to cause the core to fall through to other * #PURPLE_CMD_RET_CONTINUE to cause the core to fall through to other
* commands with the same name. * 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 wi th 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(). /** A function implementing a command, as passed to purple_cmd_register().
* *
* @todo document the arguments to these functions. * @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);
skipping to change at line 79 skipping to change at line 79
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,
PURPLE_CMD_P_VERY_HIGH = 6000, PURPLE_CMD_P_VERY_HIGH = 6000
} PurpleCmdPriority; } PurpleCmdPriority;
/** Flags used to set various properties of commands. Every command should /** Flags used to set various properties of commands. Every command should
* have at least one of #PURPLE_CMD_FLAG_IM and #PURPLE_CMD_FLAG_CHAT set in * have at least one of #PURPLE_CMD_FLAG_IM and #PURPLE_CMD_FLAG_CHAT set in
* order to be even slighly useful. * order to be even slighly useful.
* *
* @see purple_cmd_register * @see purple_cmd_register
*/ */
typedef enum _PurpleCmdFlag { typedef enum _PurpleCmdFlag {
/** Command is usable in IMs. */ /** Command is usable in IMs. */
PURPLE_CMD_FLAG_IM = 0x01, PURPLE_CMD_FLAG_IM = 0x01,
/** Command is usable in multi-user chats. */ /** Command is usable in multi-user chats. */
PURPLE_CMD_FLAG_CHAT = 0x02, PURPLE_CMD_FLAG_CHAT = 0x02,
/** Command is usable only for a particular prpl. */ /** Command is usable only for a particular prpl. */
PURPLE_CMD_FLAG_PRPL_ONLY = 0x04, PURPLE_CMD_FLAG_PRPL_ONLY = 0x04,
/** Incorrect arguments to this command should be accepted anyway. * / /** Incorrect arguments to this command should be accepted anyway. * /
PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08, PURPLE_CMD_FLAG_ALLOW_WRONG_ARGS = 0x08
} PurpleCmdFlag; } PurpleCmdFlag;
/*@}*/ /*@}*/
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** / /************************************************************************** /
/** @name Commands API * / /** @name Commands API * /
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 connection.h   connection.h 
skipping to change at line 47 skipping to change at line 47
{ {
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 */ PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY = 0x0100 /**< Connection suppo rts 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 270 skipping to change at line 270
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** / /************************************************************************** /
/** @name Connection API * / /** @name Connection API * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_)
/** /**
* This function should only be called by purple_account_connect() * This function should only be called by purple_account_connect()
* in account.c. If you're trying to sign on an account, use that * in account.c. If you're trying to sign on an account, use that
* function instead. * function instead.
* *
* Creates a connection to the specified account and either connects * Creates a connection to the specified account and either connects
* or attempts to register a new account. If you are logging in, * or attempts to register a new account. If you are logging in,
* the connection uses the current active status for this account. * the connection uses the current active status for this account.
* So if you want to sign on as "away," for example, you need to * So if you want to sign on as "away," for example, you need to
* have called purple_account_set_status(account, "away"). * have called purple_account_set_status(account, "away").
skipping to change at line 294 skipping to change at line 294
* @param regist Whether we are registering a new account or just * @param regist Whether we are registering a new account or just
* trying to do a normal signon. * trying to do a normal signon.
* @param password The password to use. * @param password The password to use.
* *
* @deprecated As this is internal, we should make it private in 3.0.0. * @deprecated As this is internal, we should make it private in 3.0.0.
*/ */
void purple_connection_new(PurpleAccount *account, gboolean regist, void purple_connection_new(PurpleAccount *account, gboolean regist,
cons t char *password); cons t char *password);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_)
/** /**
* This function should only be called by purple_account_unregister() * This function should only be called by purple_account_unregister()
* in account.c. * in account.c.
* *
* Tries to unregister the account on the server. If the account is not * Tries to unregister the account on the server. If the account is not
* connected, also creates a new connection. * connected, also creates a new connection.
* *
* @param account The account to unregister * @param account The account to unregister
* @param password The password to use. * @param password The password to use.
* @param cb Optional callback to be called when unregistration is complete * @param cb Optional callback to be called when unregistration is complete
* @param user_data user data to pass to the callback * @param user_data user data to pass to the callback
* *
* @deprecated As this is internal, we should make it private in 3.0.0. * @deprecated As this is internal, we should make it private in 3.0.0.
*/ */
void purple_connection_new_unregister(PurpleAccount *account, const char *p assword, PurpleAccountUnregistrationCb cb, void *user_data); void purple_connection_new_unregister(PurpleAccount *account, const char *p assword, PurpleAccountUnregistrationCb cb, void *user_data);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_CONNECTION_C_)
/** /**
* Disconnects and destroys a PurpleConnection. * Disconnects and destroys a PurpleConnection.
* *
* This function should only be called by purple_account_disconnect() * This function should only be called by purple_account_disconnect()
* in account.c. If you're trying to sign off an account, use that * in account.c. If you're trying to sign off an account, use that
* function instead. * function instead.
* *
* @param gc The purple connection to destroy. * @param gc The purple connection to destroy.
* *
* @deprecated As this is internal, we should make it private in 3.0.0. * @deprecated As this is internal, we should make it private in 3.0.0.
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 conversation.h   conversation.h 
skipping to change at line 86 skipping to change at line 86
* XXX These need to go when we implement a more generic core/UI eve nt * XXX These need to go when we implement a more generic core/UI eve nt
* system. * system.
*/ */
PURPLE_CONV_ACCOUNT_ONLINE, /**< One of the user's accounts went on line. */ PURPLE_CONV_ACCOUNT_ONLINE, /**< One of the user's accounts went on line. */
PURPLE_CONV_ACCOUNT_OFFLINE, /**< One of the user's accounts went of fline. */ PURPLE_CONV_ACCOUNT_OFFLINE, /**< One of the user's accounts went of fline. */
PURPLE_CONV_UPDATE_AWAY, /**< The other user went away. */ PURPLE_CONV_UPDATE_AWAY, /**< The other user went away. */
PURPLE_CONV_UPDATE_ICON, /**< The other user's buddy icon change d. */ PURPLE_CONV_UPDATE_ICON, /**< The other user's buddy icon change d. */
PURPLE_CONV_UPDATE_TITLE, PURPLE_CONV_UPDATE_TITLE,
PURPLE_CONV_UPDATE_CHATLEFT, PURPLE_CONV_UPDATE_CHATLEFT,
PURPLE_CONV_UPDATE_FEATURES, /**< The features for a chat have chang ed */ PURPLE_CONV_UPDATE_FEATURES /**< The features for a chat have chang ed */
} PurpleConvUpdateType; } PurpleConvUpdateType;
/** /**
* The typing state of a user. * The typing state of a user.
*/ */
typedef enum typedef enum
{ {
PURPLE_NOT_TYPING = 0, /**< Not typing. */ PURPLE_NOT_TYPING = 0, /**< Not typing. */
PURPLE_TYPING, /**< Currently typing. */ PURPLE_TYPING, /**< Currently typing. */
skipping to change at line 128 skipping to change at line 128
PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. * / PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. * /
PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. * / PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. * /
PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. * / PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. * /
PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. * / PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. * /
PURPLE_MESSAGE_RAW = 0x0800, /**< "Raw" message - don't PURPLE_MESSAGE_RAW = 0x0800, /**< "Raw" message - don't
apply formatting */ apply formatting */
PURPLE_MESSAGE_IMAGES = 0x1000, /**< Message contains images * / PURPLE_MESSAGE_IMAGES = 0x1000, /**< Message contains images * /
PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */ PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */
PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto - PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto -
linkified @since 2.1.0 */ linkified @since 2.1.0 */
PURPLE_MESSAGE_INVISIBLE = 0x8000, /**< Message should not be disp layed */ PURPLE_MESSAGE_INVISIBLE = 0x8000 /**< Message should not be disp layed */
} PurpleMessageFlags; } PurpleMessageFlags;
/** /**
* Flags applicable to users in Chats. * Flags applicable to users in Chats.
*/ */
typedef enum typedef enum
{ {
PURPLE_CBFLAGS_NONE = 0x0000, /**< No flags */ PURPLE_CBFLAGS_NONE = 0x0000, /**< No flags */
PURPLE_CBFLAGS_VOICE = 0x0001, /**< Voiced user or "Particip ant" */ PURPLE_CBFLAGS_VOICE = 0x0001, /**< Voiced user or "Particip ant" */
PURPLE_CBFLAGS_HALFOP = 0x0002, /**< Half-op */ PURPLE_CBFLAGS_HALFOP = 0x0002, /**< Half-op */
PURPLE_CBFLAGS_OP = 0x0004, /**< Channel Op or Moderator */ PURPLE_CBFLAGS_OP = 0x0004, /**< Channel Op or Moderator */
PURPLE_CBFLAGS_FOUNDER = 0x0008, /**< Channel Founder */ PURPLE_CBFLAGS_FOUNDER = 0x0008, /**< Channel Founder */
PURPLE_CBFLAGS_TYPING = 0x0010, /**< Currently typing */ PURPLE_CBFLAGS_TYPING = 0x0010 /**< Currently typing */
} PurpleConvChatBuddyFlags; } PurpleConvChatBuddyFlags;
#include "account.h" #include "account.h"
#include "buddyicon.h" #include "buddyicon.h"
#include "log.h" #include "log.h"
#include "server.h" #include "server.h"
/** /**
* Conversation operations and events. * Conversation operations and events.
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 gtkconv.h   gtkconv.h 
skipping to change at line 146 skipping to change at line 146
*/ */
gboolean entry_growing; /* True if the size of the entry was set gboolean entry_growing; /* True if the size of the entry was set
* automatically by typing too much to fit * automatically by typing too much to fit
* in one line */ * in one line */
GtkWidget *close; /* "x" on the tab */ GtkWidget *close; /* "x" on the tab */
GtkWidget *icon; GtkWidget *icon;
GtkWidget *tab_label; GtkWidget *tab_label;
GtkWidget *menu_icon; GtkWidget *menu_icon;
GtkWidget *menu_label; GtkWidget *menu_label;
#ifndef PIDGIN_DISABLE_DEPRECATED #if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKCONV_C_)
/** @deprecated */ /** @deprecated */
GtkSizeGroup *sg; GtkSizeGroup *sg;
#else #else
gpointer depr1; gpointer depr1;
#endif #endif
GtkWidget *lower_hbox; GtkWidget *lower_hbox;
GtkWidget *toolbar; GtkWidget *toolbar;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 gtkdialogs.h   gtkdialogs.h 
skipping to change at line 41 skipping to change at line 41
#include "conversation.h" #include "conversation.h"
/* Functions in gtkdialogs.c (these should actually stay in this file) */ /* Functions in gtkdialogs.c (these should actually stay in this file) */
void pidgin_dialogs_destroy_all(void); void pidgin_dialogs_destroy_all(void);
void pidgin_dialogs_about(void); void pidgin_dialogs_about(void);
void pidgin_dialogs_im(void); void pidgin_dialogs_im(void);
void pidgin_dialogs_im_with_user(PurpleAccount *, const char *); void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
void pidgin_dialogs_info(void); void pidgin_dialogs_info(void);
void pidgin_dialogs_log(void); void pidgin_dialogs_log(void);
#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKDIALOGS_C_)
/** /**
* @deprecated This function is no longer used and will be removed in * @deprecated This function is no longer used and will be removed in
* Pidgin 3.0.0 unless there is sufficient demand to keep it. * Pidgin 3.0.0 unless there is sufficient demand to keep it.
*/ */
void pidgin_dialogs_alias_contact(PurpleContact *); void pidgin_dialogs_alias_contact(PurpleContact *);
#endif
void pidgin_dialogs_alias_buddy(PurpleBuddy *); void pidgin_dialogs_alias_buddy(PurpleBuddy *);
void pidgin_dialogs_alias_chat(PurpleChat *); void pidgin_dialogs_alias_chat(PurpleChat *);
void pidgin_dialogs_remove_buddy(PurpleBuddy *); void pidgin_dialogs_remove_buddy(PurpleBuddy *);
void pidgin_dialogs_remove_group(PurpleGroup *); void pidgin_dialogs_remove_group(PurpleGroup *);
void pidgin_dialogs_remove_chat(PurpleChat *); void pidgin_dialogs_remove_chat(PurpleChat *);
void pidgin_dialogs_remove_contact(PurpleContact *); void pidgin_dialogs_remove_contact(PurpleContact *);
void pidgin_dialogs_merge_groups(PurpleGroup *, const char *); void pidgin_dialogs_merge_groups(PurpleGroup *, const char *);
/* Everything after this should probably be moved elsewhere */ /* Everything after this should probably be moved elsewhere */
#ifndef PIDGIN_DISABLE_DEPRECATED #ifndef PIDGIN_DISABLE_DEPRECATED
/* This PIDGIN_DISABLE_DEPRECATED doesn't need to be deactivated by
* _PIDGIN_GTKDIALOGS_C_, because it shouldn't be using this macro. */
#define PIDGIN_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \ #define PIDGIN_DIALOG(x) x = gtk_window_new(GTK_WINDOW_TOPLEVEL); \
gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_T YPE_HINT_DIALOG) gtk_window_set_type_hint(GTK_WINDOW(x), GDK_WINDOW_T YPE_HINT_DIALOG)
#endif #endif
#define PIDGIN_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->win dow) & GDK_WINDOW_STATE_ICONIFIED) #define PIDGIN_WINDOW_ICONIFIED(x) (gdk_window_get_state(GTK_WIDGET(x)->win dow) & GDK_WINDOW_STATE_ICONIFIED)
#endif /* _PIDGINDIALOGS_H_ */ #endif /* _PIDGINDIALOGS_H_ */
 End of changes. 4 change blocks. 
0 lines changed or deleted 5 lines changed or added


 gtkimhtml.h   gtkimhtml.h 
skipping to change at line 133 skipping to change at line 133
gboolean underline:1; gboolean underline:1;
gboolean strike:1; gboolean strike:1;
gchar *forecolor; gchar *forecolor;
gchar *backcolor; gchar *backcolor;
gchar *background; gchar *background;
gchar *fontface; gchar *fontface;
int fontsize; int fontsize;
GtkTextTag *link; GtkTextTag *link;
} edit; } edit;
#ifndef PIDGIN_DISABLE_DEPRECATED #if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKIMHTML_C_)
/** @deprecated */ /** @deprecated */
char *clipboard_text_string; char *clipboard_text_string;
/** @deprecated */ /** @deprecated */
char *clipboard_html_string; char *clipboard_html_string;
#else #else
char *depr1; char *depr1;
char *depr2; char *depr2;
#endif #endif
GSList *im_images; GSList *im_images;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 #if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKUTILS_C_)
/** /**
* 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() * @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);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 network.h   network.h 
skipping to change at line 109 skipping to change at line 109
* *
* @note The returned string is a pointer to a static buffer. If this * @note The returned string is a pointer to a static buffer. If this
* function is called twice, it may be important to make a copy * function is called twice, it may be important to make a copy
* of the returned string. * of the returned string.
* *
* @param fd The fd to use to help figure out the IP, or -1. * @param fd The fd to use to help figure out the IP, or -1.
* @return The local IP address to be used. * @return The local IP address to be used.
*/ */
const char *purple_network_get_my_ip(int fd); const char *purple_network_get_my_ip(int fd);
#ifndef PURPLE_DISABLE_DEPRECATED
/** /**
* Should calls to purple_network_listen() and purple_network_listen_range( ) * Should calls to purple_network_listen() and purple_network_listen_range( )
* map the port externally using NAT-PMP or UPnP? * map the port externally using NAT-PMP or UPnP?
* The default value is TRUE * The default value is TRUE
* *
* @param map_external Should the open port be mapped externally? * @param map_external Should the open port be mapped externally?
* @deprecated In 3.0.0 a boolean will be added to the above functions to * @deprecated In 3.0.0 a boolean will be added to the above functions to
* perform the same function. * perform the same function.
* @since 2.3.0 * @since 2.3.0
*/ */
void purple_network_listen_map_external(gboolean map_external); void purple_network_listen_map_external(gboolean map_external);
#endif
/** /**
* Attempts to open a listening port ONLY on the specified port number. * Attempts to open a listening port ONLY on the specified port number.
* You probably want to use purple_network_listen_range() instead of this. * You probably want to use purple_network_listen_range() instead of this.
* This function is useful, for example, if you wanted to write a telnet * This function is useful, for example, if you wanted to write a telnet
* server as a Purple plugin, and you HAD to listen on port 23. Why anyone * server as a Purple plugin, and you HAD to listen on port 23. Why anyone
* would want to do that is beyond me. * would want to do that is beyond me.
* *
* This opens a listening port. The caller will want to set up a watcher * This opens a listening port. The caller will want to set up a watcher
* of type PURPLE_INPUT_READ on the fd returned in cb. It will probably cal l * of type PURPLE_INPUT_READ on the fd returned in cb. It will probably cal l
skipping to change at line 206 skipping to change at line 204
* Gets a port number from a file descriptor. * Gets a port number from a file descriptor.
* *
* @param fd The file descriptor. This should be a tcp socket. The current * @param fd The file descriptor. This should be a tcp socket. The current
* implementation probably dies on anything but IPv4. Perhaps thi s * implementation probably dies on anything but IPv4. Perhaps thi s
* possible bug will inspire new and valuable contributors to Pur ple. * possible bug will inspire new and valuable contributors to Pur ple.
* @return The port number, in host byte order. * @return The port number, in host byte order.
*/ */
unsigned short purple_network_get_port_from_fd(int fd); unsigned short purple_network_get_port_from_fd(int fd);
/** /**
* Detects if there is an available Internet connection. Note that this cal * Detects if there is an available network connection.
l
* could block for the amount of time specified in inet_detect_timeout, so
* using it in a UI thread may cause uncomfortableness
* *
* @return TRUE if the Internet is available * @return TRUE if the network is available
*/ */
gboolean purple_network_is_available(void); gboolean purple_network_is_available(void);
/** /**
* Get the handle for the network system * Get the handle for the network system
* *
* @return the handle to the network system * @return the handle to the network system
*/ */
void *purple_network_get_handle(void); void *purple_network_get_handle(void);
 End of changes. 4 change blocks. 
7 lines changed or deleted 2 lines changed or added


 notify.h   notify.h 
skipping to change at line 229 skipping to change at line 229
* @param data Data returned by the purple_notify_searchresults(). * @param data Data returned by the purple_notify_searchresults().
*/ */
void purple_notify_searchresults_new_rows(PurpleConnection *gc, void purple_notify_searchresults_new_rows(PurpleConnection *gc,
PurpleNotifySearchResults *results, PurpleNotifySearchResults *results,
void *data); void *data);
/** /**
* Adds a stock button that will be displayed in the search results dialog. * Adds a stock button that will be displayed in the search results dialog.
* *
* @param results The search results object. * @param results The search results object.
* @param type Type of the button. (TODO: Only one button of a given typ * @param type Type of the button. (TODO: Only one button of a given typ
e can be displayed.) e
* can be displayed.)
* @param cb Function that will be called on the click event. * @param cb Function that will be called on the click event.
*/ */
void purple_notify_searchresults_button_add(PurpleNotifySearchResults *resu lts, void purple_notify_searchresults_button_add(PurpleNotifySearchResults *resu lts,
PurpleNotifySearchButtonType type, PurpleNotifySearchButtonType type,
PurpleNotifySearchResultsCallback cb); PurpleNotifySearchResultsCallback cb);
/** /**
* Adds a plain labelled button that will be displayed in the search result * Adds a plain labelled button that will be displayed in the search result
s dialog. s
* dialog.
* *
* @param results The search results object * @param results The search results object
* @param label The label to display * @param label The label to display
* @param cb Function that will be called on the click event * @param cb Function that will be called on the click event
*/ */
void purple_notify_searchresults_button_add_labeled(PurpleNotifySearchResul ts *results, void purple_notify_searchresults_button_add_labeled(PurpleNotifySearchResul ts *results,
const char *label, const char *label,
PurpleNotifySearchResults Callback cb); PurpleNotifySearchResults Callback cb);
/** /**
skipping to change at line 280 skipping to change at line 282
PurpleNotifySearchColumn *column); PurpleNotifySearchColumn *column);
/** /**
* Adds a new row of the results to the search results object. * Adds a new row of the results to the search results object.
* *
* @param results The search results object. * @param results The search results object.
* @param row The row of the results. * @param row The row of the results.
*/ */
void purple_notify_searchresults_row_add(PurpleNotifySearchResults *results , void purple_notify_searchresults_row_add(PurpleNotifySearchResults *results ,
G List *row); G List *row);
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_NOTIFY_C_)
/** /**
* Returns a number of the rows in the search results object. * Returns a number of the rows in the search results object.
* *
* @deprecated This function will be removed in Pidgin 3.0.0 unless * @deprecated This function will be removed in Pidgin 3.0.0 unless
* there is sufficient demand to keep it. Using this * there is sufficient demand to keep it. Using this
* function encourages looping through the results * function encourages looping through the results
* inefficiently. Instead of using this function you * inefficiently. Instead of using this function you
* should iterate through the results using a loop * should iterate through the results using a loop
* similar to this: * similar to this:
* for (l = results->rows; l != NULL; l = l->next) * for (l = results->rows; l != NULL; l = l->next)
* If you really need to get the number of rows you * If you really need to get the number of rows you
* can use g_list_length(results->rows). * can use g_list_length(results->rows).
* *
* @param results The search results object. * @param results The search results object.
* *
* @return Number of the result rows. * @return Number of the result rows.
*/ */
guint purple_notify_searchresults_get_rows_count(PurpleNotifySearchResults *results); guint purple_notify_searchresults_get_rows_count(PurpleNotifySearchResults *results);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_NOTIFY_C_)
/** /**
* Returns a number of the columns in the search results object. * Returns a number of the columns in the search results object.
* *
* @deprecated This function will be removed in Pidgin 3.0.0 unless * @deprecated This function will be removed in Pidgin 3.0.0 unless
* there is sufficient demand to keep it. Using this * there is sufficient demand to keep it. Using this
* function encourages looping through the columns * function encourages looping through the columns
* inefficiently. Instead of using this function you * inefficiently. Instead of using this function you
* should iterate through the columns using a loop * should iterate through the columns using a loop
* similar to this: * similar to this:
* for (l = results->columns; l != NULL; l = l->next) * for (l = results->columns; l != NULL; l = l->next)
* If you really need to get the number of columns you * If you really need to get the number of columns you
* can use g_list_length(results->columns). * can use g_list_length(results->columns).
* *
* @param results The search results object. * @param results The search results object.
* *
* @return Number of the columns. * @return Number of the columns.
*/ */
guint purple_notify_searchresults_get_columns_count(PurpleNotifySearchResul ts *results); guint purple_notify_searchresults_get_columns_count(PurpleNotifySearchResul ts *results);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_NOTIFY_C_)
/** /**
* Returns a row of the results from the search results object. * Returns a row of the results from the search results object.
* *
* @deprecated This function will be removed in Pidgin 3.0.0 unless * @deprecated This function will be removed in Pidgin 3.0.0 unless
* there is sufficient demand to keep it. Using this * there is sufficient demand to keep it. Using this
* function encourages looping through the results * function encourages looping through the results
* inefficiently. Instead of using this function you * inefficiently. Instead of using this function you
* should iterate through the results using a loop * should iterate through the results using a loop
* similar to this: * similar to this:
* for (l = results->rows; l != NULL; l = l->next) * for (l = results->rows; l != NULL; l = l->next)
skipping to change at line 345 skipping to change at line 347
* *
* @param results The search results object. * @param results The search results object.
* @param row_id Index of the row to be returned. * @param row_id Index of the row to be returned.
* *
* @return Row of the results. * @return Row of the results.
*/ */
GList *purple_notify_searchresults_row_get(PurpleNotifySearchResults *resul ts, GList *purple_notify_searchresults_row_get(PurpleNotifySearchResults *resul ts,
unsigned int row_id); unsigned int row_id);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_NOTIFY_C_)
/** /**
* Returns a title of the search results object's column. * Returns a title of the search results object's column.
* *
* @deprecated This function will be removed in Pidgin 3.0.0 unless * @deprecated This function will be removed in Pidgin 3.0.0 unless
* there is sufficient demand to keep it. Using this * there is sufficient demand to keep it. Using this
* function encourages looping through the columns * function encourages looping through the columns
* inefficiently. Instead of using this function you * inefficiently. Instead of using this function you
* should iterate through the name of a particular * should iterate through the name of a particular
* column you can use * column you can use
* g_list_nth_data(results->columns, row_id). * g_list_nth_data(results->columns, row_id).
skipping to change at line 461 skipping to change at line 463
const char *primary, const char *secondary, const char *primary, const char *secondary,
const char *text, Pu rpleNotifyCloseCallback cb, gpointer user_data); const char *text, Pu rpleNotifyCloseCallback cb, gpointer user_data);
/** /**
* Displays user information with formatted text, passing information givin g * Displays user information with formatted text, passing information givin g
* the connection and username from which the user information came. * the connection and username from which the user information came.
* *
* The text is essentially a stripped-down format of HTML, the same that * The text is essentially a stripped-down format of HTML, the same that
* IMs may send. * IMs may send.
* *
* @param gc The PurpleConnection handle associated with * @param gc The PurpleConnection handle associated with the inform
the information. ation.
* @param who The username associated with the in * @param who The username associated with the information.
formation. * @param user_info The PurpleNotifyUserInfo which contains the informatio
* @param user_info The PurpleNotifyUserInfo which contains the in n
formation * @param cb The callback to call when the user closes the notifica
* @param cb The callback to call when the user closes tion.
* 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_userinfo(PurpleConnection *gc, const char *who, void *purple_notify_userinfo(PurpleConnection *gc, const char *who,
PurpleNotifyUserInfo *use r_info, PurpleNotifyCloseCallback cb, PurpleNotifyUserInfo *use r_info, PurpleNotifyCloseCallback cb,
gpointer user_data); gpointer user_data);
/** /**
* Create a new PurpleNotifyUserInfo which is suitable for passing to purpl * Create a new PurpleNotifyUserInfo which is suitable for passing to
e_notify_userinfo() * purple_notify_userinfo()
* *
* @return A new PurpleNotifyUserInfo, which the caller must destroy when d one * @return A new PurpleNotifyUserInfo, which the caller must destroy when done
*/ */
PurpleNotifyUserInfo *purple_notify_user_info_new(void); PurpleNotifyUserInfo *purple_notify_user_info_new(void);
/** /**
* Destroy a PurpleNotifyUserInfo * Destroy a PurpleNotifyUserInfo
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
*/ */
void purple_notify_user_info_destroy(PurpleNotifyUserInfo *user_info); void purple_notify_user_info_destroy(PurpleNotifyUserInfo *user_info);
/** /**
* Retrieve the array of PurpleNotifyUserInfoEntry objects from a PurpleNot * Retrieve the array of PurpleNotifyUserInfoEntry objects from a
ifyUserInfo * PurpleNotifyUserInfo
* *
* This GList may be manipulated directly with normal GList functions such * This GList may be manipulated directly with normal GList functions such
as g_list_insert(). Only * as g_list_insert(). Only PurpleNotifyUserInfoEntry are allowed in the
* PurpleNotifyUserInfoEntry are allowed in the list. If a PurpleNotifyUse * list. If a PurpleNotifyUserInfoEntry item is added to the list, it
rInfoEntry item is added to the list, * should not be g_free()'d by the caller; PurpleNotifyUserInfo will g_free
* it should not be g_free()'d by the caller; PurpleNotifyUserInfo will g_f * it when destroyed.
ree it when destroyed.
* *
* To remove a PurpleNotifyUserInfoEntry, use purple_notify_user_info_remov * To remove a PurpleNotifyUserInfoEntry, use
e_entry(). Do not use the GList directly. * purple_notify_user_info_remove_entry(). Do not use the GList directly.
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
* *
* @constreturn A GList of PurpleNotifyUserInfoEntry objects * @constreturn A GList of PurpleNotifyUserInfoEntry objects
*/ */
GList *purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info) ; GList *purple_notify_user_info_get_entries(PurpleNotifyUserInfo *user_info) ;
/** /**
* Create a textual representation of a PurpleNotifyUserInfo, separating en * Create a textual representation of a PurpleNotifyUserInfo, separating
tries with newline * entries with newline
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
* @param newline The separation character * @param newline The separation character
*/ */
char *purple_notify_user_info_get_text_with_newline(PurpleNotifyUserInfo *u ser_info, const char *newline); char *purple_notify_user_info_get_text_with_newline(PurpleNotifyUserInfo *u ser_info, const char *newline);
/** /**
* Add a label/value pair to a PurpleNotifyUserInfo object. * Add a label/value pair to a PurpleNotifyUserInfo object.
* PurpleNotifyUserInfo keeps track of the order in which pairs are added. * PurpleNotifyUserInfo keeps track of the order in which pairs are added.
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
* @param label A label, which for example might be displayed * @param label A label, which for example might be displayed by a
by a UI with a colon after it ("Status:"). Do not include a colon. * UI with a colon after it ("Status:"). Do not include
* If NULL, value will be displayed without a lab * a colon. If NULL, value will be displayed without a
el. * label.
* @param value The value, which might be displayed by a UI af * @param value The value, which might be displayed by a UI after
ter the label. * the label. If NULL, label will still be displayed;
* If NULL, label will still be displayed; the UI * the UI should then treat label as independent and not
should then treat label as independent * include a colon if it would otherwise.
* and not include a colon if it would otherwise.
*/ */
void purple_notify_user_info_add_pair(PurpleNotifyUserInfo *user_info, cons t char *label, const char *value); void purple_notify_user_info_add_pair(PurpleNotifyUserInfo *user_info, cons t char *label, const char *value);
/** /**
* Prepend a label/value pair to a PurpleNotifyUserInfo object * Prepend a label/value pair to a PurpleNotifyUserInfo object
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
* @param label A label, which for example might be displayed * @param label A label, which for example might be displayed by a
by a UI with a colon after it ("Status:"). Do not include a colon. * UI with a colon after it ("Status:"). Do not include
* If NULL, value will be displayed without a lab * a colon. If NULL, value will be displayed without a
el. * label.
* @param value The value, which might be displayed by a UI af * @param value The value, which might be displayed by a UI after
ter the label. * the label. If NULL, label will still be displayed;
* If NULL, label will still be displayed; the UI * the UI should then treat label as independent and not
should then treat label as independent * include a colon if it would otherwise.
* and not include a colon if it would otherwise.
*/ */
void purple_notify_user_info_prepend_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value); void purple_notify_user_info_prepend_pair(PurpleNotifyUserInfo *user_info, const char *label, const char *value);
/** /**
* Remove a PurpleNotifyUserInfoEntry from a PurpleNotifyUserInfo object wi * Remove a PurpleNotifyUserInfoEntry from a PurpleNotifyUserInfo object
thout freeing the entry. * without freeing the entry.
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
* @param user_info_entry The PurpleNotifyUserInfoEntry * @param user_info_entry The PurpleNotifyUserInfoEntry
*/ */
void purple_notify_user_info_remove_entry(PurpleNotifyUserInfo *user_info, PurpleNotifyUserInfoEntry *user_info_entry); void purple_notify_user_info_remove_entry(PurpleNotifyUserInfo *user_info, PurpleNotifyUserInfoEntry *user_info_entry);
/** /**
* Create a new PurpleNotifyUserInfoEntry * Create a new PurpleNotifyUserInfoEntry
* *
* If added to a PurpleNotifyUserInfo object, this should not be free()'d, * If added to a PurpleNotifyUserInfo object, this should not be free()'d,
as PurpleNotifyUserInfo will do so * as PurpleNotifyUserInfo will do so when destroyed.
* when destroyed. purple_notify_user_info_add_pair() and purple_notify_us * purple_notify_user_info_add_pair() and
er_info_prepend_pair() are convenience * purple_notify_user_info_prepend_pair() are convenience methods for
* methods for creating entries and adding them to a PurpleNotifyUserInfo. * creating entries and adding them to a PurpleNotifyUserInfo.
* *
* @param label A label, which for example might be displayed * @param label A label, which for example might be displayed by a UI
by a UI with a colon after it ("Status:"). Do not include a colon. * with a colon after it ("Status:"). Do not include a
* If NULL, value will be displayed without a lab * colon. If NULL, value will be displayed without a label.
el. * @param value The value, which might be displayed by a UI after the
* @param value The value, which might be displayed by a UI af * label. If NULL, label will still be displayed; the UI
ter the label. * should then treat label as independent and not include a
* If NULL, label will still be displayed; the UI * colon if it would otherwise.
should then treat label as independent
* and not include a colon if it would otherwise.
* *
* @result A new PurpleNotifyUserInfoEntry * @result A new PurpleNotifyUserInfoEntry
*/ */
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. * Prepend a section break. A UI might display this as a horizontal line.
* *
* @param user_info The PurpleNotifyUserInfo * @param user_info The PurpleNotifyUserInfo
* @since 2.5.0 * @since 2.5.0
*/ */
void purple_notify_user_info_prepend_section_break(PurpleNotifyUserInfo *us er_info); 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 * Add a section header. A UI might display this in a different font
other text. * 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 * Prepend a section header. A UI might display this in a different font
rom other text. * 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
* @since 2.5.0 * @since 2.5.0
*/ */
void purple_notify_user_info_prepend_section_header(PurpleNotifyUserInfo *u ser_info, const char *label); 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 * Remove the last item which was added to a PurpleNotifyUserInfo. This
ld be used to remove a section header which is not needed. * could 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 * @return The label
*/ */
const gchar *purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEn try *user_info_entry); const gchar *purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEn try *user_info_entry);
/** /**
* Set the label for a PurpleNotifyUserInfoEntry * Set the label for a PurpleNotifyUserInfoEntry
* *
* @param user_info_entry The PurpleNotifyUserInfoEntry * @param user_info_entry The PurpleNotifyUserInfoEntry
* @param label The label * @param label The label
*/ */
void purple_notify_user_info_entry_set_label(PurpleNotifyUserInfoEntry *use r_info_entry, const char *label); void purple_notify_user_info_entry_set_label(PurpleNotifyUserInfoEntry *use r_info_entry, const char *label);
/** /**
* Get the value for a PurpleNotifyUserInfoEntry * Get the value for a PurpleNotifyUserInfoEntry
* *
* @param user_info_entry The PurpleNotifyUserInfoEntry * @param user_info_entry The PurpleNotifyUserInfoEntry
* *
* @result The value * @result The value
*/ */
const gchar *purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEn try *user_info_entry); const gchar *purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEn try *user_info_entry);
/** /**
* Set the value for a PurpleNotifyUserInfoEntry * Set the value for a PurpleNotifyUserInfoEntry
* *
* @param user_info_entry The PurpleNotifyUserInfoEntry * @param user_info_entry The PurpleNotifyUserInfoEntry
* @param value The value * @param value The value
*/ */
void purple_notify_user_info_entry_set_value(PurpleNotifyUserInfoEntry *use r_info_entry, const char *value); void purple_notify_user_info_entry_set_value(PurpleNotifyUserInfoEntry *use r_info_entry, const char *value);
/** /**
* Get the type of a PurpleNotifyUserInfoEntry * Get the type of a PurpleNotifyUserInfoEntry
* *
* @param user_info_entry The PurpleNotifyUserInfoEntry * @param user_info_entry The PurpleNotifyUserInfoEntry
* *
* @result The PurpleNotifyUserInfoEn tryType * @return The PurpleNotifyUserInfoEntryType
*/ */
PurpleNotifyUserInfoEntryType purple_notify_user_info_entry_get_type(Purple NotifyUserInfoEntry *user_info_entry); PurpleNotifyUserInfoEntryType purple_notify_user_info_entry_get_type(Purple NotifyUserInfoEntry *user_info_entry);
/** /**
* Set the type of a PurpleNotifyUserInfoEntry * Set the type of a PurpleNotifyUserInfoEntry
* *
* @param user_info_entry The PurpleNotifyUserInfoEntry * @param user_info_entry The PurpleNotifyUserInfoEntry
* @param type The PurpleNotifyUserInfoEntryType * @param type The PurpleNotifyUserInfoEntryType
*/ */
void purple_notify_user_info_entry_set_type(PurpleNotifyUserInfoEntry *user _info_entry, void purple_notify_user_info_entry_set_type(PurpleNotifyUserInfoEntry *user _info_entry,
PurpleNotifyUserInfoEntryType type); PurpleNotifyUserInfoEntryType type);
/** /**
* Opens a URI or somehow presents it to the user. * Opens a URI or somehow presents it to the user.
* *
* @param handle The plugin or connection handle. * @param handle The plugin or connection handle.
* @param uri The URI to display or go to. * @param uri The URI to display or go to.
* *
 End of changes. 41 change blocks. 
100 lines changed or deleted 97 lines changed or added


 pidginstock.h   pidginstock.h 
skipping to change at line 52 skipping to change at line 52
#define PIDGIN_STOCK_DISCONNECT "pidgin-disconnect" #define PIDGIN_STOCK_DISCONNECT "pidgin-disconnect"
#define PIDGIN_STOCK_DOWNLOAD "pidgin-download" #define PIDGIN_STOCK_DOWNLOAD "pidgin-download"
#define PIDGIN_STOCK_EDIT "pidgin-edit" #define PIDGIN_STOCK_EDIT "pidgin-edit"
#define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor" #define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor"
#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-canceled" #define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-canceled"
#define PIDGIN_STOCK_FILE_DONE "pidgin-file-done" #define PIDGIN_STOCK_FILE_DONE "pidgin-file-done"
#define PIDGIN_STOCK_IGNORE "pidgin-ignore" #define PIDGIN_STOCK_IGNORE "pidgin-ignore"
#define PIDGIN_STOCK_INFO "pidgin-info" #define PIDGIN_STOCK_INFO "pidgin-info"
#define PIDGIN_STOCK_INVITE "pidgin-invite" #define PIDGIN_STOCK_INVITE "pidgin-invite"
#define PIDGIN_STOCK_MODIFY "pidgin-modify" #define PIDGIN_STOCK_MODIFY "pidgin-modify"
#define PIDGIN_STOCK_ADD "pidgin-add"
#define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail" #define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail"
#define PIDGIN_STOCK_PAUSE "pidgin-pause" #define PIDGIN_STOCK_PAUSE "pidgin-pause"
#define PIDGIN_STOCK_POUNCE "pidgin-pounce" #define PIDGIN_STOCK_POUNCE "pidgin-pounce"
#define PIDGIN_STOCK_SIGN_OFF "pidgin-sign-off" #define PIDGIN_STOCK_SIGN_OFF "pidgin-sign-off"
#define PIDGIN_STOCK_SIGN_ON "pidgin-sign-on" #define PIDGIN_STOCK_SIGN_ON "pidgin-sign-on"
#define PIDGIN_STOCK_TEXT_NORMAL "pidgin-text-normal" #define PIDGIN_STOCK_TEXT_NORMAL "pidgin-text-normal"
#define PIDGIN_STOCK_TYPED "pidgin-typed" #define PIDGIN_STOCK_TYPED "pidgin-typed"
#define PIDGIN_STOCK_UPLOAD "pidgin-upload" #define PIDGIN_STOCK_UPLOAD "pidgin-upload"
/* Status icons */ /* Status icons */
 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 533 skipping to change at line 533
*/ */
void purple_plugins_probe(const char *ext); void purple_plugins_probe(const char *ext);
/** /**
* Returns whether or not plugin support is enabled. * Returns whether or not plugin support is enabled.
* *
* @return TRUE if plugin support is enabled, or FALSE otherwise. * @return TRUE if plugin support is enabled, or FALSE otherwise.
*/ */
gboolean purple_plugins_enabled(void); gboolean purple_plugins_enabled(void);
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PLUGIN_C_)
/** /**
* Registers a function that will be called when probing is finished. * Registers a function that will be called when probing is finished.
* *
* @param func The callback function. * @param func The callback function.
* @param data Data to pass to the callback. * @param data Data to pass to the callback.
* @deprecated If you need this, ask for a plugin-probe signal to be added. * @deprecated If you need this, ask for a plugin-probe signal to be added.
*/ */
void purple_plugins_register_probe_notify_cb(void (*func)(void *), void *da ta); void purple_plugins_register_probe_notify_cb(void (*func)(void *), void *da ta);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PLUGIN_C_)
/** /**
* Unregisters a function that would be called when probing is finished. * Unregisters a function that would be called when probing is finished.
* *
* @param func The callback function. * @param func The callback function.
* @deprecated If you need this, ask for a plugin-probe signal to be added. * @deprecated If you need this, ask for a plugin-probe signal to be added.
*/ */
void purple_plugins_unregister_probe_notify_cb(void (*func)(void *)); void purple_plugins_unregister_probe_notify_cb(void (*func)(void *));
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PLUGIN_C_)
/** /**
* Registers a function that will be called when a plugin is loaded. * Registers a function that will be called when a plugin is loaded.
* *
* @param func The callback function. * @param func The callback function.
* @param data Data to pass to the callback. * @param data Data to pass to the callback.
* @deprecated Use the plugin-load signal instead. * @deprecated Use the plugin-load signal instead.
*/ */
void purple_plugins_register_load_notify_cb(void (*func)(PurplePlugin *, vo id *), void purple_plugins_register_load_notify_cb(void (*func)(PurplePlugin *, vo id *),
void *data); void *data);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PLUGIN_C_)
/** /**
* Unregisters a function that would be called when a plugin is loaded. * Unregisters a function that would be called when a plugin is loaded.
* *
* @param func The callback function. * @param func The callback function.
* @deprecated Use the plugin-load signal instead. * @deprecated Use the plugin-load signal instead.
*/ */
void purple_plugins_unregister_load_notify_cb(void (*func)(PurplePlugin *, void *)); void purple_plugins_unregister_load_notify_cb(void (*func)(PurplePlugin *, void *));
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PLUGIN_C_)
/** /**
* Registers a function that will be called when a plugin is unloaded. * Registers a function that will be called when a plugin is unloaded.
* *
* @param func The callback function. * @param func The callback function.
* @param data Data to pass to the callback. * @param data Data to pass to the callback.
* @deprecated Use the plugin-unload signal instead. * @deprecated Use the plugin-unload signal instead.
*/ */
void purple_plugins_register_unload_notify_cb(void (*func)(PurplePlugin *, void *), void purple_plugins_register_unload_notify_cb(void (*func)(PurplePlugin *, void *),
void *data); void *data);
#endif #endif
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PLUGIN_C_)
/** /**
* Unregisters a function that would be called when a plugin is unloaded. * Unregisters a function that would be called when a plugin is unloaded.
* *
* @param func The callback function. * @param func The callback function.
* @deprecated Use the plugin-unload signal instead. * @deprecated Use the plugin-unload signal instead.
*/ */
void purple_plugins_unregister_unload_notify_cb(void (*func)(PurplePlugin * , void purple_plugins_unregister_unload_notify_cb(void (*func)(PurplePlugin * ,
void *)); void *));
#endif #endif
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 prpl.h   prpl.h 
skipping to change at line 190 skipping to change at line 190
* *
* Gadu-Gadu doesn't need a screenname to register new account. * Gadu-Gadu doesn't need a screenname to register new account.
*/ */
OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200, OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200,
/** /**
* Indicates that slash commands are native to this protocol. * Indicates that slash commands are native to this protocol.
* Used as a hint that unknown commands should not be sent as messag es. * Used as a hint that unknown commands should not be sent as messag es.
* @since 2.1.0 * @since 2.1.0
*/ */
OPT_PROTO_SLASH_COMMANDS_NATIVE = 0x00000400, OPT_PROTO_SLASH_COMMANDS_NATIVE = 0x00000400
} PurpleProtocolOptions; } PurpleProtocolOptions;
/** /**
* A protocol plugin information structure. * A protocol plugin information structure.
* *
* Every protocol plugin initializes this structure. It is the gateway * Every protocol plugin initializes this structure. It is the gateway
* between purple and the protocol plugin. Many of these callbacks can be * between purple and the protocol plugin. Many of these callbacks can be
* NULL. If a callback must be implemented, it has a comment indicating so . * NULL. If a callback must be implemented, it has a comment indicating so .
*/ */
skipping to change at line 275 skipping to change at line 275
* PRPL is unable to send the message for another reason, return * PRPL is unable to send the message for another reason, return
* some other negative value. You can use one of the valid * some other negative value. You can use one of the valid
* errno values, or just big something. If the message should * errno values, or just big something. If the message should
* not be echoed to the conversation window, return 0. * not be echoed to the conversation window, return 0.
*/ */
int (*send_im)(PurpleConnection *, const char *who, int (*send_im)(PurpleConnection *, const char *who,
const char *message, const char *message,
PurpleMessageFlags flags); PurpleMessageFlags flags);
void (*set_info)(PurpleConnection *, const char *info); void (*set_info)(PurpleConnection *, const char *info);
/**
* @return If this protocol requires the PURPLE_TYPING message to
* be sent repeatedly to signify that the user is still
* typing, then the PRPL should return the number of
* seconds to wait before sending a subsequent notification.
* Otherwise the PRPL should return 0.
*/
unsigned int (*send_typing)(PurpleConnection *, const char *name, Pu rpleTypingState state); unsigned int (*send_typing)(PurpleConnection *, const char *name, Pu rpleTypingState state);
/** /**
* Should arrange for purple_notify_userinfo() to be called with * Should arrange for purple_notify_userinfo() to be called with
* @a who's user info. * @a who's user info.
*/ */
void (*get_info)(PurpleConnection *, const char *who); void (*get_info)(PurpleConnection *, const char *who);
void (*set_status)(PurpleAccount *account, PurpleStatus *status); void (*set_status)(PurpleAccount *account, PurpleStatus *status);
void (*set_idle)(PurpleConnection *, int idletime); void (*set_idle)(PurpleConnection *, int idletime);
void (*change_passwd)(PurpleConnection *, const char *old_pass, void (*change_passwd)(PurpleConnection *, const char *old_pass,
const char *new_pass); const char *new_pass);
skipping to change at line 628 skipping to change at line 637
/** /**
* Notifies Purple that a user's idle state and time have changed. * Notifies Purple that a user's idle state and time have changed.
* *
* This is meant to be called from protocol plugins. * This is meant to be called from protocol plugins.
* *
* @param account The account the user is on. * @param account The account the user is on.
* @param name The screen name of the user. * @param name The screen name of the user.
* @param idle The user's idle state. * @param idle The user's idle state.
* @param idle_time The user's idle time. This is the time at * @param idle_time The user's idle time. This is the time at
* which the user became idle, in seconds since * which the user became idle, in seconds since
* the epoch. * the epoch. If the PRPL does not know this value
* then it should pass 0.
*/ */
void purple_prpl_got_user_idle(PurpleAccount *account, const char *name, void purple_prpl_got_user_idle(PurpleAccount *account, const char *name,
gboolean idle, time _t idle_time); gboolean idle, time _t idle_time);
/** /**
* Notifies Purple of a user's log-in time. * Notifies Purple of a user's log-in time.
* *
* This is meant to be called from protocol plugins. * This is meant to be called from protocol plugins.
* *
* @param account The account the user is on. * @param account The account the user is on.
 End of changes. 4 change blocks. 
2 lines changed or deleted 12 lines changed or added


 sslconn.h   sslconn.h 
skipping to change at line 188 skipping to change at line 188
* destroyed for you. * destroyed for you.
* @param data User-defined data. * @param data User-defined data.
* *
* @return The SSL connection handle. * @return The SSL connection handle.
*/ */
PurpleSslConnection *purple_ssl_connect(PurpleAccount *account, const char *host, PurpleSslConnection *purple_ssl_connect(PurpleAccount *account, const char *host,
int port, PurpleSslInputFunction func, int port, PurpleSslInputFunction func,
Purp leSslErrorFunction error_func, Purp leSslErrorFunction error_func,
void *data); void *data);
#ifndef PURPLE_DISABLE_DEPRECATED #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_SSLCONN_C_)
/** /**
* Makes a SSL connection using an already open file descriptor. * Makes a SSL connection using an already open file descriptor.
* *
* @deprecated Use purple_ssl_connect_with_host_fd() instead. * @deprecated Use purple_ssl_connect_with_host_fd() instead.
* *
* @param account The account making the connection. * @param account The account making the connection.
* @param fd The file descriptor. * @param fd The file descriptor.
* @param func The SSL input handler function. * @param func The SSL input handler function.
* @param error_func The SSL error handler function. * @param error_func The SSL error handler function.
* @param data User-defined data. * @param data User-defined data.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 status.h   status.h 
skipping to change at line 826 skipping to change at line 826
void purple_presence_switch_status(PurplePresence *presence, void purple_presence_switch_status(PurplePresence *presence,
const char *status_id); const char *status_id);
/** /**
* Sets the idle state and time on a presence. * Sets the idle state and time on a presence.
* *
* @param presence The presence. * @param presence The presence.
* @param idle The idle state. * @param idle The idle state.
* @param idle_time The idle time, if @a idle is TRUE. This * @param idle_time The idle time, if @a idle is TRUE. This
* is the time at which the user became idle, * is the time at which the user became idle,
* in seconds since the epoch. * in seconds since the epoch. If this value is
* unknown then 0 should be used.
*/ */
void purple_presence_set_idle(PurplePresence *presence, gboolean idle, void purple_presence_set_idle(PurplePresence *presence, gboolean idle,
time_t idle_time); time_t idle_time);
/** /**
* Sets the login time on a presence. * Sets the login time on a presence.
* *
* @param presence The presence. * @param presence The presence.
* @param login_time The login time. * @param login_time The login time.
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 2 lines changed or added


 version.h   version.h 
skipping to change at line 29 skipping to change at line 29
* *
* 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 (5) #define PURPLE_MINOR_VERSION (5)
#define PURPLE_MICRO_VERSION (2) #define PURPLE_MICRO_VERSION (3)
#define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \ #define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \
((y ) < PURPLE_MINOR_VERSION || \ ((y ) < PURPLE_MINOR_VERSION || \
(( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) (( y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION)))
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

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