pidgin.next.minor: 36289cbe: Update changelogs and some of the docs f...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 36289cbe05fc5125d36b8a550e0ae4adf3f3fd53
Ancestor: 5ce50c4a271c4f856b4c72a4f831be53c285603e
Author: sadrul at pidgin.im
Date: 2008-05-22T21:44:53
Branch: im.pidgin.pidgin.next.minor
URL: http://d.pidgin.im/viewmtn/revision/info/36289cbe05fc5125d36b8a550e0ae4adf3f3fd53

Modified files:
        ChangeLog ChangeLog.API finch/libgnt/configure.ac
        libpurple/smiley.h pidgin/gtkimhtml.h pidgin/gtkthemes.h

ChangeLog: 

Update changelogs and some of the docs for the new API. Preparing to merge with i.p.p

-------------- next part --------------
============================================================
--- ChangeLog	31cf1cf8e5a604a3f9d2c54ed99f6e1fdd533913
+++ ChangeLog	ec4d00161b51b4a3ac5afcf10ef6f1c1c2dbaa94
@@ -1,16 +1,21 @@ Pidgin and Finch: The Pimpin' Penguin IM
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.0:
+version 2.5.0 (??/??/2008):
+	libpurple:
+	* Ability to create custom smileys (currently only the MSN protocol
+	  utilizes the feature). (Thanks to Mauro Sérgio Ferreira Brasil,
+	  Marcus Lundblad, Jorge Villaseñor and other contributors)
+
 	Pidgin:
 	* Custom buddy icons can now be added and removed to buddy list
 	  entries via the buddy list entry right-click menu.
+	* Resize large incoming custom smileys to a maximum of 96px on either
+	  side.
 
 	General:
 	* Group and Chat buddy list entries can now be given custom buddy
 	  icons.
 
-version 2.4.3 (??/??/2008):
-
 version 2.4.2 (05/17/2008):
 	libpurple:
 	* In MySpaceIM, messages from spambots are discarded (Justin Williams)
============================================================
--- ChangeLog.API	9d6d700be780f8119d7444a51d840ce07403ce44
+++ ChangeLog.API	7fd62ab01ef493c7e9b42debc520e85bef00df8e
@@ -6,21 +6,6 @@ version 2.5.0 (??/??/2008):
 		* Connection flag PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY to indicate
 		  that the connection supports sending and receiving custom smileys.
 		* PurpleSmiley and the Smiley API.
-
-	pidgin:
-		Added:
-		* gtk_imhtml_smiley_create, gtk_imhtml_smiley_reload and
-		  gtk_imhtml_smiley_destroy to deal with GtkIMHtmlSmiley's.
-		* pidgin_pixbuf_from_imgstore to create a GdkPixbuf from a
-		  PurpleStoredImage.
-		* pidgin_themes_smiley_themeize_custom to associate custom smileys to
-		  a GtkIMHtml widget.
-		* GTK_IMHTML_CUSTOM_SMILEY flag for GtkIMHtml.
-		* GTK+ Custom Smiley API.
-
-version 2.5.0:
-	libpurple:
-		Added:
 		* purple_serv_got_join_chat_failed
 		* chat-join-failed signal (see conversation-signals.dox)
 		* purple_blist_update_node_icon
@@ -36,6 +21,18 @@ version 2.5.0:
 		* purple_buddy_icons_set_custom_icon
 		* pidgin_set_custom_buddy_icon
 
+	pidgin:
+		Added:
+		* gtk_imhtml_smiley_create, gtk_imhtml_smiley_reload and
+		  gtk_imhtml_smiley_destroy to deal with GtkIMHtmlSmiley's.
+		* pidgin_pixbuf_from_imgstore to create a GdkPixbuf from a
+		  PurpleStoredImage.
+		* pidgin_themes_smiley_themeize_custom to associate custom smileys to
+		  a GtkIMHtml widget.
+		* GTK_IMHTML_CUSTOM_SMILEY flag for GtkIMHtml.
+		* GTK+ Custom Smiley API.
+
+version 2.4.2:
 	perl:
 		Added:
 		* Purple::Prefs::get_children_names.
============================================================
--- finch/libgnt/configure.ac	e3d6387540b02e5f3a621be5c9b336c199a4aab4
+++ finch/libgnt/configure.ac	76f0a4f392a1259fcd94fccdf14cd608ccbe7902
@@ -24,10 +24,10 @@ AC_PREREQ([2.50])
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [4])
+m4_define([gnt_lt_current], [5])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [4])
-m4_define([gnt_micro_version], [2])
+m4_define([gnt_minor_version], [5])
+m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
============================================================
--- libpurple/smiley.h	ad29a9cdfd515a9056cd109f749a557ad69f7e11
+++ libpurple/smiley.h	0a4eb7c01d47365cb21729126d1b21402490015d
@@ -1,6 +1,7 @@
 /**
  * @file smiley.h Smiley API
  * @ingroup core
+ * @since 2.5.0
  */
 
 /* purple
============================================================
--- pidgin/gtkimhtml.h	d018d85613b4630f012e969f9b2994a70d4f87a0
+++ pidgin/gtkimhtml.h	b7ea43cb41f2b3a733360fa97f10ef9eb587b369
@@ -76,6 +76,7 @@ typedef enum {
 	GTK_IMHTML_SMILEY =     1 << 11,
 	GTK_IMHTML_LINKDESC =   1 << 12,
 	GTK_IMHTML_STRIKE =     1 << 13,
+	/** Show custom smileys when appropriate. @since 2.5.0 */
 	GTK_IMHTML_CUSTOM_SMILEY = 1 << 14,
 	GTK_IMHTML_ALL =       -1
 } GtkIMHtmlButtons;
============================================================
--- pidgin/gtkthemes.h	ccf1c230e2e69edbf3588ca54414a3327e5e4b41
+++ pidgin/gtkthemes.h	50544ee7490c1c79c030e02198b42905a232a706
@@ -51,6 +51,9 @@ void pidgin_themes_smiley_themeize(GtkWi
 
 void pidgin_themes_smiley_themeize(GtkWidget *);
 
+/**
+ * @since 2.5.0
+ */
 void pidgin_themes_smiley_themeize_custom(GtkWidget *);
 
 void pidgin_themes_smiley_theme_probe(void);