From c83dc410c99ecde83a037107fe04330983d3c86e Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 17:25:22 +0200
Subject: [PATCH 01/22] Update maxVersion to 60.0

---
 src/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/install.rdf b/src/install.rdf
index 437e7d6..521c8f6 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -31,7 +31,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>7.0</em:minVersion>
-        <em:maxVersion>38.0</em:maxVersion>
+        <em:maxVersion>60.0</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From db78af03ab8c71e0558675bb83c2216ce28b92e6 Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 17:28:44 +0200
Subject: [PATCH 02/22] Use "0o"-prefixed octal literals

---
 src/modules/logging.jsm | 42 ++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/modules/logging.jsm b/src/modules/logging.jsm
index ae8ab88..bf5384b 100644
--- a/src/modules/logging.jsm
+++ b/src/modules/logging.jsm
@@ -11,27 +11,27 @@ Cu.import("resource://gre/modules/Services.jsm");
 const FIRETRAY_LOG_LEVEL = "Warn"; // "All" for debugging
 
 const COLOR_NORMAL          = "";
-const COLOR_RESET           = "\033[m";
-const COLOR_BOLD            = "\033[1m";
-const COLOR_RED             = "\033[31m";
-const COLOR_GREEN           = "\033[32m";
-const COLOR_YELLOW          = "\033[33m";
-const COLOR_BLUE            = "\033[34m";
-const COLOR_MAGENTA         = "\033[35m";
-const COLOR_CYAN            = "\033[36m";
-const COLOR_WHITE           = "\033[37m";
-const COLOR_BOLD_RED        = "\033[1;31m";
-const COLOR_BOLD_GREEN      = "\033[1;32m";
-const COLOR_BOLD_YELLOW     = "\033[1;33m";
-const COLOR_BOLD_BLUE       = "\033[1;34m";
-const COLOR_BOLD_MAGENTA    = "\033[1;35m";
-const COLOR_BOLD_CYAN       = "\033[1;36m";
-const COLOR_BG_RED          = "\033[41m";
-const COLOR_BG_GREEN        = "\033[42m";
-const COLOR_BG_YELLOW       = "\033[43m";
-const COLOR_BG_BLUE         = "\033[44m";
-const COLOR_BG_MAGENTA      = "\033[45m";
-const COLOR_BG_CYAN         = "\033[46m";
+const COLOR_RESET           = "\0o33[m";
+const COLOR_BOLD            = "\0o33[1m";
+const COLOR_RED             = "\0o33[31m";
+const COLOR_GREEN           = "\0o33[32m";
+const COLOR_YELLOW          = "\0o33[33m";
+const COLOR_BLUE            = "\0o33[34m";
+const COLOR_MAGENTA         = "\0o33[35m";
+const COLOR_CYAN            = "\0o33[36m";
+const COLOR_WHITE           = "\0o33[37m";
+const COLOR_BOLD_RED        = "\0o33[1;31m";
+const COLOR_BOLD_GREEN      = "\0o33[1;32m";
+const COLOR_BOLD_YELLOW     = "\0o33[1;33m";
+const COLOR_BOLD_BLUE       = "\0o33[1;34m";
+const COLOR_BOLD_MAGENTA    = "\0o33[1;35m";
+const COLOR_BOLD_CYAN       = "\0o33[1;36m";
+const COLOR_BG_RED          = "\0o33[41m";
+const COLOR_BG_GREEN        = "\0o33[42m";
+const COLOR_BG_YELLOW       = "\0o33[43m";
+const COLOR_BG_BLUE         = "\0o33[44m";
+const COLOR_BG_MAGENTA      = "\0o33[45m";
+const COLOR_BG_CYAN         = "\0o33[46m";
 
 var colorTermLogColors = {
   "FATAL":  COLOR_BOLD_RED,

From 49893303cf1f33030097dbf38b73e0d73f18b721 Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 17:50:45 +0200
Subject: [PATCH 03/22] Remove javascript version because not supported any
 more since mozilla57

---
 src/chrome/content/overlay.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/overlay.xul b/src/chrome/content/overlay.xul
index 3ffea10..3fed145 100644
--- a/src/chrome/content/overlay.xul
+++ b/src/chrome/content/overlay.xul
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="chrome://firetray/skin/overlay.css" type="text/css"?>
 <!DOCTYPE overlay SYSTEM "chrome://firetray/locale/overlay.dtd">
 <overlay id="firetray-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/javascript;version=1.8" src="overlay.js"/>
+  <script type="application/javascript" src="overlay.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="firetray-strings" src="chrome://firetray/locale/overlay.properties"/>

From 70494953d32a8200a9b9b4b65aa8948208e6fc4b Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 18:00:00 +0200
Subject: [PATCH 04/22] Replace `for each` by `for (... of ...) because
 E4X/ECMA-357 is deprecated

---
 src/modules/commons.js              | 2 +-
 src/modules/ctypes/ctypes-utils.jsm | 4 ++--
 src/modules/linux/FiretrayChat.jsm  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/commons.js b/src/modules/commons.js
index 1e0c7dd..3eef440 100644
--- a/src/modules/commons.js
+++ b/src/modules/commons.js
@@ -183,7 +183,7 @@ firetray.Utils = {
   },
 
   QueryInterfaces: function(obj) {
-    for each (i in Components.interfaces)
+    for (i of Components.interfaces)
       try {
         if (obj instanceof i) log.debug (i);
       } catch(x) {}
diff --git a/src/modules/ctypes/ctypes-utils.jsm b/src/modules/ctypes/ctypes-utils.jsm
index f3df558..b4edac3 100644
--- a/src/modules/ctypes/ctypes-utils.jsm
+++ b/src/modules/ctypes/ctypes-utils.jsm
@@ -117,7 +117,7 @@ function ctypes_library(aName, aABIs, aDefines, aGlobal) {
 
     var library;
     this.ABI = -1;
-    for each (let abi in aABIs) {
+    for (let abi of aABIs) {
       // FIXME: ABI is in fact SO_VER. Now we're mixing .so versions and the
       // .dll extension :(
       let libname = abi === 'dll' ? aName :
@@ -169,7 +169,7 @@ function ctypes_library(aName, aABIs, aDefines, aGlobal) {
           } else {
             args.push(ctypes.default_abi);
           }
-          for each (let arg in Array.prototype.slice.call(arguments, 1)) {
+          for (let arg of Array.prototype.slice.call(arguments, 1)) {
             args.push(arg);
           }
 
diff --git a/src/modules/linux/FiretrayChat.jsm b/src/modules/linux/FiretrayChat.jsm
index 539500d..a3b674c 100644
--- a/src/modules/linux/FiretrayChat.jsm
+++ b/src/modules/linux/FiretrayChat.jsm
@@ -237,7 +237,7 @@ firetray.Chat = {
     let win = firetray.Handler.windows[xid].chromeWin;
     let tabmail = win.document.getElementById("tabmail");
     let chatTabs = tabmail.tabModes.chat.tabs;
-    for each (let tab in chatTabs)
+    for (let tab of chatTabs)
       if (tab.tabNode.selected) return tab;
     return null;
   },

From 1c845574f384d15ffe1895663e236f65670f2845 Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 18:19:15 +0200
Subject: [PATCH 05/22] Define variables before using them

---
 src/modules/ctypes/ctypes-utils.jsm      | 2 +-
 src/modules/winnt/FiretrayStatusIcon.jsm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/ctypes/ctypes-utils.jsm b/src/modules/ctypes/ctypes-utils.jsm
index b4edac3..42767c5 100644
--- a/src/modules/ctypes/ctypes-utils.jsm
+++ b/src/modules/ctypes/ctypes-utils.jsm
@@ -161,7 +161,7 @@ function ctypes_library(aName, aABIs, aDefines, aGlobal) {
     let lib = {
       declare: function() {
         try {
-          args = [];
+          let args = [];
           args.push(arguments[0]);
           // FIXME: ugly hack. We'll see when we need WinCbABI
           if (this.ABI === 'dll') {
diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index a9390d2..2eacb42 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -179,7 +179,7 @@ firetray.StatusIcon = {
   create: function() {
     let hwnd_hidden = this.createProxyWindow();
 
-    nid = new shell32.NOTIFYICONDATAW();
+    let nid = new shell32.NOTIFYICONDATAW();
     nid.cbSize = shell32.NOTIFYICONDATAW_SIZE();
     log.debug("SIZE="+nid.cbSize);
     nid.szTip = firetray.Handler.app.name;
@@ -191,7 +191,7 @@ firetray.StatusIcon = {
     nid.uVersion = shell32.NOTIFYICON_VERSION_4;
 
     // Install the icon
-    rv = shell32.Shell_NotifyIconW(shell32.NIM_ADD, nid.address());
+    let rv = shell32.Shell_NotifyIconW(shell32.NIM_ADD, nid.address());
     log.debug("Shell_NotifyIcon ADD="+rv+" winLastError="+ctypes.winLastError); // ERROR_INVALID_WINDOW_HANDLE(1400)
     rv = shell32.Shell_NotifyIconW(shell32.NIM_SETVERSION, nid.address());
     log.debug("Shell_NotifyIcon SETVERSION="+rv+" winLastError="+ctypes.winLastError);

From a39feb9f475b67bdee2114ff3270eaafa67ef5fe Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 18:32:03 +0200
Subject: [PATCH 06/22] Use `ChromeUtils.import()` because it's faster than
 `Components.utils.import()`

According to https://wiki.mozilla.org/Thunderbird/Add-ons_Guide_57
---
 src/chrome/content/options.js                  | 2 +-
 src/components/firetray-clhandler.js           | 2 +-
 src/modules/FiretrayHandler.jsm                | 2 +-
 src/modules/FiretrayMessaging.jsm              | 2 +-
 src/modules/FiretrayWindow.jsm                 | 2 +-
 src/modules/PrefListener.jsm                   | 2 +-
 src/modules/VersionChange.jsm                  | 2 +-
 src/modules/commons.js                         | 2 +-
 src/modules/ctypes/ctypes-utils.jsm            | 2 +-
 src/modules/ctypes/ctypesMap.jsm               | 2 +-
 src/modules/ctypes/libfiretray.jsm             | 2 +-
 src/modules/ctypes/linux/cairo.jsm             | 2 +-
 src/modules/ctypes/linux/gdk23.jsm             | 2 +-
 src/modules/ctypes/linux/gio.jsm               | 2 +-
 src/modules/ctypes/linux/glib.jsm              | 2 +-
 src/modules/ctypes/linux/gobject.jsm           | 2 +-
 src/modules/ctypes/linux/gtk2/appindicator.jsm | 2 +-
 src/modules/ctypes/linux/gtk2/gdk.jsm          | 2 +-
 src/modules/ctypes/linux/gtk2/gtk.jsm          | 2 +-
 src/modules/ctypes/linux/gtk23.jsm             | 2 +-
 src/modules/ctypes/linux/gtk3/appindicator.jsm | 2 +-
 src/modules/ctypes/linux/gtk3/gdk.jsm          | 2 +-
 src/modules/ctypes/linux/gtk3/gtk.jsm          | 2 +-
 src/modules/ctypes/linux/libc.jsm              | 2 +-
 src/modules/ctypes/linux/pango.jsm             | 2 +-
 src/modules/ctypes/linux/pangocairo.jsm        | 2 +-
 src/modules/ctypes/linux/x11.jsm               | 2 +-
 src/modules/ctypes/winnt/gdi32.jsm             | 2 +-
 src/modules/ctypes/winnt/kernel32.jsm          | 2 +-
 src/modules/ctypes/winnt/shell32.jsm           | 2 +-
 src/modules/ctypes/winnt/user32.jsm            | 2 +-
 src/modules/ctypes/winnt/win32.jsm             | 2 +-
 src/modules/linux/FiretrayAppIndicator.jsm     | 2 +-
 src/modules/linux/FiretrayChat.jsm             | 2 +-
 src/modules/linux/FiretrayChatStatusIcon.jsm   | 2 +-
 src/modules/linux/FiretrayGtkIcons.jsm         | 2 +-
 src/modules/linux/FiretrayGtkStatusIcon.jsm    | 2 +-
 src/modules/linux/FiretrayPopupMenu.jsm        | 2 +-
 src/modules/linux/FiretrayStatusIcon.jsm       | 2 +-
 src/modules/linux/FiretrayWindow.jsm           | 2 +-
 src/modules/logging.jsm                        | 2 +-
 src/modules/winnt/FiretrayPopupMenu.jsm        | 2 +-
 src/modules/winnt/FiretrayStatusIcon.jsm       | 2 +-
 src/modules/winnt/FiretrayWin32.jsm            | 2 +-
 src/modules/winnt/FiretrayWindow.jsm           | 2 +-
 45 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index a1342f6..dd806aa 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -2,7 +2,7 @@
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://firetray/FiretrayHandler.jsm");
 Cu.import("resource://firetray/commons.js");
diff --git a/src/components/firetray-clhandler.js b/src/components/firetray-clhandler.js
index 51970d9..70911b2 100644
--- a/src/components/firetray-clhandler.js
+++ b/src/components/firetray-clhandler.js
@@ -2,7 +2,7 @@
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://firetray/logging.jsm");
diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 1a15bf8..1709fb6 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/ctypes.jsm");
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index 57f4231..610eb63 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray", "FLDRS_UNINTERESTING" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource:///modules/iteratorUtils.jsm");
 Cu.import("resource:///modules/mailServices.js");
diff --git a/src/modules/FiretrayWindow.jsm b/src/modules/FiretrayWindow.jsm
index dd001f7..c46b56c 100644
--- a/src/modules/FiretrayWindow.jsm
+++ b/src/modules/FiretrayWindow.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "FiretrayWindow" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://firetray/commons.js");
 
diff --git a/src/modules/PrefListener.jsm b/src/modules/PrefListener.jsm
index 3f852b6..315758d 100644
--- a/src/modules/PrefListener.jsm
+++ b/src/modules/PrefListener.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "PrefListener" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 
 /**
diff --git a/src/modules/VersionChange.jsm b/src/modules/VersionChange.jsm
index 3fe97a4..9d4f92c 100644
--- a/src/modules/VersionChange.jsm
+++ b/src/modules/VersionChange.jsm
@@ -2,7 +2,7 @@ var EXPORTED_SYMBOLS = [ "VersionChange" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/AddonManager.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
diff --git a/src/modules/commons.js b/src/modules/commons.js
index 3eef440..b2a84ff 100644
--- a/src/modules/commons.js
+++ b/src/modules/commons.js
@@ -20,7 +20,7 @@ var EXPORTED_SYMBOLS =
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://firetray/logging.jsm");
diff --git a/src/modules/ctypes/ctypes-utils.jsm b/src/modules/ctypes/ctypes-utils.jsm
index 42767c5..5cd203e 100644
--- a/src/modules/ctypes/ctypes-utils.jsm
+++ b/src/modules/ctypes/ctypes-utils.jsm
@@ -38,7 +38,7 @@
 
 var EXPORTED_SYMBOLS  = [ "ctypes_library", "is64bit", "WinCbABI" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/src/modules/ctypes/ctypesMap.jsm b/src/modules/ctypes/ctypesMap.jsm
index 6f119a5..4d406f7 100644
--- a/src/modules/ctypes/ctypesMap.jsm
+++ b/src/modules/ctypes/ctypesMap.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "ctypesMap", "FIRETRAY_WINDOW_COUNT_MAX", "DeleteError"
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/logging.jsm");
diff --git a/src/modules/ctypes/libfiretray.jsm b/src/modules/ctypes/libfiretray.jsm
index 1f94787..9ac661c 100644
--- a/src/modules/ctypes/libfiretray.jsm
+++ b/src/modules/ctypes/libfiretray.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = ["libfiretray"];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://firetray/logging.jsm");
diff --git a/src/modules/ctypes/linux/cairo.jsm b/src/modules/ctypes/linux/cairo.jsm
index f9c4c94..1de782f 100644
--- a/src/modules/ctypes/linux/cairo.jsm
+++ b/src/modules/ctypes/linux/cairo.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "cairo" ];
 const CAIRO_LIBNAME = "cairo";
 const CAIRO_ABIS    = [ 2 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gdk23.jsm b/src/modules/ctypes/linux/gdk23.jsm
index 6bb5f82..196cd7a 100644
--- a/src/modules/ctypes/linux/gdk23.jsm
+++ b/src/modules/ctypes/linux/gdk23.jsm
@@ -4,7 +4,7 @@
  */
 var EXPORTED_SYMBOLS = [ "gdk23_defines" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gio.jsm b/src/modules/ctypes/linux/gio.jsm
index ccd7e2d..9e32533 100644
--- a/src/modules/ctypes/linux/gio.jsm
+++ b/src/modules/ctypes/linux/gio.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "gio" ];
 const GIO_LIBNAME = "gio-2.0";
 const GIO_ABIS    = [ "0" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/glib.jsm b/src/modules/ctypes/linux/glib.jsm
index 963bd5b..22df769 100644
--- a/src/modules/ctypes/linux/glib.jsm
+++ b/src/modules/ctypes/linux/glib.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "glib" ];
 const GLIB_LIBNAME = "glib-2.0";
 const GLIB_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gobject.jsm b/src/modules/ctypes/linux/gobject.jsm
index cf95946..81cd0c8 100644
--- a/src/modules/ctypes/linux/gobject.jsm
+++ b/src/modules/ctypes/linux/gobject.jsm
@@ -42,7 +42,7 @@ var EXPORTED_SYMBOLS = [ "gobject", "glib" ];
 const GOBJECT_LIBNAME = "gobject-2.0";
 const GOBJECT_ABIS = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk2/appindicator.jsm b/src/modules/ctypes/linux/gtk2/appindicator.jsm
index b421be4..01ffd3b 100644
--- a/src/modules/ctypes/linux/gtk2/appindicator.jsm
+++ b/src/modules/ctypes/linux/gtk2/appindicator.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "appind" ];
 const APPINDICATOR_LIBNAME = "appindicator";
 const APPINDICATOR_ABIS    = [ 1 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk2/gdk.jsm b/src/modules/ctypes/linux/gtk2/gdk.jsm
index d14b61f..4db8caa 100644
--- a/src/modules/ctypes/linux/gtk2/gdk.jsm
+++ b/src/modules/ctypes/linux/gtk2/gdk.jsm
@@ -42,7 +42,7 @@ var EXPORTED_SYMBOLS = [ "gdk" ];
 const GDK_LIBNAME = "gdk-x11-2.0";
 const GDK_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk2/gtk.jsm b/src/modules/ctypes/linux/gtk2/gtk.jsm
index 6f657f4..84ef437 100644
--- a/src/modules/ctypes/linux/gtk2/gtk.jsm
+++ b/src/modules/ctypes/linux/gtk2/gtk.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "gtk" ];
 const GTK_LIBNAME = "gtk-x11-2.0";
 const GTK_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk23.jsm b/src/modules/ctypes/linux/gtk23.jsm
index 6748fb0..afcca38 100644
--- a/src/modules/ctypes/linux/gtk23.jsm
+++ b/src/modules/ctypes/linux/gtk23.jsm
@@ -4,7 +4,7 @@
  */
 var EXPORTED_SYMBOLS = [ "gtk" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk3/appindicator.jsm b/src/modules/ctypes/linux/gtk3/appindicator.jsm
index 4e0980e..bea7914 100644
--- a/src/modules/ctypes/linux/gtk3/appindicator.jsm
+++ b/src/modules/ctypes/linux/gtk3/appindicator.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "appind" ];
 const APPINDICATOR_LIBNAME = "appindicator3";
 const APPINDICATOR_ABIS    = [ 1 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk3/gdk.jsm b/src/modules/ctypes/linux/gtk3/gdk.jsm
index 849e066..7c1cfe7 100644
--- a/src/modules/ctypes/linux/gtk3/gdk.jsm
+++ b/src/modules/ctypes/linux/gtk3/gdk.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "gdk" ];
 const GDK_LIBNAME = "gdk-3";
 const GDK_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/gtk3/gtk.jsm b/src/modules/ctypes/linux/gtk3/gtk.jsm
index 7f306e7..39e60e1 100644
--- a/src/modules/ctypes/linux/gtk3/gtk.jsm
+++ b/src/modules/ctypes/linux/gtk3/gtk.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "gtk" ];
 const GTK_LIBNAME = "gtk-3";
 const GTK_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/libc.jsm b/src/modules/ctypes/linux/libc.jsm
index a50c37a..30cea67 100644
--- a/src/modules/ctypes/linux/libc.jsm
+++ b/src/modules/ctypes/linux/libc.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "libc" ];
 const LIBC_LIBNAME = "c";
 const LIBC_ABIS    = [ 6 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/pango.jsm b/src/modules/ctypes/linux/pango.jsm
index a19a755..3260e74 100644
--- a/src/modules/ctypes/linux/pango.jsm
+++ b/src/modules/ctypes/linux/pango.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "pango", "pangocairo" ];
 const PANGO_LIBNAME = "pango-1.0";
 const PANGO_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/pangocairo.jsm b/src/modules/ctypes/linux/pangocairo.jsm
index e763951..e0188ee 100644
--- a/src/modules/ctypes/linux/pangocairo.jsm
+++ b/src/modules/ctypes/linux/pangocairo.jsm
@@ -5,7 +5,7 @@ var EXPORTED_SYMBOLS = [ "pangocairo" ];
 const PANGOCAIRO_LIBNAME = "pangocairo-1.0";
 const PANGOCAIRO_ABIS    = [ 0 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/linux/x11.jsm b/src/modules/ctypes/linux/x11.jsm
index 2895f45..ba70967 100644
--- a/src/modules/ctypes/linux/x11.jsm
+++ b/src/modules/ctypes/linux/x11.jsm
@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = [
 const X11_LIBNAME = "X11";
 const X11_ABIS    = [ 6 ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 const Cc = Components.classes;
 const Ci = Components.interfaces;
 
diff --git a/src/modules/ctypes/winnt/gdi32.jsm b/src/modules/ctypes/winnt/gdi32.jsm
index ba99226..768c24e 100644
--- a/src/modules/ctypes/winnt/gdi32.jsm
+++ b/src/modules/ctypes/winnt/gdi32.jsm
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = [ "gdi32" ];
 const GDI32_LIBNAME = "gdi32";
 const GDI32_ABIS    = [ "dll" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
diff --git a/src/modules/ctypes/winnt/kernel32.jsm b/src/modules/ctypes/winnt/kernel32.jsm
index 70daa2b..6731003 100644
--- a/src/modules/ctypes/winnt/kernel32.jsm
+++ b/src/modules/ctypes/winnt/kernel32.jsm
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = [ "kernel32" ];
 const KERNEL32_LIBNAME = "kernel32";
 const KERNEL32_ABIS    = [ "dll" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
diff --git a/src/modules/ctypes/winnt/shell32.jsm b/src/modules/ctypes/winnt/shell32.jsm
index 8922d4c..d0b5556 100644
--- a/src/modules/ctypes/winnt/shell32.jsm
+++ b/src/modules/ctypes/winnt/shell32.jsm
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = [ "shell32" ];
 const SHELL32_LIBNAME = "shell32";
 const SHELL32_ABIS    = [ "dll" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
diff --git a/src/modules/ctypes/winnt/user32.jsm b/src/modules/ctypes/winnt/user32.jsm
index e5f6ad4..f1a9ce9 100644
--- a/src/modules/ctypes/winnt/user32.jsm
+++ b/src/modules/ctypes/winnt/user32.jsm
@@ -3,7 +3,7 @@ var EXPORTED_SYMBOLS = [ "user32" ];
 const USER32_LIBNAME = "user32";
 const USER32_ABIS    = [ "dll" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
diff --git a/src/modules/ctypes/winnt/win32.jsm b/src/modules/ctypes/winnt/win32.jsm
index 288936e..2a6d0bf 100644
--- a/src/modules/ctypes/winnt/win32.jsm
+++ b/src/modules/ctypes/winnt/win32.jsm
@@ -1,6 +1,6 @@
 var EXPORTED_SYMBOLS = [ "win32" ];
 
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/ctypes-utils.jsm");
diff --git a/src/modules/linux/FiretrayAppIndicator.jsm b/src/modules/linux/FiretrayAppIndicator.jsm
index 6b42751..5c07c14 100644
--- a/src/modules/linux/FiretrayAppIndicator.jsm
+++ b/src/modules/linux/FiretrayAppIndicator.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/commons.js"); // first for Handler.app !
diff --git a/src/modules/linux/FiretrayChat.jsm b/src/modules/linux/FiretrayChat.jsm
index a3b674c..ed868ae 100644
--- a/src/modules/linux/FiretrayChat.jsm
+++ b/src/modules/linux/FiretrayChat.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource:///modules/imServices.jsm");
 Cu.import("resource://firetray/commons.js");
diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index 864495d..722787c 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/src/modules/linux/FiretrayGtkIcons.jsm b/src/modules/linux/FiretrayGtkIcons.jsm
index 2e61b8d..d8769a1 100644
--- a/src/modules/linux/FiretrayGtkIcons.jsm
+++ b/src/modules/linux/FiretrayGtkIcons.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://firetray/commons.js"); // first for Handler.app !
 Cu.import("resource://firetray/ctypes/linux/"+firetray.Handler.app.widgetTk+"/gtk.jsm");
diff --git a/src/modules/linux/FiretrayGtkStatusIcon.jsm b/src/modules/linux/FiretrayGtkStatusIcon.jsm
index 806e542..ff27720 100644
--- a/src/modules/linux/FiretrayGtkStatusIcon.jsm
+++ b/src/modules/linux/FiretrayGtkStatusIcon.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/commons.js"); // first for Handler.app !
diff --git a/src/modules/linux/FiretrayPopupMenu.jsm b/src/modules/linux/FiretrayPopupMenu.jsm
index a5f772b..a48e510 100644
--- a/src/modules/linux/FiretrayPopupMenu.jsm
+++ b/src/modules/linux/FiretrayPopupMenu.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/src/modules/linux/FiretrayStatusIcon.jsm b/src/modules/linux/FiretrayStatusIcon.jsm
index a0cb151..24120e8 100644
--- a/src/modules/linux/FiretrayStatusIcon.jsm
+++ b/src/modules/linux/FiretrayStatusIcon.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/commons.js"); // first for Handler.app !
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index 32b38c3..e89fc72 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -11,7 +11,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/src/modules/logging.jsm b/src/modules/logging.jsm
index bf5384b..0e4f68f 100644
--- a/src/modules/logging.jsm
+++ b/src/modules/logging.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 
diff --git a/src/modules/winnt/FiretrayPopupMenu.jsm b/src/modules/winnt/FiretrayPopupMenu.jsm
index 43113c4..dffc3da 100644
--- a/src/modules/winnt/FiretrayPopupMenu.jsm
+++ b/src/modules/winnt/FiretrayPopupMenu.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/src/modules/winnt/FiretrayStatusIcon.jsm b/src/modules/winnt/FiretrayStatusIcon.jsm
index 2eacb42..386650f 100644
--- a/src/modules/winnt/FiretrayStatusIcon.jsm
+++ b/src/modules/winnt/FiretrayStatusIcon.jsm
@@ -7,7 +7,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
diff --git a/src/modules/winnt/FiretrayWin32.jsm b/src/modules/winnt/FiretrayWin32.jsm
index ea03459..039e18d 100644
--- a/src/modules/winnt/FiretrayWin32.jsm
+++ b/src/modules/winnt/FiretrayWin32.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/winnt/win32.jsm");
diff --git a/src/modules/winnt/FiretrayWindow.jsm b/src/modules/winnt/FiretrayWindow.jsm
index 809fef3..49e6f1f 100644
--- a/src/modules/winnt/FiretrayWindow.jsm
+++ b/src/modules/winnt/FiretrayWindow.jsm
@@ -4,7 +4,7 @@ var EXPORTED_SYMBOLS = [ "firetray" ];
 
 const Cc = Components.classes;
 const Ci = Components.interfaces;
-const Cu = Components.utils;
+const Cu = ChromeUtils;
 
 Cu.import("resource://gre/modules/ctypes.jsm");
 Cu.import("resource://firetray/ctypes/ctypesMap.jsm");

From 53a8486a3d3ead37065eb006f217cf86a1dc4a2e Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sat, 18 Aug 2018 19:36:00 +0200
Subject: [PATCH 07/22] Mention CubicF as developer

---
 src/install.rdf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/install.rdf b/src/install.rdf
index 521c8f6..f899b29 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -61,6 +61,7 @@
 
     <em:developer>Jared Forsyth</em:developer>
     <em:developer>Glen Winters</em:developer>
+    <em:developer>CubicF</em:developer>
 
     <em:contributor>Simone 'Underpass'</em:contributor>
     <em:contributor>Diego Rodriguez</em:contributor>

From 6698ae286d2b3870a0ad4f0865ad710cdcefb26f Mon Sep 17 00:00:00 2001
From: Fritjof Toelstede <fritjof.toelstede@smartoptics.de>
Date: Sun, 19 Aug 2018 14:17:25 +0200
Subject: [PATCH 08/22] Delete unused property addonRootDir which was set by a
 failing function

Error is "NS_NOINTERFACE for uri.file"
Using the stack to get the addon root dir seems to be hacky anyway? Bootstrapped extensions would have an `installPath` which would be more appropriate
---
 src/modules/FiretrayHandler.jsm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 1709fb6..082f461 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -59,14 +59,7 @@ firetray.Handler = {
     OS: Services.appinfo.OS.toLowerCase(), // "WINNT", "Linux", "Darwin"
     widgetTk: Services.appinfo.widgetToolkit,
   };})(),
-  addonRootDir: (function(){
-    let uri = Services.io.newURI(Components.stack.filename, null, null);
-    if (uri instanceof Ci.nsIFileURL) {
-      log.debug("_directory="+uri.file.parent.parent.path);
-      return uri.file.parent.parent;
-    }
-    throw new Error("not resolved");
-  })(),
+
   support: {chat: false, winnt: false},
 
   init: function() {            // does creates icon

From 8ea9a448363ab2791b5db7eb5b189718028ecd5e Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sat, 8 Sep 2018 20:19:36 +0200
Subject: [PATCH 09/22] Replace legacy iterators with generators

The support for the non-standard, legacy iterator protocol has been
removed.
---
 src/modules/FiretrayHandler.jsm              |  4 +--
 src/modules/FiretrayMessaging.jsm            | 27 ++++++++------------
 src/modules/linux/FiretrayChatStatusIcon.jsm |  2 +-
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/modules/FiretrayHandler.jsm b/src/modules/FiretrayHandler.jsm
index 082f461..124cd5b 100644
--- a/src/modules/FiretrayHandler.jsm
+++ b/src/modules/FiretrayHandler.jsm
@@ -247,8 +247,8 @@ firetray.Handler = {
   // [nsISimpleEnumerator::hasMoreElements]"), and we're unsure if we should
   // initAccounts() ourselves...
   existsChatAccount: function() {
-    let accounts = new firetray.Messaging.Accounts();
-    for (let accountServer in accounts)
+    let accounts = firetray.Messaging.Accounts();
+    for (let accountServer of accounts)
       if (accountServer.type === FIRETRAY_ACCOUNT_SERVER_TYPE_IM)  {
         log.debug("found im server: "+accountServer.prettyName);
         return true;
diff --git a/src/modules/FiretrayMessaging.jsm b/src/modules/FiretrayMessaging.jsm
index 610eb63..3878f09 100644
--- a/src/modules/FiretrayMessaging.jsm
+++ b/src/modules/FiretrayMessaging.jsm
@@ -263,8 +263,8 @@ firetray.Messaging = {
     let excludedAccounts = mailAccounts["excludedAccounts"];
 
     this.newMsgCount = 0;
-    let accounts = new this.Accounts();
-    for (let accountServer in accounts) { // nsIMsgIncomingServer
+    let accounts = firetray.Messaging.Accounts();
+    for (let accountServer of accounts) { // nsIMsgIncomingServer
 
       if (accountServer.type === FIRETRAY_ACCOUNT_SERVER_TYPE_IM) {
         continue;               // IM messages are counted elsewhere
@@ -365,32 +365,27 @@ firetray.Messaging = {
  * @param sortByTypeAndName: boolean
  * @return a generator over all nsIMsgIncomingServer including hidden and IM ones
  */
-firetray.Messaging.Accounts = function(sortByTypeAndName) {
+firetray.Messaging.Accounts = function*(sortByTypeAndName) {
   if (typeof(sortByTypeAndName) == "undefined") {
-    this.sortByTypeAndName = false;
-    return;
-  }
-  if (typeof(sortByTypeAndName) !== "boolean")
+    sortByTypeAndName = false;
+  } else if (typeof(sortByTypeAndName) !== "boolean") {
     throw new TypeError();
+  }
 
-  this.sortByTypeAndName = sortByTypeAndName;
-};
-
-firetray.Messaging.Accounts.prototype.__iterator__ = function() {
-  log.debug("sortByTypeAndName="+this.sortByTypeAndName);
+  log.debug("sortByTypeAndName=" + sortByTypeAndName);
 
   /* NOTE: sort() not provided by nsIMsgAccountManager.accounts
    (nsISupportsArray or nsIArray if xulrunner >= 20.0). Should be OK to
    re-build a JS-Array for few accounts */
   let accountServers = [];
-  for (let accountServer in fixIterator(MailServices.accounts.accounts,
+  for (let accountServer of fixIterator(MailServices.accounts.accounts,
                                         Ci.nsIMsgAccount)) {
     accountServers.push(accountServer.incomingServer);
   }
 
   let mailAccounts = firetray.Utils.getObjPref('mail_accounts');
   let serverTypes = mailAccounts["serverTypes"];
-  if (this.sortByTypeAndName) {
+  if (sortByTypeAndName) {
     accountServers.sort(function(a,b) {
       if (serverTypes[a.type].order
           < serverTypes[b.type].order)
@@ -419,8 +414,8 @@ firetray.Messaging.Accounts.prototype.__iterator__ = function() {
  */
 firetray.Messaging.accountsByServerType = function() {
   let accountsByServerType = {};
-  let accounts = new firetray.Messaging.Accounts(false);
-  for (let accountServer in accounts) {
+  let accounts = firetray.Messaging.Accounts(false);
+  for (let accountServer of accounts) {
     let accountServerKey = accountServer.key.toString();
     let accountServerName = accountServer.prettyName;
     let accountServerType = accountServer.type;
diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index 722787c..0eed58a 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -181,7 +181,7 @@ if (gtk.gtk_get_major_version() == 3 && gtk.gtk_get_minor_version() >= 8) { // g
     this.pixBuffer = {};
   },
 
-  fadeGenerator: function() {
+  fadeGenerator: function*() {
     let pixbuf = firetray.ChatStatusIcon.pixBuffer;
 
     for (let a=255; a>0; a-=ALPHA_STEP) {

From d5dce606bb20dc0b40b2af8700558f31584891ac Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sat, 8 Sep 2018 20:20:05 +0200
Subject: [PATCH 10/22] Declare some variables

---
 src/modules/linux/FiretrayAppIndicator.jsm | 1 +
 src/modules/linux/FiretrayWindow.jsm       | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/modules/linux/FiretrayAppIndicator.jsm b/src/modules/linux/FiretrayAppIndicator.jsm
index 5c07c14..99d799b 100644
--- a/src/modules/linux/FiretrayAppIndicator.jsm
+++ b/src/modules/linux/FiretrayAppIndicator.jsm
@@ -73,6 +73,7 @@ firetray.AppIndicator = {
 
   attachMiddleClickCallback: function() {
     let pref = firetray.Utils.prefService.getIntPref("middle_click");
+    let item;
     if (pref === FIRETRAY_MIDDLE_CLICK_ACTIVATE_LAST) {
       item = firetray.PopupMenu.menuItem.activateLast;
       firetray.PopupMenu.showItem(firetray.PopupMenu.menuItem.activateLast);
diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index e89fc72..6cc70a7 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -478,7 +478,8 @@ firetray.Window.getXWindowStates = function(xwin) {
   log.debug("propsFound, nitems="+propsFound+", "+nitems);
   if (!propsFound) return 0;
 
-  let maximizedHorz = maximizedVert = false;
+  let maximizedVert = false;
+  let maximizedHorz = false;
   for (let i=0, len=nitems.value; i<len; ++i) {
     log.debug("i: "+propsFound.contents[i]);
     let currentProp = propsFound.contents[i];

From 6ca5920d33e74b17b128541b9ef255a1f50565e5 Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sat, 8 Sep 2018 20:22:12 +0200
Subject: [PATCH 11/22] Drop the no longer supported try...catch syntax

---
 src/modules/linux/FiretrayChat.jsm           | 14 ++++++++------
 src/modules/linux/FiretrayChatStatusIcon.jsm |  5 ++++-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/modules/linux/FiretrayChat.jsm b/src/modules/linux/FiretrayChat.jsm
index ed868ae..037edbf 100644
--- a/src/modules/linux/FiretrayChat.jsm
+++ b/src/modules/linux/FiretrayChat.jsm
@@ -320,12 +320,14 @@ firetray.Chat = {
       log.debug("globalConnected="+globalConnected);
       return globalConnected;
 
-    } catch (e if e instanceof Components.Exception &&
-             e.result === Components.results.NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS &&
-             /_items is undefined/.test(e.message)) {
-      return false;             // ignore
-    } catch(e) {
-      log.error(e); return false;
+    } catch (e) {
+      if (e instanceof Components.Exception &&
+          e.result === Components.results.NS_ERROR_XPC_JAVASCRIPT_ERROR_WITH_DETAILS &&
+          /_items is undefined/.test(e.message)) {
+        return false;             // ignore
+      } else {
+        log.error(e); return false;
+      }
     }
   }
 
diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index 0eed58a..b5d40e4 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -209,7 +209,10 @@ if (gtk.gtk_get_major_version() == 3 && gtk.gtk_get_minor_version() >= 8) { // g
           { notify: firetray.ChatStatusIcon.fadeStep },
           ALPHA_STEP_SLEEP_MILLISECONDS, Ci.nsITimer.TYPE_ONE_SHOT);
 
-    } catch (e if e instanceof StopIteration) {
+    } catch (e) {
+      if (!e instanceof StopIteration) {
+        throw e;
+      }
 
       if (firetray.ChatStatusIcon.events['stop-fade']) {
         log.debug("stop-fade");

From 7844f9de94f8431ccde7a1322a478d252d5c1f9a Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sat, 8 Sep 2018 23:57:42 +0200
Subject: [PATCH 12/22] Fix the preferences dialog

Every dialog using <prefwindow> must now include this CSS.
---
 src/chrome/content/options.xul | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chrome/content/options.xul b/src/chrome/content/options.xul
index d1dc440..21364bf 100644
--- a/src/chrome/content/options.xul
+++ b/src/chrome/content/options.xul
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://firetray/skin/overlay.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css" type="text/css"?>
 <!DOCTYPE prefwindow SYSTEM "chrome://firetray/locale/options.dtd">
 <prefwindow id="firetray-preferences"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"

From 3fabbfbf9174079aea85b39765255ec265e532c9 Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sun, 9 Sep 2018 11:48:44 +0200
Subject: [PATCH 13/22] Don't use nsIDOMXPathResult

The interface has been removed in mozilla60. evaluate() returns an
XPathResult, so we can use its result to access the named constant
properties.
---
 src/modules/commons.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/commons.js b/src/modules/commons.js
index b2a84ff..0bdb590 100644
--- a/src/modules/commons.js
+++ b/src/modules/commons.js
@@ -230,22 +230,21 @@ firetray.Utils = {
   XPath: function(ref, xpath) {
     var doc = ref.ownerDocument || ref;
 
-    const XPathResult = Ci.nsIDOMXPathResult;
     try {
       let that = this;
       var result = doc.evaluate(xpath, ref, that._nsResolver,
-                                XPathResult.ANY_TYPE, null);
+                                0 /* XPathResult.ANY_TYPE */, null);
     } catch (x) {
       log.error(x);
     }
     log.debug("XPathResult="+result.resultType);
 
     switch (result.resultType) {
-    case XPathResult.NUMBER_TYPE:
+    case result.NUMBER_TYPE:
       return result.numberValue;
-    case XPathResult.BOOLEAN_TYPE:
+    case result.BOOLEAN_TYPE:
       return result.booleanValue;
-    case XPathResult.STRING_TYPE:
+    case result.STRING_TYPE:
       return result.stringValue;
     } // else XPathResult.UNORDERED_NODE_ITERATOR_TYPE:
 

From de3145c233bb0d57ccbe268bf5d685e4523645d5 Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sun, 9 Sep 2018 20:09:28 +0200
Subject: [PATCH 14/22] Do not rely on StopIteration for the fade animation

We now use a standard generator, which never throws StopIteration.
---
 src/modules/linux/FiretrayChatStatusIcon.jsm | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index b5d40e4..edf6e87 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -203,17 +203,12 @@ if (gtk.gtk_get_major_version() == 3 && gtk.gtk_get_minor_version() >= 8) { // g
   },
 
   fadeStep: function() {
-    try {
-      if (firetray.ChatStatusIcon.generators['fade'].next())
-        firetray.ChatStatusIcon.timers['fade-step'].initWithCallback(
-          { notify: firetray.ChatStatusIcon.fadeStep },
-          ALPHA_STEP_SLEEP_MILLISECONDS, Ci.nsITimer.TYPE_ONE_SHOT);
-
-    } catch (e) {
-      if (!e instanceof StopIteration) {
-        throw e;
-      }
-
+    let step = firetray.ChatStatusIcon.generators['fade'].next();
+    if (!step.done) {
+      firetray.ChatStatusIcon.timers['fade-step'].initWithCallback(
+        { notify: firetray.ChatStatusIcon.fadeStep },
+        ALPHA_STEP_SLEEP_MILLISECONDS, Ci.nsITimer.TYPE_ONE_SHOT);
+    } else {
       if (firetray.ChatStatusIcon.events['stop-fade']) {
         log.debug("stop-fade");
         delete firetray.ChatStatusIcon.events['stop-fade'];
@@ -236,7 +231,7 @@ if (gtk.gtk_get_major_version() == 3 && gtk.gtk_get_minor_version() >= 8) { // g
           { notify: firetray.ChatStatusIcon.fadeLoop },
           FADE_OVER_SLEEP_MILLISECONDS, Ci.nsITimer.TYPE_ONE_SHOT);
       }
-    };
+    }
   },
 
   fadeLoop: function() {

From 5d1940d9735de1416f718589ac3b00345b062a60 Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Tue, 11 Sep 2018 10:38:23 +0200
Subject: [PATCH 15/22] Mark Firefox < 57 (ie, all) and TB < 57 as unsupported.

This version of the extension is incompatible with pre-quantum mozillas,
which in particular makes it useless for Firefox as quantum dropped XUL.
I don't know about SeaMonkey, ChatiZilla and Zotero.

Let's prevent the extension from loading for these codebases.
---
 src/install.rdf | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/install.rdf b/src/install.rdf
index f899b29..eb47c36 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -19,18 +19,10 @@
     <em:targetPlatform>Linux</em:targetPlatform>
     <em:targetPlatform>WINNT</em:targetPlatform>
 
-    <em:targetApplication>
-      <Description>
-        <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- Firefox -->
-        <em:minVersion>7.0</em:minVersion>
-        <em:maxVersion>38.0</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
     <em:targetApplication>      <!-- Thunderbird -->
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
-        <em:minVersion>7.0</em:minVersion>
+        <em:minVersion>57.0</em:minVersion>
         <em:maxVersion>60.0</em:maxVersion>
       </Description>
     </em:targetApplication>

From 15a4d3e47467764095a564d1ffd3d22e6abcd14c Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Wed, 19 Sep 2018 19:31:46 +0200
Subject: [PATCH 16/22] Mark SeaMonkey, ChatZilla and Zotero as unsupported as
 well.

---
 src/install.rdf | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/src/install.rdf b/src/install.rdf
index eb47c36..7fb483a 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -27,30 +27,6 @@
       </Description>
     </em:targetApplication>
 
-    <em:targetApplication>      <!-- SeaMonkey -->
-      <Description>
-        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
-        <em:minVersion>2.4</em:minVersion>
-        <em:maxVersion>2.35</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <em:targetApplication>      <!-- ChatZilla -->
-      <Description>
-        <em:id>{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}</em:id>
-        <em:minVersion>0.8</em:minVersion>
-        <em:maxVersion>0.9.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
-    <em:targetApplication>      <!-- Zotero -->
-      <Description>
-        <em:id>zotero@chnm.gmu.edu</em:id>
-        <em:minVersion>2.1a1</em:minVersion>
-        <em:maxVersion>4.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-
     <em:developer>Jared Forsyth</em:developer>
     <em:developer>Glen Winters</em:developer>
     <em:developer>CubicF</em:developer>

From acbfa295d9d90d1a6e5f3472e4e02cb5f3441dad Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sat, 13 Oct 2018 12:07:57 +0200
Subject: [PATCH 17/22] Make it compatible with 60.*

---
 src/install.rdf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/install.rdf b/src/install.rdf
index 7fb483a..328123f 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -23,7 +23,7 @@
       <Description>
         <em:id>{3550f703-e582-4d05-9a08-453d09bdfdc6}</em:id>
         <em:minVersion>57.0</em:minVersion>
-        <em:maxVersion>60.0</em:maxVersion>
+        <em:maxVersion>60.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

From b7fe5c3e510f3a7a9cab32cf66a80ecaeaecf45a Mon Sep 17 00:00:00 2001
From: Xela <xela@indigofloat.at>
Date: Sat, 3 Nov 2018 12:23:39 +0100
Subject: [PATCH 18/22] draw mail count background with cairo

---
 src/modules/ctypes/linux/cairo.jsm          |  3 +++
 src/modules/linux/FiretrayGtkStatusIcon.jsm | 25 ++++++++++++++++-----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/modules/ctypes/linux/cairo.jsm b/src/modules/ctypes/linux/cairo.jsm
index 1de782f..726d02c 100644
--- a/src/modules/ctypes/linux/cairo.jsm
+++ b/src/modules/ctypes/linux/cairo.jsm
@@ -25,6 +25,9 @@ function cairo_defines(lib) {
   lib.lazy_bind("cairo_rectangle", ctypes.void_t, this.cairo_t.ptr, ctypes.double, ctypes.double, ctypes.double, ctypes.double);
   lib.lazy_bind("cairo_set_source_rgb", ctypes.void_t, this.cairo_t.ptr, ctypes.double, ctypes.double, ctypes.double);
   lib.lazy_bind("cairo_fill", ctypes.void_t, this.cairo_t.ptr);
+  lib.lazy_bind("cairo_fill_preserve", ctypes.void_t, this.cairo_t.ptr);
+  lib.lazy_bind("cairo_set_line_width", ctypes.void_t, this.cairo_t.ptr, ctypes.double);
+  lib.lazy_bind("cairo_stroke", ctypes.void_t, this.cairo_t.ptr);
   lib.lazy_bind("cairo_move_to", ctypes.void_t, this.cairo_t.ptr, ctypes.double, ctypes.double);
   lib.lazy_bind("cairo_image_surface_create", this.cairo_surface_t.ptr, this.cairo_format_t, ctypes.int, ctypes.int);
   lib.lazy_bind("cairo_surface_destroy", ctypes.void_t, this.cairo_surface_t.ptr);
diff --git a/src/modules/linux/FiretrayGtkStatusIcon.jsm b/src/modules/linux/FiretrayGtkStatusIcon.jsm
index ff27720..77f7f06 100644
--- a/src/modules/linux/FiretrayGtkStatusIcon.jsm
+++ b/src/modules/linux/FiretrayGtkStatusIcon.jsm
@@ -228,12 +228,25 @@ firetray.Handler.setIconText = function(text, color) {
 
   try {
     // build background from image
-    let specialIcon = gdk.gdk_pixbuf_new_from_file(
-      firetray.GtkStatusIcon.FILENAME_BLANK, null); // GError **error);
-    let dest = gdk.gdk_pixbuf_copy(specialIcon);
-    let w = gdk.gdk_pixbuf_get_width(specialIcon);
-    let h = gdk.gdk_pixbuf_get_height(specialIcon);
-
+    //let specialIcon = gdk.gdk_pixbuf_new_from_file(
+    //  firetray.GtkStatusIcon.FILENAME_BLANK, null); // GError **error);
+    //let dest = gdk.gdk_pixbuf_copy(specialIcon);
+    //let w = gdk.gdk_pixbuf_get_width(specialIcon);
+    //let h = gdk.gdk_pixbuf_get_height(specialIcon);
+    // above fails, draw light gray bordered square with cairo
+    var mysurface = cairo.cairo_image_surface_create(cairo.CAIRO_FORMAT_ARGB32, 32, 32);
+    var mycr = cairo.cairo_create(mysurface);
+    cairo.cairo_rectangle(mycr, 2, 2, 28, 28);
+    cairo.cairo_set_source_rgb(mycr, 0.85, 0.85, 0.85);
+    cairo.cairo_fill_preserve(mycr);
+
+    cairo.cairo_set_line_width(mycr, 2);
+    cairo.cairo_set_source_rgb(mycr, 0.4, 0.4, 0.4);
+    cairo.cairo_stroke(mycr);
+
+    let dest = gdk.gdk_pixbuf_get_from_surface(mysurface, 0, 0, 32, 32);
+    let w = 32;
+    let h = 32;
     // prepare colors/alpha
 /* FIXME: draw everything with cairo when dropping gtk2 support. Use
  gdk_pixbuf_get_from_surface(). */

From 07d3027b9dba11cba2c9c15f1b61830b5b4dab75 Mon Sep 17 00:00:00 2001
From: Xela <xela@indigofloat.at>
Date: Sun, 4 Nov 2018 09:42:23 +0100
Subject: [PATCH 19/22] reordered icon creation, better re-use of variable,
 updated comment

---
 src/modules/linux/FiretrayGtkStatusIcon.jsm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/modules/linux/FiretrayGtkStatusIcon.jsm b/src/modules/linux/FiretrayGtkStatusIcon.jsm
index 77f7f06..75e58ba 100644
--- a/src/modules/linux/FiretrayGtkStatusIcon.jsm
+++ b/src/modules/linux/FiretrayGtkStatusIcon.jsm
@@ -233,20 +233,19 @@ firetray.Handler.setIconText = function(text, color) {
     //let dest = gdk.gdk_pixbuf_copy(specialIcon);
     //let w = gdk.gdk_pixbuf_get_width(specialIcon);
     //let h = gdk.gdk_pixbuf_get_height(specialIcon);
-    // above fails, draw light gray bordered square with cairo
-    var mysurface = cairo.cairo_image_surface_create(cairo.CAIRO_FORMAT_ARGB32, 32, 32);
+    // workaround: loading from packed xpi fails, draw light gray bordered square with cairo
+    let w = 32;
+    let h = 32;
+    let stroke = 2;
+    var mysurface = cairo.cairo_image_surface_create(cairo.CAIRO_FORMAT_ARGB32, w, h);
     var mycr = cairo.cairo_create(mysurface);
-    cairo.cairo_rectangle(mycr, 2, 2, 28, 28);
+    cairo.cairo_rectangle(mycr, stroke, stroke, w - (stroke * 2), h - (stroke * 2));
     cairo.cairo_set_source_rgb(mycr, 0.85, 0.85, 0.85);
     cairo.cairo_fill_preserve(mycr);
-
-    cairo.cairo_set_line_width(mycr, 2);
+    cairo.cairo_set_line_width(mycr, stroke);
     cairo.cairo_set_source_rgb(mycr, 0.4, 0.4, 0.4);
     cairo.cairo_stroke(mycr);
-
-    let dest = gdk.gdk_pixbuf_get_from_surface(mysurface, 0, 0, 32, 32);
-    let w = 32;
-    let h = 32;
+    let dest = gdk.gdk_pixbuf_get_from_surface(mysurface, 0, 0, w, h);
     // prepare colors/alpha
 /* FIXME: draw everything with cairo when dropping gtk2 support. Use
  gdk_pixbuf_get_from_surface(). */

From 5a4afed089c5af44bd899605600fb3197f577584 Mon Sep 17 00:00:00 2001
From: vantu5z <vantu5z@mail.ru>
Date: Fri, 16 Nov 2018 18:13:54 +0300
Subject: [PATCH 20/22] update Russian translation

---
 src/chrome/locale/ru-RU/options.dtd        | 20 ++++++++++----------
 src/chrome/locale/ru-RU/options.properties |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/chrome/locale/ru-RU/options.dtd b/src/chrome/locale/ru-RU/options.dtd
index 155fb30..2af7f81 100644
--- a/src/chrome/locale/ru-RU/options.dtd
+++ b/src/chrome/locale/ru-RU/options.dtd
@@ -1,7 +1,7 @@
 <!-- if you need multiline/carriage return, use a .properties -->
 <!ENTITY prefwindow.title "Настройки FireTray">
 
-<!ENTITY NOT_IMPLEMENTED_YET "ЕЩЕ НЕ РЕАЛИЗОВАНО">
+<!ENTITY NOT_IMPLEMENTED_YET "ЕЩЁ НЕ РЕАЛИЗОВАНО">
 
 <!ENTITY windows_options "Окна">
 <!ENTITY icon_options "Значок">
@@ -18,7 +18,7 @@
 <!ENTITY hides_last_only.label "Скрывать только последнее окно">
 <!ENTITY hides_last_only.tooltip "другие окна будут закрыты (уничтожены)">
 <!ENTITY hides_last_only.accesskey "O">
-<!ENTITY start_hidden.label "При запуске программы сворачивать ее в трей">
+<!ENTITY start_hidden.label "При запуске программы сворачивать её в трей">
 <!ENTITY start_hidden.accesskey "S">
 <!ENTITY show_activates.label "Включать восстановленные окна">
 <!ENTITY show_activates.accesskey "e">
@@ -43,10 +43,10 @@
 <!ENTITY down "↓" >
 <!ENTITY hide "скрыть" >
 <!ENTITY restore "показать" >
-<!ENTITY middle_click.label "Mouse middle click action :" >
+<!ENTITY middle_click.label "Действие по нажатию средней кнопки мыши :" >
 <!ENTITY middle_click.accesskey "k" >
-<!ENTITY show_hide "Show/hide" >
-<!ENTITY activate_last "Activate last window" >
+<!ENTITY show_hide "Показать/Скрыть" >
+<!ENTITY activate_last "Сделать активным последнее окно" >
 
 <!ENTITY mail_notification_enabled.label "Включить оповещение о новых сообщениях">
 <!ENTITY mail_notification_enabled.accesskey "a">
@@ -54,7 +54,7 @@
 <!ENTITY message_count_type.accesskey "m">
 <!ENTITY message_count_type_unread "непрочитанных сообщениях">
 <!ENTITY message_count_type_new "новых сообщениях">
-<!ENTITY message_count_type_new.tooltip "новых сообщениях с последнего просмотра папки.">
+<!ENTITY message_count_type_new.tooltip "новых сообщениях с последнего просмотра папки">
 <!ENTITY mail_notification_type.label "Тип оповещения">
 <!ENTITY mail_notification_type.tooltip "aka. Biff">
 <!ENTITY mail_notification_unread_count.label "показать количество новых сообщений">
@@ -69,16 +69,16 @@
 <!ENTITY choose.accesskey "O">
 
 <!ENTITY unread_count_folder_exceptions.label "Включать особые папки">
-<!ENTITY unread_count_folder_exceptions.tooltip "Включать особые папки для подсчета количества новых сообщений">
+<!ENTITY unread_count_folder_exceptions.tooltip "Включать особые папки для подсчёта количества новых сообщений">
 <!ENTITY excluded_folders_list.tooltip "Используйте CTRL + ЛКМ для множественного выбора">
 
 <!ENTITY unread_count_account_exceptions.label "Включаемые почтовые ящики">
-<!ENTITY unread_count_account_exceptions.tooltip "Почтовые ящик для подсчета непрочитанных сообщений">
+<!ENTITY unread_count_account_exceptions.tooltip "Почтовые ящик для подсчёта непрочитанных сообщений">
 <!ENTITY folder_count_recursive.label "Включая подпапки">
 <!ENTITY folder_count_recursive.accesskey "f">
 <!ENTITY only_favorite_folders.label "Только избранные папки">
 <!ENTITY only_favorite_folders.accesskey "v">
-<!ENTITY only_favorite_folders.tooltip "Within included folder types and included accounts, only count messages in favorite folders">
+<!ENTITY only_favorite_folders.tooltip "Во включённых типах папок и аккаутах, только количество сообщений в избранных папках">
 
 <!ENTITY account_or_server_type_name "Почтовый ящик">
 <!ENTITY account_or_server_type_name.tooltip "Имя почтового ящика или протокола">
@@ -93,7 +93,7 @@
 <!ENTITY mail_change_trigger.tooltip "Абсолютный путь к программе. В качестве первого аргумента будет передано количество сообщений">
 <!ENTITY mail_get_attention.label "Установить срочное оповещение X11">
 <!ENTITY mail_get_attention.accesskey "X">
-<!ENTITY nomail_hides_icon.label "Hide icon when no mail">
+<!ENTITY nomail_hides_icon.label "Прятать значок, если нет писем">
 <!ENTITY nomail_hides_icon.accesskey "H">
 
 <!ENTITY chat_icon_enable.label "Включить значок чата">
diff --git a/src/chrome/locale/ru-RU/options.properties b/src/chrome/locale/ru-RU/options.properties
index 3b584d9..65d45a8 100644
--- a/src/chrome/locale/ru-RU/options.properties
+++ b/src/chrome/locale/ru-RU/options.properties
@@ -1,6 +1,6 @@
 Archive=Архив
 Drafts=Черновики
-Junk=Junk
+Junk=Спам
 Queue=Очередь
 SentMail=Отправленные
 Templates=Черновики

From 3fd8a8c32ed161163a5af2b8b0a46d22d54c1306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E9=87=8D=E6=B7=AF?= <cbsghost@itri.org.tw>
Date: Thu, 22 Nov 2018 14:27:23 +0800
Subject: [PATCH 21/22] Update zh-TW locale.

---
 src/chrome/locale/zh-TW/options.dtd | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/chrome/locale/zh-TW/options.dtd b/src/chrome/locale/zh-TW/options.dtd
index 4c40159..ca569a0 100644
--- a/src/chrome/locale/zh-TW/options.dtd
+++ b/src/chrome/locale/zh-TW/options.dtd
@@ -83,6 +83,8 @@
 <!ENTITY mail_change_trigger.tooltip "要在訊息數改變時執行程式的絕對路徑。程式會將新的訊息數作為第一個參數。">
 <!ENTITY mail_get_attention.label "有新訊息時視窗發出提醒信號">
 <!ENTITY mail_get_attention.accesskey "g">
+<!ENTITY nomail_hides_icon.label "有新郵件時顯示系統列圖示">
+<!ENTITY nomail_hides_icon.accesskey "t">
 <!ENTITY chat_icon_enable.label "啟用聊天圖示">
 <!ENTITY chat_icon_enable.accesskey "E">
 <!ENTITY chat_icon_blink.label "有新訊息時閃爍聊天圖示">

From 8e45faee70d3ff2cbe8404ea5660eff16c2a88f3 Mon Sep 17 00:00:00 2001
From: Gabriele <firetray-updates@users.noreply.github.com>
Date: Sat, 24 Nov 2018 12:50:59 +0100
Subject: [PATCH 22/22] AppIndicator: Actually use custom icons

---
 src/modules/linux/FiretrayAppIndicator.jsm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/linux/FiretrayAppIndicator.jsm b/src/modules/linux/FiretrayAppIndicator.jsm
index 99d799b..a5ef985 100644
--- a/src/modules/linux/FiretrayAppIndicator.jsm
+++ b/src/modules/linux/FiretrayAppIndicator.jsm
@@ -111,9 +111,14 @@ firetray.StatusIcon.shutdownImpl =
 
 firetray.Handler.setIconImageDefault = function() {
   log.debug("setIconImageDefault");
-  appind.app_indicator_set_icon_full(firetray.AppIndicator.indicator,
-                                     firetray.StatusIcon.defaultAppIconName,
-                                     firetray.Handler.app.name);
+  let appIconType = firetray.Utils.prefService.getIntPref("app_icon_type");
+  if (appIconType === FIRETRAY_APPLICATION_ICON_TYPE_THEMED) {
+    appind.app_indicator_set_icon_full(firetray.AppIndicator.indicator,
+                                       firetray.StatusIcon.defaultAppIconName,
+                                       firetray.Handler.app.name);
+  } else if (appIconType === FIRETRAY_APPLICATION_ICON_TYPE_CUSTOM) {
+    firetray.Handler.setIconImageCustom('app_icon_custom');
+  }
 };
 
 firetray.Handler.setIconImageNewMail = function() {