Changeset c3feaa

Timestamp:

Aug 16, 2011, 10:12:23 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.8, ng_0.9

Children:

190674

Parents:

92fd25

Message:

clean namespace from pollution

Files:

• chrome.manifest (modified) (1 diff)
• chrome/content/v_identity/vI_Dialog.js (modified) (3 diffs)
• chrome/content/v_identity/vI_Dialog.xul (modified) (2 diffs)
• chrome/content/v_identity/vI_account.js (modified) (12 diffs)
• chrome/content/v_identity/vI_am-Overlay.js (modified) (2 diffs)
• chrome/content/v_identity/vI_am-smtpOverlay.js (modified) (2 diffs)
• chrome/content/v_identity/vI_context.xul (modified) (3 diffs)
• chrome/content/v_identity/vI_getHeader.js (modified) (20 diffs)
• chrome/content/v_identity/vI_getHeader.xul (modified) (1 diff)
• chrome/content/v_identity/vI_helper.js (modified) (3 diffs)
• chrome/content/v_identity/vI_htmlTextBox.xml (modified) (1 diff)
• chrome/content/v_identity/vI_identityData.js (modified) (20 diffs)
• chrome/content/v_identity/vI_msgIdentityCloneTools.js (modified) (8 diffs)
• chrome/content/v_identity/vI_notificationBar.js (modified) (6 diffs)
• chrome/content/v_identity/vI_notificationBar.xml (modified) (1 diff)
• chrome/content/v_identity/vI_overlayNameSpaceWrapper.js (added)
• chrome/content/v_identity/vI_prefDialog.js (modified) (16 diffs)
• chrome/content/v_identity/vI_prefDialog.xml (modified) (2 diffs)
• chrome/content/v_identity/vI_prefDialog.xul (modified) (18 diffs)
• chrome/content/v_identity/vI_prefDialog_FolderPicker.js (modified) (6 diffs)
• chrome/content/v_identity/vI_prefDialog_TB3.xul (modified) (2 diffs)
• chrome/content/v_identity/vI_prefDialog_TB3FolderPicker.js (modified) (2 diffs)
• chrome/content/v_identity/vI_rdfAccountMismatchDialog.js (modified) (2 diffs)
• chrome/content/v_identity/vI_rdfAccountMismatchDialog.xml (modified) (4 diffs)
• chrome/content/v_identity/vI_rdfAccountMismatchDialog.xul (modified) (1 diff)
• chrome/content/v_identity/vI_rdfDataEditor.js (modified) (4 diffs)
• chrome/content/v_identity/vI_rdfDataEditor.xul (modified) (2 diffs)
• chrome/content/v_identity/vI_rdfDataTree.js (modified) (28 diffs)
• chrome/content/v_identity/vI_rdfDataTree.xul (modified) (13 diffs)
• chrome/content/v_identity/vI_rdfDatasource.js (modified) (54 diffs)
• chrome/content/v_identity/vI_smartIdentity.js (modified) (27 diffs)
• chrome/content/v_identity/vI_smartReplyDialog.js (modified) (2 diffs)
• chrome/content/v_identity/vI_smartReplyDialog.xul (modified) (2 diffs)
• chrome/content/v_identity/vI_statusmenu.js (modified) (3 diffs)
• chrome/content/v_identity/vI_storage.js (modified) (19 diffs)
• chrome/content/v_identity/vI_storageExtras.js (modified) (20 diffs)
• chrome/content/v_identity/vI_storageExtrasDataEditorOverlay.xul (modified) (9 diffs)
• chrome/content/v_identity/vI_storageExtrasDataTreeOverlay.xul (modified) (1 diff)
• chrome/content/v_identity/vI_upgrade.js (modified) (10 diffs)
• chrome/content/v_identity/vI_upgrade.xul (modified) (6 diffs)
• chrome/content/v_identity/vI_upgradeOverlay.js (modified) (2 diffs)
• chrome/content/v_identity/vI_upgradeOverlay.xul (modified) (2 diffs)
• chrome/content/v_identity/v_identity.js (modified) (15 diffs)
• chrome/content/v_identity/v_identity.xml (modified) (23 diffs)
• chrome/content/v_identity/v_identity.xul (modified) (4 diffs)
• chrome/skin/classic/v_identity/v_identity.css (modified) (1 diff)

chrome.manifest

@@ -10 +10 @@
 overlay chrome://messenger/content/messengercompose/messengercompose.xul    chrome://v_identity/content/v_identity.xul
 overlay chrome://messenger/content/messengercompose/messengercompose.xul    chrome://v_identity/content/vI_context.xul
+overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_upgradeOverlay.xul
 overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_context.xul
-overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_upgradeOverlay.xul
 overlay chrome://messenger/content/mailWindowOverlay.xul            chrome://v_identity/content/vI_getHeader.xul
 overlay chrome://v_identity/content/vI_rdfDataTree.xul  chrome://v_identity/content/vI_storageExtrasDataTreeOverlay.xul

chrome/content/v_identity/vI_Dialog.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_Dialog = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var Dialog = {
     setDescription : function(object, description) {
         var new_text = document.createTextNode(description);
@@ -31 +32 @@
     init : function(warning) {
         document.getElementById("vI_Dialog").setAttribute("class", warning.class); 
-        vI_Dialog.setDescription(document.getElementById("vI_Dialog_title"), warning.title);
-        vI_Dialog.setDescription(document.getElementById("vI_Dialog_recLabel"), warning.recLabel);
-        vI_Dialog.setDescription(document.getElementById("vI_Dialog_recipient"), warning.recipient);
+        Dialog.setDescription(document.getElementById("vI_Dialog_title"), warning.title);
+        Dialog.setDescription(document.getElementById("vI_Dialog_recLabel"), warning.recLabel);
+        Dialog.setDescription(document.getElementById("vI_Dialog_recipient"), warning.recipient);
         document.getElementById("vI_Dialog_browser").outputString = warning.warning;
-        vI_Dialog.setDescription(document.getElementById("vI_Dialog_query"), warning.query);
+        Dialog.setDescription(document.getElementById("vI_Dialog_query"), warning.query);
         // show abort button
         if (warning.class == "replaceVIdentity") {
@@ -43 +44 @@
     }
 }
+vI.Dialog = Dialog;
+}});

chrome/content/v_identity/vI_Dialog.xul

@@ -37 +37 @@
         title="Virtual Identity"
     zlevel="6"
-    onload="vI_Dialog.init(window.arguments[0]);"
+    onload="virtualIdentityExtension.Dialog.init(window.arguments[0]);"
     ondialogaccept="window.arguments[1].returnValue = 'accept';"
     ondialogcancel="window.close(); window.arguments[1].returnValue = 'cancel';"
@@ -44 +44 @@
     persist="height width">
 
-    <script type="application/x-javascript"
-        src="chrome://v_identity/content/vI_Dialog.js" />
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_Dialog.js" />
 
     <description id="vI_Dialog_title" />

chrome/content/v_identity/vI_account.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_account = {
-    account : null,
-    
-    AccountManager : Components.classes["@mozilla.org/messenger/account-manager;1"]
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var account = {
+    _account : null,
+    
+    _AccountManager : Components.classes["@mozilla.org/messenger/account-manager;1"]
         .getService(Components.interfaces.nsIMsgAccountManager),
-
-    
-    prefroot : Components.classes["@mozilla.org/preferences-service;1"]
+    
+    _prefroot : Components.classes["@mozilla.org/preferences-service;1"]
         .getService(Components.interfaces.nsIPrefService)
         .getBranch(null),
 
     _getBaseIdentity : function () {
-        return gAccountManager.getIdentity(vI_main.elements.Obj_MsgIdentity.value);
+        return account._AccountManager.getIdentity(vI.main.elements.Obj_MsgIdentity.value);
     },
 
     _copyBoolAttribute : function(name) {
-        vI_account.account.defaultIdentity.setBoolAttribute(name,
-                vI_account._getBaseIdentity().getBoolAttribute(name));
+        account._account.defaultIdentity.setBoolAttribute(name,
+                account._getBaseIdentity().getBoolAttribute(name));
     },
     
     _copyIntAttribute : function(name) {
-        vI_account.account.defaultIdentity.setIntAttribute(name,
-                vI_account._getBaseIdentity().getIntAttribute(name));
+        account._account.defaultIdentity.setIntAttribute(name,
+                account._getBaseIdentity().getIntAttribute(name));
     },
 
     _copyCharAttribute : function(name) {
-        vI_account.account.defaultIdentity.setCharAttribute(name,
-                vI_account._getBaseIdentity().getCharAttribute(name));
+        account._account.defaultIdentity.setCharAttribute(name,
+                account._getBaseIdentity().getCharAttribute(name));
     },
 
     _copyUnicharAttribute : function(name) {
-        vI_account.account.defaultIdentity.setUnicharAttribute(name,
-                vI_account._getBaseIdentity().getUnicharAttribute(name));
+        account._account.defaultIdentity.setUnicharAttribute(name,
+                account._getBaseIdentity().getUnicharAttribute(name));
     },
 
     copyPreferences : function() {
-        if (vI_main.preferences.getBoolPref("copySMIMESettings")) {
+        if (vI.main.preferences.getBoolPref("copySMIMESettings")) {
             // SMIME settings
-            vI_notificationBar.dump("## vI_account: copy S/MIME settings\n")
-            vI_account._copyUnicharAttribute("signing_cert_name");
-            vI_account._copyUnicharAttribute("encryption_cert_name");
-            vI_account._copyIntAttribute("encryptionpolicy");
+            vI.notificationBar.dump("## account: copy S/MIME settings\n")
+            account._copyUnicharAttribute("signing_cert_name");
+            account._copyUnicharAttribute("encryption_cert_name");
+            account._copyIntAttribute("encryptionpolicy");
         }
 /*      seems not required, encryption happens before Virtual Identity account is created
-        if (vI_main.preferences.getBoolPref("copyEnigmailSettings")) {
+        if (vI.main.preferences.getBoolPref("copyEnigmailSettings")) {
             // pgp/enigmail settings
-            vI_notificationBar.dump("## vI_account: copy PGP settings\n")
-            vI_account._copyBoolAttribute("pgpSignEncrypted");
-            vI_account._copyBoolAttribute("pgpSignPlain");
-            vI_account._copyBoolAttribute("enablePgp");
-            vI_account._copyIntAttribute("pgpKeyMode");
-            vI_account._copyCharAttribute("pgpkeyId");
-            vI_account._copyIntAttribute("openPgpHeaderMode");
-            vI_account._copyCharAttribute("openPgpUrlName");
-        
-            vI_account._copyIntAttribute("defaultEncryptionPolicy");
+            vI.notificationBar.dump("## account: copy PGP settings\n")
+            account._copyBoolAttribute("pgpSignEncrypted");
+            account._copyBoolAttribute("pgpSignPlain");
+            account._copyBoolAttribute("enablePgp");
+            account._copyIntAttribute("pgpKeyMode");
+            account._copyCharAttribute("pgpkeyId");
+            account._copyIntAttribute("openPgpHeaderMode");
+            account._copyCharAttribute("openPgpUrlName");
+        
+            account._copyIntAttribute("defaultEncryptionPolicy");
         }   */
-        if (vI_main.preferences.getBoolPref("copyAttachVCardSettings")) {
+        if (vI.main.preferences.getBoolPref("copyAttachVCardSettings")) {
             // attach vcard
-            vI_notificationBar.dump("## vI_account: copy VCard settings\n")
-            vI_account._copyBoolAttribute("attachVCard");
-            vI_account._copyCharAttribute("escapedVCard");
+            vI.notificationBar.dump("## account: copy VCard settings\n")
+            account._copyBoolAttribute("attachVCard");
+            account._copyCharAttribute("escapedVCard");
         }
     },
@@ -97 +97 @@
             // recurse into all subdirectories
             if (maildir.isDirectory() &&
-                !vI_account.__dirEmpty(maildir)) return false;
+                !account.__dirEmpty(maildir)) return false;
             // ignore files with ending "*.msf"
             if (!maildir.path.match(new RegExp(".*\.msf$","i")) &&
@@ -106 +106 @@
 
     __cleanupDirectories : function() {
-        vI_notificationBar.dump("## vI_account: checking for leftover VirtualIdentity directories ")
+        vI.notificationBar.dump("## account: checking for leftover VirtualIdentity directories ")
 
         var file = Components.classes["@mozilla.org/file/directory_service;1"]
@@ -124 +124 @@
                     if (maildir.path.match(new RegExp("[/\\\\]virtualIdentity.*$","i"))) {
                         // should be empty, VirtualIdentity never uses those directories
-                        if (vI_account.__dirEmpty(maildir)) {
+                        if (account.__dirEmpty(maildir)) {
                             try {maildir.remove(true)} catch(e) { }
-                            vI_notificationBar.dump("x");
+                            vI.notificationBar.dump("x");
                         }
-                        else vI_notificationBar.dump(".");
+                        else vI.notificationBar.dump(".");
                         
                     }
@@ -134 +134 @@
             }
         }
-        vI_notificationBar.dump(" - done\n")
+        vI.notificationBar.dump(" - done\n")
     },
     
     cleanupSystem : function() {
-        vI_notificationBar.dump("## vI_account: checking for leftover VirtualIdentity accounts ")
-        for (var i=0; i < vI_account.AccountManager.accounts.Count(); i++) {
-            var account = vI_account.AccountManager.accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
-            if (vI_account.__isVIdentityAccount(account)) {
-                vI_notificationBar.dump(".")
-                vI_account.__removeAccount(account);
+        vI.notificationBar.dump("## account: checking for leftover VirtualIdentity accounts ")
+        for (var i=0; i < account._AccountManager.accounts.Count(); i++) {
+            var checkAccount = account._AccountManager.accounts.QueryElementAt(i, Components.interfaces.nsIMsgAccount);
+            if (account.__isVIdentityAccount(checkAccount)) {
+                vI.notificationBar.dump(".")
+                account.__removeAccount(checkAccount);
             }
         }
-        vI_notificationBar.dump(" - done\n")
-        vI_account.__cleanupDirectories();
-    },
-    
-    __isVIdentityAccount : function(account) {
+        vI.notificationBar.dump(" - done\n")
+        account.__cleanupDirectories();
+    },
+    
+    __isVIdentityAccount : function(checkAccount) {
         // check for new (post0.5.0) accounts,
-        try {   vI_account.prefroot.getBoolPref("mail.account." + account.key + ".vIdentity");
+        try {   account._prefroot.getBoolPref("mail.account." + checkAccount.key + ".vIdentity");
             return true;
         } catch (e) { };
         // check for old (pre 0.5.0) accounts
-        if (account.incomingServer && account.incomingServer.hostName == "virtualIdentity") return true;
+        if (checkAccount.incomingServer && checkAccount.incomingServer.hostName == "virtualIdentity") return true;
         return false;
     },
     
-    __removeAccount : function(account) {
+    __removeAccount : function(checkAccount) {
+        vI.notificationBar.dump("## account: __removeAccount\n")
         // in new (post 0.5.0) Virtual Identity accounts the incomingServer of the account
         // points to an incoming server of a different account. Cause the internal
         // removeAccount function tries to removes the incomingServer ether, create
         // a real one before calling this function.
-        if (!account.incomingServer || account.incomingServer.hostName != "virtualIdentity") {
+        if (!checkAccount.incomingServer || checkAccount.incomingServer.hostName != "virtualIdentity") {
             // if not some of the 'old' accounts
-            account.incomingServer = vI_account.AccountManager.
+            checkAccount.incomingServer = account._AccountManager.
                 createIncomingServer("toRemove","virtualIdentity","pop3");
         }
 
         // remove the rootFolder of the account
-        try { account.incomingServer.rootFolder.Delete(); }
+        try { checkAccount.incomingServer.rootFolder.Delete(); }
         catch (e) { };
         
-        var key = account.key;
-        vI_notificationBar.dump("## vI_account: removing account " + key + ".\n")
+        var key = checkAccount.key;
+        vI.notificationBar.dump("## account: removing account " + key + ".\n")
         // remove the account
-        vI_account.AccountManager.removeAccount(account);
+        account._AccountManager.removeAccount(checkAccount);
         // remove the additional tagging-pref
-        try { vI_account.prefroot.clearUserPref("mail.account." + key + ".vIdentity");  }
+        try { account._prefroot.clearUserPref("mail.account." + key + ".vIdentity");    }
         catch (e) { };
     },
@@ -192 +193 @@
             var selectedMessages = (mailWindow.gFolderDisplay)?mailWindow.gFolderDisplay.selectedMessages:null;
         }
-        if (vI_account.account) {
-            vI_account.__removeAccount(vI_account.account);
-            vI_account.account = null;
+        if (account._account) {
+            account.__removeAccount(account._account);
+            account._account = null;
         }
         try {
@@ -204 +205 @@
     createAccount : function()
     {
-        if (vI_account.account) {  // if the Account is still created, then leave all like it is
+        if (account._account) {  // if the Account is still created, then leave all like it is
             alert("account still created, shouldn't happen");
             return;
@@ -210 +211 @@
         /*
         // the easiest way would be to get all requiered Attributes might be to duplicate the default account like this
-        var recentAccount = vI_account.AccountManager.getAccount(vI_main.elements.Obj_MsgIdentity.selectedItem.getAttribute("accountkey"));
-        vI_main.VIdent_Account = vI_account.AccountManager.duplicateAccount(recentAccount);
+        var recentAccount = account._AccountManager.getAccount(vI.main.elements.Obj_MsgIdentity.selectedItem.getAttribute("accountkey"));
+        vI.main.VIdent_Account = account._AccountManager.duplicateAccount(recentAccount);
         // but this ends up in the following exception:
-        // "Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIMsgAccountManager.duplicateAccount]"
+        // "Component returned failure code: 0x80004001 (NS_ERROR_NOT_IMPLEMENTED) [nsIMsg_AccountManager.duplicateAccount]"
         // so I have to do this by hand ;(
         */
         
-        vI_account.account = vI_account.AccountManager.createAccount();
-        vI_account.prefroot.setBoolPref("mail.account." + vI_account.account.key + ".vIdentity", true)
-        
-        vI_account.account.addIdentity(vI_account.AccountManager.createIdentity());
+        account._account = account._AccountManager.createAccount();
+        account._prefroot.setBoolPref("mail.account." + account._account.key + ".vIdentity", true)
+        
+        account._account.addIdentity(account._AccountManager.createIdentity());
     
         // the new account uses the same incomingServer than the base one,
@@ -226 +227 @@
         // by pointing to the same incomingServer stored passwords can be reused
         // the incomingServer has to be replaced before the account is removed, else it get removed ether
-        var servers = vI_account.AccountManager.GetServersForIdentity(vI_account._getBaseIdentity());
+        var servers = account._AccountManager.GetServersForIdentity(account._getBaseIdentity());
         var server = servers.QueryElementAt(0, Components.interfaces.nsIMsgIncomingServer);
         
@@ -233 +234 @@
         // but we should restore it, because it's actually the same server as the one of the base identity
         server.valid = false;
-        vI_account.account.incomingServer = server;
+        account._account.incomingServer = server;
         server.valid = true;
 
-        vI_account.copyMsgIdentityClone();
-        vI_account.copyPreferences();
-        vI_account.setupFcc();
-        vI_account.setupDraft();
-        vI_account.setupTemplates();
+        account.copyMsgIdentityClone();
+        account.copyPreferences();
+        account.setupFcc();
+        account.setupDraft();
+        account.setupTemplates();
     },
     
     copyMsgIdentityClone : function() {
         var identityData = document.getElementById("msgIdentity_clone").identityData;
-        vI_account.account.defaultIdentity.setCharAttribute("useremail", identityData.email);
-        vI_account.account.defaultIdentity.setUnicharAttribute("fullName", identityData.fullName);
-        
-        vI_account.account.defaultIdentity.smtpServerKey = identityData.smtp.keyNice; // key with "" for vI_DEFAULT_SMTP_TAG
-
-        vI_notificationBar.dump("## vI_account: Stored virtualIdentity (name "
-            + vI_account.account.defaultIdentity.fullName + " email "
-            + vI_account.account.defaultIdentity.email + " smtp "
-            + vI_account.account.defaultIdentity.smtpServerKey +")\n");
+        account._account.defaultIdentity.setCharAttribute("useremail", identityData.email);
+        account._account.defaultIdentity.setUnicharAttribute("fullName", identityData.fullName);
+        
+        account._account.defaultIdentity.smtpServerKey = identityData.smtp.keyNice; // key with "" for vI.DEFAULT_SMTP_TAG
+
+        vI.notificationBar.dump("## account: Stored virtualIdentity (name "
+            + account._account.defaultIdentity.fullName + " email "
+            + account._account.defaultIdentity.email + " smtp "
+            + account._account.defaultIdentity.smtpServerKey +")\n");
     },
     
@@ -259 +260 @@
     {
         if (document.getElementById("fcc_switch").getAttribute("checked")) {
-            switch (vI_main.preferences.getCharPref("fccFolderPickerMode"))
+            switch (vI.main.preferences.getCharPref("fccFolderPickerMode"))
             {
                 case "2"  :
-                vI_notificationBar.dump ("## vI_account: preparing Fcc --- use Settings of Default Account\n");
-                vI_account.account.defaultIdentity.doFcc = vI_account.AccountManager.defaultAccount.defaultIdentity.doFcc;
-                vI_account.account.defaultIdentity.fccFolder = vI_account.AccountManager.defaultAccount.defaultIdentity.fccFolder;
-                vI_account.account.defaultIdentity.fccFolderPickerMode = vI_account.AccountManager.defaultAccount.defaultIdentity.fccFolderPickerMode;
-                vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_account.AccountManager.defaultAccount.defaultIdentity.fccReplyFollowsParent;
+                vI.notificationBar.dump ("## account: preparing Fcc --- use Settings of Default Account\n");
+                account._account.defaultIdentity.doFcc = account._AccountManager.defaultAccount.defaultIdentity.doFcc;
+                account._account.defaultIdentity.fccFolder = account._AccountManager.defaultAccount.defaultIdentity.fccFolder;
+                account._account.defaultIdentity.fccFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.fccFolderPickerMode;
+                account._account.defaultIdentity.fccReplyFollowsParent = account._AccountManager.defaultAccount.defaultIdentity.fccReplyFollowsParent;
                 break;
                 case "3"  :
-                vI_notificationBar.dump ("## vI_account: preparing Fcc --- use Settings of Modified Account\n");
-                vI_account.account.defaultIdentity.doFcc = vI_account._getBaseIdentity().doFcc;
-                vI_account.account.defaultIdentity.fccFolder = vI_account._getBaseIdentity().fccFolder;
-                vI_account.account.defaultIdentity.fccFolderPickerMode = vI_account._getBaseIdentity().fccFolderPickerMode;
-                vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_account._getBaseIdentity().fccReplyFollowsParent;
+                vI.notificationBar.dump ("## account: preparing Fcc --- use Settings of Modified Account\n");
+                account._account.defaultIdentity.doFcc = account._getBaseIdentity().doFcc;
+                account._account.defaultIdentity.fccFolder = account._getBaseIdentity().fccFolder;
+                account._account.defaultIdentity.fccFolderPickerMode = account._getBaseIdentity().fccFolderPickerMode;
+                account._account.defaultIdentity.fccReplyFollowsParent = account._getBaseIdentity().fccReplyFollowsParent;
                 break;
                 default  :
-                vI_notificationBar.dump ("## vI_account: preparing Fcc --- use Virtual Identity Settings\n");
-                vI_account.account.defaultIdentity.doFcc
-                    = vI_main.preferences.getBoolPref("doFcc");
-                vI_account.account.defaultIdentity.fccFolder
-                    = vI_main.unicodeConverter.ConvertToUnicode(vI_main.preferences.getCharPref("fccFolder"));
-                vI_account.account.defaultIdentity.fccFolderPickerMode
-                    = vI_main.preferences.getCharPref("fccFolderPickerMode");
-                vI_account.account.defaultIdentity.fccReplyFollowsParent = vI_main.preferences.getBoolPref("fccReplyFollowsParent");
+                vI.notificationBar.dump ("## account: preparing Fcc --- use Virtual Identity Settings\n");
+                account._account.defaultIdentity.doFcc
+                    = vI.main.preferences.getBoolPref("doFcc");
+                account._account.defaultIdentity.fccFolder
+                    = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("fccFolder"));
+                account._account.defaultIdentity.fccFolderPickerMode
+                    = vI.main.preferences.getCharPref("fccFolderPickerMode");
+                account._account.defaultIdentity.fccReplyFollowsParent = vI.main.preferences.getBoolPref("fccReplyFollowsParent");
 
                 break;
@@ -289 +290 @@
         }
         else {
-            dump ("## vI_account: dont performing Fcc\n");
-            vI_account.account.defaultIdentity.doFcc = false;
-        }
-        vI_notificationBar.dump("## vI_account: Stored (doFcc " + vI_account.account.defaultIdentity.doFcc + " fccFolder " +
-            vI_account.account.defaultIdentity.fccFolder + " fccFolderPickerMode " +
-            vI_account.account.defaultIdentity.fccFolderPickerMode + "(" +
-            vI_main.preferences.getCharPref("fccFolderPickerMode") + "))\n");
+            dump ("## account: dont performing Fcc\n");
+            account._account.defaultIdentity.doFcc = false;
+        }
+        vI.notificationBar.dump("## account: Stored (doFcc " + account._account.defaultIdentity.doFcc + " fccFolder " +
+            account._account.defaultIdentity.fccFolder + " fccFolderPickerMode " +
+            account._account.defaultIdentity.fccFolderPickerMode + "(" +
+            vI.main.preferences.getCharPref("fccFolderPickerMode") + "))\n");
     },
     
     setupDraft : function() {
-        switch (vI_main.preferences.getCharPref("draftFolderPickerMode"))
+        switch (vI.main.preferences.getCharPref("draftFolderPickerMode"))
         {
             case "2"  :
-            vI_notificationBar.dump ("## vI_account: preparing Draft --- use Settings of Default Account\n");
-            vI_account.account.defaultIdentity.draftFolder = vI_account.AccountManager.defaultAccount.defaultIdentity.draftFolder;
-            vI_account.account.defaultIdentity.draftsFolderPickerMode = vI_account.AccountManager.defaultAccount.defaultIdentity.draftsFolderPickerMode;
+            vI.notificationBar.dump ("## account: preparing Draft --- use Settings of Default Account\n");
+            account._account.defaultIdentity.draftFolder = account._AccountManager.defaultAccount.defaultIdentity.draftFolder;
+            account._account.defaultIdentity.draftsFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.draftsFolderPickerMode;
             break;
             case "3"  :
-            vI_notificationBar.dump ("## vI_account: preparing Draft --- use Settings of Modified Account\n");
-            vI_account.account.defaultIdentity.draftFolder = vI_account._getBaseIdentity().draftFolder;
-            vI_account.account.defaultIdentity.draftsFolderPickerMode = vI_account._getBaseIdentity().draftsFolderPickerMode;
+            vI.notificationBar.dump ("## account: preparing Draft --- use Settings of Modified Account\n");
+            account._account.defaultIdentity.draftFolder = account._getBaseIdentity().draftFolder;
+            account._account.defaultIdentity.draftsFolderPickerMode = account._getBaseIdentity().draftsFolderPickerMode;
             break;
             default  :
-            vI_notificationBar.dump ("## vI_account: preparing Draft --- use Virtual Identity Settings\n");
-            vI_account.account.defaultIdentity.draftFolder
-                = vI_main.unicodeConverter.ConvertToUnicode(vI_main.preferences.getCharPref("draftFolder"));
-            vI_account.account.defaultIdentity.draftsFolderPickerMode
-                = vI_main.preferences.getCharPref("draftFolderPickerMode");
-            break;
-        }
-        vI_notificationBar.dump("## vI_account: Stored (draftFolder " +
-            vI_account.account.defaultIdentity.draftFolder + " draftsFolderPickerMode " +
-            vI_account.account.defaultIdentity.draftsFolderPickerMode + "(" +
-            vI_main.preferences.getCharPref("draftFolderPickerMode") + "))\n");
+            vI.notificationBar.dump ("## account: preparing Draft --- use Virtual Identity Settings\n");
+            account._account.defaultIdentity.draftFolder
+                = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("draftFolder"));
+            account._account.defaultIdentity.draftsFolderPickerMode
+                = vI.main.preferences.getCharPref("draftFolderPickerMode");
+            break;
+        }
+        vI.notificationBar.dump("## account: Stored (draftFolder " +
+            account._account.defaultIdentity.draftFolder + " draftsFolderPickerMode " +
+            account._account.defaultIdentity.draftsFolderPickerMode + "(" +
+            vI.main.preferences.getCharPref("draftFolderPickerMode") + "))\n");
     },
     
     setupTemplates : function() {
-        switch (vI_main.preferences.getCharPref("stationeryFolderPickerMode"))
+        switch (vI.main.preferences.getCharPref("stationeryFolderPickerMode"))
         {
             case "2"  :
-            vI_notificationBar.dump ("## vI_account: preparing Templates --- use Settings of Default Account\n");
-            vI_account.account.defaultIdentity.stationeryFolder = vI_account.AccountManager.defaultAccount.defaultIdentity.stationeryFolder;
-            vI_account.account.defaultIdentity.tmplFolderPickerMode = vI_account.AccountManager.defaultAccount.defaultIdentity.tmplFolderPickerMode;
+            vI.notificationBar.dump ("## account: preparing Templates --- use Settings of Default Account\n");
+            account._account.defaultIdentity.stationeryFolder = account._AccountManager.defaultAccount.defaultIdentity.stationeryFolder;
+            account._account.defaultIdentity.tmplFolderPickerMode = account._AccountManager.defaultAccount.defaultIdentity.tmplFolderPickerMode;
             break;
             case "3"  :
-            vI_notificationBar.dump ("## vI_account: preparing Templates --- use Settings of Modified Account\n");
-            vI_account.account.defaultIdentity.stationeryFolder = vI_account._getBaseIdentity().stationeryFolder;
-            vI_account.account.defaultIdentity.tmplFolderPickerMode = vI_account._getBaseIdentity().tmplFolderPickerMode;
+            vI.notificationBar.dump ("## account: preparing Templates --- use Settings of Modified Account\n");
+            account._account.defaultIdentity.stationeryFolder = account._getBaseIdentity().stationeryFolder;
+            account._account.defaultIdentity.tmplFolderPickerMode = account._getBaseIdentity().tmplFolderPickerMode;
             break;
             default  :
-            vI_notificationBar.dump ("## vI_account: preparing Templates --- use Virtual Identity Settings\n");
-            vI_account.account.defaultIdentity.stationeryFolder
-                = vI_main.unicodeConverter.ConvertToUnicode(vI_main.preferences.getCharPref("stationeryFolder"));
-            vI_account.account.defaultIdentity.tmplFolderPickerMode
-                = vI_main.preferences.getCharPref("stationeryFolderPickerMode");
-            break;
-        }
-        vI_notificationBar.dump("## vI_account: Stored (stationeryFolder " +
-            vI_account.account.defaultIdentity.stationeryFolder + " tmplFolderPickerMode " +
-            vI_account.account.defaultIdentity.tmplFolderPickerMode + "(" +
-            vI_main.preferences.getCharPref("stationeryFolderPickerMode") + "))\n");
+            vI.notificationBar.dump ("## account: preparing Templates --- use Virtual Identity Settings\n");
+            account._account.defaultIdentity.stationeryFolder
+                = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("stationeryFolder"));
+            account._account.defaultIdentity.tmplFolderPickerMode
+                = vI.main.preferences.getCharPref("stationeryFolderPickerMode");
+            break;
+        }
+        vI.notificationBar.dump("## account: Stored (stationeryFolder " +
+            account._account.defaultIdentity.stationeryFolder + " tmplFolderPickerMode " +
+            account._account.defaultIdentity.tmplFolderPickerMode + "(" +
+            vI.main.preferences.getCharPref("stationeryFolderPickerMode") + "))\n");
     }
 }
+vI.account = account;
+}});

chrome/content/v_identity/vI_am-Overlay.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
 function orig_onAccept() {};
-
-var vI_am_Overlay = {
+var am_Overlay = {
     onAccept : function(aServerKeyToSelect, aFocusList) {
         orig_onAccept();
@@ -35 +35 @@
     init : function() {
         orig_onAccept = onAccept;
-        onAccept = vI_am_Overlay.onAccept;
+        onAccept = am_Overlay.onAccept;
     }
 }
-window.addEventListener('load', vI_am_Overlay.init, false);
+window.addEventListener('load', am_Overlay.init, false);
+}});

chrome/content/v_identity/vI_am-smtpOverlay.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_am_smtpOverlay = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var am_smtpOverlay = {
     refreshServerList : function(aServerKeyToSelect, aFocusList) {
         gSmtpServerListWindow.orig_refreshServerList(aServerKeyToSelect, aFocusList);
@@ -33 +34 @@
     init : function() {
         gSmtpServerListWindow.orig_refreshServerList = gSmtpServerListWindow.refreshServerList;
-        gSmtpServerListWindow.refreshServerList = vI_am_smtpOverlay.refreshServerList;
+        gSmtpServerListWindow.refreshServerList = am_smtpOverlay.refreshServerList;
     }
 }
-window.addEventListener('load', vI_am_smtpOverlay.init, false);
+window.addEventListener('load', am_smtpOverlay.init, false);
+}});

chrome/content/v_identity/vI_context.xul

@@ -34 +34 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDatasource.js" />
     <script type="application/x-javascript">
+    virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
     var vI_context = {
         prefroot : Components.classes["@mozilla.org/preferences-service;1"]
@@ -54 +56 @@
         vI_context.prefroot.removeObserver("extensions.virtualIdentity.menu_entry", vI_context, false);
     }, false);
+    }});
+    dump('context: ' + virtualIdentityExtension.initTime + '\n');
     </script>
     
@@ -65 +69 @@
                         <menuitem label="&vident.vI_Menu.DataEditor.label;"
                             oncommand="window.open('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />
-                        <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="var vI_localRdfDatasource = new vI_rdfDatasourceImporter('virtualIdentity.rdf');"/>
-                        <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="var vI_localRdfDatasource = new vI_rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')"/>
+                        <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="dump('command: ' + virtualIdentityExtension.initTime + '\n');var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasourceImporter('virtualIdentity.rdf');"/>
+                        <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="dump('command: ' + virtualIdentityExtension.initTime + '\n');var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')"/>
                     </menupopup>
                 </menu>

chrome/content/v_identity/vI_getHeader.js

@@ -39 +39 @@
 */
 
