1 files changed, 119 insertions, 114 deletions
diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp
index 02748633ea..33c19a0b50 100644
--- a/protocols/Tox/src/tox_options.cpp
+++ b/protocols/Tox/src/tox_options.cpp
@@ -1,115 +1,120 @@
-#include "common.h"
-
-INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
-{
-	CToxProto *proto = (CToxProto*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-
-	switch (uMsg)
-	{
-	case WM_INITDIALOG:
-		TranslateDialogDefault(hwnd);
-		{
-			proto = (CToxProto*)lParam;
-			SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
-
-			ptrT nick(proto->getTStringA("Nick"));
-			SetDlgItemText(hwnd, IDC_NAME, nick);
-
-			ptrT pass(proto->getTStringA("Password"));
-			SetDlgItemText(hwnd, IDC_PASSWORD, pass);
-
-			ptrA address(proto->getStringA(TOX_SETTINGS_ID));
-			if (address != NULL)
-			{
-				SetDlgItemTextA(hwnd, IDC_TOXID, address);
-			}
-
-			ptrT group(proto->getTStringA(TOX_SETTINGS_GROUP));
-			SetDlgItemText(hwnd, IDC_GROUP, group);
-			SendDlgItemMessage(hwnd, IDC_GROUP, EM_LIMITTEXT, 64, 0);
-
-			CheckDlgButton(hwnd, IDC_DISABLE_UDP, proto->getBool("DisableUDP", 0));
-			CheckDlgButton(hwnd, IDC_DISABLE_IPV6, proto->getBool("DisableIPv6", 0));
-
-			EnableWindow(GetDlgItem(hwnd, IDC_TOXID), proto->IsOnline());
-			EnableWindow(GetDlgItem(hwnd, IDC_CLIPBOARD), proto->IsOnline());
-			EnableWindow(GetDlgItem(hwnd, IDC_NAME), proto->IsOnline());
-			EnableWindow(GetDlgItem(hwnd, IDC_PASSWORD), proto->IsOnline());
-		}
-		return TRUE;
-
-	case WM_COMMAND:
-	{
-		switch (LOWORD(wParam))
-		{
-		case IDC_NAME:
-		case IDC_GROUP:
-		case IDC_PASSWORD:
-			if ((HWND)lParam == GetFocus())
-			{
-				if (HIWORD(wParam) != EN_CHANGE) return 0;
-				SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
-			}
-			break;
-
-		case IDC_DISABLE_UDP:
-		case IDC_DISABLE_IPV6:
-			SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
-			break;
-		}
-
-		case IDC_CLIPBOARD:
-		{
-			char toxId[TOX_FRIEND_ADDRESS_SIZE * 2 + 1];
-			GetDlgItemTextA(hwnd, IDC_TOXID, toxId, SIZEOF(toxId));
-			if (OpenClipboard(GetDlgItem(hwnd, IDC_TOXID)))
-			{
-				EmptyClipboard();
-				HGLOBAL hMem = GlobalAlloc(GMEM_FIXED, sizeof(toxId));
-				memcpy(GlobalLock(hMem), toxId, sizeof(toxId));
-				GlobalUnlock(hMem);
-				SetClipboardData(CF_TEXT, hMem);
-				CloseClipboard();
-			}
-		}
-			break;
-	}
-		break;
-
-	case WM_NOTIFY:
-		if (reinterpret_cast<NMHDR*>(lParam)->code == PSN_APPLY)
-		{
-			TCHAR group[64];
-			GetDlgItemText(hwnd, IDC_GROUP, group, SIZEOF(group));
-			if (_tcslen(group) > 0)
-			{
-				proto->setTString(NULL, TOX_SETTINGS_GROUP, group);
-				Clist_CreateGroup(0, group);
-			}
-			else
-			{
-				proto->delSetting(NULL, TOX_SETTINGS_GROUP);
-			}
-
-			proto->setByte("DisableUDP", (BYTE)IsDlgButtonChecked(hwnd, IDC_DISABLE_UDP));
-			proto->setByte("DisableIPv6", (BYTE)IsDlgButtonChecked(hwnd, IDC_DISABLE_IPV6));
-
-			if (proto->IsOnline())
-			{
-				TCHAR nick[TOX_MAX_NAME_LENGTH], pass[MAX_PATH];
-				GetDlgItemText(hwnd, IDC_NAME, nick, TOX_MAX_NAME_LENGTH);
-				proto->setTString("Nick", nick);
-
-				GetDlgItemText(hwnd, IDC_PASSWORD, pass, SIZEOF(pass));
-				proto->setTString("Password", pass);
-
-				proto->SaveToxProfile();
-			}
-
-			return TRUE;
-		}
-		break;
-	}
-
-	return FALSE;
+#include "common.h"
+
+INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+{
+	CToxProto *proto = (CToxProto*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
+
+	switch (uMsg)
+	{
+	case WM_INITDIALOG:
+		TranslateDialogDefault(hwnd);
+		{
+			proto = (CToxProto*)lParam;
+			SetWindowLongPtr(hwnd, GWLP_USERDATA, lParam);
+
+			ptrT nick(proto->getTStringA("Nick"));
+			SetDlgItemText(hwnd, IDC_NAME, nick);
+
+			ptrT pass(proto->getTStringA("Password"));
+			SetDlgItemText(hwnd, IDC_PASSWORD, pass);
+
+			ptrA address(proto->getStringA(TOX_SETTINGS_ID));
+			if (address != NULL)
+			{
+				SetDlgItemTextA(hwnd, IDC_TOXID, address);
+			}
+
+			ptrT group(proto->getTStringA(TOX_SETTINGS_GROUP));
+			SetDlgItemText(hwnd, IDC_GROUP, group);
+			SendDlgItemMessage(hwnd, IDC_GROUP, EM_LIMITTEXT, 64, 0);
+
+			CheckDlgButton(hwnd, IDC_DISABLE_UDP, proto->getBool("DisableUDP", 0));
+			CheckDlgButton(hwnd, IDC_DISABLE_IPV6, proto->getBool("DisableIPv6", 0));
+
+			EnableWindow(GetDlgItem(hwnd, IDC_TOXID), proto->IsOnline());
+			EnableWindow(GetDlgItem(hwnd, IDC_CLIPBOARD), proto->IsOnline());
+		}
+		return TRUE;
+
+	case WM_COMMAND:
+	{
+		switch (LOWORD(wParam))
+		{
+		case IDC_NAME:
+		case IDC_GROUP:
+		case IDC_PASSWORD:
+			if ((HWND)lParam == GetFocus())
+			{
+				if (HIWORD(wParam) != EN_CHANGE) return 0;
+				SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
+			}
+			break;
+
+		case IDC_DISABLE_UDP:
+		case IDC_DISABLE_IPV6:
+			SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
+			break;
+		}
+
+		case IDC_CLIPBOARD:
+		{
+			char toxId[TOX_FRIEND_ADDRESS_SIZE * 2 + 1];
+			GetDlgItemTextA(hwnd, IDC_TOXID, toxId, SIZEOF(toxId));
+			if (OpenClipboard(GetDlgItem(hwnd, IDC_TOXID)))
+			{
+				EmptyClipboard();
+				HGLOBAL hMem = GlobalAlloc(GMEM_FIXED, sizeof(toxId));
+				memcpy(GlobalLock(hMem), toxId, sizeof(toxId));
+				GlobalUnlock(hMem);
+				SetClipboardData(CF_TEXT, hMem);
+				CloseClipboard();
+			}
+		}
+			break;
+	}
+		break;
+
+	case WM_NOTIFY:
+		if (reinterpret_cast<NMHDR*>(lParam)->code == PSN_APPLY)
+		{
+			TCHAR nick[TOX_MAX_NAME_LENGTH];
+			GetDlgItemText(hwnd, IDC_NAME, nick, TOX_MAX_NAME_LENGTH);
+			proto->setTString("Nick", nick);
+
+			TCHAR password[MAX_PATH];
+			GetDlgItemText(hwnd, IDC_PASSWORD, password, SIZEOF(password));
+			proto->setTString("Password", password);
+			if (proto->password != NULL)
+			{
+				mir_free(proto->password);
+				proto->password = NULL;
+			}
+			proto->password = mir_utf8encodeW(password);
+
+			TCHAR group[64];
+			GetDlgItemText(hwnd, IDC_GROUP, group, SIZEOF(group));
+			if (_tcslen(group) > 0)
+			{
+				proto->setTString(NULL, TOX_SETTINGS_GROUP, group);
+				Clist_CreateGroup(0, group);
+			}
+			else
+			{
+				proto->delSetting(NULL, TOX_SETTINGS_GROUP);
+			}
+
+			proto->setByte("DisableUDP", (BYTE)IsDlgButtonChecked(hwnd, IDC_DISABLE_UDP));
+			proto->setByte("DisableIPv6", (BYTE)IsDlgButtonChecked(hwnd, IDC_DISABLE_IPV6));
+
+			if (proto->IsOnline())
+			{
+				//proto->SaveToxProfile();
+			}
+
+			return TRUE;
+		}
+		break;
+	}
+
+	return FALSE;
 }
 \ No newline at end of file