changeset 21899:af389f2537ad

merge of '70b3c6fe54dd2678b33b1b1da78c4e66acd20931' and 'f24be9cb8ea385acbcd053e528efbd2bb31b8b1d'
author Sean Egan <seanegan@gmail.com>
date Tue, 18 Dec 2007 22:12:10 +0000
parents 39b078ac8a81 (diff) 622a96f78a9c (current diff)
children 9a43b7ed0f74
files
diffstat 6 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 18 22:10:49 2007 +0000
+++ b/ChangeLog	Tue Dec 18 22:12:10 2007 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.3.2 (??/??/????):
+version 2.4.0 (??/??/????):
 	libpurple:
 	* Fixed various problems with loss of status messages when going
 	  or returning from idle on MySpaceIM.
--- a/ChangeLog.API	Tue Dec 18 22:10:49 2007 +0000
+++ b/ChangeLog.API	Tue Dec 18 22:12:10 2007 +0000
@@ -4,6 +4,7 @@
 	libpurple:
 		Added:
 		* purple_certificate_add_ca_search_path. (Florian Quèze)
+		* purple_gai_strerror.
 
 	Pidgin:
 		Added:
@@ -20,7 +21,6 @@
 		* pidgin_tooltip_setup_for_treeview, pidgin_tooltip_destroy and
 		  pidgin_tooltip_show to simplify the process of drawing tooltips.
 
-version 2.3.2 (??/??/????):
 	Finch:
 		libgnt:
 		* Added gnt_tree_set_row_color to set the color for a row in a tree.
--- a/finch/libgnt/gntcolors.h	Tue Dec 18 22:10:49 2007 +0000
+++ b/finch/libgnt/gntcolors.h	Tue Dec 18 22:12:10 2007 +0000
@@ -93,7 +93,7 @@
  *
  * @return A color
  *
- * @since 2.3.1 (gnt), 2.3.1 (pidgin)
+ * @since 2.4.0
  */
 int gnt_colors_get_color(char *key);
 #endif
@@ -119,7 +119,7 @@
  *
  * @return  A color pair
  *
- * @since 2.3.1
+ * @since 2.4.0
  */
 int gnt_color_add_pair(int fg, int bg);
 #endif
--- a/finch/libgnt/gntstyle.h	Tue Dec 18 22:10:49 2007 +0000
+++ b/finch/libgnt/gntstyle.h	Tue Dec 18 22:12:10 2007 +0000
@@ -74,7 +74,7 @@
  *
  * @return        NULL terminated string array. The array should be freed with g_strfreev().
  *
- * @since 2.3.2
+ * @since 2.4.0
  */
 char **gnt_style_get_string_list(const char *group, const char *key, gsize *length);
 
@@ -87,7 +87,7 @@
  *
  * @return  The value of the color as an int, or 0 on error.
  *
- * @since 2.3.2
+ * @since 2.4.0
  */
 int gnt_style_get_color(char *group, char *key);
 
--- a/finch/libgnt/gnttree.h	Tue Dec 18 22:10:49 2007 +0000
+++ b/finch/libgnt/gnttree.h	Tue Dec 18 22:12:10 2007 +0000
@@ -330,6 +330,7 @@
  * @param tree   The tree
  * @param key    The key for the row
  * @param color  The color
+ * @since 2.4.0
  */
 void gnt_tree_set_row_color(GntTree *, void *, int);
 
--- a/libpurple/util.h	Tue Dec 18 22:10:49 2007 +0000
+++ b/libpurple/util.h	Tue Dec 18 22:12:10 2007 +0000
@@ -1117,6 +1117,7 @@
  * @param errnum The error code.
  *
  * @return The UTF-8 error message.
+ * @since 2.4.0
  */
 G_CONST_RETURN gchar *purple_gai_strerror(gint errnum);