account.h   account.h 
skipping to change at line 30 skipping to change at line 30
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_ACCOUNT_H_ #ifndef _PURPLE_ACCOUNT_H_
#define _PURPLE_ACCOUNT_H_ #define _PURPLE_ACCOUNT_H_
#include <glib-object.h>
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
/** @copydoc _PurpleAccountUiOps */ /** @copydoc _PurpleAccountUiOps */
typedef struct _PurpleAccountUiOps PurpleAccountUiOps; typedef struct _PurpleAccountUiOps PurpleAccountUiOps;
/** @copydoc _PurpleAccount */ /** @copydoc _PurpleAccount */
typedef struct _PurpleAccount PurpleAccount; typedef struct _PurpleAccount PurpleAccount;
typedef gboolean (*PurpleFilterAccountFunc)(PurpleAccount *account); typedef gboolean (*PurpleFilterAccountFunc)(PurpleAccount *account);
typedef void (*PurpleAccountRequestAuthorizationCb)(void *); typedef void (*PurpleAccountRequestAuthorizationCb)(void *);
skipping to change at line 134 skipping to change at line 133
PurpleConnection *gc; /**< The connection handle. */ PurpleConnection *gc; /**< The connection handle. */
gboolean disconnecting; /**< The account is currently disconnect ing */ gboolean disconnecting; /**< The account is currently disconnect ing */
GHashTable *settings; /**< Protocol-specific settings. */ GHashTable *settings; /**< Protocol-specific settings. */
GHashTable *ui_settings; /**< UI-specific settings. */ GHashTable *ui_settings; /**< UI-specific settings. */
PurpleProxyInfo *proxy_info; /**< Proxy information. This will be set */ PurpleProxyInfo *proxy_info; /**< Proxy information. This will be set */
/* to NULL when the account inherits */ /* to NULL when the account inherits */
/* proxy s ettings from global prefs. */ /* proxy s ettings from global prefs. */
/*
* TODO: Supplementing the next two linked lists with hash tables
* should help performance a lot when these lists are long. This
* matters quite a bit for protocols like MSN, where all your
* buddies are added to your permit list. Currently we have to
* iterate through the entire list if we want to check if someone
* is permitted or denied. We should do this for 3.0.0.
*/
GSList *permit; /**< Permit list. */ GSList *permit; /**< Permit list. */
GSList *deny; /**< Deny list. */ GSList *deny; /**< Deny list. */
int perm_deny; /**< The permit/deny setting. */ int perm_deny; /**< The permit/deny setting. */
GList *status_types; /**< Status types. */ GList *status_types; /**< Status types. */
PurplePresence *presence; /**< Presence. */ PurplePresence *presence; /**< Presence. */
PurpleLog *system_log; /**< The system log */ PurpleLog *system_log; /**< The system log */
void *ui_data; /**< The UI can put data here. */ void *ui_data; /**< The UI can put data here. */
 End of changes. 2 change blocks. 
1 lines changed or deleted 8 lines changed or added


 gtkblist.h   gtkblist.h 
