buddyicon.h   buddyicon.h 
skipping to change at line 310 skipping to change at line 310
purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node); purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node);
/** /**
* Sets a custom buddy icon for a blist node. * Sets a custom buddy icon for a blist node.
* *
* This function will deal with saving a record of the icon, caching the da ta, * This function will deal with saving a record of the icon, caching the da ta,
* etc. * etc.
* *
* @param node The blist node for which to set a custom icon. * @param node The blist node for which to set a custom icon.
* @param icon_data The image data of the icon, which the buddy icon code w ill * @param icon_data The image data of the icon, which the buddy icon code w ill
* free. * free. Use NULL to unset the icon.
* @param icon_len The length of the data in @a icon_data. * @param icon_len The length of the data in @a icon_data.
* *
* @return The icon that was set. The caller does NOT own a reference to th is, * @return The icon that was set. The caller does NOT own a reference to th is,
* and must call purple_imgstore_ref() if it wants one. * and must call purple_imgstore_ref() if it wants one.
* @since 2.5.0 * @since 2.5.0
*/ */
PurpleStoredImage * PurpleStoredImage *
purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node, purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
guchar *icon_data, size_t icon_len) ; guchar *icon_data, size_t icon_len) ;
/** /**
* Sets a custom buddy icon for a blist node. * Sets a custom buddy icon for a blist node.
* *
* Convenience wrapper around purple_buddy_icons_node_set_custom_icon. * Convenience wrapper around purple_buddy_icons_node_set_custom_icon.
* @see purple_buddy_icons_node_set_custom_icon() * @see purple_buddy_icons_node_set_custom_icon()
* *
* @param node The blist node for which to set a custom icon. * @param node The blist node for which to set a custom icon.
* @param filename The path to the icon to set for the blist node. * @param filename The path to the icon to set for the blist node. Use NUL
L
* to unset the custom icon.
* *
* @return The icon that was set. The caller does NOT own a reference to th is, * @return The icon that was set. The caller does NOT own a reference to th is,
* and must call purple_imgstore_ref() if it wants one. * and must call purple_imgstore_ref() if it wants one.
* @since 2.5.0 * @since 2.5.0
*/ */
PurpleStoredImage * PurpleStoredImage *
purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node, purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
const gchar *filename); const gchar *filename);
#ifndef PURPLE_DISABLE_DEPRECATED #ifndef PURPLE_DISABLE_DEPRECATED
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added


 conversation.h   conversation.h 
skipping to change at line 116 skipping to change at line 116
PURPLE_MESSAGE_SEND = 0x0001, /**< Outgoing message. * / PURPLE_MESSAGE_SEND = 0x0001, /**< Outgoing message. * /
PURPLE_MESSAGE_RECV = 0x0002, /**< Incoming message. * / PURPLE_MESSAGE_RECV = 0x0002, /**< Incoming message. * /
PURPLE_MESSAGE_SYSTEM = 0x0004, /**< System message. * / PURPLE_MESSAGE_SYSTEM = 0x0004, /**< System message. * /
PURPLE_MESSAGE_AUTO_RESP = 0x0008, /**< Auto response. * / PURPLE_MESSAGE_AUTO_RESP = 0x0008, /**< Auto response. * /
PURPLE_MESSAGE_ACTIVE_ONLY = 0x0010, /**< Hint to the UI that this PURPLE_MESSAGE_ACTIVE_ONLY = 0x0010, /**< Hint to the UI that this
message should not be message should not be
shown in conversations shown in conversations
which are only open for which are only open for
internal UI purposes internal UI purposes
(e.g. for contact-aware (e.g. for contact-aware
conversions). */ conversations). * /
PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. * / PURPLE_MESSAGE_NICK = 0x0020, /**< Contains your nick. * /
PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. * / PURPLE_MESSAGE_NO_LOG = 0x0040, /**< Do not log. * /
PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. * / PURPLE_MESSAGE_WHISPER = 0x0080, /**< Whispered message. * /
PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. * / PURPLE_MESSAGE_ERROR = 0x0200, /**< Error message. * /
PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. * / PURPLE_MESSAGE_DELAYED = 0x0400, /**< Delayed message. * /
PURPLE_MESSAGE_RAW = 0x0800, /**< "Raw" message - don't PURPLE_MESSAGE_RAW = 0x0800, /**< "Raw" message - don't
apply formatting */ apply formatting */
PURPLE_MESSAGE_IMAGES = 0x1000, /**< Message contains images * / PURPLE_MESSAGE_IMAGES = 0x1000, /**< Message contains images * /
PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */ PURPLE_MESSAGE_NOTIFY = 0x2000, /**< Message is a notification */
PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto - PURPLE_MESSAGE_NO_LINKIFY = 0x4000, /**< Message should not be auto -
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 dbus-maybe.h   dbus-maybe.h 
skipping to change at line 26 skipping to change at line 26
/* this provides a type check */ /* this provides a type check */
#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \ #define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
type *typed_ptr = ptr; \ type *typed_ptr = ptr; \
purple_dbus_register_pointer(typed_ptr, PURPLE_DBUS_TYPE(type)); \ purple_dbus_register_pointer(typed_ptr, PURPLE_DBUS_TYPE(type)); \
} }
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr) purple_dbus_unregister_pointer( ptr) #define PURPLE_DBUS_UNREGISTER_POINTER(ptr) purple_dbus_unregister_pointer( ptr)
#else /* !HAVE_DBUS */ #else /* !HAVE_DBUS */
#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) #define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
if (ptr) {} \
}
#define PURPLE_DBUS_UNREGISTER_POINTER(ptr) #define PURPLE_DBUS_UNREGISTER_POINTER(ptr)
#define DBUS_EXPORT #define DBUS_EXPORT
#endif /* HAVE_DBUS */ #endif /* HAVE_DBUS */
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 4 lines changed or added


 gtkstatusbox.h   gtkstatusbox.h 
