Removed dead code
This commit is contained in:
parent
d08904d634
commit
7e3fba9157
@ -167,8 +167,6 @@ class SystemTray implements Menu {
|
|||||||
|
|
||||||
Class<? extends Menu> trayType = null;
|
Class<? extends Menu> trayType = null;
|
||||||
|
|
||||||
boolean isKDE = false;
|
|
||||||
|
|
||||||
if (DEBUG) {
|
if (DEBUG) {
|
||||||
logger.debug("is JavaFX detected? {}", isJavaFxLoaded);
|
logger.debug("is JavaFX detected? {}", isJavaFxLoaded);
|
||||||
logger.debug("is SWT detected? {}", isSwtLoaded);
|
logger.debug("is SWT detected? {}", isSwtLoaded);
|
||||||
@ -341,12 +339,6 @@ class SystemTray implements Menu {
|
|||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
// must always be set in case of forced tray types
|
|
||||||
if ("kde".equalsIgnoreCase(XDG)) {
|
|
||||||
isKDE = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (trayType == null) {
|
if (trayType == null) {
|
||||||
if ("unity".equalsIgnoreCase(XDG)) {
|
if ("unity".equalsIgnoreCase(XDG)) {
|
||||||
try {
|
try {
|
||||||
@ -586,9 +578,6 @@ class SystemTray implements Menu {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// need to set this
|
|
||||||
Gtk.isKDE = isKDE;
|
|
||||||
|
|
||||||
// have to construct swing stuff inside the swing EDT
|
// have to construct swing stuff inside the swing EDT
|
||||||
// this is the safest way to do this.
|
// this is the safest way to do this.
|
||||||
final Class<? extends Menu> finalTrayType = trayType;
|
final Class<? extends Menu> finalTrayType = trayType;
|
||||||
|
@ -52,7 +52,6 @@ class Gtk {
|
|||||||
|
|
||||||
// there is ONLY a single thread EVER setting this value!!
|
// there is ONLY a single thread EVER setting this value!!
|
||||||
private static volatile boolean isDispatch = false;
|
private static volatile boolean isDispatch = false;
|
||||||
public static boolean isKDE = false;
|
|
||||||
|
|
||||||
// objdump -T /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0 | grep gtk
|
// objdump -T /usr/lib/x86_64-linux-gnu/libgtk-x11-2.0.so.0 | grep gtk
|
||||||
// objdump -T /usr/lib/x86_64-linux-gnu/libgtk-3.so.0 | grep gtk
|
// objdump -T /usr/lib/x86_64-linux-gnu/libgtk-3.so.0 | grep gtk
|
||||||
|
@ -36,7 +36,6 @@ import javax.imageio.stream.ImageInputStream;
|
|||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
|
|
||||||
import dorkbox.systemTray.SystemTray;
|
import dorkbox.systemTray.SystemTray;
|
||||||
import dorkbox.systemTray.linux.jna.Gtk;
|
|
||||||
import dorkbox.util.CacheUtil;
|
import dorkbox.util.CacheUtil;
|
||||||
import dorkbox.util.FileUtil;
|
import dorkbox.util.FileUtil;
|
||||||
import dorkbox.util.LocationResolver;
|
import dorkbox.util.LocationResolver;
|
||||||
@ -150,7 +149,7 @@ class ImageUtils {
|
|||||||
|
|
||||||
|
|
||||||
// KDE is bonkers.
|
// KDE is bonkers.
|
||||||
if (Gtk.isKDE) {
|
if ("kde".equalsIgnoreCase(System.getenv("XDG_CURRENT_DESKTOP"))) {
|
||||||
try {
|
try {
|
||||||
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(8196);
|
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(8196);
|
||||||
PrintStream outputStream = new PrintStream(byteArrayOutputStream);
|
PrintStream outputStream = new PrintStream(byteArrayOutputStream);
|
||||||
|
Loading…
Reference in New Issue
Block a user