Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 501268
Collapse All | Expand All

(-)xpra-0.11.2/xpra/platform/xposix/appindicator_tray.py (-4 / +1 lines)
Lines 7-20 Link Here
7
# Ubuntu re-invents the wheel, and it's a broken one
7
# Ubuntu re-invents the wheel, and it's a broken one
8
8
9
import os
9
import os
10
from xpra.util import is_unity
10
from xpra.client.tray_base import TrayBase, debug
11
from xpra.client.tray_base import TrayBase, debug
11
from xpra.platform.paths import get_icon_dir
12
from xpra.platform.paths import get_icon_dir
12
13
13
14
14
def is_unity():
15
    return os.environ.get("XDG_CURRENT_DESKTOP", "").lower() == "unity"
16
17
18
_appindicator = False
15
_appindicator = False
19
def get_appindicator():
16
def get_appindicator():
20
    global _appindicator
17
    global _appindicator
(-)xpra-0.11.2/xpra/platform/xposix/features.py (-2 / +2 lines)
Lines 16-25 SHADOW_SUPPORTED = True Link Here
16
16
17
17
18
#don't bother trying to forward system tray with Ubuntu's "unity":
18
#don't bother trying to forward system tray with Ubuntu's "unity":
19
from xpra.platform.xposix.appindicator_tray import is_unity
19
from xpra.util import is_unity
20
SYSTEM_TRAY_SUPPORTED = not is_unity()
20
SYSTEM_TRAY_SUPPORTED = not is_unity()
21
MMAP_SUPPORTED = True
21
MMAP_SUPPORTED = True
22
CAN_DAEMONIZE = True
22
CAN_DAEMONIZE = True
23
DEFAULT_SSH_CMD = "ssh"
23
DEFAULT_SSH_CMD = "ssh"
24
GOT_PASSWORD_PROMPT_SUGGESTION = "Perhaps you need to set up your ssh agent?\n"
24
GOT_PASSWORD_PROMPT_SUGGESTION = "Perhaps you need to set up your ssh agent?\n"
25
CLIPBOARDS=["CLIPBOARD", "PRIMARY", "SECONDARY"]
25
CLIPBOARDS=["CLIPBOARD", "PRIMARY", "SECONDARY"]
(-)xpra-0.11.2/xpra/util.py (+5 lines)
Lines 3-8 Link Here
3
# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
3
# Xpra is released under the terms of the GNU GPL v2, or, at your option, any
4
# later version. See the file COPYING for details.
4
# later version. See the file COPYING for details.
5
5
6
import os
6
from xpra.os_util import strtobytes, bytestostr
7
from xpra.os_util import strtobytes, bytestostr
7
import traceback
8
import traceback
8
import threading
9
import threading
Lines 163-165 def nonl(x): Link Here
163
164
164
def xor(s1,s2):
165
def xor(s1,s2):
165
    return ''.join(chr(ord(a) ^ ord(b)) for a,b in zip(s1,s2))
166
    return ''.join(chr(ord(a) ^ ord(b)) for a,b in zip(s1,s2))
167
168
169
def is_unity():
170
    return os.environ.get("XDG_CURRENT_DESKTOP", "").lower() == "unity"

Return to bug 501268