# HG changeset patch
# User Rob Flynn <gaim@robflynn.com>
# Date 977290115 0
# Node ID 113a3d16f1ce56ff7be689975fcccc974ebdc155
# Parent  3d82e8f8b786a3eb082b2f804251c84555ebf2b5
[gaim-migrate @ 1337]
hehe

committer: Tailor Script <tailor@pidgin.im>

diff -r 3d82e8f8b786 -r 113a3d16f1ce STATUS
--- a/STATUS	Wed Dec 20 04:52:32 2000 +0000
+++ b/STATUS	Wed Dec 20 05:28:35 2000 +0000
@@ -1,4 +1,4 @@
-STATUS of GAIM CVS tree. Last modified $Date: 2000-12-19 23:03:47 -0500 (Tue, 19 Dec 2000) $ by $Author: robflynn $.
+STATUS of GAIM CVS tree. Last modified $Date: 2000-12-20 00:28:35 -0500 (Wed, 20 Dec 2000) $ by $Author: robflynn $.
 
 This file is meant to provide gaim users who use the CVS version to see whether
 they actually want to compile what they just checked out. Gaim CVS is usually
@@ -102,9 +102,9 @@
 buddylist is functional. It also supports permit/deny lists and going
 away/idle.
 
-When sending the initial message (to start a conversation) there will be a small 
-delay.  It  will appear as if the client has frozen.  This will not always be the 
-case.   I have a fix that I havent taken the time to write yet.
+When sending the initial message (to start a conversation) there will be a 
+small delay.  It  will appear as if the client has frozen.  This will not 
+always be the case.   I have a fix that I havent taken the time to write yet.
 
 
 ICQ
diff -r 3d82e8f8b786 -r 113a3d16f1ce pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Wed Dec 20 04:52:32 2000 +0000
+++ b/pixmaps/Makefile.am	Wed Dec 20 05:28:35 2000 +0000
@@ -73,6 +73,7 @@
 		msg_pending.xpm			\
 		msn_away.xpm			\
 		msn_online.xpm			\
+		napster.xpm			\
 		no_icon.xpm			\
 		normal.xpm			\
 		offline.xpm			\
