# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1225400425 0
# Node ID f050972561d5a42131780c844750bbb2329f32c3
# Parent  0caae32d570df42ca0a03dd1255af494cb6290d7# Parent  9c928fb69acebd9b4d4da02cc5adc04ae3504330
merge of '49798f68cc38cddbf1fb0ef1b458d1adec2f3b12'
     and 'f00591c7734e6f35f76c71eabfa9acf81edc3107'

diff -r 0caae32d570d -r f050972561d5 pidgin/gtkimhtmltoolbar.c
--- a/pidgin/gtkimhtmltoolbar.c	Wed Oct 29 21:38:15 2008 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Thu Oct 30 21:00:25 2008 +0000
@@ -920,6 +920,8 @@
 	const gchar *who = purple_conversation_get_name(conv);
 	PurpleConnection *gc = purple_conversation_get_gc(conv);
 	
+	toggle_button_set_active_block(GTK_TOGGLE_BUTTON(toolbar->attention), FALSE, 
+		toolbar);
 	purple_conversation_attention(conv, who, 0, PURPLE_MESSAGE_SEND, time(NULL));
 	purple_prpl_send_attention(gc, who, 0);
 }