less TCHARs

git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp
index a3a4d04ec0..861dec4677 100644
--- a/plugins/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/src/options.cpp
@@ -21,9 +21,9 @@ void SetFilenames(const wchar_t *path)
 		return;
 	CreateDirectoryTreeT(path);
 	
-	mir_sntprintf(g_private_key_filename,       L"%s\\" _A2W(PRIVATE_KEY_FILENAME),       path);
-	mir_sntprintf(g_fingerprint_store_filename, L"%s\\" _A2W(FINGERPRINT_STORE_FILENAME), path);
-	mir_sntprintf(g_instag_filename,            L"%s\\" _A2W(INSTAG_FILENAME),            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);
+	mir_snwprintf(g_instag_filename,            L"%s\\" _A2W(INSTAG_FILENAME),            path);
 }
 
 int FoldersChanged(WPARAM, LPARAM)
@@ -161,7 +161,7 @@ static INT_PTR CALLBACK DlgProcMirOTROpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 		CheckDlgButton(hwndDlg, IDC_CHK_ENDOFFLINE, options.end_offline ? BST_CHECKED : BST_UNCHECKED);
 		CheckDlgButton(hwndDlg, IDC_CHK_ENDCLOSE, options.end_window_close ? BST_CHECKED : BST_UNCHECKED);
 
-		prefix = mir_utf8decodeT(options.prefix);
+		prefix = mir_utf8decodeW(options.prefix);
 		SetDlgItemText(hwndDlg, IDC_ED_PREFIX, prefix);
 		mir_free(prefix);
 		bInit = true;
@@ -238,10 +238,10 @@ static unsigned int CALLBACK regen_key_thread(void* param)
 	PROTOREGENKEYOPTIONS *opts = (PROTOREGENKEYOPTIONS *)param;
 	wchar_t buff[512];
 
-	mir_sntprintf(buff, TranslateW(LANG_OTR_ASK_NEWKEY), opts->proto);
+	mir_snwprintf(buff, TranslateW(LANG_OTR_ASK_NEWKEY), opts->proto);
 	EnableWindow(opts->refresh, FALSE);
 	if (IDYES == MessageBox(opts->refresh, buff, TranslateT(LANG_OTR_INFO), MB_ICONQUESTION|MB_YESNO)) {
-		char* proto = mir_t2a(opts->proto);
+		char* proto = mir_u2a(opts->proto);
 		otr_gui_create_privkey(0, proto, proto);
 		mir_free(proto);
 		SendMessage(opts->refresh, WMU_REFRESHPROTOLIST, 0, 0);
@@ -332,7 +332,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP
 
 				char fprint[45];
 				if (otrl_privkey_fingerprint(otr_user_state, fprint, pppDesc[i]->szModuleName, pppDesc[i]->szModuleName)) {
-					wchar_t *temp = mir_a2t(fprint);
+					wchar_t *temp = mir_a2u(fprint);
 					ListView_SetItemText(lv, ilvItem, 2, temp);
 					mir_free(temp);
 				}
@@ -360,7 +360,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsProto(HWND hwndDlg, UINT msg, WPARAM wP
 					wchar_t buff_proto[128];
 					ListView_GetItemText(GetDlgItem(hwndDlg, IDC_LV_PROTO_PROTOS), sel, 0, buff_proto, _countof(buff_proto));
 					wchar_t buff[512];
-					mir_sntprintf(buff, TranslateW(LANG_OTR_ASK_REMOVEKEY), buff_proto);
+					mir_snwprintf(buff, TranslateW(LANG_OTR_ASK_REMOVEKEY), buff_proto);
 					if (IDYES == MessageBox(hwndDlg, buff, TranslateT(LANG_OTR_INFO), MB_ICONQUESTION | MB_YESNO)) {
 						char *proto = GetProtoName(lv, sel);
 						if (proto == NULL)
@@ -745,7 +745,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
 						wchar_t buff[1024], hash[45];
 						otrl_privkey_hash_to_humanT(hash, fp->fingerprint);
 						PROTOACCOUNT *pa = Proto_GetAccount(GetContactProto(hContact));
-						mir_sntprintf(buff, TranslateW(LANG_FINGERPRINT_STILL_IN_USE), hash, contact_get_nameT(hContact), pa->tszAccountName);
+						mir_snwprintf(buff, TranslateW(LANG_FINGERPRINT_STILL_IN_USE), hash, contact_get_nameT(hContact), pa->tszAccountName);
 						ShowError(buff);
 					}
 					else {
@@ -775,7 +775,7 @@ static INT_PTR CALLBACK DlgProcMirOTROptsFinger(HWND hwndDlg, UINT msg, WPARAM w
 						wchar_t buff[1024], hash[45];
 						otrl_privkey_hash_to_humanT(hash, it->first->fingerprint);
 						PROTOACCOUNT *pa = Proto_GetAccount(GetContactProto(hContact));
-						mir_sntprintf(buff, TranslateW(LANG_FINGERPRINT_NOT_DELETED), hash, contact_get_nameT(hContact), pa->tszAccountName);
+						mir_snwprintf(buff, TranslateW(LANG_FINGERPRINT_NOT_DELETED), hash, contact_get_nameT(hContact), pa->tszAccountName);
 						ShowError(buff);
 					}
 					else otrl_context_forget_fingerprint(it->first, 1);