[Gaim-commits] SF.net SVN: gaim: [16651] branches/v2_0_0

[<the...@us...>]

Revision: 16651
Author:   thekingant
Date:     2006-08-05 10:44:56 -0700 (Sat, 05 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16651&view=rev

Log Message:
-----------
Backport SVN revision #16650 from HEAD to v2_0_0
Original commit message:

Remove "Napster" from a few more places

ViewCVS Links:
-------------
    http://svn.sourceforge.net/gaim/?rev=16650&view=rev

Modified Paths:
--------------
    branches/v2_0_0/Makefile.mingw
    branches/v2_0_0/doc/gaim.1.in
    branches/v2_0_0/gaim.spec.in
    branches/v2_0_0/src/gtkdialogs.c
Modified: branches/v2_0_0/Makefile.mingw
===================================================================
--- branches/v2_0_0/Makefile.mingw	2006-08-05 17:40:38 UTC (rev 16650)
+++ branches/v2_0_0/Makefile.mingw	2006-08-05 17:44:56 UTC (rev 16651)
@@ -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

Modified: branches/v2_0_0/doc/gaim.1.in
===================================================================
--- branches/v2_0_0/doc/gaim.1.in	2006-08-05 17:40:38 UTC (rev 16650)
+++ branches/v2_0_0/doc/gaim.1.in	2006-08-05 17:44:56 UTC (rev 16651)
@@ -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.
 

Modified: branches/v2_0_0/gaim.spec.in
===================================================================
--- branches/v2_0_0/gaim.spec.in	2006-08-05 17:40:38 UTC (rev 16650)
+++ branches/v2_0_0/gaim.spec.in	2006-08-05 17:44:56 UTC (rev 16651)
@@ -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.
 

Modified: branches/v2_0_0/src/gtkdialogs.c
===================================================================
--- branches/v2_0_0/src/gtkdialogs.c	2006-08-05 17:40:38 UTC (rev 16650)
+++ branches/v2_0_0/src/gtkdialogs.c	2006-08-05 17:44:56 UTC (rev 16651)
@@ -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 "


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.