blist.h   blist.h 
skipping to change at line 225 skipping to change at line 225
const char *alias, const char *name); const char *alias, const char *name);
void (*request_add_group)(void); void (*request_add_group)(void);
/** /**
* This is called when a node has been modified and should be saved. * This is called when a node has been modified and should be saved.
* *
* Implementation of this UI op is OPTIONAL. If not implemented, it will * Implementation of this UI op is OPTIONAL. If not implemented, it will
* be set to a fallback function that saves data to blist.xml like i n * be set to a fallback function that saves data to blist.xml like i n
* previous libpurple versions. * previous libpurple versions.
* *
* @attrib node The node which has been modified. * @param node The node which has been modified.
* *
* @since 2.6.0. * @since 2.6.0.
*/ */
void (*save_node)(PurpleBlistNode *node); void (*save_node)(PurpleBlistNode *node);
/** /**
* Called when a node is about to be removed from the buddy list. * Called when a node is about to be removed from the buddy list.
* The UI op should update the relevant data structures to remove th is * The UI op should update the relevant data structures to remove th is
* node (for example, removing a buddy from the group this node is i n). * node (for example, removing a buddy from the group this node is i n).
* *
* Implementation of this UI op is OPTIONAL. If not implemented, it will * Implementation of this UI op is OPTIONAL. If not implemented, it will
* be set to a fallback function that saves data to blist.xml like i n * be set to a fallback function that saves data to blist.xml like i n
* previous libpurple versions. * previous libpurple versions.
* *
* @attrib node The node which has been modified. * @param node The node which has been modified.
* @since 2.6.0. * @since 2.6.0.
*/ */
void (*remove_node)(PurpleBlistNode *node); void (*remove_node)(PurpleBlistNode *node);
/** /**
* Called to save all the data for an account. If the UI sets this, * Called to save all the data for an account. If the UI sets this,
* the callback must save the privacy and buddy list data for an acc ount. * the callback must save the privacy and buddy list data for an acc ount.
* If the account is NULL, save the data for all accounts. * If the account is NULL, save the data for all accounts.
* *
* Implementation of this UI op is OPTIONAL. If not implemented, it will * Implementation of this UI op is OPTIONAL. If not implemented, it will
* be set to a fallback function that saves data to blist.xml like i n * be set to a fallback function that saves data to blist.xml like i n
* previous libpurple versions. * previous libpurple versions.
* *
* @attrib account The account whose data to save. If NULL, save al l data * @param account The account whose data to save. If NULL, save all data
* for all accounts. * for all accounts.
* @since 2.6.0. * @since 2.6.0.
*/ */
void (*save_account)(PurpleAccount *account); void (*save_account)(PurpleAccount *account);
void (*_purple_reserved1)(void); void (*_purple_reserved1)(void);
}; };
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 conversation.h   conversation.h 
skipping to change at line 1302 skipping to change at line 1302
/** /**
* Invite a user to a chat. * Invite a user to a chat.
* The user will be prompted to enter the user's name or a message if one i s * The user will be prompted to enter the user's name or a message if one i s
* not given. * not given.
* *
* @param chat The chat. * @param chat The chat.
* @param user The user to invite to the chat. * @param user The user to invite to the chat.
* @param message The message to send with the invitation. * @param message The message to send with the invitation.
* @param confirm Prompt before sending the invitation. The user is always * @param confirm Prompt before sending the invitation. The user is always
* prompted if either #user or #message is @c NULL. * prompted if either \a user or \a message is @c NULL.
* *
* @since 2.6.0 * @since 2.6.0
*/ */
void purple_conv_chat_invite_user(PurpleConvChat *chat, const char *user, void purple_conv_chat_invite_user(PurpleConvChat *chat, const char *user,
const char *message, gboolean confirm); const char *message, gboolean confirm);
/** /**
* Returns true if we're no longer in this chat, * Returns true if we're no longer in this chat,
* and just left the window open. * and just left the window open.
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 core.h   core.h 
skipping to change at line 27 skipping to change at line 27
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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
*/ */
/*! @mainpage Pidgin/Finch/libpurple API Documentation
*
* <a href="group__core.html">libpurple</a> is intended to be the core of a
n IM
* program. <a href="group__pidgin.html">Pidgin</a> is a GTK+ frontend
* to libpurple, and <a href="group__finch.html">Finch</a> is an ncurses
* frontend built using <a href="group__gnt.html">libgnt</a>
* (GLib Ncurses Toolkit).
*/
#ifndef _PURPLE_CORE_H_ #ifndef _PURPLE_CORE_H_
#define _PURPLE_CORE_H_ #define _PURPLE_CORE_H_
typedef struct PurpleCore PurpleCore; typedef struct PurpleCore PurpleCore;
/** Callbacks that fire at different points of the initialization and teard own /** Callbacks that fire at different points of the initialization and teard own
* of libpurple, along with a hook to return descriptive information about the * of libpurple, along with a hook to return descriptive information about the
* UI. * UI.
*/ */
typedef struct typedef struct
 End of changes. 1 change blocks. 
0 lines changed or deleted 11 lines changed or added


 dnssrv.h   dnssrv.h 
skipping to change at line 101 skipping to change at line 101
* Cancel an TXT DNS query. * Cancel an TXT DNS query.
* *
* @param query_data The request to cancel. * @param query_data The request to cancel.
* @since 2.6.0 * @since 2.6.0
*/ */
void purple_txt_cancel(PurpleSrvQueryData *query_data); void purple_txt_cancel(PurpleSrvQueryData *query_data);
/** /**
* Get the value of the current TXT record. * Get the value of the current TXT record.
* *
* @param resp The TXT response record * @param response The TXT response record
* @returns The value of the current TXT record. * @returns The value of the current TXT record.
* @since 2.6.0 * @since 2.6.0
*/ */
const gchar *purple_txt_response_get_content(PurpleTxtResponse *resp); const gchar *purple_txt_response_get_content(PurpleTxtResponse *response);
/** /**
* Destroy a TXT DNS response object. * Destroy a TXT DNS response object.
* *
* @param response The PurpleTxtResponse to destroy. * @param response The PurpleTxtResponse to destroy.
* @since 2.6.0 * @since 2.6.0
*/ */
void purple_txt_response_destroy(PurpleTxtResponse *resp); void purple_txt_response_destroy(PurpleTxtResponse *response);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _PURPLE_DNSSRV_H */ #endif /* _PURPLE_DNSSRV_H */
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 gtkimhtml.h   gtkimhtml.h 
skipping to change at line 191 skipping to change at line 191
struct _GtkIMHtmlSmiley { struct _GtkIMHtmlSmiley {
gchar *smile; gchar *smile;
gchar *file; gchar *file;
GdkPixbufAnimation *icon; GdkPixbufAnimation *icon;
gboolean hidden; gboolean hidden;
GdkPixbufLoader *loader; GdkPixbufLoader *loader;
GSList *anchors; GSList *anchors;
GtkIMHtmlSmileyFlags flags; GtkIMHtmlSmileyFlags flags;
GtkIMHtml *imhtml; GtkIMHtml *imhtml;
gpointer data; /** @Since 2.6.0 */ gpointer data; /** @since 2.6.0 */
gsize datasize; /** @Since 2.6.0 */ gsize datasize; /** @since 2.6.0 */
}; };
struct _GtkIMHtmlScalable { struct _GtkIMHtmlScalable {
void (*scale)(struct _GtkIMHtmlScalable *, int, int); void (*scale)(struct _GtkIMHtmlScalable *, int, int);
void (*add_to)(struct _GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *); void (*add_to)(struct _GtkIMHtmlScalable *, GtkIMHtml *, GtkTextIter *);
void (*free)(struct _GtkIMHtmlScalable *); void (*free)(struct _GtkIMHtmlScalable *);
}; };
struct _GtkIMHtmlImage { struct _GtkIMHtmlImage {
GtkIMHtmlScalable scalable; GtkIMHtmlScalable scalable;
skipping to change at line 908 skipping to change at line 908
* @param name The name of the protocol (e.g. http://) * @param name The name of the protocol (e.g. http://)
* @param activate The callback to trigger when the protocol text is click ed. * @param activate The callback to trigger when the protocol text is click ed.
* Removes any current protocol definition if @c NULL. The * Removes any current protocol definition if @c NULL. The
* callback should return @c TRUE if the link was activate d * callback should return @c TRUE if the link was activate d
* properly, @c FALSE otherwise. * properly, @c FALSE otherwise.
* @param context_menu The callback to trigger when the context menu is po pped * @param context_menu The callback to trigger when the context menu is po pped
* up on the protocol text. The callback should return * up on the protocol text. The callback should return
* @c TRUE if the request for context menu was process ed * @c TRUE if the request for context menu was process ed
* successfully, @c FALSE otherwise. * successfully, @c FALSE otherwise.
* *
* @return @c TRUE if the protocol was successfully registered (or unregis tered, when #activate is @c NULL) * @return @c TRUE if the protocol was successfully registered (or unregis tered, when \a activate is @c NULL)
* *
* @since 2.6.0 * @since 2.6.0
*/ */
gboolean gtk_imhtml_class_register_protocol(const char *name, gboolean gtk_imhtml_class_register_protocol(const char *name,
gboolean (*activate)(GtkIMHtml *imhtml, GtkIMHtmlLink *link) , gboolean (*activate)(GtkIMHtml *imhtml, GtkIMHtmlLink *link) ,
gboolean (*context_menu)(GtkIMHtml *imhtml, GtkIMHtmlLink *l ink, GtkWidget *menu)); gboolean (*context_menu)(GtkIMHtml *imhtml, GtkIMHtmlLink *l ink, GtkWidget *menu));
/** /**
* Get the URL associated with a link. This should be used by the IMHtml pr otocol-callbacks. * Get the URL associated with a link. This should be used by the IMHtml pr otocol-callbacks.
* *
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 lines changed or added


 gtkmedia.h   gtkmedia.h 
skipping to change at line 24 skipping to change at line 24
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 , USA
*/ */
#ifndef __GTKMEDIA_H_ #ifndef __GTKMEDIA_H_
#define __GTKMEDIA_H_ #define __GTKMEDIA_H_
G_BEGIN_DECLS G_BEGIN_DECLS
void pidgin_medias_init(void); void pidgin_medias_init(void);
G_END_DECLS G_END_DECLS
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 media-gst.h   media-gst.h 
skipping to change at line 24 skipping to change at line 24
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_MEDIA_GST_H_ #ifndef _PURPLE_MEDIA_GST_H_
#define _PURPLE_MEDIA_GST_H_ #define _PURPLE_MEDIA_GST_H_
#include "media.h" #include "media.h"
#include "mediamanager.h" #include "mediamanager.h"
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define PURPLE_TYPE_MEDIA_ELEMENT_TYPE (purple_media_element_type _get_type()) #define PURPLE_TYPE_MEDIA_ELEMENT_TYPE (purple_media_element_type _get_type())
#define PURPLE_TYPE_MEDIA_ELEMENT_INFO (purple_media_element_info _get_type()) #define PURPLE_TYPE_MEDIA_ELEMENT_INFO (purple_media_element_info _get_type())
#define PURPLE_MEDIA_ELEMENT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CA ST((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo)) #define PURPLE_MEDIA_ELEMENT_INFO(obj) (G_TYPE_CHECK_INSTANCE_CA ST((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
#define PURPLE_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST( (klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo)) #define PURPLE_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST( (klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
#define PURPLE_IS_MEDIA_ELEMENT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TY PE((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO)) #define PURPLE_IS_MEDIA_ELEMENT_INFO(obj) (G_TYPE_CHECK_INSTANCE_TY PE((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO))
#define PURPLE_IS_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE( (klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO)) #define PURPLE_IS_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE( (klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO))
#define PURPLE_MEDIA_ELEMENT_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLAS S((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo)) #define PURPLE_MEDIA_ELEMENT_INFO_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLAS S((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))
/** @copydoc _PurpleMediaElementInfo */ /** An opaque structure representing an audio/video source/sink. */
typedef struct _PurpleMediaElementInfo PurpleMediaElementInfo; typedef struct _PurpleMediaElementInfo PurpleMediaElementInfo;
typedef struct _PurpleMediaElementInfoClass PurpleMediaElementInfoClass; typedef struct _PurpleMediaElementInfoClass PurpleMediaElementInfoClass;
typedef GstElement *(*PurpleMediaElementCreateCallback)(PurpleMedia *media, typedef GstElement *(*PurpleMediaElementCreateCallback)(PurpleMedia *media,
const gchar *session_id, const gchar *participant); const gchar *session_id, const gchar *participant);
typedef enum { typedef enum {
PURPLE_MEDIA_ELEMENT_NONE = 0, /** empty element */ PURPLE_MEDIA_ELEMENT_NONE = 0, /** empty element */
PURPLE_MEDIA_ELEMENT_AUDIO = 1, /** supports audio * / PURPLE_MEDIA_ELEMENT_AUDIO = 1, /** supports audio * /
PURPLE_MEDIA_ELEMENT_VIDEO = 1 << 1, /** supports video * / PURPLE_MEDIA_ELEMENT_VIDEO = 1 << 1, /** supports video * /
PURPLE_MEDIA_ELEMENT_AUDIO_VIDEO = PURPLE_MEDIA_ELEMENT_AUDIO PURPLE_MEDIA_ELEMENT_AUDIO_VIDEO = PURPLE_MEDIA_ELEMENT_AUDIO
skipping to change at line 140 skipping to change at line 140
* *
* @since 2.6.0 * @since 2.6.0
*/ */
GstElement *purple_media_manager_get_pipeline(PurpleMediaManager *manager); GstElement *purple_media_manager_get_pipeline(PurpleMediaManager *manager);
/** /**
* Returns a GStreamer source or sink for audio or video. * Returns a GStreamer source or sink for audio or video.
* *
* @param manager The media manager to use to obtain the source/sink. * @param manager The media manager to use to obtain the source/sink.
* @param type The type of source/sink to get. * @param type The type of source/sink to get.
* @param media The media call this element is requested for.
* @param session_id The id of the session this element is requested for or
NULL.
* @param participant The remote user this element is requested for or NULL
.
* *
* @since 2.6.0 * @since 2.6.0
*/ */
GstElement *purple_media_manager_get_element(PurpleMediaManager *manager, GstElement *purple_media_manager_get_element(PurpleMediaManager *manager,
PurpleMediaSessionType type, PurpleMedia *media, PurpleMediaSessionType type, PurpleMedia *media,
const gchar *session_id, const gchar *participant); const gchar *session_id, const gchar *participant);
PurpleMediaElementInfo *purple_media_manager_get_element_info( PurpleMediaElementInfo *purple_media_manager_get_element_info(
PurpleMediaManager *manager, const gchar *name); PurpleMediaManager *manager, const gchar *name);
gboolean purple_media_manager_register_element(PurpleMediaManager *manager, gboolean purple_media_manager_register_element(PurpleMediaManager *manager,
 End of changes. 3 change blocks. 
2 lines changed or deleted 7 lines changed or added


 media.h   media.h 
skipping to change at line 24 skipping to change at line 24
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_MEDIA_H_ #ifndef _PURPLE_MEDIA_H_
#define _PURPLE_MEDIA_H_ #define _PURPLE_MEDIA_H_
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
skipping to change at line 62 skipping to change at line 62
#define PURPLE_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURP LE_TYPE_MEDIA, PurpleMediaClass)) #define PURPLE_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), PURP LE_TYPE_MEDIA, PurpleMediaClass))
#define PURPLE_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PUR PLE_TYPE_MEDIA)) #define PURPLE_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), PUR PLE_TYPE_MEDIA))
#define PURPLE_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURP LE_TYPE_MEDIA)) #define PURPLE_IS_MEDIA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURP LE_TYPE_MEDIA))
#define PURPLE_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURP LE_TYPE_MEDIA, PurpleMediaClass)) #define PURPLE_MEDIA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), PURP LE_TYPE_MEDIA, PurpleMediaClass))
#define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE (purple_media_candidate_type_get_t ype()) #define PURPLE_TYPE_MEDIA_CANDIDATE_TYPE (purple_media_candidate_type_get_t ype())
#define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_g et_type()) #define PURPLE_TYPE_MEDIA_NETWORK_PROTOCOL (purple_media_network_protocol_g et_type())
#define PURPLE_MEDIA_TYPE_STATE (purple_media_state_changed_get_type() ) #define PURPLE_MEDIA_TYPE_STATE (purple_media_state_changed_get_type() )
#define PURPLE_MEDIA_TYPE_INFO_TYPE (purple_media_info_type_get_type()) #define PURPLE_MEDIA_TYPE_INFO_TYPE (purple_media_info_type_get_type())
/** @copydoc _PurpleMedia */ /** An opaque structure representing a media call. */
typedef struct _PurpleMedia PurpleMedia; typedef struct _PurpleMedia PurpleMedia;
/** @copydoc _PurpleMediaCandidate */ /** An opaque structure representing a network candidate (IP Address and po rt pair). */
typedef struct _PurpleMediaCandidate PurpleMediaCandidate; typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
/** @copydoc _PurpleMediaCodec */ /** An opaque structure representing an audio or video codec. */
typedef struct _PurpleMediaCodec PurpleMediaCodec; typedef struct _PurpleMediaCodec PurpleMediaCodec;
/** Media caps */ /** Media caps */
typedef enum { typedef enum {
PURPLE_MEDIA_CAPS_NONE = 0, PURPLE_MEDIA_CAPS_NONE = 0,
PURPLE_MEDIA_CAPS_AUDIO = 1, PURPLE_MEDIA_CAPS_AUDIO = 1,
PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1, PURPLE_MEDIA_CAPS_AUDIO_SINGLE_DIRECTION = 1 << 1,
PURPLE_MEDIA_CAPS_VIDEO = 1 << 2, PURPLE_MEDIA_CAPS_VIDEO = 1 << 2,
PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3, PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION = 1 << 3,
PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4, PURPLE_MEDIA_CAPS_AUDIO_VIDEO = 1 << 4,
skipping to change at line 562 skipping to change at line 562
GList *purple_media_get_active_remote_candidates(PurpleMedia *media, GList *purple_media_get_active_remote_candidates(PurpleMedia *media,
const gchar *sess_id, const gchar *participant); const gchar *sess_id, const gchar *participant);
#endif #endif
/** /**
* Sets remote candidates from the stream. * Sets remote candidates from the stream.
* *
* @param media The media object to find the session in. * @param media The media object to find the session in.
* @param sess_id The session id of the session find the stream in. * @param sess_id The session id of the session find the stream in.
* @param participant The name of the remote user to set the candidates fro m. * @param participant The name of the remote user to set the candidates fro m.
* @param codecs The list of remote codecs to set.
* *
* @return @c TRUE The codecs were set successfully, or @c FALSE otherwise. * @return @c TRUE The codecs were set successfully, or @c FALSE otherwise.
* *
* @since 2.6.0 * @since 2.6.0
*/ */
gboolean purple_media_set_remote_codecs(PurpleMedia *media, const gchar *se ss_id, gboolean purple_media_set_remote_codecs(PurpleMedia *media, const gchar *se ss_id,
const gchar *participant, GList *cod ecs); const gchar *participant, GList *cod ecs);
/** /**
* Returns whether or not the candidates for set of streams are prepared * Returns whether or not the candidates for set of streams are prepared
 End of changes. 5 change blocks. 
4 lines changed or deleted 5 lines changed or added


 mediamanager.h   mediamanager.h 
skipping to change at line 24 skipping to change at line 24
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-130 1 USA
*/ */
#ifndef _PURPLE_MEDIA_MANAGER_H_ #ifndef _PURPLE_MEDIA_MANAGER_H_
#define _PURPLE_MEDIA_MANAGER_H_ #define _PURPLE_MEDIA_MANAGER_H_
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
/** @copydoc _PurpleMediaManager */ /** An opaque structure representing a group of (usually all) media calls. */
typedef struct _PurpleMediaManager PurpleMediaManager; typedef struct _PurpleMediaManager PurpleMediaManager;
/** @copydoc _PurpleMediaManagerClass */ /** The GObject class structure of the PurpleMediaManager object. */
typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass; typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass;
#include "account.h" #include "account.h"
#include "media.h" #include "media.h"
G_BEGIN_DECLS G_BEGIN_DECLS
#define PURPLE_TYPE_MEDIA_MANAGER (purple_media_manager_get_type ()) #define PURPLE_TYPE_MEDIA_MANAGER (purple_media_manager_get_type ())
#define PURPLE_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((o bj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManager)) #define PURPLE_MEDIA_MANAGER(obj) (G_TYPE_CHECK_INSTANCE_CAST((o bj), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManager))
#define PURPLE_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klas s), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass)) #define PURPLE_MEDIA_MANAGER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klas s), PURPLE_TYPE_MEDIA_MANAGER, PurpleMediaManagerClass))
skipping to change at line 84 skipping to change at line 84
*/ */
PurpleMediaManager *purple_media_manager_get(void); PurpleMediaManager *purple_media_manager_get(void);
/** /**
* Creates a media session. * Creates a media session.
* *
* @param manager The media manager to create the session under. * @param manager The media manager to create the session under.
* @param account The account to create the session on. * @param account The account to create the session on.
* @param conference_type The conference type to feed into Farsight2. * @param conference_type The conference type to feed into Farsight2.
* @param remote_user The remote user to initiate the session with. * @param remote_user The remote user to initiate the session with.
* @param initiator TRUE if the local user is the initiator of this media c all, FALSE otherwise.
* *
* @return A newly created media session. * @return A newly created media session.
* *
* @since 2.6.0 * @since 2.6.0
*/ */
PurpleMedia *purple_media_manager_create_media(PurpleMediaManager *manager, PurpleMedia *purple_media_manager_create_media(PurpleMediaManager *manager,
PurpleAccount *account, PurpleAccount *account,
const char *conference_type, const char *conference_type,
const char *remote_user, const char *remote_user,
gboolean initiator); gboolean initiator);
 End of changes. 4 change blocks. 
3 lines changed or deleted 4 lines changed or added


 smiley.h   smiley.h 
skipping to change at line 98 skipping to change at line 98
* *
* @param shortcut The associated shortcut (e.g. "(homer)"). * @param shortcut The associated shortcut (e.g. "(homer)").
* @param filepath The image file. * @param filepath The image file.
* *
* @return The custom smiley. * @return The custom smiley.
*/ */
PurpleSmiley * PurpleSmiley *
purple_smiley_new_from_file(const char *shortcut, const char *filepath); purple_smiley_new_from_file(const char *shortcut, const char *filepath);
/** /**
* Destroys the custom smiley and release the associated resources. * Destroys the custom smiley and releases the associated resources.
* *
* @param smiley The custom smiley. * @param smiley The custom smiley.
*/ */
void void
purple_smiley_delete(PurpleSmiley *smiley); purple_smiley_delete(PurpleSmiley *smiley);
/** /**
* Changes the custom smiley's shortcut. * Changes the custom smiley's shortcut.
* *
* @param smiley The custom smiley. * @param smiley The custom smiley.
skipping to change at line 186 skipping to change at line 186
* the image data has disappeared. * the image data has disappeared.
*/ */
const char *purple_smiley_get_extension(const PurpleSmiley *smiley); const char *purple_smiley_get_extension(const PurpleSmiley *smiley);
/** /**
* Returns a full path to an custom smiley. * Returns a full path to an custom smiley.
* *
* If the custom smiley has data and the file exists in the cache, this * If the custom smiley has data and the file exists in the cache, this
* will return a full path to the cached file. * will return a full path to the cached file.
* *
* In general, it is not appropriate to be poking in the file cached * In general, it is not appropriate to be poking in the file cache
* directly. If you find yourself wanting to use this function, think * directly. If you find yourself wanting to use this function, think
* very long and hard about it, and then don't. * very long and hard about it, and then don't.
* *
* Think some more. * Think some more.
* *
* @param smiley The custom smiley. * @param smiley The custom smiley.
* *
* @return A full path to the file, or @c NULL under various conditions. * @return A full path to the file, or @c NULL under various conditions.
* The caller should use #g_free to free the returned string. * The caller should use g_free to free the returned string.
*/ */
char *purple_smiley_get_full_path(PurpleSmiley *smiley); char *purple_smiley_get_full_path(PurpleSmiley *smiley);
/*@}*/ /*@}*/
/************************************************************************** / /************************************************************************** /
/** @name Custom Smiley Subsystem API * / /** @name Custom Smiley Subsystem API * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 status.h   status.h 
skipping to change at line 75 skipping to change at line 75
* other random info). For any buddy, or for any one of your accounts, * other random info). For any buddy, or for any one of your accounts,
* or for any person with which you're chatting, you may know various * or for any person with which you're chatting, you may know various
* amounts of information. This information is all contained in * amounts of information. This information is all contained in
* one PurplePresence. If one of your buddies is away and idle, * one PurplePresence. If one of your buddies is away and idle,
* then the presence contains the PurpleStatus for their awayness, * then the presence contains the PurpleStatus for their awayness,
* and it contains their current idle time. PurplePresences are * and it contains their current idle time. PurplePresences are
* never saved to disk. The information they contain is only relevant * never saved to disk. The information they contain is only relevant
* for the current PurpleSession. * for the current PurpleSession.
*/ */
/**
* PurpleStatusType's are created by each PRPL. They outline the
* available statuses of the protocol. AIM, for example, supports
* an available state with an optional available message, an away
* state with a mandatory message, and an invisible state (which is
* technically "independent" of the other two, but we'll get into
* that later). PurpleStatusTypes are very permanent. They are
* hardcoded in each PRPL and will not change often. And because
* they are hardcoded, they do not need to be saved to any XML file.
*/
typedef struct _PurpleStatusType PurpleStatusType; typedef struct _PurpleStatusType PurpleStatusType;
typedef struct _PurpleStatusAttr PurpleStatusAttr; typedef struct _PurpleStatusAttr PurpleStatusAttr;
typedef struct _PurplePresence PurplePresence; typedef struct _PurplePresence PurplePresence;
typedef struct _PurpleStatus PurpleStatus; typedef struct _PurpleStatus PurpleStatus;
/** /**
* A context for a presence. * A context for a presence.
* *
* The context indicates to what the presence applies. * The context indicates to what the presence applies.
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 10 lines changed or added


 theme-loader.h   theme-loader.h 
skipping to change at line 74 skipping to change at line 74
/************************************************************************** / /************************************************************************** /
G_BEGIN_DECLS G_BEGIN_DECLS
/** /**
* GObject foo. * GObject foo.
* @internal. * @internal.
*/ */
GType purple_theme_loader_get_type(void); GType purple_theme_loader_get_type(void);
/** /**
* Returns the string represtenting the type of the theme loader * Returns the string representing the type of the theme loader
* *
* @param self The theme loader * @param self The theme loader
* *
* @returns The string represting this type * @returns The string representing this type
*/ */
const gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self); const gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self);
/** /**
* Creates a new PurpleTheme * Creates a new PurpleTheme
* *
* @param loader The theme loader * @param loader The theme loader
* @param dir The directory containing the theme * @param dir The directory containing the theme
* *
* @returns A PurpleTheme containing the information from the directory * @returns A PurpleTheme containing the information from the directory
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 theme.h   theme.h 
skipping to change at line 76 skipping to change at line 76
* GObject foo. * GObject foo.
* @internal. * @internal.
*/ */
GType purple_theme_get_type(void); GType purple_theme_get_type(void);
/** /**
* Returns the name of the PurpleTheme object. * Returns the name of the PurpleTheme object.
* *
* @param theme The purple theme. * @param theme The purple theme.
* *
* @return The string representating the name of the theme. * @return The string representing the name of the theme.
*/ */
const gchar *purple_theme_get_name(PurpleTheme *theme); const gchar *purple_theme_get_name(PurpleTheme *theme);
/** /**
* Sets the name of the PurpleTheme object. * Sets the name of the PurpleTheme object.
* *
* @param theme The purple theme. * @param theme The purple theme.
* @param name The name of the PurpleTheme object. * @param name The name of the PurpleTheme object.
*/ */
void purple_theme_set_name(PurpleTheme *theme, const gchar *name); void purple_theme_set_name(PurpleTheme *theme, const gchar *name);
skipping to change at line 127 skipping to change at line 127
* @param theme The purple theme. * @param theme The purple theme.
* @param author The author of the PurpleTheme object. * @param author The author of the PurpleTheme object.
*/ */
void purple_theme_set_author(PurpleTheme *theme, const gchar *author); void purple_theme_set_author(PurpleTheme *theme, const gchar *author);
/** /**
* Returns the type (string) of the PurpleTheme object. * Returns the type (string) of the PurpleTheme object.
* *
* @param theme The purple theme. * @param theme The purple theme.
* *
* @return The string represtenting the type. * @return The string representing the type.
*/ */
const gchar *purple_theme_get_type_string(PurpleTheme *theme); const gchar *purple_theme_get_type_string(PurpleTheme *theme);
/** /**
* Returns the directory of the PurpleTheme object. * Returns the directory of the PurpleTheme object.
* *
* @param theme The purple theme. * @param theme The purple theme.
* *
* @return The string represtenting the theme directory. * @return The string representing the theme directory.
*/ */
const gchar *purple_theme_get_dir(PurpleTheme *theme); const gchar *purple_theme_get_dir(PurpleTheme *theme);
/** /**
* Sets the directory of the PurpleTheme object. * Sets the directory of the PurpleTheme object.
* *
* @param theme The purple theme. * @param theme The purple theme.
* @param dir The directory of the PurpleTheme object. * @param dir The directory of the PurpleTheme object.
*/ */
void purple_theme_set_dir(PurpleTheme *theme, const gchar *dir); void purple_theme_set_dir(PurpleTheme *theme, const gchar *dir);
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 util.h   util.h 
skipping to change at line 34 skipping to change at line 34
* 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
* *
* @todo Rename the functions so that they live somewhere in the purple * @todo Rename the functions so that they live somewhere in the purple
* namespace. * namespace.
*/ */
#ifndef _PURPLE_UTIL_H_ #ifndef _PURPLE_UTIL_H_
#define _PURPLE_UTIL_H_ #define _PURPLE_UTIL_H_
#include <stdio.h> #include <stdio.h>
/**
* An opaque structure representing a URL request. Can be used to cancel
* the request.
*/
typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData; typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData;
/** @copydoc _PurpleMenuAction */
typedef struct _PurpleMenuAction PurpleMenuAction; typedef struct _PurpleMenuAction PurpleMenuAction;
/** @copydoc _PurpleKeyValuePair */
typedef struct _PurpleKeyValuePair PurpleKeyValuePair; typedef struct _PurpleKeyValuePair PurpleKeyValuePair;
#include "account.h" #include "account.h"
#include "xmlnode.h" #include "xmlnode.h"
#include "notify.h" #include "notify.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
skipping to change at line 109 skipping to change at line 115
const char *album); const char *album);
/** /**
* Format song information. * Format song information.
* *
* @param title The title of the song, @c NULL to unset the value. * @param title The title of the song, @c NULL to unset the value.
* @param artist The artist of the song, can be @c NULL. * @param artist The artist of the song, can be @c NULL.
* @param album The album of the song, can be @c NULL. * @param album The album of the song, can be @c NULL.
* @param unused Currently unused, must be @c NULL. * @param unused Currently unused, must be @c NULL.
* *
* @return The formatted string. The caller must #g_free the returned str ing. * @return The formatted string. The caller must g_free the returned stri ng.
* @since 2.4.0 * @since 2.4.0
*/ */
char * purple_util_format_song_info(const char *title, const char *artist, char * purple_util_format_song_info(const char *title, const char *artist,
const char *album, gpointer unused); const char *album, gpointer unused);
/************************************************************************** / /************************************************************************** /
/** @name Utility Subsystem * / /** @name Utility Subsystem * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
skipping to change at line 1278 skipping to change at line 1284
* *
* @param str The source string. * @param str The source string.
* *
* @return A valid UTF-8 string. * @return A valid UTF-8 string.
*/ */
gchar *purple_utf8_salvage(const char *str); gchar *purple_utf8_salvage(const char *str);
/** /**
* Removes unprintable characters from a UTF-8 string. These characters * Removes unprintable characters from a UTF-8 string. These characters
* (in particular low-ASCII characters) are invalid in XML 1.0 and thus * (in particular low-ASCII characters) are invalid in XML 1.0 and thus
* are not allowed in XMPP and are rejected by libxml2 by default. This * are not allowed in XMPP and are rejected by libxml2 by default.
* function uses g_unichar_isprint to determine what characters should *
* be stripped. The returned string must be freed by the caller. * The returned string must be freed by the caller.
* *
* @param str A valid UTF-8 string. * @param str A valid UTF-8 string.
* *
* @return A newly allocated UTF-8 string without the unprintable character s. * @return A newly allocated UTF-8 string without the unprintable character s.
* @since 2.6.0 * @since 2.6.0
*
* @see g_unichar_isprint
*/ */
gchar *purple_utf8_strip_unprintables(const gchar *str); gchar *purple_utf8_strip_unprintables(const gchar *str);
/** /**
* Return the UTF-8 version of gai_strerror(). It calls gai_strerror() * Return the UTF-8 version of gai_strerror(). It calls gai_strerror()
* then converts the result to UTF-8. This function is analogous to * then converts the result to UTF-8. This function is analogous to
* g_strerror(). * g_strerror().
* *
* @param errnum The error code. * @param errnum The error code.
* *
 End of changes. 6 change blocks. 
6 lines changed or deleted 10 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 (6) #define PURPLE_MINOR_VERSION (6)
/** The micro version of the running libpurple. */ /** The micro version of the running libpurple. */
#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/