From 4486a6c1f6dc26b22486af42ebdc5d84df7dda3e Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 28 Mar 2021 16:27:13 +0200 Subject: [PATCH 1/3] Revert TB version --- dist/arch/gnome/PKGBUILD | 2 +- dist/arch/kde/PKGBUILD | 2 +- dist/arch/minimal/PKGBUILD | 2 +- dist/deb/gnome/debian.control | 2 +- dist/deb/kde/debian.control | 2 +- dist/deb/minimal/debian.control | 2 +- dist/rpm/gnome/systray-x-gnome.spec | 4 ++-- dist/rpm/kde/systray-x.spec | 4 ++-- dist/rpm/minimal/systray-x-minimal.spec | 4 ++-- webext/js/folderChange.js | 16 ++++++++++++++++ webext/manifest.json | 2 +- 11 files changed, 29 insertions(+), 13 deletions(-) diff --git a/dist/arch/gnome/PKGBUILD b/dist/arch/gnome/PKGBUILD index 5d237d4..9c5cfc6 100644 --- a/dist/arch/gnome/PKGBUILD +++ b/dist/arch/gnome/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'gnome-shell-extension-appindicator' 'thunderbird>=68' - 'thunderbird<=86' + 'thunderbird<=85' ) makedepends=( 'git' diff --git a/dist/arch/kde/PKGBUILD b/dist/arch/kde/PKGBUILD index 2fc5853..777caad 100644 --- a/dist/arch/kde/PKGBUILD +++ b/dist/arch/kde/PKGBUILD @@ -12,7 +12,7 @@ depends=( 'qt5-base' 'knotifications' 'thunderbird>=68' - 'thunderbird<=86' + 'thunderbird<=85' ) makedepends=( 'git' diff --git a/dist/arch/minimal/PKGBUILD b/dist/arch/minimal/PKGBUILD index 027e3d7..260fdc2 100644 --- a/dist/arch/minimal/PKGBUILD +++ b/dist/arch/minimal/PKGBUILD @@ -11,7 +11,7 @@ license=(MPL-2.0) depends=( 'qt5-base' 'thunderbird>=68' - 'thunderbird<=86' + 'thunderbird<=85' ) makedepends=( 'git' diff --git a/dist/deb/gnome/debian.control b/dist/deb/gnome/debian.control index a4a4bbd..38360b6 100644 --- a/dist/deb/gnome/debian.control +++ b/dist/deb/gnome/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, g++, libx11-dev, qt5-qmake, qtbase5-d Package: systray-x-gnome Architecture: any -Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:68), thunderbird (<= 1:86) +Depends: ${shlibs:Depends}, gnome-shell-extension-appindicator, thunderbird (>= 1:68), thunderbird (<= 1:85) Description: SysTray-X is a system tray extension for Thunderbird 68+ (GNOME). This version is optimized for the GNOME desktop. The add-on uses the WebExtension API's to control an external system diff --git a/dist/deb/kde/debian.control b/dist/deb/kde/debian.control index bbf5595..ccfc953 100644 --- a/dist/deb/kde/debian.control +++ b/dist/deb/kde/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, g++, libx11-dev, qt5-qmake, qtbase5-d Package: systray-x Architecture: any -Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:86) +Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:85) Description: SysTray-X is a system tray extension for Thunderbird 68+ (KDE). This version is optimized for the KDE desktop. The add-on uses the WebExtension API's to control an external system diff --git a/dist/deb/minimal/debian.control b/dist/deb/minimal/debian.control index e961cb8..d0eb513 100644 --- a/dist/deb/minimal/debian.control +++ b/dist/deb/minimal/debian.control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 4.1.16), zip, g++, libx11-dev, qt5-qmake, qtbase5-d Package: systray-x-minimal Architecture: any -Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:86) +Depends: ${shlibs:Depends}, thunderbird (>= 1:68), thunderbird (<= 1:85) Description: SysTray-X is a system tray extension for Thunderbird 68+ (non-GNOME,non-KDE). This version is for non-KDE and non-GNOME desktops. The add-on uses the WebExtension API's to control an external system diff --git a/dist/rpm/gnome/systray-x-gnome.spec b/dist/rpm/gnome/systray-x-gnome.spec index d4da8e3..3222d4d 100644 --- a/dist/rpm/gnome/systray-x-gnome.spec +++ b/dist/rpm/gnome/systray-x-gnome.spec @@ -33,10 +33,10 @@ BuildRequires: pkgconfig(x11) Requires: gnome-shell-extension-appindicator %if 0%{?fedora_version} || 0%{?centos_version} Requires: thunderbird >= 68 -Requires: thunderbird <= 86 +Requires: thunderbird <= 85 %else Requires: MozillaThunderbird >= 68 -Requires: MozillaThunderbird <= 86 +Requires: MozillaThunderbird <= 85 %endif %description diff --git a/dist/rpm/kde/systray-x.spec b/dist/rpm/kde/systray-x.spec index 1e66e91..2b91bbc 100644 --- a/dist/rpm/kde/systray-x.spec +++ b/dist/rpm/kde/systray-x.spec @@ -34,12 +34,12 @@ BuildRequires: pkgconfig(x11) BuildRequires: kf5-knotifications-devel Requires: kf5-knotifications Requires: thunderbird >= 68 -Requires: thunderbird <= 86 +Requires: thunderbird <= 85 %else BuildRequires: knotifications-devel Requires: libKF5Notifications5 Requires: MozillaThunderbird >= 68 -Requires: MozillaThunderbird <= 86 +Requires: MozillaThunderbird <= 85 %endif %description diff --git a/dist/rpm/minimal/systray-x-minimal.spec b/dist/rpm/minimal/systray-x-minimal.spec index 49f61de..1497cca 100644 --- a/dist/rpm/minimal/systray-x-minimal.spec +++ b/dist/rpm/minimal/systray-x-minimal.spec @@ -32,10 +32,10 @@ BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(x11) %if 0%{?fedora_version} || 0%{?centos_version} Requires: thunderbird >= 68 -Requires: thunderbird <= 86 +Requires: thunderbird <= 85 %else Requires: MozillaThunderbird >= 68 -Requires: MozillaThunderbird <= 86 +Requires: MozillaThunderbird <= 85 %endif %description diff --git a/webext/js/folderChange.js b/webext/js/folderChange.js index 34627a3..c71cddd 100644 --- a/webext/js/folderChange.js +++ b/webext/js/folderChange.js @@ -315,6 +315,8 @@ var SysTrayX = { applyToSubfolders(account, path, folder, recursive, fun) { if (folder.hasSubFolders) { let subFolders = folder.subFolders; + console.debug("SubFolder: " + subFolders.length); + /* while (subFolders.hasMoreElements()) { let subFolder = subFolders.getNext().QueryInterface(Ci.nsIMsgFolder); if (recursive && subFolder.hasSubFolders) @@ -327,6 +329,20 @@ var SysTrayX = { ); else fun.call(this, path, subFolder); } + */ + + for (let i = 0; i < subFolders.length; ++i) { + let subFolder = subFolders[i].QueryInterface(Ci.nsIMsgFolder); + if (recursive && subFolder.hasSubFolders) + this.applyToSubfoldersRecursive( + account, + path, + subFolder, + recursive, + fun + ); + else fun.call(this, path, subFolder); + } } }, diff --git a/webext/manifest.json b/webext/manifest.json index 068794f..9fa0e8f 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -10,7 +10,7 @@ "gecko": { "id": "systray-x@Ximi1970", "strict_min_version": "68.0", - "strict_max_version": "86.*" + "strict_max_version": "85.*" } }, From 07969434d29b473db54b6ba7e9e42a58bf40f9f2 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sun, 28 Mar 2021 16:32:56 +0200 Subject: [PATCH 2/3] Revert TB version --- webext/js/folderChange.js | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/webext/js/folderChange.js b/webext/js/folderChange.js index c71cddd..34627a3 100644 --- a/webext/js/folderChange.js +++ b/webext/js/folderChange.js @@ -315,8 +315,6 @@ var SysTrayX = { applyToSubfolders(account, path, folder, recursive, fun) { if (folder.hasSubFolders) { let subFolders = folder.subFolders; - console.debug("SubFolder: " + subFolders.length); - /* while (subFolders.hasMoreElements()) { let subFolder = subFolders.getNext().QueryInterface(Ci.nsIMsgFolder); if (recursive && subFolder.hasSubFolders) @@ -329,20 +327,6 @@ var SysTrayX = { ); else fun.call(this, path, subFolder); } - */ - - for (let i = 0; i < subFolders.length; ++i) { - let subFolder = subFolders[i].QueryInterface(Ci.nsIMsgFolder); - if (recursive && subFolder.hasSubFolders) - this.applyToSubfoldersRecursive( - account, - path, - subFolder, - recursive, - fun - ); - else fun.call(this, path, subFolder); - } } }, From 89e29c3ba88b3fcfb3261db76a8d9c337d5e0538 Mon Sep 17 00:00:00 2001 From: Maxime Rijnders Date: Sun, 1 Aug 2021 20:14:28 +0200 Subject: [PATCH 3/3] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ee9c30f..df0c78d 100644 --- a/README.md +++ b/README.md @@ -125,7 +125,7 @@ Installing the repository: ###### 20.10 ```bash -wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.10/Release.key +wget -q https://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_20.10/Release.key sudo mv -f Release.key /etc/apt/trusted.gpg.d/Systray-x.Ximi1970.asc sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.10 ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update @@ -134,7 +134,7 @@ sudo apt update ###### 20.04 LTS ```bash -wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.04/Release.key +wget -q https://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_20.04/Release.key sudo apt-key add Release.key sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_20.04 ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update @@ -143,7 +143,7 @@ sudo apt update ###### 18.04 LTS ```bash -wget -q https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_18.04/Release.key +wget -q https://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_18.04/Release.key sudo apt-key add Release.key sudo bash -c 'echo "deb https://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_18.04 ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update @@ -152,7 +152,7 @@ sudo apt update ###### 16.04 LTS ```bash -wget -q http://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04/Release.key +wget -q http://download.opensuse.org/repositories/home:/Ximi1970/xUbuntu_16.04/Release.key sudo apt-key add Release.key sudo bash -c 'echo "deb http://download.opensuse.org/repositories/home:/Ximi1970:/Mozilla:/Add-ons/xUbuntu_16.04 ./" > /etc/apt/sources.list.d/systray-x.list' sudo apt update