ChangeLog new functionallity

Add new functions to ChangeLog.API
Added @since on relevant functions (assuming this gets merged for 2.7.0)

4 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 923e9b57c7..5e31286ee5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,7 +50,9 @@ version 2.7.0 (??/??/????):
 	* The 'Message Timestamp Formats' plugin allows forcing 12-hour
 	  timestamps.  (Jonathan Maltz)
 	* Fix pastes from Chrome (rich-text pastes and probably URLs
-	  having garbage appended to them)
+	  having garbage appended to them).
+	* Show file transfer thumbnails for images on supporting protocols
+	  (currently only supported on MSN).
 
 	Bonjour:
 	* Added support for IPv6. (Thanks to T_X for testing)
@@ -76,6 +78,7 @@ version 2.7.0 (??/??/????):
 	MSN:
 	* Support for version 9 of the MSN protocol has been removed.  This
 	  version is no longer supported on the servers.
+	* Support file transfer thumbnails (previews) for images.
 
 	XMPP:
 	* Direct messages to a specific resource only upon receipt of a message
diff --git a/ChangeLog.API b/ChangeLog.API
index d7a2f50ba4..7e900acfce 100644
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -33,6 +33,12 @@ version 2.7.0 (??/??/????):
 		* purple_socket_speaks_ipv4
 		* purple_unescape_text
 		* purple_uuid_random
+		* purple_xfer_get_thumbnail
+		* purple_xfer_get_thumbnail_mimetype
+		* purple_xfer_set_thumbnail
+		* purple_xfer_prepare_thumbnail
+		* purple_request_action_with_icon
+		* purple_request_action_varg_with_icon
 		* media_caps to the PurpleBuddy struct
 		* buddy-caps-changed blist signal
 		* ui-caps-changed media manager signal
diff --git a/libpurple/ft.h b/libpurple/ft.h
index 35820b7b07..fc1209b199 100644
--- a/libpurple/ft.h
+++ b/libpurple/ft.h
@@ -699,6 +699,7 @@ void purple_xfer_prpl_ready(PurpleXfer *xfer);
  * @param len  If not @c NULL, the length of the thumbnail data returned
  *             will be set in the location pointed to by this.
  * @return The thumbnail data, or NULL if there is no thumbnail
+ * @since 2.7.0
  */
 gconstpointer purple_xfer_get_thumbnail(const PurpleXfer *xfer, gsize *len);
 
@@ -707,6 +708,7 @@ gconstpointer purple_xfer_get_thumbnail(const PurpleXfer *xfer, gsize *len);
  *
  * @param xfer The file transfer to get the mimetype for
  * @return The mimetype of the thumbnail, or @c NULL if not thumbnail is set
+ * @since 2.7.0
  */
 const gchar *purple_xfer_get_thumbnail_mimetype(const PurpleXfer *xfer);
 	
@@ -718,6 +720,7 @@ const gchar *purple_xfer_get_thumbnail_mimetype(const PurpleXfer *xfer);
  * @param thumbnail A pointer to the thumbnail data, this will be copied
  * @param size The size in bytes of the passed in thumbnail data
  * @param mimetype The mimetype of the generated thumbnail
+ * @since 2.7.0
  */
 void purple_xfer_set_thumbnail(PurpleXfer *xfer, gconstpointer thumbnail,
 	gsize size, const gchar *mimetype);
@@ -729,6 +732,7 @@ void purple_xfer_set_thumbnail(PurpleXfer *xfer, gconstpointer thumbnail,
  * @param xfer The file transfer to create a thumbnail for
  * @param formats A comma-separated list of mimetypes for image formats
  *	 	  the protocols can use for thumbnails.
+ * @since 2.7.0
  */
 void purple_xfer_prepare_thumbnail(PurpleXfer *xfer, const gchar *formats);
 
diff --git a/libpurple/request.h b/libpurple/request.h
index 36a071db6f..750bc86a6b 100644
--- a/libpurple/request.h
+++ b/libpurple/request.h
@@ -1403,6 +1403,7 @@ void *purple_request_action_varg(void *handle, const char *title,
 /**
  * Version of purple_request_action() supplying an image for the UI to 
  * optionally display as an icon in the dialog; see its documentation
+ * @since 2.7.0
  */
 void *purple_request_action_with_icon(void *handle, const char *title, 
 	const char *primary, const char *secondary, int default_action, 
@@ -1413,6 +1414,7 @@ void *purple_request_action_with_icon(void *handle, const char *title,
 /**
  * <tt>va_list</tt> version of purple_request_action_with_icon(); 
  * see its documentation.
+ * @since 2.7.0
  */
 void *purple_request_action_varg_with_icon(void *handle, const char *title,
 	const char *primary, const char *secondary, int default_action,