Skip to content

Commit

Permalink
Finally managed to fix Windows path error. Ref #391
Browse files Browse the repository at this point in the history
  • Loading branch information
kozec committed Sep 16, 2017
1 parent 4a83783 commit 8864664
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
9 changes: 5 additions & 4 deletions scripts/syncthing-gtk-exe.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
#!/c/Python27/python.exe
# Note: this one is used by Windows
import sys, os, gi, cairo, _winreg # cairo and _winreg imported so cx_Freeze knows about them
import sys, os, _winreg

if __name__ == "__main__":
portable = False

gi.require_version('Gtk', '3.0')
gi.require_version('Rsvg', '2.0')

if "--portable" in sys.argv:
sys.argv.remove("--portable")
portable = True
Expand All @@ -33,6 +30,10 @@
os.chdir(path)
os.environ["PATH"] = path

import gi, cairo
gi.require_version('Gtk', '3.0')
gi.require_version('Rsvg', '2.0')

from syncthing_gtk.tools import init_logging, init_locale
from syncthing_gtk.windows import (
enable_localization, fix_localized_system_error_messages,
Expand Down
2 changes: 1 addition & 1 deletion syncthing_gtk/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
log = logging.getLogger("App")

# Internal version used by updater (if enabled)
INTERNAL_VERSION = "v0.9.2.4"
INTERNAL_VERSION = "v0.9.2.6"
# Minimal Syncthing version supported by App
MIN_ST_VERSION = "0.13.0"

Expand Down
2 changes: 1 addition & 1 deletion syncthing_gtk/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"""

from __future__ import unicode_literals
from gi.repository import GLib
from base64 import b32decode
from datetime import tzinfo, timedelta
from subprocess import Popen
Expand Down Expand Up @@ -370,6 +369,7 @@ def get_config_dir():
return windows.get_unicode_home()
except Exception:
pass
from gi.repository import GLib
confdir = GLib.get_user_config_dir()
if confdir is None or IS_XP:
if IS_WINDOWS:
Expand Down

0 comments on commit 8864664

Please sign in to comment.