From 4427ed753fb671d52a168f8c96af3c459d9b107f Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 1 Dec 2017 22:50:44 +0100 Subject: [PATCH] Removed invalid option for ubuntu. Comment polish --- src/dorkbox/systemTray/SystemTray.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java index afb25a6..5139d8f 100644 --- a/src/dorkbox/systemTray/SystemTray.java +++ b/src/dorkbox/systemTray/SystemTray.java @@ -311,24 +311,11 @@ class SystemTray { // kde 5.8+ is "high DPI", so we need to adjust the scale. Image resize will do that } case Unity: { - try { - String ubuntuVersion = OSUtil.Linux.getUbuntuVersion(); - String[] split = ubuntuVersion.split("."); - int major = Integer.parseInt(split[0]); - int minor = Integer.parseInt(split[1]); - - // <=16.04 it is better to use GtkStatusIcons. - if (major < 16 || (major == 16 && minor <= 4)) { - return selectTypeQuietly(TrayType.GtkStatusIcon); - } - } catch (Exception ignored) { - } - // Ubuntu Unity is a weird combination. It's "Gnome", but it's not "Gnome Shell". return selectTypeQuietly(TrayType.AppIndicator); } case Unity7: { - // Ubuntu Unity7 is a weird combination. It's "Gnome", but it's not "Gnome Shell". + // Ubuntu Unity7 (17.04+, which has MIR) is a weird combination. It's "Gnome", but it's not "Gnome Shell". return selectTypeQuietly(TrayType.AppIndicator); } case XFCE: {