Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-14 10:43:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 243750: Remove unused file am-advanced.xul and associated cruft.

Browse Source 
r=bienvenu, sr=mscott
This commit is contained in:
Stefan.Borggraefe%gmx.de 2004-05-17 23:07:21 +00:00
parent 79e9310865
commit 1c5280bf2e
8 changed files with 36 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mailnews/base/prefs/resources/content/accountUtils.js
View File

@ -263,7 +263,7 @@ function msgOpenAccountWizard()
// selectPage: the xul file name for the viewing page,
// null for the account main page, other pages are
// 'am-server.xul', 'am-copies.xul', 'am-offline.xul',
// 'am-addressing.xul','am-advanced.xul', 'am-smtp.xul'
// 'am-addressing.xul', 'am-smtp.xul'
function MsgAccountManager(selectPage)
{
var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].

9
mailnews/base/prefs/resources/content/am-advanced.xul
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
</page>

2
mailnews/base/prefs/resources/locale/en-US/am-advanced.dtd
View File

@ -1,5 +1,3 @@
<!-- extracted from am-advanced.xul -->
<!-- LOCALIZATION NOTE (smtpServer.label): do not translate "SMTP" in below line -->
<!ENTITY smtpServer.label "Outgoing Server (SMTP) Settings">
<!-- LOCALIZATION NOTE (smtpDesc.label): do not translate "SMTP" in below line -->

1
mailnews/base/prefs/resources/locale/en-US/prefs.properties
View File

@ -80,7 +80,6 @@ prefPanel-copies=Copies & Folders
prefPanel-offline-and-diskspace=Offline & Disk Space
prefPanel-diskspace=Disk Space
prefPanel-addressing=Composition & Addressing
prefPanel-advanced=Advanced
## LOCALIZATION NOTE (prefPanel-smtp): Don't translate "SMTP"
prefPanel-smtp=Outgoing Server (SMTP)

2
mailnews/base/resources/content/msgAccountCentral.js
View File

@ -247,7 +247,7 @@ function ComposeAMessage(event)
// selectPage: the xul file name for the viewing page,
// null for the account main page, other pages are
// 'am-server.xul', 'am-copies.xul', 'am-offline.xul',
// 'am-addressing.xul','am-advanced.xul', 'am-smtp.xul'
// 'am-addressing.xul', 'am-smtp.xul'
function ViewSettings(selectPage)
{
window.parent.MsgAccountManager(selectPage);

84
mailnews/base/src/nsMsgAccountManagerDS.cpp
View File

@ -70,7 +70,6 @@
#define NC_RDF_PAGETITLE_MAIN NC_RDF_PAGETITLE_PREFIX "Main"
#define NC_RDF_PAGETITLE_SERVER NC_RDF_PAGETITLE_PREFIX "Server"
#define NC_RDF_PAGETITLE_COPIES NC_RDF_PAGETITLE_PREFIX "Copies"
#define NC_RDF_PAGETITLE_ADVANCED NC_RDF_PAGETITLE_PREFIX "Advanced"
#define NC_RDF_PAGETITLE_OFFLINEANDDISKSPACE NC_RDF_PAGETITLE_PREFIX "OfflineAndDiskSpace"
#define NC_RDF_PAGETITLE_DISKSPACE NC_RDF_PAGETITLE_PREFIX "DiskSpace"
#define NC_RDF_PAGETITLE_ADDRESSING NC_RDF_PAGETITLE_PREFIX "Addressing"
@ -125,7 +124,6 @@ nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleCopies=nsnull;
nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleOfflineAndDiskSpace=nsnull;
nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleDiskSpace=nsnull;
nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleAddressing=nsnull;
nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleAdvanced=nsnull;
nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleSMTP=nsnull;
nsIRDFResource* nsMsgAccountManagerDataSource::kNC_PageTitleFakeAccount=nsnull;
@ -193,8 +191,6 @@ nsMsgAccountManagerDataSource::nsMsgAccountManagerDataSource()
&kNC_PageTitleDiskSpace);
getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_ADDRESSING),
&kNC_PageTitleAddressing);
getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_ADVANCED),
&kNC_PageTitleAdvanced);
getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_SMTP),
&kNC_PageTitleSMTP);
getRDFService()->GetResource(NS_LITERAL_CSTRING(NC_RDF_PAGETITLE_FAKEACCOUNT),
@ -252,7 +248,6 @@ nsMsgAccountManagerDataSource::~nsMsgAccountManagerDataSource()
NS_IF_RELEASE(kNC_PageTitleOfflineAndDiskSpace);
NS_IF_RELEASE(kNC_PageTitleDiskSpace);
NS_IF_RELEASE(kNC_PageTitleAddressing);
NS_IF_RELEASE(kNC_PageTitleAdvanced);
NS_IF_RELEASE(kNC_PageTitleSMTP);
NS_IF_RELEASE(kNC_PageTitleFakeAccount);
NS_IF_RELEASE(kTrueLiteral);
@ -356,11 +351,6 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
else if (source == kNC_PageTitleAddressing)
mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-addressing").get(),
getter_Copies(pageTitle));
else if (source == kNC_PageTitleAdvanced)
mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-advanced").get(),
getter_Copies(pageTitle));
else if (source == kNC_PageTitleSMTP)
mStringBundle->GetStringFromName(NS_LITERAL_STRING("prefPanel-smtp").get(),
getter_Copies(pageTitle));
@ -447,8 +437,6 @@ nsMsgAccountManagerDataSource::GetTarget(nsIRDFResource *source,
str = NS_LITERAL_STRING("am-offline.xul");
else if (source == kNC_PageTitleAddressing)
str = NS_LITERAL_STRING("am-addressing.xul");
else if (source == kNC_PageTitleAdvanced)
str = NS_LITERAL_STRING("am-advanced.xul");
else if (source == kNC_PageTitleSMTP)
str = NS_LITERAL_STRING("am-smtp.xul");
else if (source == kNC_PageTitleFakeAccount)
@ -800,51 +788,47 @@ nsresult
nsMsgAccountManagerDataSource::createSettingsResources(nsIRDFResource *aSource,
nsISupportsArray *aNodeArray)
{
nsresult rv;
if (aSource == kNC_PageTitleSMTP) {
// aNodeArray->AppendElement(kNC_PageTitleAdvanced);
}
else {
// If this isn't a server, just return.
if (aSource == kNC_PageTitleSMTP)
return NS_OK;
/* if this is a server, then support the settings */
nsCOMPtr<nsIMsgIncomingServer> server;
rv = getServerForFolderNode(aSource, getter_AddRefs(server));
nsCOMPtr<nsIMsgIncomingServer> server;
nsresult rv = getServerForFolderNode(aSource, getter_AddRefs(server));
if (NS_FAILED(rv)) return rv;
if (server) {
PRBool hasIdentities;
rv = serverHasIdentities(server, &hasIdentities);
if (NS_FAILED(rv)) return rv;
if (server) {
PRBool hasIdentities;
rv = serverHasIdentities(server, &hasIdentities);
if (NS_FAILED(rv)) return rv;
if (hasIdentities) {
aNodeArray->AppendElement(kNC_PageTitleServer);
aNodeArray->AppendElement(kNC_PageTitleCopies);
aNodeArray->AppendElement(kNC_PageTitleAddressing);
}
if (hasIdentities) {
aNodeArray->AppendElement(kNC_PageTitleServer);
aNodeArray->AppendElement(kNC_PageTitleCopies);
aNodeArray->AppendElement(kNC_PageTitleAddressing);
}
// Check the offline capability before adding
// offline item
PRInt32 offlineSupportLevel = 0;
rv = server->GetOfflineSupportLevel(&offlineSupportLevel);
NS_ENSURE_SUCCESS(rv,rv);
// Check the offline capability before adding
// offline item
PRInt32 offlineSupportLevel = 0;
rv = server->GetOfflineSupportLevel(&offlineSupportLevel);
NS_ENSURE_SUCCESS(rv,rv);
PRBool supportsDiskSpace;
rv = server->GetSupportsDiskSpace(&supportsDiskSpace);
NS_ENSURE_SUCCESS(rv,rv);
PRBool supportsDiskSpace;
rv = server->GetSupportsDiskSpace(&supportsDiskSpace);
NS_ENSURE_SUCCESS(rv,rv);
// currently there is no offline without diskspace
if (offlineSupportLevel >= OFFLINE_SUPPORT_LEVEL_REGULAR) {
aNodeArray->AppendElement(kNC_PageTitleOfflineAndDiskSpace);
}
else if (supportsDiskSpace) {
aNodeArray->AppendElement(kNC_PageTitleDiskSpace);
}
// currently there is no offline without diskspace
if (offlineSupportLevel >= OFFLINE_SUPPORT_LEVEL_REGULAR) {
aNodeArray->AppendElement(kNC_PageTitleOfflineAndDiskSpace);
}
else if (supportsDiskSpace) {
aNodeArray->AppendElement(kNC_PageTitleDiskSpace);
}
if (hasIdentities) {
// extensions come after the default panels
rv = appendGenericSettingsResources(server, aNodeArray);
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to add generic panels");
}
if (hasIdentities) {
// extensions come after the default panels
rv = appendGenericSettingsResources(server, aNodeArray);
NS_ASSERTION(NS_SUCCEEDED(rv), "failed to add generic panels");
}
}

1
mailnews/base/src/nsMsgAccountManagerDS.h
View File

@ -151,7 +151,6 @@ protected:
static nsIRDFResource* kNC_PageTitleOfflineAndDiskSpace;
static nsIRDFResource* kNC_PageTitleDiskSpace;
static nsIRDFResource* kNC_PageTitleAddressing;
static nsIRDFResource* kNC_PageTitleAdvanced;
static nsIRDFResource* kNC_PageTitleSMTP;
static nsIRDFResource* kNC_PageTitleFakeAccount;

1
mailnews/jar.mn
View File

@ -49,7 +49,6 @@ messenger.jar:
content/messenger/am-offline.js (base/prefs/resources/content/am-offline.js)
content/messenger/am-addressing.xul (base/prefs/resources/content/am-addressing.xul)
content/messenger/am-addressing.js (base/prefs/resources/content/am-addressing.js)
content/messenger/am-advanced.xul (base/prefs/resources/content/am-advanced.xul)
content/messenger/am-server-advanced.xul (base/prefs/resources/content/am-server-advanced.xul)
content/messenger/am-server-advanced.js (base/prefs/resources/content/am-server-advanced.js)
content/messenger/am-smtp.xul (base/prefs/resources/content/am-smtp.xul)