conversation.h   conversation.h 
skipping to change at line 369 skipping to change at line 369
/** @name Conversation API * / /** @name Conversation API * /
/************************************************************************** / /************************************************************************** /
/*@{*/ /*@{*/
/** /**
* Creates a new conversation of the specified type. * Creates a new conversation of the specified type.
* *
* @param type The type of conversation. * @param type The type of conversation.
* @param account The account opening the conversation window on the purple * @param account The account opening the conversation window on the purple
* user's end. * user's end.
* @param name The name of the conversation. * @param name The name of the conversation. For PURPLE_CONV_TYPE_IM,
* this is the name of the buddy.
* *
* @return The new conversation. * @return The new conversation.
*/ */
PurpleConversation *purple_conversation_new(PurpleConversationType type, PurpleConversation *purple_conversation_new(PurpleConversationType type,
PurpleAccount *account, PurpleAccount *account,
const char *name); const char *name);
/** /**
* Destroys the specified conversation and removes it from the parent * Destroys the specified conversation and removes it from the parent
* window. * window.
skipping to change at line 1019 skipping to change at line 1020
* purple_conv_chat_remove_user(), and purple_conv_chat_remove_users( ) instead. * purple_conv_chat_remove_user(), and purple_conv_chat_remove_users( ) instead.
* *
* @param chat The chat. * @param chat The chat.
* @param users The list of users. * @param users The list of users.
* *
* @return The list passed. * @return The list passed.
*/ */
GList *purple_conv_chat_set_users(PurpleConvChat *chat, GList *users); GList *purple_conv_chat_set_users(PurpleConvChat *chat, GList *users);
/** /**
* Returns a list of users in the chat room. * Returns a list of users in the chat room. The members of the list
* are PurpleConvChatBuddy objects.
* *
* @param chat The chat. * @param chat The chat.
* *
* @constreturn The list of users. * @constreturn The list of users.
*/ */
GList *purple_conv_chat_get_users(const PurpleConvChat *chat); GList *purple_conv_chat_get_users(const PurpleConvChat *chat);
/** /**
* Ignores a user in a chat room. * Ignores a user in a chat room.
* *
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added


 gntkeys.h   gntkeys.h 
skipping to change at line 68 skipping to change at line 68
#define GNT_KEY_PGUP SAFE(key_ppage) #define GNT_KEY_PGUP SAFE(key_ppage)
#define GNT_KEY_PGDOWN SAFE(key_npage) #define GNT_KEY_PGDOWN SAFE(key_npage)
#define GNT_KEY_HOME SAFE(key_home) #define GNT_KEY_HOME SAFE(key_home)
#define GNT_KEY_END SAFE(key_end) #define GNT_KEY_END SAFE(key_end)
#define GNT_KEY_ENTER carriage_return #define GNT_KEY_ENTER carriage_return
#define GNT_KEY_BACKSPACE SAFE(key_backspace) #define GNT_KEY_BACKSPACE SAFE(key_backspace)
#define GNT_KEY_DEL SAFE(key_dc) #define GNT_KEY_DEL SAFE(key_dc)
#define GNT_KEY_INS SAFE(key_ic) #define GNT_KEY_INS SAFE(key_ic)
#define GNT_KEY_BACK_TAB SAFE(back_tab) #define GNT_KEY_BACK_TAB (back_tab ? back_tab : SAFE(key_btab))
#define GNT_KEY_CTRL_A "\001" #define GNT_KEY_CTRL_A "\001"
#define GNT_KEY_CTRL_B "\002" #define GNT_KEY_CTRL_B "\002"
#define GNT_KEY_CTRL_D "\004" #define GNT_KEY_CTRL_D "\004"
#define GNT_KEY_CTRL_E "\005" #define GNT_KEY_CTRL_E "\005"
#define GNT_KEY_CTRL_F "\006" #define GNT_KEY_CTRL_F "\006"
#define GNT_KEY_CTRL_G "\007" #define GNT_KEY_CTRL_G "\007"
#define GNT_KEY_CTRL_H "\010" #define GNT_KEY_CTRL_H "\010"
#define GNT_KEY_CTRL_I "\011" #define GNT_KEY_CTRL_I "\011"
#define GNT_KEY_CTRL_J "\012" #define GNT_KEY_CTRL_J "\012"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 gtksmiley.h   gtksmiley.h 
skipping to change at line 112 skipping to change at line 112
/** /**
* Sets the image data in a smiley add dialog * Sets the image data in a smiley add dialog
* *
* @param editor A smiley editor dialog * @param editor A smiley editor dialog
* @param data A pointer to smiley's data * @param data A pointer to smiley's data
* @param datasize The size of smiley's data * @param datasize The size of smiley's data
* *
* @since 2.6.0 * @since 2.6.0
*/ */
void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer *data, gs ize datasize); void pidgin_smiley_editor_set_data(PidginSmiley *editor, gpointer data, gsi ze datasize);
#endif /* PIDGIN_GTKSMILEY_H */ #endif /* PIDGIN_GTKSMILEY_H */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 media.h   media.h 
skipping to change at line 78 skipping to change at line 78
/** 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,
PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5, PURPLE_MEDIA_CAPS_MODIFY_SESSION = 1 << 5,
PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6, PURPLE_MEDIA_CAPS_CHANGE_DIRECTION = 1 << 6
} PurpleMediaCaps; } PurpleMediaCaps;
/** Media session types */ /** Media session types */
typedef enum { typedef enum {
PURPLE_MEDIA_NONE = 0, PURPLE_MEDIA_NONE = 0,
PURPLE_MEDIA_RECV_AUDIO = 1 << 0, PURPLE_MEDIA_RECV_AUDIO = 1 << 0,
PURPLE_MEDIA_SEND_AUDIO = 1 << 1, PURPLE_MEDIA_SEND_AUDIO = 1 << 1,
PURPLE_MEDIA_RECV_VIDEO = 1 << 2, PURPLE_MEDIA_RECV_VIDEO = 1 << 2,
PURPLE_MEDIA_SEND_VIDEO = 1 << 3, PURPLE_MEDIA_SEND_VIDEO = 1 << 3,
PURPLE_MEDIA_AUDIO = PURPLE_MEDIA_RECV_AUDIO | PURPLE_MEDIA_SEND_AUD IO, PURPLE_MEDIA_AUDIO = PURPLE_MEDIA_RECV_AUDIO | PURPLE_MEDIA_SEND_AUD IO,
PURPLE_MEDIA_VIDEO = PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_SEND_VID EO PURPLE_MEDIA_VIDEO = PURPLE_MEDIA_RECV_VIDEO | PURPLE_MEDIA_SEND_VID EO
} PurpleMediaSessionType; } PurpleMediaSessionType;
/** Media state-changed types */ /** Media state-changed types */
typedef enum { typedef enum {
PURPLE_MEDIA_STATE_NEW = 0, PURPLE_MEDIA_STATE_NEW = 0,
PURPLE_MEDIA_STATE_CONNECTED, PURPLE_MEDIA_STATE_CONNECTED,
PURPLE_MEDIA_STATE_END, PURPLE_MEDIA_STATE_END
} PurpleMediaState; } PurpleMediaState;
/** Media info types */ /** Media info types */
typedef enum { typedef enum {
PURPLE_MEDIA_INFO_HANGUP = 0, PURPLE_MEDIA_INFO_HANGUP = 0,
PURPLE_MEDIA_INFO_ACCEPT, PURPLE_MEDIA_INFO_ACCEPT,
PURPLE_MEDIA_INFO_REJECT, PURPLE_MEDIA_INFO_REJECT,
PURPLE_MEDIA_INFO_MUTE, PURPLE_MEDIA_INFO_MUTE,
PURPLE_MEDIA_INFO_UNMUTE, PURPLE_MEDIA_INFO_UNMUTE,
PURPLE_MEDIA_INFO_PAUSE, PURPLE_MEDIA_INFO_PAUSE,
PURPLE_MEDIA_INFO_UNPAUSE, PURPLE_MEDIA_INFO_UNPAUSE,
PURPLE_MEDIA_INFO_HOLD, PURPLE_MEDIA_INFO_HOLD,
PURPLE_MEDIA_INFO_UNHOLD, PURPLE_MEDIA_INFO_UNHOLD
} PurpleMediaInfoType; } PurpleMediaInfoType;
typedef enum { typedef enum {
PURPLE_MEDIA_CANDIDATE_TYPE_HOST, PURPLE_MEDIA_CANDIDATE_TYPE_HOST,
PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX, PURPLE_MEDIA_CANDIDATE_TYPE_SRFLX,
PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX, PURPLE_MEDIA_CANDIDATE_TYPE_PRFLX,
PURPLE_MEDIA_CANDIDATE_TYPE_RELAY, PURPLE_MEDIA_CANDIDATE_TYPE_RELAY,
PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST, PURPLE_MEDIA_CANDIDATE_TYPE_MULTICAST
} PurpleMediaCandidateType; } PurpleMediaCandidateType;
typedef enum { typedef enum {
PURPLE_MEDIA_COMPONENT_NONE = 0, PURPLE_MEDIA_COMPONENT_NONE = 0,
PURPLE_MEDIA_COMPONENT_RTP = 1, PURPLE_MEDIA_COMPONENT_RTP = 1,
PURPLE_MEDIA_COMPONENT_RTCP = 2, PURPLE_MEDIA_COMPONENT_RTCP = 2
} PurpleMediaComponentType; } PurpleMediaComponentType;
typedef enum { typedef enum {
PURPLE_MEDIA_NETWORK_PROTOCOL_UDP, PURPLE_MEDIA_NETWORK_PROTOCOL_UDP,
PURPLE_MEDIA_NETWORK_PROTOCOL_TCP, PURPLE_MEDIA_NETWORK_PROTOCOL_TCP
} PurpleMediaNetworkProtocol; } PurpleMediaNetworkProtocol;
#include "signals.h" #include "signals.h"
#include "util.h" #include "util.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/** /**
 End of changes. 6 change blocks. 
6 lines changed or deleted 6 lines changed or added


 network.h   network.h 
skipping to change at line 255 skipping to change at line 255
/** /**
* Update the TURN server IP given the host name * Update the TURN server IP given the host name
* Will result in a DNS query being executed asynchronous * Will result in a DNS query being executed asynchronous
* *
* @param turn_server The host name of the TURN server to set * @param turn_server The host name of the TURN server to set
* @since 2.6.0 * @since 2.6.0
*/ */
void purple_network_set_turn_server(const gchar *turn_server); void purple_network_set_turn_server(const gchar *turn_server);
/** /**
* Get the IP address of the STUN server as a string representation * Get the IP address of the TURN server as a string representation
* *
* @return the IP address * @return the IP address
* @since 2.6.0 * @since 2.6.0
*/ */
const gchar *purple_network_get_turn_ip(void); const gchar *purple_network_get_turn_ip(void);
/** /**
* Remove a port mapping (UPnP or NAT-PMP) associated with listening socket * Remove a port mapping (UPnP or NAT-PMP) associated with listening socket
* *
* @param fd Socket to remove the port mapping for * @param fd Socket to remove the port mapping for
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 prefs.h   prefs.h 
skipping to change at line 187 skipping to change at line 187
/** /**
* Remove all prefs. * Remove all prefs.
*/ */
void purple_prefs_destroy(void); void purple_prefs_destroy(void);
/** /**
* Set raw pref value * Set raw pref value
* *
* @param name The name of the pref * @param name The name of the pref
* @param value The value to set * @param value The value to set
*
* @deprecated We're not really sure what purpose this function serves, so
it
* will be removed in 3.0.0. Preferences values set using this
* function aren't serialized to prefs.xml, which could be
* misleading. There is also no purple_prefs_get_generic, whic
h
* means that if you can't really get the value (other in a
* connected callback). If you think you have a use for this t
hen
* please let us know.
*/ */
/* TODO: When this is removed, also remove struct purple_pref->value.generi c */
void purple_prefs_set_generic(const char *name, gpointer value); void purple_prefs_set_generic(const char *name, gpointer value);
/** /**
* Set boolean pref value * Set boolean pref value
* *
* @param name The name of the pref * @param name The name of the pref
* @param value The value to set * @param value The value to set
*/ */
void purple_prefs_set_bool(const char *name, gboolean value); void purple_prefs_set_bool(const char *name, gboolean value);
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 util.h   util.h 
skipping to change at line 517 skipping to change at line 517
* @return The new string with all URIs surrounded in standard * @return The new string with all URIs surrounded in standard
* HTML <a href="whatever"></a> tags. You must g_free this * HTML <a href="whatever"></a> tags. You must g_free this
* string when finished with it. * string when finished with it.
*/ */
char *purple_markup_linkify(const char *str); char *purple_markup_linkify(const char *str);
/** /**
* Unescapes HTML entities to their literal characters. Also translates * Unescapes HTML entities to their literal characters. Also translates
* "<br>" to "\n". * "<br>" to "\n".
* For example "&amp;" is replaced by '&' and so on. * For example "&amp;" is replaced by '&' and so on.
* Actually only "&amp;", "&quot;", "&lt;" and "&gt;" are currently *
* supported. * The following named entities are supported (in addition to numerical
* entities):
* "&amp;", "&lt;", "&gt;", "&copy;", "&quot;", "&reg;", "&apos;"
* *
* @param html The string in which to unescape any HTML entities * @param html The string in which to unescape any HTML entities
* *
* @return The text with HTML entities literalized. You must g_free * @return The text with HTML entities literalized. You must g_free
* this string when finished with it. * this string when finished with it.
*/ */
char *purple_unescape_html(const char *html); char *purple_unescape_html(const char *html);
/** /**
* Returns a newly allocated substring of the HTML UTF-8 string "str". * Returns a newly allocated substring of the HTML UTF-8 string "str".
 End of changes. 1 change blocks. 
2 lines changed or deleted 4 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 (5) #define PURPLE_MICRO_VERSION (6)
#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/