changeset 18840:75a6fdc7f622

merge of '0f5a6fae9f2ae8df51271e7bb342d7bd8cf08950' and 'be234f217f6ea72ee7ed5d116b79c5efe37c0608'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Wed, 08 Aug 2007 00:38:18 +0000
parents ed50c9745b1d (current diff) 5464e5d8603b (diff)
children 03a0054954bb
files
diffstat 3 files changed, 7 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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 = "";
 		}
--- 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();