From eacd84efa1666b3afc4c98e632fa3bb4289a43c2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 22 Oct 2012 11:49:33 +0000 Subject: removed option to push MRA contact menu items to another contacts git-svn-id: http://svn.miranda-ng.org/main/trunk@2041 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/MRA/src/MraConstans.h | 16 ++++++++-------- protocols/MRA/src/Mra_options.cpp | 4 ---- protocols/MRA/src/Mra_svcs.cpp | 12 +----------- protocols/MRA/src/resource.h | 1 - 4 files changed, 9 insertions(+), 24 deletions(-) (limited to 'protocols/MRA/src') diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index 17b73e5642..fd8cd7d16e 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -242,14 +242,14 @@ static const LPSTR lpcszMailRuDomains[] = #define MS_ICQ_SENDSMS "/SendSMS" // Database setting names -#define DBSETTING_CAPABILITIES "caps" -#define DBSETTING_XSTATUSID "XStatusId" -#define DBSETTING_XSTATUSNAME "XStatusName" -#define DBSETTING_XSTATUSMSG "XStatusMsg" -#define DBSETTING_BLOGSTATUSTIME "BlogStatusTime" -#define DBSETTING_BLOGSTATUSID "BlogStatusID" -#define DBSETTING_BLOGSTATUS "BlogStatus" -#define DBSETTING_BLOGSTATUSMUSIC "ListeningTo" +#define DBSETTING_CAPABILITIES "caps" +#define DBSETTING_XSTATUSID "XStatusId" +#define DBSETTING_XSTATUSNAME "XStatusName" +#define DBSETTING_XSTATUSMSG "XStatusMsg" +#define DBSETTING_BLOGSTATUSTIME "BlogStatusTime" +#define DBSETTING_BLOGSTATUSID "BlogStatusID" +#define DBSETTING_BLOGSTATUS "BlogStatus" +#define DBSETTING_BLOGSTATUSMUSIC "ListeningTo" #define CSSF_MASK_STATUS 0x0001 // status member valid for set/get #define CSSF_MASK_NAME 0x0002 // pszName member valid for set/get diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index c692f3e244..30e4be9759 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -134,8 +134,6 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L CHECK_DLG_BUTTON(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX, ppro->mraGetByte(NULL, "TrayIconNewMailClkToInbox", MRA_DEFAULT_TRAYICON_NEW_MAIL_CLK_TO_INBOX)); EnableWindow(GetDlgItem(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX), ppro->mraGetByte(NULL, "TrayIconNewMailNotify", MRA_DEFAULT_TRAYICON_NEW_MAIL_NOTIFY)); - CHECK_DLG_BUTTON(hWndDlg, IDC_HIDE_MENU_ITEMS_FOR_NON_MRA, ppro->mraGetByte(NULL, "HideMenuItemsForNonMRAContacts", MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA)); - CHECK_DLG_BUTTON(hWndDlg, IDC_RTF_RECEIVE_ENABLE, ppro->mraGetByte(NULL, "RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)); CHECK_DLG_BUTTON(hWndDlg, IDC_RTF_SEND_ENABLE, ppro->mraGetByte(NULL, "RTFSendEnable", MRA_DEFAULT_RTF_SEND_ENABLE)); @@ -207,8 +205,6 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L ppro->mraSetByte(NULL, "TrayIconNewMailNotify", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY)); ppro->mraSetByte(NULL, "TrayIconNewMailClkToInbox", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_TRAYICON_NEW_MAIL_NOTIFY_CLICK_TO_INBOX)); - ppro->mraSetByte(NULL, "HideMenuItemsForNonMRAContacts", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_HIDE_MENU_ITEMS_FOR_NON_MRA)); - ppro->mraSetByte(NULL, "RTFReceiveEnable", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_RECEIVE_ENABLE)); ppro->mraSetByte(NULL, "RTFSendEnable", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_RTF_SEND_ENABLE)); ppro->mraSetDword(NULL, "RTFBackgroundColour", SEND_DLG_ITEM_MESSAGE(hWndDlg, IDC_RTF_BGCOLOUR, CPM_GETCOLOUR, 0, 0)); diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index 28c761a5c4..545f07ad2e 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -606,17 +606,7 @@ int CMraProto::MraRebuildContactMenu(WPARAM wParam, LPARAM lParam) mraGetStaticStringW(hContact, DBSETTING_BLOGSTATUS, NULL, 0, &dwBlogStatusMsgSize); } // non proto contact - else { - bHasEMail = FALSE; - bHasEMailMR = FALSE; - bChatAgent = FALSE; - if (mraGetByte(NULL, "HideMenuItemsForNonMRAContacts", MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA) == FALSE) - if (IsContactMraProto(hContact) == FALSE)// избегаем добавления менюшек в контакты других копий MRA - if (GetContactEMailCount(hContact, FALSE)) { - bHasEMail = TRUE; - if (GetContactEMailCount(hContact, TRUE)) bHasEMailMR = TRUE; - } - } + else bHasEMail = bHasEMailMR = bChatAgent = FALSE; //"Request authorization" CListShowMenuItem(hContactMenuItems[0], (m_bLoggedIn && bIsContactMRA));// && (dwContactSeverFlags&CONTACT_INTFLAG_NOT_AUTHORIZED) diff --git a/protocols/MRA/src/resource.h b/protocols/MRA/src/resource.h index aa5469d599..f6eae9e9ff 100644 --- a/protocols/MRA/src/resource.h +++ b/protocols/MRA/src/resource.h @@ -41,7 +41,6 @@ #define IDC_SLOWSEND 1003 #define IDC_RETURN_ABC_PATH 1004 #define IDC_FILE_SEND_HIDE_MY_ADDRESSES 1004 -#define IDC_HIDE_MENU_ITEMS_FOR_NON_MRA 1004 #define IDC_RTF_SEND_ENABLE 1005 #define IDC_RTF_BGCOLOUR 1006 #define IDC_CVT_SMILES_ON_SEND_TEXT 1007 -- cgit v1.2.3