diff -r 3d82e8f8b786 -r 113a3d16f1ce pixmaps/napster.xpm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pixmaps/napster.xpm	Wed Dec 20 05:28:35 2000 +0000
@@ -0,0 +1,127 @@
+/* XPM */
+static char * napster_xpm[] = {
+"13 13 111 2",
+"  	c None",
+". 	c #121279",
+"+ 	c #18187F",
+"@ 	c #222282",
+"# 	c #18187D",
+"$ 	c #12127C",
+"% 	c #0F0F76",
+"& 	c #131379",
+"* 	c #0F0F79",
+"= 	c #141478",
+"- 	c #13136F",
+"; 	c #12126D",
+"> 	c #20207D",
+", 	c #12126B",
+"' 	c #161675",
+") 	c #15157A",
+"! 	c #1B1B7B",
+"~ 	c #1E1E7E",
+"{ 	c #151578",
+"] 	c #17177C",
+"^ 	c #101076",
+"/ 	c #22227C",
+"( 	c #575792",
+"_ 	c #A5A5B9",
+": 	c #C2C2D5",
+"< 	c #C9C9DF",
+"[ 	c #7171AD",
+"} 	c #111177",
+"| 	c #24247C",
+"1 	c #161677",
+"2 	c #1F1F83",
+"3 	c #0F0F70",
+"4 	c #7D7D88",
+"5 	c #787893",
+"6 	c #ABABAC",
+"7 	c #D1D1D1",
+"8 	c #EFEFEF",
+"9 	c #FFFFFF",
+"0 	c #FDFDFE",
+"a 	c #BFBFDA",
+"b 	c #E4E4EF",
+"c 	c #090970",
+"d 	c #1D1D7F",
+"e 	c #141476",
+"f 	c #78787B",
+"g 	c #969696",
+"h 	c #C1C1C1",
+"i 	c #E2E2E2",
+"j 	c #F5F5F5",
+"k 	c #F7F7FA",
+"l 	c #0A0A70",
+"m 	c #161679",
+"n 	c #7B7B7E",
+"o 	c #B1B1B1",
+"p 	c #DFDFDF",
+"q 	c #F7F7F7",
+"r 	c #FEFEFE",
+"s 	c #F7F7FB",
+"t 	c #18187B",
+"u 	c #202081",
+"v 	c #0C0C72",
+"w 	c #87878A",
+"x 	c #A7B3A5",
+"y 	c #C7D9C3",
+"z 	c #E5F1E2",
+"A 	c #E6F3E3",
+"B 	c #DBEDD6",
+"C 	c #E4F2E1",
+"D 	c #0A0A71",
+"E 	c #1D1D81",
+"F 	c #0D0D77",
+"G 	c #7F7F93",
+"H 	c #66915E",
+"I 	c #3B8F23",
+"J 	c #4FA239",
+"K 	c #E5F2E1",
+"L 	c #52A639",
+"M 	c #419C2D",
+"N 	c #92C683",
+"O 	c #CFCFE4",
+"P 	c #14147A",
+"Q 	c #1A1A80",
+"R 	c #46468B",
+"S 	c #AEAFAD",
+"T 	c #AFC6AB",
+"U 	c #A9C2AD",
+"V 	c #CDD2DB",
+"W 	c #ABC7B0",
+"X 	c #CDE7C7",
+"Y 	c #F8FBF7",
+"Z 	c #5C5CA2",
+"` 	c #16167E",
+" .	c #77779D",
+"..	c #CECECE",
+"+.	c #BFBFD3",
+"@.	c #6565A5",
+"#.	c #CFCFE3",
+"$.	c #9696C3",
+"%.	c #15157B",
+"&.	c #0D0D62",
+"*.	c #636397",
+"=.	c #908DAC",
+"-.	c #7672A0",
+";.	c #A29EC2",
+">.	c #7272AF",
+",.	c #111178",
+"'.	c #111164",
+").	c #232275",
+"!.	c #3C3983",
+"~.	c #252481",
+"{.	c #16167C",
+"        . + @ # $         ",
+"      % &       * =       ",
+"  - ; > , ' ) # ! ~ { ]   ",
+"  ^ / * ( _ : < [ } | 1   ",
+"2 3 4 5 6 7 8 9 0 a b c d ",
+"e 3 f g h i j 9 9 9 k l e ",
+"m 3 n o p q r 9 9 9 s l t ",
+"u v w x y z 9 A B C k D E ",
+"  F G H I J K L M N O P   ",
+"  Q R S T U V W X Y Z `   ",
+"    .  ...+.@.#.0 $.%.    ",
+"      &.*.=.-.;.>.,.      ",
+"        '.).!.~.{.        "};
diff -r 3d82e8f8b786 -r 113a3d16f1ce plugins/msn/msn.c
--- a/plugins/msn/msn.c	Wed Dec 20 04:52:32 2000 +0000
+++ b/plugins/msn/msn.c	Wed Dec 20 05:28:35 2000 +0000
@@ -419,6 +419,8 @@
 
 		if (strcasecmp("hotmail", resps[1]) == 0) {
 
+			/* FIXME: Eventually remove the following printf() */
+			printf("---READ---\n%s\n---END---\n", buf2);
 			if (strstr(buf2, "Content-Type: text/x-msmsgsemailnotification")) {
 				g_snprintf(buf, sizeof(buf), "%s has new hotmail", gc->username);
 				do_error_dialog(buf, "Gaim: MSN New Mail");
diff -r 3d82e8f8b786 -r 113a3d16f1ce plugins/napster.c
--- a/plugins/napster.c	Wed Dec 20 04:52:32 2000 +0000
+++ b/plugins/napster.c	Wed Dec 20 05:28:35 2000 +0000
@@ -37,6 +37,7 @@
 #include "multi.h"
 #include "prpl.h"
 #include "gaim.h"
+#include "pixmaps/napster.xpm"
 
 #define NAP_BUF_LEN 4096
 
@@ -521,13 +522,18 @@
 	}
 }
 
+static char** nap_list_icon(int uc)
+{
+	return napster_xpm;
+}
+
 static struct prpl *my_protocol = NULL;
 
 void nap_init(struct prpl *ret)
 {
 	ret->protocol = PROTO_NAPSTER;
 	ret->name = nap_name;
-	ret->list_icon = NULL;
+	ret->list_icon = nap_list_icon;
 	ret->action_menu = NULL;
 	ret->user_opts = NULL;
 	ret->login = nap_login;