# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1211492693 0
# Node ID d7e66b6137f9a2218e0ac5c2d1f8f772d9b78796
# Parent  88d67b1bb52a9d929c778afa0acbc0807cddf035
Update changelogs and some of the docs for the new API. Preparing to merge with i.p.p

diff -r 88d67b1bb52a -r d7e66b6137f9 ChangeLog
--- a/ChangeLog	Thu May 22 21:19:31 2008 +0000
+++ b/ChangeLog	Thu May 22 21:44:53 2008 +0000
@@ -1,16 +1,21 @@
 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)
diff -r 88d67b1bb52a -r d7e66b6137f9 ChangeLog.API
--- a/ChangeLog.API	Thu May 22 21:19:31 2008 +0000
+++ b/ChangeLog.API	Thu May 22 21:44:53 2008 +0000
@@ -6,21 +6,6 @@
 		* 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 @@
 		* 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.
diff -r 88d67b1bb52a -r d7e66b6137f9 finch/libgnt/configure.ac
--- a/finch/libgnt/configure.ac	Thu May 22 21:19:31 2008 +0000
+++ b/finch/libgnt/configure.ac	Thu May 22 21:44:53 2008 +0000
@@ -24,10 +24,10 @@
 # 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])
diff -r 88d67b1bb52a -r d7e66b6137f9 libpurple/smiley.h
--- a/libpurple/smiley.h	Thu May 22 21:19:31 2008 +0000
+++ b/libpurple/smiley.h	Thu May 22 21:44:53 2008 +0000
@@ -1,6 +1,7 @@
 /**
  * @file smiley.h Smiley API
  * @ingroup core
+ * @since 2.5.0
  */
 
 /* purple
diff -r 88d67b1bb52a -r d7e66b6137f9 pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h	Thu May 22 21:19:31 2008 +0000
+++ b/pidgin/gtkimhtml.h	Thu May 22 21:44:53 2008 +0000
@@ -76,6 +76,7 @@
 	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;
diff -r 88d67b1bb52a -r d7e66b6137f9 pidgin/gtkthemes.h
--- a/pidgin/gtkthemes.h	Thu May 22 21:19:31 2008 +0000
+++ b/pidgin/gtkthemes.h	Thu May 22 21:44:53 2008 +0000
@@ -51,6 +51,9 @@
 
 void pidgin_themes_smiley_themeize(GtkWidget *);
 
+/**
+ * @since 2.5.0
+ */
 void pidgin_themes_smiley_themeize_custom(GtkWidget *);
 
 void pidgin_themes_smiley_theme_probe(void);