blist.h   blist.h 
skipping to change at line 475 skipping to change at line 475
/** /**
* Adds a new buddy to the buddy list. * Adds a new buddy to the buddy list.
* *
* The buddy will be inserted right after node or prepended to the * The buddy will be inserted right after node or prepended to the
* group if node is NULL. If both are NULL, the buddy will be added to * group if node is NULL. If both are NULL, the buddy will be added to
* the "Buddies" group. * the "Buddies" group.
* *
* @param buddy The new buddy who gets added * @param buddy The new buddy who gets added
* @param contact The optional contact to place the buddy in. * @param contact The optional contact to place the buddy in.
* @param group The group to add the new buddy to. * @param group The group to add the new buddy to.
* @param node The insertion point * @param node The insertion point. Pass in NULL to add the node as
* the last child in the given group.
*/ */
void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, Pur pleGroup *group, PurpleBlistNode *node); void purple_blist_add_buddy(PurpleBuddy *buddy, PurpleContact *contact, Pur pleGroup *group, PurpleBlistNode *node);
/** /**
* Creates a new group * Creates a new group
* *
* You can't have more than one group with the same name. Sorry. If you p ass * You can't have more than one group with the same name. Sorry. If you p ass
* this the * name of a group that already exists, it will return that grou p. * this the * name of a group that already exists, it will return that grou p.
* *
* @param name The name of the new group * @param name The name of the new group
skipping to change at line 952 skipping to change at line 953
* @return The flags on the node. This is a bitmask. * @return The flags on the node. This is a bitmask.
*/ */
PurpleBlistNodeFlags purple_blist_node_get_flags(PurpleBlistNode *node); PurpleBlistNodeFlags purple_blist_node_get_flags(PurpleBlistNode *node);
/** /**
* Get the type of a given node. * Get the type of a given node.
* *
* @param node The node. * @param node The node.
* *
* @return The type of the node. * @return The type of the node.
* @since 2.1.0
*/ */
PurpleBlistNodeType purple_blist_node_get_type(PurpleBlistNode *node); PurpleBlistNodeType purple_blist_node_get_type(PurpleBlistNode *node);
/*@}*/ /*@}*/
/** /**
* Retrieves the extended menu items for a buddy list node. * Retrieves the extended menu items for a buddy list node.
* @param n The blist node for which to obtain the extended menu items. * @param n The blist node for which to obtain the extended menu items.
* @return A list of PurpleMenuAction items, as harvested by the * @return A list of PurpleMenuAction items, as harvested by the
* blist-node-extended-menu signal. * blist-node-extended-menu signal.
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 buddyicon.h   buddyicon.h 
skipping to change at line 47 skipping to change at line 47
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** / /************************************************************************** /
/** @name Buddy Icon API * / /** @name Buddy Icon API * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
/** /**
* Creates a new buddy icon structure and populate it. * Creates a new buddy icon structure and populates it.
* *
* If the buddy icon already exists, you'll get a reference to that structu re, * If the buddy icon already exists, you'll get a reference to that structu re,
* which will have been updated with the data supplied. * which will have been updated with the data supplied.
* *
* @param account The account the user is on. * @param account The account the user is on.
* @param username The username the icon belongs to. * @param username The username the icon belongs to.
* @param icon_data The buddy icon data. * @param icon_data The buddy icon data.
* @param icon_len The buddy icon length. * @param icon_len The buddy icon length.
* @param checksum A protocol checksum from the prpl or @c NULL. * @param checksum A protocol checksum from the prpl or @c NULL.
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 conversation.h   conversation.h 
skipping to change at line 121 skipping to change at line 121
PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. * / PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. * /
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 */ 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" */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 dbus-maybe.h   dbus-maybe.h 
/* This file contains macros that wrap calls to the purple dbus module. /* This file contains macros that wrap calls to the purple dbus module.
These macros call the appropriate functions if the build includes These macros call the appropriate functions if the build includes
dbus support and do nothing otherwise. See "dbus-server.h" for dbus support and do nothing otherwise. See "dbus-server.h" for
documentation. */ documentation. */
#ifndef _PURPLE_DBUS_MAYBE_H_ #ifndef _PURPLE_DBUS_MAYBE_H_
#define _PURPLE_DBUS_MAYBE_H_ #define _PURPLE_DBUS_MAYBE_H_
#ifdef HAVE_DBUS #ifdef HAVE_DBUS
#ifndef DBUS_API_SUBJECT_TO_CHANGE
#define DBUS_API_SUBJECT_TO_CHANGE
#endif
#include "dbus-server.h" #include "dbus-server.h"
/* this provides a type check */ /* this provides a type check */
#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \ #define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
type *typed_ptr = ptr; \ type *typed_ptr = ptr; \
purple_dbus_register_pointer(typed_ptr, PURPLE_DBUS_TYPE(type)); \ purple_dbus_register_pointer(typed_ptr, PURPLE_DBUS_TYPE(type)); \
} }
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr) purple_dbus_unregister_pointer( ptr) #define PURPLE_DBUS_UNREGISTER_POINTER(ptr) purple_dbus_unregister_pointer( ptr)
#else /* !HAVE_DBUS */ #else /* !HAVE_DBUS */
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 lines changed or added


 dbus-server.h   dbus-server.h 
skipping to change at line 31 skipping to change at line 31
* 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_DBUS_SERVER_H_ #ifndef _PURPLE_DBUS_SERVER_H_
#define _PURPLE_DBUS_SERVER_H_ #define _PURPLE_DBUS_SERVER_H_
#include "dbus-purple.h"
#include "value.h" #include "value.h"
G_BEGIN_DECLS G_BEGIN_DECLS
/** /**
Types of pointers are identified by the ADDRESS of a PurpleDbusType Types of pointers are identified by the ADDRESS of a PurpleDbusType
object. This way, plugins can easily access types defined in purple object. This way, plugins can easily access types defined in purple
proper as well as introduce their own types that will not conflict proper as well as introduce their own types that will not conflict
with those introduced by other plugins. with those introduced by other plugins.
skipping to change at line 53 skipping to change at line 54
parent. Parent means the same as the base class in object oriented parent. Parent means the same as the base class in object oriented
programming. programming.
*/ */
typedef struct _PurpleDBusType PurpleDBusType; typedef struct _PurpleDBusType PurpleDBusType;
struct _PurpleDBusType { struct _PurpleDBusType {
PurpleDBusType *parent; PurpleDBusType *parent;
}; };
#include "dbus-bindings.h"
/* By convention, the PurpleDBusType variable representing each structure /* By convention, the PurpleDBusType variable representing each structure
PurpleSomeStructure has the name PURPLE_DBUS_TYPE_PurpleSomeStructure. PurpleSomeStructure has the name PURPLE_DBUS_TYPE_PurpleSomeStructure.
The following macros facilitate defining such variables The following macros facilitate defining such variables
#PURPLE_DBUS_DECLARE_TYPE declares an extern variable representing a #PURPLE_DBUS_DECLARE_TYPE declares an extern variable representing a
given type, for use in header files. given type, for use in header files.
#PURPLE_DBUS_DEFINE_TYPE defines a variable representing a given #PURPLE_DBUS_DEFINE_TYPE defines a variable representing a given
type, use in .c files. It defines a new type without a parent; for type, use in .c files. It defines a new type without a parent; for
types with a parent use #PURPLE_DBUS_DEFINE_INHERITING_TYPE. types with a parent use #PURPLE_DBUS_DEFINE_INHERITING_TYPE.
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 eventloop.h   eventloop.h 
skipping to change at line 143 skipping to change at line 143
* measured in seconds. Analogous to g_timeout_add_seconds in glib. * measured in seconds. Analogous to g_timeout_add_seconds in glib.
* *
* This allows UIs to group timers for better power efficiency. For * This allows UIs to group timers for better power efficiency. For
* this reason, @a interval may be rounded by up to a second. * this reason, @a interval may be rounded by up to a second.
* *
* Implementation of this UI op is optional. If it's not implemente d, * Implementation of this UI op is optional. If it's not implemente d,
* calls to purple_timeout_add_seconds() will be serviced by * calls to purple_timeout_add_seconds() will be serviced by
* #timeout_add. * #timeout_add.
* *
* @see purple_timeout_add_seconds() * @see purple_timeout_add_seconds()
* @since 2.1.0
**/ **/
guint (*timeout_add_seconds)(guint interval, GSourceFunc function, guint (*timeout_add_seconds)(guint interval, GSourceFunc function,
gpointer data); gpointer data);
void (*_purple_reserved2)(void); void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void); void (*_purple_reserved3)(void);
void (*_purple_reserved4)(void); void (*_purple_reserved4)(void);
}; };
/************************************************************************** / /************************************************************************** /
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 gntbindable.h   gntbindable.h 
skipping to change at line 152 skipping to change at line 152
* Perform an action from a keybinding. * Perform an action from a keybinding.
* *
* @param bindable The bindable object. * @param bindable The bindable object.
* @param keys The key to trigger the action. * @param keys The key to trigger the action.
* *
* @return @c TRUE if the action was performed successfully, @c FALSE othe rwise. * @return @c TRUE if the action was performed successfully, @c FALSE othe rwise.
*/ */
gboolean gnt_bindable_perform_action_key(GntBindable *bindable, const char *keys); gboolean gnt_bindable_perform_action_key(GntBindable *bindable, const char *keys);
/** /**
* Discover if a key is bound.
*
* @param bindable The bindable object.
* @param keys The key to check for.
*
* @return @c TRUE if the the key has an action associated with it.
*/
gboolean gnt_bindable_check_key(GntBindable *bindable, const char *keys);
/**
* Perform an action on a bindable object. * Perform an action on a bindable object.
* *
* @param bindable The bindable object. * @param bindable The bindable object.
* @param name The action to perform, followed by a @c NULL-terminated list of parameters. * @param name The action to perform, followed by a @c NULL-terminated list of parameters.
* *
* @return @c TRUE if the action was performed successfully, @c FALSE othe rwise. * @return @c TRUE if the action was performed successfully, @c FALSE othe rwise.
*/ */
gboolean gnt_bindable_perform_action_named(GntBindable *bindable, const cha r *name, ...); gboolean gnt_bindable_perform_action_named(GntBindable *bindable, const cha r *name, ...);
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 gntlog.h   gntlog.h 
/** /**
* @file gntlog.h GNT Log viewer * @file gntlog.h GNT Log viewer
* @ingroup finch * @ingroup finch
* @see @ref gntlog-signals
*/ */
/* finch /* finch
* *
* Finch is the legal property of its developers, whose names are too numer ous * Finch is the legal property of its developers, whose names are too numer ous
* 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.
* *
* 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
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added


 gtkthemes.h   gtkthemes.h 
skipping to change at line 49 skipping to change at line 49
char *icon; char *icon;
char *author; char *author;
struct smiley_list *list; struct smiley_list *list;
}; };
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 *);
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
*/
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);
#endif /* _PIDGINDIALOGS_H_ */
#endif /* _PIDGINTHEMES_H_ */
 End of changes. 7 change blocks. 
0 lines changed or deleted 9 lines changed or added


 imgstore.h   imgstore.h 
skipping to change at line 54 skipping to change at line 54
* 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.
* *
* No ID is allocated when using this function. If you need to reference t he * No ID is allocated when using this function. If you need to reference t he
* image by an ID, use purple_imgstore_add_with_id() instead. * image by an ID, use purple_imgstore_add_with_id() instead.
* *
* @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.
* @param filename Filename associated with image. * @param filename Filename associated with image. This is for your
* convenience. It could be the full path to the
* image or, more commonly, the filename of the image
* without any directory information. It can also be
* 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);
/** /**
* 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.
* @param filename Filename associated with image. * @param filename Filename associated with image. This is for your
* convenience. It could be the full path to the
* image or, more commonly, the filename of the image
* without any directory information. It can also be
* NULL, if you don't need to keep track of a filename.
* @return ID for the image. * @return ID for the image. This is a unique number that can be used
* within libpurple to reference the image.
*/ */
int purple_imgstore_add_with_id(gpointer data, size_t size, const char *fil ename); int purple_imgstore_add_with_id(gpointer data, size_t size, const char *fil ename);
/** /**
* Retrieve an image from the store. The caller does not own a * Retrieve an image from the store. The caller does not own a
* reference to the image. * reference to the image.
* *
* @param id The ID for the image. * @param id The ID for the image.
* *
* @return A pointer to the requested image, or NULL if it was not found. * @return A pointer to the requested image, or NULL if it was not found.
skipping to change at line 119 skipping to change at line 128
* Retrieves a pointer to the image's filename. * Retrieves a pointer to the image's filename.
* *
* @param img The image * @param img The image
* *
* @return A pointer to the filename, which must not * @return A pointer to the filename, which must not
* be freed or modified. * be freed or modified.
*/ */
const char *purple_imgstore_get_filename(const PurpleStoredImage *img); const char *purple_imgstore_get_filename(const PurpleStoredImage *img);
/** /**
* Returns an extension corresponding to the image's file type. * Looks at the magic numbers of the image data (the first few bytes)
* and returns an extension corresponding to the image's file type.
* *
* @param img The image. * @param img The image.
* *
* @return The icon's extension or "icon" if unknown. * @return The image's extension (for example "png") or "icon"
* if unknown.
*/ */
const char *purple_imgstore_get_extension(PurpleStoredImage *img); const char *purple_imgstore_get_extension(PurpleStoredImage *img);
/** /**
* Increment the reference count. * Increment the reference count.
* *
* @param img The image. * @param img The image.
* *
* @return @a img * @return @a img
*/ */
 End of changes. 5 change blocks. 
5 lines changed or deleted 16 lines changed or added


 notify.h   notify.h 
skipping to change at line 587 skipping to change at line 587
*/ */
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
*/ */
gchar *purple_notify_user_info_entry_get_label(PurpleNotifyUserInfoEntry *u ser_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
*/ */
gchar *purple_notify_user_info_entry_get_value(PurpleNotifyUserInfoEntry *u ser_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);
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 prefs.h   prefs.h 
skipping to change at line 302 skipping to change at line 302
const char *purple_prefs_get_path(const char *name); const char *purple_prefs_get_path(const char *name);
/** /**
* Get path list pref value * Get path list pref value
* *
* @param name The name of the pref * @param name The name of the pref
* @return The value of the pref * @return The value of the pref
*/ */
GList *purple_prefs_get_path_list(const char *name); GList *purple_prefs_get_path_list(const char *name);
/* /**
* Returns a list of children for a pref * Returns a list of children for a pref
* *
* @param name The parent pref * @param name The parent pref
* @return A list of newly allocated strings denoting the names of the chil dren. * @return A list of newly allocated strings denoting the names of the chil dren.
* Returns @c NULL if there are no children or if pref doesn't exis t. * Returns @c NULL if there are no children or if pref doesn't exis t.
* The caller must free all the strings and the list. * The caller must free all the strings and the list.
* *
* @since 2.1.0 * @since 2.1.0
*/ */
GList *purple_prefs_get_children_names(const char *name); GList *purple_prefs_get_children_names(const char *name);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 prpl.h   prpl.h 
skipping to change at line 179 skipping to change at line 179
/** /**
* Set the Register button active when screenname is not given. * Set the Register button active when screenname is not given.
* *
* 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
*/ */
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 this 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 .
*/ */
struct _PurplePluginProtocolInfo struct _PurplePluginProtocolInfo
{ {
PurpleProtocolOptions options; /**< Protocol options. */ PurpleProtocolOptions options; /**< Protocol options. */
GList *user_splits; /**< A GList of PurpleAccountUserSplit */ GList *user_splits; /**< A GList of PurpleAccountUserSplit */
GList *protocol_options; /**< A GList of PurpleAccountOption */ GList *protocol_options; /**< A GList of PurpleAccountOption */
PurpleBuddyIconSpec icon_spec; /**< The icon spec. */ PurpleBuddyIconSpec icon_spec; /**< The icon spec. */
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 status.h   status.h 
skipping to change at line 99 skipping to change at line 99
PURPLE_PRESENCE_CONTEXT_CONV, PURPLE_PRESENCE_CONTEXT_CONV,
PURPLE_PRESENCE_CONTEXT_BUDDY PURPLE_PRESENCE_CONTEXT_BUDDY
} PurplePresenceContext; } PurplePresenceContext;
/** /**
* A primitive defining the basic structure of a status type. * A primitive defining the basic structure of a status type.
*/ */
/* /*
* If you add a value to this enum, make sure you update * If you add a value to this enum, make sure you update
* the status_primitive_map array in status.c. * the status_primitive_map array in status.c and the special-cases for idl
e
* and offline-messagable just below it.
*/ */
typedef enum typedef enum
{ {
PURPLE_STATUS_UNSET = 0, PURPLE_STATUS_UNSET = 0,
PURPLE_STATUS_OFFLINE, PURPLE_STATUS_OFFLINE,
PURPLE_STATUS_AVAILABLE, PURPLE_STATUS_AVAILABLE,
PURPLE_STATUS_UNAVAILABLE, PURPLE_STATUS_UNAVAILABLE,
PURPLE_STATUS_INVISIBLE, PURPLE_STATUS_INVISIBLE,
PURPLE_STATUS_AWAY, PURPLE_STATUS_AWAY,
PURPLE_STATUS_EXTENDED_AWAY, PURPLE_STATUS_EXTENDED_AWAY,
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 util.h   util.h 
skipping to change at line 476 skipping to change at line 476
* @param dest_plain The destination plain-text output. * @param dest_plain The destination plain-text output.
*/ */
void purple_markup_html_to_xhtml(const char *html, char **dest_xhtml, void purple_markup_html_to_xhtml(const char *html, char **dest_xhtml,
char **dest_plain ); char **dest_plain );
/** /**
* Strips HTML tags from a string. * Strips HTML tags from a string.
* *
* @param str The string to strip HTML from. * @param str The string to strip HTML from.
* *
* @return The new string without HTML. This must be freed. * @return The new string without HTML. You must g_free this string
* when finished with it.
*/ */
char *purple_markup_strip_html(const char *str); char *purple_markup_strip_html(const char *str);
/** /**
* Adds the necessary HTML code to turn URIs into HTML links in a string. * Adds the necessary HTML code to turn URIs into HTML links in a string.
* *
* @param str The string to linkify. * @param str The string to linkify.
* *
* @return The linkified text. * @return The new string with all URIs surrounded in standard
* HTML <a href="whatever"></a> tags. You must g_free this
* string when finished with it.
*/ */
char *purple_markup_linkify(const char *str); char *purple_markup_linkify(const char *str);
/** /**
* Unescapes HTML entities to their literal characters. * Unescapes HTML entities to their literal characters.
* For example "&amp;" is replaced by '&' and so on. * For example "&amp;" is replaced by '&' and so on.
* Actually only "&amp;", "&quot;", "&lt;" and "&gt;" are currently * Actually only "&amp;", "&quot;", "&lt;" and "&gt;" are currently
* supported. * supported.
* *
* @param html The string in which to unescape any HTML entities * @param html The string in which to unescape any HTML entities
* *
* @return the text with HTML entities literalized * @return The text with HTML entities literalized. You must g_free
* this string when finished with it.
*/ */
char *purple_unescape_html(const char *html); char *purple_unescape_html(const char *html);
/** /**
* Returns a newly allocated substring of the HTML UTF-8 string "str". * Returns a newly allocated substring of the HTML UTF-8 string "str".
* The markup is preserved such that the substring will have the same * The markup is preserved such that the substring will have the same
* formatting as original string, even though some tags may have been * formatting as original string, even though some tags may have been
* opened before "x", or may close after "y". All open tags are closed * opened before "x", or may close after "y". All open tags are closed
* at the end of the returned string, in the proper order. * at the end of the returned string, in the proper order.
* *
skipping to change at line 700 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 with the correct file * @return A hex encoded version of the SHA-1 hash of the data passed
* extention appended. * in with the correct file extention appended. The file
* extension is determined by calling
* purple_util_get_image_extension(). This return value must
* 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);
/*@}*/ /*@}*/
/************************************************************************** / /************************************************************************** /
/** @name Environment Detection Functions * / /** @name Environment Detection Functions * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
skipping to change at line 1075 skipping to change at line 1082
* *
* @param address The email address to validate. * @param address The email address to validate.
* *
* @return True if the email address is syntactically correct. * @return True if the email address is syntactically correct.
*/ */
gboolean purple_email_is_valid(const char *address); gboolean purple_email_is_valid(const char *address);
/** /**
* Checks if the given IP address is a syntactically valid IPv4 address. * Checks if the given IP address is a syntactically valid IPv4 address.
* *
* @param address The IP address to validate. * @param ip The IP address to validate.
* *
* @return True if the IP address is syntactically correct. * @return True if the IP address is syntactically correct.
*/ */
gboolean purple_ip_address_is_valid(const char *ip); gboolean purple_ip_address_is_valid(const char *ip);
/** /**
* This function extracts a list of URIs from the a "text/uri-list" * This function extracts a list of URIs from the a "text/uri-list"
* string. It was "borrowed" from gnome_uri_list_extract_uris * string. It was "borrowed" from gnome_uri_list_extract_uris
* *
* @param uri_list An uri-list in the standard format. * @param uri_list An uri-list in the standard format.
 End of changes. 5 change blocks. 
6 lines changed or deleted 13 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 (4) #define PURPLE_MINOR_VERSION (4)
#define PURPLE_MICRO_VERSION (1) #define PURPLE_MICRO_VERSION (2)
#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/