Added UbuntuGnome. Fixed warning output for elementaryOS.
This commit is contained in:
parent
86ceefc5d3
commit
c01f12fcaf
@ -491,10 +491,7 @@ class SystemTray {
|
|||||||
// http://bazaar.launchpad.net/~wingpanel-devs/wingpanel/trunk/view/head:/sample/SampleIndicator.vala
|
// http://bazaar.launchpad.net/~wingpanel-devs/wingpanel/trunk/view/head:/sample/SampleIndicator.vala
|
||||||
|
|
||||||
if (!useNativeMenus && AUTO_FIX_INCONSISTENCIES) {
|
if (!useNativeMenus && AUTO_FIX_INCONSISTENCIES) {
|
||||||
if (OsUtil.Linux.isElementaryOS()) {
|
logger.warn("Cannot use non-native menus with pantheon DE. Forcing native menus.");
|
||||||
} else {
|
|
||||||
logger.warn("Cannot use non-native menus with pantheon DE. Forcing native menus.");
|
|
||||||
}
|
|
||||||
useNativeMenus = true;
|
useNativeMenus = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -533,7 +530,11 @@ class SystemTray {
|
|||||||
logger.debug("Running Fedora");
|
logger.debug("Running Fedora");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 23 is gtk, 24/25 is gtk (but also wrong size unless we adjust it)
|
// 23 is gtk, 24/25 is gtk (but also wrong size unless we adjust it. ImageUtil automatically does this)
|
||||||
|
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
|
||||||
|
}
|
||||||
|
else if (OsUtil.Linux.isUbuntu()) {
|
||||||
|
// so far, because of the interaction between gnome3 + ubuntu, the GtkStatusIcon miraculously works.
|
||||||
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
|
trayType = selectTypeQuietly(useNativeMenus, TrayType.GtkStatusIcon);
|
||||||
} else {
|
} else {
|
||||||
// arch likely will have problems unless the correct/appropriate libraries are installed.
|
// arch likely will have problems unless the correct/appropriate libraries are installed.
|
||||||
|
Loading…
Reference in New Issue
Block a user