# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1188842845 0
# Node ID 59d6a26c10fc26f50593387c250658a325ca794a
# Parent  0bf089a22f610720a6ae58dbabd3b92f945c5de6# Parent  582a5608cfc1e6cd0e234b907889a84c68980cc9
merge of '5f6418804a7d4bb6c64f14f7bc4addc6dee0b232'
     and '65bd357175b8ebc632813ed394592ac6d1189bbd'

diff -r 0bf089a22f61 -r 59d6a26c10fc libpurple/protocols/myspace/CHANGES
--- a/libpurple/protocols/myspace/CHANGES	Mon Sep 03 17:23:46 2007 +0000
+++ b/libpurple/protocols/myspace/CHANGES	Mon Sep 03 18:07:25 2007 +0000
@@ -6,7 +6,7 @@
 * 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.
-
+* Pidgin 2.1.1 only.
 
 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)
diff -r 0bf089a22f61 -r 59d6a26c10fc libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Mon Sep 03 17:23:46 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Mon Sep 03 18:07:25 2007 +0000
@@ -2629,7 +2629,7 @@
 
 	switch (GPOINTER_TO_UINT(user_data)) {
 		case MSIM_CONTACT_LIST_IMPORT_ALL_FRIENDS:
-			msg = g_strdup_printf(_("%d buddies were added or updated"), buddy_count);
+			msg = g_strdup_printf(_("%d buddies were added or updated from the server (including buddies already on the server-side list)"), buddy_count);
 			purple_notify_info(session->account, _("Add contacts from server"), msg, NULL);
 			g_free(msg);
 			break;
diff -r 0bf089a22f61 -r 59d6a26c10fc libpurple/protocols/myspace/myspace.h
--- a/libpurple/protocols/myspace/myspace.h	Mon Sep 03 17:23:46 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Mon Sep 03 18:07:25 2007 +0000
@@ -96,7 +96,7 @@
 #define MSIM_LANGUAGE_NAME_ENGLISH  "ENGLISH"
 
 /* msimprpl version string of this plugin */
-#define MSIM_PRPL_VERSION_STRING    "0.16"
+#define MSIM_PRPL_VERSION_STRING    "0.18"
 
 /* Default server */
 #define MSIM_SERVER                 "im.myspace.akadns.net"
@@ -186,10 +186,10 @@
 /** A type of "attention" message (zap, nudge, buzz, etc. depending on the
  * protocol) that can be sent and received. */
 struct _MsimAttentionType {
-	PurpleStoredImage *icon;
-	const gchar *description;		/**< Shown before sending. */
+	const gchar *name;	 	        /**< Shown before sending. */
 	const gchar *incoming_description;	/**< Shown when sent. */
 	const gchar *outgoing_description;	/**< Shown when received. */
+	const gchar *icon_name;
 };
 #endif
 
diff -r 0bf089a22f61 -r 59d6a26c10fc libpurple/protocols/myspace/release.sh
--- a/libpurple/protocols/myspace/release.sh	Mon Sep 03 17:23:46 2007 +0000
+++ b/libpurple/protocols/myspace/release.sh	Mon Sep 03 18:07:25 2007 +0000
@@ -4,7 +4,7 @@
 
 # Package a new msimprpl for release. Must be run with bash.
 
-VERSION=0.16
+VERSION=0.18
 make
 # Include 'myspace' directory in archive, so it can easily be unextracted
 # into ~/pidgin/libpurple/protocols at the correct location.