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/SimpleStatusMsg/src/awaymsg.cpp | 4 -- plugins/SimpleStatusMsg/src/commonheaders.h | 1 - plugins/SimpleStatusMsg/src/main.cpp | 83 --------------------------- plugins/SimpleStatusMsg/src/simplestatusmsg.h | 3 + 4 files changed, 3 insertions(+), 88 deletions(-) (limited to 'plugins/SimpleStatusMsg') diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 81442e02e1..17b43b5381 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -446,9 +446,5 @@ int LoadAwayMsgModule(void) HookEvent(ME_CLIST_PREBUILDCONTACTMENU, AwayMsgPreBuildMenu); - // Deprecated SimpleAway services - CreateServiceFunction(MS_SA_COPYAWAYMSG, CopyAwayMsgCommand); - CreateServiceFunction(MS_SA_GOTOURLMSG, GoToURLMsgCommand); - return 0; } diff --git a/plugins/SimpleStatusMsg/src/commonheaders.h b/plugins/SimpleStatusMsg/src/commonheaders.h index 30b7b51e82..b709b87837 100644 --- a/plugins/SimpleStatusMsg/src/commonheaders.h +++ b/plugins/SimpleStatusMsg/src/commonheaders.h @@ -42,7 +42,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -#include #include #include "simplestatusmsg.h" diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index 530c769fa2..4e9ff62d91 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1184,66 +1184,6 @@ static INT_PTR ChangeStatusMsg(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR SetOfflineStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_OFFLINE, 0); - return 0; -} - -static INT_PTR SetOnlineStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_ONLINE, 0); - return 0; -} - -static INT_PTR SetAwayStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_AWAY, 0); - return 0; -} - -static INT_PTR SetDNDStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_DND, 0); - return 0; -} - -static INT_PTR SetNAStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_NA, 0); - return 0; -} - -static INT_PTR SetOccupiedStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_OCCUPIED, 0); - return 0; -} - -static INT_PTR SetFreeChatStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_FREECHAT, 0); - return 0; -} - -static INT_PTR SetInvisibleStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_INVISIBLE, 0); - return 0; -} - -static INT_PTR SetOnThePhoneStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_ONTHEPHONE, 0); - return 0; -} - -static INT_PTR SetOutToLunchStatus(WPARAM wParam, LPARAM lParam) -{ - ChangeStatusMessage((WPARAM)ID_STATUS_OUTTOLUNCH, 0); - return 0; -} - static int ProcessProtoAck(WPARAM wParam,LPARAM lParam) { ACKDATA *ack = (ACKDATA *)lParam; @@ -1965,11 +1905,6 @@ static int OnPreShutdown(WPARAM wParam, LPARAM lParam) return 0; } -static INT_PTR IsSARunning(WPARAM wParam, LPARAM lParam) -{ - return 1; -} - //remember to mir_free() the return value static INT_PTR sttGetAwayMessageT(WPARAM wParam, LPARAM lParam) { @@ -1995,24 +1930,6 @@ extern "C" int __declspec(dllexport) Load(void) CreateServiceFunction(MS_SIMPLESTATUSMSG_CHANGESTATUSMSG, ChangeStatusMsg); CreateServiceFunction(MS_SIMPLESTATUSMSG_SHOWDIALOGINT, ShowStatusMessageDialogInternal); // internal use ONLY - // Deprecated SimpleAway services - CreateServiceFunction(MS_SA_ISSARUNNING, IsSARunning); - CreateServiceFunction(MS_SA_CHANGESTATUSMSG, ChangeStatusMsg); - CreateServiceFunction(MS_SA_TTCHANGESTATUSMSG, ShowStatusMessageDialogInternal); - CreateServiceFunction(MS_SA_SHOWSTATUSMSGDIALOG, ShowStatusMessageDialog); - CreateServiceFunction(MS_SA_SETSTATUSMODE, SetStatusModeFromExtern); - - CreateServiceFunction(MS_SA_SETOFFLINESTATUS, SetOfflineStatus); - CreateServiceFunction(MS_SA_SETONLINESTATUS, SetOnlineStatus); - CreateServiceFunction(MS_SA_SETAWAYSTATUS, SetAwayStatus); - CreateServiceFunction(MS_SA_SETDNDSTATUS, SetDNDStatus); - CreateServiceFunction(MS_SA_SETNASTATUS, SetNAStatus); - CreateServiceFunction(MS_SA_SETOCCUPIEDSTATUS, SetOccupiedStatus); - CreateServiceFunction(MS_SA_SETFREECHATSTATUS, SetFreeChatStatus); - CreateServiceFunction(MS_SA_SETINVISIBLESTATUS, SetInvisibleStatus); - CreateServiceFunction(MS_SA_SETONTHEPHONESTATUS, SetOnThePhoneStatus); - CreateServiceFunction(MS_SA_SETOUTTOLUNCHSTATUS, SetOutToLunchStatus); - HookEvent(ME_SYSTEM_OKTOEXIT, OnOkToExit); HookEvent(ME_SYSTEM_PRESHUTDOWN, OnPreShutdown); diff --git a/plugins/SimpleStatusMsg/src/simplestatusmsg.h b/plugins/SimpleStatusMsg/src/simplestatusmsg.h index f78f04dcbc..c1ca255b19 100644 --- a/plugins/SimpleStatusMsg/src/simplestatusmsg.h +++ b/plugins/SimpleStatusMsg/src/simplestatusmsg.h @@ -34,6 +34,9 @@ PROTOACCOUNTS; extern PROTOACCOUNTS *accounts; +// Represents status that a protocol(s) is/are currently in +#define ID_STATUS_CURRENT 40082 + #define DLG_SHOW_STATUS 1 #define DLG_SHOW_STATUS_ICONS 2 #define DLG_SHOW_LIST_ICONS 4 -- cgit v1.2.3