skipping to change at line 30 skipping to change at line 30
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PIDGINBLIST_H_ #ifndef _PIDGINBLIST_H_
#define _PIDGINBLIST_H_ #define _PIDGINBLIST_H_
/** @copydoc _PidginBuddyList */
typedef struct _PidginBuddyList PidginBuddyList; typedef struct _PidginBuddyList PidginBuddyList;
enum { enum {
STATUS_ICON_COLUMN, STATUS_ICON_COLUMN,
STATUS_ICON_VISIBLE_COLUMN, STATUS_ICON_VISIBLE_COLUMN,
NAME_COLUMN, NAME_COLUMN,
IDLE_COLUMN, IDLE_COLUMN,
IDLE_VISIBLE_COLUMN, IDLE_VISIBLE_COLUMN,
BUDDY_ICON_COLUMN, BUDDY_ICON_COLUMN,
BUDDY_ICON_VISIBLE_COLUMN, BUDDY_ICON_VISIBLE_COLUMN,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 gtkgaim-compat.h   gtkgaim-compat.h 
skipping to change at line 300 skipping to change at line 300
#define GaimGtkXferDialog PidginXferDialog #define GaimGtkXferDialog PidginXferDialog
#define gaim_gtkxfer_dialog_remove_xfer pidgin_xfer_dialog_remove_xfer #define gaim_gtkxfer_dialog_remove_xfer pidgin_xfer_dialog_remove_xfer
#define gaim_gtkxfer_dialog_show pidgin_xfer_dialog_show #define gaim_gtkxfer_dialog_show pidgin_xfer_dialog_show
#define gaim_gtkxfer_dialog_update_xfer pidgin_xfer_dialog_update_xfer #define gaim_gtkxfer_dialog_update_xfer pidgin_xfer_dialog_update_xfer
#define gaim_gtk_xfers_get_ui_ops pidgin_xfers_get_ui_ops #define gaim_gtk_xfers_get_ui_ops pidgin_xfers_get_ui_ops
#define gaim_gtk_xfers_init pidgin_xfers_init #define gaim_gtk_xfers_init pidgin_xfers_init
#define gaim_gtk_xfers_uninit pidgin_xfers_uninit #define gaim_gtk_xfers_uninit pidgin_xfers_uninit
#define GAIM_HIG_BORDER PIDGIN_HIG_BORDER #define GAIM_HIG_BORDER PIDGIN_HIG_BORDER
#define GAIM_HIG_BOX_SPACE PIDGIN_HIG_BOX_SPACE #define GAIM_HIG_BOX_SPACE PIDGIN_HIG_BOX_SPACE
#define GAIM_HIG_CAT_SPACE PIDGIN_HIG_CAT_SPACE #define GAIM_HIG_CAT_SPACE PIDGIN_HIG_CAT_SPACE
#if !GTK_CHECK_VERSION(2,16,0)
#define GAIM_INVISIBLE_CHAR PIDGIN_INVISIBLE_CHAR #define GAIM_INVISIBLE_CHAR PIDGIN_INVISIBLE_CHAR
#endif /* Less than GTK+ 2.16 */
#define GAIM_IS_GTK_CONVERSATION PIDGIN_IS_PIDGIN_CONVERSATION #define GAIM_IS_GTK_CONVERSATION PIDGIN_IS_PIDGIN_CONVERSATION
#define GAIM_IS_GTK_PLUGIN PIDGIN_IS_PIDGIN_PLUGIN #define GAIM_IS_GTK_PLUGIN PIDGIN_IS_PIDGIN_PLUGIN
#define gaim_new_check_item pidgin_new_check_item #define gaim_new_check_item pidgin_new_check_item
#define gaim_new_item_from_stock pidgin_new_item_from_stock #define gaim_new_item_from_stock pidgin_new_item_from_stock
#define gaim_new_item pidgin_new_item #define gaim_new_item pidgin_new_item
#define gaim_pixbuf_button_from_stock pidgin_pixbuf_button_from_stock #define gaim_pixbuf_button_from_stock pidgin_pixbuf_button_from_stock
#define gaim_pixbuf_toolbar_button_from_stock pidgin_pixbuf_toolbar_button_ from_stock #define gaim_pixbuf_toolbar_button_from_stock pidgin_pixbuf_toolbar_button_ from_stock
#define GaimScrollBookClass PidginScrollBookClass #define GaimScrollBookClass PidginScrollBookClass
#define gaim_scroll_book_get_type pidgin_scroll_book_get_type #define gaim_scroll_book_get_type pidgin_scroll_book_get_type
#define gaim_scroll_book_new pidgin_scroll_book_new #define gaim_scroll_book_new pidgin_scroll_book_new
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 pidgin.h   pidgin.h 
skipping to change at line 94 skipping to change at line 94
#endif /* Less than GTK+ 2.6 */ #endif /* Less than GTK+ 2.6 */
/* /*
* Spacings between components, as defined by the * Spacings between components, as defined by the
* GNOME Human Interface Guidelines. * GNOME Human Interface Guidelines.
*/ */
#define PIDGIN_HIG_CAT_SPACE 18 #define PIDGIN_HIG_CAT_SPACE 18
#define PIDGIN_HIG_BORDER 12 #define PIDGIN_HIG_BORDER 12
#define PIDGIN_HIG_BOX_SPACE 6 #define PIDGIN_HIG_BOX_SPACE 6
#if !GTK_CHECK_VERSION(2,16,0) || !defined(PIDGIN_DISABLE_DEPRECATED)
/* /*
* See GNOME bug #307304 for some discussion about the invisible * Older versions of GNOME defaulted to using an asterisk as the invisible
* character. 0x25cf is a good choice, too. * character. But this is ugly and we want to use something nicer.
*
* The default invisible character was changed in GNOME revision 21446
* (GTK+ 2.16) from an asterisk to the first available character out of
* 0x25cf, 0x2022, 0x2731, 0x273a. See GNOME bugs 83935 and 307304 for
* discussion leading up to the change.
*
* Here's the change:
* http://svn.gnome.org/viewvc/gtk%2B?view=revision&revision=21446
*
*/ */
#define PIDGIN_INVISIBLE_CHAR (gunichar)0x2022 #define PIDGIN_INVISIBLE_CHAR (gunichar)0x25cf
#endif /* Less than GTK+ 2.16 */
#endif /* _PIDGIN_H_ */ #endif /* _PIDGIN_H_ */
 End of changes. 3 change blocks. 
3 lines changed or deleted 14 lines changed or added


 plugin.h   plugin.h 
skipping to change at line 37 skipping to change at line 37
* 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_PLUGIN_H_ #ifndef _PURPLE_PLUGIN_H_
#define _PURPLE_PLUGIN_H_ #define _PURPLE_PLUGIN_H_
#include <glib/glist.h> #include <glib/glist.h>
#include <gmodule.h> #include <gmodule.h>
#include "signals.h" #include "signals.h"
#include "value.h" #include "value.h"
/** @copydoc _PurplePlugin */
typedef struct _PurplePlugin PurplePlugin; typedef struct _PurplePlugin PurplePlugin;
/** @copydoc _PurplePluginInfo */
typedef struct _PurplePluginInfo PurplePluginInfo; typedef struct _PurplePluginInfo PurplePluginInfo;
/** @copydoc _PurplePluginUiInfo */
typedef struct _PurplePluginUiInfo PurplePluginUiInfo; typedef struct _PurplePluginUiInfo PurplePluginUiInfo;
/** @copydoc _PurplePluginLoaderInfo */
typedef struct _PurplePluginLoaderInfo PurplePluginLoaderInfo; typedef struct _PurplePluginLoaderInfo PurplePluginLoaderInfo;
/** @copydoc _PurplePluginAction */
typedef struct _PurplePluginAction PurplePluginAction; typedef struct _PurplePluginAction PurplePluginAction;
typedef int PurplePluginPriority; /**< Plugin priority. */ typedef int PurplePluginPriority; /**< Plugin priority. */
#include "pluginpref.h" #include "pluginpref.h"
/** /**
* Plugin types. * Plugin types.
*/ */
typedef enum typedef enum
 End of changes. 5 change blocks. 
0 lines changed or deleted 5 lines changed or added


 prefs.h   prefs.h 
skipping to change at line 33 skipping to change at line 33
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
* *
*/ */
#ifndef _PURPLE_PREFS_H_ #ifndef _PURPLE_PREFS_H_
#define _PURPLE_PREFS_H_ #define _PURPLE_PREFS_H_
#include <glib.h> #include <glib.h>
/** /**
* Pref data types. * Preference data types.
*/ */
typedef enum _PurplePrefType typedef enum _PurplePrefType
{ {
PURPLE_PREF_NONE, PURPLE_PREF_NONE, /**< No type. */
PURPLE_PREF_BOOLEAN, PURPLE_PREF_BOOLEAN, /**< Boolean. */
PURPLE_PREF_INT, PURPLE_PREF_INT, /**< Integer. */
PURPLE_PREF_STRING, PURPLE_PREF_STRING, /**< String. */
PURPLE_PREF_STRING_LIST, PURPLE_PREF_STRING_LIST, /**< List of strings. */
PURPLE_PREF_PATH, PURPLE_PREF_PATH, /**< Path. */
PURPLE_PREF_PATH_LIST PURPLE_PREF_PATH_LIST /**< List of paths. */
} PurplePrefType; } PurplePrefType;
/** /**
* The type of callbacks for preference changes. * The type of callbacks for preference changes.
* *
* @param name the name of the preference which has changed. * @param name the name of the preference which has changed.
* @param type the type of the preferenced named @a name * @param type the type of the preferenced named @a name
* @param val the new value of the preferencs; should be cast to the corre ct * @param val the new value of the preferencs; should be cast to the corre ct
* type. For instance, to recover the value of a #PURPLE_PREF_ INT * type. For instance, to recover the value of a #PURPLE_PREF_ INT
 End of changes. 2 change blocks. 
8 lines changed or deleted 8 lines changed or added


 sslconn.h   sslconn.h 
skipping to change at line 42 skipping to change at line 42
PURPLE_SSL_HANDSHAKE_FAILED = 1, PURPLE_SSL_HANDSHAKE_FAILED = 1,
PURPLE_SSL_CONNECT_FAILED = 2, PURPLE_SSL_CONNECT_FAILED = 2,
PURPLE_SSL_CERTIFICATE_INVALID = 3 PURPLE_SSL_CERTIFICATE_INVALID = 3
} PurpleSslErrorType; } PurpleSslErrorType;
#include "certificate.h" #include "certificate.h"
#include "proxy.h" #include "proxy.h"
#define PURPLE_SSL_DEFAULT_PORT 443 #define PURPLE_SSL_DEFAULT_PORT 443
/** @copydoc _PurpleSslConnection */
typedef struct _PurpleSslConnection PurpleSslConnection; typedef struct _PurpleSslConnection PurpleSslConnection;
typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *, typedef void (*PurpleSslInputFunction)(gpointer, PurpleSslConnection *,
Pur pleInputCondition); Pur pleInputCondition);
typedef void (*PurpleSslErrorFunction)(PurpleSslConnection *, PurpleSslErro rType, typedef void (*PurpleSslErrorFunction)(PurpleSslConnection *, PurpleSslErro rType,
gpo inter); gpo inter);
struct _PurpleSslConnection struct _PurpleSslConnection
{ {
/** Hostname to which the SSL connection will be made */ /** Hostname to which the SSL connection will be made */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 status.h   status.h 
skipping to change at line 202 skipping to change at line 202
* *
* @return A new status type. * @return A new status type.
*/ */
PurpleStatusType *purple_status_type_new_full(PurpleStatusPrimitive primiti ve, PurpleStatusType *purple_status_type_new_full(PurpleStatusPrimitive primiti ve,
const char *id, const char *name, const char *id, const char *name,
gboolean saveable, gboolean saveable,
gboolean user_settable, gboolean user_settable,
gboolean independent); gboolean independent);
/** /**
* Creates a new status type with some default values (not * Creates a new status type with some default values (
* savable and not independent). * saveable and not independent).
* *
* @param primitive The primitive status type. * @param primitive The primitive status type.
* @param id The ID of the status type, or @c NULL to use the id of * @param id The ID of the status type, or @c NULL to use the id of
* the primitive status type. * the primitive status type.
* @param name The name presented to the user, or @c NULL to use t he * @param name The name presented to the user, or @c NULL to use t he
* name of the primitive status type. * name of the primitive status type.
* @param user_settable TRUE if this is a status the user can manually set. * @param user_settable TRUE if this is a status the user can manually set.
* *
* @return A new status type. * @return A new status type.
*/ */
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 lines changed or added


 util.h   util.h 
skipping to change at line 1199 skipping to change at line 1199
* g_strerror(). * g_strerror().
* *
* @param errnum The error code. * @param errnum The error code.
* *
* @return The UTF-8 error message. * @return The UTF-8 error message.
* @since 2.4.0 * @since 2.4.0
*/ */
G_CONST_RETURN gchar *purple_gai_strerror(gint errnum); G_CONST_RETURN gchar *purple_gai_strerror(gint errnum);
/** /**
* Compares two UTF-8 strings case-insensitively. This string is * Compares two UTF-8 strings case-insensitively. This comparison is
* more expensive than a simple g_utf8_collate() comparison because * more expensive than a simple g_utf8_collate() comparison because
* it calls g_utf8_casefold() on each string, which allocates new * it calls g_utf8_casefold() on each string, which allocates new
* strings. * strings.
* *
* @param a The first string. * @param a The first string.
* @param b The second string. * @param b The second string.
* *
* @return -1 if @a is less than @a b. * @return -1 if @a is less than @a b.
* 0 if @a is equal to @a b. * 0 if @a is equal to @a b.
* 1 if @a is greater than @a b. * 1 if @a is greater than @a b.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 version.h   version.h 
skipping to change at line 27 skipping to change at line 27
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_VERSION_H_ #ifndef _PURPLE_VERSION_H_
#define _PURPLE_VERSION_H_ #define _PURPLE_VERSION_H_
/** The major version of the running libpurple. */
#define PURPLE_MAJOR_VERSION (2) #define PURPLE_MAJOR_VERSION (2)
/** The minor version of the running libpurple. */
#define PURPLE_MINOR_VERSION (5) #define PURPLE_MINOR_VERSION (5)
#define PURPLE_MICRO_VERSION (4) /** The micro version of the running libpurple. */
#define PURPLE_MICRO_VERSION (5)
#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. 3 change blocks. 
1 lines changed or deleted 4 lines changed or added


 xmlnode.h   xmlnode.h 
skipping to change at line 246 skipping to change at line 246
* @param prefix The prefix of the node * @param prefix The prefix of the node
*/ */
void xmlnode_set_prefix(xmlnode *node, const char *prefix); void xmlnode_set_prefix(xmlnode *node, const char *prefix);
/** /**
* Returns the prefix of a node * Returns the prefix of a node
* *
* @param node The node to get the prefix from * @param node The node to get the prefix from
* @return The prefix of this node * @return The prefix of this node
*/ */
const char *xmlnode_get_prefix(xmlnode *node); const char *xmlnode_get_prefix(const xmlnode *node);
/** /**
* Returns the node in a string of xml. * Returns the node in a string of xml.
* *
* @param node The starting node to output. * @param node The starting node to output.
* @param len Address for the size of the string. * @param len Address for the size of the string.
* *
* @return The node represented as a string. You must * @return The node represented as a string. You must
* g_free this string when finished using it. * g_free this string when finished using it.
*/ */
char *xmlnode_to_str(xmlnode *node, int *len); char *xmlnode_to_str(const xmlnode *node, int *len);
/** /**
* Returns the node in a string of human readable xml. * Returns the node in a string of human readable xml.
* *
* @param node The starting node to output. * @param node The starting node to output.
* @param len Address for the size of the string. * @param len Address for the size of the string.
* *
* @return The node as human readable string including * @return The node as human readable string including
* tab and new line characters. You must * tab and new line characters. You must
* g_free this string when finished using it. * g_free this string when finished using it.
*/ */
char *xmlnode_to_formatted_str(xmlnode *node, int *len); char *xmlnode_to_formatted_str(const xmlnode *node, int *len);
/** /**
* Creates a node from a string of XML. Calling this on the * Creates a node from a string of XML. Calling this on the
* root node of an XML document will parse the entire document * root node of an XML document will parse the entire document
* into a tree of nodes, and return the xmlnode of the root. * into a tree of nodes, and return the xmlnode of the root.
* *
* @param str The string of xml. * @param str The string of xml.
* @param size The size of the string, or -1 if @a str is * @param size The size of the string, or -1 if @a str is
* NUL-terminated. * NUL-terminated.
* *
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 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/