# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1196446216 0
# Node ID 2de3a2de5f13db330a6777824a956c6cd2311ae0
# Parent  052f5c37e881ca4450a51f523795f57318fbd68b
Update the changelogs. Correct the man page. Allow 'default' to mean the
default color (-1).

diff -r 052f5c37e881 -r 2de3a2de5f13 ChangeLog
--- a/ChangeLog	Fri Nov 30 09:22:44 2007 +0000
+++ b/ChangeLog	Fri Nov 30 18:10:16 2007 +0000
@@ -1,5 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.3.1 (??/??/????):
+	Finch:
+	* Color is used in the buddylist to indicate status. Look at the sample
+	  gntrc file in the man-page for details.
+
 version 2.3.0 (11/24/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.3.0
 		NOTE: Some bugs marked fixed in 2.2.1, 2.2.2 or 2.2.3 may not
diff -r 052f5c37e881 -r 2de3a2de5f13 ChangeLog.API
--- a/ChangeLog.API	Fri Nov 30 09:22:44 2007 +0000
+++ b/ChangeLog.API	Fri Nov 30 18:10:16 2007 +0000
@@ -1,5 +1,14 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.3.1 (??/??/????):
+	Finch:
+		libgnt:
+		* Added gnt_tree_set_row_color to set the color for a row in a tree.
+		* Added gnt_style_get_string_list
+		* Added gnt_color_add_pair to define a new color.
+		* Added gnt_colors_get_color to get an ncurses color value from a
+		  string.
+
 version 2.3.0 (11/24/2007):
 	libpurple:
 		Added:
diff -r 052f5c37e881 -r 2de3a2de5f13 doc/finch.1.in
--- a/doc/finch.1.in	Fri Nov 30 09:22:44 2007 +0000
+++ b/doc/finch.1.in	Fri Nov 30 18:10:16 2007 +0000
@@ -137,13 +137,13 @@
 .br
 [Finch]
 .br
-online-color: green; black
+color-available = green; black
 .br
-away-color: blue; black
+color-away = blue; black
 .br
-idle-color: gray; black
+color-idle = gray; black
 .br
-offline-color: red; black
+color-offline = red; black
 .br
 #See below for details on color
 .br
diff -r 052f5c37e881 -r 2de3a2de5f13 finch/gntblist.c
--- a/finch/gntblist.c	Fri Nov 30 09:22:44 2007 +0000
+++ b/finch/gntblist.c	Fri Nov 30 18:10:16 2007 +0000
@@ -27,7 +27,6 @@
 
 #include <account.h>
 #include <blist.h>
-#include <curses.h>
 #include <notify.h>
 #include <request.h>
 #include <savedstatuses.h>
@@ -1788,22 +1787,19 @@
 
 void finch_blist_init()
 {
-	short fg, bg;
-	if (has_colors()) {
-		pair_content(GNT_COLOR_NORMAL, &fg, &bg);
-		color_available = get_color("color-available");
-		if (!color_available)
-			color_available = gnt_color_add_pair(COLOR_GREEN, bg);
-		color_away = get_color("color-away");
-		if (!color_away)
-			color_away = gnt_color_add_pair(COLOR_BLUE, bg);
-		color_idle = get_color("color-idle");
-		if (!color_idle)
-			color_idle = gnt_color_add_pair(COLOR_CYAN, bg);
-		color_offline = get_color("color-offline");
-		if (!color_offline)
-			color_offline = gnt_color_add_pair(COLOR_RED, bg);
-	}
+	color_available = get_color("color-available");
+	if (!color_available)
+		color_available = gnt_color_add_pair(COLOR_GREEN, -1);
+	color_away = get_color("color-away");
+	if (!color_away)
+		color_away = gnt_color_add_pair(COLOR_BLUE, -1);
+	color_idle = get_color("color-idle");
+	if (!color_idle)
+		color_idle = gnt_color_add_pair(COLOR_CYAN, -1);
+	color_offline = get_color("color-offline");
+	if (!color_offline)
+		color_offline = gnt_color_add_pair(COLOR_RED, -1);
+
 	purple_prefs_add_none(PREF_ROOT);
 	purple_prefs_add_none(PREF_ROOT "/size");
 	purple_prefs_add_int(PREF_ROOT "/size/width", 20);
diff -r 052f5c37e881 -r 2de3a2de5f13 finch/libgnt/gntcolors.c
--- a/finch/libgnt/gntcolors.c	Fri Nov 30 09:22:44 2007 +0000
+++ b/finch/libgnt/gntcolors.c	Fri Nov 30 18:10:16 2007 +0000
@@ -164,8 +164,12 @@
 		color = COLOR_MAGENTA;
 	else if (strcmp(key, "cyan") == 0)
 		color = COLOR_CYAN;
-	else
+	else if (strcmp(key, "default") == 0)
 		color = -1;
+	else {
+		g_warning("Invalid color name: %s\n", key);
+		color = -1;
+	}
 	return color;
 }