From e61723dd5bc3480d7015d5d030c256f205627f9f Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 30 Dec 2016 00:04:16 +0100 Subject: [PATCH] Updated SystemTray and Extension for Debian 8.5/8.6 + Gnome3. It does not work (on a default install) --- src/dorkbox/systemTray/SystemTray.java | 10 ++++++++++ src/dorkbox/systemTray/gnomeShell/Extension.java | 4 +++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java index a751bd4..126ab4f 100644 --- a/src/dorkbox/systemTray/SystemTray.java +++ b/src/dorkbox/systemTray/SystemTray.java @@ -548,6 +548,16 @@ class SystemTray { else if ("cinnamon".equalsIgnoreCase(GDM)) { trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); } + else if ("default".equalsIgnoreCase(GDM)) { + // this can be gnome3 on debian + + if (OSUtil.Linux.isDebian()) { + // note: Debian Gnome3 does NOT work! (tested on Debian 8.5 and 8.6 default installs) + logger.warn("Debian with Gnome detected. SystemTray support is not known to work."); + } + + trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); + } else if ("gnome-classic".equalsIgnoreCase(GDM)) { trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon); } diff --git a/src/dorkbox/systemTray/gnomeShell/Extension.java b/src/dorkbox/systemTray/gnomeShell/Extension.java index edab2d6..95597d0 100644 --- a/src/dorkbox/systemTray/gnomeShell/Extension.java +++ b/src/dorkbox/systemTray/gnomeShell/Extension.java @@ -214,7 +214,9 @@ class Extension { */ public static void install() { - if (!ENABLE_EXTENSION_INSTALL || !OSUtil.DesktopEnv.isGnome()) { + boolean isGnome = OSUtil.DesktopEnv.isGnome(); + if (!ENABLE_EXTENSION_INSTALL || !isGnome || (isGnome && OSUtil.Linux.isDebian())) { + // note: Debian Gnome3 does NOT work! (tested on Debian 8.5 and 8.6 default installs) return; }