From 7de38a08b97e0554e318b8c25806cef5d47259e6 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Thu, 12 Jun 2014 17:49:53 +0000 Subject: headers of not adopted plugins moved to !Deprecated git-svn-id: http://svn.miranda-ng.org/main/trunk@9438 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MyDetails/src/commons.h | 1 - plugins/MyDetails/src/data.cpp | 17 ---------------- plugins/MyDetails/src/data.h | 2 -- plugins/MyDetails/src/frame.cpp | 40 ------------------------------------- plugins/MyDetails/src/mydetails.cpp | 12 +---------- 5 files changed, 1 insertion(+), 71 deletions(-) (limited to 'plugins/MyDetails') diff --git a/plugins/MyDetails/src/commons.h b/plugins/MyDetails/src/commons.h index 408feb8ba8..ee2e8c56eb 100644 --- a/plugins/MyDetails/src/commons.h +++ b/plugins/MyDetails/src/commons.h @@ -46,7 +46,6 @@ Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp index c6afc471e8..8244c6e7b2 100644 --- a/plugins/MyDetails/src/data.cpp +++ b/plugins/MyDetails/src/data.cpp @@ -219,10 +219,6 @@ void Protocol::GetStatusMsg(int aStatus, TCHAR *msg, size_t msg_size) ptrT tmp((TCHAR *)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR)); lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size); } - else if (ServiceExists(MS_AWAYMSG_GETSTATUSMSGT)) { - ptrT tmp((TCHAR*)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, 0)); - lcopystr(msg, tmp == NULL ? _T("") : tmp, msg_size); - } } TCHAR* Protocol::GetStatusMsg() @@ -443,13 +439,6 @@ Protocol *ProtocolArray::Get(const char *name) return NULL; } - -bool ProtocolArray::CanSetStatusMsgPerProtocol() -{ - return ServiceExists(MS_SA_CHANGESTATUSMSG) != 0; -} - - void ProtocolArray::GetAvatars() { for (int i = 0; i < buffer_len; i++) @@ -558,12 +547,6 @@ TCHAR *ProtocolArray::GetDefaultStatusMsg(int status) if (status == ID_STATUS_CONNECTING) status = ID_STATUS_OFFLINE; - TCHAR *tmp = (TCHAR *)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)status, 0); - if (tmp != NULL) { - lstrcpyn(default_status_message, tmp, SIZEOF(default_status_message)); - mir_free(tmp); - } - return default_status_message; } diff --git a/plugins/MyDetails/src/data.h b/plugins/MyDetails/src/data.h index 53bc6ade9d..803c6ecc23 100644 --- a/plugins/MyDetails/src/data.h +++ b/plugins/MyDetails/src/data.h @@ -134,8 +134,6 @@ public: void GetStatuses(); int GetGlobalStatus(); - bool CanSetStatusMsgPerProtocol(); - void GetDefaultNick(); // Copy to cache void GetDefaultAvatar(); // Copy to cache TCHAR *GetDefaultStatusMsg(); // Copy to cache diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 2469e22728..3e1309edd8 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -1806,26 +1806,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar HMENU submenu = GetSubMenu(menu, 3); TranslateMenu(submenu); - if (protocols->CanSetStatusMsgPerProtocol()) { - // Add this proto to menu - mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my status message for %s..."), proto->description); - - MENUITEMINFO mii = {0}; - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_TYPE; - mii.fType = MFT_STRING; - mii.dwTypeData = tmp; - mii.cch = (int)_tcslen(tmp); - mii.wID = 1; - - if (!proto->CanSetStatusMsg()) { - mii.fMask |= MIIM_STATE; - mii.fState = MFS_DISABLED; - } - - InsertMenuItem(submenu, 0, TRUE, &mii); - } - // Add this to menu mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my status message for %s..."), CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, proto->status, GSMDF_TCHAR)); @@ -1927,26 +1907,6 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); - if (protocols->CanSetStatusMsgPerProtocol()) { - // Add this proto to menu - mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my status message for %s..."), proto->description); - - ZeroMemory(&mii, sizeof(mii)); - mii.cbSize = sizeof(mii); - mii.fMask = MIIM_ID | MIIM_TYPE; - mii.fType = MFT_STRING; - mii.dwTypeData = tmp; - mii.cch = (int)_tcslen(tmp); - mii.wID = 3; - - if ( !proto->CanSetStatusMsg()) { - mii.fMask |= MIIM_STATE; - mii.fState = MFS_DISABLED; - } - - InsertMenuItem(submenu, 0, TRUE, &mii); - } - mir_sntprintf(tmp, SIZEOF(tmp), TranslateT("Set my nickname for %s..."), proto->description); ZeroMemory(&mii, sizeof(mii)); diff --git a/plugins/MyDetails/src/mydetails.cpp b/plugins/MyDetails/src/mydetails.cpp index 7b8d6bf2f3..5316f302eb 100644 --- a/plugins/MyDetails/src/mydetails.cpp +++ b/plugins/MyDetails/src/mydetails.cpp @@ -488,19 +488,9 @@ static INT_PTR PluginCommand_SetMyStatusMessageUI(WPARAM wParam, LPARAM lParam) if (proto_num == -1) return -1; - if (protocols->CanSetStatusMsgPerProtocol() && !proto->CanSetStatusMsg()) + if (!proto->CanSetStatusMsg()) return -2; } - else if (ServiceExists(MS_SA_CHANGESTATUSMSG)) { - if (proto == NULL && status == 0) - CallService(MS_SA_CHANGESTATUSMSG, protocols->GetGlobalStatus(), NULL); - else if (status == 0) - CallService(MS_SA_CHANGESTATUSMSG, proto->status, (LPARAM)proto_name); - else - CallService(MS_SA_CHANGESTATUSMSG, status, (LPARAM)proto_name); - - return 0; - } if (proto == NULL || proto->status != ID_STATUS_OFFLINE) { if (!status_msg_dialog_open) { -- cgit v1.2.3