upd: Disable "Set as default" button for non-verified email adresses.

[gigi.git] / src / org / cacert / gigi / pages / account / mail / MailManagementForm.java

diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
index 9be2bf528132044ed4132b331a39631b5fa3a554..04ed69d2258d808736936b5db29dc225662f74e0 100644 (file)
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.java
@@ -74,12 +74,17 @@ public class MailManagementForm extends Form {
                 vars.put("id", mailID);
                 if (emailAddress.getAddress().equals(target.getEmail())) {
                     vars.put("default", " disabled");
+                    vars.put("deletable", " disabled");
                 } else {
+                    vars.put("deletable", "");
                     vars.put("default", "");
                 }
                 if (emailAddress.isVerified()) {
                     vars.put("verification", l.getTranslation("Verified"));
                 } else {
+                    // only verified emails may become the default email
+                    // address.
+                    vars.put("default", " disabled");
                     vars.put("verification", l.getTranslation("Unverified"));
                 }
                 vars.put("last_verification", emailAddress.getLastPing(true));