# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1258411892 0
# Node ID 1d419161f05d073fafa79d09f8d34cc39d426c57
# Parent  7b1cfd48beab0a117906dfbdc4fafb48d20e5e2d
Changelog attention UI
Fixup pidgin/pixmaps Makefile after merge

Closed #2788

diff -r 7b1cfd48beab -r 1d419161f05d ChangeLog
--- a/ChangeLog	Mon Nov 16 22:06:27 2009 +0000
+++ b/ChangeLog	Mon Nov 16 22:51:32 2009 +0000
@@ -15,6 +15,7 @@
 	  Information" dialog accessible on the Help menu.
 	* Use GtkStatusIcon for the docklet, providing better integration in
 	  notification area.
+	* Added UI for sending attentions (buzz, nudge) on supporting protocols.
 
 version 2.6.4 (??/??/20??):
 	libpurple:
diff -r 7b1cfd48beab -r 1d419161f05d ChangeLog.API
--- a/ChangeLog.API	Mon Nov 16 22:06:27 2009 +0000
+++ b/ChangeLog.API	Mon Nov 16 22:51:32 2009 +0000
@@ -14,12 +14,15 @@
 		* media_caps to the PurpleBuddy struct
 		* buddy-caps-changed blist signal
 		* ui-caps-changed media manager signal
+		* sent-attention conversation signal
+		* got-attention conversation signal
 	
 	Pidgin:
 		Added:
 		* pidgin_dialogs_buildinfo (should not be used by anything but Pidgin)
 		* pidgin_dialogs_developers (should not be used by anything but Pidgin)
 		* pidgin_dialogs_translators (should not be used by anything but Pidgin)
+		* gtk_imhtmltoolbar_switch_active_conversation
 
 version 2.6.3 (10/16/2009):
 	No changes
diff -r 7b1cfd48beab -r 1d419161f05d pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Mon Nov 16 22:06:27 2009 +0000
+++ b/pidgin/pixmaps/Makefile.am	Mon Nov 16 22:51:32 2009 +0000
@@ -446,8 +446,7 @@
 		toolbar/16/send-file.png \
 		toolbar/16/transfer.png \
 		toolbar/16/unblock.png \
-		toolbar/16/video-call.png
-		toolbar/16/unblock.png \
+		toolbar/16/video-call.png \
 		toolbar/16/get-attention.png
 
 TOOLBAR_22_SCALABLE = \