From 91997a87369097a830ab01002075b397a0bc1166 Mon Sep 17 00:00:00 2001 From: "sdagley%netscape.com" Date: Sat, 21 Sep 2002 19:08:45 +0000 Subject: [PATCH] Part of #152231 - moving InternetConfigService to uriloader from appshell. These changes are for the CFM builds. r=ccarlen,sr=scc git-svn-id: svn://10.0.0.236/trunk@130208 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/uriloader/build/nsURILoaderModule.cpp | 15 ++ mozilla/uriloader/macbuild/uriLoader.xml | 150 ++++++++++++ mozilla/uriloader/macbuild/uriLoaderIDL.xml | 30 +++ mozilla/xpfe/appshell/macbuild/AppShell.xml | 216 ------------------ .../xpfe/appshell/macbuild/appshellIDL.xml | 30 --- .../xpfe/appshell/src/nsAppShellFactory.cpp | 19 -- mozilla/xpfe/appshell/src/nsUserInfoMac.cpp | 53 +++-- .../components/startup/src/nsUserInfoMac.cpp | 53 +++-- 8 files changed, 265 insertions(+), 301 deletions(-) diff --git a/mozilla/uriloader/build/nsURILoaderModule.cpp b/mozilla/uriloader/build/nsURILoaderModule.cpp index 35a78b5b6a8..24fa97cfd12 100644 --- a/mozilla/uriloader/build/nsURILoaderModule.cpp +++ b/mozilla/uriloader/build/nsURILoaderModule.cpp @@ -53,6 +53,15 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsOSHelperAppService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalProtocolHandler) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefetchService, Init) +//////////////////////////////////////////////////////////////////////// +// Define the contructor function for the Mac specific objects +#ifdef XP_MAC +#include "nsMacMIMEDataSource.h" +#include "nsInternetConfigService.h" +NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacMIMEDataSource); +NS_GENERIC_FACTORY_CONSTRUCTOR(nsInternetConfigService); +#endif + //////////////////////////////////////////////////////////////////////// // Define a table of CIDs implemented by this module along with other // information like the function to create an instance, contractid, and @@ -73,6 +82,12 @@ static const nsModuleComponentInfo components[] = { nsExternalProtocolHandlerConstructor, }, { NS_PREFETCHSERVICE_CLASSNAME, NS_PREFETCHSERVICE_CID, NS_PREFETCHSERVICE_CONTRACTID, nsPrefetchServiceConstructor, }, +#ifdef XP_MAC + { "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 0ab6fe894d6..48f82240f3a 100644 --- a/mozilla/uriloader/macbuild/uriLoader.xml +++ b/mozilla/uriloader/macbuild/uriLoader.xml @@ -995,6 +995,41 @@ Library Debug + + Name + InterfacesXStubs + MacOS + Library + Debug + + + Name + InternetConfigLib + MacOS + Library + Debug, WeakImport + + + Name + nsInternetConfig.cpp + MacOS + Text + Debug + + + Name + nsMacMIMEDataSource.cpp + MacOS + Text + Debug + + + Name + nsInternetConfigService.cpp + MacOS + Text + Debug + Name NSComponentStartup.o @@ -1102,6 +1137,11 @@ InterfacesStubs MacOS + + Name + InterfacesXStubs + MacOS + Name nsURILoader.cpp @@ -1117,6 +1157,26 @@ nsDocLoader.cpp MacOS + + Name + InternetConfigLib + MacOS + + + Name + nsInternetConfig.cpp + MacOS + + + Name + nsMacMIMEDataSource.cpp + MacOS + + + Name + nsInternetConfigService.cpp + MacOS + Name nsExternalHelperAppService.cpp @@ -2086,6 +2146,41 @@ Library Debug + + Name + InterfacesXStubs + MacOS + Library + Debug + + + Name + InternetConfigLib + MacOS + Library + Debug, WeakImport + + + Name + nsInternetConfig.cpp + MacOS + Text + Debug + + + Name + nsMacMIMEDataSource.cpp + MacOS + Text + Debug + + + Name + nsInternetConfigService.cpp + MacOS + Text + Debug + Name NSComponentStartup.o @@ -2193,6 +2288,11 @@ InterfacesStubs MacOS + + Name + InterfacesXStubs + MacOS + Name nsURILoader.cpp @@ -2208,6 +2308,26 @@ nsDocLoader.cpp MacOS + + Name + InternetConfigLib + MacOS + + + Name + nsInternetConfig.cpp + MacOS + + + Name + nsMacMIMEDataSource.cpp + MacOS + + + Name + nsInternetConfigService.cpp + MacOS + Name nsExternalHelperAppService.cpp @@ -2252,6 +2372,24 @@ exthandler + + uriLoaderDebug.shlb + Name + nsInternetConfig.cpp + MacOS + + + uriLoaderDebug.shlb + Name + nsInternetConfigService.cpp + MacOS + + + uriLoaderDebug.shlb + Name + nsMacMIMEDataSource.cpp + MacOS + uriLoaderDebug.shlb Name @@ -2384,6 +2522,18 @@ InterfacesStubs MacOS + + uriLoaderDebug.shlb + Name + InterfacesXStubs + MacOS + + + uriLoaderDebug.shlb + Name + InternetConfigLib + MacOS + diff --git a/mozilla/uriloader/macbuild/uriLoaderIDL.xml b/mozilla/uriloader/macbuild/uriLoaderIDL.xml index 8c959e2c711..99b346d6f2f 100644 --- a/mozilla/uriloader/macbuild/uriLoaderIDL.xml +++ b/mozilla/uriloader/macbuild/uriLoaderIDL.xml @@ -814,6 +814,13 @@ Text + + Name + nsIInternetConfigService.idl + MacOS + Text + + @@ -876,6 +883,11 @@ nsIPrefetchService.idl MacOS + + Name + nsIInternetConfigService.idl + MacOS + @@ -1639,6 +1651,13 @@ Text + + Name + nsIInternetConfigService.idl + MacOS + Text + + @@ -1701,6 +1720,11 @@ nsIPrefetchService.idl MacOS + + Name + nsIInternetConfigService.idl + MacOS + @@ -1777,6 +1801,12 @@ nsIDownload.idl MacOS + + headers + Name + nsIInternetConfigService.idl + MacOS + headers Name diff --git a/mozilla/xpfe/appshell/macbuild/AppShell.xml b/mozilla/xpfe/appshell/macbuild/AppShell.xml index 97e81955f92..ca07f748926 100644 --- a/mozilla/xpfe/appshell/macbuild/AppShell.xml +++ b/mozilla/xpfe/appshell/macbuild/AppShell.xml @@ -1079,34 +1079,6 @@ Text Debug - - Name - InternetConfigLib - MacOS - Library - Debug, WeakImport - - - Name - nsInternetConfig.cpp - MacOS - Text - Debug - - - Name - nsMacMIMEDataSource.cpp - MacOS - Text - Debug - - - Name - nsInternetConfigService.cpp - MacOS - Text - Debug - Name nsTimingService.cpp @@ -1227,26 +1199,6 @@ nsUserInfoMac.cpp MacOS - - Name - InternetConfigLib - MacOS - - - Name - nsInternetConfig.cpp - MacOS - - - Name - nsMacMIMEDataSource.cpp - MacOS - - - Name - nsInternetConfigService.cpp - MacOS - Name nsTimingService.cpp @@ -2285,34 +2237,6 @@ Text Debug - - Name - InternetConfigLib - MacOS - Library - Debug, WeakImport - - - Name - nsInternetConfig.cpp - MacOS - Text - Debug - - - Name - nsMacMIMEDataSource.cpp - MacOS - Text - Debug - - - Name - nsInternetConfigService.cpp - MacOS - Text - Debug - Name nsTimingService.cpp @@ -2433,26 +2357,6 @@ nsUserInfoMac.cpp MacOS - - Name - InternetConfigLib - MacOS - - - Name - nsInternetConfig.cpp - MacOS - - - Name - nsMacMIMEDataSource.cpp - MacOS - - - Name - nsInternetConfigService.cpp - MacOS - Name nsTimingService.cpp @@ -3456,34 +3360,6 @@ Text Debug - - Name - InternetConfigLib - MacOS - Library - Debug - - - Name - nsInternetConfig.cpp - MacOS - Text - Debug - - - Name - nsMacMIMEDataSource.cpp - MacOS - Text - Debug - - - Name - nsInternetConfigService.cpp - MacOS - Text - Debug - Name nsTimingService.cpp @@ -3555,26 +3431,6 @@ nsUserInfoMac.cpp MacOS - - Name - InternetConfigLib - MacOS - - - Name - nsInternetConfig.cpp - MacOS - - - Name - nsMacMIMEDataSource.cpp - MacOS - - - Name - nsInternetConfigService.cpp - MacOS - Name nsTimingService.cpp @@ -4571,34 +4427,6 @@ Text Debug - - Name - InternetConfigLib - MacOS - Library - Debug - - - Name - nsInternetConfig.cpp - MacOS - Text - Debug - - - Name - nsMacMIMEDataSource.cpp - MacOS - Text - Debug - - - Name - nsInternetConfigService.cpp - MacOS - Text - Debug - Name nsTimingService.cpp @@ -4665,26 +4493,6 @@ nsUserInfoMac.cpp MacOS - - Name - InternetConfigLib - MacOS - - - Name - nsInternetConfig.cpp - MacOS - - - Name - nsMacMIMEDataSource.cpp - MacOS - - - Name - nsInternetConfigService.cpp - MacOS - Name nsTimingService.cpp @@ -4750,24 +4558,6 @@ nsContentTreeOwner.cpp MacOS - - AppShellDebug.shlb - Name - nsInternetConfig.cpp - MacOS - - - AppShellDebug.shlb - Name - nsInternetConfigService.cpp - MacOS - - - AppShellDebug.shlb - Name - nsMacMIMEDataSource.cpp - MacOS - AppShellDebug.shlb Name @@ -4892,12 +4682,6 @@ InterfacesStubs MacOS - - AppShellDebug.shlb - Name - InternetConfigLib - MacOS - diff --git a/mozilla/xpfe/appshell/macbuild/appshellIDL.xml b/mozilla/xpfe/appshell/macbuild/appshellIDL.xml index 614bc4c7d8b..8c0f2e17131 100644 --- a/mozilla/xpfe/appshell/macbuild/appshellIDL.xml +++ b/mozilla/xpfe/appshell/macbuild/appshellIDL.xml @@ -762,13 +762,6 @@ Text - - Name - nsIInternetConfigService.idl - MacOS - Text - - Name nsITimingService.idl @@ -836,11 +829,6 @@ nsIUserInfo.idl MacOS - - Name - nsIInternetConfigService.idl - MacOS - Name nsITimingService.idl @@ -1577,13 +1565,6 @@ Text - - Name - nsIInternetConfigService.idl - MacOS - Text - - Name nsITimingService.idl @@ -1651,11 +1632,6 @@ nsIUserInfo.idl MacOS - - Name - nsIInternetConfigService.idl - MacOS - Name nsITimingService.idl @@ -1727,12 +1703,6 @@ nsIUserInfo.idl MacOS - - headers - Name - nsIInternetConfigService.idl - MacOS - headers Name diff --git a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp index f81d97b2a54..421b1161351 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp @@ -51,13 +51,6 @@ #include "nsWindowMediator.h" #include "nsTimingService.h" -#ifdef XP_MAC -#include "nsMacMIMEDataSource.h" -#include "nsInternetConfigService.h" -NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacMIMEDataSource); -NS_GENERIC_FACTORY_CONSTRUCTOR(nsInternetConfigService); -#endif - #include "nsUserInfo.h" /* extern the factory entry points for each component... */ @@ -101,18 +94,6 @@ static const nsModuleComponentInfo gAppShellModuleInfo[] = NS_TIMINGSERVICE_CONTRACTID, nsTimingServiceConstructor, }, -#if XP_MAC - { "MacMIME data source", - NS_NATIVEMIMEDATASOURCE_CID, - NS_NATIVEMIMEDATASOURCE_CONTRACTID, - nsMacMIMEDataSourceConstructor, - }, - { "Internet Config Service", - NS_INTERNETCONFIGSERVICE_CID, - NS_INTERNETCONFIGSERVICE_CONTRACTID, - nsInternetConfigServiceConstructor, - }, -#endif }; NS_IMPL_NSGETMODULE(appshell, gAppShellModuleInfo) diff --git a/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp b/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp index 743b4340ade..1b02c4ae727 100644 --- a/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp +++ b/mozilla/xpfe/appshell/src/nsUserInfoMac.cpp @@ -36,10 +36,12 @@ * ***** END LICENSE BLOCK ***** */ #include "nsUserInfo.h" -#include "nsInternetConfig.h" #include "nsString.h" #include "nsReadableUtils.h" +#include "nsIServiceManager.h" +#include "nsIInternetConfigService.h" + nsUserInfo::nsUserInfo() { NS_INIT_ISUPPORTS(); @@ -54,34 +56,47 @@ NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); NS_IMETHODIMP nsUserInfo::GetFullname(PRUnichar **aFullname) { - nsInternetConfig ic; - char* cName; - nsresult result = ic.GetString( kICRealName, &cName ); - if ( NS_SUCCEEDED ( result ) ) - { - nsString fullName; - fullName.AssignWithConversion( cName ); - nsMemory::Free( cName ); - *aFullname = ToNewUnicode(fullName); - } - return result; + nsresult result = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + { + char* cName; + result = icService->GetString(nsIInternetConfigService::eICString_RealName, &cName); + if ( NS_SUCCEEDED ( result ) ) + { + nsString fullName; + fullName.AssignWithConversion( cName ); + nsMemory::Free( cName ); + *aFullname = ToNewUnicode(fullName); + } + } + return result; + } NS_IMETHODIMP nsUserInfo::GetEmailAddress(char * *aEmailAddress) { - nsInternetConfig ic; - return ic.GetString( kICEmail, aEmailAddress ); + nsresult result = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + { + result = icService->GetString(nsIInternetConfigService::eICString_Email, aEmailAddress); + } + return result; } NS_IMETHODIMP nsUserInfo::GetUsername(char * *aUsername) { *aUsername = nsnull; - nsInternetConfig ic; char* cString; - nsresult rv = ic.GetString( kICEmail, &cString ); + nsresult rv = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString); + if ( NS_FAILED( rv ) ) return rv; nsCAutoString tempString(cString); @@ -100,8 +115,10 @@ nsUserInfo::GetDomain(char * *aDomain) { *aDomain = nsnull; char* cString; - nsInternetConfig ic; - nsresult rv = ic.GetString( kICEmail, &cString ); + nsresult rv = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString); if ( NS_FAILED( rv ) ) return rv; nsCAutoString tempString( cString); nsMemory::Free( cString ); diff --git a/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp b/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp index 743b4340ade..1b02c4ae727 100644 --- a/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsUserInfoMac.cpp @@ -36,10 +36,12 @@ * ***** END LICENSE BLOCK ***** */ #include "nsUserInfo.h" -#include "nsInternetConfig.h" #include "nsString.h" #include "nsReadableUtils.h" +#include "nsIServiceManager.h" +#include "nsIInternetConfigService.h" + nsUserInfo::nsUserInfo() { NS_INIT_ISUPPORTS(); @@ -54,34 +56,47 @@ NS_IMPL_ISUPPORTS1(nsUserInfo,nsIUserInfo); NS_IMETHODIMP nsUserInfo::GetFullname(PRUnichar **aFullname) { - nsInternetConfig ic; - char* cName; - nsresult result = ic.GetString( kICRealName, &cName ); - if ( NS_SUCCEEDED ( result ) ) - { - nsString fullName; - fullName.AssignWithConversion( cName ); - nsMemory::Free( cName ); - *aFullname = ToNewUnicode(fullName); - } - return result; + nsresult result = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + { + char* cName; + result = icService->GetString(nsIInternetConfigService::eICString_RealName, &cName); + if ( NS_SUCCEEDED ( result ) ) + { + nsString fullName; + fullName.AssignWithConversion( cName ); + nsMemory::Free( cName ); + *aFullname = ToNewUnicode(fullName); + } + } + return result; + } NS_IMETHODIMP nsUserInfo::GetEmailAddress(char * *aEmailAddress) { - nsInternetConfig ic; - return ic.GetString( kICEmail, aEmailAddress ); + nsresult result = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + { + result = icService->GetString(nsIInternetConfigService::eICString_Email, aEmailAddress); + } + return result; } NS_IMETHODIMP nsUserInfo::GetUsername(char * *aUsername) { *aUsername = nsnull; - nsInternetConfig ic; char* cString; - nsresult rv = ic.GetString( kICEmail, &cString ); + nsresult rv = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString); + if ( NS_FAILED( rv ) ) return rv; nsCAutoString tempString(cString); @@ -100,8 +115,10 @@ nsUserInfo::GetDomain(char * *aDomain) { *aDomain = nsnull; char* cString; - nsInternetConfig ic; - nsresult rv = ic.GetString( kICEmail, &cString ); + nsresult rv = NS_ERROR_FAILURE; + nsCOMPtr icService (do_GetService(NS_INTERNETCONFIGSERVICE_CONTRACTID)); + if (icService) + rv = icService->GetString(nsIInternetConfigService::eICString_Email, &cString); if ( NS_FAILED( rv ) ) return rv; nsCAutoString tempString( cString); nsMemory::Free( cString );