removed unneeded UTF conversions

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

3 files changed, 11 insertions, 15 deletions

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;

 	}