- direct call of MS_SKIN_ADDNEWSOUND replaced with Skin_AddSound() call;

- obsolete structure SKINSOUNDDESC removed 
- dynamically translated hot keys;
- checked correct LPGEN'ing of the sounds creation;
- code cleaning

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

7 files changed, 10 insertions, 10 deletions

diff --git a/protocols/MRA/MraAntiSpam.cpp b/protocols/MRA/MraAntiSpam.cpp
index 20be25d33a..002aa3cd08 100644
--- a/protocols/MRA/MraAntiSpam.cpp
+++ b/protocols/MRA/MraAntiSpam.cpp
@@ -195,7 +195,7 @@ INT_PTR CALLBACK MraAntiSpamDlgProcOpts(HWND hWndDlg,UINT msg,WPARAM wParam,LPAR
 			MraAntiSpamLoadBadWordsW();

 		}

 

-		if ((LOWORD(wParam)==IDC_EDIT_BAD_WORD) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus()) ) return(0);

+		if ((LOWORD(wParam)==IDC_EDIT_BAD_WORD) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return(0);

 		SendMessage(GetParent(hWndDlg),PSM_CHANGED,0,0);

 		break;

 	case WM_NOTIFY:

@@ -444,7 +444,7 @@ DWORD MraAntiSpamReceivedMessageW(LPSTR lpszEMail,SIZE_T dwEMailSize,DWORD dwMes
 				dwRet=MESSAGE_NOT_SPAM;

 			}else{// temp contact

 				if (DB_Mra_GetByte(NULL,"AntiSpamCheckTempContacts",MRA_ANTISPAM_DEFAULT_CHK_TEMP_CONTACTS)==FALSE ||

-					(((dwMessageFlags&MESSAGE_FLAG_AUTHORIZE) && DB_Mra_GetByte(NULL,"AutoAuthGrandNewUsers",MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS) && DB_Mra_GetByte(NULL,"AutoAuthGrandNewUsersDisableSPAMCheck",MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK))) )

+					(((dwMessageFlags&MESSAGE_FLAG_AUTHORIZE) && DB_Mra_GetByte(NULL,"AutoAuthGrandNewUsers",MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS) && DB_Mra_GetByte(NULL,"AutoAuthGrandNewUsersDisableSPAMCheck",MRA_DEFAULT_AUTO_AUTH_GRAND_NEW_USERS_DISABLE_SPAM_CHECK))))

 				{// проверка временного контакта

 					bCheckMessage=FALSE;

 					dwRet=MESSAGE_NOT_SPAM;

diff --git a/protocols/MRA/MraAvatars.cpp b/protocols/MRA/MraAvatars.cpp
index ad147b09a6..786e930392 100644
--- a/protocols/MRA/MraAvatars.cpp
+++ b/protocols/MRA/MraAvatars.cpp
@@ -806,7 +806,7 @@ INT_PTR CALLBACK MraAvatarsQueueDlgProcOpts(HWND hWndDlg,UINT msg,WPARAM wParam,
 			SetDlgItemInt(hWndDlg,IDC_SERVERPORT,MRA_AVT_DEFAULT_SERVER_PORT,FALSE);

 		}

 

-		if ((LOWORD(wParam)==IDC_SERVER || LOWORD(wParam)==IDC_SERVERPORT || LOWORD(wParam)==IDC_UPD_CHECK_INTERVAL) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus()) ) return(FALSE);

+		if ((LOWORD(wParam)==IDC_SERVER || LOWORD(wParam)==IDC_SERVERPORT || LOWORD(wParam)==IDC_UPD_CHECK_INTERVAL) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return(FALSE);

 		SendMessage(GetParent(hWndDlg),PSM_CHANGED,0,0);

 		break;

 	case WM_NOTIFY:

diff --git a/protocols/MRA/MraFilesQueue.cpp b/protocols/MRA/MraFilesQueue.cpp
index 09e052c822..75b25a4f78 100644
--- a/protocols/MRA/MraFilesQueue.cpp
+++ b/protocols/MRA/MraFilesQueue.cpp
@@ -135,7 +135,7 @@ INT_PTR CALLBACK MraFilesQueueDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam,
 			EnableWindow(GetDlgItem(hWndDlg,IDC_FILE_SEND_EXTRA_ADDRESS),IS_DLG_BUTTON_CHECKED(hWndDlg,IDC_FILE_SEND_ADD_EXTRA_ADDRESS));

 		}

 

-		if ((LOWORD(wParam)==IDC_FILE_SEND_EXTRA_ADDRESS || LOWORD(wParam)==IDC_FILE_SEND_BLOCK_SIZE) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus()) ) return(FALSE);

+		if ((LOWORD(wParam)==IDC_FILE_SEND_EXTRA_ADDRESS || LOWORD(wParam)==IDC_FILE_SEND_BLOCK_SIZE) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return(FALSE);

 		SendMessage(GetParent(hWndDlg),PSM_CHANGED,0,0);

 		break;

 	case WM_NOTIFY:

diff --git a/protocols/MRA/MraPopUp.cpp b/protocols/MRA/MraPopUp.cpp
index ec3893aea5..79a8664e01 100644
--- a/protocols/MRA/MraPopUp.cpp
+++ b/protocols/MRA/MraPopUp.cpp
@@ -112,7 +112,7 @@ INT_PTR CALLBACK MraPopupDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, LPAR
 				EnableWindow(GetDlgItem(hWndDlg, IDC_POPUP_TIMEOUT), bEnabled);

 			}

 		default:

