# HG changeset patch
# User Jeffrey Connelly <jaconnel@calpoly.edu>
# Date 1177796687 0
# Node ID f62023eddfc699f0ae959c11db4e735160a6fe5f
# Parent  8063f163f41129c93d28e34120c5bf4153c230c4
Add and use MySpaceIM icon uploaded by hbons (48x48 original and resized 22x22 and 16x16 versions).

diff -r 8063f163f411 -r f62023eddfc6 libpurple/protocols/myspace/myspace.c
--- a/libpurple/protocols/myspace/myspace.c	Sat Apr 28 21:19:40 2007 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Sat Apr 28 21:44:47 2007 +0000
@@ -123,12 +123,7 @@
      * C:\cygwin\home\Jeff\purple-2.0.0beta6\gtk\pixmaps\status\default 
      * and returning "myspace" but icon shows up blank.
      */
-    if (acct == NULL)
-    {
-        purple_debug_info("msim", "msim_list_icon: acct == NULL!\n");
-        //exit(-2);
-    }
-      return "meanwhile";
+    return "myspace";
 }
 /** 
  * Parse a MySpaceIM protocol message into a hash table. 
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/protocols/16/Makefile.am
--- a/pidgin/pixmaps/protocols/16/Makefile.am	Sat Apr 28 21:19:40 2007 +0000
+++ b/pidgin/pixmaps/protocols/16/Makefile.am	Sat Apr 28 21:44:47 2007 +0000
@@ -9,6 +9,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/protocols/16/myspace.png
Binary file pidgin/pixmaps/protocols/16/myspace.png has changed
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/protocols/22/Makefile.am
--- a/pidgin/pixmaps/protocols/22/Makefile.am	Sat Apr 28 21:19:40 2007 +0000
+++ b/pidgin/pixmaps/protocols/22/Makefile.am	Sat Apr 28 21:44:47 2007 +0000
@@ -9,6 +9,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/protocols/22/myspace.png
Binary file pidgin/pixmaps/protocols/22/myspace.png has changed
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/protocols/48/Makefile.am
--- a/pidgin/pixmaps/protocols/48/Makefile.am	Sat Apr 28 21:19:40 2007 +0000
+++ b/pidgin/pixmaps/protocols/48/Makefile.am	Sat Apr 28 21:44:47 2007 +0000
@@ -9,6 +9,7 @@
 		jabber.png \
 		meanwhile.png \
 		msn.png \
+		myspace.png \
 		qq.png \
 		silc.png \
 		simple.png \
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/protocols/48/myspace.png
Binary file pidgin/pixmaps/protocols/48/myspace.png has changed
diff -r 8063f163f411 -r f62023eddfc6 pidgin/pixmaps/status/default/Makefile.am
--- a/pidgin/pixmaps/status/default/Makefile.am	Sat Apr 28 21:19:40 2007 +0000
+++ b/pidgin/pixmaps/status/default/Makefile.am	Sat Apr 28 21:44:47 2007 +0000
@@ -26,6 +26,7 @@
 	male.png \
 	meanwhile.png \
 	msn.png \
+	myspace.png \
 	notauthorized.png \
 	novell.png \
 	occupied.png \