From 92f2417f65b72662a0188f6fef412a820004c0a9 Mon Sep 17 00:00:00 2001 From: "darin%netscape.com" Date: Tue, 8 Oct 2002 21:31:54 +0000 Subject: [PATCH] fixes bug 172963 "remove dead mime code" r=dougt sr=alecf git-svn-id: svn://10.0.0.236/trunk@131464 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/netwerk/build/nsNetModule.cpp | 7 -- mozilla/netwerk/macbuild/netwerk.xml | 108 ------------------ mozilla/netwerk/mime/public/Makefile.in | 1 - mozilla/netwerk/mime/src/Makefile.in | 2 - mozilla/uriloader/build/nsURILoaderModule.cpp | 2 - mozilla/uriloader/macbuild/uriLoader.xml | 30 ----- 6 files changed, 150 deletions(-) diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index 87e53beba4e..19b8db40cb3 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -84,8 +84,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAppleFileDecoder) /////////////////////////////////////////////////////////////////////////////// -#include "nsMIMEService.h" -#include "nsXMLMIMEDataSource.h" #include "nsMIMEInfoImpl.h" NS_GENERIC_FACTORY_CONSTRUCTOR(nsMIMEInfoImpl) @@ -792,11 +790,6 @@ static const nsModuleComponentInfo gNetModuleInfo[] = { { "Cache Manager",NS_CACHE_MANAGER_CID, NS_NETWORK_CACHE_MANAGER_CONTRACTID,nsCacheManagerConstructor }, #endif // from netwerk/mime: - { "xml mime datasource", - NS_XMLMIMEDATASOURCE_CID, - NS_XMLMIMEDATASOURCE_CONTRACTID, - nsXMLMIMEDataSource::Create - }, { "xml mime INFO", NS_MIMEINFO_CID, NS_MIMEINFO_CONTRACTID, diff --git a/mozilla/netwerk/macbuild/netwerk.xml b/mozilla/netwerk/macbuild/netwerk.xml index bdb595f2290..c77d1040c98 100644 --- a/mozilla/netwerk/macbuild/netwerk.xml +++ b/mozilla/netwerk/macbuild/netwerk.xml @@ -1170,20 +1170,6 @@ Text Debug - - Name - nsMIMEService.cpp - MacOS - Text - Debug - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Text - Debug - Name nsStreamConverterService.cpp @@ -1863,16 +1849,6 @@ nsMIMEInfoImpl.cpp MacOS - - Name - nsMIMEService.cpp - MacOS - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Name nsStreamConverterService.cpp @@ -3372,20 +3348,6 @@ Text Debug - - Name - nsMIMEService.cpp - MacOS - Text - Debug - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Text - Debug - Name nsStreamConverterService.cpp @@ -4065,16 +4027,6 @@ nsMIMEInfoImpl.cpp MacOS - - Name - nsMIMEService.cpp - MacOS - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Name nsStreamConverterService.cpp @@ -5574,20 +5526,6 @@ Text Debug - - Name - nsMIMEService.cpp - MacOS - Text - Debug - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Text - Debug - Name nsStreamConverterService.cpp @@ -6253,16 +6191,6 @@ nsMIMEInfoImpl.cpp MacOS - - Name - nsMIMEService.cpp - MacOS - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Name nsStreamConverterService.cpp @@ -7752,20 +7680,6 @@ Text Debug - - Name - nsMIMEService.cpp - MacOS - Text - Debug - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Text - Debug - Name nsStreamConverterService.cpp @@ -8431,16 +8345,6 @@ nsMIMEInfoImpl.cpp MacOS - - Name - nsMIMEService.cpp - MacOS - - - Name - nsXMLMIMEDataSource.cpp - MacOS - Name nsStreamConverterService.cpp @@ -9046,18 +8950,6 @@ nsMIMEInfoImpl.cpp MacOS - - Necko.shlb - Name - nsMIMEService.cpp - MacOS - - - Necko.shlb - Name - nsXMLMIMEDataSource.cpp - MacOS - protocol about diff --git a/mozilla/netwerk/mime/public/Makefile.in b/mozilla/netwerk/mime/public/Makefile.in index cf0bcbc5786..750e9dd894e 100644 --- a/mozilla/netwerk/mime/public/Makefile.in +++ b/mozilla/netwerk/mime/public/Makefile.in @@ -32,7 +32,6 @@ XPIDL_MODULE = mimetype XPIDLSRCS = \ nsIMIMEService.idl \ nsIMIMEInfo.idl \ - nsIMIMEDataSource.idl \ $(NULL) EXPORTS = \ diff --git a/mozilla/netwerk/mime/src/Makefile.in b/mozilla/netwerk/mime/src/Makefile.in index 325444af738..e71d4909d87 100644 --- a/mozilla/netwerk/mime/src/Makefile.in +++ b/mozilla/netwerk/mime/src/Makefile.in @@ -36,8 +36,6 @@ REQUIRES = xpcom \ CPPSRCS = \ nsMIMEInfoImpl.cpp \ - nsMIMEService.cpp \ - nsXMLMIMEDataSource.cpp \ $(NULL) # we don't want the shared lib, but we want to force the creation of a diff --git a/mozilla/uriloader/build/nsURILoaderModule.cpp b/mozilla/uriloader/build/nsURILoaderModule.cpp index 2d92d5c51aa..155ddbbd18f 100644 --- a/mozilla/uriloader/build/nsURILoaderModule.cpp +++ b/mozilla/uriloader/build/nsURILoaderModule.cpp @@ -83,8 +83,6 @@ static const nsModuleComponentInfo components[] = { { NS_PREFETCHSERVICE_CLASSNAME, NS_PREFETCHSERVICE_CID, NS_PREFETCHSERVICE_CONTRACTID, nsPrefetchServiceConstructor, }, #if defined(XP_MAC) || defined(XP_MACOSX) - { "MacMIME data source", NS_NATIVEMIMEDATASOURCE_CID, NS_NATIVEMIMEDATASOURCE_CONTRACTID, - nsMacMIMEDataSourceConstructor, }, { "Internet Config Service", NS_INTERNETCONFIGSERVICE_CID, NS_INTERNETCONFIGSERVICE_CONTRACTID, nsInternetConfigServiceConstructor, }, #endif diff --git a/mozilla/uriloader/macbuild/uriLoader.xml b/mozilla/uriloader/macbuild/uriLoader.xml index 48f82240f3a..883e73612b7 100644 --- a/mozilla/uriloader/macbuild/uriLoader.xml +++ b/mozilla/uriloader/macbuild/uriLoader.xml @@ -1016,13 +1016,6 @@ Text Debug - - Name - nsMacMIMEDataSource.cpp - MacOS - Text - Debug - Name nsInternetConfigService.cpp @@ -1167,11 +1160,6 @@ nsInternetConfig.cpp MacOS - - Name - nsMacMIMEDataSource.cpp - MacOS - Name nsInternetConfigService.cpp @@ -2167,13 +2155,6 @@ Text Debug - - Name - nsMacMIMEDataSource.cpp - MacOS - Text - Debug - Name nsInternetConfigService.cpp @@ -2318,11 +2299,6 @@ nsInternetConfig.cpp MacOS - - Name - nsMacMIMEDataSource.cpp - MacOS - Name nsInternetConfigService.cpp @@ -2384,12 +2360,6 @@ nsInternetConfigService.cpp MacOS - - uriLoaderDebug.shlb - Name - nsMacMIMEDataSource.cpp - MacOS - uriLoaderDebug.shlb Name