# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1154799638 0
# Node ID 88ccffe0875cbde9e1a49ed3d1bd6bc6d1e04928
# Parent  143474e2b1cb6015b38cfa4794511704f86746ac
[gaim-migrate @ 16650]
Remove "Napster" from a few more places

committer: Tailor Script <tailor@pidgin.im>

diff -r 143474e2b1cb -r 88ccffe0875c Makefile.mingw
--- a/Makefile.mingw	Sat Aug 05 17:04:47 2006 +0000
+++ b/Makefile.mingw	Sat Aug 05 17:40:38 2006 +0000
@@ -54,7 +54,6 @@
 TOC_TYPE = PLUGIN
 IRC_TYPE = PLUGIN
 JABBER_TYPE = PLUGIN
-NAPSTER_TYPE = PLUGIN
 GG_TYPE = PLUGIN
 NOVELL_TYPE = PLUGIN
 SILC_TYPE = PLUGIN
@@ -68,7 +67,6 @@
 	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw
 	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw
 	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw
-	$(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw
@@ -90,7 +88,6 @@
 	$(MAKE) TYPE='$(MSN_TYPE)' -C $(MSN) -f Makefile.mingw install
 	$(MAKE) TYPE='$(IRC_TYPE)' -C $(IRC) -f Makefile.mingw install
 	$(MAKE) TYPE='$(JABBER_TYPE)' -C $(JABBER) -f Makefile.mingw install
-	$(MAKE) TYPE='$(NAPSTER_TYPE)' -C $(NAPSTER) -f Makefile.mingw install
 	$(MAKE) TYPE='$(GG_TYPE)' -C $(GG) -f Makefile.mingw install
 	$(MAKE) TYPE='$(NOVELL_TYPE)' -C $(NOVELL) -f Makefile.mingw install
 	$(MAKE) TYPE='$(SILC_TYPE)' -C $(SILC) -f Makefile.mingw install
@@ -118,7 +115,6 @@
 	$(MAKE) -C $(MSN) -f Makefile.mingw clean
 	$(MAKE) -C $(IRC) -f Makefile.mingw clean
 	$(MAKE) -C $(JABBER) -f Makefile.mingw clean
-	$(MAKE) -C $(NAPSTER) -f Makefile.mingw clean
 	$(MAKE) -C $(GG) -f Makefile.mingw clean
 	$(MAKE) -C $(NOVELL) -f Makefile.mingw clean
 	$(MAKE) -C $(SILC) -f Makefile.mingw clean
diff -r 143474e2b1cb -r 88ccffe0875c doc/gaim.1.in
--- a/doc/gaim.1.in	Sat Aug 05 17:04:47 2006 +0000
+++ b/doc/gaim.1.in	Sat Aug 05 17:40:38 2006 +0000
@@ -30,7 +30,7 @@
 .PP
 \fBgaim\fR is a GTK2-based Instant Messaging (IM) application.  It supports
 multiple protocols via modules, including AIM, ICQ, Yahoo!, MSN, Jabber,
-IRC, Napster, Gadu-Gadu and Zephyr.  It has many common features found in
+IRC, Gadu-Gadu and Zephyr.  It has many common features found in
 other clients, as well as many unique features.  Gaim is not endorsed by or
 affiliated with America Online, ICQ, Microsoft, or Yahoo.
 
diff -r 143474e2b1cb -r 88ccffe0875c doc/gntgaim.1.in
--- a/doc/gntgaim.1.in	Sat Aug 05 17:04:47 2006 +0000
+++ b/doc/gntgaim.1.in	Sat Aug 05 17:40:38 2006 +0000
@@ -30,7 +30,7 @@
 .PP
 \fBgntgaim\fR is a console-based frontend for Instant Messaging (IM)
 application Gaim.  It supports multiple protocols via modules, including AIM,
-ICQ, Yahoo!, MSN, Jabber, IRC, Napster, Gadu-Gadu and Zephyr.  It has many
+ICQ, Yahoo!, MSN, Jabber, IRC, Gadu-Gadu and Zephyr.  It has many
 common features found in other clients, as well as many unique features.  Gaim
 is not endorsed by or affiliated with America Online, ICQ, Microsoft, or Yahoo.
 
diff -r 143474e2b1cb -r 88ccffe0875c gaim.spec.in
--- a/gaim.spec.in	Sat Aug 05 17:04:47 2006 +0000
+++ b/gaim.spec.in	Sat Aug 05 17:40:38 2006 +0000
@@ -112,7 +112,7 @@
 %description
 Gaim allows you to talk to anyone using a variety of messaging
 protocols, including AIM, ICQ, IRC, Yahoo!, Novell Groupwise, MSN
-Messenger, Jabber, Gadu-Gadu, Napster, Lotus Sametime and Zephyr.
+Messenger, Jabber, Gadu-Gadu, Lotus Sametime and Zephyr.
 These protocols are implemented using a modular, easy to use design.
 To use a protocol, just add an account using the account editor.
 
diff -r 143474e2b1cb -r 88ccffe0875c src/gtkdialogs.c
--- a/src/gtkdialogs.c	Sat Aug 05 17:04:47 2006 +0000
+++ b/src/gtkdialogs.c	Sat Aug 05 17:40:38 2006 +0000
@@ -268,7 +268,7 @@
 	g_string_append(str,
 		_("Gaim is a modular messaging client capable of using "
 		  "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
-		  "Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu "
+		  "Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-Gadu "
 		  "all at once.  It is written using GTK+.<BR><BR>"
 		  "You may modify and redistribute the program under "
 		  "the terms of the GPL (version 2 or later).  A copy of the GPL is "