account.h   account.h 
skipping to change at line 34 skipping to change at line 34
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_ACCOUNT_H_ #ifndef _PURPLE_ACCOUNT_H_
#define _PURPLE_ACCOUNT_H_ #define _PURPLE_ACCOUNT_H_
#include <glib-object.h> #include <glib-object.h>
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
/** @copydoc _PurpleAccountUiOps */
typedef struct _PurpleAccountUiOps PurpleAccountUiOps; typedef struct _PurpleAccountUiOps PurpleAccountUiOps;
/** @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 *);
typedef void (*PurpleAccountRegistrationCb)(PurpleAccount *account, gboolea n succeeded, void *user_data); typedef void (*PurpleAccountRegistrationCb)(PurpleAccount *account, gboolea n succeeded, void *user_data);
typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gbool ean succeeded, void *user_data); typedef void (*PurpleAccountUnregistrationCb)(PurpleAccount *account, gbool ean succeeded, void *user_data);
#include "connection.h" #include "connection.h"
#include "log.h" #include "log.h"
#include "proxy.h" #include "proxy.h"
skipping to change at line 107 skipping to change at line 109
* as returned by #request_authorize. * as returned by #request_authorize.
*/ */
void (*close_account_request)(void *ui_handle); void (*close_account_request)(void *ui_handle);
void (*_purple_reserved1)(void); void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void); void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void); void (*_purple_reserved3)(void);
void (*_purple_reserved4)(void); void (*_purple_reserved4)(void);
}; };
/** Structure representing an account.
*/
struct _PurpleAccount struct _PurpleAccount
{ {
char *username; /**< The username. */ char *username; /**< The username. */
char *alias; /**< How you appear to yourself. */ char *alias; /**< How you appear to yourself. */
char *password; /**< The account password. */ char *password; /**< The account password. */
char *user_info; /**< User information. */ char *user_info; /**< User information. */
char *buddy_icon_path; /**< The buddy icon's non-cached path. */ char *buddy_icon_path; /**< The buddy icon's non-cached path. */
gboolean remember_pass; /**< Remember the password. */ gboolean remember_pass; /**< Remember the password. */
 End of changes. 3 change blocks. 
0 lines changed or deleted 4 lines changed or added


 debug.h   debug.h 
skipping to change at line 77 skipping to change at line 77
/** @name Debug API * / /** @name Debug API * /
/************************************************************************** / /************************************************************************** /
/** /**
* Outputs debug information. * Outputs debug information.
* *
* @param level The debug level. * @param level The debug level.
* @param category The category (or @c NULL). * @param category The category (or @c NULL).
* @param format The format string. * @param format The format string.
*/ */
void purple_debug(PurpleDebugLevel level, const char *category, void purple_debug(PurpleDebugLevel level, const char *category,
const char *format, ...); const char *format, ...) G_GNUC_PRINTF(3, 4) ;
/** /**
* Outputs misc. level debug information. * Outputs misc. level debug information.
* *
* This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_MISC as * This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_MISC as
* the level. * the level.
* *
* @param category The category (or @c NULL). * @param category The category (or @c NULL).
* @param format The format string. * @param format The format string.
* *
* @see purple_debug() * @see purple_debug()
*/ */
void purple_debug_misc(const char *category, const char *format, ...); void purple_debug_misc(const char *category, const char *format, ...) G_GNU C_PRINTF(2, 3);
/** /**
* Outputs info level debug information. * Outputs info level debug information.
* *
* This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_INFO as * This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_INFO as
* the level. * the level.
* *
* @param category The category (or @c NULL). * @param category The category (or @c NULL).
* @param format The format string. * @param format The format string.
* *
* @see purple_debug() * @see purple_debug()
*/ */
void purple_debug_info(const char *category, const char *format, ...); void purple_debug_info(const char *category, const char *format, ...) G_GNU C_PRINTF(2, 3);
/** /**
* Outputs warning level debug information. * Outputs warning level debug information.
* *
* This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_WARNING as * This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_WARNING as
* the level. * the level.
* *
* @param category The category (or @c NULL). * @param category The category (or @c NULL).
* @param format The format string. * @param format The format string.
* *
* @see purple_debug() * @see purple_debug()
*/ */
void purple_debug_warning(const char *category, const char *format, ...); void purple_debug_warning(const char *category, const char *format, ...) G_ GNUC_PRINTF(2, 3);
/** /**
* Outputs error level debug information. * Outputs error level debug information.
* *
* This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_ERROR as * This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_ERROR as
* the level. * the level.
* *
* @param category The category (or @c NULL). * @param category The category (or @c NULL).
* @param format The format string. * @param format The format string.
* *
* @see purple_debug() * @see purple_debug()
*/ */
void purple_debug_error(const char *category, const char *format, ...); void purple_debug_error(const char *category, const char *format, ...) G_GN UC_PRINTF(2, 3);
/** /**
* Outputs fatal error level debug information. * Outputs fatal error level debug information.
* *
* This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_ERROR as * This is a wrapper for purple_debug(), and uses PURPLE_DEBUG_ERROR as
* the level. * the level.
* *
* @param category The category (or @c NULL). * @param category The category (or @c NULL).
* @param format The format string. * @param format The format string.
* *
* @see purple_debug() * @see purple_debug()
*/ */
void purple_debug_fatal(const char *category, const char *format, ...); void purple_debug_fatal(const char *category, const char *format, ...) G_GN UC_PRINTF(2, 3);
/** /**
* Enable or disable printing debug output to the console. * Enable or disable printing debug output to the console.
* *
* @param enabled TRUE to enable debug output or FALSE to disable it. * @param enabled TRUE to enable debug output or FALSE to disable it.
*/ */
void purple_debug_set_enabled(gboolean enabled); void purple_debug_set_enabled(gboolean enabled);
/** /**
* Check if console debug output is enabled. * Check if console debug output is enabled.
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 eventloop.h   eventloop.h 
skipping to change at line 45 skipping to change at line 45
/** /**
* An input condition. * An input condition.
*/ */
typedef enum typedef enum
{ {
PURPLE_INPUT_READ = 1 << 0, /**< A read condition. */ PURPLE_INPUT_READ = 1 << 0, /**< A read condition. */
PURPLE_INPUT_WRITE = 1 << 1 /**< A write condition. */ PURPLE_INPUT_WRITE = 1 << 1 /**< A write condition. */
} PurpleInputCondition; } PurpleInputCondition;
/** The type of callbacks to handle events on file descriptors, as passed t
o
* purple_input_add(). The callback will receive the @c user_data passed
to
* purple_input_add(), the file descriptor on which the event occurred, an
d the
* condition that was satisfied to cause the callback to be invoked.
*/
typedef void (*PurpleInputFunction)(gpointer, gint, PurpleInputCondition); typedef void (*PurpleInputFunction)(gpointer, gint, PurpleInputCondition);
/** @copydoc _PurpleEventLoopUiOps */
typedef struct _PurpleEventLoopUiOps PurpleEventLoopUiOps; typedef struct _PurpleEventLoopUiOps PurpleEventLoopUiOps;
/** An abstraction of an application's mainloop; libpurple will use this to
* watch file descriptors and schedule timed callbacks. If your applicati
on
* uses the glib mainloop, there is an implementation of this struct in
* <tt>libpurple/example/nullclient.c</tt> which you can use verbatim.
*/
struct _PurpleEventLoopUiOps struct _PurpleEventLoopUiOps
{ {
/** /**
* Creates a callback timer with an interval measured in millisecond * Should create a callback timer with an interval measured in
s. * milliseconds. The supplied @a function should be called every @a
* @see g_timeout_add, purple_timeout_add * interval seconds until it returns @c FALSE, after which it should
not
* be called again.
*
* Analogous to g_timeout_add in glib.
*
* @param interval the interval in <em>milliseconds</em> between cal
ls
* to @a function.
* @param data arbitrary data to be passed to @a function at eac
h
* call.
* @todo Who is responsible for freeing @a data?
*
* @return a handle for the timeout, which can be passed to
* #timeout_remove.
*
* @see purple_timeout_add
**/ **/
guint (*timeout_add)(guint interval, GSourceFunc function, gpointer data); guint (*timeout_add)(guint interval, GSourceFunc function, gpointer data);
/** /**
* Removes a callback timer. * Should remove a callback timer. Analogous to g_source_remove in
* @see purple_timeout_remove, g_source_remove glib.
* @param handle an identifier for a timeout, as returned by
* #timeout_add.
* @return @c TRUE if the timeout identified by @a handle was
* found and removed.
* @see purple_timeout_remove
*/ */
gboolean (*timeout_remove)(guint handle); gboolean (*timeout_remove)(guint handle);
/** /**
* Adds an input handler. * Should add an input handler. Analogous to g_io_add_watch_full in
* @see purple_input_add, g_io_add_watch_full * glib.
*
* @param fd a file descriptor to watch for events
* @param cond a bitwise OR of events on @a fd for which @a fun
c
* should be called.
* @param func a callback to fire whenever a relevant event on
@a
* fd occurs.
* @param user_data arbitrary data to pass to @a fd.
* @return an identifier for this input handler, which can
be
* passed to #input_remove.
*
* @see purple_input_add
*/ */
guint (*input_add)(int fd, PurpleInputCondition cond, guint (*input_add)(int fd, PurpleInputCondition cond,
PurpleInputFunction func, gpointe r user_data); PurpleInputFunction func, gpointer user_data);
/** /**
* Removes an input handler. * Should remove an input handler. Analogous to g_source_remove in
* @see purple_input_remove, g_source_remove glib.
* @param handle an identifier, as returned by #input_add.
* @return @c TRUE if the input handler was found and removed.
* @see purple_input_remove
*/ */
gboolean (*input_remove)(guint handle); gboolean (*input_remove)(guint handle);
/** /**
* Get the current error status for an input. * If implemented, should get the current error status for an input.
* Implementation of this UI op is optional. Implement it if the UI' *
s sockets * Implementation of this UI op is optional. Implement it if the UI'
* or event loop needs to customize determination of socket error st s
atus. * sockets or event loop needs to customize determination of socket
* @see purple_input_get_error, getsockopt * error status. If unimplemented, <tt>getsockopt(2)</tt> will be u
sed
* instead.
*
* @see purple_input_get_error
*/ */
int (*input_get_error)(int fd, int *error); int (*input_get_error)(int fd, int *error);
/** /**
* Creates a callback timer with an interval measured in seconds. * If implemented, should create a callback timer with an interval
* 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 the * calls to purple_timeout_add_seconds() will be serviced by
* timeout_add UI op. * #timeout_add.
* *
* @see g_timeout_add_seconds, purple_timeout_add_seconds() * @see purple_timeout_add_seconds()
**/ **/
guint (*timeout_add_seconds)(guint interval, GSourceFunc function, g guint (*timeout_add_seconds)(guint interval, GSourceFunc function,
pointer 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);
}; };
/************************************************************************** / /************************************************************************** /
/** @name Event Loop API * / /** @name Event Loop API * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
skipping to change at line 121 skipping to change at line 170
* first call will be at the end of the first interval. * first call will be at the end of the first interval.
* *
* If the timer is in a multiple of seconds, use purple_timeout_add_seconds () * If the timer is in a multiple of seconds, use purple_timeout_add_seconds ()
* instead as it allows UIs to group timers for power efficiency. * instead as it allows UIs to group timers for power efficiency.
* *
* @param interval The time between calls of the function, in * @param interval The time between calls of the function, in
* milliseconds. * milliseconds.
* @param function The function to call. * @param function The function to call.
* @param data data to pass to @a function. * @param data data to pass to @a function.
* @return A handle to the timer which can be passed to * @return A handle to the timer which can be passed to
* purple_timeout_remove to remove the timer. * purple_timeout_remove() to remove the timer.
*/ */
guint purple_timeout_add(guint interval, GSourceFunc function, gpointer dat a); guint purple_timeout_add(guint interval, GSourceFunc function, gpointer dat a);
/** /**
* Creates a callback timer. * Creates a callback timer.
* *
* The timer will repeat until the function returns @c FALSE. The * The timer will repeat until the function returns @c FALSE. The
* first call will be at the end of the first interval. * first call will be at the end of the first interval.
* *
* This function allows UIs to group timers for better power efficiency. F or * This function allows UIs to group timers for better power efficiency. F or
* this reason, @a interval may be rounded by up to a second. * this reason, @a interval may be rounded by up to a second.
* *
* @param interval The time between calls of the function, in * @param interval The time between calls of the function, in
* seconds. * seconds.
* @param function The function to call. * @param function The function to call.
* @param data data to pass to @a function. * @param data data to pass to @a function.
* @return A handle to the timer which can be passed to * @return A handle to the timer which can be passed to
* purple_timeout_remove to remove the timer. * purple_timeout_remove() to remove the timer.
* *
* @since 2.1.0 * @since 2.1.0
*/ */
guint purple_timeout_add_seconds(guint interval, GSourceFunc function, gpoi nter data); guint purple_timeout_add_seconds(guint interval, GSourceFunc function, gpoi nter data);
/** /**
* Removes a timeout handler. * Removes a timeout handler.
* *
* @param handle The handle, as returned by purple_timeout_add. * @param handle The handle, as returned by purple_timeout_add().
* *
* @return Something. * @return @c TRUE if the handler was successfully removed.
*/ */
gboolean purple_timeout_remove(guint handle); gboolean purple_timeout_remove(guint handle);
/** /**
* Adds an input handler. * Adds an input handler.
* *
* @param fd The input file descriptor. * @param fd The input file descriptor.
* @param cond The condition type. * @param cond The condition type.
* @param func The callback function for data. * @param func The callback function for data.
* @param user_data User-specified data. * @param user_data User-specified data.
* *
* @return The resulting handle (will be greater than 0). * @return The resulting handle (will be greater than 0).
* @see g_io_add_watch_full * @see g_io_add_watch_full
*/ */
guint purple_input_add(int fd, PurpleInputCondition cond, guint purple_input_add(int fd, PurpleInputCondition cond,
PurpleInputFunction func, gpointer user_data); PurpleInputFunction func, gpointer user_data);
/** /**
* Removes an input handler. * Removes an input handler.
* *
* @param handle The handle of the input handler. Note that this is the ret urn * @param handle The handle of the input handler. Note that this is the ret urn
* value from purple_input_add, <i>not</i> the file descriptor. * value from purple_input_add(), <i>not</i> the file descrip tor.
*/ */
gboolean purple_input_remove(guint handle); gboolean purple_input_remove(guint handle);
/** /**
* Get the current error status for an input. * Get the current error status for an input.
*
* The return value and error follow getsockopt() with a level of SOL_SOCKE T and an * The return value and error follow getsockopt() with a level of SOL_SOCKE T and an
* option name of SO_ERROR, and this is how the error is determined if the UI does not * option name of SO_ERROR, and this is how the error is determined if the UI does not
* implement the input_get_error UI op. * implement the input_get_error UI op.
* *
* @param fd The input file descriptor. * @param fd The input file descriptor.
* @param error A pointer to an int which on return will hav * @param error A pointer to an @c int which on return will have the er
e the error, or 0 if no error. ror, or
* @c 0 if no error.
* *
* @return 0 if there is no error; -1 if there is an error, in which case e * @return @c 0 if there is no error; @c -1 if there is an error, in which
rrno will be set. case
* @a errno will be set.
*/ */
int int
purple_input_get_error(int fd, int *error); purple_input_get_error(int fd, int *error);
/*@}*/ /*@}*/
/************************************************************************** / /************************************************************************** /
/** @name UI Registration Functions * / /** @name UI Registration Functions * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
 End of changes. 22 change blocks. 
32 lines changed or deleted 94 lines changed or added


 imgstore.h   imgstore.h 
skipping to change at line 32 skipping to change at line 32
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_IMGSTORE_H_ #ifndef _PURPLE_IMGSTORE_H_
#define _PURPLE_IMGSTORE_H_ #define _PURPLE_IMGSTORE_H_
#include <glib.h> #include <glib.h>
/** A reference-counted immutable wrapper around an image's data and its
* filename.
*/
typedef struct _PurpleStoredImage PurpleStoredImage; typedef struct _PurpleStoredImage PurpleStoredImage;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
* Add an image to the store. * Add an image to the store.
* *
* 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
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 request.h   request.h 
skipping to change at line 241 skipping to change at line 241
PurpleAccount *account, const char *who, PurpleAccount *account, const char *who,
PurpleConversation *conv, void *user_data); PurpleConversation *conv, void *user_data);
void (*_purple_reserved1)(void); void (*_purple_reserved1)(void);
void (*_purple_reserved2)(void); void (*_purple_reserved2)(void);
void (*_purple_reserved3)(void); void (*_purple_reserved3)(void);
void (*_purple_reserved4)(void); void (*_purple_reserved4)(void);
} PurpleRequestUiOps; } PurpleRequestUiOps;
typedef void (*PurpleRequestInputCb)(void *, const char *); typedef void (*PurpleRequestInputCb)(void *, const char *);
/** The type of callbacks passed to purple_request_action(). The first
* argument is the @a user_data parameter; the second is the index in the
list
* of actions of the one chosen.
*/
typedef void (*PurpleRequestActionCb)(void *, int); typedef void (*PurpleRequestActionCb)(void *, int);
typedef void (*PurpleRequestChoiceCb)(void *, int); typedef void (*PurpleRequestChoiceCb)(void *, int);
typedef void (*PurpleRequestFieldsCb)(void *, PurpleRequestFields *fields); typedef void (*PurpleRequestFieldsCb)(void *, PurpleRequestFields *fields);
typedef void (*PurpleRequestFileCb)(void *, const char *filename); typedef void (*PurpleRequestFileCb)(void *, const char *filename);
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/************************************************************************** / /************************************************************************** /
skipping to change at line 1267 skipping to change at line 1272
* @return A UI-specific handle. * @return A UI-specific handle.
*/ */
void *purple_request_choice(void *handle, const char *title, const char *pr imary, void *purple_request_choice(void *handle, const char *title, const char *pr imary,
const char *secondary, int default_value, const char *secondary, int default_value,
const char *ok_text, GCallback ok_cb, const char *ok_text, GCallback ok_cb,
const char *cancel_text, GCallback cancel_cb, const char *cancel_text, GCallback cancel_cb,
PurpleAccount *account, const char *who, PurpleConversation *conv, PurpleAccount *account, const char *who, PurpleConversation *conv,
void *user_data, ...) G_GNUC_NULL_TERMINATED; void *user_data, ...) G_GNUC_NULL_TERMINATED;
/** /**
* Prompts the user for multiple-choice input. * <tt>va_list</tt> version of purple_request_choice(); see its documentati
* on.
* @param handle The plugin or connection handle. For some things t
his
* is <em>extremely</em> important. See the comments
on
* purple_request_input().
* @param title The title of the message, or @c NULL if it should h
ave
* no title.
* @param primary The main point of the message, or @c NULL if you're
* feeling enigmatic.
* @param secondary Secondary information, or @c NULL if there is none.
* @param default_value The default choice; this should be one of the value
s
* listed in the varargs.
* @param ok_text The text for the @c OK button, which may not be @c
NULL.
* @param ok_cb The callback for the @c OK button, which may not be
@c
* NULL.
* @param cancel_text The text for the @c Cancel button, which may not be
@c
* NULL.
* @param cancel_cb The callback for the @c Cancel button, or @c NULL t
o do
* nothing.
* @param account The #PurpleAccount associated with this request, or
@c
* NULL if none is
* @param who The username of the buddy associated with this requ
est,
* or @c NULL if none is
* @param conv The #PurpleConversation associated with this reques
t, or
* @c NULL if none is
* @param user_data The data to pass to the callback.
* @param choices The choices, which should be pairs of <tt>char *</t
t>
* descriptions and <tt>int</tt> values, terminated wi
th a
* @c NULL parameter.
*
* @return A UI-specific handle.
*/ */
void *purple_request_choice_varg(void *handle, const char *title, void *purple_request_choice_varg(void *handle, const char *title,
const char *primary, const char *secondary, int default_value, const char *primary, const char *secondary, int default_value,
const char *ok_text, GCallback ok_cb, const char *ok_text, GCallback ok_cb,
const char *cancel_text, GCallback cancel_cb, const char *cancel_text, GCallback cancel_cb,
PurpleAccount *account, const char *who, PurpleConversation *conv, PurpleAccount *account, const char *who, PurpleConversation *conv,
void *user_data, va_list choices); void *user_data, va_list choices);
/** /**
* Prompts the user for an action. * Prompts the user for an action.
skipping to change at line 1333 skipping to change at line 1308
* @param account The #PurpleAccount associated with this request, o r @c * @param account The #PurpleAccount associated with this request, o r @c
* NULL if none is. * NULL if none is.
* @param who The username of the buddy associated with this req uest, * @param who The username of the buddy associated with this req uest,
* or @c NULL if none is. * or @c NULL if none is.
* @param conv The #PurpleConversation associated with this reque st, or * @param conv The #PurpleConversation associated with this reque st, or
* @c NULL if none is. * @c NULL if none is.
* @param user_data The data to pass to the callback. * @param user_data The data to pass to the callback.
* @param action_count The number of actions. * @param action_count The number of actions.
* @param ... A list of actions. These are pairs of * @param ... A list of actions. These are pairs of
* arguments. The first of each pair is the * arguments. The first of each pair is the
* <tt>char *</tt> that appears on the button. It sh * <tt>char *</tt> label that appears on the button.
ould It
* have an underscore before the letter you want * should have an underscore before the letter you wa
* to use as the accelerator key for the button. nt
* The second of each pair is the <tt>GCallback</tt> * to use as the accelerator key for the button. The
* second of each pair is the #PurpleRequestActionCb
* function to use when the button is clicked. * function to use when the button is clicked.
* *
* @return A UI-specific handle. * @return A UI-specific handle.
*/ */
void *purple_request_action(void *handle, const char *title, const char *pr imary, void *purple_request_action(void *handle, const char *title, const char *pr imary,
const char *secondary, int default_action, PurpleAccount *account, const char *secondary, int default_action, PurpleAccount *account,
const char *who, PurpleConversation *conv, void *user_data, const char *who, PurpleConversation *conv, void *user_data,
size_t action_count, ...); size_t action_count, ...);
/** /**
* Prompts the user for an action. * <tt>va_list</tt> version of purple_request_action(); see its documentati
* on.
* This is often represented as a dialog with a button for each action.
*
* @param handle The plugin or connection handle. For some things
this
* is <em>extremely</em> important. See the comments
on
* purple_request_input().
* @param title The title of the message, or @c NULL if it should
have
* no title.
* @param primary The main point of the message, or @c NULL if you'r
e
* feeling enigmatic.
* @param secondary Secondary information, or @c NULL if there is none
.
* @param default_action The default action, zero-indexed; if the third act
ion
* supplied should be the default, supply <tt>2</tt>.
* The should be the action that users are most likel
y
* to select.
* @param account The #PurpleAccount associated with this request, o
r @c
* NULL if none is.
* @param who The username of the buddy associated with this req
uest,
* or @c NULL if none is.
* @param conv The #PurpleConversation associated with this reque
st, or
* @c NULL if none is.
* @param user_data The data to pass to the callback.
* @param action_count The number of actions.
* @param actions A list of actions. These are pairs of
* arguments. The first of each pair is the
* <tt>char *</tt> that appears on the button. It sh
ould
* have an underscore before the letter you want
* to use as the accelerator key for the button.
* The second of each pair is the <tt>GCallback</tt>
* function to use when the button is clicked.
*
* @return A UI-specific handle.
*/ */
void *purple_request_action_varg(void *handle, const char *title, void *purple_request_action_varg(void *handle, const char *title,
const char *primary, const char *secondary, int default_action, const char *primary, const char *secondary, int default_action,
PurpleAccount *account, const char *who, PurpleConversation *conv, PurpleAccount *account, const char *who, PurpleConversation *conv,
void *user_data, size_t action_count, va_list actions); void *user_data, size_t action_count, va_list actions);
/** /**
* Displays groups of fields for the user to fill in. * Displays groups of fields for the user to fill in.
* *
* @param handle The plugin or connection handle. For some things thi s * @param handle The plugin or connection handle. For some things thi s
 End of changes. 4 change blocks. 
93 lines changed or deleted 16 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 (0) #define PURPLE_MICRO_VERSION (1)
#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/