removed unneeded UTF conversions

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

10 files changed, 44 insertions, 57 deletions

diff --git a/protocols/IcqOscarJ/src/UI/loginpassword.cpp b/protocols/IcqOscarJ/src/UI/loginpassword.cpp
index bf6706dc75..9636e9a41b 100644
--- a/protocols/IcqOscarJ/src/UI/loginpassword.cpp
+++ b/protocols/IcqOscarJ/src/UI/loginpassword.cpp
@@ -46,9 +46,9 @@ INT_PTR CALLBACK LoginPasswdDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		{

 			DWORD dwUin = ppro->getContactUin(NULL);

 

-			char pszUIN[MAX_PATH], str[MAX_PATH];

-			mir_snprintf(pszUIN, 128, ICQTranslateUtfStatic(LPGEN("Enter a password for UIN %u:"), str, MAX_PATH), dwUin);

-			SetDlgItemTextUtf(hwndDlg, IDC_INSTRUCTION, pszUIN);

+			TCHAR pszUIN[MAX_PATH];

+			mir_sntprintf(pszUIN, 128, TranslateT("Enter a password for UIN %u:"), dwUin);

+			SetDlgItemText(hwndDlg, IDC_INSTRUCTION, pszUIN);

 

 			SendDlgItemMessage(hwndDlg, IDC_LOGINPW, EM_LIMITTEXT, PASSWORDMAXLEN - 1, 0);

 

diff --git a/protocols/IcqOscarJ/src/UI/userinfotab.cpp b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
index d913bc50f4..f8bec5308b 100644
--- a/protocols/IcqOscarJ/src/UI/userinfotab.cpp
+++ b/protocols/IcqOscarJ/src/UI/userinfotab.cpp
@@ -172,7 +172,7 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, HANDLE hContact,
 				bAlloc = 1;

 			}

 			if (idCtrl == IDC_UIN)

-				SetDlgItemTextUtf(hwndDlg, IDC_UINSTATIC, ICQTranslateUtfStatic(LPGEN("ScreenName:"), str, MAX_PATH));

+				SetDlgItemText(hwndDlg, IDC_UINSTATIC, TranslateT("ScreenName:"));

 			break;

 

 		default:

@@ -184,7 +184,7 @@ static void SetValue(CIcqProto* ppro, HWND hwndDlg, int idCtrl, HANDLE hContact,
 

 	EnableDlgItem(hwndDlg, idCtrl, !unspecified);

 	if (unspecified)

-		SetDlgItemTextUtf(hwndDlg, idCtrl, ICQTranslateUtfStatic(LPGEN("<not specified>"), str, MAX_PATH));

+		SetDlgItemText(hwndDlg, idCtrl, TranslateT("<not specified>"));

 	else if (bUtf)

 		SetDlgItemTextUtf(hwndDlg, idCtrl, pstr);

 	else

@@ -257,7 +257,7 @@ static INT_PTR CALLBACK IcqDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 						SetValue(ppro, hwndDlg, IDC_PORT, hContact, (char*)DBVT_WORD, (char*)ppro->wListenPort, SVS_ZEROISUNSPEC);

 						SetValue(ppro, hwndDlg, IDC_VERSION, hContact, (char*)DBVT_WORD, (char*)ICQ_VERSION, SVS_ICQVERSION);

 						SetValue(ppro, hwndDlg, IDC_MIRVER, hContact, (char*)DBVT_ASCIIZ, str, SVS_ZEROISUNSPEC);

-						SetDlgItemTextUtf(hwndDlg, IDC_SUPTIME, ICQTranslateUtfStatic(LPGEN("Member since:"), str, MAX_PATH));

+						SetDlgItemText(hwndDlg, IDC_SUPTIME, TranslateT("Member since:"));

 						SetValue(ppro, hwndDlg, IDC_SYSTEMUPTIME, hContact, szProto, "MemberTS", SVS_TIMESTAMP);

 						SetValue(ppro, hwndDlg, IDC_STATUS, hContact, (char*)DBVT_WORD, (char*)ppro->m_iStatus, SVS_STATUSID);

 					}

