merge of '03d3f60c959d6bb7240c886be4c0066be8e197a0' cpw.attention_ui

Thu, 30 Oct 2008 21:00:25 +0000

author
Marcus Lundblad <malu@pidgin.im>
date
Thu, 30 Oct 2008 21:00:25 +0000
branch
cpw.attention_ui
changeset 25929
545b433c1483
parent 25928
03d3f60c959d (current diff)
parent 25927
a799d27e2974 (diff)
child 25930
44d277a5bcd3

merge of '03d3f60c959d6bb7240c886be4c0066be8e197a0'
and 'a799d27e297409e13ea7527689b00bba4f82cd51'

libpurple/protocols/qq/group_conv.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_conv.h file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_find.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_find.h file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_free.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_free.h file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_search.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/group_search.h file | annotate | diff | comparison | revisions
libpurple/protocols/qq/header_info.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/header_info.h file | annotate | diff | comparison | revisions
libpurple/protocols/qq/qq_define.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/qq_define.h file | annotate | diff | comparison | revisions
libpurple/protocols/qq/sys_msg.c file | annotate | diff | comparison | revisions
libpurple/protocols/qq/sys_msg.h file | annotate | diff | comparison | revisions
--- 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);
 }

mercurial