github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

fix symbol clash

pull/1/head
Heiko Hund 2011-07-21 09:01:04 +02:00
parent bb030a99c1
commit 42b3ead5f0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
options.h
View File

@ -87,7 +87,7 @@ typedef enum {
typedef enum { typedef enum {
config, config,
system, windows,
manual manual
} proxy_source_t; } proxy_source_t;

8
proxy.c
View File

@ -201,7 +201,7 @@ LoadProxySettings(HWND hwndDlg)
{ {
SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_OPENVPN), BM_CLICK, 0, 0); SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_OPENVPN), BM_CLICK, 0, 0);
} }
else if (o.proxy_source == system) else if (o.proxy_source == windows)
{ {
SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MSIE), BM_CLICK, 0, 0); SendMessage(GetDlgItem(hwndDlg, ID_RB_PROXY_MSIE), BM_CLICK, 0, 0);
} }
@ -228,7 +228,7 @@ SaveProxySettings(HWND hwndDlg)
} }
else if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MSIE) == BST_CHECKED) else if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MSIE) == BST_CHECKED)
{ {
o.proxy_source = system; o.proxy_source = windows;
proxy_source_string[0] = _T('1'); proxy_source_string[0] = _T('1');
} }
else if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MANUAL) == BST_CHECKED) else if (IsDlgButtonChecked(hwndDlg, ID_RB_PROXY_MANUAL) == BST_CHECKED)
@ -307,7 +307,7 @@ GetProxyRegistrySettings()
} }
else if (proxy_source_string[0] == _T('1')) else if (proxy_source_string[0] == _T('1'))
{ {
o.proxy_source = system; o.proxy_source = windows;
} }
else if (proxy_source_string[0] == _T('2')) else if (proxy_source_string[0] == _T('2'))
{ {
@ -396,7 +396,7 @@ void ConstructProxyCmdLine(TCHAR *proxy_string, unsigned int size)
o.proxy_socks_address, o.proxy_socks_port); o.proxy_socks_address, o.proxy_socks_port);
} }
} }
else if (o.proxy_source == system) else if (o.proxy_source == windows)
{ {
__sntprintf_0(proxy_string, size, _T(" --auto-proxy")); __sntprintf_0(proxy_string, size, _T(" --auto-proxy"));
} }