Skip to content

Commit

Permalink
#2179: use appindicator on unity and gnome, but leave the other deskt…
Browse files Browse the repository at this point in the history
…op environments alone for now - they're not necessarily as broken as those two

git-svn-id: https://xpra.org/svn/Xpra/trunk@21894 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 26, 2019
1 parent c74373c commit e91f0bd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions src/xpra/os_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@ def getUbuntuVersion():
def is_unity():
return os.environ.get("XDG_CURRENT_DESKTOP", "").lower().startswith("unity")

def is_gnome():
return os.environ.get("XDG_CURRENT_DESKTOP", "").lower().startswith("gnome")

def is_WSL():
if not POSIX:
return False
Expand Down
4 changes: 2 additions & 2 deletions src/xpra/platform/xposix/appindicator_tray.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import os

from xpra.util import envbool
from xpra.os_util import is_unity, monotonic_time, getUbuntuVersion, PYTHON2, PYTHON3
from xpra.os_util import is_unity, is_gnome, monotonic_time, getUbuntuVersion, PYTHON2, PYTHON3
from xpra.client.tray_base import TrayBase
from xpra.platform.paths import get_icon_dir, get_icon_filename
from xpra.log import Logger
Expand Down Expand Up @@ -51,7 +51,7 @@ def get_application_category(appindicator):
return v

def can_use_appindicator():
return get_appindicator() is not None
return get_appindicator() is not None and (is_unity() or is_gnome())


class AppindicatorTray(TrayBase):
Expand Down

0 comments on commit e91f0bd

Please sign in to comment.