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

clean this up. since I'm passing the server id through, I don't

Browse Source 
need to pass the markOldRead and max_articles values through.
I can get them in JS.  no doy.
This commit is contained in:
sspitzer%netscape.com 2000-01-13 08:37:26 +00:00
parent 943f4cfb7f
commit 84219d96dc
2 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mailnews/news/resources/content/downloadheaders.js
View File

@ -28,33 +28,27 @@ var prefs = Components.classes['component://netscape/preferences'].getService();
prefs = prefs.QueryInterface(Components.interfaces.nsIPref);
var serverid = null;
var max_articles_value = 0;
var mark_old_read_value = true;
var markreadElement = null;
var numberElement = null;
var accountManager = Components.classes["component://netscape/messenger/account-manager"].getService(Components.interfaces.nsIMsgAccountManager);
var server = accountManager.getIncomingServer(serverid);
var nntpServer = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
function OnLoad()
{
doSetOKCancel(OkButtonCallback, null);
if (window.arguments && window.arguments[0]) {
var args = window.arguments[0].split(",");
// args will be of the form <number>,<newsgroup name>,<max>,<mark>,<serverid>
// args will be of the form <number>,<newsgroup name>,<serverid>
newmessages = args[0];
newsgroupname = args[1];
max_articles_value = max_articles_value + args[2];
if (args[3] == "true") {
mark_old_read_value = true;
}
else {
mark_old_read_value = false;
}
serverid = args[4];
serverid = args[2];
dump("new message count = " + newmessages + "\n");
dump("newsgroup name = " + newsgroupname + "\n");
dump("max_articles_value = " + max_articles_value + "\n");
dump("mark_old_read_value = " + mark_old_read_value + "\n");
dump("serverid = " + serverid + "\n");
var downloadHeadersTitlePrefix = Bundle.GetStringFromName("downloadHeadersTitlePrefix");
@ -69,10 +63,10 @@ function OnLoad()
numberElement = document.getElementById("number");
numberElement.value = max_articles_value;
numberElement.value = nntpServer.maxArticles;
markreadElement = document.getElementById("markread");
markreadElement.checked = mark_old_read_value;
markreadElement.checked = nntpServer.markOldRead;
return true;
}
@ -86,10 +80,6 @@ function setDivText(divname, value) {
}
function OkButtonCallback() {
var accountManager = Components.classes["component://netscape/messenger/account-manager"].getService(Components.interfaces.nsIMsgAccountManager);
var server = accountManager.getIncomingServer(serverid);
var nntpServer = server.QueryInterface(Components.interfaces.nsINntpIncomingServer);
nntpServer.maxArticles = numberElement.value;
nntpServer.markOldRead= markreadElement.checked;
nntpServer.markOldRead = markreadElement.checked;
}

19
mailnews/news/src/nsNNTPNewsgroupList.cpp
View File

@ -446,25 +446,6 @@ nsNNTPNewsgroupList::GetRangeOfArtsToDownload(
args.Append(",");
args.Append(m_groupName);
PRInt32 dialogMaxArticles = 0;
PRBool dialogMarkOldRead = PR_FALSE;
// get the max articles for this server
rv = nntpServer->GetMaxArticles(&dialogMaxArticles);
if (NS_FAILED(rv)) dialogMaxArticles = 0;
args.Append(dialogMaxArticles);
args.Append(",");
// get the marked read value for this server
rv = nntpServer->GetMarkOldRead(&dialogMarkOldRead);
if (NS_FAILED(rv)) dialogMarkOldRead = PR_FALSE;
if (dialogMarkOldRead) {
args.Append("true,");
}
else {
args.Append("false,");
}
// get the server key
nsXPIDLCString serverKey;
rv = server->GetKey(getter_Copies(serverKey));