diff --git a/protocols/IcqOscarJ/src/changeinfo/db.cpp b/protocols/IcqOscarJ/src/changeinfo/db.cpp
index 552ca3fce7..f32985e764 100644
--- a/protocols/IcqOscarJ/src/changeinfo/db.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/db.cpp
@@ -135,7 +135,7 @@ static INT_PTR CALLBACK PwConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 

 				if (strcmpnull(szTest, dat->ppro->GetUserPassword(TRUE))) 

 				{

-					MessageBoxUtf(hwndDlg, LPGEN("The password does not match your current password. Check Caps Lock and try again."), LPGEN("Change ICQ Details"), MB_OK);

+					MessageBox(hwndDlg, TranslateT("The password does not match your current password. Check Caps Lock and try again."), TranslateT("Change ICQ Details"), MB_OK);

 					SendDlgItemMessage(hwndDlg,IDC_OLDPASS,EM_SETSEL,0,(LPARAM)-1);

 					SetFocus(GetDlgItem(hwndDlg,IDC_OLDPASS));

 					break;

@@ -144,7 +144,7 @@ static INT_PTR CALLBACK PwConfirmDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 				GetDlgItemTextA(hwndDlg,IDC_PASSWORD,szTest,sizeof(szTest));

 				if(strcmpnull(szTest, dat->Pass)) 

 				{

-					MessageBoxUtf(hwndDlg, LPGEN("The password does not match the password you originally entered. Check Caps Lock and try again."), LPGEN("Change ICQ Details"), MB_OK);

+					MessageBox(hwndDlg, TranslateT("The password does not match the password you originally entered. Check Caps Lock and try again."), TranslateT("Change ICQ Details"), MB_OK);

 					SendDlgItemMessage(hwndDlg,IDC_PASSWORD,EM_SETSEL,0,(LPARAM)-1);

 					SetFocus(GetDlgItem(hwndDlg,IDC_PASSWORD));

 					break;

@@ -179,7 +179,7 @@ int ChangeInfoData::SaveSettingsToDb(HWND hwndDlg)
 

 				if (nSettingLen > 8 || nSettingLen < 1)

 				{

-					MessageBoxUtf(hwndDlg, LPGEN("The ICQ server does not support passwords longer than 8 characters. Please use a shorter password."), LPGEN("Change ICQ Details"), MB_OK);

+					MessageBox(hwndDlg, TranslateT("The ICQ server does not support passwords longer than 8 characters. Please use a shorter password."), TranslateT("Change ICQ Details"), MB_OK);

 					ret=0;

 					break;

 				}

diff --git a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
index b25fd627dc..4a1f068b7e 100644
--- a/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/dlgproc.cpp
@@ -243,7 +243,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			case PSN_APPLY:

 				if (dat->ChangesMade()) 

 				{

-					if (IDYES!=MessageBoxUtf(hwndDlg, LPGEN("You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?"), LPGEN("Change ICQ Details"), MB_YESNOCANCEL))

+					if (MessageBox(hwndDlg, TranslateT("You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?"), TranslateT("Change ICQ Details"), MB_YESNOCANCEL) != IDYES)

 					{

 						SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_INVALID_NOCHANGEPAGE);

 						return TRUE;

@@ -436,10 +436,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 			EnableDlgItem(hwndDlg, IDC_SAVE, FALSE);

 			EnableDlgItem(hwndDlg, IDC_LIST, FALSE);

-			{

-				char str[MAX_PATH];

-				SetDlgItemTextUtf(hwndDlg, IDC_UPLOADING, ICQTranslateUtfStatic(LPGEN("Upload in progress..."), str, MAX_PATH));

-			}

+			SetDlgItemText(hwndDlg, IDC_UPLOADING, TranslateT("Upload in progress..."));

 			EnableDlgItem(hwndDlg, IDC_UPLOADING, TRUE);

 			ShowDlgItem(hwndDlg, IDC_UPLOADING, SW_SHOW);

 			dat->hAckHook = HookEventMessage(ME_PROTO_ACK, hwndDlg, DM_PROTOACK);

@@ -484,8 +481,6 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		{

 			ACKDATA *ack=(ACKDATA*)lParam;

 			int i,done;

-			char str[MAX_PATH];

-			char buf[MAX_PATH];

 

 			if (ack->type != ACKTYPE_SETINFO) break;

 			if (ack->result == ACKRESULT_SUCCESS)

@@ -497,8 +492,9 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				dat->hUpload[i] = NULL;

 				for (done = 0, i = 0; i < SIZEOF(dat->hUpload); i++)

 					done += dat->hUpload[i] == NULL;

-				mir_snprintf(buf, sizeof(buf), "%s%d%%", ICQTranslateUtfStatic(LPGEN("Upload in progress..."), str, MAX_PATH), 100*done/(SIZEOF(dat->hUpload)));

-				SetDlgItemTextUtf(hwndDlg, IDC_UPLOADING, buf);

+				TCHAR buf[MAX_PATH];

+				mir_sntprintf(buf, sizeof(buf), TranslateT("Upload in progress...%d%%"), 100*done/(SIZEOF(dat->hUpload)));

+				SetDlgItemText(hwndDlg, IDC_UPLOADING, buf);

 				if (done < SIZEOF(dat->hUpload)) break;

 

 				dat->ClearChangeFlags();

@@ -506,7 +502,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				dat->hAckHook = NULL;

 				EnableDlgItem(hwndDlg, IDC_LIST, TRUE);

 				EnableDlgItem(hwndDlg, IDC_UPLOADING, FALSE);

-				SetDlgItemTextUtf(hwndDlg, IDC_UPLOADING, ICQTranslateUtfStatic(LPGEN("Upload complete"), str, MAX_PATH));

+				SetDlgItemText(hwndDlg, IDC_UPLOADING, TranslateT("Upload complete"));

 				SendMessage(GetParent(hwndDlg), PSM_FORCECHANGED, 0, 0);

 			}

 			else if (ack->result==ACKRESULT_FAILED)

@@ -515,7 +511,7 @@ INT_PTR CALLBACK ChangeInfoDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				dat->hAckHook = NULL;

 				EnableDlgItem(hwndDlg, IDC_LIST, TRUE);

 				EnableDlgItem(hwndDlg, IDC_UPLOADING, FALSE);

-				SetDlgItemTextUtf(hwndDlg, IDC_UPLOADING, ICQTranslateUtfStatic(LPGEN("Upload FAILED"), str, MAX_PATH));

+				SetDlgItemText(hwndDlg, IDC_UPLOADING, TranslateT("Upload FAILED"));

 				SendMessage(GetParent(hwndDlg), PSM_FORCECHANGED, 0, 0);

 				EnableDlgItem(hwndDlg, IDC_SAVE, TRUE);

 			}

diff --git a/protocols/IcqOscarJ/src/changeinfo/upload.cpp b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
index 13d017e7cb..8e562b80f0 100644
--- a/protocols/IcqOscarJ/src/changeinfo/upload.cpp
+++ b/protocols/IcqOscarJ/src/changeinfo/upload.cpp
@@ -59,7 +59,7 @@ int ChangeInfoData::UploadSettings(void)
 {

 	if (!ppro->icqOnline())

 	{

-		MessageBoxUtf(hwndDlg, LPGEN("You are not currently connected to the ICQ network. You must be online in order to update your information on the server."), LPGEN("Change ICQ Details"), MB_OK);

+		MessageBox(hwndDlg, TranslateT("You are not currently connected to the ICQ network. You must be online in order to update your information on the server."), TranslateT("Change ICQ Details"), MB_OK);

 		return 0;

 	}

 

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index d7b3153502..f8c3e3c2a9 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -33,12 +33,12 @@
 

 extern BOOL bPopupService;

 

-static const char* szLogLevelDescr[] = {

-	LPGEN("Display all problems"),

-	LPGEN("Display problems causing possible loss of data"),

-	LPGEN("Display explanations for disconnection"),

-	LPGEN("Display problems requiring user intervention"),

-	LPGEN("Do not display any problems (not recommended)")

+static const TCHAR* szLogLevelDescr[] = {

+	LPGENT("Display all problems"),

+	LPGENT("Display problems causing possible loss of data"),

+	LPGENT("Display explanations for disconnection"),

+	LPGENT("Display problems requiring user intervention"),

+	LPGENT("Do not display any problems (not recommended)")

 };

 

 static void LoadDBCheckState(CIcqProto* ppro, HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef)

@@ -99,10 +99,7 @@ static INT_PTR CALLBACK DlgProcIcqOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			LoadDBCheckState(ppro, hwndDlg, IDC_KEEPALIVE, "KeepAlive", DEFAULT_KEEPALIVE_ENABLED);

 			SendDlgItemMessage(hwndDlg, IDC_LOGLEVEL, TBM_SETRANGE, FALSE, MAKELONG(0, 4));

 			SendDlgItemMessage(hwndDlg, IDC_LOGLEVEL, TBM_SETPOS, TRUE, 4-ppro->getByte("ShowLogLevel", LOG_WARNING));

-			{

-				char buf[MAX_PATH];

-				SetDlgItemTextUtf(hwndDlg, IDC_LEVELDESCR, ICQTranslateUtfStatic(szLogLevelDescr[4-SendDlgItemMessage(hwndDlg, IDC_LOGLEVEL, TBM_GETPOS, 0, 0)], buf, MAX_PATH));

-			}

+			SetDlgItemText(hwndDlg, IDC_LEVELDESCR, TranslateTS(szLogLevelDescr[4-SendDlgItemMessage(hwndDlg, IDC_LOGLEVEL, TBM_GETPOS, 0, 0)]));

 			ShowDlgItem(hwndDlg, IDC_RECONNECTREQD, SW_HIDE);

 			LoadDBCheckState(ppro, hwndDlg, IDC_NOERRMULTI, "IgnoreMultiErrorBox", 0);

 		}

@@ -110,9 +107,7 @@ static INT_PTR CALLBACK DlgProcIcqOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 	case WM_HSCROLL:

 		{

-			char str[MAX_PATH];

-

-			SetDlgItemTextUtf(hwndDlg, IDC_LEVELDESCR, ICQTranslateUtfStatic(szLogLevelDescr[4-SendDlgItemMessage(hwndDlg, IDC_LOGLEVEL,TBM_GETPOS, 0, 0)], str, MAX_PATH));

+			SetDlgItemText(hwndDlg, IDC_LEVELDESCR, TranslateTS(szLogLevelDescr[4-SendDlgItemMessage(hwndDlg, IDC_LOGLEVEL,TBM_GETPOS, 0, 0)]));

 			OptDlgChanged(hwndDlg);

 		}

 		break;

@@ -398,10 +393,10 @@ static INT_PTR CALLBACK DlgProcIcqFeaturesOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			icq_EnableMultipleControls(hwndDlg, icqDCMsgControls, SIZEOF(icqDCMsgControls), byData?TRUE:FALSE);

 			BYTE byXStatusEnabled = ppro->getByte("XStatusEnabled", DEFAULT_XSTATUS_ENABLED);

 			CheckDlgButton(hwndDlg, IDC_XSTATUSENABLE, byXStatusEnabled);

-      BYTE byMoodsEnabled = ppro->getByte("MoodsEnabled", DEFAULT_MOODS_ENABLED);

+			BYTE byMoodsEnabled = ppro->getByte("MoodsEnabled", DEFAULT_MOODS_ENABLED);

 			CheckDlgButton(hwndDlg, IDC_MOODSENABLE, byMoodsEnabled);

 			icq_EnableMultipleControls(hwndDlg, icqXStatusControls, SIZEOF(icqXStatusControls), byXStatusEnabled);

-      icq_EnableMultipleControls(hwndDlg, icqCustomStatusControls, SIZEOF(icqCustomStatusControls), byXStatusEnabled || byMoodsEnabled);

+			icq_EnableMultipleControls(hwndDlg, icqCustomStatusControls, SIZEOF(icqCustomStatusControls), byXStatusEnabled || byMoodsEnabled);

 			LoadDBCheckState(ppro, hwndDlg, IDC_XSTATUSAUTO, "XStatusAuto", DEFAULT_XSTATUS_AUTO);

 			LoadDBCheckState(ppro, hwndDlg, IDC_XSTATUSRESET, "XStatusReset", DEFAULT_XSTATUS_RESET);

 			LoadDBCheckState(ppro, hwndDlg, IDC_KILLSPAMBOTS, "KillSpambots", DEFAULT_KILLSPAM_ENABLED);

@@ -476,8 +471,8 @@ static INT_PTR CALLBACK DlgProcIcqFeaturesOpts(HWND hwndDlg, UINT msg, WPARAM wP
 			ppro->setByte("DirectMessaging", ppro->m_bDCMsgEnabled);

 			ppro->m_bXStatusEnabled = (BYTE)IsDlgButtonChecked(hwndDlg, IDC_XSTATUSENABLE);

 			ppro->setByte("XStatusEnabled", ppro->m_bXStatusEnabled);

-      ppro->m_bMoodsEnabled = (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MOODSENABLE);

-      ppro->setByte("MoodsEnabled", ppro->m_bMoodsEnabled);

+			ppro->m_bMoodsEnabled = (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MOODSENABLE);

+			ppro->setByte("MoodsEnabled", ppro->m_bMoodsEnabled);

 			StoreDBCheckState(ppro, hwndDlg, IDC_XSTATUSAUTO, "XStatusAuto");

 			StoreDBCheckState(ppro, hwndDlg, IDC_XSTATUSRESET, "XStatusReset");

 			StoreDBCheckState(ppro, hwndDlg, IDC_KILLSPAMBOTS , "KillSpambots");

@@ -511,10 +506,8 @@ static INT_PTR CALLBACK DlgProcIcqContactsOpts(HWND hwndDlg, UINT msg, WPARAM wP
 		LoadDBCheckState(ppro, hwndDlg, IDC_AUTOLOADAVATARS, "AvatarsAutoLoad", DEFAULT_LOAD_AVATARS);

 		LoadDBCheckState(ppro, hwndDlg, IDC_STRICTAVATARCHECK, "StrictAvatarCheck", DEFAULT_AVATARS_CHECK);

 

-		icq_EnableMultipleControls(hwndDlg, icqContactsControls, SIZEOF(icqContactsControls),

-			ppro->getByte("UseServerCList", DEFAULT_SS_ENABLED)?TRUE:FALSE);

-		icq_EnableMultipleControls(hwndDlg, icqAvatarControls, SIZEOF(icqAvatarControls),

-			ppro->getByte("AvatarsEnabled", DEFAULT_AVATARS_ENABLED)?TRUE:FALSE);

+		icq_EnableMultipleControls(hwndDlg, icqContactsControls, SIZEOF(icqContactsControls), ppro->getByte("UseServerCList", DEFAULT_SS_ENABLED)?TRUE:FALSE);

+		icq_EnableMultipleControls(hwndDlg, icqAvatarControls, SIZEOF(icqAvatarControls), ppro->getByte("AvatarsEnabled", DEFAULT_AVATARS_ENABLED)?TRUE:FALSE);

 

 		if (ppro->icqOnline())

 		{

@@ -567,7 +560,7 @@ static INT_PTR CALLBACK DlgProcIcqContactsOpts(HWND hwndDlg, UINT msg, WPARAM wP
 

 INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

-int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)

+int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.position = -800000000;

diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp
index 570a1e0b5e..01e7b14f6b 100644
--- a/protocols/IcqOscarJ/src/icq_uploadui.cpp
+++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp
@@ -855,9 +855,9 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg,UINT message,WPARAM wPara
 				// All contacts are in sync

 				AppendToUploadLog(hwndDlg, ICQTranslateUtfStatic(LPGEN("All operations complete"), str, MAX_PATH));

 				EnableDlgItem(hwndDlg, IDCANCEL, TRUE);

-				SetDlgItemTextUtf(hwndDlg, IDCANCEL, ICQTranslateUtfStatic(LPGEN("Close"), str, MAX_PATH));

-        // end server modifications here

-        ppro->servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100);

+				SetDlgItemText(hwndDlg, IDCANCEL, TranslateT("Close"));

+				// end server modifications here

+				ppro->servlistPostPacket(NULL, 0, SSO_END_OPERATION, 100);

 				working = 0;

 				//        SendMessage(hwndList, CLM_SETGREYOUTFLAGS,0,0);

 				UpdateCheckmarks(hwndList, ppro, hItemAll);

@@ -888,8 +888,8 @@ static INT_PTR CALLBACK DlgProcUploadList(HWND hwndDlg,UINT message,WPARAM wPara
 			//        InvalidateRect(GetDlgItem(hwndDlg, IDC_CLIST), NULL, FALSE);

 			EnableDlgItem(hwndDlg, IDC_CLIST, FALSE);

 			hProtoAckHook = HookEventMessage(ME_PROTO_ACK, hwndDlg, M_PROTOACK);

-      // start server modifications here

-      ppro->servlistPostPacket(NULL, 0, SSO_BEGIN_OPERATION | SSOF_IMPORT_OPERATION, 100);

+			// start server modifications here

+			ppro->servlistPostPacket(NULL, 0, SSO_BEGIN_OPERATION | SSOF_IMPORT_OPERATION, 100);

 			PostMessage(hwndDlg, M_UPLOADMORE, 0, 0);

 			break;

 

diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp
index e64b777695..7ad568d0ea 100644
--- a/protocols/IcqOscarJ/src/icq_xstatus.cpp
+++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp
@@ -613,7 +613,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 			ShowDlgItem(hwndDlg, IDC_RETRXSTATUS, SW_HIDE);

 			ShowDlgItem(hwndDlg, IDC_XMSG, SW_SHOW);

 			ShowDlgItem(hwndDlg, IDC_XTITLE, SW_SHOW);

-			SetDlgItemTextUtf(hwndDlg,IDOK,ICQTranslateUtfStatic(LPGEN("Close"), str, MAX_PATH));

+			SetDlgItemText(hwndDlg,IDOK,TranslateT("Close"));

 			UnhookEvent(dat->hEvent); dat->hEvent = NULL;

 			char *szText = dat->ppro->getSettingStringUtf(dat->hContact, DBSETTING_XSTATUS_NAME, "");

 			SetDlgItemTextUtf(hwndDlg, IDC_XTITLE, szText);

@@ -665,7 +665,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 				SendMessage(GetDlgItem(hwndDlg, IDC_XMSG), EM_SETREADONLY, 1, 0);

 

 				if (dat->ppro->CheckContactCapabilities(dat->hContact, CAPF_XSTATUS) && !dat->ppro->getByte("XStatusAuto", DEFAULT_XSTATUS_AUTO)) {

-					SetDlgItemTextUtf(hwndDlg,IDOK,ICQTranslateUtfStatic(LPGEN("Cancel"), str, MAX_PATH));

+					SetDlgItemText(hwndDlg,IDOK,TranslateT("Cancel"));

 					dat->hEvent = HookEventMessage(ME_PROTO_ACK, hwndDlg, HM_PROTOACK);

 					ShowDlgItem(hwndDlg, IDC_RETRXSTATUS, SW_SHOW);

 					ShowDlgItem(hwndDlg, IDC_XMSG, SW_HIDE);

@@ -673,7 +673,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 					dat->iEvent = dat->ppro->requestXStatusDetails(dat->hContact, FALSE);

 				}

 				else {

-					SetDlgItemTextUtf(hwndDlg,IDOK,ICQTranslateUtfStatic(LPGEN("Close"), str, MAX_PATH));

+					SetDlgItemText(hwndDlg,IDOK,TranslateT("Close"));

 					dat->hEvent = NULL;

 					char *szText = dat->ppro->getSettingStringUtf(dat->hContact, DBSETTING_XSTATUS_NAME, "");

 					SetDlgItemTextUtf(hwndDlg, IDC_XTITLE, szText);

@@ -730,7 +730,7 @@ static INT_PTR CALLBACK SetXStatusDlgProc(HWND hwndDlg,UINT message,WPARAM wPara
 		case IDC_XMSG:

 			if (!dat->bAction) { // set our xStatus

 				KillTimer(hwndDlg,1);

-				SetDlgItemTextUtf(hwndDlg,IDOK,ICQTranslateUtfStatic(LPGEN("OK"), str, MAX_PATH));

+				SetDlgItemText(hwndDlg,IDOK,TranslateT("OK"));

 			}

 		}

 		break;

diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
index 951195c25c..9c71183f02 100644
--- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp
+++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp
@@ -497,7 +497,7 @@ INT_PTR CIcqProto::RevokeAuthorization(WPARAM wParam, LPARAM lParam)
 		if (getContactUid((HANDLE)wParam, &dwUin, &szUid))

 			return 0; // Invalid contact

 

-		if (MessageBoxUtf(NULL, LPGEN("Are you sure you want to revoke user's authorization?\nThis will remove you from his/her list on some clients."), LPGEN("Confirmation"), MB_ICONQUESTION | MB_YESNO) != IDYES)

+		if (MessageBox(NULL, TranslateT("Are you sure you want to revoke user's authorization?\nThis will remove you from his/her list on some clients."), TranslateT("Confirmation"), MB_ICONQUESTION | MB_YESNO) != IDYES)

 			return 0;

 

 		icq_sendRevokeAuthServ(dwUin, szUid);

diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
index 67cea9db88..c2ee0077cd 100644
--- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
@@ -840,15 +840,13 @@ static char *oftGetFileContainer(oscar_filetransfer* oft, const char** files, in
 

 HANDLE CIcqProto::oftInitTransfer(HANDLE hContact, DWORD dwUin, char* szUid, const TCHAR** files, const TCHAR* pszDesc)

 {

-	oscar_filetransfer *ft;

 	int i, filesCount;

 	struct _stati64 statbuf;

-	char ** filesUtf;

 

 	// Initialize filetransfer struct

 	debugLogA("Init file send");

 

-	ft = CreateOscarTransfer();

+	oscar_filetransfer *ft = CreateOscarTransfer();

 	ft->hContact = hContact;

 	ft->pMessage.bMessageType = MTYPE_FILEREQ;

 	InitMessageCookie(&ft->pMessage);

@@ -858,7 +856,7 @@ HANDLE CIcqProto::oftInitTransfer(HANDLE hContact, DWORD dwUin, char* szUid, con
 	ft->files_list = (char**)SAFE_MALLOC(sizeof(TCHAR *) * filesCount);

 	ft->qwTotalSize = 0;

 

-	filesUtf = (char**)SAFE_MALLOC(sizeof(char *) * filesCount);

+	char **filesUtf = (char**)SAFE_MALLOC(sizeof(char *) * filesCount);

 	for(i = 0; i < filesCount; i++) filesUtf[i] = FileNameToUtf(files[i]);

 

 	// Prepare files arrays