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

Removed dead code

Browse Source
This commit is contained in:
nathan 2016-10-10 23:48:13 +02:00
parent d08904d634
commit 7e3fba9157
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dorkbox/systemTray/SystemTray.java
View File

@ -167,8 +167,6 @@ class SystemTray implements Menu {
Class<? extends Menu> trayType = null;
boolean isKDE = false;
if (DEBUG) {
logger.debug("is JavaFX detected? {}", isJavaFxLoaded);
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 ("unity".equalsIgnoreCase(XDG)) {
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
// this is the safest way to do this.
final Class<? extends Menu> finalTrayType = trayType;

1
src/dorkbox/systemTray/linux/jna/Gtk.java
View File

@ -52,7 +52,6 @@ class Gtk {
// there is ONLY a single thread EVER setting this value!!
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-3.so.0 | grep gtk

3
src/dorkbox/systemTray/util/ImageUtils.java
View File

@ -36,7 +36,6 @@ import javax.imageio.stream.ImageInputStream;
import javax.swing.ImageIcon;
import dorkbox.systemTray.SystemTray;
import dorkbox.systemTray.linux.jna.Gtk;
import dorkbox.util.CacheUtil;
import dorkbox.util.FileUtil;
import dorkbox.util.LocationResolver;
@ -150,7 +149,7 @@ class ImageUtils {
// KDE is bonkers.
if (Gtk.isKDE) {
if ("kde".equalsIgnoreCase(System.getenv("XDG_CURRENT_DESKTOP"))) {
try {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(8196);
PrintStream outputStream = new PrintStream(byteArrayOutputStream);