Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 385056 Remove MOZ_XUL_APP ifdefs from /mailnews (removals from the main code) r=Neil,sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@228433 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bugzilla%standard8.demon.co.uk
2007-06-21 15:44:52 +00:00
parent d2fc6bba61
commit ffd68af3c9
17 changed files with 8 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/mailnews/addrbook/src/nsAddressBook.cpp
View File

@@ -89,10 +89,7 @@
#include "nsIMsgVCardService.h"
#include "nsCRTGlue.h"
#include "nsIAbLDAPAttributeMap.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLine.h"
#endif
// our schema is not fixed yet, but we still want some sort of objectclass
// for now, use obsolete in the class name, hinting that this will change
@@ -1340,8 +1337,6 @@ NS_IMETHODIMP nsAddressBook::Convert4xVCardPrefs(const char *prefRoot, char **es
return rv;
}
#ifdef MOZ_XUL_APP
NS_IMETHODIMP
nsAddressBook::Handle(nsICommandLine* aCmdLine)
{
@@ -1370,9 +1365,3 @@ nsAddressBook::GetHelpInfo(nsACString& aResult)
aResult.Assign(NS_LITERAL_CSTRING(" -addressbook Open the address book at startup.\n"));
return NS_OK;
}
#else // !MOZ_XUL_APP
CMDLINEHANDLER_IMPL(nsAddressBook,"-addressbook","general.startup.addressbook","chrome://messenger/content/addressbook/addressbook.xul","Start with the addressbook.",NS_ADDRESSBOOKSTARTUPHANDLER_CONTRACTID,"Addressbook Startup Handler",PR_FALSE,"", PR_TRUE)
#endif

17
mozilla/mailnews/addrbook/src/nsAddressBook.h
View File

