# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179673323 0
# Node ID 251ed95cc52ca5fe2d4b8162e028ff3b20122a9b
# Parent  fdd52f7651c71bb87a0695bd8e087b52c3884c9b# Parent  afb25cb38e756ff65a8fc77b4f75b18ad012ff9f
merge of '211be57922bc0273e193942f976264ae52d8cf41'
     and '7fa526ccf77d3d2da927a55aa8115be7e1be184d'

diff -r fdd52f7651c7 -r 251ed95cc52c ChangeLog
--- a/ChangeLog	Sun May 20 14:57:09 2007 +0000
+++ b/ChangeLog	Sun May 20 15:02:03 2007 +0000
@@ -32,6 +32,15 @@
 	  conversation tabs (Ma Xuan)
 	* Fix IRC connection bug with dircproxy (xjoe)
 	* Ctrl+[shift]+tab focuses the next most active tab (William Thompson)
+	* Add a Google Talk item to the protocol list, to help users who think
+	  we don't support Google Talk.  The item acts just like "XMPP".
+	* Remember if the X server supports XScreenSaver, to avoid waking it
+	  every 5 seconds.  (Arjan van de Ven with Intel Corporation)
+	* Change our idle checking to poll only as necessary and raise the
+	  unidle timeout from 5 seconds to 60 when using XScreenSaver.  This
+	  and the XScreenSaver change will reduce Pidgin's effect on power
+	  consumption when running with NO_HZ.  (Arjan van de Ven with Intel
+	  Corporation)
 
 	Finch:
 	* Userlist in chat windows, which can be turned on or off using