skipping to change at line 113 skipping to change at line 113
gboolean icon_opaque; gboolean icon_opaque;
gboolean imhtml_visible; gboolean imhtml_visible;
GtkWidget *cell_view; GtkWidget *cell_view;
GtkCellRenderer *icon_rend; GtkCellRenderer *icon_rend;
GtkCellRenderer *text_rend; GtkCellRenderer *text_rend;
GdkPixbuf *error_pixbuf; GdkPixbuf *error_pixbuf;
int connecting_index; int connecting_index;
GdkPixbuf *connecting_pixbufs[31]; GdkPixbuf *connecting_pixbufs[9];
int typing_index; int typing_index;
GdkPixbuf *typing_pixbufs[6]; GdkPixbuf *typing_pixbufs[6];
gboolean network_available; gboolean network_available;
gboolean connecting; gboolean connecting;
guint typing; guint typing;
GtkTreeIter iter; GtkTreeIter iter;
char *error; char *error;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 sslconn.h   sslconn.h 
skipping to change at line 70 skipping to change at line 70
PurpleSslErrorFunction error_cb; PurpleSslErrorFunction error_cb;
/** Data passed to PurpleSslConnection::recv_cb() */ /** Data passed to PurpleSslConnection::recv_cb() */
void *recv_cb_data; void *recv_cb_data;
/** User-defined callback executed when the SSL connection receives data */ /** User-defined callback executed when the SSL connection receives data */
PurpleSslInputFunction recv_cb; PurpleSslInputFunction recv_cb;
/** File descriptor used to refer to the socket */ /** File descriptor used to refer to the socket */
int fd; int fd;
/** Glib event source ID; used to refer to the received data callbac k /** Glib event source ID; used to refer to the received data callbac k
* in the glib eventloop */ * in the glib eventloop */
int inpa; guint inpa;
/** Data related to the underlying TCP connection */ /** Data related to the underlying TCP connection */
PurpleProxyConnectData *connect_data; PurpleProxyConnectData *connect_data;
/** Internal connection data managed by the SSL backend (GnuTLS/LibN SS/whatever) */ /** Internal connection data managed by the SSL backend (GnuTLS/LibN SS/whatever) */
void *private_data; void *private_data;
/** Verifier to use in authenticating the peer */ /** Verifier to use in authenticating the peer */
PurpleCertificateVerifier *verifier; PurpleCertificateVerifier *verifier;
}; };
 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 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 (5) #define PURPLE_MINOR_VERSION (5)
#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/