xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #2114: mingw2.patch

File mingw2.patch, 2.0 KB (added by Nathan Hallquist, 2 years ago)
  • xpra/net/ssh.py

     
    114114    from xpra.platform.paths import get_icon_filename
    115115    from xpra.os_util import use_tty
    116116    if not use_tty():
    117         icon = get_icon_filename("authentication", "png")
     117        icon = get_icon_filename("authentication", "png") or ""
    118118        prompt = "Are you sure you want to continue connecting?"
    119119        code, out = dialog_confirm("Confirm Key", prompt, info, icon, buttons=[("yes", 200), ("NO", 201)])
    120120        log.debug("dialog output: '%s', return code=%s", nonl(out), code)
     
    132132    from xpra.platform.paths import get_icon_filename
    133133    from xpra.os_util import use_tty
    134134    if not use_tty():
    135         icon = get_icon_filename("authentication", "png")
     135        icon = get_icon_filename("authentication", "png") or ""
    136136        code, out = dialog_pass("Password Input", prompt, icon)
    137137        log.debug("pass dialog output return code=%s", code)
    138138        if code!=0:
  • xpra/platform/win32/paths.py

     
    176176    return do_get_xpra_command()
    177177
    178178def do_get_xpra_command():
     179    from xpra.platform.paths import default_do_get_xpra_command
     180    d = default_do_get_xpra_command()
    179181    mingw = os.environ.get("MINGW_PREFIX")
    180182    if mingw:
    181183        xpra_script = os.path.join(mingw, "bin", "xpra")
     
    182184        py = os.path.join(mingw, "bin", "python%i.exe" % sys.version_info[0])
    183185        if os.path.exists(xpra_script) and os.path.exists(py):
    184186            return [py, xpra_script]
    185     from xpra.platform.paths import default_do_get_xpra_command
    186     return default_do_get_xpra_command()
     187        elif len(d) == 1:
     188            if not d[0].lower().endswith(".exe"):
     189                return [sys.executable, d[0]]
     190    return d