The data shown in the "Trust" column of the User Selection dialog box
is actually the validity of the User ID, not the ownertrust in the
key.
This fix aligns this column header in the User Selection dialog with
the similar column header in the Key Management dialog.
---
src/nsEnigMsgCompose.cpp | 3 +--
ui/content/enigmailUserSelection.js | 28 ++++++++++++++--------------
ui/content/enigmailUserSelection.xul | 4 ++--
ui/locale/en-US/enigmail.dtd | 1 +
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/nsEnigMsgCompose.cpp b/src/nsEnigMsgCompose.cpp
index 2bc3f7a..bd4928a 100644
--- a/src/nsEnigMsgCompose.cpp
+++ b/src/nsEnigMsgCompose.cpp
@@ -77,10 +77,9 @@ nsEnigMsgCompose::nsEnigMsgCompose()
nsEnigMsgCompose::~nsEnigMsgCompose()
{
- nsresult rv;
#ifdef FORCE_PR_LOG
nsCOMPtr<nsIThread> myThread;
- rv = ENIG_GET_THREAD(myThread);
+ ENIG_GET_THREAD(myThread);
DEBUG_LOG(("nsEnigMsgCompose:: >>>>>>>>> DTOR(%p): myThread=%p\n",
this, myThread.get()));
#endif
diff --git a/ui/content/enigmailUserSelection.js
b/ui/content/enigmailUserSelection.js
index baaba7e..da462fc 100644
--- a/ui/content/enigmailUserSelection.js
+++ b/ui/content/enigmailUserSelection.js
@@ -518,16 +518,16 @@ function enigmailBuildList(refresh) {
// create a (sub) row for the user tree
-function enigUserSelCreateRow (userObj, activeState, userId, keyValue,
dateField, trustStatus, uidValid) {
+function enigUserSelCreateRow (userObj, activeState, userId, keyValue,
dateField, uidValidityStatus, uidValid) {
var selectCol=document.createElement("treecell");
selectCol.setAttribute("id", "indicator");
- var trustCol=document.createElement("treecell");
+ var uidValidityCol=document.createElement("treecell");
var expCol=document.createElement("treecell");
var userCol=document.createElement("treecell");
userCol.setAttribute("id", "name");
expCol.setAttribute("id", "expiry");
- trustCol.setAttribute("id", "trust");
+ uidValidityCol.setAttribute("id", "validity");
userCol.setAttribute("label", userId);
expCol.setAttribute("label", EnigGetDateTime(dateField,true, false));
@@ -540,36 +540,36 @@ function enigUserSelCreateRow (userObj, activeState,
userId, keyValue, dateField
keyCol.setAttribute("label", EnigGetString("keyTrust.group"));
keyCol.setAttribute("id", "keyid");
- var trust=EnigGetTrustLabel(trustStatus.charAt(0));
+ var validity=EnigGetTrustLabel(uidValidityStatus.charAt(0));
if (!uidValid) {
userCol.setAttribute("properties", "enigKeyInactive");
- trustCol.setAttribute("properties", "enigKeyInactive");
+ uidValidityCol.setAttribute("properties", "enigKeyInactive");
expCol.setAttribute("properties", "enigKeyInactive");
keyCol.setAttribute("properties", "enigKeyInactive");
- trust=EnigGetString("keyTrust.untrusted");
+ validity=EnigGetString("keyTrust.untrusted");
}
- if (!userObj.subkeyOK && KEY_NOT_VALID.indexOf(trustStatus.charAt(0))<0) {
- trust=EnigGetString("keyValid.noSubkey");
+ if (!userObj.subkeyOK &&
KEY_NOT_VALID.indexOf(uidValidityStatus.charAt(0))<0) {
+ validity=EnigGetString("keyValid.noSubkey");
}
if (((userObj.keyTrust.length>0) &&
(KEY_NOT_VALID.indexOf(userObj.keyTrust.charAt(0))>=0)) ||
(!userObj.subkeyOK) ||
((!gAlwaysTrust) && ("mfu".indexOf(userObj.keyTrust.charAt(0))<0)) ||
- ((!gAlwaysTrust) && trustStatus.length>0 &&
- ("o-qn".indexOf(trustStatus.charAt(0))>=0))) {
+ ((!gAlwaysTrust) && uidValidityStatus.length>0 &&
+ ("o-qn".indexOf(uidValidityStatus.charAt(0))>=0))) {
userCol.setAttribute("properties", "enigKeyInactive");
- trustCol.setAttribute("properties", "enigKeyInactive");
+ uidValidityCol.setAttribute("properties", "enigKeyInactive");
expCol.setAttribute("properties", "enigKeyInactive");
keyCol.setAttribute("properties", "enigKeyInactive");
if (!gAllowExpired && activeState>=0) activeState=2;
}
EnigSetActive(selectCol, activeState);
- trustCol.setAttribute("label", trust);
+ uidValidityCol.setAttribute("label", validity);
var userRow=document.createElement("treerow");
userRow.appendChild(selectCol);
userRow.appendChild(userCol);
- userRow.appendChild(trustCol);
+ userRow.appendChild(uidValidityCol);
userRow.appendChild(expCol);
userRow.appendChild(keyCol);
var treeItem=document.createElement("treeitem");
@@ -676,7 +676,7 @@ function enigmailUserSelCallback(event) {
if ((event.detail == 1) && (col.value.id != "selectionCol"))
return; // single clicks are only relvant for the selection column
- if ((event.detail == 2) &&
("selectionCol,enigUserNameCol,trustCol,expCol,keyCol".indexOf(col.value.id) <
0))
+ if ((event.detail == 2) &&
("selectionCol,enigUserNameCol,uidValidityCol,expCol,keyCol".indexOf(col.value.id)
< 0))
return;
event.stopPropagation();
diff --git a/ui/content/enigmailUserSelection.xul
b/ui/content/enigmailUserSelection.xul
index fea15e8..3f33ea9 100644
--- a/ui/content/enigmailUserSelection.xul
+++ b/ui/content/enigmailUserSelection.xul
@@ -92,8 +92,8 @@
ignoreincolumnpicker="true"
label="&enigmail.keyUserId.label;"/>
<splitter class="tree-splitter"/>
- <treecol id="trustCol" style="width:85px"
- label="&enigmail.keyTrust.label;"
+ <treecol id="uidValidityCol" style="width:85px"
+ label="&enigmail.uidValidity.label;"
persist="width,hidden"/>
<splitter class="tree-splitter"/>
<treecol id="expCol" style="width:70px"
diff --git a/ui/locale/en-US/enigmail.dtd b/ui/locale/en-US/enigmail.dtd
index 4439b3b..5a19e08 100644
--- a/ui/locale/en-US/enigmail.dtd
+++ b/ui/locale/en-US/enigmail.dtd
@@ -258,6 +258,7 @@
<!ENTITY enigmail.usersNotFound.label "Recipients not valid, not
trusted or not found">
<!ENTITY enigmail.keyExpiry.label "Expiry">
<!ENTITY enigmail.keyTrust.label "Trust">
+<!ENTITY enigmail.uidValidity.label "Validity">
<!ENTITY enigmail.keySelection.label "Selection">
<!ENTITY enigmail.keyId.label "Key ID">
<!ENTITY enigmail.userSelPlainText.label "Send mail unencrypted">
--
1.8.5.1
_______________________________________________
enigmail-users mailing list
[email protected]
https://admin.hostpoint.ch/mailman/listinfo/enigmail-users_enigmail.net
