codec.h   codec.h 
skipping to change at line 123 skipping to change at line 123
*/ */
guint purple_media_codec_get_channels(PurpleMediaCodec *codec); guint purple_media_codec_get_channels(PurpleMediaCodec *codec);
/** /**
* Gets a list of the optional parameters. * Gets a list of the optional parameters.
* *
* The list consists of PurpleKeyValuePair's. * The list consists of PurpleKeyValuePair's.
* *
* @param The codec to get the optional parameters from. * @param The codec to get the optional parameters from.
* *
* @return The list of optional parameters. * @return The list of optional parameters. The list is owned by the codec
and
* should not be freed.
* *
* @since 2.6.0 * @since 2.6.0
*/ */
GList *purple_media_codec_get_optional_parameters(PurpleMediaCodec *codec); GList *purple_media_codec_get_optional_parameters(PurpleMediaCodec *codec);
/** /**
* Adds an optional parameter to the codec. * Adds an optional parameter to the codec.
* *
* @param codec The codec to add the parameter to. * @param codec The codec to add the parameter to.
* @param name The name of the parameter to add. * @param name The name of the parameter to add.
 End of changes. 1 change blocks. 
1 lines changed or deleted 3 lines changed or added


 ft.h   ft.h 
skipping to change at line 61 skipping to change at line 61
/** /**
* The different states of the xfer. * The different states of the xfer.
*/ */
typedef enum typedef enum
{ {
PURPLE_XFER_STATUS_UNKNOWN = 0, /**< Unknown, the xfer may be null . */ PURPLE_XFER_STATUS_UNKNOWN = 0, /**< Unknown, the xfer may be null . */
PURPLE_XFER_STATUS_NOT_STARTED, /**< It hasn't started yet. */ PURPLE_XFER_STATUS_NOT_STARTED, /**< It hasn't started yet. */
PURPLE_XFER_STATUS_ACCEPTED, /**< Receive accepted, but destina tion file not selected yet */ PURPLE_XFER_STATUS_ACCEPTED, /**< Receive accepted, but destina tion file not selected yet */
PURPLE_XFER_STATUS_STARTED, /**< purple_xfer_start has been ca lled. */ PURPLE_XFER_STATUS_STARTED, /**< purple_xfer_start has been ca lled. */
PURPLE_XFER_STATUS_DONE, /**< The xfer completed successful ly. */ PURPLE_XFER_STATUS_DONE, /**< The xfer completed successful ly. */
PURPLE_XFER_STATUS_CANCEL_LOCAL, /**< The xfer was canceled by us. PURPLE_XFER_STATUS_CANCEL_LOCAL, /**< The xfer was cancelled by us.
*/ */
PURPLE_XFER_STATUS_CANCEL_REMOTE /**< The xfer was canceled by the PURPLE_XFER_STATUS_CANCEL_REMOTE /**< The xfer was cancelled by the
other end, or we couldn't connect. */ other end, or we couldn't connect. */
} PurpleXferStatusType; } PurpleXferStatusType;
/** /**
* File transfer UI operations. * File transfer UI operations.
* *
* Any UI representing a file transfer must assign a filled-out * Any UI representing a file transfer must assign a filled-out
* PurpleXferUiOps structure to the purple_xfer. * PurpleXferUiOps structure to the purple_xfer.
*/ */
typedef struct typedef struct
{ {
skipping to change at line 307 skipping to change at line 307
/** /**
* Returns the status of the xfer. * Returns the status of the xfer.
* *
* @param xfer The file transfer. * @param xfer The file transfer.
* *
* @return The status. * @return The status.
*/ */
PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer); PurpleXferStatusType purple_xfer_get_status(const PurpleXfer *xfer);
/** /**
* Returns true if the file transfer was canceled. * Returns true if the file transfer was cancelled.
* *
* @param xfer The file transfer. * @param xfer The file transfer.
* *
* @return Whether or not the transfer was canceled. * @return Whether or not the transfer was cancelled.
* FIXME: This should be renamed using cancelled for 3.0.0.
*/ */
gboolean purple_xfer_is_canceled(const PurpleXfer *xfer); gboolean purple_xfer_is_canceled(const PurpleXfer *xfer);
/** /**
* Returns the completed state for a file transfer. * Returns the completed state for a file transfer.
* *
* @param xfer The file transfer. * @param xfer The file transfer.
* *
* @return The completed state. * @return The completed state.
*/ */
 End of changes. 3 change blocks. 
6 lines changed or deleted 7 lines changed or added


 gntft.h   gntft.h 
skipping to change at line 74 skipping to change at line 74
void finch_xfer_dialog_add_xfer(PurpleXfer *xfer); void finch_xfer_dialog_add_xfer(PurpleXfer *xfer);
/** /**
* Removes a file transfer from the dialog. * Removes a file transfer from the dialog.
* *
* @param xfer The file transfer. * @param xfer The file transfer.
*/ */
void finch_xfer_dialog_remove_xfer(PurpleXfer *xfer); void finch_xfer_dialog_remove_xfer(PurpleXfer *xfer);
/** /**
* Indicate in a file transfer dialog that a transfer was canceled. * Indicate in a file transfer dialog that a transfer was cancelled.
* *
* @param xfer The file transfer that was canceled. * @param xfer The file transfer that was cancelled.
*/ */
void finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer); void finch_xfer_dialog_cancel_xfer(PurpleXfer *xfer);
/** /**
* Updates the information for a transfer in the dialog. * Updates the information for a transfer in the dialog.
* *
* @param xfer The file transfer. * @param xfer The file transfer.
*/ */
void finch_xfer_dialog_update_xfer(PurpleXfer *xfer); void finch_xfer_dialog_update_xfer(PurpleXfer *xfer);
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 gtkft.h   gtkft.h 
skipping to change at line 91 skipping to change at line 91
/** /**
* Removes a file transfer from the dialog. * Removes a file transfer from the dialog.
* *
* @param dialog The file transfer dialog. * @param dialog The file transfer dialog.
* @param xfer The file transfer. * @param xfer The file transfer.
*/ */
void pidgin_xfer_dialog_remove_xfer(PidginXferDialog *dialog, void pidgin_xfer_dialog_remove_xfer(PidginXferDialog *dialog,
Pur pleXfer *xfer); Pur pleXfer *xfer);
/** /**
* Indicate in a file transfer dialog that a transfer was canceled. * Indicate in a file transfer dialog that a transfer was cancelled.
* *
* @param dialog The file transfer dialog. * @param dialog The file transfer dialog.
* @param xfer The file transfer that was canceled. * @param xfer The file transfer that was cancelled.
*/ */
void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog, void pidgin_xfer_dialog_cancel_xfer(PidginXferDialog *dialog,
Pur pleXfer *xfer); Pur pleXfer *xfer);
/** /**
* Updates the information for a transfer in the dialog. * Updates the information for a transfer in the dialog.
* *
* @param dialog The file transfer dialog. * @param dialog The file transfer dialog.
* @param xfer The file transfer. * @param xfer The file transfer.
*/ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 gtkutils.h   gtkutils.h 
skipping to change at line 716 skipping to change at line 716
* the callback returns the dialog will be destroyed. * the callback returns the dialog will be destroyed.
* @return A #PidginMiniDialog, suitable for passing to * @return A #PidginMiniDialog, suitable for passing to
* pidgin_blist_add_alert(). * pidgin_blist_add_alert().
* @see pidginstock.h * @see pidginstock.h
*/ */
GtkWidget *pidgin_make_mini_dialog(PurpleConnection *handle, GtkWidget *pidgin_make_mini_dialog(PurpleConnection *handle,
const char* stock_id, const char *primary, const char *secondary, const char* stock_id, const char *primary, const char *secondary,
void *user_data, ...) G_GNUC_NULL_TERMINATED; void *user_data, ...) G_GNUC_NULL_TERMINATED;
/** /**
* Does exactly what pidgin_make_mini_dialog() does, except you can specify
* a custom icon for the dialog.
*/
GtkWidget *pidgin_make_mini_dialog_with_custom_icon(PurpleConnection *gc,
GdkPixbuf *custom_icon,
const char *primary,
const char *secondary,
void *user_data,
...) G_GNUC_NULL_TERMINATED;
/**
* This is a callback function to be used for Ctrl+F searching in treeviews . * This is a callback function to be used for Ctrl+F searching in treeviews .
* Sample Use: * Sample Use:
* gtk_tree_view_set_search_equal_func(treeview, * gtk_tree_view_set_search_equal_func(treeview,
* pidgin_tree_view_search_equal_func, * pidgin_tree_view_search_equal_func,
* search_data, search_data_destroy_cb); * search_data, search_data_destroy_cb);
* *
*/ */
gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint colum n, gboolean pidgin_tree_view_search_equal_func(GtkTreeModel *model, gint colum n,
const gchar *key, GtkTreeIter *iter, gpointer data); const gchar *key, GtkTreeIter *iter, gpointer data);
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added


 minidialog.h   minidialog.h 
skipping to change at line 76 skipping to change at line 76
* <dt><tt>"title"</tt> (<tt>char *</tt>)</dt> * <dt><tt>"title"</tt> (<tt>char *</tt>)</dt>
* <dd>A string to be displayed as the dialog's title.</dd> * <dd>A string to be displayed as the dialog's title.</dd>
* <dt><tt>"description"</tt> (<tt>char *</tt>)</dt> * <dt><tt>"description"</tt> (<tt>char *</tt>)</dt>
* <dd>A string to be displayed as the dialog's description. If this is @c * <dd>A string to be displayed as the dialog's description. If this is @c
* NULL, the description widget will be hidden. * NULL, the description widget will be hidden.
* </dd> * </dd>
* <dt><tt>"icon-name"</tt> (<tt>char *</tt>)</dt> * <dt><tt>"icon-name"</tt> (<tt>char *</tt>)</dt>
* <dd>The Gtk stock id of an icon for the dialog, or @c NULL for no icon . * <dd>The Gtk stock id of an icon for the dialog, or @c NULL for no icon .
* @see pidginstock.h * @see pidginstock.h
* </dd> * </dd>
* <dt><tt>"custom-icon"</tt> (<tt>GdkPixbuf *</tt>)</dt>
* <dd>The custom icon to use instead of a stock one (overrides the "icon
-name" property).</dd>
* </dl> * </dl>
*/ */
typedef struct { typedef struct {
GtkVBox parent; GtkVBox parent;
/** A GtkVBox into which extra widgets for the dialog should be pack ed. /** A GtkVBox into which extra widgets for the dialog should be pack ed.
*/ */
GtkBox *contents; GtkBox *contents;
gpointer priv; gpointer priv;
skipping to change at line 111 skipping to change at line 113
* @param user_data arbitrary data, supplied to * @param user_data arbitrary data, supplied to
* pidgin_mini_dialog_add_button() when the button was * pidgin_mini_dialog_add_button() when the button was
* created. * created.
*/ */
typedef void (*PidginMiniDialogCallback)(PidginMiniDialog *mini_dialog, typedef void (*PidginMiniDialogCallback)(PidginMiniDialog *mini_dialog,
GtkButton *button, gpointer user_data); GtkButton *button, gpointer user_data);
/** Get the GType of #PidginMiniDialog. */ /** Get the GType of #PidginMiniDialog. */
GType pidgin_mini_dialog_get_type (void); GType pidgin_mini_dialog_get_type (void);
/** Creates a new #PidginMiniDialog. This is a shortcut for creating the d ialog /** Creates a new #PidginMiniDialog with a stock icon. This is a shortcut f or creating the dialog
* with @c g_object_new() then setting each property yourself. * with @c g_object_new() then setting each property yourself.
* @return a new #PidginMiniDialog. * @return a new #PidginMiniDialog.
*/ */
PidginMiniDialog *pidgin_mini_dialog_new(const gchar *title, PidginMiniDialog *pidgin_mini_dialog_new(const gchar *title,
const gchar *description, const gchar *icon_name); const gchar *description, const gchar *icon_name);
/** Creates a new #PidginMiniDialog with a custom icon. This is a shortcut
for creating the dialog
* with @c g_object_new() then setting each property yourself.
* @return a new #PidginMiniDialog.
*/
PidginMiniDialog *pidgin_mini_dialog_new_with_custom_icon(const gchar *titl
e,
const gchar *description, GdkPixbuf *custom_icon);
/** Shortcut for setting a mini-dialog's title via GObject properties. /** Shortcut for setting a mini-dialog's title via GObject properties.
* @param mini_dialog a mini-dialog * @param mini_dialog a mini-dialog
* @param title the new title for @a mini_dialog * @param title the new title for @a mini_dialog
*/ */
void pidgin_mini_dialog_set_title(PidginMiniDialog *mini_dialog, void pidgin_mini_dialog_set_title(PidginMiniDialog *mini_dialog,
const char *title); const char *title);
/** Shortcut for setting a mini-dialog's description via GObject properties . /** Shortcut for setting a mini-dialog's description via GObject properties .
* @param mini_dialog a mini-dialog * @param mini_dialog a mini-dialog
* @param description the new description for @a mini_dialog, or @c NULL t o * @param description the new description for @a mini_dialog, or @c NULL t o
skipping to change at line 140 skipping to change at line 149
void pidgin_mini_dialog_set_description(PidginMiniDialog *mini_dialog, void pidgin_mini_dialog_set_description(PidginMiniDialog *mini_dialog,
const char *description); const char *description);
/** Shortcut for setting a mini-dialog's icon via GObject properties. /** Shortcut for setting a mini-dialog's icon via GObject properties.
* @param mini_dialog a mini-dialog * @param mini_dialog a mini-dialog
* @param icon_name the Gtk stock ID of an icon, or @c NULL for no icon. * @param icon_name the Gtk stock ID of an icon, or @c NULL for no icon.
*/ */
void pidgin_mini_dialog_set_icon_name(PidginMiniDialog *mini_dialog, void pidgin_mini_dialog_set_icon_name(PidginMiniDialog *mini_dialog,
const char *icon_name); const char *icon_name);
/** Shortcut for setting a mini-dialog's custom icon via GObject properties
.
* @param mini_dialog a mini-dialog
* @param icon_name the pixbuf to use as a custom icon
*/
void pidgin_mini_dialog_set_custom_icon(PidginMiniDialog *mini_dialog,
GdkPixbuf *custom_icon);
/** Adds a new button to a mini-dialog, and attaches the supplied callback to /** Adds a new button to a mini-dialog, and attaches the supplied callback to
* its <tt>clicked</tt> signal. After a button is clicked, the dialog is * its <tt>clicked</tt> signal. After a button is clicked, the dialog is
* destroyed. * destroyed.
* @param mini_dialog a mini-dialog * @param mini_dialog a mini-dialog
* @param text the text to display on the new button * @param text the text to display on the new button
* @param clicked_cb the function to call when the button is clicked * @param clicked_cb the function to call when the button is clicked
* @param user_data arbitrary data to pass to @a clicked_cb when it is * @param user_data arbitrary data to pass to @a clicked_cb when it is
* called. * called.
*/ */
void pidgin_mini_dialog_add_button(PidginMiniDialog *mini_dialog, void pidgin_mini_dialog_add_button(PidginMiniDialog *mini_dialog,
 End of changes. 4 change blocks. 
1 lines changed or deleted 21 lines changed or added


 network.h   network.h 
skipping to change at line 242 skipping to change at line 242
*/ */
PurpleNetworkListenData *purple_network_listen_range_family( PurpleNetworkListenData *purple_network_listen_range_family(
unsigned short start, unsigned short end, int socket_family, unsigned short start, unsigned short end, int socket_family,
int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data); int socket_type, PurpleNetworkListenCallback cb, gpointer cb_data);
/** /**
* This can be used to cancel any in-progress listener connection * This can be used to cancel any in-progress listener connection
* by passing in the return value from either purple_network_listen() * by passing in the return value from either purple_network_listen()
* or purple_network_listen_range(). * or purple_network_listen_range().
* *
* @param listen_data This listener attempt will be canceled and * @param listen_data This listener attempt will be cancelled and
* the struct will be freed. * the struct will be freed.
*/ */
void purple_network_listen_cancel(PurpleNetworkListenData *listen_data); void purple_network_listen_cancel(PurpleNetworkListenData *listen_data);
/** /**
* Gets a port number from a file descriptor. * Gets a port number from a file descriptor.
* *
* @param fd The file descriptor. This should be a tcp socket. The current * @param fd The file descriptor. This should be a tcp socket. The current
* implementation probably dies on anything but IPv4. Perhaps thi s * implementation probably dies on anything but IPv4. Perhaps thi s
* possible bug will inspire new and valuable contributors to Pur ple. * possible bug will inspire new and valuable contributors to Pur ple.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pidginstock.h   pidginstock.h 
skipping to change at line 47 skipping to change at line 47
#define PIDGIN_STOCK_ALIAS "pidgin-alias" #define PIDGIN_STOCK_ALIAS "pidgin-alias"
#define PIDGIN_STOCK_AWAY "pidgin-away" #define PIDGIN_STOCK_AWAY "pidgin-away"
#define PIDGIN_STOCK_CHAT "pidgin-chat" #define PIDGIN_STOCK_CHAT "pidgin-chat"
#define PIDGIN_STOCK_CLEAR "pidgin-clear" #define PIDGIN_STOCK_CLEAR "pidgin-clear"
#define PIDGIN_STOCK_CLOSE_TABS "pidgin-close-tab" #define PIDGIN_STOCK_CLOSE_TABS "pidgin-close-tab"
#define PIDGIN_STOCK_DEBUG "pidgin-debug" #define PIDGIN_STOCK_DEBUG "pidgin-debug"
#define PIDGIN_STOCK_DISCONNECT "pidgin-disconnect" #define PIDGIN_STOCK_DISCONNECT "pidgin-disconnect"
#define PIDGIN_STOCK_DOWNLOAD "pidgin-download" #define PIDGIN_STOCK_DOWNLOAD "pidgin-download"
#define PIDGIN_STOCK_EDIT "pidgin-edit" #define PIDGIN_STOCK_EDIT "pidgin-edit"
#define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor" #define PIDGIN_STOCK_FGCOLOR "pidgin-fgcolor"
#define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-canceled" #define PIDGIN_STOCK_FILE_CANCELED "pidgin-file-cancelled"
#define PIDGIN_STOCK_FILE_DONE "pidgin-file-done" #define PIDGIN_STOCK_FILE_DONE "pidgin-file-done"
#define PIDGIN_STOCK_IGNORE "pidgin-ignore" #define PIDGIN_STOCK_IGNORE "pidgin-ignore"
#define PIDGIN_STOCK_INFO "pidgin-info" #define PIDGIN_STOCK_INFO "pidgin-info"
#define PIDGIN_STOCK_INVITE "pidgin-invite" #define PIDGIN_STOCK_INVITE "pidgin-invite"
#define PIDGIN_STOCK_MODIFY "pidgin-modify" #define PIDGIN_STOCK_MODIFY "pidgin-modify"
#define PIDGIN_STOCK_ADD "pidgin-add" #define PIDGIN_STOCK_ADD "pidgin-add"
#define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail" #define PIDGIN_STOCK_OPEN_MAIL "pidgin-stock-open-mail"
#define PIDGIN_STOCK_PAUSE "pidgin-pause" #define PIDGIN_STOCK_PAUSE "pidgin-pause"
#define PIDGIN_STOCK_POUNCE "pidgin-pounce" #define PIDGIN_STOCK_POUNCE "pidgin-pounce"
#define PIDGIN_STOCK_SIGN_OFF "pidgin-sign-off" #define PIDGIN_STOCK_SIGN_OFF "pidgin-sign-off"
 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 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 (3) #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. 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/