Skip to content

Commit

Permalink
#2179: appindicator works better than topicons, at least on Ubuntu - …
Browse files Browse the repository at this point in the history
…shame it crashes on python3

git-svn-id: https://xpra.org/svn/Xpra/trunk@21893 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Feb 26, 2019
1 parent 3378966 commit c74373c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
12 changes: 8 additions & 4 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ Recommends:
#bionic: ,libwebp6
#cosmic: ,libwebp6
#buster: ,libwebp6
# to make the system tray work again with gnome-shell:
#bionic: ,gnome-shell-extension-top-icons-plus
#buster: ,gnome-shell-extension-top-icons-plus
#cosmic: ,gnome-shell-extension-top-icons-plus
# audio-related:
,gstreamer1.0-pulseaudio
,gstreamer1.0-alsa
Expand Down Expand Up @@ -185,6 +181,10 @@ Recommends: python-dbus
,python-paramiko
#the start-session GUI:
,python-xdg
# to make the system tray work again with gnome-shell:
#buster: ,gnome-shell-extension-appindicator
#bionic: ,gnome-shell-extension-appindicator
#cosmic: ,gnome-shell-extension-appindicator
# for webcam support:
Suggests: python-pyinotify
,python-opencv
Expand Down Expand Up @@ -242,6 +242,10 @@ Recommends: python3-dbus
,python3-paramiko
#the start-session GUI:
,python3-xdg
# to make the system tray work again with gnome-shell:
#stretch: ,gnome-shell-extension-top-icons-plus
#bionic: ,gnome-shell-extension-top-icons-plus
#cosmic: ,gnome-shell-extension-top-icons-plus
# for webcam support:
Suggests:
,python3-pyinotify
Expand Down
2 changes: 1 addition & 1 deletion src/xpra/platform/xposix/appindicator_tray.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def get_application_category(appindicator):
return v

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


class AppindicatorTray(TrayBase):
Expand Down

0 comments on commit c74373c

Please sign in to comment.