Patch for TB 68

bootstrap.js

@@ -15,6 +15,7 @@ function loadIntoWindow(window) {
   let document = window.document; // XULDocument
   let type = document.documentElement.getAttribute('windowtype'); // documentElement maybe 'messengerWindow' / 'addressbookWindow'
   if ( targetWindows.indexOf(type) < 0 ) return;
+  Services.console.logStringMessage("Expression Search: loading ExpressionSearchChrome");
   ExpressionSearchChrome.init(); // will and add my filter, and TB want the domID exists when filter registered, so only called when have window ready
   ExpressionSearchChrome.Load(window);
 }
@@ -56,7 +57,7 @@ function startup(aData, aReason) {
 
 function shutdown(aData, aReason) {
   // When the application is shutting down we normally don't have to clean up any UI changes made
-  if (aReason == APP_SHUTDOWN) return;
+  //** if (aReason == APP_SHUTDOWN) return;
 
   try {
     if ( sss.sheetRegistered(userCSS, sss.USER_SHEET) ) sss.unregisterSheet(userCSS, sss.USER_SHEET);

content/es.js

@@ -35,13 +35,20 @@ var ExpressionSearchChrome = {
   init: function() {
     Cu.import("chrome://expressionsearch/content/log.js"); // load log first
     if ( this.loaded ) {
+	    try {
+		    ExpressionSearchLog.log("Expression Search: init...1", false, true);
+		    this.importModules();
+		    this.initPerf();
+	    } catch (err) {
+		    ExpressionSearchLog.logException(err);
+	    }
       if ( !this.prefs && ExpressionSearchLog ) {
         ExpressionSearchLog.log("Expression Search is NOT restartless! Please restart Thunderbird!", 1);
       } else return;
     }
     this.loaded = 1;
     try {
-      ExpressionSearchLog.log("Expression Search: init...", false, true);
+      ExpressionSearchLog.log("Expression Search: init...2", false, true);
       this.importModules();
       this.initPerf();
     } catch (err) {
@@ -128,6 +135,7 @@ var ExpressionSearchChrome = {
      "results_label_size", "showbuttonlabel", "statusbar_info_showtime", "statusbar_info_hidetime", "c2s_enableCtrl", "c2s_enableShift", "c2s_enableCtrlReplace",
      "c2s_enableShiftReplace", "c2s_regexpMatch", "c2s_regexpReplace", "c2s_removeDomainName", "installed_version", "enable_statusbar_info", "enable_verbose_info"].forEach( function(key) {
       try {
+		ExpressionSearchLog.log("Expression Search: watch key:"+key, false, true);
         ExpressionSearchChrome.observe('', 'nsPref:changed', key); // we fake one
       } catch ( err ) {
         ExpressionSearchLog.logException(err);
@@ -1180,4 +1188,4 @@ var ExpressionSearchChrome = {
     }
   },
 
-};
+};

content/help.html

@@ -338,6 +338,7 @@ <h3>Click 2 Search</h3>
 <h3>Version history</h3>
 <ul><li>
 Version 1.4: <ul>
+<li>1.4.2: Works with TB 68, fixed by R Roth see <a href='http://www.tnrglobal.com/2020/05/thunderbird-addons/'>RR TB Addons</a>/li>
 <li>Works with TB 63 nightly, drop support for TB older than 60</li>
 <li>Change from legacy XUL overly addon to restartless addon</li>
 </ul>

manifest.json

@@ -3,20 +3,20 @@
     "gecko": {
       "id": "{03EF8A6E-C972-488f-92FA-98ABC2C9F8B9}",
       "strict_min_version": "68.0",
-      "strict_max_version": "68.9"
+      "strict_max_version": "68.*"
     }
   },
-  "version": "1.4beta",
+  "version": "1.4.2",
   "manifest_version": 2,
   "name": "Expression Search / Google Mail UI",
   "description": "Type 'from:fred to:tom' to see all messages from Fred to Tom in the current view.",
-  "author": "Opera Wang",
+  "author": "Opera Wang V68 by Rich Roth - http://www.tnrglobal.com/2020/05/thunderbird-addons/",
   "homepage_url": "https://github.com/wangvisual/expression-search",
   "legacy": {
     "type": "bootstrap",
     "options": {
       "page": "chrome://expressionsearch/content/esPrefDialog.xul",
-      "open_in_tab": false
+      "open_in_tab": true
     }
   },
   "icons": {