# HG changeset patch
# User Sean Egan <seanegan@gmail.com>
# Date 1186532960 0
# Node ID 510cd9fa91aab79a555fe2586e6521e699de19ca
# Parent  140662c8280c897360e479b5ab9670f7b89a1f0e
Revert 'show docklet' preference default to 'always.'

diff -r 140662c8280c -r 510cd9fa91aa ChangeLog
--- a/ChangeLog	Tue Aug 07 11:32:56 2007 +0000
+++ b/ChangeLog	Wed Aug 08 00:29:20 2007 +0000
@@ -5,10 +5,14 @@
 	* Added an account action to open your inbox in the yahoo prpl.
 	* Added support for Unicode status messages in Yahoo.
 	* Server-stored aliases for Yahoo. (John Moody)
+	* Fixed support for Yahoo! doodling.
+	* Bonjour plugin uses native Avahi instead of Howl
 
 	Pidgin:
 	* Show current outgoing conversation formatting on the font label on
 	  the toolbar
+	* Slim new redesign of conversation tabs to maximize number of
+	  conversations that can fit in a window
 
 version 2.1.0 (07/28/2007):
 	libpurple:
diff -r 140662c8280c -r 510cd9fa91aa pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Tue Aug 07 11:32:56 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Aug 08 00:29:20 2007 +0000
@@ -6320,13 +6320,13 @@
 			style = "color=\"#c4a000\"";
 		} else if (gtkconv->unseen_state == PIDGIN_UNSEEN_NICK)	{
 			atk_object_set_description(accessibility_obj, _("Nick Said"));
-			style = "color=\"#204a87\" style=\"italic\" weight=\"bold\"";
+			style = "color=\"#204a87\" weight=\"bold\"";
 		} else if (gtkconv->unseen_state == PIDGIN_UNSEEN_TEXT)	{
 			atk_object_set_description(accessibility_obj, _("Unread Messages"));
 			style = "color=\"#cc0000\" weight=\"bold\"";
 		} else if (gtkconv->unseen_state == PIDGIN_UNSEEN_EVENT) {
 			atk_object_set_description(accessibility_obj, _("New Event"));
-			style = "color=\"#888a85\" style=\"italic\"";
+			style = "color=\"#888a85\" weight=\"bold\"";
 		} else {
 			style = "";
 		}
diff -r 140662c8280c -r 510cd9fa91aa pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Tue Aug 07 11:32:56 2007 +0000
+++ b/pidgin/gtkdocklet.c	Wed Aug 08 00:29:20 2007 +0000
@@ -121,7 +121,7 @@
 	/* determine if any ims have unseen messages */
 	convs = get_pending_list(DOCKLET_TOOLTIP_LINE_LIMIT);
 
-	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) {
+	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "always")) {
 		if (convs && ui_ops->create && !visible) {
 			g_list_free(convs);
 			ui_ops->create();