changeset 29650:f050972561d5

merge of '49798f68cc38cddbf1fb0ef1b458d1adec2f3b12' and 'f00591c7734e6f35f76c71eabfa9acf81edc3107'
author Marcus Lundblad <ml@update.uu.se>
date Thu, 30 Oct 2008 21:00:25 +0000
parents 0caae32d570d (current diff) 9c928fb69ace (diff)
children ee18c6a99628
files libpurple/protocols/qq/group_conv.c libpurple/protocols/qq/group_conv.h libpurple/protocols/qq/group_find.c libpurple/protocols/qq/group_find.h libpurple/protocols/qq/group_free.c libpurple/protocols/qq/group_free.h libpurple/protocols/qq/group_search.c libpurple/protocols/qq/group_search.h libpurple/protocols/qq/header_info.c libpurple/protocols/qq/header_info.h libpurple/protocols/qq/sys_msg.c libpurple/protocols/qq/sys_msg.h
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }