# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1186533498 0
# Node ID 75a6fdc7f62281afcc83f0cb58a65f8373ae0cff
# Parent  ed50c9745b1da90a7abca5082a94a118fde1620d# Parent  5464e5d8603bececdcaf01e92bec9c8ae4a6f825
merge of '0f5a6fae9f2ae8df51271e7bb342d7bd8cf08950'
     and 'be234f217f6ea72ee7ed5d116b79c5efe37c0608'

diff -r ed50c9745b1d -r 75a6fdc7f622 ChangeLog
--- a/ChangeLog	Wed Aug 08 00:36:35 2007 +0000
+++ b/ChangeLog	Wed Aug 08 00:38:18 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 ed50c9745b1d -r 75a6fdc7f622 pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Wed Aug 08 00:36:35 2007 +0000
+++ b/pidgin/gtkconv.c	Wed Aug 08 00:38:18 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 ed50c9745b1d -r 75a6fdc7f622 pidgin/gtkdocklet.c
--- a/pidgin/gtkdocklet.c	Wed Aug 08 00:36:35 2007 +0000
+++ b/pidgin/gtkdocklet.c	Wed Aug 08 00:38:18 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();