- MRA_CHAT removed due to its discontinuation at www.mail.ru

- fixes for MRA urls

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

6 files changed, 4 insertions, 15 deletions

diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h
index bcd8a3817d..2a6a6c8c63 100644
--- a/protocols/MRA/src/Mra.h
+++ b/protocols/MRA/src/Mra.h
@@ -33,7 +33,6 @@
 

 #define MIRANDA_VER 0x0A00

 

-// http://miranda.svn.sourceforge.net/viewvc/miranda/trunk/miranda/include/?sortby = file

 #include <newpluginapi.h>

 #include <m_system.h>

 #include <m_system_cpp.h>

diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index b0fbb07f26..81719e3061 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -65,8 +65,6 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_MY_WORLD_STR                     L"My World"

 #define MRA_ZHUKI                            "/Zhuki"

 #define MRA_ZHUKI_STR                        L"Zhuki"

-#define MRA_CHAT                             "/Chat"

-#define MRA_CHAT_STR                         L"Chat"

 #define MRA_WEB_SEARCH                       "/WebSearch"

 #define MRA_WEB_SEARCH_STR                   L"Web search"

 #define MRA_UPD_ALL_USERS_INFO               "/UpdateAllUsersInfo"

@@ -76,11 +74,11 @@ static const LPSTR lpcszMailRuDomains[] =
 #define MRA_REQ_AUTH_FOR_ALL                 "/ReqAuthForAll"

 #define MRA_REQ_AUTH_FOR_ALL_STR             L"Request authorization for all"

 

-#define MRA_MPOP_AUTH_URL                    "http://swa.mail.ru/cgi-bin/auth?Login = %s&agent = %s&page = %s"

+#define MRA_MPOP_AUTH_URL                    "http://swa.mail.ru/cgi-bin/auth?Login=%s&agent=%s&page=%s"

 

 #define MRA_WIN_INBOX_URL                    "http://win.mail.ru/cgi-bin/start"

 #define MRA_PDA_INBOX_URL                    "http://pda.mail.ru/cgi-bin/start"

-#define MRA_EDIT_PROFILE_URL                 "http://win.mail.ru/cgi-bin/userinfo?mra = 1"

+#define MRA_EDIT_PROFILE_URL                 "http://win.mail.ru/cgi-bin/userinfo?mra=1"

 #define MRA_CHAT_URL                         "http://chat.mail.ru"

 #define MRA_ZHUKI_URL                        "http://zhuki.mail.ru"

 #define MRA_SEARCH_URL                       "http://go.mail.ru"

diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index a7bf1d446b..3475dfe611 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -15,7 +15,6 @@ GUI_DISPLAY_ITEM gdiMenuItems[] =
 	{ MRA_MY_ANSWERS,         MRA_MY_ANSWERS_STR,         IDI_MRA_ANSWERS,    &CMraProto::MraAnswers },

 	{ MRA_MY_WORLD,           MRA_MY_WORLD_STR,           IDI_MRA_WORLD,      &CMraProto::MraWorld },

 	{ MRA_ZHUKI,              MRA_ZHUKI_STR,              IDI_MRA_ZHUKI,      &CMraProto::MraZhuki },

-	{ MRA_CHAT,               MRA_CHAT_STR,               IDI_MRA_CHAT,       &CMraProto::MraChat },

 	{ MRA_WEB_SEARCH,         MRA_WEB_SEARCH_STR,         IDI_MRA_WEB_SEARCH, &CMraProto::MraWebSearch },

 	{ MRA_UPD_ALL_USERS_INFO, MRA_UPD_ALL_USERS_INFO_STR, IDI_PROFILE,        &CMraProto::MraUpdateAllUsersInfo },

 	{ MRA_CHK_USERS_AVATARS,  MRA_CHK_USERS_AVATARS_STR,  IDI_PROFILE,        &CMraProto::MraCheckUpdatesUsersAvt },

diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 4555f28463..641938162a 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -165,7 +165,6 @@ struct CMraProto : public PROTO_INTERFACE, public MZeroedObject
 	INT_PTR __cdecl MraShowInboxStatus(WPARAM, LPARAM);

 	INT_PTR __cdecl MraEditProfile(WPARAM, LPARAM);

 	INT_PTR __cdecl MraZhuki(WPARAM, LPARAM);

-	INT_PTR __cdecl MraChat(WPARAM, LPARAM);

 	INT_PTR __cdecl MraWebSearch(WPARAM, LPARAM);

 	INT_PTR __cdecl MraUpdateAllUsersInfo(WPARAM, LPARAM);

 	INT_PTR __cdecl MraCheckUpdatesUsersAvt(WPARAM, LPARAM);

diff --git a/protocols/MRA/src/MraSelectEMail.cpp b/protocols/MRA/src/MraSelectEMail.cpp
index 29c5c4fd7d..6a0cf2a34d 100644
--- a/protocols/MRA/src/MraSelectEMail.cpp
+++ b/protocols/MRA/src/MraSelectEMail.cpp
@@ -109,7 +109,7 @@ INT_PTR CALLBACK MraSelectEMailDlgProc(HWND hWndDlg, UINT message, WPARAM wParam
 					{

 						size_t dwUrlSize;

 						CHAR szUrl[BUFF_SIZE_URL];

-						dwUrlSize = mir_snprintf(szUrl, SIZEOF(szUrl), "http://cards.mail.ru/event.html?rcptname = %s&rcptemail = %s", GetContactNameA(dat->hContact), szEMail);

+						dwUrlSize = mir_snprintf(szUrl, SIZEOF(szUrl), "http://cards.mail.ru/event.html?rcptname=%s&rcptemail=%s", GetContactNameA(dat->hContact), szEMail);

 						dat->ppro->MraMPopSessionQueueAddUrl(dat->ppro->hMPopSessionQueue, szUrl, dwUrlSize);

 					}

 					break;

diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp
index d221ec848b..86d74c509c 100644
--- a/protocols/MRA/src/Mra_svcs.cpp
+++ b/protocols/MRA/src/Mra_svcs.cpp
@@ -211,12 +211,6 @@ INT_PTR CMraProto::MraZhuki(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR CMraProto::MraChat(WPARAM wParam, LPARAM lParam)

-{

-	MraMPopSessionQueueAddUrl(hMPopSessionQueue, MRA_CHAT_URL, sizeof(MRA_CHAT_URL));

-	return 0;

-}

-

 INT_PTR CMraProto::MraWebSearch(WPARAM wParam, LPARAM lParam)

 {

 	CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)MRA_SEARCH_URL);

@@ -329,7 +323,7 @@ INT_PTR CMraProto::MraSendPostcard(WPARAM wParam, LPARAM lParam)
 

 			if ( GetContactFirstEMail((HANDLE)wParam, FALSE, szEMail, SIZEOF(szEMail), &dwEMailSize)) {

 				BuffToLowerCase(szEMail, szEMail, dwEMailSize);

-				dwUrlSize = mir_snprintf(szUrl, SIZEOF(szUrl), "http://cards.mail.ru/event.html?rcptname = %s&rcptemail = %s", GetContactNameA((HANDLE)wParam), szEMail);

+				dwUrlSize = mir_snprintf(szUrl, SIZEOF(szUrl), "http://cards.mail.ru/event.html?rcptname=%s&rcptemail=%s", GetContactNameA((HANDLE)wParam), szEMail);

 				MraMPopSessionQueueAddUrl(hMPopSessionQueue, szUrl, dwUrlSize);

 			}

 		}