Fixed issues with isGnome() detection on Unix (FreeBSD)
This commit is contained in:
parent
e57724229e
commit
3919e1ce9e
|
@ -214,7 +214,7 @@ class Extension {
|
|||
*/
|
||||
public static
|
||||
void install() {
|
||||
if (!ENABLE_EXTENSION_INSTALL || !OSUtil.Linux.DesktopEnv.isGnome()) {
|
||||
if (!ENABLE_EXTENSION_INSTALL || !OSUtil.DesktopEnv.isGnome()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -222,7 +222,7 @@ class Extension {
|
|||
boolean hasSystemTray;
|
||||
|
||||
// should just be 3.14.1 or 3.20 or similar
|
||||
String gnomeVersion = OSUtil.Linux.DesktopEnv.getGnomeVersion();
|
||||
String gnomeVersion = OSUtil.DesktopEnv.getGnomeVersion();
|
||||
if (gnomeVersion == null) {
|
||||
return;
|
||||
}
|
||||
|
@ -382,7 +382,7 @@ class Extension {
|
|||
|
||||
public static
|
||||
void unInstall() {
|
||||
if (!ENABLE_EXTENSION_INSTALL || !OSUtil.Linux.DesktopEnv.isGnome()) {
|
||||
if (!ENABLE_EXTENSION_INSTALL || !OSUtil.DesktopEnv.isGnome()) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -146,7 +146,7 @@ class ImageUtils {
|
|||
SystemTray.logger.debug("Windows version: '{}'", Arrays.toString(version));
|
||||
SystemTray.logger.debug("Windows DPI settings: '{}'", dpiX);
|
||||
}
|
||||
} else if (OS.isLinux()) {
|
||||
} else if (OS.isLinux() || OS.isUnix()) {
|
||||
// GtkStatusIcon will USUALLY automatically scale the icon
|
||||
// AppIndicator MIGHT scale the icon (depends on the OS)
|
||||
|
||||
|
@ -155,14 +155,14 @@ class ImageUtils {
|
|||
String XDG = System.getenv("XDG_CURRENT_DESKTOP");
|
||||
if (XDG == null) {
|
||||
// Check if plasmashell is running, if it is -- then we are most likely KDE
|
||||
double plasmaVersion = OSUtil.Linux.DesktopEnv.getPlasmaVersion();
|
||||
double plasmaVersion = OSUtil.DesktopEnv.getPlasmaVersion();
|
||||
if (plasmaVersion > 0) {
|
||||
XDG = "kde";
|
||||
}
|
||||
}
|
||||
|
||||
if ("kde".equalsIgnoreCase(XDG)) {
|
||||
double plasmaVersion = OSUtil.Linux.DesktopEnv.getPlasmaVersion();
|
||||
double plasmaVersion = OSUtil.DesktopEnv.getPlasmaVersion();
|
||||
|
||||
// 1 = 16
|
||||
// 2 = 32
|
||||
|
|
Loading…
Reference in New Issue
Block a user