Merge branch 'huttli-master'

Makefile

@@ -12,7 +12,7 @@ build: compile-schema
 	rm -rf _build
 	mkdir _build
 	cp -r --preserve=timestamps locale schemas convenience.js extension.js metadata.json prefs.js README.md _build
-	echo Build was successful 
+	echo Build was successful
 
 compile-schema: ./schemas/org.gnome.shell.extensions.topicons.gschema.xml
 	glib-compile-schemas schemas

README.md

@@ -1,11 +1,12 @@
-# UNMAINTAINED
-
+# WARNING
 
 > As stated in issue [#91](https://github.com/phocean/TopIcons-plus/issues/91), I have stopped maintaining this project actively.
 
-I am not a TopIcons-Plus user myself and even not a Gnome user anymore.
+The Gnome project chose to drop status icons and any kind of legacy tray, making the project useless on the long term and difficult to maintain due to bugs or lack of features that are out of its scope.
+
+In particular, no wayland support can be achieved.
 
-Moreover, the Gnome project chose to drop status icons and any kind of legacy tray, making the project useless on the long term and difficult to maintain due to bugs or lack of features that are out of its scope.
+Open such issues not here but to the Gnome project.
 
 # TopIcons Plus
 
@@ -102,5 +103,6 @@ TopIcons Plus is a fork of TopIcons. Many thanks go to Adel Gadllah for making t
 
 Also, thanks to all contributors (code and issues), and especially to:
 
-- [nevesnunes](https://github.com/nevesnunes) for the very nice code improvements he brought up,
-- [terrycloth](https://github.com/terrycloth) for his contributions to the installation script and documentation to make it ready for the Fedora packaging.
+- [nevesnunes](https://github.com/nevesnunes) for the very nice code improvements he brought up ;
+- [terrycloth](https://github.com/terrycloth) for his contributions to the installation script and documentation to make it ready for the Fedora packaging ;
+- [huttli](https://github.com/huttli) for packaging various forks and changes, and submitting them upstream.

extension.js

@@ -67,14 +67,13 @@ function enable() {
 }
 
 function disable() {
-
+    disconnectPanelChildSignals();
+
     if (Main.legacyTray)
         moveToTray();
     else
         destroyTray();
     settings.run_dispose();
-
-    disconnectPanelChildSignals();
 }
 
 function onTrayIconAdded(o, icon, role, delay=1000) {
@@ -178,7 +177,13 @@ function createTray() {
     tray = new Shell.TrayManager();
     tray.connect('tray-icon-added', onTrayIconAdded);
     tray.connect('tray-icon-removed', onTrayIconRemoved);
-    tray.manage_screen(global.screen, Main.panel.actor);
+    if (global.screen) {
+        // For GNOME 3.28 and older
+        tray.manage_screen(global.screen, Main.panel.actor);
+    } else {
+        // For GNOME 3.30+
+        tray.manage_screen(Main.panel.actor);
+    }
     placeTray();
 }
 

metadata.json

@@ -10,10 +10,12 @@
     "3.22",
     "3.23",
     "3.24",
-    "3.26"
-  ], 
+    "3.26",
+    "3.28",
+    "3.30"
+  ],
   "settings-schema": "org.gnome.shell.extensions.topicons",
   "url": "https://github.com/phocean/TopIcons-plus",
   "uuid": "[email protected]",
-  "version": 21
+  "version": 22
 }