projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
11d562e
)
Fix tinc-gui on Windows.
author
Dennis Joachimsthaler
<dennis@efjot.de>
Fri, 17 Jan 2014 15:10:10 +0000
(16:10 +0100)
committer
Guus Sliepen
<Guus.Sliepen@astro.su.se>
Fri, 17 Jan 2014 15:10:10 +0000
(16:10 +0100)
gui/tinc-gui
patch
|
blob
|
history
diff --git
a/gui/tinc-gui
b/gui/tinc-gui
index
2b4f903
..
64b738e
100755
(executable)
--- a/
gui/tinc-gui
+++ b/
gui/tinc-gui
@@
-27,7
+27,7
@@
import time
from wx.lib.mixins.listctrl import ColumnSorterMixin
from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
from wx.lib.mixins.listctrl import ColumnSorterMixin
from wx.lib.mixins.listctrl import ListCtrlAutoWidthMixin
-if platform.system == 'Windows':
+if platform.system
()
== 'Windows':
import _winreg
# Classes to interface with a running tinc daemon
import _winreg
# Classes to interface with a running tinc daemon
@@
-233,9
+233,9
@@
class VPN:
return int(resp[2])
def __init__(self, netname = None, pidfile = None):
return int(resp[2])
def __init__(self, netname = None, pidfile = None):
- if platform.system == 'Windows':
+ if platform.system
()
== 'Windows':
try:
try:
- reg = _winreg.ConnectRegistry(None, HKEY_LOCAL_MACHINE)
+ reg = _winreg.ConnectRegistry(None,
_winreg.
HKEY_LOCAL_MACHINE)
key = _winreg.OpenKey(reg, "SOFTWARE\\tinc")
VPN.confdir = _winreg.QueryValue(key, None)
except WindowsError:
key = _winreg.OpenKey(reg, "SOFTWARE\\tinc")
VPN.confdir = _winreg.QueryValue(key, None)
except WindowsError:
@@
-252,7
+252,7
@@
class VPN:
if pidfile != None:
self.pidfile = pidfile
else:
if pidfile != None:
self.pidfile = pidfile
else:
- if platform.system == 'Windows':
+ if platform.system
()
== 'Windows':
self.pidfile = os.path.join(self.confbase, 'pid')
else:
if netname:
self.pidfile = os.path.join(self.confbase, 'pid')
else:
if netname: