3 files changed, 12 insertions, 12 deletions

diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 2629202ed3..60ee2d96aa 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -167,36 +167,36 @@ void InitMirOTRMenu(void)
 
 	// menu items
 	CMenuItem mi;
-	mi.flags = CMIF_DISABLED | CMIF_TCHAR;
+	mi.flags = CMIF_DISABLED | CMIF_UNICODE;
 	mi.name.w = LPGENW("OTR Status");
 	mi.position = 0;
 	hStatusInfoItem = AddMirOTRMenuItem(&mi, NULL);
 
-	mi.flags = CMIF_TCHAR | CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED;
+	mi.flags = CMIF_UNICODE | CMIF_NOTPRIVATE | CMIF_NOTUNVERIFIED;
 	mi.name.w = LANG_MENU_START;
 	mi.position = 100001;
 	mi.hIcolibItem = IcoLib_GetIconHandle(ICON_UNVERIFIED);
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUSTART);
 
-	mi.flags = CMIF_TCHAR | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
+	mi.flags = CMIF_UNICODE | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
 	mi.name.w = LANG_MENU_REFRESH;
 	mi.position = 100002;
 	mi.hIcolibItem = IcoLib_GetIconHandle(ICON_FINISHED);
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUREFRESH);
 
-	mi.flags = CMIF_TCHAR | CMIF_NOTNOTPRIVATE;
+	mi.flags = CMIF_UNICODE | CMIF_NOTNOTPRIVATE;
 	mi.name.w = LANG_MENU_STOP;
 	mi.position = 100003;
 	mi.hIcolibItem = IcoLib_GetIconHandle(ICON_NOT_PRIVATE);
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUSTOP);
 
-	mi.flags = CMIF_TCHAR | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
+	mi.flags = CMIF_UNICODE | CMIF_NOTNOTPRIVATE | CMIF_NOTFINISHED;
 	mi.name.w = LANG_MENU_VERIFY;
 	mi.position = 200001;
 	mi.hIcolibItem = IcoLib_GetIconHandle(ICON_PRIVATE);
 	AddMirOTRMenuItem(&mi, MS_OTR_MENUVERIFY);
 
-	mi.flags = CMIF_TCHAR | CMIF_CHECKED;
+	mi.flags = CMIF_UNICODE | CMIF_CHECKED;
 	mi.name.w = LANG_MENU_TOGGLEHTML;
 	mi.position = 300001;
 	mi.hIcolibItem = 0;
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index 861dec4677..d11a3ecb29 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -19,7 +19,7 @@ void SetFilenames(const wchar_t *path)
 {
 	if (!path || !path[0]) 
 		return;
-	CreateDirectoryTreeT(path);
+	CreateDirectoryTreeW(path);
 	
 	mir_snwprintf(g_private_key_filename,       L"%s\\" _A2W(PRIVATE_KEY_FILENAME),       path);
 	mir_snwprintf(g_fingerprint_store_filename, L"%s\\" _A2W(FINGERPRINT_STORE_FILENAME), path);
@@ -30,7 +30,7 @@ int FoldersChanged(WPARAM, LPARAM)
 {
 	wchar_t path[MAX_PATH];
 	if ( FoldersGetCustomPathT(hPATH_MIROTR, path, _countof(path), L""))
-		SetFilenames(VARST(DATA_DIRECTORY));
+		SetFilenames(VARSW(DATA_DIRECTORY));
 	else
 		SetFilenames(path);
 
@@ -47,7 +47,7 @@ void LoadFilenames()
 		FoldersChanged(0, 0);
 	}
 	else {
-		SetFilenames( VARST(DATA_DIRECTORY));
+		SetFilenames( VARSW(DATA_DIRECTORY));
 		ReadPrivkeyFiles();
 	}
 }
@@ -822,7 +822,7 @@ static int OpenOptions(WPARAM wParam, LPARAM)
 	odp.hInstance = hInst;
 	odp.pwszGroup = LPGENW("Services");
 	odp.pwszTitle = L"OTR";
-	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+	odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
 
 	odp.pwszTab = LANG_OPT_GENERAL;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENERAL);
diff --git a/plugins/MirOTR/src/svcs_menu.cpp b/plugins/MirOTR/src/svcs_menu.cpp
index c86d81ef4f..5b9d4703d7 100644
--- a/plugins/MirOTR/src/svcs_menu.cpp
+++ b/plugins/MirOTR/src/svcs_menu.cpp
@@ -30,7 +30,7 @@ int StartOTR(MCONTACT hContact) {
 		for(const wchar_t* c=MIROTR_PROTO_HELLO_MSG; *c && msgoff<msgend; *msgoff++=*c++);
 		LCID langid = Langpack_GetDefaultLocale();
 		if(langid != 0x0409/*US*/ && langid != 0x1009/*CA*/ && langid != 0x0809/*GB*/){ // non english
-			const wchar_t* translated=TranslateTS(MIROTR_PROTO_HELLO_MSG);
+			const wchar_t* translated=TranslateW(MIROTR_PROTO_HELLO_MSG);
 			if(mir_wstrcmp(MIROTR_PROTO_HELLO_MSG,translated)){
 				*msgoff++ = '\n';
 				for(const wchar_t* c=nick; *c && msgoff<msgend; *msgoff++=*c++);
@@ -159,7 +159,7 @@ void InitMenu()
 	CreateServiceFunction(MS_OTR_MENUTOGGLEHTML, SVC_ToggleHTMLOTR);
 
 	CMenuItem mi;
-	mi.flags = CMIF_NOTOFFLINE | CMIF_TCHAR;
+	mi.flags = CMIF_NOTOFFLINE | CMIF_UNICODE;
 	mi.position = -400000;
 
 	SET_UID(mi, 0xAB574FAD, 0x15D8, 0x49FF, 0xB7, 0x03, 0xDA, 0x2B, 0x45, 0x46, 0xC3, 0x56);