dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

Fixed issue with systemtray gnome-shell restart on ubuntu 18.04

Browse Source
This commit is contained in:
nathan 2018-10-24 23:45:18 +02:00
parent 37b490723b
commit 5268f8cc53
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dorkbox/systemTray/gnomeShell/Extension.java
View File

@ -169,8 +169,7 @@ class Extension {
private static private static
void restartShell() { void restartShell() {
if (OSUtil.DesktopEnv.isWayland()) { // in some situations, you can no longer restart the shell in wayland. You must logout-login for shell modifications to apply
// you can no longer restart the shell in wayland. You must logout-login for shell modifications to apply
// https://mail.gnome.org/archives/commits-list/2015-March/msg01019.html // https://mail.gnome.org/archives/commits-list/2015-March/msg01019.html
// HOWEVER, with wayland, shell-extensions that DO NO MODIFY THE GUI (we don't, we just add icons to it) // HOWEVER, with wayland, shell-extensions that DO NO MODIFY THE GUI (we don't, we just add icons to it)
@ -178,8 +177,14 @@ class Extension {
// if there are still difficulties, you can use the following // if there are still difficulties, you can use the following
// gnome-shell-extension-tool -e SystemTray@Dorkbox // gnome-shell-extension-tool -e SystemTray@Dorkbox
if (OSUtil.DesktopEnv.isWayland()) {
int[] version = OSUtil.Linux.getUbuntuVersion();
if (version[0] == 17) {
// ubuntu 17.04 is NOT WAYLAND (it's MIR) and ubuntu 17.10 is WAYLAND (and it's broken...)
return; return;
} }
}
if (ENABLE_SHELL_RESTART) { if (ENABLE_SHELL_RESTART) {