summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-01-28 20:47:26 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-01-28 20:47:26 +0000
commit42a5e3cab53a1e83c21d00f5ac71b51802bc4db1 (patch)
tree3f3cfdfa9c95f6f0d865390f7b1044876346b4be /protocols
parent095608f5e98292aa7fe82a075e7e867fc4dcd467 (diff)
MRA: Zhuki removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@7936 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols')
-rw-r--r--protocols/MRA/res/Bagz.icobin1150 -> 0 bytes
-rw-r--r--protocols/MRA/res/resource.rc1
-rw-r--r--protocols/MRA/src/MraConstans.h3
-rw-r--r--protocols/MRA/src/MraIcons.cpp1
-rw-r--r--protocols/MRA/src/MraProto.h1
-rw-r--r--protocols/MRA/src/Mra_menus.cpp7
-rw-r--r--protocols/MRA/src/resource.h1
-rw-r--r--protocols/MRA/src/version.h2
8 files changed, 1 insertions, 15 deletions
diff --git a/protocols/MRA/res/Bagz.ico b/protocols/MRA/res/Bagz.ico
deleted file mode 100644
index b3030573cf..0000000000
--- a/protocols/MRA/res/Bagz.ico
+++ /dev/null
Binary files differ
diff --git a/protocols/MRA/res/resource.rc b/protocols/MRA/res/resource.rc
index 20f5919442..0cf5df058e 100644
--- a/protocols/MRA/res/resource.rc
+++ b/protocols/MRA/res/resource.rc
@@ -38,7 +38,6 @@ IDI_MAIL_NOTIFY ICON "MailNotify.ico"
IDI_MRA_WEB_SEARCH ICON "WebSearch.ico"
IDI_MRA_BLOGS ICON "Blogs.ico"
IDI_MRA_POSTCARD ICON "PostCards.ico"
-IDI_MRA_ZHUKI ICON "Bagz.ico"
IDI_MRA_PHOTO ICON "Photo.ico"
IDI_MRA_CHAT ICON "Chat.ico"
IDI_MRA_PHONE ICON "Phone.ico"
diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h
index 26133e59d7..7bd8ece264 100644
--- a/protocols/MRA/src/MraConstans.h
+++ b/protocols/MRA/src/MraConstans.h
@@ -55,8 +55,6 @@ static const LPSTR lpcszMailRuDomains[] =
#define MRA_MY_VIDEO_STR LPGEN("My Video")
#define MRA_MY_ANSWERS_STR LPGEN("My Answers")
#define MRA_MY_WORLD_STR LPGEN("My World")
-#define MRA_ZHUKI "/Zhuki"
-#define MRA_ZHUKI_STR LPGEN("Zhuki")
#define MRA_WEB_SEARCH "/WebSearch"
#define MRA_WEB_SEARCH_STR LPGEN("Web search")
#define MRA_UPD_ALL_USERS_INFO "/UpdateAllUsersInfo"
@@ -72,7 +70,6 @@ static const LPSTR lpcszMailRuDomains[] =
#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_CHAT_URL "http://chat.mail.ru"
-#define MRA_ZHUKI_URL "http://zhuki.mail.ru"
#define MRA_SEARCH_URL _T("http://go.mail.ru")
// used spesialy! added: /domain/user
diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index 3df65987a3..693ebadd3d 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -14,7 +14,6 @@ IconItem gdiMenuItems[MAIN_MENU_ITEMS_COUNT] =
{ MRA_MY_VIDEO_STR, MRA_VIEW_VIDEO, IDI_MRA_VIDEO },
{ MRA_MY_ANSWERS_STR, MRA_ANSWERS, IDI_MRA_ANSWERS },
{ MRA_MY_WORLD_STR, MRA_WORLD, IDI_MRA_WORLD },
- { MRA_ZHUKI_STR, MRA_ZHUKI, IDI_MRA_ZHUKI },
{ MRA_WEB_SEARCH_STR, MRA_WEB_SEARCH, IDI_MRA_WEB_SEARCH },
{ MRA_UPD_ALL_USERS_INFO_STR, MRA_UPD_ALL_USERS_INFO, IDI_PROFILE },
{ MRA_CHK_USERS_AVATARS_STR, MRA_CHK_USERS_AVATARS, IDI_PROFILE },
diff --git a/protocols/MRA/src/MraProto.h b/protocols/MRA/src/MraProto.h
index 4e364ccc2f..92e5b5c036 100644
--- a/protocols/MRA/src/MraProto.h
+++ b/protocols/MRA/src/MraProto.h
@@ -133,7 +133,6 @@ struct CMraProto : public PROTO<CMraProto>
INT_PTR __cdecl MraGotoInbox(WPARAM, LPARAM);
INT_PTR __cdecl MraShowInboxStatus(WPARAM, LPARAM);
INT_PTR __cdecl MraEditProfile(WPARAM, LPARAM);
- INT_PTR __cdecl MraZhuki(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/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp
index 5fd0056bed..4466ec8ac1 100644
--- a/protocols/MRA/src/Mra_menus.cpp
+++ b/protocols/MRA/src/Mra_menus.cpp
@@ -34,12 +34,6 @@ INT_PTR CMraProto::MraEditProfile(WPARAM wParam, LPARAM lParam)
return 0;
}
-INT_PTR CMraProto::MraZhuki(WPARAM wParam, LPARAM lParam)
-{
- MraMPopSessionQueueAddUrl(hMPopSessionQueue, MRA_ZHUKI_URL);
- return 0;
-}
-
INT_PTR CMraProto::MraWebSearch(WPARAM wParam, LPARAM lParam)
{
CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)MRA_SEARCH_URL);
@@ -404,7 +398,6 @@ void CMraProto::InitMenus()
CreateProtoService(MRA_VIEW_VIDEO, &CMraProto::MraViewVideo);
CreateProtoService(MRA_ANSWERS, &CMraProto::MraAnswers);
CreateProtoService(MRA_WORLD, &CMraProto::MraWorld);
- CreateProtoService(MRA_ZHUKI, &CMraProto::MraZhuki);
CreateProtoService(MRA_WEB_SEARCH, &CMraProto::MraWebSearch);
CreateProtoService(MRA_UPD_ALL_USERS_INFO, &CMraProto::MraUpdateAllUsersInfo);
CreateProtoService(MRA_CHK_USERS_AVATARS, &CMraProto::MraCheckUpdatesUsersAvt);
diff --git a/protocols/MRA/src/resource.h b/protocols/MRA/src/resource.h
index a7a0affabb..ce5e636e0d 100644
--- a/protocols/MRA/src/resource.h
+++ b/protocols/MRA/src/resource.h
@@ -17,7 +17,6 @@
#define IDI_MRA_WEB_SEARCH 112
#define IDI_MRA_BLOGS 113
#define IDI_MRA_POSTCARD 114
-#define IDI_MRA_ZHUKI 115
#define IDI_MRA_PHOTO 117
#define IDI_DELETED 118
#define IDI_MRA_CHAT 120
diff --git a/protocols/MRA/src/version.h b/protocols/MRA/src/version.h
index 6bc7877a19..f0bf119c1c 100644
--- a/protocols/MRA/src/version.h
+++ b/protocols/MRA/src/version.h
@@ -1,7 +1,7 @@
#define __MAJOR_VERSION 2
#define __MINOR_VERSION 1
#define __RELEASE_NUM 0
-#define __BUILD_NUM 7
+#define __BUILD_NUM 8
#include <stdver.h>