# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1188614211 0
# Node ID 0a055f917c85358689c54c4f7c0a83bd02fb66c3
# Parent  f1740f23c8968286edbb75c2ef7b4cfc35bc7f89# Parent  11849a5c3951cfa9e457e2468d2ab550390436bb
merge of '1247a733923713e275ecb722adf9abc726896c3f'
     and '26743756292ed5c798a0e97c6983736a95f5b0d2'

diff -r 11849a5c3951 -r 0a055f917c85 ChangeLog
diff -r 11849a5c3951 -r 0a055f917c85 ChangeLog.API
--- a/ChangeLog.API	Fri Aug 31 19:08:35 2007 +0000
+++ b/ChangeLog.API	Sat Sep 01 02:36:51 2007 +0000
@@ -6,6 +6,9 @@
 		* PURPLE_MESSAGE_INVISIBLE flag, which can be used by
 		  purple_conv_im_send_with_flags to send a message, but not display it
 		  in the conversation
+		* serv_send_attention(), serv_got_attention(), as well as send_attention 
+		  and attention_types in PurplePluginProtocolInfo. This new API is used
+		  for zapping in MySpaceIM, buzzing in Yahoo, and nudging in MSN.
 		Changed:
 		* purple_prefs_load is now called within purple_prefs_init.
 		  The UI no longer needs to call it.
diff -r 11849a5c3951 -r 0a055f917c85 libpurple/protocols/myspace/CHANGES
--- a/libpurple/protocols/myspace/CHANGES	Fri Aug 31 19:08:35 2007 +0000
+++ b/libpurple/protocols/myspace/CHANGES	Sat Sep 01 02:36:51 2007 +0000
@@ -1,3 +1,13 @@
+2007-08-28 Jeff Connelly <pidgin@xyzzy.cjb.net> - 0.17
+* Get server-side contact list from server on sign-on (partly implements
+  server-side contacts, ticket #2658).
+* Set local alias to username on sign-on, if not already set. This fixes
+  #2793, though this may not be the best way, other fixes under consideration.
+* Support myim:sendIM and addContact URLs with cID and uID parameters.
+* Fix #2722, only check for mail if "New mail notifications" is enabled.
+* Modularize msimprpl.
+
+
 2007-08-23 Jeff Connelly <pidgin@xyzzy.cjb.net> - 0.16
 * Add option to add all friends from myspace.com to your buddy list (#2660)
 * If a user doesn't have a picture, don't display an icon (instead of
@@ -6,6 +16,7 @@
 * Fix #2752, which led to duplicate groups
 * Fix #2720, crash/disconnect when adding a buddy that doesn't exist
   (You'll now receive an error when looking up invalid usernames).
+* Source-code release only.
 
 2007-08-22 Jeff Connelly <pidgin@xyzzy.cjb.net> - 0.15
 * Incomplete implementation of adding friends from myspace.com.