зеркало из https://github.com/mozilla/gecko-dev.git
Thunderbird now uses a dynamically generated 3-pane. No more alternate 3-pane xul file, so remove the C++ code
that tries to launch the alternate 3-pane. Land the new vertical 3-pane for thunderbird. Folder pane | Thread Pane | Message pane.
This commit is contained in:
Родитель
5213c89d42
Коммит
2462f8b8d8
|
@ -73,6 +73,7 @@ CMDLINEHANDLER3_IMPL(nsMessengerBootstrap,"-mail","general.startup.mail","Start
|
|||
|
||||
NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask)
|
||||
{
|
||||
#ifndef MOZ_THUNDERBIRD
|
||||
if (!aChromeUrlForTask) return NS_ERROR_FAILURE;
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIPref> prefService(do_GetService(kPrefServiceCID, &rv));
|
||||
|
@ -92,6 +93,11 @@ NS_IMETHODIMP nsMessengerBootstrap::GetChromeUrlForTask(char **aChromeUrlForTask
|
|||
}
|
||||
}
|
||||
*aChromeUrlForTask = PL_strdup("chrome://messenger/content/messenger.xul");
|
||||
#else
|
||||
NS_ENSURE_ARG_POINTER(aChromeUrlForTask);
|
||||
*aChromeUrlForTask = PL_strdup("chrome://messenger/content/");
|
||||
#endif
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -1721,6 +1721,7 @@ CMDLINEHANDLER3_IMPL(nsNntpService,"-news","general.startup.news","Start with ne
|
|||
|
||||
NS_IMETHODIMP nsNntpService::GetChromeUrlForTask(char **aChromeUrlForTask)
|
||||
{
|
||||
#ifndef MOZ_THUNDERBIRD
|
||||
if (!aChromeUrlForTask) return NS_ERROR_FAILURE;
|
||||
nsresult rv;
|
||||
nsCOMPtr<nsIPrefBranch> prefBranch(do_GetService(NS_PREFSERVICE_CONTRACTID, &rv));
|
||||
|
@ -1741,6 +1742,10 @@ NS_IMETHODIMP nsNntpService::GetChromeUrlForTask(char **aChromeUrlForTask)
|
|||
}
|
||||
*aChromeUrlForTask = PL_strdup("chrome://messenger/content/messenger.xul");
|
||||
return NS_OK;
|
||||
#else
|
||||
NS_ENSURE_ARG_POINTER(aChromeUrlForTask);
|
||||
*aChromeUrlForTask = PL_strdup("chrome://messenger/content/");
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче