From: Dennis Joachimsthaler <dennis@efjot.de>
Date: Fri, 17 Jan 2014 15:10:10 +0000 (+0100)
Subject: Fix tinc-gui on Windows.
X-Git-Tag: release-1.1pre10~17
X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=ab583f7e8c550822c63a1a6b73a7a329f622d9e0

Fix tinc-gui on Windows.
---

diff --git a/gui/tinc-gui b/gui/tinc-gui
index 2b4f9034..64b738eb 100755
--- 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
 
-if platform.system == 'Windows':
+if platform.system() == 'Windows':
 	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):
-		if platform.system == 'Windows':
+		if platform.system() == 'Windows':
 			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:
@@ -252,7 +252,7 @@ class VPN:
 		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: