changeset 20154:df24e0153753

Try to sync up the change log. It would be helpful for people to remember to update it. :P

--- a/ChangeLog	Tue Sep 18 03:35:50 2007 +0000
+++ b/ChangeLog	Tue Sep 18 05:18:29 2007 +0000
@@ -3,18 +3,36 @@
 Version 2.2.1:
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.1
 	
+	libpurple:
+	* A few build issues on Solaris were fixed.
+	* Cancelling the password prompt for an account will no longer leave
+	  it in an ambiguous state.  (It will be disabled.)
+	* Fixed an erroneous size display for MSN file transfers. (galt)
+	* Real usernames are now shown in the system log.
+
 	Pidgin:
-	* When aliasing someone to an alias that already exists in the
-	  same group, offer to merge the buddies into the same contact
-	* It's possible to keep a conversation (chat/IM) open even after closing
-	  the conversation window/tab.
-	* A music emblem is displayed in the buddy list for a buddy if we know she
-	  is listening to some soothing music.
-	* 'Move to' menu in buddy list context menu for moving buddies to
-  	   other groups
-	* Move "Smiley" to the top-level of the toolbar
-	* Save Pidgin's display in the command line for session
+	* If you alias a buddy to an alias that is already present within
+	  a particular group, we now offer to merge the buddies into the
+	  same contact.
+	* A music emblem is now displayed in the buddy list for a buddy if we
+	  know she is listening to some soothing music.
+	* Added a 'Move to' menu in buddy list context menu for moving buddies
+	  to other groups as an alternative to dragging.
+	* Group headings are now marked via an underline instead of a
+	  different color background.
+	* It is now possible to mark a chat on your buddy list as "Persistent"
+	  so you do not leave the chat when the window or tab is closed.
+	* The auto-join option for chats is now listed in the "Add Chat"
+	  dialog along with the new persistence option.
+	* Closing an IM no longer immediately closes your conversation.  It
+	  will now remain active for a short time so that if the conversation
+	  resumes, the history will be retained.  A preference has been added
+	  to toggle this behavior.
+	* The "Smiley" menu has been moved to the top-level of the toolbar.
+	* Fixed keyboard tab reordering to move tabs one step instead of two.
+	* Pidgin's display is now saved with the command line for session
 	  restoration.  (David Mohr)
+	* You should no longer lose proxy settings when Pidgin is restarted.
 
 Version 2.2.0 (09/13/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.0