account.h   account.h 
skipping to change at line 145 skipping to change at line 145
/* 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 * TODO: Supplementing the next two linked lists with hash tables
* should help performance a lot when these lists are long. This * should help performance a lot when these lists are long. This
* matters quite a bit for protocols like MSN, where all your * matters quite a bit for protocols like MSN, where all your
* buddies are added to your permit list. Currently we have to * buddies are added to your permit list. Currently we have to
* iterate through the entire list if we want to check if someone * iterate through the entire list if we want to check if someone
* is permitted or denied. We should do this for 3.0.0. * is permitted or denied. We should do this for 3.0.0.
* Or maybe use a GTree.
*/ */
GSList *permit; /**< Permit list. */ GSList *permit; /**< Permit list. */
GSList *deny; /**< Deny list. */ GSList *deny; /**< Deny list. */
PurplePrivacyType perm_deny; /**< The permit/deny setting. */ PurplePrivacyType 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 */
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 cipher.h   cipher.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_CIPHER_H #ifndef PURPLE_CIPHER_H
#define PURPLE_CIPHER_H #define PURPLE_CIPHER_H
#include <glib.h> #include <glib.h>
#include <string.h>
#define PURPLE_CIPHER(obj) ((PurpleCipher *)(obj)) /**< PurpleCipher typecast helper */ #define PURPLE_CIPHER(obj) ((PurpleCipher *)(obj)) /**< PurpleCipher typecast helper */
#define PURPLE_CIPHER_OPS(obj) ((PurpleCipherOps *)(obj)) /**< PurpleCipherInfo typecase helper */ #define PURPLE_CIPHER_OPS(obj) ((PurpleCipherOps *)(obj)) /**< PurpleCipherInfo typecase helper */
#define PURPLE_CIPHER_CONTEXT(obj) ((PurpleCipherContext *)(obj)) /**< PurpleCipherContext typecast helper */ #define PURPLE_CIPHER_CONTEXT(obj) ((PurpleCipherContext *)(obj)) /**< PurpleCipherContext typecast helper */
typedef struct _PurpleCipher PurpleCipher; /**< A handle to a PurpleCipher */ typedef struct _PurpleCipher PurpleCipher; /**< A handle to a PurpleCipher */
typedef struct _PurpleCipherOps PurpleCipherOps; /**< Ops for a PurpleCipher */ typedef struct _PurpleCipherOps PurpleCipherOps; /**< Ops for a PurpleCipher */
typedef struct _PurpleCipherContext PurpleCipherContext; /**< A conte xt for a PurpleCipher */ typedef struct _PurpleCipherContext PurpleCipherContext; /**< A conte xt for a PurpleCipher */
/** /**
skipping to change at line 132 skipping to change at line 133
/** The get batch mode function */ /** The get batch mode function */
PurpleCipherBatchMode (*get_batch_mode)(PurpleCipherContext *context ); PurpleCipherBatchMode (*get_batch_mode)(PurpleCipherContext *context );
/** The get block size function */ /** The get block size function */
size_t (*get_block_size)(PurpleCipherContext *context); size_t (*get_block_size)(PurpleCipherContext *context);
/** The set key with length function */ /** The set key with length function */
void (*set_key_with_len)(PurpleCipherContext *context, const guchar *key, size_t len); void (*set_key_with_len)(PurpleCipherContext *context, const guchar *key, size_t len);
}; };
#ifdef __cplusplus G_BEGIN_DECLS
extern "C" {
#endif /* __cplusplus */
/************************************************************************** ***/ /************************************************************************** ***/
/** @name PurpleCipher API */ /** @name PurpleCipher API */
/************************************************************************** ***/ /************************************************************************** ***/
/*@{*/ /*@{*/
/** /**
* Gets a cipher's name * Gets a cipher's name
* *
* @param cipher The cipher handle * @param cipher The cipher handle
skipping to change at line 501 skipping to change at line 500
*/ */
gchar *purple_cipher_http_digest_calculate_response( gchar *purple_cipher_http_digest_calculate_response(
const gchar *algorithm, const gchar *method, const gchar *algorithm, const gchar *method,
const gchar *digest_uri, const gchar *qop, const gchar *digest_uri, const gchar *qop,
const gchar *entity, const gchar *nonce, const gchar *entity, const gchar *nonce,
const gchar *nonce_count, const gchar *client_nonce, const gchar *nonce_count, const gchar *client_nonce,
const gchar *session_key); const gchar *session_key);
/*@}*/ /*@}*/
#ifdef __cplusplus G_END_DECLS
}
#endif /* __cplusplus */
#endif /* PURPLE_CIPHER_H */ #endif /* PURPLE_CIPHER_H */
 End of changes. 3 change blocks. 
6 lines changed or deleted 3 lines changed or added


 gtkimhtml.h   gtkimhtml.h 
skipping to change at line 53 skipping to change at line 53
#define GTK_TYPE_IMHTML (gtk_imhtml_get_type()) #define GTK_TYPE_IMHTML (gtk_imhtml_get_type())
#define GTK_IMHTML(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_T YPE_IMHTML, GtkIMHtml)) #define GTK_IMHTML(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_T YPE_IMHTML, GtkIMHtml))
#define GTK_IMHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TY PE_IMHTML, GtkIMHtmlClass)) #define GTK_IMHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TY PE_IMHTML, GtkIMHtmlClass))
#define GTK_IS_IMHTML(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_T YPE_IMHTML)) #define GTK_IS_IMHTML(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_T YPE_IMHTML))
#define GTK_IS_IMHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TY PE_IMHTML)) #define GTK_IS_IMHTML_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TY PE_IMHTML))
#define GTK_IMHTML_SCALABLE(obj) ((GtkIMHtmlScalable *)obj) #define GTK_IMHTML_SCALABLE(obj) ((GtkIMHtmlScalable *)obj)
#define GTK_IMHTML_ANIMATION(obj) ((GtkIMHtmlAnimation *)obj) #define GTK_IMHTML_ANIMATION(obj) ((GtkIMHtmlAnimation *)obj)
typedef struct _GtkIMHtml GtkIMHtml; typedef struct _GtkIMHtml GtkIMHtml;
typedef struct _GtkIMHtmlClass GtkIMHtmlClass; typedef struct _GtkIMHtmlClass GtkIMHtmlClass;
#if !(defined PIDGIN_DISABLE_DEPRECATED) && !(defined _PIDGIN_GTKIMHTML_C_)
typedef struct _GtkIMHtmlFontDetail GtkIMHtmlFontDetail; /* The five elements contained in a FONT tag */ typedef struct _GtkIMHtmlFontDetail GtkIMHtmlFontDetail; /* The five elements contained in a FONT tag */
#endif
typedef struct _GtkSmileyTree GtkSmileyTree; typedef struct _GtkSmileyTree GtkSmileyTree;
typedef struct _GtkIMHtmlSmiley GtkIMHtmlSmiley; typedef struct _GtkIMHtmlSmiley GtkIMHtmlSmiley;
typedef struct _GtkIMHtmlScalable GtkIMHtmlScalable; typedef struct _GtkIMHtmlScalable GtkIMHtmlScalable;
typedef struct _GtkIMHtmlImage GtkIMHtmlImage; typedef struct _GtkIMHtmlImage GtkIMHtmlImage;
typedef struct _GtkIMHtmlAnimation GtkIMHtmlAnimation; typedef struct _GtkIMHtmlAnimation GtkIMHtmlAnimation;
typedef struct _GtkIMHtmlHr GtkIMHtmlHr; typedef struct _GtkIMHtmlHr GtkIMHtmlHr;
typedef struct _GtkIMHtmlFuncs GtkIMHtmlFuncs; typedef struct _GtkIMHtmlFuncs GtkIMHtmlFuncs;
/** /**
* @since 2.6.0 * @since 2.6.0
skipping to change at line 165 skipping to change at line 167
void (*buttons_update)(GtkIMHtml *, GtkIMHtmlButtons); void (*buttons_update)(GtkIMHtml *, GtkIMHtmlButtons);
void (*toggle_format)(GtkIMHtml *, GtkIMHtmlButtons); void (*toggle_format)(GtkIMHtml *, GtkIMHtmlButtons);
void (*clear_format)(GtkIMHtml *); void (*clear_format)(GtkIMHtml *);
void (*update_format)(GtkIMHtml *); void (*update_format)(GtkIMHtml *);
gboolean (*message_send)(GtkIMHtml *); gboolean (*message_send)(GtkIMHtml *);
void (*undo)(GtkIMHtml *); void (*undo)(GtkIMHtml *);
void (*redo)(GtkIMHtml *); void (*redo)(GtkIMHtml *);
GList *protocols; /* List of GtkIMHtmlProtocol's */ GList *protocols; /* List of GtkIMHtmlProtocol's */
}; };
#if !(defined PIDGIN_DISABLE_DEPRECATED) && !(defined _PIDGIN_GTKIMHTML_C_)
/** @deprecated as of 2.7.10 */
struct _GtkIMHtmlFontDetail { struct _GtkIMHtmlFontDetail {
gushort size; gushort size;
gchar *face; gchar *face;
gchar *fore; gchar *fore;
gchar *back; gchar *back;
gchar *bg; gchar *bg;
gchar *sml; gchar *sml;
gboolean underline; gboolean underline;
gshort bold; gshort bold;
}; };
#endif
struct _GtkSmileyTree { struct _GtkSmileyTree {
GString *values; GString *values;
GtkSmileyTree **children; GtkSmileyTree **children;
GtkIMHtmlSmiley *image; GtkIMHtmlSmiley *image;
}; };
struct _GtkIMHtmlSmiley { struct _GtkIMHtmlSmiley {
gchar *smile; gchar *smile;
gchar *file; gchar *file;
 End of changes. 4 change blocks. 
0 lines changed or deleted 5 lines changed or added


 version.h   version.h 
skipping to change at line 32 skipping to change at line 32
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_VERSION_H_ #ifndef _PURPLE_VERSION_H_
#define _PURPLE_VERSION_H_ #define _PURPLE_VERSION_H_
/** The major version of the running libpurple. */ /** The major version of the running libpurple. */
#define PURPLE_MAJOR_VERSION (2) #define PURPLE_MAJOR_VERSION (2)
/** The minor version of the running libpurple. */ /** The minor version of the running libpurple. */
#define PURPLE_MINOR_VERSION (7) #define PURPLE_MINOR_VERSION (7)
/** The micro version of the running libpurple. */ /** The micro version of the running libpurple. */
#define PURPLE_MICRO_VERSION (9) #define PURPLE_MICRO_VERSION (11)
#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/