Changeset 8f20eb

Timestamp:

Sep 29, 2007, 7:23:57 PM (14 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

11aa72

Parents:

c34db9

Message:

show description in smtp-Menu, if there, else show only hostname

File:

• chrome/content/v_identity/vI_smtpSelector.js (modified) (4 diffs)

chrome/content/v_identity/vI_smtpSelector.js

@@ -20 +20 @@
     the Initial Developer. All Rights Reserved.
 
-    Contributor(s): chuonthis
+    Contributor(s):
  * ***** END LICENSE BLOCK ***** */
-
-/**
-* some code copied and adapted from 'Show SMTP Username'
-* thanks to chuonthis
-*/
 
 vI_smtpSelector = {
@@ -121 +116 @@
             }
         }
-        vI_smtpSelector.elements.Obj_SMTPServerList.setAttribute("label", vI_smtpSelector.getNewHostnamex(idserver));
+        vI_smtpSelector.elements.Obj_SMTPServerList.setAttribute("label", (server.description?server.description:server.hostname));
     },
 
@@ -127 +122 @@
         var listitem = document.createElement("menuitem");
 
-        var hostname = vI_smtpSelector.getNewHostnamex(server);
-        
-        listitem.setAttribute("label", hostname);
+        listitem.setAttribute("label", (server.description?server.description:server.hostname));
         listitem.setAttribute("key", server.key);
         // give it some unique id
@@ -135 +128 @@
 
         return listitem;
-    },
-    
-    getNewHostnamex : function (server)
-    {
-        var showAlias = true;
-        var showUsername = true;
-        var hideUsername = true;
-
-        
-        // reuse Preferences from ssun
-        try { showAlias = vI.preferences.getBoolPref("ssun.showalias"); } catch (ex) {}
-        try { showUsername = vI.preferences.getBoolPref("ssun.showusername"); } catch (ex) {}
-        try { hideUsername = vI.preferences.getBoolPref("ssun.hideusername"); } catch (ex) {}
-
-        var hostname = server.hostname;
-        var port = "";
-
-        if (server.port)
-          port = ":" + server.port;
-
-        // SSUN: Get server alias
-        var alias = "";
-        if (showAlias) {
-        try { alias = vI.preferences.getCharPref("ssun." + server.key + ".alias"); } catch (ex) {}
-        if (alias) {
-            hostname = alias;
-        } else {
-            hostname += port;
-        }
-        } else {
-        hostname += port;
-        }
-
-        // SSUN: Add username
-        if (showUsername && (!showAlias || (showAlias && (!alias || !hideUsername))) && server.authMethod && server.username)
-          hostname += " (" + server.username + ")";
-
-        return hostname
     }
 }