@@ -47,13 +47,8 @@
#include "nsIStreamLoader.h"
#include "rdf.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLineHandler.h"
#define ICOMMANDLINEHANDLER nsICommandLineHandler
#else
#include "nsICmdLineHandler.h"
#define ICOMMANDLINEHANDLER nsICmdLineHandler
#endif
class nsILocalFile;
class nsIAbDirectory;
@@ -101,15 +96,9 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIADDRESSBOOK
NS_DECL_NSICONTENTHANDLER
NS_DECL_NSISTREAMLOADEROBSERVER
#ifdef MOZ_XUL_APP
NS_DECL_NSICOMMANDLINEHANDLER
#else
NS_DECL_NSICMDLINEHANDLER
CMDLINEHANDLER_REGISTERPROC_DECLS
#endif
NS_DECL_NSICONTENTHANDLER
NS_DECL_NSISTREAMLOADEROBSERVER
NS_DECL_NSICOMMANDLINEHANDLER
protected:
nsresult DoCommand(nsIRDFDataSource *db, const nsACString& command,

4
mozilla/mailnews/base/ispdata/Makefile.in
View File

@@ -59,10 +59,6 @@ include $(topsrcdir)/config/rules.mk
GARBAGE += $(addprefix $(EXPORT_DIR)/, $(EXPORT_RESOURCE_FILES))
ifndef MOZ_XUL_APP
GARBAGE += $(addprefix $(EXPORT_DIR_L10N)/, $(EXPORT_RESOURCE_FILES))
endif
ifneq ($(EXPORT_RESOURCE_FILES),$(NULL))
libs:: $(EXPORT_RESOURCE_FILES)
$(INSTALL) $^ $(EXPORT_DIR)

10
mozilla/mailnews/base/src/nsMailDirProvider.cpp
View File

@@ -37,9 +37,7 @@
#include "nsMailDirProvider.h"
#include "nsMailDirServiceDefs.h"
#ifdef MOZ_XUL_APP
#include "nsXULAppAPI.h"
#endif
#include "nsMsgBaseCID.h"
#include "nsArrayEnumerator.h"
#include "nsCOMArray.h"
@@ -86,9 +84,8 @@ nsMailDirProvider::GetFiles(const char *aKey,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsISimpleEnumerator> combinedEnumerator;
#ifdef MOZ_XUL_APP
nsCOMPtr<nsISimpleEnumerator> extensionsEnum;
rv = dirSvc->Get(XRE_EXTENSIONS_DIR_LIST,
NS_GET_IID(nsISimpleEnumerator),
getter_AddRefs(extensionsEnum));
@@ -96,10 +93,7 @@ nsMailDirProvider::GetFiles(const char *aKey,
rv = NS_NewUnionEnumerator(getter_AddRefs(combinedEnumerator), directoryEnumerator, extensionsEnum);
NS_ENSURE_SUCCESS(rv, rv);
#else
directoryEnumerator.swap(combinedEnumerator);
#endif
NS_IF_ADDREF(*aResult = new AppendingEnumerator(combinedEnumerator));
return NS_SUCCESS_AGGREGATE_RESULT;
}

17
mozilla/mailnews/base/src/nsMessengerBootstrap.cpp
View File

@@ -57,7 +57,6 @@
#include "nsIDialogParamBlock.h"
#include "nsUnicharUtils.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLine.h"
#include "nsILocalFile.h"
#include "nsNetUtil.h"
@@ -67,13 +66,12 @@
#include "nsIRDFService.h"
#include "nsIMsgHdr.h"
#include "nsMsgUtils.h"
#endif // MOZ_XUL_APP
NS_IMPL_THREADSAFE_ADDREF(nsMessengerBootstrap)
NS_IMPL_THREADSAFE_RELEASE(nsMessengerBootstrap)
NS_IMPL_QUERY_INTERFACE2(nsMessengerBootstrap,
ICOMMANDLINEHANDLER,
nsICommandLineHandler,
nsIMessengerWindowService)
nsMessengerBootstrap::nsMessengerBootstrap()
@@ -84,7 +82,6 @@ nsMessengerBootstrap::~nsMessengerBootstrap()
{
}
#ifdef MOZ_XUL_APP
NS_IMETHODIMP
nsMessengerBootstrap::Handle(nsICommandLine* aCmdLine)
{
@@ -228,18 +225,6 @@ nsMessengerBootstrap::GetHelpInfo(nsACString& aResult)
return NS_OK;
}
#else
CMDLINEHANDLER3_IMPL(nsMessengerBootstrap,"-mail","general.startup.mail","Start with mail.",NS_MAILSTARTUPHANDLER_CONTRACTID,"Mail Cmd Line Handler",PR_TRUE,"", PR_TRUE)
NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask)
{
if (!aChromeUrlForTask) return NS_ERROR_FAILURE;
*aChromeUrlForTask = PL_strdup("chrome://messenger/content/");
return NS_OK;
}
#endif
NS_IMETHODIMP nsMessengerBootstrap::OpenMessengerWindowWithUri(const char *windowType, const char * aFolderURI, nsMsgKey aMessageKey)
{
nsresult rv;

15
mozilla/mailnews/base/src/nsMessengerBootstrap.h
View File

@@ -42,14 +42,7 @@
#include "nscore.h"
#include "nsIServiceManager.h"
#include "nsIMessengerWindowService.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLineHandler.h"
#define ICOMMANDLINEHANDLER nsICommandLineHandler
#else
#include "nsICmdLineHandler.h"
#define ICOMMANDLINEHANDLER nsICmdLineHandler
#endif
#define NS_MESSENGERBOOTSTRAP_CID \
{ /* 4a85a5d0-cddd-11d2-b7f6-00805f05ffa5 */ \
@@ -57,7 +50,7 @@
{0xb7, 0xf6, 0x00, 0x80, 0x5f, 0x05, 0xff, 0xa5}}
class nsMessengerBootstrap :
public ICOMMANDLINEHANDLER,
public nsICommandLineHandler,
public nsIMessengerWindowService
{
@@ -67,13 +60,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIMESSENGERWINDOWSERVICE
#ifdef MOZ_XUL_APP
NS_DECL_NSICOMMANDLINEHANDLER
#else
NS_DECL_NSICMDLINEHANDLER
CMDLINEHANDLER_REGISTERPROC_DECLS
#endif
};
#endif

3
mozilla/mailnews/base/src/nsMessengerUnixIntegration.cpp
View File

@@ -70,10 +70,7 @@
#include "nsISupportsPrimitives.h"
#include "nsNativeCharsetUtils.h"
#ifdef MOZ_XUL_APP
#include "nsToolkitCompsCID.h"
#endif
#define ALERT_CHROME_URL "chrome://messenger/content/newmailalert.xul"
#define NEW_MAIL_ALERT_ICON "chrome://messenger/skin/icons/new-mail-alert.png"

20
mozilla/mailnews/base/src/nsMessengerWinIntegration.cpp
View File

@@ -77,14 +77,8 @@
#include "nsIInterfaceRequestorUtils.h"
#include "nsNativeCharsetUtils.h"
// XXX test for this as long as there are still non-xul-app suite builds
#ifdef MOZ_XUL_APP
#include "nsToolkitCompsCID.h"
#define PROFILE_COMMANDLINE_ARG " -profile "
#else
#include "nsIProfile.h"
#define PROFILE_COMMANDLINE_ARG " -p "
#endif
#define XP_SHSetUnreadMailCounts "SHSetUnreadMailCountW"
#define XP_SHEnumerateUnreadMailAccounts "SHEnumerateUnreadMailAccountsW"
@@ -413,8 +407,6 @@ nsMessengerWinIntegration::Init()
if (mStoreUnreadCounts)
{
// XXX test for this as long as there are still non-xul-app suite builds
#ifdef MOZ_XUL_APP
// get current profile path for the commandliner
nsCOMPtr<nsIFile> profilePath;
rv = directoryService->Get(NS_APP_USER_PROFILE_50_DIR,
@@ -424,13 +416,6 @@ nsMessengerWinIntegration::Init()
rv = profilePath->GetPath(mProfilePath);
NS_ENSURE_SUCCESS(rv, rv);
#else
// get current profile name to fill in commandliner.
nsCOMPtr<nsIProfile> profileService = do_GetService(NS_PROFILE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv,rv);
profileService->GetCurrentProfile(getter_Copies(mProfileName));
#endif
// get application path
char appPath[_MAX_PATH] = {0};
@@ -1068,14 +1053,9 @@ nsMessengerWinIntegration::UpdateRegistryWithCurrent()
commandLinerForAppLaunch.Append(mAppName);
commandLinerForAppLaunch.Append(NS_LITERAL_STRING(DOUBLE_QUOTE));
commandLinerForAppLaunch.Append(NS_LITERAL_STRING(PROFILE_COMMANDLINE_ARG));
// XXX test for this as long as there are still non-xul-app suite builds
#ifdef MOZ_XUL_APP
commandLinerForAppLaunch.Append(NS_LITERAL_STRING(DOUBLE_QUOTE));
commandLinerForAppLaunch.Append(mProfilePath);
commandLinerForAppLaunch.Append(NS_LITERAL_STRING(DOUBLE_QUOTE));
#else
commandLinerForAppLaunch.Append(mProfileName);
#endif
commandLinerForAppLaunch.Append(NS_LITERAL_STRING(MAIL_COMMANDLINE_ARG));
if (!commandLinerForAppLaunch.IsEmpty())

6
mozilla/mailnews/base/src/nsMessengerWinIntegration.h
View File

@@ -153,13 +153,7 @@ private:
nsString mEmailPrefix;
nsCString mShellDllPath;
// XXX test for this as long as there are still non-xul-app suite builds
#ifdef MOZ_XUL_APP
nsString mProfilePath;
#else
nsString mProfileName;
#endif
PRInt32 mCurrentUnreadCount;
PRInt32 mLastUnreadCountWrittenToRegistry;

11
mozilla/mailnews/compose/src/nsMsgComposeService.cpp
View File

@@ -95,10 +95,8 @@
#include "nsIContentSink.h"
#include "mozISanitizingSerializer.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLine.h"
#include "nsIAppStartup.h"
#endif
#ifdef XP_WIN32
#include <windows.h>
@@ -332,7 +330,6 @@ void nsMsgComposeService::CloseHiddenCachedWindow(nsIDOMWindowInternal *domWindo
nsCOMPtr<nsIBaseWindow> baseWindow;
baseWindow = do_QueryInterface(treeOwner);
if (baseWindow) {
#ifdef MOZ_XUL_APP
// HACK ALERT: when we hid this window we fired the "xul-window-destroyed"
// notification for it. Now that it's being really-destroyed it will fire that
// notification *again* for itself. The appstartup code maintains an internal
@@ -341,7 +338,6 @@ void nsMsgComposeService::CloseHiddenCachedWindow(nsIDOMWindowInternal *domWindo
nsCOMPtr<nsIAppStartup> appStartup(do_GetService(NS_APPSTARTUP_CONTRACTID));
if (appStartup)
appStartup->EnterLastWindowClosingSurvivalArea();
#endif
baseWindow->Destroy();
}
@@ -1481,7 +1477,6 @@ nsMsgComposeService::LoadDraftOrTemplate(const nsACString& aMsgURI, nsMimeOutput
aMsgWindow, nsnull, mailCharset.get(), nsnull);;
}
#ifdef MOZ_XUL_APP
NS_IMETHODIMP
nsMsgComposeService::Handle(nsICommandLine* aCmdLine)
{
@@ -1569,9 +1564,3 @@ nsMsgComposeService::GetHelpInfo(nsACString& aResult)
aResult.Assign(NS_LITERAL_CSTRING(" -compose Compose a mail or news message.\n"));
return NS_OK;
}
#else
CMDLINEHANDLER_IMPL(nsMsgComposeService, "-compose", "general.startup.messengercompose", DEFAULT_CHROME,
"Start with messenger compose.", NS_MSGCOMPOSESTARTUPHANDLER_CONTRACTID, "Messenger Compose Startup Handler",
PR_TRUE, "about:blank", PR_TRUE)
#endif

11
mozilla/mailnews/compose/src/nsMsgComposeService.h
View File

@@ -47,13 +47,8 @@
#include "nsIMimeStreamConverter.h"
#include "nsInterfaceHashtable.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLineHandler.h"
#define ICOMMANDLINEHANDLER nsICommandLineHandler
#else
#include "nsICmdLineHandler.h"
#define ICOMMANDLINEHANDLER nsICmdLineHandler
#endif
class nsMsgCachedWindowInfo
{
@@ -89,13 +84,7 @@ public:
NS_DECL_ISUPPORTS
NS_DECL_NSIMSGCOMPOSESERVICE
NS_DECL_NSIOBSERVER
#ifdef MOZ_XUL_APP
NS_DECL_NSICOMMANDLINEHANDLER
#else
NS_DECL_NSICMDLINEHANDLER
CMDLINEHANDLER_REGISTERPROC_DECLS
#endif
nsresult Init();
void Reset();

8
mozilla/mailnews/extensions/mdn/Makefile.in
View File

@@ -59,11 +59,3 @@ libs::
install::
$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/mdn.js $(DESTDIR)$(mozappdir)/defaults/pref
ifndef MOZ_XUL_APP
libs realchrome::
@$(REGCHROME) content messenger-mdn messenger.jar
install::
@$(REGCHROME_INSTALL) content messenger-mdn messenger.jar
endif

25
mozilla/mailnews/mapi/mapihook/src/msgMapiHook.cpp
View File

@@ -87,10 +87,6 @@
#include "nsEmbedCID.h"
#ifndef MOZ_XUL_APP
#include "nsICmdLineService.h"
#endif
extern PRLogModuleInfo *MAPI;
class nsMAPISendListener : public nsIMsgSendListener
@@ -159,27 +155,6 @@ nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppList
PRBool nsMapiHook::isMapiService = PR_FALSE;
PRBool nsMapiHook::Initialize()
{
// XXX test for this as long as there are still non-xul-app suite builds
#ifndef MOZ_XUL_APP
nsresult rv;
nsCOMPtr<nsINativeAppSupport> native;
nsCOMPtr<nsICmdLineService> cmdLineArgs (do_GetService(NS_COMMANDLINESERVICE_CONTRACTID, &rv));
if (NS_FAILED(rv)) return PR_FALSE;
nsCOMPtr<nsIAppStartup> appStartup (do_GetService(NS_APPSTARTUP_CONTRACTID, &rv));
if (NS_FAILED(rv)) return PR_FALSE;
rv = appStartup->GetNativeAppSupport(getter_AddRefs(native));
if (NS_FAILED(rv)) return PR_FALSE;
rv = native->EnsureProfile(cmdLineArgs);
if (NS_FAILED(rv)) return PR_FALSE;
#endif
return PR_TRUE;
}
void nsMapiHook::CleanUp()
{
// This routine will be fully implemented in future

1
mozilla/mailnews/mapi/mapihook/src/msgMapiHook.h
View File

@@ -43,7 +43,6 @@ class nsMapiHook
{
public :
static PRBool Initialize();
static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername,
PRUnichar **aPassword);
static PRBool VerifyUserName(const nsString& aUsername, nsCString& aIdKey);

3
mozilla/mailnews/mapi/mapihook/src/msgMapiImp.cpp
View File

@@ -151,8 +151,7 @@ STDMETHODIMP CMapiImp::Initialize()
nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
if (pConfig != nsnull)
if (nsMapiHook::Initialize())
hr = S_OK;
hr = S_OK;
PR_Unlock(m_Lock);

17
mozilla/mailnews/news/src/nsNntpService.cpp
View File

@@ -85,10 +85,7 @@
#include "nsEscape.h"
#include "nsNetUtil.h"
#include "nsIWindowWatcher.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLine.h"
#endif
#undef GetPort // XXX Windows!
#undef SetPort // XXX Windows!
@@ -1595,8 +1592,6 @@ nsNntpService::GetListOfGroupsOnServer(nsINntpIncomingServer *aNntpServer, nsIMs
}
#ifdef MOZ_XUL_APP
NS_IMETHODIMP
nsNntpService::Handle(nsICommandLine* aCmdLine)
{
@@ -1624,18 +1619,6 @@ nsNntpService::GetHelpInfo(nsACString& aResult)
return NS_OK;
}
#else // MOZ_XUL_APP
CMDLINEHANDLER3_IMPL(nsNntpService,"-news","general.startup.news","Start with news.",NS_NEWSSTARTUPHANDLER_CONTRACTID,"News Cmd Line Handler", PR_FALSE,"", PR_TRUE)
NS_IMETHODIMP nsNntpService::GetChromeUrlForTask(char **aChromeUrlForTask)
{
if (!aChromeUrlForTask) return NS_ERROR_FAILURE;
*aChromeUrlForTask = PL_strdup("chrome://messenger/content/");
return NS_OK;
}
#endif // MOZ_XUL_APP
NS_IMETHODIMP
nsNntpService::HandleContent(const char * aContentType, nsIInterfaceRequestor* aWindowContext, nsIRequest *request)
{

11
mozilla/mailnews/news/src/nsNntpService.h
View File

@@ -52,13 +52,8 @@
#include "nsIContentHandler.h"
#include "nsICacheSession.h"
#ifdef MOZ_XUL_APP
#include "nsICommandLineHandler.h"
#define ICOMMANDLINEHANDLER nsICommandLineHandler
#else
#include "nsICmdLineHandler.h"
#define ICOMMANDLINEHANDLER nsICmdLineHandler
#endif
class nsIURI;
class nsIUrlListener;
@@ -80,13 +75,7 @@ public:
NS_DECL_NSIMSGPROTOCOLINFO
NS_DECL_NSICONTENTHANDLER
NS_DECL_NSIMSGMESSAGEFETCHPARTSERVICE
#ifdef MOZ_XUL_APP
NS_DECL_NSICOMMANDLINEHANDLER
#else
NS_DECL_NSICMDLINEHANDLER
CMDLINEHANDLER_REGISTERPROC_DECLS
#endif
// nsNntpService
nsNntpService();