-var vI_getHeader = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var getHeader = {
     messenger: null,
     preferences : Components.classes["@mozilla.org/preferences-service;1"]
@@ -53 +54 @@
     
     prepareHeaderToSearchArray : function() {
-        var headerList = vI_getHeader.unicodeConverter.ConvertToUnicode(vI_getHeader.preferences.getCharPref("smart_reply_headers")).split(/\n/)
-        
-        vI_getHeader.headerToSearch = [];
+        var headerList = getHeader.unicodeConverter.ConvertToUnicode(getHeader.preferences.getCharPref("smart_reply_headers")).split(/\n/)
+        
+        getHeader.headerToSearch = [];
         
         // prepare headerToSearch for speedup.
@@ -67 +68 @@
             
             // create header name to store the value
-            var headerNameToStore = "vI_" + headerNameToSearch
+            var headerNameToStore = "vI." + headerNameToSearch
             if (!isNaN(headerNumberToSearch)) headerNameToStore += ":" + headerNumberToSearch
             
-            vI_getHeader.headerToSearch.push({ headerNameToSearch : headerNameToSearch, headerNumberToSearch : headerNumberToSearch,
+            getHeader.headerToSearch.push({ headerNameToSearch : headerNameToSearch, headerNumberToSearch : headerNumberToSearch,
                     headerNameToStore : headerNameToStore });
         }
@@ -80 +81 @@
     
     getHeader: function(hdr) {
-        vI_notificationBar.clear_dump()
+        vI.notificationBar.clear_dump()
         var index;
 
-        if (!vI_getHeader.headerToSearch) vI_getHeader.prepareHeaderToSearchArray()
+        if (!getHeader.headerToSearch) getHeader.prepareHeaderToSearchArray()
 
         var found = false; var label = "";
-        var subtitle = vI_getHeader.strings.getString("vident.getHeader.noHeader");
+        var subtitle = getHeader.strings.getString("vident.getHeader.noHeader");
         // create array to count the header
         var currentHeadersCounter = [];
         
-        var vI_listId = false; var vI_received = false; var vI_content_base = false;
+        var listId = false; var received = false; var content_base = false;
         for (var header in currentHeaderData) {
             var headerName = currentHeaderData[header].headerName.toLowerCase();
-//          vI_notificationBar.dump("## vI_getHeader: found header: " + currentHeaderData[header].headerName + "\n");
+//          vI.notificationBar.dump("## getHeader: found header: " + currentHeaderData[header].headerName + "\n");
 
             // remember list-id header to prevent using Mailing-List addresses as sender
-            if (!vI_listId && headerName == "list-id") {
-                hdr.setStringProperty("vI_list-id","found"); vI_listId = true;
-                vI_notificationBar.dump("## vI_getHeader: found header: list-id  ...stored to recognize mailing-list\n");
+            if (!listId && headerName == "list-id") {
+                hdr.setStringProperty("vI_list-id","found"); listId = true;
+                vI.notificationBar.dump("## getHeader: found header: list-id  ...stored to recognize mailing-list\n");
 //              continue;
             }
 
             // remember received header to prevent using Mailing-List addresses as sender
-            if (!vI_received && headerName == "received") {
-                hdr.setStringProperty("vI_received","found"); vI_received = true;
-                vI_notificationBar.dump("## vI_getHeader: found header: received  ...stored to recognize received mail\n");
+            if (!received && headerName == "received") {
+                hdr.setStringProperty("vI_received","found"); received = true;
+                vI.notificationBar.dump("## getHeader: found header: received  ...stored to recognize received mail\n");
 //              continue;
             }
             
             // remember content-base header to prevent using Blog/News-Feed addresses as sender
-            if (!vI_content_base && headerName == "content-base") {
-                hdr.setStringProperty("vI_content_base","found"); vI_content_base = true;
-                vI_notificationBar.dump("## vI_getHeader: found header: content-base  ...stored to recognize blog/news-feed\n");
+            if (!content_base && headerName == "content-base") {
+                hdr.setStringProperty("vI_content_base","found"); content_base = true;
+                vI.notificationBar.dump("## getHeader: found header: content-base  ...stored to recognize blog/news-feed\n");
 //              continue;
             }
@@ -119 +120 @@
             else currentHeadersCounter[headerName] = 1
             
-            for (var index = 0; index < vI_getHeader.headerToSearch.length; index++) {
-                if (headerName == vI_getHeader.headerToSearch[index].headerNameToSearch &&
-                    (isNaN(vI_getHeader.headerToSearch[index].headerNumberToSearch) ||
-                        vI_getHeader.headerToSearch[index].headerNumberToSearch == currentHeadersCounter[headerName])) {
+            for (var index = 0; index < getHeader.headerToSearch.length; index++) {
+                if (headerName == getHeader.headerToSearch[index].headerNameToSearch &&
+                    (isNaN(getHeader.headerToSearch[index].headerNumberToSearch) ||
+                        getHeader.headerToSearch[index].headerNumberToSearch == currentHeadersCounter[headerName])) {
                     
                     var value = currentHeaderData[header].headerValue;
                     if (currentHeadersCounter[headerName] != 1)
-                        value = hdr.getStringProperty(vI_getHeader.headerToSearch[index].headerNameToStore) + 
+                        value = hdr.getStringProperty(getHeader.headerToSearch[index].headerNameToStore) + 
                         ", " + value;
-                    hdr.setStringProperty(vI_getHeader.headerToSearch[index].headerNameToStore,vI_getHeader.unicodeConverter.ConvertFromUnicode(value) + vI_getHeader.unicodeConverter.Finish());
-
-                    var storedValue = hdr.getProperty(vI_getHeader.headerToSearch[index].headerNameToStore)
-                    var storedConvValue = vI_getHeader.unicodeConverter.ConvertToUnicode(storedValue)
-                    vI_notificationBar.dump("## vI_getHeader: found header: " + headerName +
+                    hdr.setStringProperty(getHeader.headerToSearch[index].headerNameToStore,getHeader.unicodeConverter.ConvertFromUnicode(value) + getHeader.unicodeConverter.Finish());
+
+                    var storedValue = hdr.getProperty(getHeader.headerToSearch[index].headerNameToStore)
+                    var storedConvValue = getHeader.unicodeConverter.ConvertToUnicode(storedValue)
+                    vI.notificationBar.dump("## getHeader: found header: " + headerName +
                         "[:" + currentHeadersCounter[headerName] + "] - stored as '" + 
                         storedConvValue + "'\n");
                     if (!found) { 
-                        subtitle = vI_getHeader.strings.getString("vident.getHeader.headerFound");
+                        subtitle = getHeader.strings.getString("vident.getHeader.headerFound");
                         found = true;
                     }
@@ -146 +147 @@
             }
         }
-        vI_notificationBar.setNote(label, "get_header_notification", subtitle);
+        vI.notificationBar.setNote(label, "get_header_notification", subtitle);
     },
     
     hideExtraHeader: function() {
-        var addedHdrs = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders").split(/ /);
+        var addedHdrs = prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders").split(/ /);
         for (var index = 0; index < addedHdrs.length; index++) {
             var header_to_search_splitted=addedHdrs[index].split(/:/)
@@ -167 +168 @@
     setupEventListener: function() {
         var listener = {};
-        listener.onStartHeaders = vI_getHeader.hideExtraHeader;
-        listener.onEndHeaders   = vI_getHeader.getHeaderDummy;
+        listener.onStartHeaders = getHeader.hideExtraHeader;
+        listener.onEndHeaders   = getHeader.getHeaderDummy;
         gMessageListeners.push(listener);
 
-        vI_getHeader.messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
-        vI_getHeader.messenger = vI_getHeader.messenger.QueryInterface(Components.interfaces.nsIMessenger);
-        vI_getHeader.strings = document.getElementById("vIdentBundle");
-        
-        vI_getHeader.unicodeConverter.charset = "UTF-8";
+        getHeader.messenger = Components.classes["@mozilla.org/messenger;1"].createInstance();
+        getHeader.messenger = getHeader.messenger.QueryInterface(Components.interfaces.nsIMessenger);
+        getHeader.strings = document.getElementById("vIdentBundle");
+        
+        getHeader.unicodeConverter.charset = "UTF-8";
         
         // read headers later if msg is loaded completely - this ensures compatibility to Thunderbird Conversation
-        vI_getHeader.orig_OnMsgLoaded = OnMsgLoaded;
-        OnMsgLoaded = vI_getHeader.OnMsgLoaded;
+        getHeader.orig_OnMsgLoaded = OnMsgLoaded;
+        OnMsgLoaded = getHeader.OnMsgLoaded;
     },
     
@@ -191 +192 @@
         
         var msgHdr = neckoURL.messageHeader;
-        if (msgHdr) vI_getHeader.getHeader(msgHdr);
-        vI_getHeader.orig_OnMsgLoaded(url)
+        if (msgHdr) getHeader.getHeader(msgHdr);
+        getHeader.orig_OnMsgLoaded(url)
     }
 }
 
 
-var vI_prepareHeader = {
+var prepareHeader = {
     prefroot : Components.classes["@mozilla.org/preferences-service;1"]
             .getService(Components.interfaces.nsIPrefService)
@@ -208 +209 @@
     
     init : function() {
-        vI_prepareHeader.orig_initializeHeaderViewTables = initializeHeaderViewTables;
-        initializeHeaderViewTables = vI_prepareHeader.replacement_initializeHeaderViewTables;
-        if (vI_prepareHeader.addExtraHeader()) vI_prepareHeader.addObserver();
+        prepareHeader.orig_initializeHeaderViewTables = initializeHeaderViewTables;
+        initializeHeaderViewTables = prepareHeader.replacement_initializeHeaderViewTables;
+        if (prepareHeader.addExtraHeader()) prepareHeader.addObserver();
     },
     
     replacement_initializeHeaderViewTables : function() {
-        vI_prepareHeader.cleanup();
-        vI_notificationBar.dump("## vI_getHeader: initializeHeaderViewTables\n");
-        vI_prepareHeader.orig_initializeHeaderViewTables();
-        if (vI_prepareHeader.addExtraHeader()) vI_prepareHeader.addObserver();
+        prepareHeader.cleanup();
+        vI.notificationBar.dump("## getHeader: initializeHeaderViewTables\n");
+        prepareHeader.orig_initializeHeaderViewTables();
+        if (prepareHeader.addExtraHeader()) prepareHeader.addObserver();
     },
     
     cleanup : function() {
-        vI_prepareHeader.removeObserver();
-        vI_prepareHeader.removeExtraHeader();
+        prepareHeader.removeObserver();
+        prepareHeader.removeExtraHeader();
     },
     
     addObserver : function() {
-        if (vI_prepareHeader.observer_added) return;
-        vI_prepareHeader.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
-        vI_prepareHeader.prefroot.addObserver("extensions.virtualIdentity.smart_reply_headers", this, false);
-        vI_prepareHeader.uninstallObserver.register();
-        vI_prepareHeader.observer_added = true;
+        if (prepareHeader.observer_added) return;
+        prepareHeader.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
+        prepareHeader.prefroot.addObserver("extensions.virtualIdentity.smart_reply_headers", this, false);
+        prepareHeader.uninstallObserver.register();
+        prepareHeader.observer_added = true;
     },
     
     removeObserver : function() {
-        if (!vI_prepareHeader.observer_added) return;
-        vI_prepareHeader.prefroot.removeObserver("extensions.virtualIdentity.smart_reply_headers", this);
-        vI_prepareHeader.uninstallObserver.unregister();
-        vI_prepareHeader.observer_added = false;
+        if (!prepareHeader.observer_added) return;
+        prepareHeader.prefroot.removeObserver("extensions.virtualIdentity.smart_reply_headers", this);
+        prepareHeader.uninstallObserver.unregister();
+        prepareHeader.observer_added = false;
     },
     
     // this is a adapted copy of enigEnsureExtraHeaders() from enigmail, thanks
     addExtraHeader : function() {
-        vI_prepareHeader.unicodeConverter.charset = "UTF-8";
-        var header_list = vI_prepareHeader.unicodeConverter.ConvertToUnicode(vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_headers")).split(/\n/)
+        prepareHeader.unicodeConverter.charset = "UTF-8";
+        var header_list = prepareHeader.unicodeConverter.ConvertToUnicode(prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_headers")).split(/\n/)
         
         // add List-Id to recognizable headers to prevent using Mailing-List addresses as sender
@@ -256 +257 @@
 //      try {
             var extraHdrs = " " + 
-                vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase();
-
-            var addedHeaders = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders");
+                prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase();
+
+            var addedHeaders = prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders");
 
             for (var index = 0; index < header_list.length; index++) {
@@ -273 +274 @@
                     for (var j = 0; j < gCollapsedHeaderList.length; j++) {
                         if (gCollapsedHeaderList[j].name == headerToSearch) {
-    //                      vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gCollapsedHeaderList\n");
+    //                      vI.notificationBar.dump("## prepareHeader: Header '" + headerToSearch + "' in gCollapsedHeaderList\n");
                             found = true; break;
                         }
@@ -283 +284 @@
                 for (var j = 0; j < gExpandedHeaderList.length; j++) {
                     if (gExpandedHeaderList[j].name == headerToSearch) {
-//                      vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gExpandedHeaderList\n");
+//                      vI.notificationBar.dump("## prepareHeader: Header '" + headerToSearch + "' in gExpandedHeaderList\n");
                         found = true; break;
                     }
@@ -292 +293 @@
                     (addedHeaders.indexOf(" " + headerToSearch + " ") < 0))
                         addedHeaders += " " + headerToSearch;
-//              else vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' already in extraExpandedHeaders\n");
+//              else vI.notificationBar.dump("## prepareHeader: Header '" + headerToSearch + "' already in extraExpandedHeaders\n");
             }
             
@@ -299 +300 @@
                 extraHdrs += " " + addedHeaders;
                 extraHdrs = extraHdrs.replace(/^\s+|\s+$/g,"")
-                vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs)
-                vI_prepareHeader.prefroot.setCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders", addedHeaders)
-                vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + addedHeaders + "' added\n");
+                prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs)
+                prepareHeader.prefroot.setCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders", addedHeaders)
+                vI.notificationBar.dump("## prepareHeader: extraExpandedHeaders '" + addedHeaders + "' added\n");
             }       
 
@@ -307 +308 @@
 //      }
 //      catch (e) {
-//          vI_notificationBar.dump("## vI_prepareHeader: your application is too old, please update. Otherwise try to install mnenhy or enigmail to use additional headers.")
+//          vI.notificationBar.dump("## prepareHeader: your application is too old, please update. Otherwise try to install mnenhy or enigmail to use additional headers.")
 //          return false;
 //      }
@@ -313 +314 @@
 
     removeExtraHeader: function() {
-        vI_notificationBar.dump("## vI_prepareHeader: cleanupExtraHeader\n");
-
-        var addedHdrs = vI_prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders").split(/ /);
+        vI.notificationBar.dump("## prepareHeader: cleanupExtraHeader\n");
+
+        var addedHdrs = prepareHeader.prefroot.getCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders").split(/ /);
 
         if (addedHdrs.length > 0) {
-            var extraHdrs = vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase().split(/ /);
+            var extraHdrs = prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase().split(/ /);
         
             for (var i = 0; i < addedHdrs.length; i++) {
@@ -328 +329 @@
                 }
             }
-            vI_notificationBar.dump("## vI_prepareHeader: extraExpandedHeaders '" + addedHdrs.join(" ") + "' removed\n");
-            vI_prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs.join(" "))
-            vI_prepareHeader.prefroot.setCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders", "")
+            vI.notificationBar.dump("## prepareHeader: extraExpandedHeaders '" + addedHdrs.join(" ") + "' removed\n");
+            prepareHeader.prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", extraHdrs.join(" "))
+            prepareHeader.prefroot.setCharPref("extensions.virtualIdentity.smart_reply_added_extraHeaders", "")
         }
     },
@@ -336 +337 @@
     observe: function(subject, topic, data) {
         if (topic == "nsPref:changed") {
-            vI_prepareHeader.removeExtraHeader();
-            vI_prepareHeader.addExtraHeader();
-            vI_notificationBar.dump("## vI_prepareHeader: changed preference '" + subject + " " + topic + " " + data + "'\n");
+            prepareHeader.removeExtraHeader();
+            prepareHeader.addExtraHeader();
+            vI.notificationBar.dump("## prepareHeader: changed preference '" + subject + " " + topic + " " + data + "'\n");
             
             // remove (old) prepared headerArray
-            vI_getHeader.headerToSearch = null;
-            
-            vI_notificationBar.dump("## vI_prepareHeader: reload Message\n");
+            getHeader.headerToSearch = null;
+            
+            vI.notificationBar.dump("## prepareHeader: reload Message\n");
             MsgReload();
         }
@@ -354 +355 @@
             if (topic == "quit-application-granted") {
                 /* uninstall stuff. */
-                vI_notificationBar.dump("## vI_uninstall: uninstall/disabledment \n");
-                vI_prepareHeader.removeExtraHeader();
-                vI_notificationBar.dump("## vI_uninstall: uninstall/disablement done\n");
+                vI.notificationBar.dump("## vI.uninstall: uninstall/disabledment \n");
+                prepareHeader.removeExtraHeader();
+                vI.notificationBar.dump("## vI.uninstall: uninstall/disablement done\n");
                 this.unregister();
             }
@@ -372 +373 @@
     }
 }
-
-addEventListener('messagepane-loaded', vI_getHeader.setupEventListener, true);
-window.addEventListener("load", function(e) { vI_prepareHeader.init(); }, false);
-window.addEventListener("unload", function(e) { vI_prepareHeader.cleanup(); }, false);
-// window.addEventListener("load", initializeOverlay, false);
+addEventListener('messagepane-loaded', getHeader.setupEventListener, true);
+window.addEventListener("load", function(e) { prepareHeader.init(); }, false);
+window.addEventListener("unload", function(e) { prepareHeader.cleanup(); }, false);
+}});

chrome/content/v_identity/vI_getHeader.xul

@@ -34 +34 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_getHeader.js"/>
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>

chrome/content/v_identity/vI_helper.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_helper = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var helper = {
     // simplified versionChecker, type is "TB" or "SM"
     // returns true if appVersion is smaller or equal version
@@ -53 +54 @@
 
     extensionActive : function (extensionID) {
-    // new AddonManager uses asynchronous calls, therefore status is pre-stored in vI_upgradeOverlay.js
+    // new AddonManager uses asynchronous calls, therefore status is pre-stored in vI.upgradeOverlay.js
         try {
             var prefroot = Components.classes["@mozilla.org/preferences-service;1"]
@@ -62 +63 @@
     }
 }
+vI.helper = helper;
+}});

chrome/content/v_identity/vI_htmlTextBox.xml

@@ -44 +44 @@
             <xul:browser xbl:inherits="src=url" type="content" class="vI_htmlTextBox" hidden="true" flex="1" disablehistory="true" />
             <xul:button xbl:inherits="tooltiptext=url" label="&vI_prefDialog.openHelpInBrowserButton.label;"
-                    oncommand="vI_prefDialog.openURL(this.tooltipText); vI_prefDialog.toggleHelp();" />
+                    oncommand="virtualIdentityExtension.prefDialog.openURL(this.tooltipText); virtualIdentityExtension.prefDialog.toggleHelp();" />
         </xul:vbox>
     </content>

chrome/content/v_identity/vI_identityData.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-function vI_identityData(email, fullName, id, smtp, extras, sideDescription, existingID) {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+function identityData(email, fullName, id, smtp, extras, sideDescription, existingID) {
     this._email = email?email:"";
     this._emailParsed = false;
     this._fullName = fullName?fullName:"";
-    this.id = new vI_idObj(id);
-    this.smtp = new vI_smtpObj(smtp);
-    this.extras = extras?extras:new vI_storageExtras();
+    this.id = new idObj(id);
+    this.smtp = new smtpObj(smtp);
+    this.extras = extras?extras:new vI.storageExtras();
     this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
         compareID : null,
@@ -39 +40 @@
     this.stringBundle = document.getElementById("vIdentBundle");
 }
-vI_identityData.prototype = {
+identityData.prototype = {
     _email : null,          // internal email-field might contain combinedName (until first queried via email)
     _fullName : null,
@@ -58 +59 @@
             this._fullName += RegExp.leftContext + RegExp.rightContext;
             this._email = RegExp.lastMatch;
-//          vI_notificationBar.dump("## vI_identityData: parseEmail _fullName = '" + this._fullName + "'\n");
-//          vI_notificationBar.dump("## vI_identityData: parseEmail _email =    '" + this._email + "'\n");
+//          vI.notificationBar.dump("## identityData: parseEmail _fullName = '" + this._fullName + "'\n");
+//          vI.notificationBar.dump("## identityData: parseEmail _email =    '" + this._email + "'\n");
         }
         this._emailParsed = true;
@@ -70 +71 @@
 
     cleanName : function(fullName) {
-//      vI_notificationBar.dump("## vI_identityData: cleanName init '" + fullName + "'\n");
+//      vI.notificationBar.dump("## identityData: cleanName init '" + fullName + "'\n");
         var _fullName = fullName.replace(/^\s+|\s+$/g,"");
         if (_fullName.search(/^\".+\"$|^'.+'$/g) != -1) {
             _fullName = this.cleanName(_fullName.replace(/^\"(.+)\"$|^'(.+)'$/g,"$1$2"));
         }
-//      vI_notificationBar.dump("## vI_identityData: cleanName done '" + _fullName + "'\n");
+//      vI.notificationBar.dump("## identityData: cleanName done '" + _fullName + "'\n");
         return _fullName;
     },
@@ -105 +106 @@
     // creates an Duplicate of the current IdentityData, cause usually we are working with a pointer
     getDuplicate : function() {
-        return new vI_identityData(this.email, this.fullName, this.id.key, this.smtp.key, this.extras.getDuplicate(), this.sideDescription, this.existingID);
+        return new identityData(this.email, this.fullName, this.id.key, this.smtp.key, this.extras.getDuplicate(), this.sideDescription, this.existingID);
     },
 
@@ -120 +121 @@
     // dependent on MsgComposeCommands, should/will only be called in ComposeDialog
     isExistingIdentity : function(ignoreFullNameWhileComparing) {
-        vI_notificationBar.dump("## vI_identityData: isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n");
-//      vI_notificationBar.dump("## vI_identityData base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n");
+        vI.notificationBar.dump("## identityData: isExistingIdentity: ignoreFullNameWhileComparing='" + ignoreFullNameWhileComparing + "'\n");
+//      vI.notificationBar.dump("## identityData base: fullName.toLowerCase()='" + this.fullName + "' email.toLowerCase()='" + this.email + "' smtp='" + this.smtp.key + "'\n");
 
         var ignoreFullNameMatchKey = null;
@@ -128 +129 @@
         for (var i in accounts) {
             // skip possible active VirtualIdentity Accounts
-            try { vI_account.prefroot.getBoolPref("mail.account."+accounts[i].key+".vIdentity"); continue; } catch (e) { };
+            try { vI.account.prefroot.getBoolPref("mail.account."+accounts[i].key+".vIdentity"); continue; } catch (e) { };
     
             var identities = queryISupportsArray(accounts[i].identities, Components.interfaces.nsIMsgIdentity);
             for (var j in identities) {
-//              vI_notificationBar.dump("## vI_identityData comp: fullName.toLowerCase()='" + identities[j].fullName.toLowerCase() + "' email.toLowerCase()='" + identities[j].email.toLowerCase() + "' smtp='" + identities[j].smtpServerKey + "'\n");
+//              vI.notificationBar.dump("## identityData comp: fullName.toLowerCase()='" + identities[j].fullName.toLowerCase() + "' email.toLowerCase()='" + identities[j].email.toLowerCase() + "' smtp='" + identities[j].smtpServerKey + "'\n");
                 var email = this.email?this.email:"";               // might be null if no identity is set
                 var idEmail = identities[j].email?identities[j].email:"";   // might be null if no identity is set
                 if (    (email.toLowerCase() == idEmail.toLowerCase()) &&
-                    this.smtp.equal(new vI_smtpObj(identities[j].smtpServerKey))    ) {
+                    this.smtp.equal(new smtpObj(identities[j].smtpServerKey))   ) {
                         // if fullName matches, than this is a final match
                         if ( this.fullName.toLowerCase() == identities[j].fullName.toLowerCase() ) {
-                            vI_notificationBar.dump("## vI_identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identities[j].key + "'\n");
+                            vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + identities[j].key + "'\n");
                             return identities[j].key; // return key and stop searching
                         }
@@ -149 +150 @@
 
         if ( ignoreFullNameWhileComparing && ignoreFullNameMatchKey ) {
-            vI_notificationBar.dump("## vI_identityData: isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n");
+            vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " found, id='" + ignoreFullNameMatchKey + "'\n");
             return  ignoreFullNameMatchKey;
         }
 
-        vI_notificationBar.dump("## vI_identityData: isExistingIdentity: " + this.combinedName + " not found\n");
+        vI.notificationBar.dump("## identityData: isExistingIdentity: " + this.combinedName + " not found\n");
         return null;
     },
@@ -183 +184 @@
         const Items = Array("fullName", "email", "smtp", "id");
         var string = "";        
-        var saveBaseId = (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
-        var saveSMTP = (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true")
+        var saveBaseId = (vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
+        var saveSMTP = (vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true")
         for each (let item in Items) {
             var classEqual = (this.comp.equals[item])?"equal":"unequal";
@@ -209 +210 @@
 }
 
-function vI_identityCollection() {
+function identityCollection() {
     this.number = 0;
     this.identityDataCollection = {};
     this.menuItems = {};
 }
-vI_identityCollection.prototype =
+identityCollection.prototype =
 {
     number : null,
@@ -226 +227 @@
 
     dropIdentity : function(index) {
-        vI_notificationBar.dump("## identityCollection:   dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n");
+        vI.notificationBar.dump("## identityCollection:   dropping address from inputList: " + this.identityDataCollection[index].combinedName + "\n");
         while (index < (this.number - 1)) { this.identityDataCollection[index] = this.identityDataCollection[++index]; };
         this.identityDataCollection[--this.number] = null;
@@ -240 +241 @@
                 if (this.identityDataCollection[index].fullName == "" && identityData.fullName != "") {
                     this.identityDataCollection[index].fullName = identityData.fullName;
-                    vI_notificationBar.dump("## identityCollection:   added fullName '" + identityData.fullName
+                    vI.notificationBar.dump("## identityCollection:   added fullName '" + identityData.fullName
                         + "' to stored email '" + this.identityDataCollection[index].email +"'\n")
                 }
@@ -249 +250 @@
                     this.identityDataCollection[index].smtp.key = identityData.smtp.key;
                     this.identityDataCollection[index].extras = identityData.extras;
-                    vI_notificationBar.dump("## identityCollection:   added id '" + identityData.id.value
+                    vI.notificationBar.dump("## identityCollection:   added id '" + identityData.id.value
                         + "' smtp '" + identityData.smtp.value + "' (+extras) to stored email '" + this.identityDataCollection[index].email +"'\n")
                 }
@@ -255 +256 @@
             }
         }
-        vI_notificationBar.dump("## identityCollection:   add new address to result: " + identityData.combinedName + "\n")
+        vI.notificationBar.dump("## identityCollection:   add new address to result: " + identityData.combinedName + "\n")
         this.identityDataCollection[index] = identityData;
         this.number = index + 1;
@@ -261 +262 @@
     
     // this is used to completely use the conten of another identityCollection, but without changing all pointers
-    // see for instance vI_smartIdentity.__filterAddresses
+    // see for instance vI.smartIdentity.__filterAddresses
     takeOver : function(newIdentityCollection) {
         this.number = newIdentityCollection.number
@@ -268 +269 @@
 };
 
-const vI_DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
-const vI_NO_SMTP_TAG = "vI_noStoredSMTP"
-
-function vI_smtpObj(key) {
+const DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
+const NO_SMTP_TAG = "vI_noStoredSMTP"
+
+function smtpObj(key) {
     this._key = key;
     this.DEFAULT_TAG = document.getElementById("bundle_messenger").getString("defaultServerTag");
 }
-vI_smtpObj.prototype = {
+smtpObj.prototype = {
     DEFAULT_TAG : null,
     _key : null,
@@ -285 +286 @@
         return this._key
     },
-    get keyNice() { // the same as key but with "" for vI_DEFAULT_SMTP_TAG
-        if (this.key == vI_DEFAULT_SMTP_TAG) return ""; // this is the key used for default server
+    get keyNice() { // the same as key but with "" for DEFAULT_SMTP_TAG
+        if (this.key == DEFAULT_SMTP_TAG) return ""; // this is the key used for default server
         return this.key
     },
@@ -292 +293 @@
         if (this._value == null) {
             this._value = "";
-            if (this._key == null || this._key == "") this._key = vI_DEFAULT_SMTP_TAG;
-            if (this._key == vI_DEFAULT_SMTP_TAG) this._value = this.DEFAULT_TAG;
+            if (this._key == null || this._key == "") this._key = DEFAULT_SMTP_TAG;
+            if (this._key == DEFAULT_SMTP_TAG) this._value = this.DEFAULT_TAG;
             else if (!this._key) this._value = null;
             else if (this._key) {
@@ -308 +309 @@
             }
         }
-        if (!this._value) this._key = vI_NO_SMTP_TAG; // if non-existant SMTP handle like non available
+        if (!this._value) this._key = NO_SMTP_TAG; // if non-existant SMTP handle like non available
         return this._value;
     },
     equal : function(compareSmtpObj) {
-        if (this.key == vI_NO_SMTP_TAG || compareSmtpObj.key == vI_NO_SMTP_TAG) return true;
+        if (this.key == NO_SMTP_TAG || compareSmtpObj.key == NO_SMTP_TAG) return true;
         return (this.keyNice == compareSmtpObj.keyNice);
     },
     hasNoDefinedSMTP : function() {
-        return (this.key == vI_NO_SMTP_TAG);
-    }
-}
-
-function vI_idObj(key) { this._key = key; }
-vI_idObj.prototype = {
+        return (this.key == NO_SMTP_TAG);
+    }
+}
+
+function idObj(key) { this._key = key; }
+idObj.prototype = {
     _key : null,
     _value : null,
@@ -355 +356 @@
     }
 }
+vI.DEFAULT_SMTP_TAG = DEFAULT_SMTP_TAG;
+vI.NO_SMTP_TAG = NO_SMTP_TAG;
+vI.identityCollection = identityCollection;
+vI.identityData = identityData;
+}});

chrome/content/v_identity/vI_msgIdentityCloneTools.js

@@ -22 +22 @@
     Contributor(s): Thunderbird Developers
  * ***** END LICENSE BLOCK ***** */
-
-var vI_msgIdentityCloneTools = {    
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var msgIdentityCloneTools = {   
     copySelectedIdentity : function(id_key) {
-        vI_notificationBar.dump("## vI_msgIdentityCloneTools: copySelectedIdentity\n");
+        vI.notificationBar.dump("## msgIdentityCloneTools: copySelectedIdentity\n");
         var msgIdentityElem = document.getElementById("msgIdentity");
         var msgIdentityPopupElem = document.getElementById("msgIdentityPopup");
@@ -44 +44 @@
         try { setSecuritySettings(1); enigSetMenuSettings(''); } catch(vErr) { };
         if (!existingIdentity) {
-            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
+            vI.notificationBar.dump("## msgIdentityCloneTools: signatureSwitch hide/remove signatures\n");
             // code to hide the text signature
-            try { if (vI_main.preferences.getBoolPref("hide_signature") && ss_signature.length == 0) {
-                vI_notificationBar.dump("## vI_msgIdentityCloneTools: hide text/html signature");
+            try { if (vI.main.preferences.getBoolPref("hide_signature") && ss_signature.length == 0) {
+                vI.notificationBar.dump("## msgIdentityCloneTools: hide text/html signature");
                 ss_main.signatureSwitch()
-                vI_notificationBar.dump("\n");
-            } } catch(vErr) { vI_notificationBar.dump(" -- missing signatureSwitch extension?\n"); };
+                vI.notificationBar.dump("\n");
+            } } catch(vErr) { vI.notificationBar.dump(" -- missing signatureSwitch extension?\n"); };
             // code to hide the sMime signature
-            try { if (vI_main.preferences.getBoolPref("hide_sMime_messageSignature")) {
+            try { if (vI.main.preferences.getBoolPref("hide_sMime_messageSignature")) {
                 var element = document.getElementById("menu_securitySign1");
                 if (element.getAttribute("checked") == "true") {
-                    vI_notificationBar.dump("## signatureSwitch hide_sMime_messageSignature with doCommand\n");
+                    vI.notificationBar.dump("## signatureSwitch hide_sMime_messageSignature with doCommand\n");
                     element.doCommand();
                 }
@@ -62 +62 @@
             } catch(vErr) { };
             // code to hide the openGPG signature
-            try { if (vI_main.preferences.getBoolPref("hide_openPGP_messageSignature")) {
+            try { if (vI.main.preferences.getBoolPref("hide_openPGP_messageSignature")) {
                 var element = document.getElementById("enigmail_signed_send");
                 if (element.getAttribute("checked") == "true") {
@@ -74 +74 @@
                     }
                     if (skipChangeGPGsign)
-                        vI_notificationBar.dump("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
+                        vI.notificationBar.dump("## signatureSwitch skip hide_openPGP_messageSignature - EnigMail AlertWindow open\n");
                     else {
-                        vI_notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
+                        vI.notificationBar.dump("## signatureSwitch hide_openPGP_messageSignature with doCommand\n");
                         element.doCommand();
                     }
@@ -85 +85 @@
         }
         else {
-            vI_notificationBar.dump("## vI_msgIdentityCloneTools: signatureSwitch restore signature\n");
+            vI.notificationBar.dump("## msgIdentityCloneTools: signatureSwitch restore signature\n");
             // code to show the text signature
             try { if (ss_signature.length > 0) {
-                vI_notificationBar.dump("## vI_msgIdentityCloneTools: show text/html signature");
+                vI.notificationBar.dump("## msgIdentityCloneTools: show text/html signature");
                 ss_main.signatureSwitch()
-                vI_notificationBar.dump("\n");
-            } } catch(vErr) { vI_notificationBar.dump(" -- missing signatureSwitch extension?\n"); };
+                vI.notificationBar.dump("\n");
+            } } catch(vErr) { vI.notificationBar.dump(" -- missing signatureSwitch extension?\n"); };
             // sMime and openGPG signature will not be re-added automatically
         }
@@ -97 +97 @@
     
     initReplyTo : function() {
-        if (vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.autoReplyToSelf")) {
+        if (vI.statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.autoReplyToSelf")) {
             document.getElementById("autoReplyToSelfLabel").removeAttribute("hidden");
-            vI_msgIdentityCloneTools.removeAllReplyTos();
+            msgIdentityCloneTools.removeAllReplyTos();
         }
         else document.getElementById("autoReplyToSelfLabel").setAttribute("hidden", "true");
@@ -109 +109 @@
                 var awType = awGetPopupElement(row).selectedItem.getAttribute("value");
                 if (awType == "addr_reply") {
-                    vI_notificationBar.dump("## vI_msgIdentityCloneTools: removed ReplyTo found in row " + row + "\n");
+                    vI.notificationBar.dump("## msgIdentityCloneTools: removed ReplyTo found in row " + row + "\n");
                     awDeleteRow(row--); // removed one line therefore decrease row-value
                 }
@@ -119 +119 @@
         if (!document.getElementById("autoReplyToSelfLabel").hasAttribute("hidden")) {
             awAddRecipient("addr_reply",document.getElementById("msgIdentity_clone").label);
-            vI_notificationBar.dump("## vI_msgIdentityCloneTools: added ReplyToSelf");
+            vI.notificationBar.dump("## msgIdentityCloneTools: added ReplyToSelf");
             document.getElementById("autoReplyToSelfLabel").setAttribute("hidden","true");
         }
     }
 }
+vI.msgIdentityCloneTools = msgIdentityCloneTools;   
+}});

chrome/content/v_identity/vI_notificationBar.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_notificationBar = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var notificationBar = {
     quiet : null,
     timer : null,
@@ -43 +44 @@
     
     observe: function() {
-        var showDebugArea = vI_notificationBar.preferences.getBoolPref("debug_notification")
-        vI_notificationBar.Obj_DebugBox.setAttribute("hidden", !showDebugArea)
-        vI_notificationBar.Obj_DebugBoxSplitter.setAttribute("hidden", !showDebugArea)
-        if (vI_notificationBar.Obj_DebugBaseID) vI_notificationBar.Obj_DebugBaseID.setAttribute("base_id_key_hidden", !showDebugArea)
+        var showDebugArea = notificationBar.preferences.getBoolPref("debug_notification")
+        notificationBar.Obj_DebugBox.setAttribute("hidden", !showDebugArea)
+        notificationBar.Obj_DebugBoxSplitter.setAttribute("hidden", !showDebugArea)
+        if (notificationBar.Obj_DebugBaseID) notificationBar.Obj_DebugBaseID.setAttribute("base_id_key_hidden", !showDebugArea)
     },
     
     addObserver: function() {
-        vI_notificationBar.prefroot.addObserver("extensions.virtualIdentity.debug_notification", vI_notificationBar, false);
+        notificationBar.prefroot.addObserver("extensions.virtualIdentity.debug_notification", notificationBar, false);
     },
     
     removeObserver: function() {
-        vI_notificationBar.prefroot.removeObserver("extensions.virtualIdentity.debug_notification", vI_notificationBar);
+        notificationBar.prefroot.removeObserver("extensions.virtualIdentity.debug_notification", notificationBar);
     },
 
     init : function() {
-        vI_notificationBar.Obj_DebugBox = document.getElementById("vIDebugBox");
-        if (!vI_notificationBar.Obj_DebugBox) return false;
-        vI_notificationBar.upgrade = vI_notificationBar.Obj_DebugBox.getAttribute("upgrade")
+        notificationBar.Obj_DebugBox = document.getElementById("vIDebugBox");
+        if (!notificationBar.Obj_DebugBox) return false;
+        notificationBar.upgrade = notificationBar.Obj_DebugBox.getAttribute("upgrade")
 
         // nothing else to do for the upgrade dialog
-        if (vI_notificationBar.upgrade) return true;
+        if (notificationBar.upgrade) return true;
         
-        vI_notificationBar.Obj_vINotification = document.getElementById("vINotification");
-        vI_notificationBar.Obj_DebugBoxSplitter = document.getElementById("vIDebugBoxSplitter");
-        vI_notificationBar.Obj_DebugBaseID = document.getElementById("msgIdentity_clone");
+        notificationBar.Obj_vINotification = document.getElementById("vINotification");
+        notificationBar.Obj_DebugBoxSplitter = document.getElementById("vIDebugBoxSplitter");
+        notificationBar.Obj_DebugBaseID = document.getElementById("msgIdentity_clone");
         
-        vI_notificationBar.addObserver();
-        vI_notificationBar.observe();
-        vI_notificationBar.dump_app_version();
+        notificationBar.addObserver();
+        notificationBar.observe();
+        notificationBar.dump_app_version();
 
         return true;
@@ -77 +78 @@
     
     clear : function() {
-        if (!vI_notificationBar.Obj_vINotification) return;
-        if (vI_notificationBar.timer) window.clearTimeout(vI_notificationBar.timer);
-        vI_notificationBar.timer = null;
-        vI_notificationBar.Obj_vINotification.removeAllNotifications(true);
+        if (!notificationBar.Obj_vINotification) return;
+        if (notificationBar.timer) window.clearTimeout(notificationBar.timer);
+        notificationBar.timer = null;
+        notificationBar.Obj_vINotification.removeAllNotifications(true);
     },
     
     clear_dump : function() {
-        if (!vI_notificationBar.Obj_DebugBox) return;
-        var new_DebugBox = vI_notificationBar.Obj_DebugBox.cloneNode(false);
-        vI_notificationBar.Obj_DebugBox.parentNode.replaceChild(
-            new_DebugBox, vI_notificationBar.Obj_DebugBox);
-        vI_notificationBar.Obj_DebugBox = new_DebugBox;
-        vI_notificationBar.dump_app_version();
+        if (!notificationBar.Obj_DebugBox) return;
+        var new_DebugBox = notificationBar.Obj_DebugBox.cloneNode(false);
+        notificationBar.Obj_DebugBox.parentNode.replaceChild(
+            new_DebugBox, notificationBar.Obj_DebugBox);
+        notificationBar.Obj_DebugBox = new_DebugBox;
+        notificationBar.dump_app_version();
     },
     
@@ -114 +115 @@
             var protohandler = Components.classes["@mozilla.org/network/protocol;1?name=http"]
                 .getService(Components.interfaces.nsIHttpProtocolHandler);
-            vI_notificationBar.__dumpDebugBox(appInfo.name + " " + appInfo.version + " (" + appInfo.appBuildID + "; " + protohandler.oscpu + ")\n")
+            notificationBar.__dumpDebugBox(appInfo.name + " " + appInfo.version + " (" + appInfo.appBuildID + "; " + protohandler.oscpu + ")\n")
         }
-        else vI_notificationBar.__dumpDebugBox("mail-client seems not supported by Virtual Identity Extension")
+        else notificationBar.__dumpDebugBox("mail-client seems not supported by Virtual Identity Extension")
         
-        vI_notificationBar.__getExtensionList(vI_notificationBar.__dumpDebugBox)
+        notificationBar.__getExtensionList(notificationBar.__dumpDebugBox)
 
-//      vI_notificationBar.__dumpDebugBox(output + "\n")
+//      notificationBar.__dumpDebugBox(output + "\n")
 
-        vI_notificationBar.__dumpDebugBox("--------------------------------------------------------------------------------\n")
+        notificationBar.__dumpDebugBox("--------------------------------------------------------------------------------\n")
     },
     
     dump : function(note) {
-        if (!vI_notificationBar.Obj_DebugBox) vI_notificationBar.init()
-        if (!vI_notificationBar.preferences.getBoolPref("debug_notification") &&
-            !vI_notificationBar.upgrade) return;
-        dump(note); vI_notificationBar.__dumpDebugBox(note);
+        if (!notificationBar.Obj_DebugBox) notificationBar.init()
+        if (!notificationBar.preferences.getBoolPref("debug_notification") &&
+            !notificationBar.upgrade) return;
+        dump(note); notificationBar.__dumpDebugBox(note);
     },
 
     __dumpDebugBox : function(note) {
-        if ((!vI_notificationBar.preferences.getBoolPref("debug_notification") &&
-            !vI_notificationBar.upgrade) ||
-            vI_notificationBar.quiet) return;
-        if (!vI_notificationBar.Obj_DebugBox &&
-            !vI_notificationBar.init()) return;
+        if ((!notificationBar.preferences.getBoolPref("debug_notification") &&
+            !notificationBar.upgrade) ||
+            notificationBar.quiet) return;
+        if (!notificationBar.Obj_DebugBox &&
+            !notificationBar.init()) return;
 
         var new_text = document.createTextNode(note);
         var new_br = document.createElementNS("http://www.w3.org/1999/xhtml", 'br');
-        vI_notificationBar.Obj_DebugBox.inputField.appendChild(new_text);
-        vI_notificationBar.Obj_DebugBox.inputField.appendChild(new_br);
-        vI_notificationBar.Obj_DebugBox.inputField.scrollTop = 
-            vI_notificationBar.Obj_DebugBox.inputField.scrollHeight -
-            vI_notificationBar.Obj_DebugBox.inputField.clientHeight
+        notificationBar.Obj_DebugBox.inputField.appendChild(new_text);
+        notificationBar.Obj_DebugBox.inputField.appendChild(new_br);
+        notificationBar.Obj_DebugBox.inputField.scrollTop = 
+            notificationBar.Obj_DebugBox.inputField.scrollHeight -
+            notificationBar.Obj_DebugBox.inputField.clientHeight
     },
     
     setNote: function(note, prefstring, title) {
-        vI_notificationBar.clear();
-        vI_notificationBar.addNote(note, prefstring, title);
+        notificationBar.clear();
+        notificationBar.addNote(note, prefstring, title);
     },
 
@@ -167 +168 @@
     __setTitle: function(title) {
         if (!title) return;
-//      vI_notificationBar.dump("** setTitle: " + title + "\n");
+//      notificationBar.dump("** setTitle: " + title + "\n");
         var Obj_vINotificationTitle = document.getElementById("vINotificationTitle");
         Obj_vINotificationTitle.setAttribute("value", title);
@@ -174 +175 @@
 
     addNote: function(note, prefstring, title) {
-//      vI_notificationBar.dump("** " + note + "\n\n");
-        if (!vI_notificationBar.preferences.getBoolPref(prefstring)) return;
-        if (!vI_notificationBar.Obj_vINotification) vI_notificationBar.init();
-        if (!vI_notificationBar.Obj_vINotification) return;
-        var oldNotification = vI_notificationBar.Obj_vINotification.currentNotification
+//      notificationBar.dump("** " + note + "\n\n");
+        if (!notificationBar.preferences.getBoolPref(prefstring)) return;
+        if (!notificationBar.Obj_vINotification) notificationBar.init();
+        if (!notificationBar.Obj_vINotification) return;
+        var oldNotification = notificationBar.Obj_vINotification.currentNotification
         var newLabel = (oldNotification)?oldNotification.label + note:note;
-        vI_notificationBar.clear();
-        vI_notificationBar.Obj_vINotification
+        notificationBar.clear();
+        notificationBar.Obj_vINotification
                 .appendNotification(newLabel, "", "chrome://messenger/skin/icons/flag.png");
-        vI_notificationBar.__setTitle(title);
+        notificationBar.__setTitle(title);
 
-        if (vI_notificationBar.preferences.getIntPref("notification_timeout") != 0)
-            vI_notificationBar.timer = window.setTimeout(vI_notificationBar.clear,
-                vI_notificationBar.preferences.getIntPref("notification_timeout") * 1000);
+        if (notificationBar.preferences.getIntPref("notification_timeout") != 0)
+            notificationBar.timer = window.setTimeout(virtualIdentityExtension.notificationBar.clear,
+                notificationBar.preferences.getIntPref("notification_timeout") * 1000);
     }
 }
-window.addEventListener("unload", function(e) { try {vI_notificationBar.removeObserver();} catch (ex) { } }, false);
+window.addEventListener("unload", function(e) { try {notificationBar.removeObserver();} catch (ex) { } }, false);
+vI.notificationBar = notificationBar;   
+}});

chrome/content/v_identity/vI_notificationBar.xml

@@ -38 +38 @@
             xbl:inherits="value=label"
             DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"
-            onoverflow="vI_notificationBar.overflow(this);" oncontextmenu="" />
+            onoverflow="virtualIdentityExtension.notificationBar.overflow(this);" oncontextmenu="" />
           <children/>
         </xul:hbox>

chrome/content/v_identity/vI_prefDialog.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_prefDialog = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var prefDialog = {
     toggleHelp : function() {
         var browserElem = document.getElementById("vI_remoteBrowserBox");
@@ -33 +34 @@
             browserElem.setAttribute("hidden", "true");
         }
-        vI_prefDialog.updateHelpUrl();
+        prefDialog.updateHelpUrl();
     },
 
@@ -121 +122 @@
         init : function() {
         // initialize the default window values...
-            for( var i = 0; i < vI_prefDialog.base._elementIDs.length; i++ ) {
-                var elementID = vI_prefDialog.base._elementIDs[i];
+            for( var i = 0; i < prefDialog.base._elementIDs.length; i++ ) {
+                var elementID = prefDialog.base._elementIDs[i];
                 var element = document.getElementById(elementID);
                 if (!element) break;
@@ -129 +130 @@
                     if (eltType == "radiogroup")
                         element.selectedItem = element.childNodes[
-                            vI_prefDialog.preferences.getIntPref(element.getAttribute("prefstring"))];
+                            prefDialog.preferences.getIntPref(element.getAttribute("prefstring"))];
                     else if (eltType == "checkbox")
                         element.checked = 
-                            vI_prefDialog.preferences.getBoolPref(element.getAttribute("prefstring"));
+                            prefDialog.preferences.getBoolPref(element.getAttribute("prefstring"));
                     else if (eltType == "textbox")
                         if (element.getAttribute("preftype") == "int")
                             element.setAttribute("value", 
-                            vI_prefDialog.preferences.getIntPref(element.getAttribute("prefstring")) );
+                            prefDialog.preferences.getIntPref(element.getAttribute("prefstring")) );
                         else {
                             element.setAttribute("value", 
-                            vI_prefDialog.unicodeConverter.ConvertToUnicode(vI_prefDialog.preferences.getCharPref(element.getAttribute("prefstring"))) );
+                            prefDialog.unicodeConverter.ConvertToUnicode(prefDialog.preferences.getCharPref(element.getAttribute("prefstring"))) );
 //                          alert(element.getAttribute("prefstring") + " " + element.getAttribute("value"))
                         }
                     else if (eltType == "listbox")
                         element.value =
-                            vI_prefDialog.preferences.getCharPref(element.getAttribute("prefstring"));
+                            prefDialog.preferences.getCharPref(element.getAttribute("prefstring"));
 //              } catch (ex) {}
             }
@@ -150 +151 @@
 
         savePrefs : function() {
-            for( var i = 0; i < vI_prefDialog.base._elementIDs.length; i++ ) {
-                var elementID = vI_prefDialog.base._elementIDs[i];
+            for( var i = 0; i < prefDialog.base._elementIDs.length; i++ ) {
+                var elementID = prefDialog.base._elementIDs[i];
                 var element = document.getElementById(elementID);
                 if (!element) break;
                 var eltType = element.localName;
                 if (eltType == "radiogroup")
-                    vI_prefDialog.preferences.setIntPref(
+                    prefDialog.preferences.setIntPref(
                         element.getAttribute("prefstring"), parseInt(element.value));
                 else if (eltType == "checkbox")
-                    vI_prefDialog.preferences.setBoolPref(
+                    prefDialog.preferences.setBoolPref(
                         element.getAttribute("prefstring"), element.checked);
                 else if (eltType == "textbox") {
                     if (element.getAttribute("preftype") == "int")
-                        vI_prefDialog.preferences.setIntPref(
+                        prefDialog.preferences.setIntPref(
                             element.getAttribute("prefstring"), element.value);
-                    else vI_prefDialog.preferences.setCharPref(
-                            element.getAttribute("prefstring"), vI_prefDialog.unicodeConverter.ConvertFromUnicode(element.value));
+                    else prefDialog.preferences.setCharPref(
+                            element.getAttribute("prefstring"), prefDialog.unicodeConverter.ConvertFromUnicode(element.value));
                 }
                 else if (eltType == "listbox")
-                    vI_prefDialog.preferences.setCharPref(element.getAttribute("prefstring"), element.value);
+                    prefDialog.preferences.setCharPref(element.getAttribute("prefstring"), element.value);
             }
         },
@@ -182 +183 @@
             var smartDraft = document.getElementById("VIdent_identity.smart_draft").checked;
             var smartReply = document.getElementById("VIdent_identity.smart_reply").checked;
-            var mAttr = vI_prefDialog.base.modifyAttribute;
+            var mAttr = prefDialog.base.modifyAttribute;
 
             // idSelectionConstraint
@@ -198 +199 @@
             mAttr("VIdent_identity.idSelection_storage_prefer_smart_reply","disabled",idSelectionInputConstraint);
             mAttr("VIdent_identity.idSelection_storage_ignore_smart_reply","disabled",idSelectionInputConstraint);
-            if (idSelectionInputConstraint) vI_prefDialog.base.idSelectionResultConstraint();
+            if (idSelectionInputConstraint) prefDialog.base.idSelectionResultConstraint();
 
             // sourceEmailConstraint
@@ -219 +220 @@
 
         smartReplyConstraint : function(element) {
-            var mAttr = vI_prefDialog.base.modifyAttribute;
+            var mAttr = prefDialog.base.modifyAttribute;
             mAttr("VIdent_identity.smart_reply_for_newsgroups","disabled",element.checked);
             mAttr("VIdent_identity.smart_reply_headers","disabled",element.checked);
@@ -227 +228 @@
             mAttr("VIdent_identity.smart_reply_headers_reset","disabled",element.checked);
             mAttr("VIdent_identity.smart_detectByReceivedHeader","disabled",element.checked);
-            vI_prefDialog.base.constraints();
+            prefDialog.base.constraints();
         },
         
@@ -237 +238 @@
         smartReplyHideSignature : function() {
             const switch_signature_ID="{2ab1b709-ba03-4361-abf9-c50b964ff75d}"
-            if (vI_helper.extensionActive(switch_signature_ID)) {
+            if (vI.helper.extensionActive(switch_signature_ID)) {
                 document.getElementById("VIdent_identity.HideSignature.warning").setAttribute("hidden", "true");
                 document.getElementById("VIdent_identity.hide_signature").setAttribute("disabled", "false");
@@ -244 +245 @@
         
         autoTimestampConstraint : function(element) {
-            var mAttr = vI_prefDialog.base.modifyAttribute;
+            var mAttr = prefDialog.base.modifyAttribute;
             mAttr("VIdent_identity.autoTimestamp.options","hidden",element.checked);
         },
         
         storageConstraint : function(element) {
-            var mAttr = vI_prefDialog.base.modifyAttribute;
+            var mAttr = prefDialog.base.modifyAttribute;
             mAttr("VIdent_identity.storage_storedefault","disabled",element.checked);
             mAttr("VIdent_identity.storage_store_base_id","disabled",element.checked);
@@ -274 +275 @@
             mAttr("storageUp","featureDisabled",element.checked);
             mAttr("storageUpDown","featureDisabled",element.checked);
-            vI_prefDialog.base.constraints();
+            prefDialog.base.constraints();
         },
 
         menuButtonConstraints : function(elem) {
-            var mAttr = vI_prefDialog.base.modifyAttribute;
+            var mAttr = prefDialog.base.modifyAttribute;
             var valueParam = (document.getElementById("viewGroup").getAttribute("hidden") == "true");   // true -> removeAttribute
             var dialogElem = document.getElementById("vI_prefDialog");
@@ -287 +288 @@
 
         flipMenuButtons : function(elem) {
-            var mAttr = vI_prefDialog.base.modifyAttribute;
+            var mAttr = prefDialog.base.modifyAttribute;
             var valueParam = (elem.getAttribute("open") == "true");
             var dialogElem = document.getElementById("vI_prefDialog");
@@ -304 +305 @@
 
     init : function() {
-        vI_prefDialog.unicodeConverter.charset="UTF-8";
-        vI_prefDialog.base.init();
-        onInitCopiesAndFolders()
+        prefDialog.unicodeConverter.charset="UTF-8";
+        prefDialog.base.init();
+        vI.onInitCopiesAndFolders()
 
         const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
-        if (!vI_helper.extensionActive(enigmail_ID)) {
+        if (!vI.helper.extensionActive(enigmail_ID)) {
             document.getElementById("openPGPencryption").setAttribute("hidden", "true");
             document.getElementById("VIdent_identity.hide_openPGP_messageSignature").setAttribute("hidden", "true");
         }
         
-        vI_prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
-        vI_prefDialog.base.smartReplyHideSignature();
-        vI_prefDialog.base.storageConstraint(document.getElementById("VIdent_identity.storage"));
-        vI_prefDialog.base.autoTimestampConstraint(document.getElementById("VIdent_identity.autoTimestamp"));
-        vI_prefDialog.base.constraints();
-        vI_prefDialog.base.menuButtonConstraints();
-        vI_prefDialog.base.initTreeValues();
+        prefDialog.base.smartReplyConstraint(document.getElementById("VIdent_identity.smart_reply"));
+        prefDialog.base.smartReplyHideSignature();
+        prefDialog.base.storageConstraint(document.getElementById("VIdent_identity.storage"));
+        prefDialog.base.autoTimestampConstraint(document.getElementById("VIdent_identity.autoTimestamp"));
+        prefDialog.base.constraints();
+        prefDialog.base.menuButtonConstraints();
+        prefDialog.base.initTreeValues();
 
     },
@@ -326 +327 @@
     savePrefs : function() {
         // Copy all changes to Elements
-        onSaveCopiesAndFolders();
-        vI_prefDialog.base.savePrefs();
+        vI.onSaveCopiesAndFolders();
+        prefDialog.base.savePrefs();
     },
 
@@ -338 +339 @@
         }
 }
+vI.prefDialog = prefDialog;
+}});

chrome/content/v_identity/vI_prefDialog.xml

@@ -33 +33 @@
     <constructor>
         <![CDATA[
-        if (vI_notificationBar) vI_notificationBar.dump("## identitySelector: constructor\n");
+        with (virtualIdentityExtension.LIB) { 
+        if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: constructor\n");
         var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
             .getService(Components.interfaces.nsIMsgAccountManager);
-        var debugNotes = vI_prefDialog.preferences.getBoolPref("debug_notification");
+        var debugNotes = vI.prefDialog.preferences.getBoolPref("debug_notification");
 
         for (let i = AccountManager.accounts.Count() - 1; i >= 0 ; i--) {
@@ -55 +56 @@
         if (debugNotes)
             document.getAnonymousElementByAttribute(this, "id", "ignoreIDs_debug").removeAttribute("hidden")
+        }
         ]]>
     </constructor>
     <property name="value" >
         <setter><![CDATA[
-        if (vI_notificationBar) vI_notificationBar.dump("## identitySelector: setting value to '" + val + "'\n");
+        with (virtualIdentityExtension.LIB) { 
+        if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: setting value to '" + val + "'\n");
         var listItems = this.childNodes;
         for (var index = 0; index < listItems.length; index++) {
             var key = listItems[index].getAttribute("value");
             listItems[index].checked = (val.indexOf(":" + key + ":") == -1);
-            if (vI_notificationBar) vI_notificationBar.dump("## identitySelector: setting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n")
+            if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: setting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n")
         }
         this._value = val;
+        }
         ]]></setter>
         <getter><![CDATA[
-        if (vI_notificationBar) vI_notificationBar.dump("## identitySelector: getting value\n");
+        with (virtualIdentityExtension.LIB) { 
+        if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: getting value\n");
         var returnVal = "";
         var listItems = this.childNodes;
         for (var index = 0; index < listItems.length; index++) {
-            if (vI_notificationBar) vI_notificationBar.dump("## identitySelector: getting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: getting value, '" + listItems[index].getAttribute("value") + "' '" + listItems[index].checked + "' '" + listItems[index].getAttribute("checked") + "'\n");
             if (!listItems[index].checked) returnVal += " :" + listItems[index].getAttribute("value") + ": "
         }
-        if (vI_notificationBar) vI_notificationBar.dump("## identitySelector: getting value, result '" + returnVal + "'\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## identitySelector: getting value, result '" + returnVal + "'\n");
         return returnVal;
+        }
         ]]></getter>        
     </property>

chrome/content/v_identity/vI_prefDialog.xul

@@ -80 +80 @@
     <hbox>
     <vbox>
-        <image id="toggleIcon" class="addresstwisty" onclick="vI_prefDialog.base.flipMenuButtons(this);" open="true" persist="open" />
+        <image id="toggleIcon" class="addresstwisty" onclick="virtualIdentityExtension.prefDialog.base.flipMenuButtons(this);" open="true" persist="open" />
         <spacer flex="1" />
     </vbox>
@@ -88 +88 @@
         <hbox>
             <radio pane="source" id="sourceEmail"
-                oncommand="document.getElementById('prefTabbox').selectedIndex = 0; vI_prefDialog.updateHelpUrl();" 
+                oncommand="document.getElementById('prefTabbox').selectedIndex = 0; virtualIdentityExtension.prefDialog.updateHelpUrl();" 
                 tooltiptext="&vI_prefDialog.tabbox.tab0.label;" />
             <vbox><spacer flex="1"/><image class="arrow" id="toSelection" /><spacer flex="1"/></vbox>
             <radio pane="source" id="selection"
-                oncommand="document.getElementById('prefTabbox').selectedIndex = 1; vI_prefDialog.updateHelpUrl();"
+                oncommand="document.getElementById('prefTabbox').selectedIndex = 1; virtualIdentityExtension.prefDialog.updateHelpUrl();"
                 tooltiptext="&vI_prefDialog.tabbox.tab1.label;" />
             <vbox><spacer flex="1"/><image class="arrow" id="toCompose" /><spacer flex="1"/></vbox>
             <radio pane="source" id="composeDialog"
-                oncommand="document.getElementById('prefTabbox').selectedIndex = 2; vI_prefDialog.updateHelpUrl();"
+                oncommand="document.getElementById('prefTabbox').selectedIndex = 2; virtualIdentityExtension.prefDialog.updateHelpUrl();"
                 tooltiptext="&vI_prefDialog.tabbox.tab2.label;" />
             <vbox><spacer flex="1"/><image class="arrow" id="toSend" /><spacer flex="1"/></vbox>
             <radio pane="source" id="emailOut"
-                oncommand="document.getElementById('prefTabbox').selectedIndex = 3; vI_prefDialog.updateHelpUrl();"
+                oncommand="document.getElementById('prefTabbox').selectedIndex = 3; virtualIdentityExtension.prefDialog.updateHelpUrl();"
                 tooltiptext="&vI_prefDialog.tabbox.tab3.label;" />
         </hbox>
@@ -108 +108 @@
             <vbox><spacer flex="1"/><image class="arrow" id="storageUp" /><spacer flex="1"/></vbox>
             <radio pane="source" id="storageOut" 
-                oncommand="document.getElementById('prefTabbox').selectedIndex = 4; vI_prefDialog.updateHelpUrl();"
+                oncommand="document.getElementById('prefTabbox').selectedIndex = 4; virtualIdentityExtension.prefDialog.updateHelpUrl();"
                 tooltiptext="&vI_prefDialog.tabbox.tab4.label;" />
             <vbox><spacer flex="1"/><image class="arrow" id="storageUpDown" /><spacer flex="1"/></vbox>
@@ -118 +118 @@
             <spacer flex="1"/>
             <hbox><spacer flex="1"/><radio pane="source" id="options"
-                oncommand="document.getElementById('prefTabbox').selectedIndex = 5; vI_prefDialog.updateHelpUrl();"
+                oncommand="document.getElementById('prefTabbox').selectedIndex = 5; virtualIdentityExtension.prefDialog.updateHelpUrl();"
                 tooltiptext="&vI_prefDialog.tabbox.tab5.label;" />
             </hbox>
@@ -124 +124 @@
             <button id="logoButton1" class="v_identity_logo v_identity_logo_button"
                 label="&vident.vidLogo.label; &vident.version;"
-                oncommand="vI_prefDialog.openURL('http://www.absorb.it/virtual-id')"
+                oncommand="virtualIdentityExtension.prefDialog.openURL('http://www.absorb.it/virtual-id')"
                 tooltiptext="&vI_prefDialog.vidLogo.tooltiptext;" />
         </vbox>
@@ -131 +131 @@
     <hbox>
         <tabs>
-            <tab label="&vI_prefDialog.tabbox.tab0.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 0; vI_prefDialog.updateHelpUrl(0);"/>
-            <tab label="&vI_prefDialog.tabbox.tab1.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 1; vI_prefDialog.updateHelpUrl(1);"/>
-            <tab label="&vI_prefDialog.tabbox.tab2.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 2; vI_prefDialog.updateHelpUrl(2);"/>
-            <tab label="&vI_prefDialog.tabbox.tab3.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 3; vI_prefDialog.updateHelpUrl(3);"/>
-            <tab label="&vI_prefDialog.tabbox.tab4.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 4; vI_prefDialog.updateHelpUrl(4);"/>
-            <tab label="&vI_prefDialog.tabbox.tab5.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 5; vI_prefDialog.updateHelpUrl(5);"/>
+            <tab label="&vI_prefDialog.tabbox.tab0.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 0; virtualIdentityExtension.prefDialog.updateHelpUrl(0);"/>
+            <tab label="&vI_prefDialog.tabbox.tab1.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 1; virtualIdentityExtension.prefDialog.updateHelpUrl(1);"/>
+            <tab label="&vI_prefDialog.tabbox.tab2.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 2; virtualIdentityExtension.prefDialog.updateHelpUrl(2);"/>
+            <tab label="&vI_prefDialog.tabbox.tab3.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 3; virtualIdentityExtension.prefDialog.updateHelpUrl(3);"/>
+            <tab label="&vI_prefDialog.tabbox.tab4.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 4; virtualIdentityExtension.prefDialog.updateHelpUrl(4);"/>
+            <tab label="&vI_prefDialog.tabbox.tab5.label;" oncommand="document.getElementById('viewGroup').selectedIndex = 5; virtualIdentityExtension.prefDialog.updateHelpUrl(5);"/>
         </tabs>
         <spacer flex="1" />
         <button id="logoButton2" class="v_identity_logo v_identity_logo_button"
                 label="&vident.vidLogo.label; &vident.version;"
-                oncommand="vI_prefDialog.openURL('http://www.absorb.it/virtual-id')"
+                oncommand="virtualIdentityExtension.prefDialogopenURL('http://www.absorb.it/virtual-id')"
                 tooltiptext="&vI_prefDialog.vidLogo.tooltiptext;" hidden="true" />
     </hbox>
@@ -147 +147 @@
     <tabpanel orient="vertical" >
         <hbox flex="1">
-        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; vI_prefDialog.updateHelpUrl();"
+        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; virtualIdentityExtension.prefDialog.updateHelpUrl();"
             hidecolumnpicker="true" hidehscroll="true" >
         <treecols orient="vertical"><treecol flex="1" hideheader="true" primary="true"/></treecols>
@@ -175 +175 @@
                 <checkbox id="VIdent_identity.smart_draft" label="&vI_prefDialog.smartDraft.label;"
                     tooltiptext="&vI_prefDialog.smartDraft.tooltiptext;" prefstring="smart_draft"
-                    oncommand="vI_prefDialog.base.constraints();" />
+                    oncommand="virtualIdentityExtension.prefDialogbase.constraints();" />
                 </groupbox>
                 <groupbox>
@@ -181 +181 @@
                 <checkbox id="VIdent_identity.smart_reply" label="&vI_prefDialog.smartReply.label;"
                     tooltiptext="&vI_prefDialog.smartReply.tooltiptext;" prefstring="smart_reply"
-                    oncommand="vI_prefDialog.base.smartReplyConstraint(this);" />
+                    oncommand="virtualIdentityExtension.prefDialogbase.smartReplyConstraint(this);" />
                 <hbox><spacer class="widthS"/>
                     <vbox>
@@ -201 +201 @@
                     <vbox><description class="widthX">&vI_prefDialog.smartReply.headers.desc;</description>
                     <spacer flex="1"/>
-                    <button id="VIdent_identity.smart_reply_headers_reset" label="&vI_prefDialog.smartReply.headers.reset;" oncommand="vI_prefDialog.base.smartReplyHeaderReset();"/>
+                    <button id="VIdent_identity.smart_reply_headers_reset" label="&vI_prefDialog.smartReply.headers.reset;" oncommand="virtualIdentityExtension.prefDialogbase.smartReplyHeaderReset();"/>
                     </vbox>
                     <textbox id="VIdent_identity.smart_reply_headers" multiline="true"
@@ -246 +246 @@
     <tabpanel orient="vertical" >
         <hbox flex="1">
-        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; vI_prefDialog.updateHelpUrl();"
+        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; virtualIdentityExtension.prefDialog.updateHelpUrl();"
             hidecolumnpicker="true" hidehscroll="true">
         <treecols orient="vertical"><treecol flex="1" hideheader="true" primary="true" /></treecols>
@@ -300 +300 @@
                     <checkbox id="VIdent_identity.idSelection_ask" label="&vI_prefDialog.idSelection.ask.label;"
                         prefstring="idSelection_ask"
-                        oncommand="vI_prefDialog.base.idSelectionResultConstraint();"/>
+                        oncommand="virtualIdentityExtension.prefDialogbase.idSelectionResultConstraint();"/>
                     <hbox><spacer class="widthS"/><checkbox id="VIdent_identity.idSelection_ask_always" label="&vI_prefDialog.idSelection.ask_always.label;"
                         prefstring="idSelection_ask_always"
-                        oncommand="vI_prefDialog.base.idSelectionResultConstraint();"/>
+                        oncommand="virtualIdentityExtension.prefDialogbase.idSelectionResultConstraint();"/>
                     </hbox>
                     <checkbox id="VIdent_identity.idSelection_autocreate" label="&vI_prefDialog.idSelection.autocreate.label;"
                         prefstring="idSelection_autocreate"
-                        oncommand="vI_prefDialog.base.idSelectionResultConstraint();"/>
+                        oncommand="virtualIdentityExtension.prefDialogbase.idSelectionResultConstraint();"/>
 
                     <hbox><spacer class="widthS"/><label value="&vI_prefDialog.idSelection.autocreate.desc;" hidden="true"
@@ -325 +325 @@
     <tabpanel orient="vertical" >
         <hbox flex="1">
-        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; vI_prefDialog.updateHelpUrl();"
+        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; virtualIdentityExtension.prefDialog.updateHelpUrl();"
             hidecolumnpicker="true" hidehscroll="true">
         <treecols orient="vertical"><treecol flex="1" hideheader="true" primary="true" /></treecols>
@@ -344 +344 @@
                 <caption label="&vI_prefDialog.composeDialog.caption;"/>
                     <checkbox id="VIdent_identity.autoTimestamp" label="&vI_prefDialog.composeDialog.autoTimestamp.label;"
-                        tooltiptext="&vI_prefDialog.composeDialog.autoTimestamp.tooltiptext;" prefstring="autoTimestamp" oncommand="vI_prefDialog.base.autoTimestampConstraint(this);"/>
+                        tooltiptext="&vI_prefDialog.composeDialog.autoTimestamp.tooltiptext;" prefstring="autoTimestamp" oncommand="virtualIdentityExtension.prefDialogbase.autoTimestampConstraint(this);"/>
                     <hbox id="VIdent_identity.autoTimestamp.options" hidden="true"><spacer class="widthS"/>
                         <vbox>
@@ -396 +396 @@
     <tabpanel orient="vertical" >
         <hbox flex="1">
-        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; vI_prefDialog.updateHelpUrl();"
+        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; virtualIdentityExtension.prefDialog.updateHelpUrl();"
             hidecolumnpicker="true" hidehscroll="true" >
         <treecols orient="vertical"><treecol flex="1" hideheader="true" primary="true"/></treecols>
@@ -563 +563 @@
     <tabpanel orient="vertical" >
         <hbox flex="1">
-        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; vI_prefDialog.updateHelpUrl();"
+        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; virtualIdentityExtension.prefDialog.updateHelpUrl();"
             hidecolumnpicker="true" hidehscroll="true">
         <treecols orient="vertical">
@@ -592 +592 @@
                 <checkbox id="VIdent_identity.storage" label="&vI_prefDialog.storage.label;"
                     tooltiptext="&vI_prefDialog.storage.tooltiptext;" prefstring="storage"
-                    oncommand="vI_prefDialog.base.storageConstraint(this);" />
+                    oncommand="virtualIdentityExtension.prefDialogbase.storageConstraint(this);" />
                 <spacer class="paragraph"/>
                 <button id="VIdent_identity.storage.openEditor" label="&vI_prefDialog.storage.openEditor;" oncommand="openDialog('chrome://v_identity/content/vI_rdfDataTree.xul', '', 'chrome, dialog, resizable=yes');" />
-                <button id="VIdent_identity.storage.import" label="&vI_prefDialog.storage.import;" oncommand="var vI_localRdfDatasource = new vI_rdfDatasourceImporter('virtualIdentity.rdf');" />
-                <button id="VIdent_identity.storage.export" label="&vI_prefDialog.storage.export;" oncommand="var vI_localRdfDatasource = new vI_rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')" />
+                <button id="VIdent_identity.storage.import" label="&vI_prefDialog.storage.import;" oncommand="var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasourceImporter('virtualIdentity.rdf');" />
+                <button id="VIdent_identity.storage.export" label="&vI_prefDialog.storage.export;" oncommand="var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')" />
                 </groupbox>
             </tabpanel>
@@ -677 +677 @@
     <tabpanel orient="vertical" >
         <hbox flex="1">
-        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; vI_prefDialog.updateHelpUrl();"
+        <tree class="vIprefTree" seltype="single" onselect="this.nextSibling.selectedIndex = this.currentIndex; virtualIdentityExtension.prefDialog.updateHelpUrl();"
             hidecolumnpicker="true" hidehscroll="true">
         <treecols orient="vertical">

chrome/content/v_identity/vI_prefDialog_FolderPicker.js

@@ -43 +43 @@
  * ***** END LICENSE BLOCK ***** */
 
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+
 var gFccRadioElemChoice, gDraftsRadioElemChoice, gTmplRadioElemChoice;
 var gFccRadioElemChoiceLocked, gDraftsRadioElemChoiceLocked, gTmplRadioElemChoiceLocked;
@@ -156 +158 @@
     // For POP3 accounts, special folders are created at the account creation time.
     var msgFolder = GetMsgFolderFromUri(uri, false);
-    InitFolderDisplays(msgFolder, accountPickerId, folderPickerId)
+    vI.InitFolderDisplays(msgFolder, accountPickerId, folderPickerId)
 
     switch (pickerMode) 
@@ -210 +212 @@
 function onSaveCopiesAndFolders()
 {
-    SaveFolderSettings( gFccRadioElemChoice, 
+    vI.SaveFolderSettings( gFccRadioElemChoice, 
                         "doFcc",
                         gFccFolderWithDelim, 
@@ -218 +220 @@
                         "VIdent_identity.fccFolderPickerMode" );
 
-    SaveFolderSettings( gDraftsRadioElemChoice, 
+    vI.SaveFolderSettings( gDraftsRadioElemChoice, 
                         "messageDrafts",
                         gDraftsFolderWithDelim, 
@@ -226 +228 @@
                         "VIdent_identity.draftFolderPickerMode" );
 
-    SaveFolderSettings( gTmplRadioElemChoice,
+    vI.SaveFolderSettings( gTmplRadioElemChoice,
                         "messageTemplates",
                         gTemplatesFolderWithDelim, 
@@ -337 +339 @@
     activeRadioElem.radioGroup.selectedItem = activeRadioElem;
 }
+vI.onInitCopiesAndFolders = onInitCopiesAndFolders;
+vI.onSaveCopiesAndFolders = onSaveCopiesAndFolders;
+}});

chrome/content/v_identity/vI_prefDialog_TB3.xul

@@ -24 +24 @@
    - ***** END LICENSE BLOCK ***** -->
 
+<?xul-overlay href="chrome://v_identity/content/vI_prefDialog_TB3FolderPicker.xul"?>
 <?xul-overlay href="chrome://v_identity/content/vI_prefDialog.xul"?>
-<?xul-overlay href="chrome://v_identity/content/vI_prefDialog_TB3FolderPicker.xul"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://v_identity/locale/vI_prefDialog.dtd">
@@ -31 +31 @@
 <dialog id="vI_prefDialog"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload="vI_prefDialog.init();"
+        onload="virtualIdentityExtension.prefDialog.init();"
         buttons="accept,cancel,help"
-        ondialogaccept="vI_prefDialog.savePrefs();"
-    ondialoghelp="vI_prefDialog.toggleHelp();"
-    buttonlabelhelp="&vI_prefDialog.dlgHelpButton.label;"
+        ondialogaccept="virtualIdentityExtension.prefDialog.savePrefs();"
+        ondialoghelp="virtualIdentityExtension.prefDialog.toggleHelp();"
+        buttonlabelhelp="&vI_prefDialog.dlgHelpButton.label;"
         persist="screenX screenY"
             title="&vI_prefDialog.dlgTitle.label;" >
         
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
+        <script type="application/x-javascript"
+            src="chrome://v_identity/content/vI_prefDialog_FolderPicker.js" />
         <script type="application/x-javascript"
             src="chrome://v_identity/content/vI_prefDialog.js" />
-        <script type="application/x-javascript"
-            src="chrome://v_identity/content/vI_prefDialog_FolderPicker.js" />
         <script type="application/x-javascript"
             src="chrome://v_identity/content/vI_helper.js" />

chrome/content/v_identity/vI_prefDialog_TB3FolderPicker.js

@@ -42 +42 @@
  *
  * ***** END LICENSE BLOCK ***** */
+
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
 
 function InitFolderDisplays(msgFolder, accountPickerId, folderPickerId) {
@@ -123 +125 @@
     formElement.setAttribute("value", radioElemChoice);
 }
+vI.InitFolderDisplays = InitFolderDisplays;
+vI.SaveFolderSettings = SaveFolderSettings;
+}});

chrome/content/v_identity/vI_rdfAccountMismatchDialog.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_rdfAccountMismatchDialog = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var rdfAccountMismatchDialog = {
     mismatchItems : null,
     type : null,
 
     init : function() { 
-        vI_rdfAccountMismatchDialog.type = window.arguments[0];
-        vI_rdfAccountMismatchDialog.mismatchItems = window.arguments[1];
+        rdfAccountMismatchDialog.type = window.arguments[0];
+        rdfAccountMismatchDialog.mismatchItems = window.arguments[1];
         
         // display the relevant help-tags
-        document.getElementById("rdfAccountMismatchDialog_vbox_" + vI_rdfAccountMismatchDialog.type).removeAttribute("hidden");
-        document.getElementById("rdfAccountMismatchDialog_listhead_" + vI_rdfAccountMismatchDialog.type).removeAttribute("hidden");
+        document.getElementById("rdfAccountMismatchDialog_vbox_" + rdfAccountMismatchDialog.type).removeAttribute("hidden");
+        document.getElementById("rdfAccountMismatchDialog_listhead_" + rdfAccountMismatchDialog.type).removeAttribute("hidden");
         
-        for (var i = 0; i < vI_rdfAccountMismatchDialog.mismatchItems.length; i++) {
+        for (var i = 0; i < rdfAccountMismatchDialog.mismatchItems.length; i++) {
 //             var label = document.createElement("label");
             var listitem = document.createElement("listitem");
             listitem.setAttribute("id", "mismatchLine_" + i);
             listitem.setAttribute("class", "mismatchLine");
-            listitem.setAttribute("type",vI_rdfAccountMismatchDialog.type);
-            listitem.setAttribute("oldkey",vI_rdfAccountMismatchDialog.mismatchItems[i].oldkey);
-            listitem.setAttribute("label",vI_rdfAccountMismatchDialog.mismatchItems[i].label);
-            listitem.setAttribute("ext1",vI_rdfAccountMismatchDialog.mismatchItems[i].ext1);
-            listitem.setAttribute("ext2",vI_rdfAccountMismatchDialog.mismatchItems[i].ext2);
-            listitem.setAttribute("count",vI_rdfAccountMismatchDialog.mismatchItems[i].count);
+            listitem.setAttribute("type",rdfAccountMismatchDialog.type);
+            listitem.setAttribute("oldkey",rdfAccountMismatchDialog.mismatchItems[i].oldkey);
+            listitem.setAttribute("label",rdfAccountMismatchDialog.mismatchItems[i].label);
+            listitem.setAttribute("ext1",rdfAccountMismatchDialog.mismatchItems[i].ext1);
+            listitem.setAttribute("ext2",rdfAccountMismatchDialog.mismatchItems[i].ext2);
+            listitem.setAttribute("count",rdfAccountMismatchDialog.mismatchItems[i].count);
             document.getElementById("rdfAccountMismatchDialog_listbox").appendChild(listitem)
         }
@@ -51 +52 @@
 
     accept : function() {
-        for (var i = 0; i < vI_rdfAccountMismatchDialog.mismatchItems.length; i++) {
-            vI_rdfAccountMismatchDialog.mismatchItems[i].key = document.getElementById("mismatchLine_" + i).key
+        for (var i = 0; i < rdfAccountMismatchDialog.mismatchItems.length; i++) {
+            rdfAccountMismatchDialog.mismatchItems[i].key = document.getElementById("mismatchLine_" + i).key
         }
         /* window.argument[2] stores callback parent */
-        window.arguments[2].repairAccountMismatch(vI_rdfAccountMismatchDialog.type, vI_rdfAccountMismatchDialog.mismatchItems);
+        window.arguments[2].repairAccountMismatch(rdfAccountMismatchDialog.type, rdfAccountMismatchDialog.mismatchItems);
     }
 }
-window.addEventListener("load", vI_rdfAccountMismatchDialog.init, false);
+window.addEventListener("load", rdfAccountMismatchDialog.init, false);
+}});

chrome/content/v_identity/vI_rdfAccountMismatchDialog.xml

@@ -155 +155 @@
     <method name="_addIdentities">
         <body><![CDATA[
-        vI_notificationBar.dump("## mismatchID-menupopup: _addIdentities.\n");
+        virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: _addIdentities.\n");
         var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
             .getService(Components.interfaces.nsIMsgAccountManager);
@@ -171 +171 @@
                 this.appendChild(menuitem);
             }
-        }        
-        ]]></body>
+        }
+        ]]></body>
     </method>
     <method name="_addSmtp">
         <parameter name="server" />
         <body><![CDATA[
-            vI_notificationBar.dump("## mismatchID-menupopup: _addSmtp.\n");
+            virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: _addSmtp.\n");
             const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
             var menuitem = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
@@ -185 +185 @@
             menuitem.setAttribute("ext2",  server.username);
             menuitem.setAttribute("key",  server.key);
-            this.appendChild(menuitem);        
+            this.appendChild(menuitem);
         ]]></body>
     </method>
     <method name="_addSmtpServers">
         <body><![CDATA[
-            vI_notificationBar.dump("## mismatchID-menupopup: _addSmtpServers.\n");
+            virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: _addSmtpServers.\n");
             
             const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
             var menuitem = document.createElementNS(XUL_NS, "menuitem"); // create a new XUL menuitem
             menuitem.setAttribute("class", "mismatchMenuitem");
-            const vI_DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
-            menuitem.setAttribute("key", vI_DEFAULT_SMTP_TAG);
+            menuitem.setAttribute("key", virtualIdentityExtension.identityData.DEFAULT_SMTP_TAG);
             menuitem.setAttribute("label", document.getElementById("bundle_messenger").getString("defaultServerTag"));
             this.appendChild(menuitem);
@@ -206 +205 @@
                 if (server instanceof Components.interfaces.nsISmtpServer && !server.redirectorType) this._addSmtp(server);
             }
-        ]]></body>
+        ]]></body>
     </method>
     <constructor>
         <![CDATA[       
-        vI_notificationBar.dump("## mismatchID-menupopup: constructor.\n");
+        virtualIdentityExtension.notificationBar.dump("## mismatchID-menupopup: constructor.\n");
         const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
         this.appendChild(document.createElementNS(XUL_NS, "menuseparator")); // create a new XUL menuseparator
         if (this.getAttribute("type") == "identity") this._addIdentities();
         else    this._addSmtpServers();
-        ]]>
+        ]]>
     </constructor>
     </implementation>

chrome/content/v_identity/vI_rdfAccountMismatchDialog.xul

@@ -32 +32 @@
     buttons="accept"
     title="&vident.vI_rdfAccountMismatchDialog.title;"
-    ondialogaccept="vI_rdfAccountMismatchDialog.accept();"
-    ondialogcancel="vI_rdfAccountMismatchDialog.accept();"
+    ondialogaccept="virtualIdentityExtension.rdfAccountMismatchDialog.accept();"
+    ondialogcancel="virtualIdentityExtension.rdfAccountMismatchDialog.accept();"
     zlevel="6">
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfAccountMismatchDialog.js" />

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_rdfDataEditor = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var rdfDataEditor = {
     __rdfDatasource : null,
     __rdfDataTree : null,
@@ -44 +45 @@
     init : function() {
         if (window.arguments[0]["recipientCol"])
-            vI_rdfDataEditor.__recipient = window.arguments[0]["recipientCol"];
-        vI_rdfDataEditor.__type = window.arguments[1];
-        vI_rdfDataEditor.__rdfDatasource = window.arguments[2];
-        vI_rdfDataEditor.__rdfDataTree = window.arguments[3];
+            rdfDataEditor.__recipient = window.arguments[0]["recipientCol"];
+        rdfDataEditor.__type = window.arguments[1];
+        rdfDataEditor.__rdfDatasource = window.arguments[2];
+        rdfDataEditor.__rdfDataTree = window.arguments[3];
         ;
-        vI_rdfDataEditor.__identityData = new vI_identityData();
-        vI_rdfDataEditor.__identityData.copy(window.arguments[0].identityData);
+        rdfDataEditor.__identityData = new vI.identityData();
+        rdfDataEditor.__identityData.copy(window.arguments[0].identityData);
 
         
         // set recipient
-        document.getElementById("recipient").value = vI_rdfDataEditor.__recipient;
+        document.getElementById("recipient").value = rdfDataEditor.__recipient;
         
         // set type of entry (and populate Menu)
         var typeMenuPopup = document.getElementById("type_menu_popup")
-        for each (typeField in Array("email", "maillist", "newsgroup", "filter")) {
+        for each (var typeField in Array("email", "maillist", "newsgroup", "filter")) {
             var menuitem = document.createElement("menuitem");
             var label = document.getElementById("vI_rdfDataTreeBundle").getString("vI_rdfDataTree.dataType." + typeField)
@@ -64 +65 @@
             menuitem.setAttribute("key", typeField);
             typeMenuPopup.appendChild(menuitem);
-            if (typeField == vI_rdfDataEditor.__type) document.getElementById("type_menu").selectedItem = menuitem
+            if (typeField == rdfDataEditor.__type) document.getElementById("type_menu").selectedItem = menuitem
         }
         
         // set sender
-        document.getElementById("sender").value = vI_rdfDataEditor.__identityData.combinedName;
+        document.getElementById("sender").value = rdfDataEditor.__identityData.combinedName;
 
         // set Identity
-        vI_rdfDataEditor.__populateIdentityMenu();
+        rdfDataEditor.__populateIdentityMenu();
         var MenuItems = document.getElementById("identity_list_popup").childNodes;
         for (var index = 0; index < MenuItems.length; index++) {
-            if (MenuItems[index].getAttribute("value") == vI_rdfDataEditor.__identityData.id.key) {
+            if (MenuItems[index].getAttribute("value") == rdfDataEditor.__identityData.id.key) {
                 document.getElementById("identity_list").selectedItem =
                         MenuItems[index];
@@ -83 +84 @@
         // set SMTP
         document.getElementById("smtpServerListHbox").addNoneServer(); // add non (not stored) Server
-        document.getElementById("smtpServerListHbox").smtp = vI_rdfDataEditor.__identityData.smtp.keyNice;
+        document.getElementById("smtpServerListHbox").smtp = rdfDataEditor.__identityData.smtp.keyNice;
         
         // set extra values
-        vI_rdfDataEditor.__identityData.extras.setEditorValues();
-        vI_storageExtrasHelper.hideUnusedEditorFields();
+        rdfDataEditor.__identityData.extras.setEditorValues();
+        vI.storageExtrasHelper.hideUnusedEditorFields();
     },
     
     blurEvent : function(elementId) {
         var elem = document.getElementById(elementId);
-        var localIdentityData = new vI_identityData(elem.value, null, null, null, null, null, null);
+        var localIdentityData = new vI.identityData(elem.value, null, null, null, null, null, null);
         elem.value = localIdentityData.combinedName;                    
     },
     
     accept : function() {
-        var localIdentityData = new vI_identityData(document.getElementById("sender").value, null,
+        var localIdentityData = new vI.identityData(document.getElementById("sender").value, null,
             document.getElementById("identity_list").selectedItem.getAttribute("value"),
             document.getElementById("smtp_server_list").selectedItem.getAttribute("key"));
         localIdentityData.extras.readEditorValues();
 
-        vI_rdfDataEditor.__rdfDatasource.updateRDF(
+        rdfDataEditor.__rdfDatasource.updateRDF(
                 document.getElementById("recipient").value,
                 document.getElementById("type_menu").selectedItem.getAttribute("key"),
                 localIdentityData,
-                true, true, vI_rdfDataEditor.__recipient, vI_rdfDataEditor.__type);
+                true, true, rdfDataEditor.__recipient, rdfDataEditor.__type);
         
         return document.getElementById("type_menu").selectedItem.getAttribute("key");
     }
 }
+vI.rdfDataEditor = rdfDataEditor;
+}});

chrome/content/v_identity/vI_rdfDataEditor.xul

@@ -32 +32 @@
 <dialog id="vI_rdfDataEditor"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    onload="vI_rdfDataEditor.init();"
-    ondialogaccept="window.arguments[3].treeType = vI_rdfDataEditor.accept();"
+    onload="virtualIdentityExtension.rdfDataEditor.init();"
+    ondialogaccept="window.arguments[3].treeType = virtualIdentityExtension.rdfDataEditor.accept();"
     title="&vI_rdfDataEditor.dlgTitle.label;" >
 
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataEditor.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
@@ -68 +69 @@
                 <label value="&vI_rdfDataEditor.sender.label;" accesskey="&vI_rdfDataEditor.sender.accesskey;" control="sender"/>
             <spacer flex="1"/></vbox>
-            <textbox id="sender" flex="1"  onblur="vI_rdfDataEditor.blurEvent('sender')" />
+            <textbox id="sender" flex="1"  onblur="virtualIdentityExtension.rdfDataEditor.blurEvent('sender')" />
         </hbox>
         <hbox>

chrome/content/v_identity/vI_rdfDataTree.js

@@ -29 +29 @@
 */
 
-
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
 //prepares an object for easy comparison against another. for strings, lowercases them
 function prepareForComparison (o) {
@@ -38 +38 @@
 
 
-function rdfDataTree(treeType, vI_rdfDatasource) {
+function rdfDataTree(treeType, rdfDatasource) {
     this.treeType = treeType;
-    this._vI_rdfDatasource = vI_rdfDatasource;
+    this._rdfDatasource = rdfDatasource;
     this.filterText = "";
     this.loadTable();
-}
+};
+
 rdfDataTree.prototype = {
     idTable : null,
@@ -49 +50 @@
     filterText : null,
     treeType : null,
-    _vI_rdfDatasource : null,
+    _rdfDatasource : null,
 
     get treeElem() { return document.getElementById("rdfDataTree_" + this.treeType); },
@@ -56 +57 @@
     //this function is called every time the tree is sorted, filtered, or reloaded
     loadTable : function() {
-//         if (vI_notificationBar) vI_notificationBar.dump("## rdfDataTree: loadTable.\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDataTree: loadTable.\n");
         //remember scroll position. this is useful if this is an editable table
         //to prevent the user from losing the row they edited
@@ -63 +64 @@
         if (this.idData == null) {
             this.idData = [];
-            this._vI_rdfDatasource.readAllEntriesFromRDF(this.addNewDatum, this.treeType, this.idData);
+            this._rdfDatasource.readAllEntriesFromRDF(this.addNewDatum, this.treeType, this.idData);
         }
         if (this.filterText == "") {
@@ -92 +93 @@
         // set Tab label
         this.tabElem.setAttribute("label", this.treeType + " (" + this.idTable.length + ")");
-//         if (vI_notificationBar) vI_notificationBar.dump("## rdfDataTree: loadTable done.\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDataTree: loadTable done.\n");
     },
 
@@ -105 +106 @@
                 resource : resource,
                 identityData : localIdentityData}
-//      vI_notificationBar.dump("## addNewDatum.\n");
+//      vI.notificationBar.dump("## addNewDatum.\n");
         localIdentityData.extras.addPrefs(pref);
         idData.push(pref);
     },
     sort : function(columnName) {
-//      vI_notificationBar.dump("## sort: " + columnName + ".\n");
+//      vI.notificationBar.dump("## sort: " + columnName + ".\n");
         var order = this.treeElem.getAttribute("sortDirection") == "ascending" ? 1 : -1;
         //if the column is passed and it's already sorted by that column, reverse sort
@@ -130 +131 @@
         this.treeElem.setAttribute("sortResource", columnName);
         
-        this.treeElem.view = new vI_rdfDataTree.treeView(this.idTable);
+        this.treeElem.view = new rdfDataTreeCollection.treeView(this.idTable);
         
         //set the appropriate attributes to show to indicator
@@ -140 +141 @@
         }
     }
-}
-
-var vI_rdfDataTree = {
+};
+
+var rdfDataTreeCollection = {
     promptService : Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
             .getService(Components.interfaces.nsIPromptService),
@@ -152 +153 @@
     
     _strings : null,
-    _vI_rdfDatasource : null,
+    _rdfDatasource : null,
     
     onTabSelect : function () {
-        vI_rdfDataTree.hideInfoBox();
-        if (vI_rdfDataTree.tabbox) {
-            vI_rdfDataTree.moveConstraints();
-            vI_rdfDataTree.updateButtonMenu();
+        rdfDataTreeCollection.hideInfoBox();
+        if (rdfDataTreeCollection.tabbox) {
+            rdfDataTreeCollection.moveConstraints();
+            rdfDataTreeCollection.updateButtonMenu();
         }
     },
     
     onselect : function () {
-        vI_rdfDataTree.moveConstraints();
-        vI_rdfDataTree.updateButtonMenu();
-
-        var tree = vI_rdfDataTree.trees[vI_rdfDataTree.tabbox.selectedPanel.id];
-        var htmlBox = document.getElementById("vI_rdfDataTreeInfoBox")
+        rdfDataTreeCollection.moveConstraints();
+        rdfDataTreeCollection.updateButtonMenu();
+
+        var tree = rdfDataTreeCollection.trees[rdfDataTreeCollection.tabbox.selectedPanel.id];
+        var htmlBox = document.getElementById("rdfDataTreeCollectionInfoBox")
         if (tree.treeElem.view.selection.count != 1)
-            { vI_rdfDataTree.hideInfoBox(); return; }
+            { rdfDataTreeCollection.hideInfoBox(); return; }
         
         var identityData = tree.idTable[tree.treeElem.currentIndex]["identityData"];
@@ -185 +186 @@
 
         htmlBox.outputString = _identityInfo;
-        vI_rdfDataTree.infoBoxHidden = false;
+        rdfDataTreeCollection.infoBoxHidden = false;
         htmlBox.setAttribute("style", "height:" + htmlBox.contentDocument.lastChild.scrollHeight +"px");
-        vI_rdfDataTree.overflow(); // better resize one time too much, mozilla is still magic  :)
+        rdfDataTreeCollection.overflow(); // better resize one time too much, mozilla is still magic  :)
     },
 
     init : function() {
-        vI_rdfDataTree.tabbox = document.getElementById("TreeTabbox");
-        vI_rdfDataTree._strings = document.getElementById("vI_rdfDataTreeBundle");
-
-        vI_rdfDataTree._vI_rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf");
-        
-        for each (var treeType in vI_rdfDataTree.treeTypes)
-            vI_rdfDataTree.trees[treeType] = new rdfDataTree(treeType, vI_rdfDataTree._vI_rdfDatasource);
+        rdfDataTreeCollection.tabbox = document.getElementById("TreeTabbox");
+        rdfDataTreeCollection._strings = document.getElementById("vI_rdfDataTreeBundle");
+
+        rdfDataTreeCollection._rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf");
+        
+        for each (var treeType in rdfDataTreeCollection.treeTypes)
+            rdfDataTreeCollection.trees[treeType] = new rdfDataTree(treeType, rdfDataTreeCollection._rdfDatasource);
     },
     
     clean : function() {
-        if (vI_rdfDataTree._vI_rdfDatasource) vI_rdfDataTree._vI_rdfDatasource.clean();
+        if (rdfDataTreeCollection._rdfDatasource) rdfDataTreeCollection._rdfDatasource.clean();
     },
 
@@ -219 +220 @@
         this.getCellText = function(row, col) {
             var retValue = table[row][col.id.substr(0,col.id.indexOf("_"))];
-            if (!vI_rdfDataTree._braille && (retValue == "no" || retValue == "yes"))
+            if (!rdfDataTreeCollection._braille && (retValue == "no" || retValue == "yes"))
                 return ""; // image will be used as indicator
             else return retValue;
@@ -241 +242 @@
         this.getColumnProperties = function(colid,col,props){};
         this.cycleHeader = function(col, elem) {
-            var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
+            var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
             if (treeType != "filter")
-                vI_rdfDataTree.trees[treeType].sort(col.id.substr(0,col.id.indexOf("_")));
+                rdfDataTreeCollection.trees[treeType].sort(col.id.substr(0,col.id.indexOf("_")));
         };
         this.getCellProperties = function(row,col,props){
-            if (vI_rdfDataTree._braille) return;
+            if (rdfDataTreeCollection._braille) return;
             var aserv=Components.classes["@mozilla.org/atom-service;1"].
                 getService(Components.interfaces.nsIAtomService);
@@ -259 +260 @@
     __setFilter : function (text) {
         // loop trough all trees
-        for each (var treeType in vI_rdfDataTree.treeTypes) {
-            var tree = vI_rdfDataTree.trees[treeType];
+        for each (var treeType in rdfDataTreeCollection.treeTypes) {
+            var tree = rdfDataTreeCollection.trees[treeType];
             tree.filterText = text;
             tree.loadTable();
@@ -269 +270 @@
         //do this now rather than doing it at every comparison
         var value = prepareForComparison(event.target.value);
-        vI_rdfDataTree.__setFilter(value);
+        rdfDataTreeCollection.__setFilter(value);
         document.getElementById("clearFilter").disabled = value.length == 0;
     },
@@ -278 +279 @@
         filterElement.focus();
         filterElement.value = "";
-        vI_rdfDataTree.__setFilter("");
+        rdfDataTreeCollection.__setFilter("");
     },
     
     __updateMenu : function(modifySelected, removeSelected) {
-        var tree = vI_rdfDataTree.trees[vI_rdfDataTree.tabbox.selectedPanel.id];
+        var tree = rdfDataTreeCollection.trees[rdfDataTreeCollection.tabbox.selectedPanel.id];
         var noSelections = (tree.treeElem.view.selection.count == 0)
         modifySelected.setAttribute("disabled", noSelections)
@@ -289 +290 @@
     
     updateButtonMenu : function() {
-        vI_rdfDataTree.__updateMenu(
-            document.getElementById("editButton_" + vI_rdfDataTree.tabbox.selectedPanel.id),
-            document.getElementById("deleteButton_" + vI_rdfDataTree.tabbox.selectedPanel.id))
+        rdfDataTreeCollection.__updateMenu(
+            document.getElementById("editButton_" + rdfDataTreeCollection.tabbox.selectedPanel.id),
+            document.getElementById("deleteButton_" + rdfDataTreeCollection.tabbox.selectedPanel.id))
     },
     
     updateContextMenu : function() {
-        vI_rdfDataTree.__updateMenu(
+        rdfDataTreeCollection.__updateMenu(
             document.getElementById("context_modifySelected"),
             document.getElementById("context_removeSelected"))
@@ -301 +302 @@
     
     updateMenu : function() {
-        vI_rdfDataTree.__updateMenu(
+        rdfDataTreeCollection.__updateMenu(
             document.getElementById("menu_modifySelected"),
             document.getElementById("menu_removeSelected"))
@@ -307 +308 @@
 
     modifySelected : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
-        var tree = vI_rdfDataTree.trees[treeType];
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
+        var tree = rdfDataTreeCollection.trees[treeType];
         if (tree.treeElem.view.selection.count == 0) return;
         if (tree.treeElem.view.selection.count > 5) {
-            var warning = vI_rdfDataTree._strings.getString("vI_rdfDataTree.modify.Warning1") + " " +
+            var warning = rdfDataTreeCollection._strings.getString("rdfDataTree.modify.Warning1") + " " +
                 tree.treeElem.view.selection.count + " " +
-                vI_rdfDataTree._strings.getString("vI_rdfDataTree.modify.Warning2")
-            if (!vI_rdfDataTree.promptService.confirm(window,"Warning",warning)) return;
+                rdfDataTreeCollection._strings.getString("rdfDataTree.modify.Warning2")
+            if (!rdfDataTreeCollection.promptService.confirm(window,"Warning",warning)) return;
         }
         
@@ -327 +328 @@
                     "chrome, dialog, modal, alwaysRaised, resizable=yes",
                     tree.idTable[v], treeType,
-                    vI_rdfDataTree._vI_rdfDatasource, retVar).focus();
+                    rdfDataTreeCollection._rdfDatasource, retVar).focus();
         }
         
         // reload all trees (multiple types might have changed)
-        for each (var treeType in vI_rdfDataTree.treeTypes) {
-            vI_rdfDataTree.trees[treeType].idData = null;
-            vI_rdfDataTree.trees[treeType].idTable = null;
-            vI_rdfDataTree.trees[treeType].loadTable()
-        }
-        vI_rdfDataTree.tabbox.selectedTab = document.getElementById(retVar.treeType + "Tab");
-        vI_rdfDataTree.hideInfoBox();
+        for each (var treeType in rdfDataTreeCollection.treeTypes) {
+            rdfDataTreeCollection.trees[treeType].idData = null;
+            rdfDataTreeCollection.trees[treeType].idTable = null;
+            rdfDataTreeCollection.trees[treeType].loadTable()
+        }
+        rdfDataTreeCollection.tabbox.selectedTab = document.getElementById(retVar.treeType + "Tab");
+        rdfDataTreeCollection.hideInfoBox();
     },
     
     removeSelected : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
-        var tree = vI_rdfDataTree.trees[treeType];
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
+        var tree = rdfDataTreeCollection.trees[treeType];
         if (tree.treeElem.view.selection.count == 0) return;
-        var warning = vI_rdfDataTree._strings.getString("vI_rdfDataTree.remove.Warning1") + " " +
+        var warning = rdfDataTreeCollection._strings.getString("rdfDataTreeCollection.remove.Warning1") + " " +
             tree.treeElem.view.selection.count + " " +
-            vI_rdfDataTree._strings.getString("vI_rdfDataTree.remove.Warning2")
-        
-        if (!vI_rdfDataTree.promptService.confirm(window,"Warning",warning)) return;
+            rdfDataTreeCollection._strings.getString("rdfDataTreeCollection.remove.Warning2")
+        
+        if (!rdfDataTreeCollection.promptService.confirm(window,"Warning",warning)) return;
         
         var start = new Object(); var end = new Object();
@@ -356 +357 @@
             tree.treeElem.view.selection.getRangeAt(t,start,end);
             for (var v=start.value; v<=end.value; v++){
-                vI_rdfDataTree._vI_rdfDatasource.removeVIdentityFromRDF(tree.idTable[v]["resource"], treeType)
+                rdfDataTreeCollection._rdfDatasource.removeVIdentityFromRDF(tree.idTable[v]["resource"], treeType)
             }
         }
@@ -362 +363 @@
         tree.idData = null; tree.idTable = null;
         tree.loadTable();
-        vI_rdfDataTree.hideInfoBox();
+        rdfDataTreeCollection.hideInfoBox();
     },
     
     moveConstraints : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
         if (treeType != "filter") return;
-        var tree = vI_rdfDataTree.trees[treeType];
+        var tree = rdfDataTreeCollection.trees[treeType];
         if (tree.treeElem.view.selection.count == 0) {
             document.getElementById("reorderUpButton_filter").setAttribute("disabled","true");
@@ -391 +392 @@
 
     moveUpSelected : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
         if (treeType != "filter") return; // just to be safe, button should be disabled
-        var tree = vI_rdfDataTree.trees[treeType];
+        var tree = rdfDataTreeCollection.trees[treeType];
         if (tree.treeElem.view.selection.count == 0) return; // just to be safe, button should be disabled
 
@@ -402 +403 @@
         tree.treeElem.view.selection.getRangeAt(0,start,end);
         for (var v=start.value; v<=end.value; v++){
-            var resource = vI_rdfDataTree._vI_rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
-            vI_rdfDataTree._vI_rdfDatasource.filterContainer.InsertElementAt(resource,v,true); 
+            var resource = rdfDataTreeCollection._rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
+            rdfDataTreeCollection._rdfDatasource.filterContainer.InsertElementAt(resource,v,true); 
         }
         tree.idData = null; tree.idTable = null;
@@ -411 +412 @@
 
     moveDownSelected : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
         if (treeType != "filter") return; // just to be safe, button should be disabled
-        var tree = vI_rdfDataTree.trees[treeType];
+        var tree = rdfDataTreeCollection.trees[treeType];
         if (tree.treeElem.view.selection.count == 0) return; // just to be safe, button should be disabled
 
@@ -422 +423 @@
         tree.treeElem.view.selection.getRangeAt(0,start,end);
         for (var v=end.value; v>=start.value; v--){
-            var resource = vI_rdfDataTree._vI_rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
-            vI_rdfDataTree._vI_rdfDatasource.filterContainer.InsertElementAt(resource,v+2,true); 
+            var resource = rdfDataTreeCollection._rdfDatasource.filterContainer.RemoveElementAt(v+1, true);
+            rdfDataTreeCollection._rdfDatasource.filterContainer.InsertElementAt(resource,v+2,true); 
         }
         tree.idData = null; tree.idTable = null;
@@ -432 +433 @@
     infoBoxHidden : true,
     overflow : function() {
-        if (vI_rdfDataTree.infoBoxHidden) return;
-        var htmlBox = document.getElementById("vI_rdfDataTreeInfoBox")
+        if (rdfDataTreeCollection.infoBoxHidden) return;
+        var htmlBox = document.getElementById("rdfDataTreeCollectionInfoBox")
         htmlBox.setAttribute("style", "height:" + htmlBox.contentDocument.lastChild.scrollHeight +"px");
     },
 
     hideInfoBox : function() {
-        vI_rdfDataTree.infoBoxHidden = true;
-        document.getElementById("vI_rdfDataTreeInfoBox").setAttribute("style", "height:0px");
-        for each (var treeType in vI_rdfDataTree.treeTypes) {
-            try { if (vI_rdfDataTree.trees[treeType])
-                vI_rdfDataTree.trees[treeType].treeElem.view.selection.selectNone() } catch (e) { }
+        rdfDataTreeCollection.infoBoxHidden = true;
+        document.getElementById("rdfDataTreeCollectionInfoBox").setAttribute("style", "height:0px");
+        for each (var treeType in rdfDataTreeCollection.treeTypes) {
+            try { if (rdfDataTreeCollection.trees[treeType])
+                rdfDataTreeCollection.trees[treeType].treeElem.view.selection.selectNone() } catch (e) { }
         }
     },
 
     selectAll : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
-        var tree = vI_rdfDataTree.trees[treeType];
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
+        var tree = rdfDataTreeCollection.trees[treeType];
         tree.treeElem.view.selection.selectAll();
     },
     
     newItem : function() {
-        var treeType = vI_rdfDataTree.tabbox.selectedPanel.id;
-        var newItemPreset = { identityData : new vI_identityData ("", null, null, vI_NO_SMTP_TAG, null, null) };
-        // XXXX create useful preset
+        var treeType = rdfDataTreeCollection.tabbox.selectedPanel.id;
+        var newItemPreset = { identityData : new vI.identityData ("", null, null, vI.NO_SMTP_TAG, null, null) };
         var retVar = { treeType: null };
 
@@ -461 +461 @@
             "chrome, dialog, modal, alwaysRaised, resizable=yes",
             newItemPreset, treeType,
-            vI_rdfDataTree._vI_rdfDatasource, retVar).focus();
+            rdfDataTreeCollection._rdfDatasource, retVar).focus();
 
         // reload all trees (multiple types might have changed)
-        for each (var treeType in vI_rdfDataTree.treeTypes) {
-            vI_rdfDataTree.trees[treeType].idData = null;
-            vI_rdfDataTree.trees[treeType].idTable = null;
-            vI_rdfDataTree.trees[treeType].loadTable()
-        }
-        vI_rdfDataTree.tabbox.selectedTab = document.getElementById(retVar.treeType + "Tab");
-        vI_rdfDataTree.hideInfoBox();
+        for each (var treeType in rdfDataTreeCollection.treeTypes) {
+            rdfDataTreeCollection.trees[treeType].idData = null;
+            rdfDataTreeCollection.trees[treeType].idTable = null;
+            rdfDataTreeCollection.trees[treeType].loadTable()
+        }
+        rdfDataTreeCollection.tabbox.selectedTab = document.getElementById(retVar.treeType + "Tab");
+        rdfDataTreeCollection.hideInfoBox();
     }
 };
+dump("registering global rdfDataTreeCollection\n");
+vI.rdfDataTreeCollection = rdfDataTreeCollection;
+vI.rdfDataTree = rdfDataTree;
+dump("registering global rdfDataTreeCollection done " + vI.initTime + " " + vI.rdfDataTreeCollection + "\n");
+}});

chrome/content/v_identity/vI_rdfDataTree.xul

@@ -57 +57 @@
         height="500"
         persist="width,height,screenX,screenY"
-        onload="vI_rdfDataTree.init();"
-        onunload="vI_rdfDataTree.clean();"
+        onload="virtualIdentityExtension.rdfDataTreeCollection.init();"
+        onunload="virtualIdentityExtension.rdfDataTreeCollection.clean();"
         title="&vI_rdfDataTree.dlgTitle.label;">
 
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDatasource.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataTree.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDatasource.js" />
-<script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 
@@ -82 +83 @@
 </menupopup>
 
-<menupopup id="configContext" onpopupshowing="if (event.target == this) vI_rdfDataTree.updateContextMenu();">
+<menupopup id="configContext" onpopupshowing="if (event.target == this) virtualIdentityExtension.rdfDataTreeCollection.updateContextMenu();">
     <menuitem id="context_modifySelected" label="&vI_rdfDataTree.modifySelected.label;"
-        oncommand="vI_rdfDataTree.modifySelected(this);"/>
+        oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected(this);"/>
     <menuitem id="context_removeSelected" label="&vI_rdfDataTree.removeSelected.label;"
-        oncommand="vI_rdfDataTree.removeSelected();"/>
+        oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();"/>
     <menuitem id="context_newItem" label="&vI_rdfDataTree.newItem.label;"
-        oncommand="vI_rdfDataTree.newItem();"/>
+        oncommand="virtualIdentityExtension.rdfDataTreeCollection.newItem();"/>
     <menuseparator />
     <menuitem id="context_menu_selectAll" label="&selectAllCmd.label;"
-        oncommand="vI_rdfDataTree.selectAll();"/>
+        oncommand="virtualIdentityExtension.rdfDataTreeCollection.selectAll();"/>
 </menupopup>
 
 <keyset>
-    <key keycode="VK_ENTER" oncommand="vI_rdfDataTree.modifySelected();"/>
-    <key keycode="VK_RETURN" oncommand="vI_rdfDataTree.modifySelected();"/>
-    <key keycode="VK_DELETE" oncommand="vI_rdfDataTree.removeSelected();"/>
-    <key modifiers="accel" key="&selectAllCmd.accesskey;" oncommand="vI_rdfDataTree.selectAll();"/>
+    <key keycode="VK_ENTER" oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();"/>
+    <key keycode="VK_RETURN" oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();"/>
+    <key keycode="VK_DELETE" oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();"/>
+    <key modifiers="accel" key="&selectAllCmd.accesskey;" oncommand="virtualIdentityExtension.rdfDataTreeCollection.selectAll();"/>
 </keyset>
 
@@ -108 +109 @@
         <menu id="editMenu" label="&vI_rdfDataTree.editMenu.label;" 
             accesskey="&vI_rdfDataTree.editMenu.accesskey;">
-        <menupopup onpopupshowing="if (event.target == this) vI_rdfDataTree.updateMenu();">
+        <menupopup onpopupshowing="if (event.target == this) virtualIdentityExtension.rdfDataTreeCollection.updateMenu();">
             <menuitem id="menu_modifySelected" label="&vI_rdfDataTree.modifySelected.label;"
                 accesskey="&vI_rdfDataTree.modifySelected.accesskey;"
-                oncommand="vI_rdfDataTree.modifySelected();"/>
+                oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();"/>
             <menuitem id="menu_removeSelected" label="&vI_rdfDataTree.removeSelected.label;"
                 accesskey="&vI_rdfDataTree.removeSelected.accesskey;"
-                oncommand="vI_rdfDataTree.removeSelected();"/>
+                oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();"/>
             <menuitem id="menu_newItem" label="&vI_rdfDataTree.newItem.label;"
                 accesskey="&vI_rdfDataTree.newItem.accesskey;"
-                oncommand="vI_rdfDataTree.newItem();"/>
+                oncommand="virtualIdentityExtension.rdfDataTreeCollection.newItem();"/>
             <menuseparator />
             <menuitem id="menu_menu_selectAll" label="&selectAllCmd.label;" accesskey="&selectAllCmd.accesskey;"
-                oncommand="vI_rdfDataTree.selectAll();"/>
+                oncommand="virtualIdentityExtension.rdfDataTreeCollection.selectAll();"/>
         </menupopup>
         </menu>
         <menu id="tasksMenu" label="&tasksMenu.label;" accesskey="&tasksMenu.accesskey;">
         <menupopup>
-            <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="var vI_localRdfDatasource = new vI_rdfDatasourceImporter('virtualIdentity.rdf');"/>
-            <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="var vI_localRdfDatasource = new vI_rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')"/>
+            <menuitem label="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasourceImporter('virtualIdentity.rdf');"/>
+            <menuitem label="&exportCmd.label;" accesskey="&exportCmd.accesskey;" oncommand="var vI_localRdfDatasource = new virtualIdentityExtension.rdfDatasource(); vI_localRdfDatasource.export('virtualIdentity.rdf')"/>
         </menupopup>
         </menu>
@@ -133 +134 @@
     <spacer width="20px" />
     <label value="&vI_rdfDataTree.filterPrefs.label;" accesskey="&vI_rdfDataTree.filterPrefs.accesskey;" control="filter"/>
-    <textbox id="filter" flex="1" oninput="vI_rdfDataTree.inputFilter(event);"/>
-    <button id="clearFilter" label="&vI_rdfDataTree.showAll.label;" accesskey="&vI_rdfDataTree.showAll.accesskey;" oncommand="vI_rdfDataTree.clearFilter();" disabled="true"/>
+    <textbox id="filter" flex="1" oninput="virtualIdentityExtension.rdfDataTreeCollection.inputFilter(event);"/>
+    <button id="clearFilter" label="&vI_rdfDataTree.showAll.label;" accesskey="&vI_rdfDataTree.showAll.accesskey;" oncommand="virtualIdentityExtension.rdfDataTreeCollection.clearFilter();" disabled="true"/>
 </hbox>
 
 <tabbox id="TreeTabbox" flex="1">
-<tabs onselect="vI_rdfDataTree.onTabSelect();" >
+<tabs onselect="virtualIdentityExtension.rdfDataTreeCollection.onTabSelect();" >
 <tab id="emailTab" />
 <tab id="maillistTab" />
@@ -149 +150 @@
 <tree id="rdfDataTree_email" flex="1" class="plain" seltype="multiple"
     persist="sortDirection sortResource" sortDirection="ascending" sortResource="recipientCol"
-    enableColumnDrag="true" context="configContext" onselect="vI_rdfDataTree.onselect(this);">
+    enableColumnDrag="true" context="configContext" onselect="virtualIdentityExtension.rdfDataTreeCollection.onselect(this);">
     <treecols id="rdfDataTreeCols_email">
         <treecol id="recipientCol_email" label="&vI_rdfDataTree.recipientColumn.label;" flex="10"
@@ -168 +169 @@
             persist="hidden width ordinal sortDirection"/>      
     </treecols>
-    <treechildren id="configTreeBody_email" ondblclick="if (event.button == 0) vI_rdfDataTree.modifySelected();" />
+    <treechildren id="configTreeBody_email" ondblclick="if (event.button == 0) virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" />
 </tree>
 <vbox>
           <button id="newButton_email" label="&newButton.label;" accesskey="&newButton.accesskey;"
-                  oncommand="vI_rdfDataTree.newItem();"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.newItem();"/>
           <button id="editButton_email" label="&editButton.label;" accesskey="&editButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.modifySelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" disabled="true"/>
           <button id="deleteButton_email" label="&deleteButton.label;" accesskey="&deleteButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.removeSelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();" disabled="true"/>
           <spacer flex="1"/>
 </vbox>
@@ -186 +187 @@
 <tree id="rdfDataTree_maillist" flex="1" class="plain" seltype="multiple"
     persist="sortDirection sortResource" sortDirection="ascending" sortResource="recipientCol"
-    enableColumnDrag="true" context="configContext" onselect="vI_rdfDataTree.onselect();">
+    enableColumnDrag="true" context="configContext" onselect="virtualIdentityExtension.rdfDataTreeCollection.onselect();">
     <treecols id="rdfDataTreeCols_maillist">
         <treecol id="recipientCol_maillist" label="&vI_rdfDataTree.recipientColumn.label;" flex="10"
@@ -205 +206 @@
             persist="hidden width ordinal sortDirection"/>      
     </treecols>
-    <treechildren id="configTreeBody_maillist" ondblclick="if (event.button == 0) vI_rdfDataTree.modifySelected();" />
+    <treechildren id="configTreeBody_maillist" ondblclick="if (event.button == 0) virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" />
 </tree>
 <vbox>
           <button id="newButton_maillist" label="&newButton.label;" accesskey="&newButton.accesskey;"
-                  oncommand="vI_rdfDataTree.newItem();"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.newItem();"/>
           <button id="editButton_maillist" label="&editButton.label;" accesskey="&editButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.modifySelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" disabled="true"/>
           <button id="deleteButton_maillist" label="&deleteButton.label;" accesskey="&deleteButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.removeSelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();" disabled="true"/>
           <spacer flex="1"/>
 </vbox>
@@ -222 +223 @@
 <tree id="rdfDataTree_newsgroup" flex="1" class="plain" seltype="multiple"
     persist="sortDirection sortResource" sortDirection="ascending" sortResource="recipientCol"
-    enableColumnDrag="true" context="configContext" onselect="vI_rdfDataTree.onselect();">
+    enableColumnDrag="true" context="configContext" onselect="virtualIdentityExtension.rdfDataTreeCollection.onselect();">
     <treecols id="rdfDataTreeCols_newsgroup">
         <treecol id="recipientCol_newsgroup" label="&vI_rdfDataTree.recipientColumn.label;" flex="10"
@@ -241 +242 @@
             persist="hidden width ordinal sortDirection"/>      
     </treecols>
-    <treechildren id="configTreeBody_newsgroup" ondblclick="if (event.button == 0) vI_rdfDataTree.modifySelected();" />
+    <treechildren id="configTreeBody_newsgroup" ondblclick="if (event.button == 0) virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" />
 </tree>
 <vbox>
           <button id="newButton_newsgroup" label="&newButton.label;" accesskey="&newButton.accesskey;"
-                  oncommand="vI_rdfDataTree.newItem();"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.newItem();"/>
           <button id="editButton_newsgroup" label="&editButton.label;" accesskey="&editButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.modifySelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" disabled="true"/>
           <button id="deleteButton_newsgroup" label="&deleteButton.label;" accesskey="&deleteButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.removeSelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();" disabled="true"/>
           <spacer flex="1"/>
 </vbox>
@@ -258 +259 @@
 <tree id="rdfDataTree_filter" flex="1" class="plain" seltype="multiple"
     persist="sortDirection sortResource" sortDirection="ascending" sortResource="indexCol"
-    enableColumnDrag="true" context="configContext" onselect="vI_rdfDataTree.onselect();">
+    enableColumnDrag="true" context="configContext" onselect="virtualIdentityExtension.rdfDataTreeCollection.onselect();">
     <treecols id="rdfDataTreeCols_filter">
         <treecol id="indexCol_filter" label="&vI_rdfDataTree.indexColumn.label;" flex="10"
@@ -282 +283 @@
             persist="hidden width ordinal"/>        
     </treecols>
-    <treechildren id="configTreeBody_filter" ondblclick="if (event.button == 0) vI_rdfDataTree.modifySelected();" />
+    <treechildren id="configTreeBody_filter" ondblclick="if (event.button == 0) virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" />
 </tree>
 <vbox>
           <button id="newButton_filter" label="&newButton.label;" accesskey="&newButton.accesskey;"
-                  oncommand="vI_rdfDataTree.newItem();"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.newItem();"/>
           <button id="editButton_filter" label="&editButton.label;" accesskey="&editButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.modifySelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.modifySelected();" disabled="true"/>
           <button id="deleteButton_filter" label="&deleteButton.label;" accesskey="&deleteButton.accesskey;" 
-                  oncommand="vI_rdfDataTree.removeSelected();" disabled="true"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.removeSelected();" disabled="true"/>
           <spacer flex="1"/>
           <button id="reorderUpButton_filter" label="&reorderUpButton.label;" accesskey="&reorderUpButton.accesskey;" 
                   class="up"
-                  oncommand="vI_rdfDataTree.moveUpSelected();"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.moveUpSelected();"/>
           <button id="reorderDownButton_filter" label="&reorderDownButton.label;" accesskey="&reorderDownButton.accesskey;" 
                   class="down"
-                  oncommand="vI_rdfDataTree.moveDownSelected();"/>
+                  oncommand="virtualIdentityExtension.rdfDataTreeCollection.moveDownSelected();"/>
           <spacer flex="1"/>
 </vbox>
@@ -306 +307 @@
 </tabbox>
 <!-- <splitter /> -->
-<browser id="vI_rdfDataTreeInfoBox" class="vI_htmlTextBox" type="chrome" cssSource="vI_rdfTreeInfo.css" disablehistory="true" onoverflow="vI_rdfDataTree.overflow();"/>
-
+<browser id="rdfDataTreeCollectionInfoBox" class="vI_htmlTextBox" type="chrome" cssSource="vI_rdfTreeInfo.css" disablehistory="true" onoverflow="virtualIdentityExtension.rdfDataTreeCollection.overflow();"/>
     <splitter id="vIDebugBoxSplitter" hidden="true"/>
     <textbox id="vIDebugBox" hidden="true" multiline="true" readonly="true"
     DOMAttrModified="if(event.attrName == 'value') this.value = event.newValue; return true;"/>
-
+        <script type="application/x-javascript">dump('window rdfDataTreeCollection done ' + parseInt((new Date()).getTime()) + ' ' + virtualIdentityExtension.initTime + ' ' + virtualIdentityExtension.rdfDataTreeCollection + '\n');</script>
 </window>

chrome/content/v_identity/vI_rdfDatasource.js

@@ -24 +24 @@
 
 
-
-function vI_rdfDatasource(rdfFileName, dontRegisterObserver) {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+function rdfDatasource(rdfFileName, dontRegisterObserver) {
     this._rdfFileName = rdfFileName;
     if (this._rdfFileName) this.init();
@@ -31 +31 @@
 }
 
-vI_rdfDatasource.prototype = {
+rdfDatasource.prototype = {
     _rdfVersion :       "0.0.5",
     _rdfService :       Components.classes["@mozilla.org/rdf/rdf-service;1"]
@@ -80 +80 @@
 
     init: function() {
-//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource init.\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource init.\n");
 
         this._openRdfDataSource();
@@ -91 +91 @@
             
 //         this.refreshAccountInfo();
-//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource init done.\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource init done.\n");
     },
     
@@ -109 +109 @@
         var fileURI = protoHandler.newFileURI(newFile);
 
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource init: read rdf from '" + fileURI.spec + "'\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource init: read rdf from '" + fileURI.spec + "'\n");
 
         this._rdfDataSource =
             this._rdfService.GetDataSourceBlocking(fileURI.spec);
             
-//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource read rdf from '" + fileURI.spec + "' done." + this._rdfService + "\n");
     },
     
@@ -161 +161 @@
     rdfUpgrade : function() {
         var currentVersion = this.getCurrentRDFFileVersion();
-        if (vI_notificationBar) vI_notificationBar.dump("checking for previous version of rdf, found " + 
+        if (vI.notificationBar) vI.notificationBar.dump("checking for previous version of rdf, found " + 
             currentVersion + "\nrdf-upgrade required.\n")
         switch (currentVersion) {
@@ -175 +175 @@
         }
         this.storeRDFVersion();
-        if (vI_notificationBar) vI_notificationBar.dump("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.\n\n");
+        if (vI.notificationBar) vI.notificationBar.dump("rdf-upgrade to " + this.getCurrentRDFFileVersion() + " done.\n\n");
     },
     // **************    RDF UPGRADE CODE    ****************************************************
     // only used for upgrade to 0.0.3 - loop through all ressources.
     _transferAllResources : function () {
-        if (vI_notificationBar) vI_notificationBar.dump("upgrade: transferAllResources ");
+        if (vI.notificationBar) vI.notificationBar.dump("upgrade: transferAllResources ");
         var enumerator = this._rdfDataSource.GetAllResources();
         while (enumerator && enumerator.hasMoreElements()) {
@@ -200 +200 @@
             if (container.IndexOf(resource) == -1) container.AppendElement(resource);
         
-            if (vI_notificationBar) vI_notificationBar.dump(".");
-        }
-        if (vI_notificationBar) vI_notificationBar.dump("\n");
+            if (vI.notificationBar) vI.notificationBar.dump(".");
+        }
+        if (vI.notificationBar) vI.notificationBar.dump("\n");
     },
     // **************    RDF UPGRADE CODE    ****************************************************
     _tagDefaultSMTP: function() {
-        if (vI_notificationBar) vI_notificationBar.dump("upgrade: tagDefaultSMTP ");
+        if (vI.notificationBar) vI.notificationBar.dump("upgrade: tagDefaultSMTP ");
         for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
             var enumerator = this.getContainer(treeType).GetElements();
@@ -213 +213 @@
                 resource.QueryInterface(Components.interfaces.nsIRDFResource);
                 var smtp = this._getRDFValue(resource, "smtp")
-                if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", vI_DEFAULT_SMTP_TAG);
-                if (vI_notificationBar) vI_notificationBar.dump(".");
-            }
-        }
-        if (vI_notificationBar) vI_notificationBar.dump("\n");
+                if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", vI.DEFAULT_SMTP_TAG);
+                if (vI.notificationBar) vI.notificationBar.dump(".");
+            }
+        }
+        if (vI.notificationBar) vI.notificationBar.dump("\n");
     },
     // **************    RDF UPGRADE CODE    ****************************************************
     _createAccountInfoContainers: function() {
-        if (vI_notificationBar) vI_notificationBar.dump("upgrade: createAccountInfoContainers \n");
+        if (vI.notificationBar) vI.notificationBar.dump("upgrade: createAccountInfoContainers \n");
         var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
             getService(Components.interfaces.nsIRDFContainerUtils);
@@ -253 +253 @@
     // **************    RDF UPGRADE CODE    ****************************************************
     _createRDFContainers: function() {
-        if (vI_notificationBar) vI_notificationBar.dump("upgrade: createRDFContainers ");
+        if (vI.notificationBar) vI.notificationBar.dump("upgrade: createRDFContainers ");
         var rdfContainerUtils = Components.classes["@mozilla.org/rdf/container-utils;1"].
             getService(Components.interfaces.nsIRDFContainerUtils);
@@ -340 +340 @@
     
     cleanAccountInfo : function() {
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: cleanAccountInfo\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: cleanAccountInfo\n");
         
         var enumerator = this._identityContainer.GetElements();
@@ -381 +381 @@
     
     searchIdentityMismatch : function() {
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchIdentityMismatch");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: searchIdentityMismatch");
 
         var relevantIDs = this.getRelevantIDs();
@@ -408 +408 @@
         }
         if (mismatchIDs.length > 0) {
-            if (vI_notificationBar) vI_notificationBar.dump(" found mismatches on id(s).\n");
+            if (vI.notificationBar) vI.notificationBar.dump(" found mismatches on id(s).\n");
             
             window.openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0,
@@ -416 +416 @@
         }
         else {
-            if (vI_notificationBar) vI_notificationBar.dump(" found no mismatch\n");
+            if (vI.notificationBar) vI.notificationBar.dump(" found no mismatch\n");
             return false;
         }
@@ -424 +424 @@
         var keyField = (type == "identity")?"id":"smtp" // field to change is 'id' or 'smtp' dependent on type
         for (var i = 0; i < mismatchItems.length; i++) {
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: repairAccountMismatch change " + mismatchItems[i].oldkey + " into " + mismatchItems[i].key + ": ");
             // search relevant Identities
             for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
@@ -434 +434 @@
                         if (mismatchItems[i].key == "") this._unsetRDFValue(resource, keyField, mismatchItems[i].oldkey)
                         else this._setRDFValue(resource, keyField, mismatchItems[i].key)
-                        if (vI_notificationBar) vI_notificationBar.dump(".");
+                        if (vI.notificationBar) vI.notificationBar.dump(".");
                     }
                 }
             }
-            if (vI_notificationBar) vI_notificationBar.dump("\n");
+            if (vI.notificationBar) vI.notificationBar.dump("\n");
         }
     },
@@ -451 +451 @@
                 resource.QueryInterface(Components.interfaces.nsIRDFResource);
                 var smtp = this._getRDFValue(resource, "smtp")
-                if (smtp && smtp != vI_DEFAULT_SMTP_TAG) {
+                if (smtp && smtp != vI.DEFAULT_SMTP_TAG) {
                     if (!relevantSMTPs[smtp]) relevantSMTPs[smtp] = 1; else relevantSMTPs[smtp] += 1;
                 }
@@ -460 +460 @@
     
     searchSmtpMismatch : function() {
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: searchSmtpMismatch");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: searchSmtpMismatch");
 
         var relevantSMTPs = this.getRelevantSMTPs();
@@ -484 +484 @@
         }
         if (mismatchSMTPs.length > 0) {
-            if (vI_notificationBar) vI_notificationBar.dump(" found mismatches on smtp(s).\n");
+            if (vI.notificationBar) vI.notificationBar.dump(" found mismatches on smtp(s).\n");
             window.openDialog("chrome://v_identity/content/vI_rdfAccountMismatchDialog.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes", "smtp", mismatchSMTPs,
@@ -491 +491 @@
         }
         else {
-            if (vI_notificationBar) vI_notificationBar.dump(" found no mismatch\n");
+            if (vI.notificationBar) vI.notificationBar.dump(" found no mismatch\n");
             return false;
         }
@@ -497 +497 @@
 
     storeAccountInfo : function() {
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts\n");
 
         var AccountManager = Components.classes["@mozilla.org/messenger/account-manager;1"]
@@ -505 +505 @@
             for (let j = 0; j < account.identities.Count(); j++) {
                 var identity = account.identities.QueryElementAt(j, Components.interfaces.nsIMsgIdentity);
-//                 if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts identity store id " + identity.key + "\n");
+//                 if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts identity store id " + identity.key + "\n");
 
                 var resource = this._rdfService.GetResource(this._rdfNS + this._rdfNSIdentities + "/" + identity.key);
@@ -519 +519 @@
         
         function storeSmtp(server, parent) {
-//             if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts smtp store id " + server.key + "\n");
+//             if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts smtp store id " + server.key + "\n");
             var resource = parent._rdfService.GetResource(parent._rdfNS + parent._rdfNSSMTPservers + "/" + server.key);
             parent._setRDFValue(resource, "label", (server.description?server.description:server.hostname));
@@ -536 +536 @@
         }
 
-//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: storeAccounts done\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: storeAccounts done\n");
     },
 
@@ -561 +561 @@
         if (!this._rdfDataSource) return null;
         if (!recDescription) {
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: _getRDFResourceForVIdentity: no Recipient given.\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: _getRDFResourceForVIdentity: no Recipient given.\n");
             return null;
         }
@@ -577 +577 @@
     
     removeVIdentityFromRDF : function (resource, recType) {
-//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
+//      if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: removeVIdentityFromRDF " + resource.ValueUTF8 + ".\n");
         this._unsetRDFValue(resource, "email", this._getRDFValue(resource, "email"))
         this._unsetRDFValue(resource, "fullName", this._getRDFValue(resource, "fullName"))
@@ -584 +584 @@
         this._unsetRDFValue(resource, "name", this._getRDFValue(resource, "name"))
         
-        var extras = new vI_storageExtras(this, resource);
+        var extras = new vI.storageExtras(this, resource);
         extras.loopForRDF(this, resource, "unset");
         this.getContainer(recType).RemoveElement(resource, true);
@@ -590 +590 @@
     
     _unsetRDFValue : function (resource, field, value) {
-//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource _unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource + "\n");
+//      if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource _unsetRDFValue " + this._rdfService  + " " + this._rdfDataSource + "\n");
         var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
         var name = this._rdfService.GetLiteral(value?value:"");
@@ -601 +601 @@
     },
     
-    // this will be used from rdfDataTree to get all RDF values, callFunction is vI_rdfDataTree.__addNewDatum
+    // this will be used from rdfDataTree to get all RDF values, callFunction is vI.rdfDataTreeCollection.__addNewDatum
     readAllEntriesFromRDF : function (addNewDatum, treeType, idData) {
-//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
+//      if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: readAllEntriesFromRDF " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
         var enumerator = this.getContainer(treeType).GetElements();
         while (enumerator && enumerator.hasMoreElements()) {
@@ -613 +613 @@
             var id = this._getRDFValue(resource, "id")
             var smtp = this._getRDFValue(resource, "smtp")
-            if (!smtp) smtp = vI_NO_SMTP_TAG;
-            var extras = new vI_storageExtras(this, resource);
+            if (!smtp) smtp = vI.NO_SMTP_TAG;
+            var extras = new vI.storageExtras(this, resource);
             
-            var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
+            var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
             addNewDatum (resource, name, localIdentityData, idData)
         }
@@ -622 +622 @@
     
     findMatchingFilter : function (recDescription) {
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter for " + recDescription + ".\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter for " + recDescription + ".\n");
         var enumerator = this._filterContainer.GetElements();
         while (enumerator && enumerator.hasMoreElements()) {
@@ -634 +634 @@
             if (filter == "") continue;
             if (/^\/(.*)\/$/.exec(filter))
-                { if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter with RegExp '"
+                { if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter with RegExp '"
                     + filter.replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
-            else    { if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter, compare with '"
+            else    { if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter, compare with '"
                     + filter + "'\n"); recentfilterType = filterType.StrCmp; }
             
@@ -643 +643 @@
                     try {   /^\/(.*)\/$/.exec(filter);
                         if (recDescription.match(new RegExp(RegExp.$1,"i"))) {
-                            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter found stored data.\n");
+                            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter found stored data.\n");
                             return this._readVIdentityFromRDF(resource);
                         }
@@ -650 +650 @@
                 case filterType.StrCmp:
                     if (recDescription.toLowerCase().indexOf(filter.toLowerCase()) != -1) {
-                        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter found stored data.\n");
+                        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter found stored data.\n");
                         return this._readVIdentityFromRDF(resource);
                     }
@@ -656 +656 @@
             }
         }
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: findMatchingFilter no match found.\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: findMatchingFilter no match found.\n");
         return null;
     },
@@ -666 +666 @@
         if (!this._rdfDataSource.hasArcOut(resource, email)) {
             // no data available --> give up.
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF no data found.\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: readVIdentityFromRDF no data found.\n");
             return null;
         }
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: readVIdentityFromRDF found stored data.\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: readVIdentityFromRDF found stored data.\n");
         
         return this._readVIdentityFromRDF(resource);
@@ -679 +679 @@
         var id = this._getRDFValue(resource, "id")
         var smtp = this._getRDFValue(resource, "smtp")
-        if (!smtp) smtp = vI_NO_SMTP_TAG;
+        if (!smtp) smtp = vI.NO_SMTP_TAG;
         
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: email='" + email + 
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: email='" + email + 
             "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
         
-        var extras = new vI_storageExtras(this, resource);
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: extras:" + extras.status() + "\n");
+        var extras = new vI.storageExtras(this, resource);
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: extras:" + extras.status() + "\n");
         
-        var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
+        var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
         return localIdentityData;
     },
 
     _getRDFValue : function (resource, field) {
-//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource _getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource _getRDFValue " + this._rdfService  + " " + this._rdfDataSource + " " + this + "\n");
         var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
         var target = this._rdfDataSource.GetTarget(resource, predicate, true);
@@ -702 +702 @@
         this.updateRDF(recDescription, recType,
             document.getElementById("msgIdentity_clone").identityData,
-            (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
-            (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
+            (vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
+            (vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
             null, null);
     },
@@ -715 +715 @@
 
     updateRDF : function (recDescription, recType, localIdentityData, storeBaseID, storeSMTP, prevRecDescription, prevRecType) {
-//         if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource (" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n");
+//         if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource (" + this._rdfNS + "): updateRDF recDescription=" + recDescription + " localIdentityData.email=" + localIdentityData.email + ".\n");
         
 //      if (!localIdentityData.email) {
-//          if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
+//          if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
 //          return;
 //      }
@@ -728 +728 @@
         var resource = this._getRDFResourceForVIdentity(prevRecDescription, prevRecType);
         if (!resource) return;
-//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
+//      if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
         
         var position = this.getContainer(recType).IndexOf(resource); // check for index in new recType
@@ -740 +740 @@
             this._setRDFValue(resource, "id", localIdentityData.id.key);
         else    this._unsetRDFValue(resource, "id", this._getRDFValue(resource, "id"))
-        if (storeSMTP && localIdentityData.smtp.key != vI_NO_SMTP_TAG)
+        if (storeSMTP && localIdentityData.smtp.key != vI.NO_SMTP_TAG)
             this._setRDFValue(resource, "smtp", localIdentityData.smtp.key);
         else    this._unsetRDFValue(resource, "smtp", this._getRDFValue(resource, "smtp"))
@@ -747 +747 @@
         localIdentityData.extras.loopForRDF(this, resource, "set");
         
-        if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");
+        if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: updateRDF add " + resource.ValueUTF8 + " at position " + position + ".\n");
         if (position != -1) this.getContainer(recType).InsertElementAt(resource, position, true);
         else this.getContainer(recType).AppendElement(resource);
@@ -753 +753 @@
 
     _setRDFValue : function (resource, field, value) {
-//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: _setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
+//      if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: _setRDFValue " + resource.ValueUTF8 + " " + field + " " + value + ".\n");
         if (!value) return value; // return if some value was not set.
-//      if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource _setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");
+//      if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource _setRDFValue " + this._rdfService + " " + this._rdfDataSource + "\n");
         var predicate = this._rdfService.GetResource(this._rdfNS + "rdf#" + field);
         var name = this._rdfService.GetLiteral(value);
@@ -771 +771 @@
         observe : function(subject, topic, data) {
             if (topic == "am-smtpChanges" || topic == "am-acceptChanges") {
-                if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: account/smtp changes observed\n");
+                if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: account/smtp changes observed\n");
                 this.searchIdentityMismatch();
                 this.searchSmtpMismatch();
@@ -778 +778 @@
         },
         register : function() {
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: register AccountManagerObserver\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasource: register AccountManagerObserver\n");
             var obsService = Components.classes["@mozilla.org/observer-service;1"].
                 getService(Components.interfaces.nsIObserverService)
@@ -796 +796 @@
 
 // create with name of the file to import into
-function vI_rdfDatasourceImporter(rdfFileName) {
+function rdfDatasourceImporter(rdfFileName) {
     this._rdfFileName = rdfFileName;
     if (this._rdfFileName) this.import();
 }
 
-vI_rdfDatasourceImporter.prototype = {
+rdfDatasourceImporter.prototype = {
     _rdfService :       Components.classes["@mozilla.org/rdf/rdf-service;1"]
                             .getService(Components.interfaces.nsIRDFService),
@@ -844 +844 @@
             values.id = values.id?values.id:"import_" + id
             relevantIDs[id] = values;
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: translate relevant ID from previous '" + id + "' to current '" + relevantIDs[id].id + "'\n");
         }
         return relevantIDs;
@@ -876 +876 @@
             values.smtp = values.smtp?values.smtp:"import_" + smtp;
             relevantSMTPs[smtp] = values;
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: translate relevant SMTP from previous '" + smtp + "' to current '" + relevantSMTPs[smtp].smtp + "'\n");
         }
         return relevantSMTPs;
@@ -906 +906 @@
         
         if (filePicker.show() == Components.interfaces.nsIFilePicker.returnOK) {
-            if (vI_notificationBar) vI_notificationBar.dump("\n## vI_rdfDatasourceImporter IMPORT\n## vI_rdfDatasourceImporter import: preparation:\n");
+            if (vI.notificationBar) vI.notificationBar.dump("\n## rdfDatasourceImporter IMPORT\n## rdfDatasourceImporter import: preparation:\n");
             
             var importRdfDataFile = Components.classes["@mozilla.org/file/local;1"]
@@ -916 +916 @@
             filePicker.file.copyTo(importRdfDataFile.parent,importRdfDataFile.leafName);
 
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: copied file from " + filePicker.file.path + " to " + importRdfDataFile.path + "'\n");
             
             // init Datasources
-            this._rdfImportDataSource = new vI_rdfDatasource(importRdfDataFile.leafName, true);
+            this._rdfImportDataSource = new rdfDatasource(importRdfDataFile.leafName, true);
             
             // search matching IDs and SMTPs for anyones used in import-file
@@ -925 +925 @@
             var relevantSMTPs = this._translateRelevantSMTPs();
             
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: preparation done.\n");
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: starting import:\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: preparation done.\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: starting import:\n");
 
             for each (treeType in Array("email", "maillist", "newsgroup", "filter")) {
                 // re-initialize importDataSource to point rdfService to the right Resources
-                this._rdfImportDataSource = new vI_rdfDatasource(importRdfDataFile.leafName, true);
+                this._rdfImportDataSource = new rdfDatasource(importRdfDataFile.leafName, true);
                 var container = this._rdfImportDataSource.getContainer(treeType)
                 if (container.GetCount() == 0) continue;
-                if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n");
+                if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter importing " + treeType + ": " + container.GetCount()+ " datasets from " + this._rdfImportDataSource._rdfDataSource.URI + "\n");
                 var enumerator = container.GetElements();
                 // re-initialize dataSource to point rdfService to the right Resources
-                this._rdfDataSource = new vI_rdfDatasource(this._rdfFileName, true);
+                this._rdfDataSource = new rdfDatasource(this._rdfFileName, true);
                 var count = 0;
                 while (enumerator.hasMoreElements()) {
                     var resource = enumerator.getNext(); count += 1;
                     resource.QueryInterface(Components.interfaces.nsIRDFResource);
-                    if (vI_notificationBar) vI_notificationBar.dump("## " + count + " ");
+                    if (vI.notificationBar) vI.notificationBar.dump("## " + count + " ");
                     var name = this._rdfImportDataSource._getRDFValue(resource, "name")
                     var email = this._rdfImportDataSource._getRDFValue(resource, "email")
@@ -948 +948 @@
                     id = id?relevantIDs[id].id:null
                     var smtp = this._rdfImportDataSource._getRDFValue(resource, "smtp")
-                    smtp = (smtp && smtp != vI_DEFAULT_SMTP_TAG)?relevantSMTPs[smtp].smtp:smtp
-                    var extras = new vI_storageExtras(this._rdfImportDataSource, resource);
-                    var localIdentityData = new vI_identityData(email, fullName, id, smtp, extras)
+                    smtp = (smtp && smtp != vI.DEFAULT_SMTP_TAG)?relevantSMTPs[smtp].smtp:smtp
+                    var extras = new vI.storageExtras(this._rdfImportDataSource, resource);
+                    var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
                     
                     this._rdfDataSource.updateRDF(name, treeType, localIdentityData, false, false, null, null)
@@ -959 +959 @@
             }
             
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: removing temporary file " + importRdfDataFile.path + ".\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: removing temporary file " + importRdfDataFile.path + ".\n");
             this._rdfImportDataSource = null; importRdfDataFile.remove(false);
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: import done.\n");
-            
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: cleaning ID/SMTP storages:\n");
-            this._rdfDataSource = new vI_rdfDatasource(this._rdfFileName, true);
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: import done.\n");
+            
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: cleaning ID/SMTP storages:\n");
+            this._rdfDataSource = new rdfDatasource(this._rdfFileName, true);
             
             this._storeMappedIDs(relevantIDs);
@@ -974 +974 @@
             this._rdfDataSource.clean();
             this._rdfDataSource = null;
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter import: cleaning ID/SMTP storages done.\n");
-            if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasourceImporter IMPORT DONE.\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter import: cleaning ID/SMTP storages done.\n");
+            if (vI.notificationBar) vI.notificationBar.dump("## rdfDatasourceImporter IMPORT DONE.\n");
         }
     }
 }
+vI.rdfDatasource = rdfDatasource;
+vI.rdfDatasourceImporter = rdfDatasourceImporter;
+}});

chrome/content/v_identity/vI_smartIdentity.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_smartIdentity = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var smartIdentity = {
     messenger : Components.classes["@mozilla.org/messenger;1"].createInstance()
         .QueryInterface(Components.interfaces.nsIMessenger),
@@ -30 +31 @@
 
     clean : function() {
-        vI_smartIdentity.smartIdentity_BaseIdentity = null;
+        smartIdentity.smartIdentity_BaseIdentity = null;
     },
     
@@ -37 +38 @@
         var type = gMsgCompose.type;
         var msgComposeType = Components.interfaces.nsIMsgCompType;
-        vI_notificationBar.dump("## vI_smartIdentity: msgComposeType = " + type + "\n");
+        vI.notificationBar.dump("## smartIdentity: msgComposeType = " + type + "\n");
         
         switch (type) {
@@ -49 +50 @@
             case msgComposeType.ReplyWithTemplate:
             case msgComposeType.ReplyToList:
-                vI_smartIdentity.Reply(); break;
+                smartIdentity.Reply(); break;
             case msgComposeType.Draft:
             case msgComposeType.Template:
-                vI_smartIdentity.Draft(); break;
+                smartIdentity.Draft(); break;
             case msgComposeType.New:
             case msgComposeType.NewsPost:
             case msgComposeType.MailToUrl:
-                vI_smartIdentity.NewMail(); break;
+                smartIdentity.NewMail(); break;
             }
     },
@@ -62 +63 @@
     // this function adds a timestamp to the current sender
     __autoTimestamp : function() {
-        vI_notificationBar.dump("## vI_smartIdentity: __autoTimestamp()\n");
+        vI.notificationBar.dump("## smartIdentity: __autoTimestamp()\n");
         if (document.getElementById("msgIdentity_clone").vid) {
-            vI_notificationBar.dump("## vI_smartIdentity: Virtual Identity in use, aborting\n");
+            vI.notificationBar.dump("## smartIdentity: Virtual Identity in use, aborting\n");
             return;
         }
@@ -72 +73 @@
         var domain = current_email[1];
         
-        vI_notificationBar.dump("## vI_smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n");
-        
-        var autoString = vI_main.preferences.getCharPref("autoString");
-        var formatString = vI_main.preferences.getCharPref("autoTimeFormat");
+        vI.notificationBar.dump("## smartIdentity: current email: " + current_email[0] + "@" + current_email[1] + "\n");
+        
+        var autoString = vI.main.preferences.getCharPref("autoString");
+        var formatString = vI.main.preferences.getCharPref("autoTimeFormat");
         
         var dateObj = new Date(); var dateString = "";
@@ -84 +85 @@
         
         var new_email = autoString.replace(/%l/g, localpart).replace(/%d/g, domain).replace(/%t/g,dateString);
-        vI_notificationBar.dump("## vI_smartIdentity: new email: " + new_email + "\n");
-
-        vI_notificationBar.setNote(vI_main.elements.strings.getString("vident.smartIdentity.vIUsage") + ".",
+        vI.notificationBar.dump("## smartIdentity: new email: " + new_email + "\n");
+
+        vI.notificationBar.setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIUsage") + ".",
                     "smart_reply_notification");
 
@@ -93 +94 @@
     
     __ignoreID : function() {
-        vI_notificationBar.dump("## vI_smartIdentity: checking " + vI_main.preferences.getCharPref("idSelection_ignoreIDs") + " against " + vI_main.elements.Obj_MsgIdentity.value + "\n")
+        vI.notificationBar.dump("## smartIdentity: checking " + vI.main.preferences.getCharPref("idSelection_ignoreIDs") + " against " + vI.main.elements.Obj_MsgIdentity.value + "\n")
         // check if usage if virtual Identities should be used at all for the currently selected ID
-        if (vI_main.preferences.getCharPref("idSelection_ignoreIDs").indexOf(":" + vI_main.elements.Obj_MsgIdentity.value + ":") != -1) {
-            vI_notificationBar.dump("## vI_smartIdentity: not using virtual Identites for ID " + vI_main.elements.Obj_MsgIdentity.value + "\n");
+        if (vI.main.preferences.getCharPref("idSelection_ignoreIDs").indexOf(":" + vI.main.elements.Obj_MsgIdentity.value + ":") != -1) {
+            vI.notificationBar.dump("## smartIdentity: not using virtual Identites for ID " + vI.main.elements.Obj_MsgIdentity.value + "\n");
             return true;
         }
@@ -103 +104 @@
     
     NewMail : function() {
-        if (vI_smartIdentity.__ignoreID()) return;
+        if (smartIdentity.__ignoreID()) return;
         
-        var storageIdentities = new vI_identityCollection();
-        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
-        
-        if (storageIdentities.number > 0) vI_smartIdentity.__smartIdentitySelection(storageIdentities, false)
-        else if (vI_main.preferences.getBoolPref("autoTimestamp")) vI_smartIdentity.__autoTimestamp();  
+        var storageIdentities = new vI.identityCollection();
+        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
+        
+        if (storageIdentities.number > 0) smartIdentity.__smartIdentitySelection(storageIdentities, false)
+        else if (vI.main.preferences.getBoolPref("autoTimestamp")) smartIdentity.__autoTimestamp(); 
     },
     
     ReplyOnSent : function(hdr) {
-        vI_notificationBar.dump("## vI_smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");
-        
-        var allIdentities = new vI_identityCollection();
-
-        vI_smartIdentity.__SmartDraftOrReplyOnSent(hdr, allIdentities);
-        var storageIdentities = new vI_identityCollection();
-        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
+        vI.notificationBar.dump("## smartIdentity: ReplyOnSent() (rules like SmartDraft)\n");
+        
+        var allIdentities = new vI.identityCollection();
+
+        smartIdentity.__SmartDraftOrReplyOnSent(hdr, allIdentities);
+        var storageIdentities = new vI.identityCollection();
+        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
         
         allIdentities.mergeWithoutDuplicates(storageIdentities);
             
-        if (allIdentities.number > 0) vI_smartIdentity.__smartIdentitySelection(allIdentities, true);
+        if (allIdentities.number > 0) smartIdentity.__smartIdentitySelection(allIdentities, true);
 
     },
 
     Draft : function() {
-        vI_notificationBar.dump("## vI_smartIdentity: Draft()\n");
-        
-        var allIdentities = new vI_identityCollection();
-
-        var draftHdr = vI_smartIdentity.messenger.
+        vI.notificationBar.dump("## smartIdentity: Draft()\n");
+        
+        var allIdentities = new vI.identityCollection();
+
+        var draftHdr = smartIdentity.messenger.
             messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
         // fails with seamonkey 1.1.11, so just try to read to draft id
-        try { draftHdr = vI_smartIdentity.messenger.
+        try { draftHdr = smartIdentity.messenger.
             messageServiceFromURI(gMsgCompose.compFields.draftId).messageURIToMsgHdr(gMsgCompose.compFields.draftId);
         } catch (ex) { };
 
-        vI_smartIdentity.__SmartDraftOrReplyOnSent(draftHdr, allIdentities);
-        var storageIdentities = new vI_identityCollection();
-        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
+        smartIdentity.__SmartDraftOrReplyOnSent(draftHdr, allIdentities);
+        var storageIdentities = new vI.identityCollection();
+        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
         
         allIdentities.mergeWithoutDuplicates(storageIdentities);
             
-        if (allIdentities.number > 0) vI_smartIdentity.__smartIdentitySelection(allIdentities, true);
+        if (allIdentities.number > 0) smartIdentity.__smartIdentitySelection(allIdentities, true);
     },
     
     __parseHeadersWithArray: function(hdr, allIdentities) {
         var emails = {}; var fullNames = {}; var combinedNames = {};
-        var number = vI_main.headerParser.parseHeadersWithArray(hdr, emails, fullNames, combinedNames);
+        var number = vI.main.headerParser.parseHeadersWithArray(hdr, emails, fullNames, combinedNames);
         for (var index = 0; index < number; index++) {
-            var newIdentity = new vI_identityData(emails.value[index], fullNames.value[index],
-                null, vI_NO_SMTP_TAG, null, null);
+            var newIdentity = new vI.identityData(emails.value[index], fullNames.value[index],
+                null, vI.NO_SMTP_TAG, null, null);
             allIdentities.addWithoutDuplicates(newIdentity);
         }
@@ -160 +161 @@
     // this function checks if we have a draft-case and Smart-Draft should replace the Identity
     __SmartDraftOrReplyOnSent : function(hdr, allIdentities) {
-        if (!vI_main.preferences.getBoolPref("smart_draft"))
-            { vI_notificationBar.dump("## vI_smartIdentity: SmartDraft deactivated\n"); return; }
-
-        vI_notificationBar.dump("## vI_smartIdentity: __SmartDraftOrReplyOnSent()\n");
+        if (!vI.main.preferences.getBoolPref("smart_draft"))
+            { vI.notificationBar.dump("## smartIdentity: SmartDraft deactivated\n"); return; }
+
+        vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent()\n");
 
         if (hdr) {
-            vI_smartIdentity.__parseHeadersWithArray(hdr.author, allIdentities)
-            vI_notificationBar.dump("## vI_smartIdentity: sender '" + allIdentities.identityDataCollection[0].combinedName + "'\n");
-        }
-        else vI_notificationBar.dump("## vI_smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
+            smartIdentity.__parseHeadersWithArray(hdr.author, allIdentities)
+            vI.notificationBar.dump("## smartIdentity: sender '" + allIdentities.identityDataCollection[0].combinedName + "'\n");
+        }
+        else vI.notificationBar.dump("## smartIdentity: __SmartDraftOrReplyOnSent: No Header found, shouldn't happen\n");
     },
     
     __filterAddresses : function(smartIdentities) {
-        var returnIdentities = new vI_identityCollection();
+        var returnIdentities = new vI.identityCollection();
         
         var filterList  =
-            vI_main.unicodeConverter.ConvertToUnicode(vI_main.preferences.getCharPref("smart_reply_filter")).split(/\n/)
+            vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("smart_reply_filter")).split(/\n/)
         if (filterList.length == 0) filterList[0] == ""
         
@@ -183 +184 @@
             var recentfilterType; var skipRegExp = false;
             if (filterList.length <= 1 && filterList[0] == "")
-                { vI_notificationBar.dump("## vI_smartIdentity: no filters configured\n"); recentfilterType = filterType.None; }
+                { vI.notificationBar.dump("## smartIdentity: no filters configured\n"); recentfilterType = filterType.None; }
             else if (/^[+-]?\/(.*)\/$/.exec(filterList[i]))
-                { vI_notificationBar.dump("## vI_smartIdentity: filter emails with RegExp '"
+                { vI.notificationBar.dump("## smartIdentity: filter emails with RegExp '"
                     + filterList[i].replace(/\\/g,"\\\\") + "'\n"); recentfilterType = filterType.RegExp; }
-            else    { vI_notificationBar.dump("## vI_smartIdentity: filter emails, compare with '"
+            else    { vI.notificationBar.dump("## smartIdentity: filter emails, compare with '"
                     + filterList[i] + "'\n"); recentfilterType = filterType.StrCmp; }
             for (var j = 0; j < smartIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in 
@@ -205 +206 @@
                         }
                         catch(vErr) {
-                            vI_notificationBar.addNote(
-                                vI_main.elements.strings.getString("vident.smartIdentity.ignoreRegExp") +
+                            vI.notificationBar.addNote(
+                                vI.main.elements.strings.getString("vident.smartIdentity.ignoreRegExp") +
                                 +filterList[i].replace(/\\/g,"\\\\") + " .",
                                 "smart_reply_notification");
@@ -223 +224 @@
     __smartReplyCollectAddresses : function(hdr, allIdentities) {
         // add emails from selected headers (stored by vI_getHeader.xul/js)
-        var reply_headers = vI_main.unicodeConverter.ConvertToUnicode(vI_main.preferences.getCharPref("smart_reply_headers")).split(/\n/)
+        var reply_headers = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("smart_reply_headers")).split(/\n/)
                     
         for (var index = 0; index < reply_headers.length; index++) {
@@ -243 +244 @@
             // if mailing-list ignore to-header (usually the mailing list address)
             if (replyHeaderNameToRead == "to" && hdr.getStringProperty("vI_list-id")) {
-                vI_notificationBar.dump("## vI_smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n");
+                vI.notificationBar.dump("## smartIdentity: header 'list-id' found (mailinglist), skipping header 'to'\n");
                 continue;
             }
             
             // ------------- read the stored header -------------------------------
-            var value = vI_main.unicodeConverter.ConvertToUnicode(hdr.getStringProperty("vI_" + replyHeaderNameToRead))
-            vI_notificationBar.dump("## vI_smartIdentity: reading header '" +
+            var value = vI.main.unicodeConverter.ConvertToUnicode(hdr.getStringProperty("vI_" + replyHeaderNameToRead))
+            vI.notificationBar.dump("## smartIdentity: reading header '" +
                 replyHeaderNameToRead + "': '" + value + "'\n");
             
             // ------------- parse address-string to get a field of single email-addresses
-            var splitted = new vI_identityCollection();
-            vI_smartIdentity.__parseHeadersWithArray(value, splitted);
+            var splitted = new vI.identityCollection();
+            smartIdentity.__parseHeadersWithArray(value, splitted);
             
             // move found addresses step by step to allIdentities, and change values if requested
@@ -260 +261 @@
                 // if there is no email than it makes no sense to use it as a sender
                 if (!splitted.identityDataCollection[i].email.match(/^.*@.*$/)) {
-                    vI_notificationBar.dump("## vI_smartIdentity:   skipping '" +
+                    vI.notificationBar.dump("## smartIdentity:   skipping '" +
                     splitted.identityDataCollection[i].email + "', no email\n")
                     continue;
@@ -269 +270 @@
                 allIdentities.addWithoutDuplicates(splitted.identityDataCollection[i]);
 
-                vI_notificationBar.dump("## vI_smartIdentity:   found '" +
+                vI.notificationBar.dump("## smartIdentity:   found '" +
                     splitted.identityDataCollection[i].combinedName + "'\n")
             }
@@ -276 +277 @@
     
     Reply : function() {
-        var hdr = vI_smartIdentity.messenger.
+        var hdr = smartIdentity.messenger.
             messageServiceFromURI(gMsgCompose.originalMsgURI).messageURIToMsgHdr(gMsgCompose.originalMsgURI);
 
-        vI_notificationBar.dump("## vI_smartIdentity: Reply()\n");
+        vI.notificationBar.dump("## smartIdentity: Reply()\n");
 
         if (hdr && !gMsgCompose.compFields.newsgroups && !hdr.getStringProperty("vI_content_base")) {
@@ -291 +292 @@
         //  hidden option smart_detectByReceivedHeader will act as a switch for not RFC-compliant servers
             // RFC-compliant
-            if (vI_main.preferences.getBoolPref("smart_detectByReceivedHeader")) {
+            if (vI.main.preferences.getBoolPref("smart_detectByReceivedHeader")) {
                 if (!hdr.getStringProperty("vI_received")) { // mail was not received
-                    vI_notificationBar.dump("## vI_smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n");
-                    vI_smartIdentity.ReplyOnSent(hdr);
+                    vI.notificationBar.dump("## smartIdentity: reply on non-received (sent?) mail. Using SmartDraft. \n");
+                    smartIdentity.ReplyOnSent(hdr);
                     return;
                 }
@@ -304 +305 @@
 
                 if (hdr && (hdr.folder.flags & MSG_FOLDER_FLAG_SENTMAIL)) {
-                    vI_notificationBar.dump("## vI_smartIdentity: reply from Sent folder.");
+                    vI.notificationBar.dump("## smartIdentity: reply from Sent folder.");
                     if (hdr.folder.flags & MSG_FOLDER_FLAG_INBOX)
-                        vI_notificationBar.dump(" Folder is INBOX, assuming Reply-Case. \n");
+                        vI.notificationBar.dump(" Folder is INBOX, assuming Reply-Case. \n");
                     else {
-                        vI_notificationBar.dump(" Using SmartDraft. \n");
-                        vI_smartIdentity.ReplyOnSent(hdr);
+                        vI.notificationBar.dump(" Using SmartDraft. \n");
+                        smartIdentity.ReplyOnSent(hdr);
                         return;
                     }
@@ -316 +317 @@
         }
         
-        if (vI_smartIdentity.__ignoreID()) return;
-        
-        var storageIdentities = new vI_identityCollection();
-        vI_storage.getVIdentityFromAllRecipients(storageIdentities);
-        
-        var smartIdentities = new vI_identityCollection();
-        if (storageIdentities.number == 0 || !vI_main.preferences.getBoolPref("idSelection_storage_ignore_smart_reply"))
-            vI_smartIdentity.__SmartReply(hdr, smartIdentities);
-        else vI_notificationBar.dump("## vI_smartIdentity: SmartReply skipped, Identities in Storage found.\n");
+        if (smartIdentity.__ignoreID()) return;
+        
+        var storageIdentities = new vI.identityCollection();
+        vI.storage.getVIdentityFromAllRecipients(storageIdentities);
+        
+        var smartIdentities = new vI.identityCollection();
+        if (storageIdentities.number == 0 || !vI.main.preferences.getBoolPref("idSelection_storage_ignore_smart_reply"))
+            smartIdentity.__SmartReply(hdr, smartIdentities);
+        else vI.notificationBar.dump("## smartIdentity: SmartReply skipped, Identities in Storage found.\n");
 
         // merge SmartReply-Identities and Storage-Identites
-        if (vI_main.preferences.getBoolPref("idSelection_storage_prefer_smart_reply"))
+        if (vI.main.preferences.getBoolPref("idSelection_storage_prefer_smart_reply"))
             { smartIdentities.mergeWithoutDuplicates(storageIdentities); var allIdentities = smartIdentities; }
         else
             { storageIdentities.mergeWithoutDuplicates(smartIdentities); var allIdentities = storageIdentities; }
         
-        vI_notificationBar.dump("## vI_smartIdentity: merged SmartReply & Storage, " + allIdentities.number + " address(es) left\n")
-        
-        if (allIdentities.number > 0) vI_smartIdentity.__smartIdentitySelection(allIdentities, false);
+        vI.notificationBar.dump("## smartIdentity: merged SmartReply & Storage, " + allIdentities.number + " address(es) left\n")
+        
+        if (allIdentities.number > 0) smartIdentity.__smartIdentitySelection(allIdentities, false);
     },
     
     // this function checks if we have a reply-case and Smart-Reply should replace the Identity
     __SmartReply : function(hdr, smartIdentities) {
-        if (!vI_main.preferences.getBoolPref("smart_reply"))
-            { vI_notificationBar.dump("## vI_smartIdentity: SmartReply deactivated\n"); return; }
-        if (gMsgCompose.compFields.newsgroups && !vI_main.preferences.getBoolPref("smart_reply_for_newsgroups")) {
-            vI_notificationBar.dump("## vI_smartIdentity: SmartReply, answering to a newsgroup, aborting\n");
+        if (!vI.main.preferences.getBoolPref("smart_reply"))
+            { vI.notificationBar.dump("## smartIdentity: SmartReply deactivated\n"); return; }
+        if (gMsgCompose.compFields.newsgroups && !vI.main.preferences.getBoolPref("smart_reply_for_newsgroups")) {
+            vI.notificationBar.dump("## smartIdentity: SmartReply, answering to a newsgroup, aborting\n");
             return;
         }
 
-        vI_notificationBar.dump("## vI_smartIdentity: __SmartReply()\n");
-        vI_notificationBar.dump("## vI_smartIdentity: ----------------------------------------------------------\n")
+        vI.notificationBar.dump("## smartIdentity: __SmartReply()\n");
+        vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")
         if (hdr) {
             /* first step: collect addresses */
-            vI_smartIdentity.__smartReplyCollectAddresses(hdr, smartIdentities);
-            vI_notificationBar.dump("## vI_smartIdentity: " + smartIdentities.number + " address(es) after parsing, before filtering\n")
+            smartIdentity.__smartReplyCollectAddresses(hdr, smartIdentities);
+            vI.notificationBar.dump("## smartIdentity: " + smartIdentities.number + " address(es) after parsing, before filtering\n")
             
             /* second step: filter (and sort) addresses */
-            vI_smartIdentity.__filterAddresses(smartIdentities);
-            
-            vI_notificationBar.dump("## vI_smartIdentity: filtering done, " + smartIdentities.number + " address(es) left\n")
+            smartIdentity.__filterAddresses(smartIdentities);
+            
+            vI.notificationBar.dump("## smartIdentity: filtering done, " + smartIdentities.number + " address(es) left\n")
             
             /* set default FullName */
-            var smart_reply_defaultFullName = vI_main.unicodeConverter.ConvertToUnicode(vI_main.preferences.getCharPref("smart_reply_defaultFullName"))
+            var smart_reply_defaultFullName = vI.main.unicodeConverter.ConvertToUnicode(vI.main.preferences.getCharPref("smart_reply_defaultFullName"))
             if (smart_reply_defaultFullName != "") {
                 for (var index = 0; index < smartIdentities.number; index++) {
                     if (smartIdentities.identityDataCollection[index].fullName == "") {
                         smartIdentities.identityDataCollection[index].fullName = smart_reply_defaultFullName
-                        vI_notificationBar.dump("## vI_smartIdentity: added default FullName '" + 
+                        vI.notificationBar.dump("## smartIdentity: added default FullName '" + 
                             smart_reply_defaultFullName + "' to '" + smartIdentities.identityDataCollection[index].email + "'\n")
                     }
@@ -373 +374 @@
             /* if match replace FullName with existing one, keep identity in list by now        */
             /* will not be added to the menu but probably choosen with __smartIdentitySelection     */
-            if (vI_main.preferences.getBoolPref("smart_reply_ignoreFullName")) {
-                vI_notificationBar.dump("## vI_smartIdentity: compare with existing Identities (ignoring FullNames).\n")
+            if (vI.main.preferences.getBoolPref("smart_reply_ignoreFullName")) {
+                vI.notificationBar.dump("## smartIdentity: compare with existing Identities (ignoring FullNames).\n")
             
                 for (var index = 0; index < smartIdentities.number; index++) {
@@ -381 +382 @@
                         var newFullName = gAccountManager.getIdentity(idKey).fullName;
                         smartIdentities.identityDataCollection[index].fullName = newFullName;
-                        vI_notificationBar.dump("## vI_smartIdentity: replaced Fullname of '" + smartIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
+                        vI.notificationBar.dump("## smartIdentity: replaced Fullname of '" + smartIdentities.identityDataCollection[index].email + "' with '" + newFullName + "' \n");
                     }
                 }
             }
         }
-        else vI_notificationBar.dump("## vI_smartIdentity: SmartReply skipped. No Header-information found.\n");
-        
-        vI_notificationBar.dump("## vI_smartIdentity: ----------------------------------------------------------\n")
+        else vI.notificationBar.dump("## smartIdentity: SmartReply skipped. No Header-information found.\n");
+        
+        vI.notificationBar.dump("## smartIdentity: ----------------------------------------------------------\n")
     },
     
@@ -398 +399 @@
                 allIdentities.identityDataCollection[index].id.key = existingID;    // set found identity
                 // if 'preferExisting' than select it and return
-                if (vI_main.preferences.getBoolPref("idSelection_preferExisting")) {
-                    vI_notificationBar.dump("## vI_smartIdentity: found existing Identity, use without interaction.\n");
+                if (vI.main.preferences.getBoolPref("idSelection_preferExisting")) {
+                    vI.notificationBar.dump("## smartIdentity: found existing Identity, use without interaction.\n");
                     // add all Indentities to Clone Menu before selecting and leaving the function
                     document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
-                    vI_smartIdentity.changeIdentityToSmartIdentity(allIdentities, index);
+                    smartIdentity.changeIdentityToSmartIdentity(allIdentities, index);
                     return;
                 }
                 // else reorder list of Identities to prefer it on autoselect
                 // has to be done before Identities are added to the Menu
-                vI_notificationBar.dump("## vI_smartIdentity: found existing Identity, prefer this one.\n");
+                vI.notificationBar.dump("## smartIdentity: found existing Identity, prefer this one.\n");
                 var firstIdentity = allIdentities.identityDataCollection[index];
                 for (var i = index; index > 0; index--) {
@@ -419 +420 @@
         document.getElementById("msgIdentity_clone").addIdentitiesToCloneMenu(allIdentities);
 
-        if (!autocreate && vI_main.preferences.getBoolPref("idSelection_ask") && 
-            ((allIdentities.number == 1 && vI_main.preferences.getBoolPref("idSelection_ask_always"))
+        if (!autocreate && vI.main.preferences.getBoolPref("idSelection_ask") && 
+            ((allIdentities.number == 1 && vI.main.preferences.getBoolPref("idSelection_ask_always"))
                 || allIdentities.number > 1)) {
             for (var index = 0; index < allIdentities.number; index++) {
-                vI_notificationBar.dump("## vI_smartIdentityReplyDialog index=" + index + ": '" + allIdentities.identityDataCollection[index].combinedName + "' "
+                vI.notificationBar.dump("## smartIdentityReplyDialog index=" + index + ": '" + allIdentities.identityDataCollection[index].combinedName + "' "
                     + "(" + allIdentities.identityDataCollection[index].id.value + "," + allIdentities.identityDataCollection[index].smtp.value + ")\n");
             }
@@ -429 +430 @@
                     "chrome, dialog, modal, alwaysRaised, resizable=yes",
                      allIdentities,
-                    /* callback: */ vI_smartIdentity.changeIdentityToSmartIdentity).focus();
-        }
-        else if (autocreate || vI_main.preferences.getBoolPref("idSelection_autocreate")) {
-            vI_smartIdentity.changeIdentityToSmartIdentity(allIdentities, 0);
+                    /* callback: */ smartIdentity.changeIdentityToSmartIdentity).focus();
+        }
+        else if (autocreate || vI.main.preferences.getBoolPref("idSelection_autocreate")) {
+            smartIdentity.changeIdentityToSmartIdentity(allIdentities, 0);
         }   
     },
     
     changeIdentityToSmartIdentity : function(allIdentities, selectedValue) {
-        vI_notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
+        vI.notificationBar.dump("## changeIdentityToSmartIdentity selectedValue=" + selectedValue + ": '" + allIdentities.identityDataCollection[selectedValue].combinedName + "' "
             + "(" + allIdentities.identityDataCollection[selectedValue].id.value + "," + allIdentities.identityDataCollection[selectedValue].smtp.value + ")\n");
         document.getElementById("msgIdentity_clone").selectedMenuItem = allIdentities.menuItems[selectedValue];
         if (document.getElementById("msgIdentity_clone").vid) {
-            var label=vI_main.elements.strings.getString("vident.smartIdentity.vIUsage");
+            var label=vI.main.elements.strings.getString("vident.smartIdentity.vIUsage");
             if (allIdentities.number > 1) label += " "
-                + vI_main.elements.strings.getString("vident.smartIdentity.moreThanOne");
-            vI_notificationBar.addNote(label + ".", "smart_reply_notification");
-        }
-        vI_smartIdentity.__removeSmartIdentityFromRecipients(allIdentities, selectedValue);
+                + vI.main.elements.strings.getString("vident.smartIdentity.moreThanOne");
+            vI.notificationBar.addNote(label + ".", "smart_reply_notification");
+        }
+        smartIdentity.__removeSmartIdentityFromRecipients(allIdentities, selectedValue);
     },
     
     __removeSmartIdentityFromRecipients : function(allIdentities, index) {
-        if (!vI_main.preferences.getBoolPref("idSelection_removeSmartIdentityFromRecipients")) return;
+        if (!vI.main.preferences.getBoolPref("idSelection_removeSmartIdentityFromRecipients")) return;
         
         // check if selected email is defined as doBcc address. If so, it should not be removed.
         var skip_bcc = false;
         if (getCurrentIdentity().doBcc) {
-            var bcc_addresses = new vI_identityCollection();
-            vI_smartIdentity.__parseHeadersWithArray(getCurrentIdentity().doBccList, bcc_addresses);
+            var bcc_addresses = new vI.identityCollection();
+            smartIdentity.__parseHeadersWithArray(getCurrentIdentity().doBccList, bcc_addresses);
             
             for (var i = 0; i < bcc_addresses.number; i++) {
@@ -487 +488 @@
                     awSetInputAndPopupValue(input, "", popup, "addr_to", -1);
                     awCleanupRows()
-                    vI_notificationBar.addNote(" " +
-                        vI_main.elements.strings.getString("vident.smartIdentity.remRecipient"),
+                    vI.notificationBar.addNote(" " +
+                        vI.main.elements.strings.getString("vident.smartIdentity.remRecipient"),
                         "smart_reply_notification");
                     break;
@@ -495 +496 @@
     }
 }
+vI.smartIdentity = smartIdentity;
+}});

chrome/content/v_identity/vI_smartReplyDialog.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_smartReply_dialog = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var smartReply_dialog = {
     Obj_radioGroup : null,
     all_addresses : null,
 
     init : function() { 
-        vI_smartReply_dialog.Obj_radioGroup = document.getElementById("replySelector.radiogroup");
-        vI_smartReply_dialog.all_addresses = window.arguments[0];
-        for (var index = 0; index < vI_smartReply_dialog.all_addresses.number; index++) {
-            var menuentry = vI_smartReply_dialog.all_addresses.identityDataCollection[index].combinedName;
+        smartReply_dialog.Obj_radioGroup = document.getElementById("replySelector.radiogroup");
+        smartReply_dialog.all_addresses = window.arguments[0];
+        for (var index = 0; index < smartReply_dialog.all_addresses.number; index++) {
+            var menuentry = smartReply_dialog.all_addresses.identityDataCollection[index].combinedName;
 
             var id = null; var smtp = null;
 
-            if (vI_smartReply_dialog.all_addresses.identityDataCollection[index].id)
-                id = vI_smartReply_dialog.all_addresses.identityDataCollection[index].id.value;
-            if (vI_smartReply_dialog.all_addresses.identityDataCollection[index].smtp)
-                smtp = vI_smartReply_dialog.all_addresses.identityDataCollection[index].smtp.value;
+            if (smartReply_dialog.all_addresses.identityDataCollection[index].id)
+                id = smartReply_dialog.all_addresses.identityDataCollection[index].id.value;
+            if (smartReply_dialog.all_addresses.identityDataCollection[index].smtp)
+                smtp = smartReply_dialog.all_addresses.identityDataCollection[index].smtp.value;
 
             menuentry += (id?" (" + id + "," + 
                     (smtp?smtp:document.getElementById("bundle_messenger").getString("defaultServerTag")) +
                     ")":"")
-            vI_smartReply_dialog.add_row(menuentry);
+            smartReply_dialog.add_row(menuentry);
         }
     },
@@ -50 +51 @@
         var radio = document.createElement("radio");
         radio.setAttribute("label",combinedName);
-        vI_smartReply_dialog.Obj_radioGroup.appendChild(radio);
+        smartReply_dialog.Obj_radioGroup.appendChild(radio);
     },
 
     accept : function() {
         /* window.argument[1] stores callback function */
-        window.arguments[1](vI_smartReply_dialog.all_addresses, vI_smartReply_dialog.Obj_radioGroup.selectedIndex);
+        window.arguments[1](smartReply_dialog.all_addresses, smartReply_dialog.Obj_radioGroup.selectedIndex);
         document.documentElement.acceptDialog();
     }
 }
-window.addEventListener("load", vI_smartReply_dialog.init, false);
+window.addEventListener("load", smartReply_dialog.init, false);
+}});

chrome/content/v_identity/vI_smartReplyDialog.xul

@@ -37 +37 @@
     zlevel="6">
 
-<script type="application/x-javascript"
-            src="chrome://v_identity/content/vI_smartReplyDialog.js" />
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_smartReplyDialog.js" />
 
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
@@ -49 +49 @@
     <caption label="&vident.replySelector.caption.label;"/>
 
-    <radiogroup id="replySelector.radiogroup" oncommand="vI_smartReply_dialog.accept();">
+    <radiogroup id="replySelector.radiogroup" oncommand="virtualIdentityExtension.smartReply_dialog.accept();">
     </radiogroup>
   </groupbox>

chrome/content/v_identity/vI_statusmenu.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_statusmenu = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var statusmenu = {
     prefroot : Components.classes["@mozilla.org/preferences-service;1"]
         .getService(Components.interfaces.nsIPrefService)
@@ -41 +42 @@
         switch (data) {
             case "extensions.virtualIdentity.fcc_show_switch":
-                vI_statusmenu.objFccSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
+                statusmenu.objFccSwitch.setAttribute("hidden", !statusmenu.prefroot.getBoolPref(data));
                 // no break, continue like with doFcc           
             case "extensions.virtualIdentity.doFcc":
-                vI_statusmenu.objFccSwitch.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.doFcc"));
+                statusmenu.objFccSwitch.setAttribute("checked", statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.doFcc"));
                 break;
             case "extensions.virtualIdentity.storage_show_switch":
-                vI_statusmenu.objSaveSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
+                statusmenu.objSaveSwitch.setAttribute("hidden", !statusmenu.prefroot.getBoolPref(data));
                 break;
             case "extensions.virtualIdentity.storage_show_baseID_switch":
-                vI_statusmenu.objSaveBaseIDSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
+                statusmenu.objSaveBaseIDSwitch.setAttribute("hidden", !statusmenu.prefroot.getBoolPref(data));
                 break;
             case "extensions.virtualIdentity.storage_show_SMTP_switch":
-                vI_statusmenu.objSaveSMTPSwitch.setAttribute("hidden", !vI_statusmenu.prefroot.getBoolPref(data));
+                statusmenu.objSaveSMTPSwitch.setAttribute("hidden", !statusmenu.prefroot.getBoolPref(data));
                 break;
             case "extensions.virtualIdentity.storage_storedefault":
-                vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage_storedefault"));
+                statusmenu.objStorageSaveMenuItem.setAttribute("checked", statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage_storedefault"));
                 break;
             case "extensions.virtualIdentity.storage_store_base_id":
-                vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref(data));
+                statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", statusmenu.prefroot.getBoolPref(data));
                 break;
             case "extensions.virtualIdentity.storage_store_SMTP":
-                vI_statusmenu.objSaveSMTPMenuItem.setAttribute("checked", vI_statusmenu.prefroot.getBoolPref(data));
+                statusmenu.objSaveSMTPMenuItem.setAttribute("checked", statusmenu.prefroot.getBoolPref(data));
                 break;
             case "extensions.virtualIdentity.storage_colorIndication":
-                document.getElementById("identityHbox").setAttribute("colorize", vI_statusmenu.prefroot.getBoolPref(data))
-                document.getElementById("baseIDHbox").setAttribute("colorize", vI_statusmenu.prefroot.getBoolPref(data))
-                document.getElementById("smtpServerHbox").setAttribute("colorize", vI_statusmenu.prefroot.getBoolPref(data))
+                document.getElementById("identityHbox").setAttribute("colorize", statusmenu.prefroot.getBoolPref(data))
+                document.getElementById("baseIDHbox").setAttribute("colorize", statusmenu.prefroot.getBoolPref(data))
+                document.getElementById("smtpServerHbox").setAttribute("colorize", statusmenu.prefroot.getBoolPref(data))
                 break;
             case "extensions.virtualIdentity.storage":
-                if (vI_statusmenu.prefroot.getBoolPref(data)) {
-                    vI_statusmenu.objStorageSaveMenuItem.removeAttribute("hidden");
-                    vI_statusmenu.objSaveBaseIDMenuItem.removeAttribute("hidden");
-                    vI_statusmenu.objSaveSMTPMenuItem.removeAttribute("hidden");
-                    vI_statusmenu.objStatusMenuSeparator.removeAttribute("hidden");
+                if (statusmenu.prefroot.getBoolPref(data)) {
+                    statusmenu.objStorageSaveMenuItem.removeAttribute("hidden");
+                    statusmenu.objSaveBaseIDMenuItem.removeAttribute("hidden");
+                    statusmenu.objSaveSMTPMenuItem.removeAttribute("hidden");
+                    statusmenu.objStatusMenuSeparator.removeAttribute("hidden");
                 }
                 else {
-                    vI_statusmenu.objStorageSaveMenuItem.setAttribute("hidden", "true");
-                    vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("hidden", "true");
-                    vI_statusmenu.objSaveSMTPMenuItem.setAttribute("hidden", "true");
-                    vI_statusmenu.objStatusMenuSeparator.setAttribute("hidden", "true");
+                    statusmenu.objStorageSaveMenuItem.setAttribute("hidden", "true");
+                    statusmenu.objSaveBaseIDMenuItem.setAttribute("hidden", "true");
+                    statusmenu.objSaveSMTPMenuItem.setAttribute("hidden", "true");
+                    statusmenu.objStatusMenuSeparator.setAttribute("hidden", "true");
                 }
                 break;
         }
-        vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);
+        statusmenu.menuConstraint(statusmenu.objStorageSaveMenuItem);
     },
     
     addObserver: function() {
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.fcc_show_switch", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.doFcc", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_switch", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_baseID_switch", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_SMTP_switch", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_colorIndication", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_storedefault", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_base_id", vI_statusmenu, false);
-        vI_statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_SMTP", vI_statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.fcc_show_switch", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.doFcc", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_switch", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_baseID_switch", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_show_SMTP_switch", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_colorIndication", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_storedefault", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_base_id", statusmenu, false);
+        statusmenu.prefroot.addObserver("extensions.virtualIdentity.storage_store_SMTP", statusmenu, false);
     },
     
     removeObserver: function() {
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.fcc_show_switch", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.doFcc", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_switch", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_baseID_switch", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_SMTP_switch", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_colorIndication", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_storedefault", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_base_id", vI_statusmenu);
-        vI_statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_SMTP", vI_statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.fcc_show_switch", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.doFcc", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_switch", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_baseID_switch", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_show_SMTP_switch", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_colorIndication", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_storedefault", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_base_id", statusmenu);
+        statusmenu.prefroot.removeObserver("extensions.virtualIdentity.storage_store_SMTP", statusmenu);
     },
     
     init : function () {
-        vI_statusmenu.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
-
-        vI_statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
-        vI_statusmenu.objSaveBaseIDMenuItem = document.getElementById("vI_statusMenu_storage_saveBaseID");
-        vI_statusmenu.objSaveSMTPMenuItem = document.getElementById("vI_statusMenu_storage_saveSMTP");
-        vI_statusmenu.objStorageSaveMenuItem = document.getElementById("vI_statusMenu_storage_save");
-        vI_statusmenu.objStatusMenuSeparator = document.getElementById("vI_statusMenu_separator");
-        vI_statusmenu.objSaveSwitch = document.getElementById("saveSwitch");
-        vI_statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
-        vI_statusmenu.objSaveSMTPSwitch = document.getElementById("saveSMTPSwitch");
-        vI_statusmenu.objFccSwitch = document.getElementById("fcc_switch");
-        vI_statusmenu.objStatusText = document.getElementById("statusText");
-        vI_statusmenu.objStatusTooltipLine1 = document.getElementById("vI_statusMenuTooltip_StatusValueLine1");
-        vI_statusmenu.objStatusTooltipLine2 = document.getElementById("vI_statusMenuTooltip_StatusValueLine2");
-
-        vI_statusmenu.addObserver();
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.fcc_show_switch");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_switch");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_baseID_switch");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_SMTP_switch");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_colorIndication");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_base_id");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_SMTP");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage_storedefault");
-        vI_statusmenu.observe(null, null, "extensions.virtualIdentity.storage");
+        statusmenu.prefroot.QueryInterface(Components.interfaces.nsIPrefBranch2);
+
+        statusmenu.objStatusMenu = document.getElementById("vI-status-menu");
+        statusmenu.objSaveBaseIDMenuItem = document.getElementById("vI_statusMenu_storage_saveBaseID");
+        statusmenu.objSaveSMTPMenuItem = document.getElementById("vI_statusMenu_storage_saveSMTP");
+        statusmenu.objStorageSaveMenuItem = document.getElementById("vI_statusMenu_storage_save");
+        statusmenu.objStatusMenuSeparator = document.getElementById("vI_statusMenu_separator");
+        statusmenu.objSaveSwitch = document.getElementById("saveSwitch");
+        statusmenu.objSaveBaseIDSwitch = document.getElementById("saveBaseIDSwitch");
+        statusmenu.objSaveSMTPSwitch = document.getElementById("saveSMTPSwitch");
+        statusmenu.objFccSwitch = document.getElementById("fcc_switch");
+        statusmenu.objStatusText = document.getElementById("statusText");
+        statusmenu.objStatusTooltipLine1 = document.getElementById("vI_statusMenuTooltip_StatusValueLine1");
+        statusmenu.objStatusTooltipLine2 = document.getElementById("vI_statusMenuTooltip_StatusValueLine2");
+
+        statusmenu.addObserver();
+        statusmenu.observe(null, null, "extensions.virtualIdentity.fcc_show_switch");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_switch");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_baseID_switch");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_show_SMTP_switch");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_colorIndication");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_base_id");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_store_SMTP");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage_storedefault");
+        statusmenu.observe(null, null, "extensions.virtualIdentity.storage");
     },
     
@@ -145 +146 @@
         var sourceString = "vident.statusText.save." + save;
         if (smtp != "off") sourceString = sourceString + ".smtp"
-        var messageLine1 = vI_main.elements.strings.getString(sourceString + ".line1");
-        var messageLine2 = vI_main.elements.strings.getString(sourceString + ".line2");
+        var messageLine1 = vI.main.elements.strings.getString(sourceString + ".line1");
+        var messageLine2 = vI.main.elements.strings.getString(sourceString + ".line2");
         if (!messageLine2) {
-            vI_statusmenu.objStatusText.setAttribute("label", messageLine1);
-            vI_statusmenu.objStatusTooltipLine1.setAttribute("value", messageLine1);
-            vI_statusmenu.objStatusTooltipLine2.setAttribute("hidden", "true");
+            statusmenu.objStatusText.setAttribute("label", messageLine1);
+            statusmenu.objStatusTooltipLine1.setAttribute("value", messageLine1);
+            statusmenu.objStatusTooltipLine2.setAttribute("hidden", "true");
         }   
         else {
-            vI_statusmenu.objStatusText.setAttribute("label", messageLine1 + " " + messageLine2);
-            vI_statusmenu.objStatusTooltipLine1.setAttribute("value", messageLine1);
-            vI_statusmenu.objStatusTooltipLine2.setAttribute("value", messageLine2);
-            vI_statusmenu.objStatusTooltipLine2.removeAttribute("hidden");
-        }
-        window.setTimeout(vI_statusmenu.__clearStatusMessage, vI_statusmenu.__timeout * 1000);
+            statusmenu.objStatusText.setAttribute("label", messageLine1 + " " + messageLine2);
+            statusmenu.objStatusTooltipLine1.setAttribute("value", messageLine1);
+            statusmenu.objStatusTooltipLine2.setAttribute("value", messageLine2);
+            statusmenu.objStatusTooltipLine2.removeAttribute("hidden");
+        }
+        window.setTimeout(virtualIdentityExtension.statusmenu.__clearStatusMessage, statusmenu.__timeout * 1000);
     },
 
     __clearStatusMessage : function() {
-        vI_statusmenu.objStatusText.setAttribute("label", "");
+        statusmenu.objStatusText.setAttribute("label", "");
     },
 
     changeSMTPStatus : function (elem) {
-        vI_statusmenu.objSaveSMTPMenuItem.setAttribute("checked", elem.getAttribute("checked"));
-        vI_statusmenu.menuConstraint();
+        statusmenu.objSaveSMTPMenuItem.setAttribute("checked", elem.getAttribute("checked"));
+        statusmenu.menuConstraint();
     },
 
     changeBaseIDStatus : function (elem) {
-        vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", elem.getAttribute("checked"));
-        vI_statusmenu.menuConstraint();
+        statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", elem.getAttribute("checked"));
+        statusmenu.menuConstraint();
     },
 
     changeSaveStatus : function (elem) {
-        vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", elem.getAttribute("checked"));
-        vI_statusmenu.menuConstraint();
+        statusmenu.objStorageSaveMenuItem.setAttribute("checked", elem.getAttribute("checked"));
+        statusmenu.menuConstraint();
     },
 
     menuConstraint : function () {
         var save = "off"; var smtp = "off";
-        if (vI_statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true") {
-            vI_statusmenu.objSaveSMTPMenuItem.removeAttribute("disabled");
-            vI_statusmenu.objSaveBaseIDMenuItem.removeAttribute("disabled");
-            if (vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) {
-                if (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true") save = "base";
+        if (statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true") {
+            statusmenu.objSaveSMTPMenuItem.removeAttribute("disabled");
+            statusmenu.objSaveBaseIDMenuItem.removeAttribute("disabled");
+            if (statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) {
+                if (statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true") save = "base";
                 else save = "ok";
-                if (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true") smtp = "save";
+                if (statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true") smtp = "save";
             }
         }
         else {
-            vI_statusmenu.objSaveSMTPMenuItem.setAttribute("disabled", "true");
-            vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("disabled", "true");
-        }
-        vI_statusmenu.objStatusMenu.setAttribute("save", save);
-        vI_statusmenu.objStatusMenu.setAttribute("smtp", smtp);
-        vI_statusmenu.__addStatusMessage(save, smtp);
+            statusmenu.objSaveSMTPMenuItem.setAttribute("disabled", "true");
+            statusmenu.objSaveBaseIDMenuItem.setAttribute("disabled", "true");
+        }
+        statusmenu.objStatusMenu.setAttribute("save", save);
+        statusmenu.objStatusMenu.setAttribute("smtp", smtp);
+        statusmenu.__addStatusMessage(save, smtp);
     },
 
     clicked : function (button) {
         if (button != 0) return; // only react on left mouse button
-        if (!vI_statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) return;
-
-        var curSaveStatus = (vI_statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true");
-        var curSaveSMTPStatus = (vI_statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true");
-        var curSaveBaseIDStatus = (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true");
+        if (!statusmenu.prefroot.getBoolPref("extensions.virtualIdentity.storage")) return;
+
+        var curSaveStatus = (statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true");
+        var curSaveSMTPStatus = (statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true");
+        var curSaveBaseIDStatus = (statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true");
         var newSaveStatus = ((!curSaveStatus) || (curSaveStatus && !curSaveSMTPStatus) || (curSaveStatus && !curSaveBaseIDStatus))
         var newSaveSMTPStatus = ((!curSaveSMTPStatus && curSaveStatus) || (curSaveBaseIDStatus && !curSaveSMTPStatus))
         var newSaveBaseIDStatus = ((curSaveSMTPStatus && curSaveStatus && !curSaveBaseIDStatus) || (curSaveBaseIDStatus && !curSaveSMTPStatus))
-        vI_statusmenu.objStorageSaveMenuItem.setAttribute("checked", newSaveStatus)
-        vI_statusmenu.objSaveSMTPMenuItem.setAttribute("checked", newSaveSMTPStatus)
-        vI_statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", newSaveBaseIDStatus)
+        statusmenu.objStorageSaveMenuItem.setAttribute("checked", newSaveStatus)
+        statusmenu.objSaveSMTPMenuItem.setAttribute("checked", newSaveSMTPStatus)
+        statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", newSaveBaseIDStatus)
         
-        vI_statusmenu.menuConstraint();
+        statusmenu.menuConstraint();
     }
 }
+vI.statusmenu = statusmenu;
+}});

chrome/content/v_identity/vI_storage.js

@@ -28 +28 @@
 */
 
-var vI_storage = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var storage = {
     multipleRecipients : null,
     focusedElement : null,
@@ -42 +43 @@
             .getBranch(null).QueryInterface(Components.interfaces.nsIPrefBranch2),
     
-    vI_rdfDatasource : null,    // local storage
+    rdfDatasource : null,    // local storage
 
     clean: function() {
-        vI_notificationBar.dump("## vI_storage: clean.\n");
-        vI_storage.multipleRecipients = null;
-        vI_storage.lastCheckedEmail = {};
-        vI_storage.firstUsedInputElement = null;
-        awSetInputAndPopupValue = vI_storage.original_functions.awSetInputAndPopupValue;
-        if (vI_storage.vI_rdfDatasource) vI_storage.vI_rdfDatasource.clean();
+        vI.notificationBar.dump("## storage: clean.\n");
+        storage.multipleRecipients = null;
+        storage.lastCheckedEmail = {};
+        storage.firstUsedInputElement = null;
+        awSetInputAndPopupValue = storage.original_functions.awSetInputAndPopupValue;
+        if (storage.rdfDatasource) storage.rdfDatasource.clean();
     },
     
@@ -59 +60 @@
     replacement_functions : {
         awSetInputAndPopupValue : function (inputElem, inputValue, popupElem, popupValue, rowNumber) {
-            vI_notificationBar.dump("## vI_storage: awSetInputAndPopupValue '" + inputElem.id +"'\n");
-            vI_storage.original_functions.awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber);
-            vI_storage.updateVIdentityFromStorage(inputElem);
+            vI.notificationBar.dump("## storage: awSetInputAndPopupValue '" + inputElem.id +"'\n");
+            storage.original_functions.awSetInputAndPopupValue(inputElem, inputValue, popupElem, popupValue, rowNumber);
+            storage.updateVIdentityFromStorage(inputElem);
         }
     },
@@ -68 +69 @@
         // only react on events triggered by addressCol2 - textinput Elements
         if (!element || ! element.id.match(/^addressCol2*/)) return;
-        vI_notificationBar.dump("\n## vI_storage: awOnBlur '" + element.id +"'\n");
-        vI_storage.updateVIdentityFromStorage(element);
-        vI_storage.focusedElement = null;
+        vI.notificationBar.dump("\n## storage: awOnBlur '" + element.id +"'\n");
+        storage.updateVIdentityFromStorage(element);
+        storage.focusedElement = null;
     },
 
     awOnFocus : function (element) {
         if (!element || ! element.id.match(/^addressCol2*/)) return;
-        vI_storage.focusedElement = element;
+        storage.focusedElement = element;
     },
 
     awPopupOnCommand : function (element) {
-        vI_notificationBar.dump("\n## vI_storage: awPopupOnCommand'" + element.id +"'\n");
-        vI_storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2")));
+        vI.notificationBar.dump("\n## storage: awPopupOnCommand'" + element.id +"'\n");
+        storage.updateVIdentityFromStorage(document.getElementById(element.id.replace(/^addressCol1/,"addressCol2")));
         if (element.selectedItem.getAttribute("value") == "addr_reply") // if reply-to is manually entered disable AutoReplyToSelf
             document.getElementById("autoReplyToSelfLabel").setAttribute("hidden", "true");
@@ -88 +89 @@
     initialized : null,
     init: function() {
-        if (!vI_storage.initialized) {
-            vI_storage.vI_rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf");
+        if (!storage.initialized) {
+            storage.rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf");
 
             // better approach would be to use te onchange event, but this one is not fired in any change case
@@ -100 +101 @@
                     var oldBlur = input.getAttribute("onblur")
                     input.setAttribute("onblur", (oldBlur?oldBlur+"; ":"") +
-                        "window.setTimeout(vI_storage.awOnBlur, 250, this.parentNode.parentNode.parentNode);")
+                        "window.setTimeout(virtualIdentityExtension.storage.awOnBlur, 250, this.parentNode.parentNode.parentNode);")
                     var oldFocus = input.getAttribute("onfocus")
                     input.setAttribute("onfocus", (oldFocus?oldFocus+"; ":"") +
-                        "window.setTimeout(vI_storage.awOnFocus, 250, this.parentNode.parentNode.parentNode);")
+                        "window.setTimeout(virtualIdentityExtension.storage.awOnFocus, 250, this.parentNode.parentNode.parentNode);")
                 }
                 var popup = awGetPopupElement(row);
@@ -109 +110 @@
                     var oldCommand = popup.getAttribute("oncommand")
                     popup.setAttribute("oncommand", (oldCommand?oldCommand+"; ":"") +
-                        "window.setTimeout(vI_storage.awPopupOnCommand, 250, this);")
-                }
-            }
-            vI_storage.initialized = true;
-        }
-        vI_storage.original_functions.awSetInputAndPopupValue = awSetInputAndPopupValue;
+                        "window.setTimeout(virtualIdentityExtension.storage.awPopupOnCommand, 250, this);")
+                }
+            }
+            storage.initialized = true;
+        }
+        storage.original_functions.awSetInputAndPopupValue = awSetInputAndPopupValue;
         awSetInputAndPopupValue = function (inputElem, inputValue, popupElem, popupValue, rowNumber) {
-            vI_storage.replacement_functions.awSetInputAndPopupValue (inputElem, inputValue, popupElem, popupValue, rowNumber) }
+            storage.replacement_functions.awSetInputAndPopupValue (inputElem, inputValue, popupElem, popupValue, rowNumber) }
 
         // reset unavailable storageExtras preferences
         const enigmail_ID="{847b3a00-7ab1-11d4-8f02-006008948af5}"
-        if (!vI_helper.extensionActive(enigmail_ID)) {
-            vI_main.preferences.setBoolPref("storageExtras_openPGP_messageEncryption", false)
-            vI_main.preferences.setBoolPref("storageExtras_openPGP_messageSignature", false)
-            vI_main.preferences.setBoolPref("storageExtras_openPGP_PGPMIME", false)
+        if (!vI.helper.extensionActive(enigmail_ID)) {
+            vI.main.preferences.setBoolPref("storageExtras_openPGP_messageEncryption", false)
+            vI.main.preferences.setBoolPref("storageExtras_openPGP_messageSignature", false)
+            vI.main.preferences.setBoolPref("storageExtras_openPGP_PGPMIME", false)
         }
     },
@@ -130 +131 @@
     firstUsedInputElement : null,   // this stores the first Element for which a Lookup in the Storage was successfull
     updateVIdentityFromStorage: function(inputElement) {        
-        if (!vI_main.preferences.getBoolPref("storage"))
-            { vI_notificationBar.dump("## vI_storage: Storage deactivated\n"); return; }
-        vI_notificationBar.dump("## vI_storage: updateVIdentityFromStorage()\n");
+        if (!vI.main.preferences.getBoolPref("storage"))
+            { vI.notificationBar.dump("## storage: Storage deactivated\n"); return; }
+        vI.notificationBar.dump("## storage: updateVIdentityFromStorage()\n");
 
         var recipientType = document.getElementById(inputElement.id.replace(/^addressCol2/,"addressCol1"))
             .selectedItem.getAttribute("value");
         var row = inputElement.id.replace(/^addressCol2#/,"")
-        if (recipientType == "addr_reply" || recipientType == "addr_followup" || vI_storage.__isDoBcc(row)) {
+        if (recipientType == "addr_reply" || recipientType == "addr_followup" || storage.__isDoBcc(row)) {
             // reset firstUsedInputElement if recipientType was changed (and don't care about doBcc fields)
-            if (vI_storage.firstUsedInputElement == inputElement)
-                vI_storage.firstUsedInputElement = null;
-            vI_notificationBar.dump("## vI_storage: field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n")
+            if (storage.firstUsedInputElement == inputElement)
+                storage.firstUsedInputElement = null;
+            vI.notificationBar.dump("## storage: field is a 'reply-to' or 'followup-to' or preconfigured 'doBcc'. not searched.\n")
             return;
         }
         
         if (inputElement.value == "") {
-            vI_notificationBar.dump("## vI_storage: no recipient found, not checked.\n"); return;
+            vI.notificationBar.dump("## storage: no recipient found, not checked.\n"); return;
         }
         
         var row = inputElement.id.replace(/^addressCol2#/,"")
-        if (vI_storage.lastCheckedEmail[row] && vI_storage.lastCheckedEmail[row] == inputElement.value) {
-            vI_notificationBar.dump("## vI_storage: same email than before, not checked again.\n"); return;
-        }
-        vI_storage.lastCheckedEmail[row] = inputElement.value;
-        var recipient = vI_storage.__getDescriptionAndType(inputElement.value, recipientType);
+        if (storage.lastCheckedEmail[row] && storage.lastCheckedEmail[row] == inputElement.value) {
+            vI.notificationBar.dump("## storage: same email than before, not checked again.\n"); return;
+        }
+        storage.lastCheckedEmail[row] = inputElement.value;
+        var recipient = storage.__getDescriptionAndType(inputElement.value, recipientType);
 
         var matchResults = { storageData : {}, menuItem : {} };
-        matchResults.storageData[0] = vI_storage.vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-        matchResults.storageData[1] = vI_storage.vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
-
-        vI_notificationBar.dump("## vI_storage: updateVIdentityFromStorage add found Identities to CloneMenu.\n");
+        matchResults.storageData[0] = storage.rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
+        matchResults.storageData[1] = storage.rdfDatasource.findMatchingFilter(recipient.recDesc);
+
+        vI.notificationBar.dump("## storage: updateVIdentityFromStorage add found Identities to CloneMenu.\n");
         var matchIndex = null;
         for (var i = 0; i <= 1; i++) {
@@ -170 +171 @@
         }
         if (matchIndex == null) {
-            vI_notificationBar.dump("## vI_storage: updateVIdentityFromStorage no usable Storage-Data found.\n");
+            vI.notificationBar.dump("## storage: updateVIdentityFromStorage no usable Storage-Data found.\n");
             return;
         }
         else {
-            vI_notificationBar.dump("## vI_storage: using data from " + ((matchIndex == 0)?"direct":"filter") + " match\n");
+            vI.notificationBar.dump("## storage: using data from " + ((matchIndex == 0)?"direct":"filter") + " match\n");
         }
         // found storageData, so store InputElement
-        if (!vI_storage.firstUsedInputElement) vI_storage.firstUsedInputElement = inputElement;
-        
-        vI_notificationBar.dump("## vI_storage: compare with current Identity\n");
-        if (vI_main.preferences.getBoolPref("storage_getOneOnly") &&                    // if requested to retrieve only storageID for first recipient entered
-            vI_storage.firstUsedInputElement &&                     // and the request for the first recipient was already done
-            vI_storage.firstUsedInputElement != inputElement &&             // and it's not the same element we changed now
+        if (!storage.firstUsedInputElement) storage.firstUsedInputElement = inputElement;
+        
+        vI.notificationBar.dump("## storage: compare with current Identity\n");
+        if (vI.main.preferences.getBoolPref("storage_getOneOnly") &&                    // if requested to retrieve only storageID for first recipient entered
+            storage.firstUsedInputElement &&                        // and the request for the first recipient was already done
+            storage.firstUsedInputElement != inputElement &&                // and it's not the same element we changed now
             !matchResults.storageData[matchIndex].equalsCurrentIdentity(false).equal)   // and this id is different than the current used one
-                vI_notificationBar.setNote(vI_main.elements.strings
+                vI.notificationBar.setNote(vI.main.elements.strings
                     .getString("vident.smartIdentity.vIStorageCollidingIdentity"),  // than drop the potential changes
                     "storage_notification");
         // only update fields if new Identity is different than old one.
         else {
-            vI_notificationBar.dump("## vI_storage: updateVIdentityFromStorage check if storage-data matches current Identity.\n");
+            vI.notificationBar.dump("## storage: updateVIdentityFromStorage check if storage-data matches current Identity.\n");
             var compResult = matchResults.storageData[matchIndex].equalsCurrentIdentity(true);
             if (!compResult.equal) {
-                var warning = vI_storage.__getWarning("replaceVIdentity", recipient, compResult.compareMatrix);
+                var warning = storage.__getWarning("replaceVIdentity", recipient, compResult.compareMatrix);
                 var msgIdentityCloneElem = document.getElementById("msgIdentity_clone")
                 if (    !msgIdentityCloneElem.vid ||
-                    !vI_main.preferences.getBoolPref("storage_warn_vI_replace") ||
-                    (vI_storage.__askWarning(warning) == "accept")) {
+                    !vI.main.preferences.getBoolPref("storage_warn_vI_replace") ||
+                    (storage.__askWarning(warning) == "accept")) {
                         msgIdentityCloneElem.selectedMenuItem = matchResults.menuItem[matchIndex];
                         if (msgIdentityCloneElem.vid)
-                            vI_notificationBar.setNote(vI_main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".",
+                            vI.notificationBar.setNote(vI.main.elements.strings.getString("vident.smartIdentity.vIStorageUsage") + ".",
                             "storage_notification");
                 }
             }
             else {
-                vI_notificationBar.dump("## vI_storage: updateVIdentityFromStorage doing nothing - equals current Identity.\n");
+                vI.notificationBar.dump("## storage: updateVIdentityFromStorage doing nothing - equals current Identity.\n");
             }
         }
@@ -211 +212 @@
     __getDescriptionAndType : function (recipient, recipientType) {
         if (recipientType == "addr_newsgroups") return { recDesc : recipient, recType : "newsgroup" }
-        else if (vI_storage.__isMailingList(recipient)) {
-            vI_notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is MailList\n");
-            return { recDesc : vI_storage.__getMailListName(recipient), recType : "maillist" }
+        else if (storage.__isMailingList(recipient)) {
+            vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is MailList\n");
+            return { recDesc : storage.__getMailListName(recipient), recType : "maillist" }
         }
         else {
-            vI_notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is no MailList\n");
-            var localIdentityData = new vI_identityData(recipient, null, null, null, null, null, null);
+            vI.notificationBar.dump("## __getDescriptionAndType: '" + recipient + "' is no MailList\n");
+            var localIdentityData = new vI.identityData(recipient, null, null, null, null, null, null);
             return { recDesc : localIdentityData.combinedName, recType : "email" }
         }
@@ -224 +225 @@
     storeVIdentityToAllRecipients : function(msgType) {
         if (msgType != nsIMsgCompDeliverMode.Now) return true;
-        vI_notificationBar.dump("## vI_storage: ----------------------------------------------------------\n")
-        if (!vI_main.preferences.getBoolPref("storage"))
-            { vI_notificationBar.dump("## vI_storage: Storage deactivated\n"); return true; }
-        
-        if (vI_statusmenu.objStorageSaveMenuItem.getAttribute("checked") != "true") {
-            vI_notificationBar.dump("## vI_storage: SaveMenuItem not checked.\n")
+        vI.notificationBar.dump("## storage: ----------------------------------------------------------\n")
+        if (!vI.main.preferences.getBoolPref("storage"))
+            { vI.notificationBar.dump("## storage: Storage deactivated\n"); return true; }
+        
+        if (vI.statusmenu.objStorageSaveMenuItem.getAttribute("checked") != "true") {
+            vI.notificationBar.dump("## storage: SaveMenuItem not checked.\n")
             return true;
         }
         
-        vI_notificationBar.dump("## vI_storage: storeVIdentityToAllRecipients()\n");
+        vI.notificationBar.dump("## storage: storeVIdentityToAllRecipients()\n");
         
         // check if there are multiple recipients
-        vI_storage.multipleRecipients = false;
+        storage.multipleRecipients = false;
         var recipients = 0;
         for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
             var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
             if (recipientType == "addr_reply" || recipientType == "addr_followup" || 
-                vI_storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
+                storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
             if (recipients++ == 1) {
-                vI_storage.multipleRecipients = true
-                vI_notificationBar.dump("## vI_storage: multiple recipients found.\n")
+                storage.multipleRecipients = true
+                vI.notificationBar.dump("## storage: multiple recipients found.\n")
                 break;
             }
@@ -252 +253 @@
             var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
             if (recipientType == "addr_reply" || recipientType == "addr_followup" || 
-                vI_storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
-            if (!vI_storage.__updateStorageFromVIdentity(awGetInputElement(row).value, recipientType)) {
-                vI_notificationBar.dump("## vI_storage: --------------  aborted  ---------------------------------\n")
+                storage.__isDoBcc(row) || awGetInputElement(row).value.match(/^\s*$/) ) continue;
+            if (!storage.__updateStorageFromVIdentity(awGetInputElement(row).value, recipientType)) {
+                vI.notificationBar.dump("## storage: --------------  aborted  ---------------------------------\n")
                 return false; // abort sending
             }
         }
-        vI_notificationBar.dump("## vI_storage: ----------------------------------------------------------\n");
+        vI.notificationBar.dump("## storage: ----------------------------------------------------------\n");
         return true;
     },
@@ -264 +265 @@
     __getWarning : function(warningCase, recipient, compareMatrix) {
         var warning = { title: null, recLabel : null, recipient : null, warning : null, css: null, query : null, class : null };
-        warning.title = vI_main.elements.strings.getString("vident." + warningCase + ".title")
-        warning.recLabel = vI_main.elements.strings.getString("vident." + warningCase + ".recipient") + " (" + recipient.recType + "):"
+        warning.title = vI.main.elements.strings.getString("vident." + warningCase + ".title")
+        warning.recLabel = vI.main.elements.strings.getString("vident." + warningCase + ".recipient") + " (" + recipient.recType + "):"
         warning.recipient = recipient.recDesc;
         warning.warning = 
             "<table class='" + warningCase + "'><thead><tr><th class='col1'/>" +
-                "<th class='col2'>" + vI_main.elements.strings.getString("vident." + warningCase + ".currentIdentity") + "</th>" +
-                "<th class='col3'>" + vI_main.elements.strings.getString("vident." + warningCase + ".storedIdentity") + "</th>" +
+                "<th class='col2'>" + vI.main.elements.strings.getString("vident." + warningCase + ".currentIdentity") + "</th>" +
+                "<th class='col3'>" + vI.main.elements.strings.getString("vident." + warningCase + ".storedIdentity") + "</th>" +
             "</tr></thead>" +
             "<tbody>" + compareMatrix + "</tbody>" +
             "</table>"
-        warning.css = "vI_DialogBrowser.css";
-        warning.query = vI_main.elements.strings.getString("vident." + warningCase + ".query");
+        warning.css = "vI.DialogBrowser.css";
+        warning.query = vI.main.elements.strings.getString("vident." + warningCase + ".query");
         warning.class = warningCase;
         return warning;
@@ -289 +290 @@
     
     __updateStorageFromVIdentity : function(recipient, recipientType) {
-        vI_notificationBar.dump("## vI_storage: __updateStorageFromVIdentity.\n")
-        var dontUpdateMultipleNoEqual = (vI_main.preferences.getBoolPref("storage_dont_update_multiple") &&
-                    vI_storage.multipleRecipients)
-        vI_notificationBar.dump("## vI_storage: __updateStorageFromVIdentity dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
-        recipient = vI_storage.__getDescriptionAndType(recipient, recipientType);
-
-        var storageDataByType = vI_storage.vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
-        var storageDataByFilter = vI_storage.vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
+        vI.notificationBar.dump("## storage: __updateStorageFromVIdentity.\n")
+        var dontUpdateMultipleNoEqual = (vI.main.preferences.getBoolPref("storage_dont_update_multiple") &&
+                    storage.multipleRecipients)
+        vI.notificationBar.dump("## storage: __updateStorageFromVIdentity dontUpdateMultipleNoEqual='" + dontUpdateMultipleNoEqual + "'\n")
+        recipient = storage.__getDescriptionAndType(recipient, recipientType);
+
+        var storageDataByType = storage.rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
+        var storageDataByFilter = storage.rdfDatasource.findMatchingFilter(recipient.recDesc);
         
         // update (storing) of data by type is required if there is
@@ -307 +308 @@
         if (    (!storageDataByType && !storageDataByFilterEqual) ||
             (!storageDataByTypeEqual && !storageDataByFilterEqual && !dontUpdateMultipleNoEqual) ) {
-            vI_notificationBar.dump("## vI_storage: __updateStorageFromVIdentity updating\n")
+            vI.notificationBar.dump("## storage: __updateStorageFromVIdentity updating\n")
             var doUpdate = "accept";
-            if (storageDataByType && !storageDataByTypeEqual && vI_main.preferences.getBoolPref("storage_warn_update")) {
-                vI_notificationBar.dump("## vI_storage: __updateStorageFromVIdentity overwrite warning\n");
-                doUpdate = vI_storage.__askWarning(vI_storage.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
+            if (storageDataByType && !storageDataByTypeEqual && vI.main.preferences.getBoolPref("storage_warn_update")) {
+                vI.notificationBar.dump("## storage: __updateStorageFromVIdentity overwrite warning\n");
+                doUpdate = storage.__askWarning(storage.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
                 if (doUpdate == "takeover") {
                     var msgIdentityCloneElem = document.getElementById("msgIdentity_clone");
@@ -320 +321 @@
             }
         }
-        if (doUpdate == "accept") vI_storage.vI_rdfDatasource.updateRDFFromVIdentity(recipient.recDesc, recipient.recType);
+        if (doUpdate == "accept") storage.rdfDatasource.updateRDFFromVIdentity(recipient.recDesc, recipient.recType);
         return true;
     },
@@ -336 +337 @@
             if (ab instanceof Components.interfaces.nsIAbDirectory && !ab.isRemote) {
                 let abdirectory = abManager.getDirectory(ab.URI + 
-                    "?(and(DisplayName,=," + encodeURIComponent(vI_storage.__getMailListName(recipient)) + ")(IsMailList,=,TRUE))");
+                    "?(and(DisplayName,=," + encodeURIComponent(storage.__getMailListName(recipient)) + ")(IsMailList,=,TRUE))");
                 if (abdirectory) {
                     let cards = abdirectory.childCards;
@@ -364 +365 @@
         for (var index = 0; index < doBccArray.count; index++ ) {
             if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
-                vI_notificationBar.dump("## vI_storage: ignoring doBcc field '" +
+                vI.notificationBar.dump("## storage: ignoring doBcc field '" +
                     doBccArray.StringAt(index) + "'.\n");
                 return true;
@@ -373 +374 @@
 
     getVIdentityFromAllRecipients : function(allIdentities) {
-        if (!vI_main.preferences.getBoolPref("storage"))
-            { vI_notificationBar.dump("## vI_storage: Storage deactivated\n"); return; }
-        vI_notificationBar.dump("## vI_storage: getVIdentityFromAllRecipients()\n");
+        if (!vI.main.preferences.getBoolPref("storage"))
+            { vI.notificationBar.dump("## storage: Storage deactivated\n"); return; }
+        vI.notificationBar.dump("## storage: getVIdentityFromAllRecipients()\n");
 
         for (var row = 1; row <= top.MAX_RECIPIENTS; row ++) {
             var recipientType = awGetPopupElement(row).selectedItem.getAttribute("value");
-            if (recipientType == "addr_reply" || recipientType == "addr_followup" || vI_storage.__isDoBcc(row)) continue;
-            vI_storage.lastCheckedEmail[row] = awGetInputElement(row).value;
-            var recipient = vI_storage.__getDescriptionAndType(awGetInputElement(row).value, recipientType);
-            var storageData = vI_storage.vI_rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
+            if (recipientType == "addr_reply" || recipientType == "addr_followup" || storage.__isDoBcc(row)) continue;
+            storage.lastCheckedEmail[row] = awGetInputElement(row).value;
+            var recipient = storage.__getDescriptionAndType(awGetInputElement(row).value, recipientType);
+            var storageData = storage.rdfDatasource.readVIdentityFromRDF(recipient.recDesc, recipient.recType);
             if (storageData) allIdentities.addWithoutDuplicates(storageData);
-            storageData = vI_storage.vI_rdfDatasource.findMatchingFilter(recipient.recDesc);
+            storageData = storage.rdfDatasource.findMatchingFilter(recipient.recDesc);
             if (storageData) allIdentities.addWithoutDuplicates(storageData);
         }
-        vI_notificationBar.dump("## vI_storage: found " + allIdentities.number + " address(es)\n")
+        vI.notificationBar.dump("## storage: found " + allIdentities.number + " address(es)\n")
     }
 }
+vI.storage = storage;
+}});

chrome/content/v_identity/vI_storageExtras.js

@@ -22 +22 @@
  * ***** END LICENSE BLOCK ***** */
 
-function vI_storageExtras_adapt(sourceId, targetId) {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+function storageExtras_adapt(sourceId, targetId) {
     var checked = document.getElementById(sourceId).getAttribute("checked");
     if (targetId) var target = document.getElementById(targetId)
@@ -30 +31 @@
 }   
 
-var vI_storageExtrasHelper = {
+var storageExtrasHelper = {
     seamonkey_old : null,
 
@@ -38 +39 @@
     
     hideUnusedEditorFields : function() {
-        var storageExtras = new vI_storageExtras();
+        var localStorageExtras = new storageExtras();
         var allHidden = true;
         var hide = (document.getElementById("vI_storageExtras_hideUnusedEditorFields").getAttribute("checked") == "true")
-        for( var i = 0; i < storageExtras.extras.length; i++ ) {
-            var hidden = hide && !vI_storageExtrasHelper.preferences.getBoolPref(storageExtras.extras[i].option)
+        for( var i = 0; i < localStorageExtras.extras.length; i++ ) {
+            var hidden = hide && !storageExtrasHelper.preferences.getBoolPref(localStorageExtras.extras[i].option)
             if (!hidden) allHidden = false
-            document.getElementById("vI_" + storageExtras.extras[i].option).setAttribute("hidden", hidden)
-            document.getElementById("vI_" + storageExtras.extras[i].option + "_store").setAttribute("hidden", hidden)
+            document.getElementById("vI_" + localStorageExtras.extras[i].option).setAttribute("hidden", hidden)
+            document.getElementById("vI_" + localStorageExtras.extras[i].option + "_store").setAttribute("hidden", hidden)
         }
         document.getElementById("storeValue").setAttribute("hidden", allHidden)
@@ -53 +54 @@
 }
 
-function vI_storageExtras(rdfDatasource, resource) {
-// function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
+function storageExtras(rdfDatasource, resource) {
+// function storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
     this.extras = [
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "reciept", "storageExtras_returnReciept", "returnReceiptMenu", null, function(identity) { return identity.requestReturnReceipt; }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "fcc", "storageExtras_fcc", "fcc_switch", null, function(identity) { return identity.doFcc; }),
-        new vI_storageExtras_characterEncoding(),
-        new vI_storageExtras_msgFormat(),
-        new vI_storageExtras_checkbox(
+        new storageExtras_characterEncoding(),
+        new storageExtras_msgFormat(),
+        new storageExtras_checkbox(
             "sMimeEnc", "storageExtras_sMime_messageEncryption", "menu_securityEncryptRequire1",
                 function() { return ((typeof(setSecuritySettings)=='function')?setSecuritySettings(1):null) },
                 function(identity) { return (identity.getIntAttribute('encryptionpolicy') == 2) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "sMimeSig", "storageExtras_sMime_messageSignature", "menu_securitySign1",
                 function() { return ((typeof(setSecuritySettings)=='function')?setSecuritySettings(1):null) },
                 function(identity) { return (identity.getBoolAttribute('sign_mail')) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "PGPEnc", "storageExtras_openPGP_messageEncryption", "enigmail_encrypted_send",
                 function() { return ((typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null) },
                 function(identity) { return (identity.getIntAttribute('defaultEncryptionPolicy') > 0) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "PGPSig", "storageExtras_openPGP_messageSignature", "enigmail_signed_send",
                 function() { return ((typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null) },
                 function(identity) { return ((identity.getIntAttribute('defaultEncryptionPolicy') > 0)?identity.getBoolAttribute('pgpSignEncrypted'):identity.getBoolAttribute('pgpSignPlain')) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "PGPMIME", "storageExtras_openPGP_PGPMIME", "enigmail_sendPGPMime",
                 function() { return ((typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null) },
@@ -86 +87 @@
 }
 
-vI_storageExtras.prototype = {
+storageExtras.prototype = {
     loopForRDF : function(rdfDatasource, resource, type) {
         for( var i = 0; i < this.extras.length; i++ ) {
-//          if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: loopForRDF " + rdfDatasource + "\n");
+//          if (vI.notificationBar) vI.notificationBar.dump("## vI.rdfDatasource: loopForRDF " + rdfDatasource + "\n");
             // only if pref set and feature(element available) or for dataEditor
             if (typeof(gMsgCompose) == "undefined" || !gMsgCompose || this.extras[i].active) {
@@ -103 +104 @@
     // just give a duplicate of the current storageExtras, else we will work with pointers
     getDuplicate : function() {
-        var newExtras = new vI_storageExtras();
+        var newExtras = new storageExtras();
         for( var i = 0; i < this.extras.length; i++ ) {
             newExtras.extras[i].value = this.extras[i].value;
@@ -166 +167 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) this.extras[i].readIdentityValue(identity)
-//          vI_notificationBar.dump("## vI_storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//          vI.notificationBar.dump("## storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
@@ -173 +174 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) this.extras[i].setValue()
-//          vI_notificationBar.dump("## vI_storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//          vI.notificationBar.dump("## storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
     readValues : function() {
         for( var i = 0; i < this.extras.length; i++ ) {
-//          vI_notificationBar.dump("## vI_storageExtras preparing readValue "+ this.extras[i].field +"\n");
+//          vI.notificationBar.dump("## storageExtras preparing readValue "+ this.extras[i].field +"\n");
             if (this.extras[i].active) this.extras[i].readValue()
-//              vI_notificationBar.dump("## vI_storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//              vI.notificationBar.dump("## storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
@@ -189 +190 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             this.extras[i].readEditorValue();
-//          vI_notificationBar.dump("## vI_storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");
-        }
-    },
-
-    // add value's to the pref object, required for rdfDataTree
+//          vI.notificationBar.dump("## storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");
+        }
+    },
+
+    // add value's to the pref object, required for rdfDataTreeCollection
     addPrefs : function(pref) {
         for( var i = 0; i < this.extras.length; i++ )
@@ -200 +201 @@
 }
 
-function vI_storageExtras_characterEncoding_setMenuMark() {
+function storageExtras_characterEncoding_setMenuMark() {
     var maileditCharsetMenu = document.getElementById("maileditCharsetMenu")
     var value = maileditCharsetMenu.getAttribute("unmarkedValue")
@@ -209 +210 @@
     }
 }
-function vI_storageExtras_characterEncoding() {
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
+function storageExtras_characterEncoding() {
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option)
     this.comp = { compareValue : null, equal : null }
 }
-vI_storageExtras_characterEncoding.prototype = {
+storageExtras_characterEncoding.prototype = {
     active : null,
     value : null,
@@ -246 +247 @@
             var onpopupshowing = maileditCharsetMenu.getAttribute("onpopupshowing")
             document.getElementById("maileditCharsetMenu").setAttribute("onpopupshowing",
-                onpopupshowing + ";vI_storageExtras_characterEncoding_setMenuMark();")
+                onpopupshowing + ";storageExtras_characterEncoding_setMenuMark();")
         }
         gMsgCompose.compFields.characterSet = this.value;
@@ -254 +255 @@
         // read the value from the internal vI object, global object might not be available any more
         // happens especially while storing after sending the message
-        this.value = vI_main.gMsgCompose.compFields.characterSet;
+        this.value = vI.main.gMsgCompose.compFields.characterSet;
         if (gCharsetConvertManager) {
             var charsetAlias = gCharsetConvertManager.getCharsetAlias(this.value);
@@ -281 +282 @@
 }
 
-function vI_storageExtras_msgFormat() {
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
+function storageExtras_msgFormat() {
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option)
     this.comp = { value : null, compareValue : null, equal : null }
 }
-vI_storageExtras_msgFormat.prototype = {
+storageExtras_msgFormat.prototype = {
     active : null,
     value : null,
@@ -338 +339 @@
 }
 
-function vI_storageExtras_sMime_messageEncryption() { 
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
+function storageExtras_sMime_messageEncryption() { 
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option)
     this.comp = { value : null, compareValue : null, equal : null }
 }
-vI_storageExtras_sMime_messageEncryption.prototype = {
+storageExtras_sMime_messageEncryption.prototype = {
     active : null,
     value : null,
@@ -375 +376 @@
     // function to set or read the value from/to the MessageCompose Dialog
     setValue : function() {
-        vI_notificationBar.dump("## storageExtras_sMime_messageEncryption \n");
+        vI.notificationBar.dump("## storageExtras_sMime_messageEncryption \n");
         var doEncryptElem = document.getElementById("menu_securityEncryptRequire1");
         if (this.value == null) return;
@@ -405 +406 @@
 
 // a general checkbox for extra options. Has to provide some additional information
-function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
+function storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
     this.field = field;     // description of the option
     this.option = option;       // option string to get preference settings
@@ -411 +412 @@
     this.updateFunction = updateFunction;
     this.valueFromIdentityFunction = identityValue;
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option) 
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option) 
 //      elements are never available in DataTree, so leave this out.
 //      && document.getElementById(this.composeDialogElementID);
     this.comp = { compareValue : null, equal : null }
 }
-vI_storageExtras_checkbox.prototype = {
+storageExtras_checkbox.prototype = {
     active : null,
     value : null,
@@ -457 +458 @@
 
         if ((element.getAttribute("checked") == "true") != (this.value == "true")) {
-            vI_notificationBar.dump("## vI_storageExtras change "+ this.field + " to " + this.value + " with doCommand\n");
+            vI.notificationBar.dump("## storageExtras change "+ this.field + " to " + this.value + " with doCommand\n");
             element.doCommand();
         }
@@ -483 +484 @@
     }
 }
+
+vI.storageExtras = storageExtras;
+vI.storageExtrasHelper = storageExtrasHelper;
+vI.storageExtras_adapt = storageExtras_adapt;
+}});

chrome/content/v_identity/vI_storageExtrasDataEditorOverlay.xul

@@ -48 +48 @@
         <spacer width="10px" />
         <checkbox id="vI_storageExtras_hideUnusedEditorFields" label="&vI_storageExtrasDataEditorOverlay.hideUnused.label;"
-            oncommand="vI_storageExtrasHelper.hideUnusedEditorFields();"
+            oncommand="virtualIdentityExtension.storageExtrasHelper.hideUnusedEditorFields();"
             persist="checked" />
     </caption>
@@ -54 +54 @@
     <!-- storageExtras_returnReciept -->
         <hbox>
-        <checkbox id="vI_storageExtras_returnReciept_store" oncommand="vI_storageExtras_adapt(this.id, null);" />
+        <checkbox id="vI_storageExtras_returnReciept_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null);" />
         <checkbox id="vI_storageExtras_returnReciept" label="&vI_storageExtrasDataEditorOverlay.reciept.label;"/>
         </hbox>
     <!-- storageExtras_fcc -->
         <hbox>
-        <checkbox id="vI_storageExtras_fcc_store" oncommand="vI_storageExtras_adapt(this.id, null);" />
+        <checkbox id="vI_storageExtras_fcc_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null);" />
         <checkbox id="vI_storageExtras_fcc" label="&vI_storageExtrasDataEditorOverlay.fcc.label;"/>
         </hbox>
@@ -65 +65 @@
         <hbox>
         <checkbox id="vI_storageExtras_characterEncoding_store"
-            oncommand="vI_storageExtras_adapt(this.id, 'maileditCharsetMenuLabel');vI_storageExtras_adapt(this.id, 'maileditCharsetMenu');" />
+            oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, 'maileditCharsetMenuLabel');virtualIdentityExtension.storageExtras_adapt(this.id, 'maileditCharsetMenu');" />
         <hbox id="vI_storageExtras_characterEncoding">
             <vbox><spacer flex="1"/>
@@ -90 +90 @@
         <hbox>
         <checkbox id="vI_storageExtras_messageFormat_store"
-            oncommand="vI_storageExtras_adapt(this.id, 'outputFormatMenuLabel');vI_storageExtras_adapt(this.id, 'outputFormatMenu');" />
+            oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, 'outputFormatMenuLabel');virtualIdentityExtension.storageExtras_adapt(this.id, 'outputFormatMenu');" />
         <hbox id="vI_storageExtras_messageFormat">
             <vbox><spacer flex="1"/>
@@ -108 +108 @@
     <!-- storageExtras_sMime_messageEncryption -->
         <hbox>
-        <checkbox id="vI_storageExtras_sMime_messageEncryption_store" oncommand="vI_storageExtras_adapt(this.id, null)" />
+        <checkbox id="vI_storageExtras_sMime_messageEncryption_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null)" />
         <checkbox id="vI_storageExtras_sMime_messageEncryption"
             label="&vI_storageExtrasDataEditorOverlay.sMimeEnc.label;"/>
@@ -114 +114 @@
     <!-- storageExtras_sMime_messageSignature -->
         <hbox>
-        <checkbox id="vI_storageExtras_sMime_messageSignature_store" oncommand="vI_storageExtras_adapt(this.id, null)" />
+        <checkbox id="vI_storageExtras_sMime_messageSignature_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null)" />
         <checkbox id="vI_storageExtras_sMime_messageSignature"
             label="&vI_storageExtrasDataEditorOverlay.sMimeSig.label;"/>
@@ -120 +120 @@
     <!-- storageExtras_openPGP_messageEncryption -->
         <hbox>
-        <checkbox id="vI_storageExtras_openPGP_messageEncryption_store" oncommand="vI_storageExtras_adapt(this.id, null)" />
+        <checkbox id="vI_storageExtras_openPGP_messageEncryption_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null)" />
         <checkbox id="vI_storageExtras_openPGP_messageEncryption"
             label="&vI_storageExtrasDataEditorOverlay.PGPEnc.label;"/>
@@ -126 +126 @@
     <!-- storageExtras_openPGP_messageSignature -->
         <hbox>
-        <checkbox id="vI_storageExtras_openPGP_messageSignature_store" oncommand="vI_storageExtras_adapt(this.id, null)" />
+        <checkbox id="vI_storageExtras_openPGP_messageSignature_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null)" />
         <checkbox id="vI_storageExtras_openPGP_messageSignature"
             label="&vI_storageExtrasDataEditorOverlay.PGPSig.label;"/>
@@ -132 +132 @@
     <!-- storageExtras_openPGP_PGPMIME -->
         <hbox>
-        <checkbox id="vI_storageExtras_openPGP_PGPMIME_store" oncommand="vI_storageExtras_adapt(this.id, null)" />
+        <checkbox id="vI_storageExtras_openPGP_PGPMIME_store" oncommand="virtualIdentityExtension.storageExtras_adapt(this.id, null)" />
         <checkbox id="vI_storageExtras_openPGP_PGPMIME"
             label="&vI_storageExtrasDataEditorOverlay.PGPMIME.label;"/>

chrome/content/v_identity/vI_storageExtrasDataTreeOverlay.xul

@@ -32 +32 @@
 
 <overlay id="vI_storageExtrasOverlay" 
-          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" >
 
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" />

chrome/content/v_identity/vI_upgrade.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_upgrade = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var upgrade = {
     preferences : Components.classes["@mozilla.org/preferences-service;1"]
             .getService(Components.interfaces.nsIPrefService)
@@ -31 +32 @@
             .getService(Components.interfaces.nsIVersionComparator),
     
-    vI_rdfDatasource : null,
+    rdfDatasource : null,
 
     init : function() {
-        vI_upgrade.__initRequirements();
+        upgrade.__initRequirements();
         document.documentElement.getButton("cancel").setAttribute("hidden", "true")
     },
 
     clean : function() {
-        if (vI_upgrade.vI_rdfDatasource) vI_upgrade.vI_rdfDatasource.clean();
+        if (upgrade.rdfDatasource) upgrade.rdfDatasource.clean();
     },
 
     __initRequirements : function() {
-        vI_notificationBar.dump("") // this initialises the debug-area
-        vI_upgrade.vI_rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf", true);
+        vI.notificationBar.dump("") // this initialises the debug-area
+        upgrade.rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf", true);
     },
     
@@ -61 +62 @@
                 
         // don't show the dialog if we do a one-step upgrade
-        if (vI_upgrade.versionChecker.compare(extVersion, nextVersion) <= 0) {
-            vI_notificationBar.dump("starting quick_upgrade.\n")
-            vI_upgrade.__initRequirements();
-            vI_upgrade.__upgrade();
+        if (upgrade.versionChecker.compare(extVersion, nextVersion) <= 0) {
+            vI.notificationBar.dump("starting quick_upgrade.\n")
+            upgrade.__initRequirements();
+            upgrade.__upgrade();
             return true;
         }
@@ -81 +82 @@
     
     __upgrade : function() {
-        if (vI_upgrade.vI_rdfDatasource.extUpgradeRequired()) vI_upgrade.extUpgrade();
+        if (upgrade.rdfDatasource.extUpgradeRequired()) upgrade.extUpgrade();
         
-        vI_account.cleanupSystem();
+        vI.account.cleanupSystem();
     },          
 
     upgrade : function() {
-        vI_notificationBar.dump("starting upgrade.\n\n")
+        vI.notificationBar.dump("starting upgrade.\n\n")
         document.getElementById("upgradeWizard").setAttribute("canAdvance", "false")
         document.documentElement.getButton('next').setAttribute('disabled','true');
         
-        vI_upgrade.__upgrade();
+        upgrade.__upgrade();
     
-        vI_notificationBar.dump("\n\nupgrade finished.\n");
+        vI.notificationBar.dump("\n\nupgrade finished.\n");
         
         document.documentElement.getButton('next').setAttribute('disabled','false');
@@ -100 +101 @@
     
     extUpgrade : function() {
-        var currentVersion = vI_upgrade.vI_rdfDatasource.getCurrentExtFileVersion();
-        vI_notificationBar.dump("checking for previous version, found " + 
+        var currentVersion = upgrade.rdfDatasource.getCurrentExtFileVersion();
+        vI.notificationBar.dump("checking for previous version, found " + 
             currentVersion + "\nextension-upgrade required.\n")
         switch (currentVersion) {
@@ -107 +108 @@
                 // no break
             default:
-                vI_upgrade.__transferMovedUserPrefs(currentVersion);
-                vI_upgrade.__removeObsoleteUserPrefs(currentVersion);
-                vI_upgrade.__removeExtraAddedHeaders(currentVersion);
+                upgrade.__transferMovedUserPrefs(currentVersion);
+                upgrade.__removeObsoleteUserPrefs(currentVersion);
+                upgrade.__removeExtraAddedHeaders(currentVersion);
         }
-        vI_upgrade.vI_rdfDatasource.storeExtVersion();
-        vI_notificationBar.dump("extension-upgrade to " + vI_upgrade.vI_rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");
+        upgrade.rdfDatasource.storeExtVersion();
+        vI.notificationBar.dump("extension-upgrade to " + upgrade.rdfDatasource.getCurrentExtFileVersion() + " done.\n\n");
     },
     
@@ -120 +121 @@
             .getBranch(null);
         
-        vI_notificationBar.dump("extension-upgrade __removeExtraAddedHeaders " + currentVersion + "\n");
-        if ((!currentVersion || vI_upgrade.versionChecker.compare(currentVersion, "0.6.9") < 0) && 
+        vI.notificationBar.dump("extension-upgrade __removeExtraAddedHeaders " + currentVersion + "\n");
+        if ((!currentVersion || upgrade.versionChecker.compare(currentVersion, "0.6.9") < 0) && 
                 prefroot.getCharPref("mailnews.headers.extraExpandedHeaders") != "") {
             // clean extraExpandedHeaders once, because the whole header-saving and restoring was broken too long
-            vI_notificationBar.dump("cleaning extraExpandedHeaders\n");
+            vI.notificationBar.dump("cleaning extraExpandedHeaders\n");
             prefroot.setCharPref("mailnews.headers.extraExpandedHeaders", "")
-            vI_notificationBar.dump("cleaned extraExpandedHeaders\n");
+            vI.notificationBar.dump("cleaned extraExpandedHeaders\n");
         }
-        vI_notificationBar.dump("extension-upgrade __removeExtraAddedHeaders done.\n\n");
+        vI.notificationBar.dump("extension-upgrade __removeExtraAddedHeaders done.\n\n");
     },
     
@@ -143 +144 @@
         for (var i = 0; i < transferPrefs.length; i++) {
             // if former version of extension was at least 0.5.0, start with WizardPage 0.5.2
-            if (!currentVersion || (vI_upgrade.versionChecker.compare(currentVersion, transferPrefs[i].version) < 0)) {
+            if (!currentVersion || (upgrade.versionChecker.compare(currentVersion, transferPrefs[i].version) < 0)) {
                 // remove any obsolete preferences under extensions.virtualIdentity
-                vI_notificationBar.dump("transfer changed preferences of pre-" + transferPrefs[i].version + " release:\n")
+                vI.notificationBar.dump("transfer changed preferences of pre-" + transferPrefs[i].version + " release:\n")
                 for each (transferPref in transferPrefs[i].prefs) {
-                    try {   vI_upgrade.preferences.setBoolPref(transferPref.targetPref, 
-                            vI_upgrade.preferences.getBoolPref(transferPref.sourcePref));
-                        vI_upgrade.preferences.clearUserPref(transferPref.sourcePref);
-                        vI_notificationBar.dump(".") 
+                    try {   upgrade.preferences.setBoolPref(transferPref.targetPref, 
+                            upgrade.preferences.getBoolPref(transferPref.sourcePref));
+                        upgrade.preferences.clearUserPref(transferPref.sourcePref);
+                        vI.notificationBar.dump(".") 
                     }
                     catch (e) { };
                 }
-                vI_notificationBar.dump("done.\n")
+                vI.notificationBar.dump("done.\n")
             }
         }
@@ -171 +172 @@
         for (var i = 0; i < obsoletePrefs.length; i++) {
             // if former version of extension was at least 0.5.0, start with WizardPage 0.5.2
-            if (!currentVersion || (vI_upgrade.versionChecker.compare(currentVersion, obsoletePrefs[i].version) < 0)) {
+            if (!currentVersion || (upgrade.versionChecker.compare(currentVersion, obsoletePrefs[i].version) < 0)) {
                 // remove any obsolete preferences under extensions.virtualIdentity
-                vI_notificationBar.dump("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release:\n")
+                vI.notificationBar.dump("removing obsolete preferences of pre-" + obsoletePrefs[i].version + " release:\n")
                 for each (pref in obsoletePrefs[i].prefs) {
-                    try { vI_upgrade.preferences.clearUserPref(pref); vI_notificationBar.dump(".") }
+                    try { upgrade.preferences.clearUserPref(pref); vI.notificationBar.dump(".") }
                     catch (e) { };
                 }
-                vI_notificationBar.dump("done.\n")
+                vI.notificationBar.dump("done.\n")
             }
         }
@@ -191 +192 @@
         }
 }
+vI.upgrade = upgrade;
 // start init only if wizard is shown, so it is done in vI_upgrade.xul
-// window.addEventListener('load', vI_upgrade.init, true);
+// window.addEventListener('load', upgrade.init, true);
+}});

chrome/content/v_identity/vI_upgrade.xul

@@ -38 +38 @@
 <wizard id="upgradeWizard" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&vident.upgrade.dlgTitle.label;"
-    zlevel="6" onload="vI_upgrade.init(); vI_upgrade.prepare(document.getElementById('introPage'));" onunload="vI_upgrade.clean();" >
+    zlevel="6" onload="virtualIdentityExtension.upgrade.init(); virtualIdentityExtension.upgrade.prepare(document.getElementById('introPage'));" onunload="virtualIdentityExtension.upgrade.clean();" >
 
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_account.js" />
@@ -62 +63 @@
     </wizardpage>
     <!-- features -->
-    <wizardpage onpageshow="vI_upgrade.prepare(this);"
+    <wizardpage onpageshow="virtualIdentityExtension.upgrade.prepare(this);"
         label="&vident.upgrade.features.label;" description="&vident.upgrade.features.description;" 
         pageid="features" next="license" >
@@ -72 +73 @@
     </wizardpage>
     <!-- GPL license -->
-    <wizardpage onpageshow="vI_upgrade.prepare(this);"
+    <wizardpage onpageshow="virtualIdentityExtension.upgrade.prepare(this);"
         label="&vident.upgrade.license.label;" description="&vident.upgrade.license.description;"
         pageid="license" next="upgrade" >
@@ -83 +84 @@
     </wizardpage>
     <!-- upgrade procedure -->
-    <wizardpage onpageshow="vI_upgrade.prepare(this);vI_upgrade.upgrade();"
+    <wizardpage onpageshow="virtualIdentityExtension.upgrade.prepare(this);virtualIdentityExtension.upgrade.upgrade();"
         label="&vident.upgrade.upgrade.label;" description="&vident.upgrade.upgrade.description;" 
         pageid="upgrade" next="finish" >
@@ -92 +93 @@
     </wizardpage>   
     <!-- finish -->
-    <wizardpage onpageshow="vI_upgrade.prepare(this);"
+    <wizardpage onpageshow="virtualIdentityExtension.upgrade.prepare(this);"
         label="&vident.upgrade.finish.label;" description="&vident.upgrade.finish.description;" 
         pageid="finish" >
@@ -105 +106 @@
     <button class="v_identity_logo v_identity_logo_button"
         label="&vident.vidLogo.label; &vident.version;"
-        oncommand="vI_upgrade.openURL('http://www.absorb.it/virtual-id')" tooltiptext="&vident.upgrade.vidLogo.tooltiptext;" />
+        oncommand="virtualIdentityExtension.upgrade.openURL('http://www.absorb.it/virtual-id')" tooltiptext="&vident.upgrade.vidLogo.tooltiptext;" />
     <spacer width="10px" />
     <label id="extVersion" value="&vident.version;" hidden="true" />

chrome/content/v_identity/vI_upgradeOverlay.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_upgradeOverlay = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var upgradeOverlay = {
     init: function() {
-        var rdfDatasource = new vI_rdfDatasource("virtualIdentity.rdf", true);
+        var rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf", true);
         if (rdfDatasource.extUpgradeRequired()) {
-            if (!vI_upgrade.quick_upgrade(rdfDatasource.getCurrentExtFileVersion()))
+            if (!vI.upgrade.quick_upgrade(rdfDatasource.getCurrentExtFileVersion()))
                 window.open("chrome://v_identity/content/vI_upgrade.xul",0,
                     "chrome, dialog, modal, alwaysRaised, resizable=yes").focus();
         }
         else {
-            vI_account.cleanupSystem(); // always clean leftover accounts and directories
+            vI.account.cleanupSystem(); // always clean leftover accounts and directories
             rdfDatasource.storeExtVersion();
         }
@@ -68 +69 @@
     }
 }
-addEventListener('messagepane-loaded', vI_upgradeOverlay.init, true);
+addEventListener('messagepane-loaded', upgradeOverlay.init, true);
+}});

chrome/content/v_identity/vI_upgradeOverlay.xul

@@ -36 +36 @@
 
 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-    <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgradeOverlay.js" />
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
+
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>   
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_account.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDatasource.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" />
-    
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgradeOverlay.js" />
+
     // include following scripts to enable quick_upgrade
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
@@ -46 +49 @@
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_identityData.js" />
     <script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
-    <script type="application/x-javascript" src="chrome://v_identity/content/vI_notificationBar.js"/>
 
     <vbox id="messagepanebox" >

chrome/content/v_identity/v_identity.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-var vI_main = {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+var main = {
     preferences : Components.classes["@mozilla.org/preferences-service;1"]
             .getService(Components.interfaces.nsIPrefService)
@@ -45 +46 @@
     elements : {
         init_base : function() {
-            vI_main.elements.Area_MsgIdentityHbox = document.getElementById("msgIdentityHbox");
-            vI_main.elements.Obj_MsgIdentity = document.getElementById("msgIdentity");
+            main.elements.Area_MsgIdentityHbox = document.getElementById("msgIdentityHbox");
+            main.elements.Obj_MsgIdentity = document.getElementById("msgIdentity");
         },
         init_rest : function() {
-            vI_main.elements.Obj_MsgIdentityPopup = document.getElementById("msgIdentityPopup");
-            vI_main.elements.Obj_vILogo = document.getElementById("v_identity_logo");
-            vI_main.elements.strings = document.getElementById("vIdentBundle");
+            main.elements.Obj_MsgIdentityPopup = document.getElementById("msgIdentityPopup");
+            main.elements.Obj_vILogo = document.getElementById("v_identity_logo");
+            main.elements.strings = document.getElementById("vIdentBundle");
         },
         strings : null
@@ -58 +59 @@
     ComposeStateListener : {
         NotifyComposeBodyReady: function() { 
-            vI_notificationBar.dump("## v_identity: NotifyComposeBodyReady\n");
-            vI_main.initSystemStage2();
+            vI.notificationBar.dump("## v_identity: NotifyComposeBodyReady\n");
+            main.initSystemStage2();
         },
         NotifyComposeFieldsReady: function() { 
-            vI_notificationBar.dump("## v_identity: NotifyComposeFieldsReady\n");
+            vI.notificationBar.dump("## v_identity: NotifyComposeFieldsReady\n");
         },
         ComposeProcessDone: function(aResult) {
-            vI_notificationBar.dump("## v_identity: StateListener reports ComposeProcessDone\n");
-            vI_main.Cleanup(); // not really required, parallel handled by vI_main.close
-            vI_storage.clean();
+            vI.notificationBar.dump("## v_identity: StateListener reports ComposeProcessDone\n");
+            main.Cleanup(); // not really required, parallel handled by main.close
+            vI.storage.clean();
         },
         SaveInFolderDone: function(folderURI) { 
-            vI_notificationBar.dump("## v_identity: SaveInFolderDone\n");
-            vI_main.Cleanup();
-            vI_storage.clean();
+            vI.notificationBar.dump("## v_identity: SaveInFolderDone\n");
+            main.Cleanup();
+            vI.storage.clean();
         }
     },
@@ -78 +79 @@
     replacement_functions : {
         FillIdentityList: function(menulist) {
-            vI_notificationBar.dump("## v_identity: mod. FillIdentityList\n");
+            vI.notificationBar.dump("## v_identity: mod. FillIdentityList\n");
             var mgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
                                 .getService(Components.interfaces.nsIMsgAccountManager);
@@ -112 +113 @@
                 if (!server) continue;
                 // check for VirtualIdentity Account
-                try {   vI_account.prefroot.getBoolPref("mail.account." + accounts[i].key + ".vIdentity");
+                try {   vI.account.prefroot.getBoolPref("mail.account." + accounts[i].key + ".vIdentity");
                     continue; } catch (e) { };
 
@@ -126 +127 @@
         GenericSendMessageInProgress : false,
         GenericSendMessage: function (msgType) {
-            if (vI_main.replacement_functions.GenericSendMessageInProgress) return;
-            vI_main.replacement_functions.GenericSendMessageInProgress = true;
+            if (main.replacement_functions.GenericSendMessageInProgress) return;
+            main.replacement_functions.GenericSendMessageInProgress = true;
             
             // if addressCol2 is focused while sending check storage for the entered address before continuing
-            vI_storage.awOnBlur(vI_storage.focusedElement);
+            vI.storage.awOnBlur(vI.storage.focusedElement);
 
             var promptService = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                 .getService(Components.interfaces.nsIPromptService);
-            vI_notificationBar.dump("\n## v_identity: VIdentity_GenericSendMessage\n");
+            vI.notificationBar.dump("\n## v_identity: VIdentity_GenericSendMessage\n");
             
             var vid = document.getElementById("msgIdentity_clone").vid
 
             if (msgType == nsIMsgCompDeliverMode.Now) {
-                if ( (vid && vI_main.preferences.getBoolPref("warn_virtual") &&
+                if ( (vid && main.preferences.getBoolPref("warn_virtual") &&
                     !(promptService.confirm(window,"Warning",
-                        vI_main.elements.strings.getString("vident.sendVirtual.warning")))) ||
-                  (!vid && vI_main.preferences.getBoolPref("warn_nonvirtual") &&
+                        main.elements.strings.getString("vident.sendVirtual.warning")))) ||
+                  (!vid && main.preferences.getBoolPref("warn_nonvirtual") &&
                     !(promptService.confirm(window,"Warning",
-                        vI_main.elements.strings.getString("vident.sendNonvirtual.warning")))) ) {
-                    vI_main.replacement_functions.GenericSendMessageInProgress = false;
+                        main.elements.strings.getString("vident.sendNonvirtual.warning")))) ) {
+                    main.replacement_functions.GenericSendMessageInProgress = false;
                     return;
                 }
-                if (!vI_storage.storeVIdentityToAllRecipients(msgType)) {
-//                  vI_notificationBar.dump("## v_identity: sending aborted\n");
-                    vI_main.replacement_functions.GenericSendMessageInProgress = false;
+                if (!vI.storage.storeVIdentityToAllRecipients(msgType)) {
+//                  vI.notificationBar.dump("## v_identity: sending aborted\n");
+                    main.replacement_functions.GenericSendMessageInProgress = false;
                     return;
                 }
-                vI_msgIdentityCloneTools.addReplyToSelf();
+                vI.msgIdentityCloneTools.addReplyToSelf();
             }
-            if (vid) vI_main.prepareAccount();
-            vI_main.replacement_functions.GenericSendMessageInProgress = false;
-//          vI_notificationBar.dump("## v_identity: original_functions.GenericSendMessage\n");
+            if (vid) main.prepareAccount();
+            main.replacement_functions.GenericSendMessageInProgress = false;
+//          vI.notificationBar.dump("## v_identity: original_functions.GenericSendMessage\n");
 
             // final check if eyerything is nice before we handover to the real sending...
@@ -163 +164 @@
 
             var currentIdentity = getCurrentIdentity();
-            //                          vI_identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
-            var currentIdentityData = new vI_identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
+            //                          vI.identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
+            var currentIdentityData = new vI.identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
             
-            vI_notificationBar.dump("\n## vI_identityData GenericSendMessage Final Check\n");
-            vI_notificationBar.dump("## vI_identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
-            vI_notificationBar.dump("## vI_identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
+            vI.notificationBar.dump("\n## vI.identityData GenericSendMessage Final Check\n");
+            vI.notificationBar.dump("## vI.identityData currentIdentity: fullName='" + currentIdentityData.fullName + "' email='" + currentIdentityData.email + "' smtp='" + currentIdentityData.smtp.key + "'\n");
+            vI.notificationBar.dump("## vI.identityData virtualIdentityData: fullName='" + virtualIdentityData.fullName + "' email='" + virtualIdentityData.email + "' smtp='" + virtualIdentityData.smtp.key + "'\n");
 
             if  (currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase()   &&
                 currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase()      &&
                 virtualIdentityData.smtp.equal(currentIdentityData.smtp)    ) {
-                    vI_main.original_functions.GenericSendMessage(msgType);
+                    main.original_functions.GenericSendMessage(msgType);
             }
             else {
-                if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI_notificationBar.dump("\n## vI_identityData failed check for fullName.\n");
-                if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI_notificationBar.dump("\n## vI_identityData failed check for email.\n");
-                if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) vI_notificationBar.dump("\n## vI_identityData failed check for SMTP.\n");
-                alert(vI_main.elements.strings.getString("vident.genericSendMessage.error"));
-                vI_main.Cleanup();
+                if (!(currentIdentityData.fullName.toLowerCase() == virtualIdentityData.fullName.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for fullName.\n");
+                if (!(currentIdentityData.email.toLowerCase() == virtualIdentityData.email.toLowerCase())) vI.notificationBar.dump("\n## vI.identityData failed check for email.\n");
+                if (!(virtualIdentityData.smtp.equal(currentIdentityData.smtp))) vI.notificationBar.dump("\n## vI.identityData failed check for SMTP.\n");
+                alert(main.elements.strings.getString("vident.genericSendMessage.error"));
+                main.Cleanup();
             }
-//          vI_notificationBar.dump("## v_identity: original_functions.GenericSendMessage done\n");
+//          vI.notificationBar.dump("## v_identity: original_functions.GenericSendMessage done\n");
         },
         
         replace_FillIdentityList : function() {
-            //~ vI_notificationBar.dump("## v_identity: replace FillIdentityList \n");
-            vI_main.original_functions.FillIdentityList = FillIdentityList;
-            FillIdentityList = vI_main.replacement_functions.FillIdentityList;
+            //~ vI.notificationBar.dump("## v_identity: replace FillIdentityList \n");
+            main.original_functions.FillIdentityList = FillIdentityList;
+            FillIdentityList = main.replacement_functions.FillIdentityList;
         }
     },
 
     remove: function() {
-        window.removeEventListener('compose-window-reopen', vI_main.reopen, true);
-        window.removeEventListener('compose-window-close', vI_main.close, true);
-        vI_notificationBar.dump("## v_identity: end. remove Account if there.\n")
-        vI_main.Cleanup();
-        vI_storage.clean();
+        window.removeEventListener('compose-window-reopen', main.reopen, true);
+        window.removeEventListener('compose-window-close', main.close, true);
+        vI.notificationBar.dump("## v_identity: end. remove Account if there.\n")
+        main.Cleanup();
+        vI.storage.clean();
     },
 
     // initialization //
     init: function() {
-        window.removeEventListener('load', vI_main.init, false);
-        window.removeEventListener('compose-window-init', vI_main.init, true);
-        if (vI_main.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen)
-        vI_notificationBar.dump("\n## v_identity: init.\n")
-        vI_main.unicodeConverter.charset="UTF-8";
-        if (!vI_main.adapt_genericSendMessage()) { vI_notificationBar.dump("\n## v_identity: init failed.\n"); return; }
-        
-        vI_main.adapt_interface();
-        gMsgCompose.RegisterStateListener(vI_main.ComposeStateListener);
-        document.getElementById("vI_tooltipPopupset")
+        window.removeEventListener('load', main.init, false);
+        window.removeEventListener('compose-window-init', main.init, true);
+        if (main.elements.Area_MsgIdentityHbox) return; // init done before, (?reopen)
+        vI.notificationBar.dump("\n## v_identity: init.\n")
+        main.unicodeConverter.charset="UTF-8";
+        if (!main.adapt_genericSendMessage()) { vI.notificationBar.dump("\n## v_identity: init failed.\n"); return; }
+        
+        main.adapt_interface();
+        gMsgCompose.RegisterStateListener(main.ComposeStateListener);
+        document.getElementById("virtualIdentityExtension_tooltipPopupset")
             .addTooltip(document.getElementById("msgIdentity_clone"), false);
-        window.addEventListener('compose-window-reopen', vI_main.reopen, true);
-        window.addEventListener('compose-window-close', vI_main.close, true);
+        window.addEventListener('compose-window-reopen', main.reopen, true);
+        window.addEventListener('compose-window-close', main.close, true);
         
         // append observer to fcc_switch, because it does'n work with real identities (hidden by css)
         document.getElementById("fcc_switch").appendChild(document.getElementById("msgIdentity_clone_observer").cloneNode(false));
 
-        vI_main.AccountManagerObserver.register();
+        main.AccountManagerObserver.register();
         
-        vI_main.initSystemStage1();
-        vI_notificationBar.dump("## v_identity: init done.\n\n")
+        main.initSystemStage1();
+        vI.notificationBar.dump("## v_identity: init done.\n\n")
     },
     
     initSystemStage1 : function() {
-        vI_notificationBar.dump("## v_identity: initSystemStage1.\n")
-        vI_main.gMsgCompose = gMsgCompose;
+        vI.notificationBar.dump("## v_identity: initSystemStage1.\n")
+        main.gMsgCompose = gMsgCompose;
         document.getElementById("msgIdentity_clone").init();
-        vI_statusmenu.init();
+        vI.statusmenu.init();
     },
     
     initSystemStage2 : function() {
-        vI_notificationBar.dump("## v_identity: initSystemStage2.\n")
-        vI_msgIdentityCloneTools.initReplyTo();
-        vI_storage.init();
-        vI_smartIdentity.init();
+        vI.notificationBar.dump("## v_identity: initSystemStage2.\n")
+        vI.msgIdentityCloneTools.initReplyTo();
+        vI.storage.init();
+        vI.smartIdentity.init();
     },
     
     close : function() {
-        vI_main.Cleanup();
-        vI_storage.clean();
+        main.Cleanup();
+        vI.storage.clean();
     },
     
     adapt_interface : function() {
-        if (vI_main.elements.strings) return; // only rearrange the interface once
+        if (main.elements.strings) return; // only rearrange the interface once
         
         // initialize the pointers to extension elements
-        vI_main.elements.init_base()
+        main.elements.init_base()
         
         // rearrange the positions of some elements
-        var parent_hbox = vI_main.elements.Obj_MsgIdentity.parentNode;
+        var parent_hbox = main.elements.Obj_MsgIdentity.parentNode;
         var storage_box = document.getElementById("addresses-box");
         var autoReplyToSelfLabel = document.getElementById("autoReplyToSelfLabel");
@@ -257 +258 @@
         storage_box.removeChild(autoReplyToSelfLabel);
         parent_hbox.appendChild(autoReplyToSelfLabel);
-        storage_box.removeChild(vI_main.elements.Area_MsgIdentityHbox);
-        parent_hbox.appendChild(vI_main.elements.Area_MsgIdentityHbox);
-
-        vI_main.elements.Obj_MsgIdentity.setAttribute("hidden", "true");
-        vI_main.elements.Obj_MsgIdentity.previousSibling.setAttribute("control", "msgIdentity_clone");
+        storage_box.removeChild(main.elements.Area_MsgIdentityHbox);
+        parent_hbox.appendChild(main.elements.Area_MsgIdentityHbox);
+
+        main.elements.Obj_MsgIdentity.setAttribute("hidden", "true");
+        main.elements.Obj_MsgIdentity.previousSibling.setAttribute("control", "msgIdentity_clone");
         
         var access_label = parent_hbox.getElementsByAttribute( "control", "msgIdentity" )[0];
@@ -267 +268 @@
         
         // initialize the pointers to extension elements (initialize those earlier might brake the interface)
-        vI_main.elements.init_rest();   
+        main.elements.init_rest();  
     },
     
     adapt_genericSendMessage : function() {
-        if (vI_main.original_functions.GenericSendMessage) return true; // only initialize this once
-        vI_notificationBar.dump("## v_identity: adapt GenericSendMessage\n");
-        vI_main.original_functions.GenericSendMessage = GenericSendMessage;
-        GenericSendMessage = vI_main.replacement_functions.GenericSendMessage;
+        if (main.original_functions.GenericSendMessage) return true; // only initialize this once
+        vI.notificationBar.dump("## v_identity: adapt GenericSendMessage\n");
+        main.original_functions.GenericSendMessage = GenericSendMessage;
+        GenericSendMessage = main.replacement_functions.GenericSendMessage;
         return true;
     },
     
     reopen: function() {
-        vI_notificationBar.clear();
-        vI_notificationBar.clear_dump();
-        vI_notificationBar.dump("## v_identity: composeDialog reopened. (msgType " + gMsgCompose.type + ")\n")
+        vI.notificationBar.clear();
+        vI.notificationBar.clear_dump();
+        vI.notificationBar.dump("## v_identity: composeDialog reopened. (msgType " + gMsgCompose.type + ")\n")
         
         // clean all elements
         document.getElementById("msgIdentity_clone").clean();
-        vI_smartIdentity.clean();
-        vI_notificationBar.dump("## v_identity: everything cleaned.\n")
+        vI.smartIdentity.clean();
+        vI.notificationBar.dump("## v_identity: everything cleaned.\n")
         
         // now (re)init the elements
-        vI_main.initSystemStage1();
+        main.initSystemStage1();
         
         // stateListener only works in reply-cases
@@ -303 +304 @@
             case msgComposeType.ForwardAsAttachment:
             case msgComposeType.ForwardInline:
-                vI_main.initSystemStage2(); break;
+                main.initSystemStage2(); break;
             case msgComposeType.Reply:
             case msgComposeType.ReplyAll:
@@ -311 +312 @@
             case msgComposeType.ReplyWithTemplate:
             case msgComposeType.ReplyToList:
-                gMsgCompose.RegisterStateListener(vI_main.ComposeStateListener);
+                gMsgCompose.RegisterStateListener(main.ComposeStateListener);
         }
-        vI_notificationBar.dump("## v_identity: reopen done.\n")
+        vI.notificationBar.dump("## v_identity: reopen done.\n")
     },
     
@@ -319 +320 @@
 
     __setSelectedIdentity : function(menuItem) {
-        vI_main.elements.Obj_MsgIdentity.selectedItem = menuItem;
-        vI_main.elements.Obj_MsgIdentity.setAttribute("label", menuItem.getAttribute("label"));
-        vI_main.elements.Obj_MsgIdentity.setAttribute("accountname", menuItem.getAttribute("accountname"));
-        vI_main.elements.Obj_MsgIdentity.setAttribute("value", menuItem.getAttribute("value"));
+        main.elements.Obj_MsgIdentity.selectedItem = menuItem;
+        main.elements.Obj_MsgIdentity.setAttribute("label", menuItem.getAttribute("label"));
+        main.elements.Obj_MsgIdentity.setAttribute("accountname", menuItem.getAttribute("accountname"));
+        main.elements.Obj_MsgIdentity.setAttribute("value", menuItem.getAttribute("value"));
     },
 
@@ -328 +329 @@
     addVirtualIdentityToMsgIdentityMenu : function()
     {
-        vI_main.tempStorage.BaseIdentity = vI_main.elements.Obj_MsgIdentity.selectedItem;
-        vI_main.tempStorage.NewIdentity = document.createElement("menuitem");
-        vI_main.tempStorage.NewIdentity.className = "identity-popup-item";
+        main.tempStorage.BaseIdentity = main.elements.Obj_MsgIdentity.selectedItem;
+        main.tempStorage.NewIdentity = document.createElement("menuitem");
+        main.tempStorage.NewIdentity.className = "identity-popup-item";
         
         // set the account name in the choosen menu item
-        vI_main.tempStorage.NewIdentity.setAttribute("label", vI_account.account.defaultIdentity.identityName);
-        vI_main.tempStorage.NewIdentity.setAttribute("accountname", " - " +  vI_account.account.incomingServer.prettyName);
-        vI_main.tempStorage.NewIdentity.setAttribute("accountkey", vI_account.account.key);
-        vI_main.tempStorage.NewIdentity.setAttribute("value", vI_account.account.defaultIdentity.key);
-        
-        vI_main.elements.Obj_MsgIdentityPopup.appendChild(vI_main.tempStorage.NewIdentity);
-        vI_main.__setSelectedIdentity(vI_main.tempStorage.NewIdentity);
+        main.tempStorage.NewIdentity.setAttribute("label", vI.account.account.defaultIdentity.identityName);
+        main.tempStorage.NewIdentity.setAttribute("accountname", " - " +  vI.account.account.incomingServer.prettyName);
+        main.tempStorage.NewIdentity.setAttribute("accountkey", vI.account.account.key);
+        main.tempStorage.NewIdentity.setAttribute("value", vI.account.account.defaultIdentity.key);
+        
+        main.elements.Obj_MsgIdentityPopup.appendChild(main.tempStorage.NewIdentity);
+        main.__setSelectedIdentity(main.tempStorage.NewIdentity);
     },
     
     removeVirtualIdentityFromMsgIdentityMenu : function()
     {
-        if (!vI_main.tempStorage.BaseIdentity) return; // don't try to remove Item twice
+        if (!main.tempStorage.BaseIdentity) return; // don't try to remove Item twice
         try {   // might not exist anymore (window closed), so just try to remove it
-            document.getElementById("msgIdentity").firstChild.removeChild(vI_main.tempStorage.NewIdentity);
-            vI_main.__setSelectedIdentity(vI_main.tempStorage.BaseIdentity);
+            document.getElementById("msgIdentity").firstChild.removeChild(main.tempStorage.NewIdentity);
+            main.__setSelectedIdentity(main.tempStorage.BaseIdentity);
         } catch (e) { };
-        vI_main.tempStorage.NewIdentity = null;
-        vI_main.tempStorage.BaseIdentity = null;
+        main.tempStorage.NewIdentity = null;
+        main.tempStorage.BaseIdentity = null;
     },
 
     prepareAccount : function() {
-        vI_main.Cleanup(); // just to be sure that nothing is left (maybe last time sending was irregularily stopped)
-        vI_account.createAccount();
-        vI_main.addVirtualIdentityToMsgIdentityMenu();
+        main.Cleanup(); // just to be sure that nothing is left (maybe last time sending was irregularily stopped)
+        vI.account.createAccount();
+        main.addVirtualIdentityToMsgIdentityMenu();
     },
 
     Cleanup : function() {
-        vI_main.removeVirtualIdentityFromMsgIdentityMenu();
-        vI_account.removeUsedVIAccount();
+        main.removeVirtualIdentityFromMsgIdentityMenu();
+        vI.account.removeUsedVIAccount();
     },
     
@@ -369 +370 @@
         observe : function(subject, topic, data) {
             if (topic == "am-smtpChanges") {
-                vI_notificationBar.dump("## v_identity: smtp changes observed\n");
+                vI.notificationBar.dump("## v_identity: smtp changes observed\n");
                 var msgIdentity_clone = document.getElementById("msgIdentity_clone");
                 document.getAnonymousElementByAttribute(msgIdentity_clone, "class", "smtpServerListHbox").refresh();
             }
             if (topic == "am-acceptChanges") {
-                vI_notificationBar.dump("## v_identity: account changes observed\n");
+                vI.notificationBar.dump("## v_identity: account changes observed\n");
                 document.getElementById("msgIdentity_clone").clean();
                 document.getElementById("msgIdentity_clone").init();
@@ -395 +396 @@
 
 
-vI_main.replacement_functions.replace_FillIdentityList();
-window.addEventListener('compose-window-init', vI_main.init, true);
-
-window.addEventListener("unload", function(e) { vI_main.AccountManagerObserver.unregister(); try {vI_statusmenu.removeObserver();} catch (ex) { } }, false);
-
+main.replacement_functions.replace_FillIdentityList();
+window.addEventListener('compose-window-init', main.init, true);
+
+window.addEventListener("unload", function(e) { main.AccountManagerObserver.unregister(); try {vI.statusmenu.removeObserver();} catch (ex) { } }, false);
+vI.main = main;
+}});

chrome/content/v_identity/v_identity.xml

@@ -35 +35 @@
           xmlns:xbl="http://www.mozilla.org/xbl">
     
-    <binding id="tooltipPopupset">
+    <binding id="vI_tooltipPopupset">
     <implementation>
     <method name="addTooltip">
@@ -44 +44 @@
         this.removeTooltip(randID);
         if (!randID) {
-            randID = "tooltip_" + parseInt((new Date()).getTime());
+            randID = "virtualIdentityExtension_tooltip_" + parseInt((new Date()).getTime());
             elem.tooltipElem.setAttribute("tooltip", randID);
         }
@@ -72 +72 @@
     <method name="popupshowing">
             <body><![CDATA[
+            virtualIdentityExtension.notificationBar.dump("** v_identity.xml vI_tooltipPopupset popupshowing.\n")
         if (!this._identityInfo) {
             this._identityInfo = 
@@ -81 +82 @@
                     "</td>" +
                 "</tr></table>"
-//          vI_notificationBar.dump("** v_identity.xml added tooltip with id='" +  this.elem.identityData.id.key + "'\n")
+            virtualIdentityExtension.notificationBar.dump("** v_identity.xml added tooltip with id='" +  this.elem.identityData.id.key + "'\n")
             this._tooltipBrowser.outputString = this._identityInfo;
         }
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml vI_tooltipPopupset popupshowing done.\n")
         ]]></body>
     </method>
@@ -125 +127 @@
         this.label = this._identityDataStorage.combinedName;
         this.value = this._identityDataStorage.id.key;
-        // vI_notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n")
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor id='" + this.value + "'.\n")
 
         this.description = this._identityDataStorage.sideDescription;
         this.smtp = this._identityDataStorage.smtp.value;
-        // vI_notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml fromPopupItem_clone constructor smtp='" + this.smtp + "'.\n")
         this.smtpStyle = "width:" + document.getElementById("smtp_server_list").clientWidth + "px;";
         this._identityDataStorage.smtp.value;
         
-        document.getElementById("vI_tooltipPopupset").addTooltip(this, true);
+        document.getElementById("virtualIdentityExtension_tooltipPopupset").addTooltip(this, true);
         ]]>
     </constructor>
     <method name="clean">
             <body><![CDATA[
-        document.getElementById("vI_tooltipPopupset")
+        document.getElementById("virtualIdentityExtension_tooltipPopupset")
             .removeTooltip(this.tooltipElem.getAttribute("tooltip"));
         ]]></body>
@@ -167 +169 @@
                 <xul:menupopup anonid="smtp_server_list_popup" />
             </xul:menulist>
-            <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();vI_statusmenu.changeSMTPStatus(this);" >
+            <xul:checkbox  id="saveSMTPSwitch" class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeSMTPStatus(this);" >
                 <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="checked" />
                 <xul:observes element="vI_statusMenu_storage_saveSMTP" attribute="disabled" />
@@ -182 +184 @@
         listitem.setAttribute("type", "non-iconic-noaccel");
         listitem.setAttribute("label", " ");
-        listitem.setAttribute("key", vI_NO_SMTP_TAG);
+        listitem.setAttribute("key", virtualIdentityExtension.NO_SMTP_TAG);
         this._smtpPopup.insertBefore(listitem, this._smtpPopup.firstChild);
         this._smtpMenu.selectedItem = listitem;
@@ -242 +244 @@
     <property name="smtp" onget="return this._smtpMenu.selectedItem.getAttribute('key');" >
         <setter><![CDATA[
-        if (val == vI_NO_SMTP_TAG) return; // dont overwrite if not set
-        vI_notificationBar.dump("** v_identity.xml smtp set to '" + val + "'\n")
+        if (val == virtualIdentityExtension.NO_SMTP_TAG) return; // dont overwrite if not set
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml smtp set to '" + val + "'\n")
         var MenuItems = this._smtpPopup.childNodes
         for (var index = 0; index < MenuItems.length; index++) {
@@ -283 +285 @@
                 <xul:spacer flex="1" /></xul:vbox>
                 <xul:vbox id="saveSwitch"><xul:spacer flex="1" />
-                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();vI_statusmenu.changeSaveStatus(this);" >
+                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeSaveStatus(this);" >
                         <xul:observes element="vI_statusMenu_storage_save" attribute="checked" />
                     </xul:checkbox>
@@ -300 +302 @@
                 <xul:spacer flex="1" /></xul:vbox>
                 <xul:vbox id="saveBaseIDSwitch"><xul:spacer flex="1" />
-                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();vI_statusmenu.changeBaseIDStatus(this);" >
+                    <xul:checkbox class="vI_plain" allowevents="true" oncommand="event.stopPropagation();virtualIdentityExtension.statusmenu.changeBaseIDStatus(this);" >
                         <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="checked" />
                         <xul:observes element="vI_statusMenu_storage_saveBaseID" attribute="disabled" />
@@ -321 +323 @@
         inputTextbox.setAttribute("timeout", "300")
         
-        // to ealy to access vI_tooltipPopupset, this might break the interface
+        // too early to access virtualIdentityExtension_tooltipPopupset, this might break the interface
         // it will be done in v_identity.js init
-        // document.getElementById("vI_tooltipPopupset").addTooltip(this, false);
+        // document.getElementById("virtualIdentityExtension_tooltipPopupset").addTooltip(this, false);
         
         this._prefroot.addObserver("extensions.virtualIdentity.show_smtp", this._observer, false);
@@ -331 +333 @@
     <destructor>
         <![CDATA[
-        var vI_tooltipPopupset = document.getElementById("vI_tooltipPopupset")
-        if (vI_tooltipPopupset) vI_tooltipPopupset.removeTooltip(this.tooltipElem.getAttribute("tooltip"));
+        var tooltipPopupset = document.getElementById("virtualIdentityExtension_tooltipPopupset")
+        if (tooltipPopupset) tooltipPopupset.removeTooltip(this.tooltipElem.getAttribute("tooltip"));
         this._prefroot.removeObserver("extensions.virtualIdentity.show_smtp", this._observer);
         ]]>
@@ -344 +346 @@
     <method name="command">
         <body><![CDATA[
-        vI_notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")
+        virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")
+        virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() \n")
         // copy selected Menu-Value from clone to orig.
-        vI_notificationBar.dump("** v_identity.xmlcopy selected Menu-Value from clone to orig. Searching for id=" + this.selectedMenuItem.identityData.id.key + " \n")
-        
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xmlcopy selected Menu-Value from clone to orig. Searching for id=" + this.selectedMenuItem.identityData.id.key + " \n")
         if ( this.selectedMenuItem.identityData.id.key != null ) {
             var MenuItems = this._msgIdentityPopupElem.childNodes
@@ -360 +362 @@
         }
         this.identityData = this.selectedMenuItem.identityData.getDuplicate();
-        
+        virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml msgIdentityCloneElem.doCommand() this.value=" + this.value + "\n");
         // if current SMTP is empty, take the one from current Identity
         if (this.identityData.smtp.hasNoDefinedSMTP()) {
@@ -381 +383 @@
             // else description = identity.description?"- "+identity.description:identity.accountname
             
-            var newIdentity = new vI_identityData(identity.email, identity.fullName, identity.key,
+            var newIdentity = new virtualIdentityExtension.identityData(identity.email, identity.fullName, identity.key,
                         identity.smtpServerKey, null, description, true)
             newIdentity.extras.readIdentityValues(identity);
@@ -490 +492 @@
         <getter><![CDATA[
             if (!this._msgIdentityElem.selectedItem) {
-                vI_notificationBar.dump("** v_identity.xml: msgIdentityElem.selectedItem not set, using first Menuitem\n");
+                virtualIdentityExtension.notificationBar.dump("** v_identity.xml: msgIdentityElem.selectedItem not set, using first Menuitem\n");
                 this._msgIdentityElem.selectedItem = this._msgIdentityPopupElem.firstChild
-                vI_notificationBar.dump("** v_identity.xml: msgIdentityElem.doCommand()\n");
+                virtualIdentityExtension.notificationBar.dump("** v_identity.xml: msgIdentityElem.doCommand()\n");
                 this._msgIdentityElem.doCommand();
             }
@@ -500 +502 @@
     <method name="blurEvent">
             <body><![CDATA[
-        vI_notificationBar.dump("\n** v_identity.xml blurEvent")
+        virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml blurEvent")
         this.inputEvent(); // timeout might prevent inputEvent to fire before blurEvent
         
@@ -509 +511 @@
     <method name="inputEvent">
             <body><![CDATA[     
-        vI_notificationBar.dump("\n** v_identity.xml inputEvent\n")
+        virtualIdentityExtension.notificationBar.dump("\n** v_identity.xml inputEvent\n")
         
         this.identityData.combinedName = this.label;
@@ -519 +521 @@
     <method name="checkForVirtualIdentity">
         <body><![CDATA[
-        vI_notificationBar.dump("** v_identity.xml checkForVirtualIdentity: " + this.identityData.id.key + " '" + this.identityData.id.value + "'\n")
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml checkForVirtualIdentity: " + this.identityData.id.key + " '" + this.identityData.id.value + "'\n")
         var existingIdentity = this.identityData.isExistingIdentity(false);
         
         this.vid = (!existingIdentity);
         
-        vI_msgIdentityCloneTools.signatureSwitch(existingIdentity);
+        virtualIdentityExtension.msgIdentityCloneTools.signatureSwitch(existingIdentity);
         
         return existingIdentity;
@@ -533 +535 @@
         this.identityData.smtp.key = val;
         
-        document.getElementById("vI_tooltipPopupset").addTooltip(this);
+        document.getElementById("virtualIdentityExtension_tooltipPopupset").addTooltip(this);
 
         var existingIdentity = this.checkForVirtualIdentity();
@@ -545 +547 @@
         ]]></getter>
         <setter><![CDATA[
-        vI_notificationBar.dump("** v_identity.xml identityData setter\n")
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml identityData setter\n")
         if (!val) this._identityDataStorage = null
         else {
@@ -551 +553 @@
             this._identityDataStorage = val;
             if (oldIdentityData) { // indicates that it's not first time after clean
-                vI_notificationBar.dump("** v_identity.xml previousID: fullName='" + oldIdentityData.fullName + "' email='" + oldIdentityData.email + "' smtp='" + oldIdentityData.smtp.key + "' id='" + oldIdentityData.id.key + "' existingID='" + oldIdentityData.existingID + "'\n");
-                vI_notificationBar.dump("** v_identity.xml newID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'\n");
+                virtualIdentityExtension.notificationBar.dump("** v_identity.xml previousID: fullName='" + oldIdentityData.fullName + "' email='" + oldIdentityData.email + "' smtp='" + oldIdentityData.smtp.key + "' id='" + oldIdentityData.id.key + "' existingID='" + oldIdentityData.existingID + "'\n");
+                virtualIdentityExtension.notificationBar.dump("** v_identity.xml newID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'\n");
                 if (!this._identityDataStorage.existingID && !this._identityDataStorage.combinedName)
                     this._identityDataStorage.fullName = oldIdentityData.fullName;
@@ -569 +571 @@
             this.description = this._identityDataStorage.sideDescription;
             document.getAnonymousElementByAttribute(this, "anonid", "smtpServerListHbox").smtp = this._identityDataStorage.smtp.keyNice;
-            vI_notificationBar.dump("** v_identity.xml resultingID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'\n");            
-        }
-        vI_notificationBar.dump("** v_identity.xml identityData setter done.'\n")
+            virtualIdentityExtension.notificationBar.dump("** v_identity.xml resultingID: fullName='" + this._identityDataStorage.fullName + "' email='" + this._identityDataStorage.email + "' smtp='" + this._identityDataStorage.smtp.key + "' id='" + this._identityDataStorage.id.key + "' existingID='" + this._identityDataStorage.existingID + "'\n");          
+        }
+        virtualIdentityExtension.notificationBar.dump("** v_identity.xml identityData setter done.'\n")
         ]]></setter>
     </property>

chrome/content/v_identity/v_identity.xul

@@ -36 +36 @@
   <overlay id="v_identity" 
           xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
+<script type="application/x-javascript" src="chrome://v_identity/content/vI_overlayNameSpaceWrapper.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/v_identity.js" />
 <script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
@@ -77 +77 @@
         tooltiptext="&vident.composeDialog.fcc_switch.tooltiptext;" hidden="true" doFcc="false"
         oncommand="if (this.doFcc == this.checked) this.checked = !(this.checked); this.doFcc = this.checked;" />
-    <popupset id="vI_tooltipPopupset" />
+    <popupset id="virtualIdentityExtension_tooltipPopupset" />
 </hbox>
   </vbox>
@@ -84 +84 @@
       <menupopup id="vI_statusMenu">
           <menuitem type="checkbox" id="vI_statusMenu_storage_save" label="&vident.vI_Menu.storageSave.label;"
-            oncommand="vI_statusmenu.menuConstraint(this);"/>
+            oncommand="virtualIdentityExtension.statusmenu.menuConstraint(this);"/>
           <menuitem type="checkbox" id="vI_statusMenu_storage_saveBaseID" label="&vident.vI_Menu.saveBaseID.label;"
-            oncommand="vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);"/>
+            oncommand="virtualIdentityExtension.statusmenu.menuConstraint(virtualIdentityExtension.statusmenu.objStorageSaveMenuItem);"/>
           <menuitem type="checkbox" id="vI_statusMenu_storage_saveSMTP" label="&vident.vI_Menu.saveSMTP.label;"
-            oncommand="vI_statusmenu.menuConstraint(vI_statusmenu.objStorageSaveMenuItem);"/>
+            oncommand="virtualIdentityExtension.statusmenu.menuConstraint(virtualIdentityExtension.statusmenu.objStorageSaveMenuItem);"/>
           <menuseparator id="vI_statusMenu_separator" />
           <menuitem class="menuitem-iconic" label="&vident.vI_Menu.Settings.label;"
@@ -125 +125 @@
               context="vI_statusMenu"
               tooltip="vI_statusMenuTooltip"
-              onclick="vI_statusmenu.clicked(event.button);" />
+              onclick="virtualIdentityExtension.statusmenu.clicked(event.button);" />
 </statusbar>
   

chrome/skin/classic/v_identity/v_identity.css

@@ -379 +379 @@
 }
 
-#vI_tooltipPopupset {
-    -moz-binding: url("chrome://v_identity/content/v_identity.xml#tooltipPopupset");
+#virtualIdentityExtension_tooltipPopupset {
+    -moz-binding: url("chrome://v_identity/content/v_identity.xml#vI_tooltipPopupset");
 }