-			if ((LOWORD(wParam) == IDC_POPUP_TIMEOUT) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()) )

+			if ((LOWORD(wParam) == IDC_POPUP_TIMEOUT) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus()))

 				return(FALSE);

 			SendMessage(GetParent(hWndDlg), PSM_CHANGED, 0, 0);

 		}

diff --git a/protocols/MRA/Mra_options.cpp b/protocols/MRA/Mra_options.cpp
index 97e1aa1b91..137b347f1c 100644
--- a/protocols/MRA/Mra_options.cpp
+++ b/protocols/MRA/Mra_options.cpp
@@ -79,7 +79,7 @@ INT_PTR CALLBACK DlgProcOptsAccount(HWND hWndDlg,UINT msg,WPARAM wParam,LPARAM l
 			CallService(MS_UTILS_OPENURL,TRUE,(LPARAM)MRA_FORGOT_PASSWORD_URL);

 			return(TRUE);

 		}

-		if ((LOWORD(wParam)==IDC_LOGIN || LOWORD(wParam)==IDC_PASSWORD) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus()) ) return 0;

+		if ((LOWORD(wParam)==IDC_LOGIN || LOWORD(wParam)==IDC_PASSWORD) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return 0;

 		SendMessage(GetParent(hWndDlg),PSM_CHANGED,0,0);

 		break;

 	case WM_NOTIFY:

@@ -200,7 +200,7 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg,UINT msg,WPARAM wParam,LPAR
 			break;

 		}

 

-		if ((LOWORD(wParam)==IDC_SERVER || LOWORD(wParam)==IDC_SERVERPORT) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus()) ) return(FALSE);

+		if ((LOWORD(wParam)==IDC_SERVER || LOWORD(wParam)==IDC_SERVERPORT) && (HIWORD(wParam)!=EN_CHANGE || (HWND)lParam!=GetFocus())) return(FALSE);

 		SendMessage(GetParent(hWndDlg),PSM_CHANGED,0,0);

 		break;

 	case WM_NOTIFY:

diff --git a/protocols/MRA/Mra_svcs.cpp b/protocols/MRA/Mra_svcs.cpp
index cb194fb575..896d33ae82 100644
--- a/protocols/MRA/Mra_svcs.cpp
+++ b/protocols/MRA/Mra_svcs.cpp
@@ -983,7 +983,7 @@ INT_PTR MraSetListeningTo(WPARAM wParam,LPARAM lParam)
 {

 	LISTENINGTOINFO *pliInfo=(LISTENINGTOINFO*)lParam;

 

-	if ( pliInfo == NULL || pliInfo->cbSize != sizeof(LISTENINGTOINFO) )

+	if ( pliInfo == NULL || pliInfo->cbSize != sizeof(LISTENINGTOINFO))

 	{

 		MraSendCommand_ChangeUserBlogStatus(MRIM_BLOG_STATUS_MUSIC,NULL,0,0);

 		DB_Mra_DeleteValue(NULL,DBSETTING_BLOGSTATUSMUSIC);

@@ -1744,7 +1744,7 @@ INT_PTR MraAddToListByEvent(WPARAM wParam,LPARAM lParam)
 				LPSTR lpszRequestReason;

 				MRA_LPS lpsEMail,lpsNick,lpsFirstName,lpsLastName;

 

-				lpsNick.lpszData=(LPSTR)(dbei.pBlob+ ((dbei.eventType==EVENTTYPE_AUTHREQUEST)?(sizeof(DWORD)*2):0) );

+				lpsNick.lpszData=(LPSTR)(dbei.pBlob+ ((dbei.eventType==EVENTTYPE_AUTHREQUEST)?(sizeof(DWORD)*2):0));

 				lpsNick.dwSize=lstrlenA(lpsNick.lpszData);

 				lpsFirstName.lpszData=lpsNick.lpszData+lpsNick.dwSize+1;

 				lpsFirstName.dwSize=lstrlenA(lpsFirstName.lpszData);

diff --git a/protocols/MRA/Readme_MRA.txt b/protocols/MRA/Readme_MRA.txt
index a0904565a9..d94ee81399 100644
--- a/protocols/MRA/Readme_MRA.txt
+++ b/protocols/MRA/Readme_MRA.txt
@@ -330,7 +330,7 @@ Version 1.8.0.27 // 2007.02.24
 Version 1.8.0.25 // 2007.02.20

  - Ипользуются новые сервисы миранды (минимум 0.6.0.100 версия)

  - Улучшена работа с сетью: добавлены таймауты операций

- - Добавлена поддержка игр (собеседник получает отказ автоматически :) )

+ - Добавлена поддержка игр (собеседник получает отказ автоматически :))

  - Добавлены уведомления, в том числе затрагивающие невидимость

  - Добавлена опция: Smart RTF - Умная отправка (только если клиент понимает RTF)

  - Добавлены коды и подробные описания ошибок