From 3ab11e1d7ceea5ef5fa18091cf44349a8ecf2210 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 7 Apr 2013 21:06:41 +0000 Subject: minus fortune teller git-svn-id: http://svn.miranda-ng.org/main/trunk@4378 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ExternalAPI/delphi/m_fortunemsg.inc | 69 -------------------------- plugins/SimpleStatusMsg/src/commonheaders.h | 1 - plugins/SimpleStatusMsg/src/main.cpp | 77 ----------------------------- plugins/SimpleStatusMsg/src/msgbox.cpp | 5 +- 4 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 plugins/ExternalAPI/delphi/m_fortunemsg.inc diff --git a/plugins/ExternalAPI/delphi/m_fortunemsg.inc b/plugins/ExternalAPI/delphi/m_fortunemsg.inc deleted file mode 100644 index a13a8c3980..0000000000 --- a/plugins/ExternalAPI/delphi/m_fortunemsg.inc +++ /dev/null @@ -1,69 +0,0 @@ -{ -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -} - -{$IFNDEF M_FORTUNEMSG} -{$DEFINE M_FORTUNEMSG} - -const - MIN_FORTUNEMSG = 10; - MAX_FORTUNEMSG = 1024; - FORTUNE_BUFSIZE = (MAX_FORTUNEMSG+1); - -//returns the fortune message (from a random file) -//wParam=0 -//lParam=(AnsiChar *)buffer or 0 -//returns (AnsiChar *)status msg (buffer if specified), or 0 on failure -//If lParam != 0 then the fortune msg is to be stored there, make sure -//its length is at least equal to FORTUNE_BUFSIZE. If lParam == 0, then -//the plugin will allocate the memory, but don't forget to free it (the -//return value) using MS_FORTUNEMSG_FREEMEMORY (but only if you specify lParam=0!!!) - MS_FORTUNEMSG_GETMESSAGE = 'FortuneMsg/GetMessage'; - -//returns the fortune message for a protocol -//wParam=(AnsiChar*)szProtoName -//lParam=(AnsiChar *)buffer or 0 -//returns (AnsiChar *)status msg (buffer if specified), or 0 on failure -//If lParam != 0 then the fortune msg is to be stored there, make sure -//its length is at least equal to FORTUNE_BUFSIZE. If lParam == 0, then -//the plugin will allocate the memory, but don't forget to free it (the -//return value) using MS_FORTUNEMSG_FREEMEMORY (but only if you specify lParam=0!!!) - MS_FORTUNEMSG_GETPROTOMSG = 'FortuneMsg/GetProtoMessage'; - -//returns the fortune status message for a status -//wParam=(int)status -//lParam=(AnsiChar *)buffer or 0 -//returns (AnsiChar *)status msg (buffer if specified), or 0 on failure -//If lParam != 0 then the fortune msg is to be stored there, make sure -//its length is at least equal to FORTUNE_BUFSIZE. If lParam == 0, then -//the plugin will allocate the memory, but don't forget to free it (the -//return value) using MS_FORTUNEMSG_FREEMEMORY (but only if you specify lParam=0!!!) - MS_FORTUNEMSG_GETSTATUSMSG = 'FortuneMsg/GetStatusMessage'; - -//frees the memory allocated by one of the other three services -//wParam=0 -//lParam=(void *)pointer to the memory to be freed -//(the returned value from one of the other three services if called with lParam=0) -//return value: 0 on success, -1 on failure (argument was NULL) - MS_FORTUNEMSG_FREEMEMORY = 'FortuneMsg/FreeMemory'; - - -//this service was created for being used by Variables plugin -//wParam=0 -//lParam=(ARGUMENTSINFO *) see m_variables.h for description of the structure -//returns (AnsiChar *)status msg, or 0 on failure - MS_FORTUNEMSG_FROMVARIABLES = 'FortuneMsg/FromVariables'; - -{$ENDIF} diff --git a/plugins/SimpleStatusMsg/src/commonheaders.h b/plugins/SimpleStatusMsg/src/commonheaders.h index 5b6128774c..296d8f54a0 100644 --- a/plugins/SimpleStatusMsg/src/commonheaders.h +++ b/plugins/SimpleStatusMsg/src/commonheaders.h @@ -39,7 +39,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include -#include #include #include #include diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index ab72a2a225..29925dbb9d 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -202,83 +202,6 @@ TCHAR *InsertBuiltinVarsIntoMsg(TCHAR *in, const char *szProto, int status) mir_free(ptszWinampTitle); } - else if (!_tcsnicmp(msg+i, _T("%fortunemsg%"), 12)) - { - TCHAR *FortuneMsg; - - char *FortuneMsgA; - - - if (!ServiceExists(MS_FORTUNEMSG_GETMESSAGE)) - continue; - - - FortuneMsgA = (char*)CallService(MS_FORTUNEMSG_GETMESSAGE, 0, 0); - FortuneMsg = mir_a2u(FortuneMsgA); - - if (lstrlen(FortuneMsg) > 12) - msg = (TCHAR *)mir_realloc(msg, (lstrlen(msg) + 1 + lstrlen(FortuneMsg) - 12) * sizeof(TCHAR)); - - MoveMemory(msg + i + lstrlen(FortuneMsg), msg + i + 12, (lstrlen(msg) - i - 11) * sizeof(TCHAR)); - CopyMemory(msg + i, FortuneMsg, lstrlen(FortuneMsg) * sizeof(TCHAR)); - - - mir_free(FortuneMsg); - CallService(MS_FORTUNEMSG_FREEMEMORY, 0, (LPARAM)FortuneMsgA); - - } - else if (!_tcsnicmp(msg+i, _T("%protofortunemsg%"), 17)) - { - TCHAR *FortuneMsg; - - char *FortuneMsgA; - - - if (!ServiceExists(MS_FORTUNEMSG_GETPROTOMSG)) - continue; - - - FortuneMsgA = (char*)CallService(MS_FORTUNEMSG_GETPROTOMSG, (WPARAM)szProto, 0); - FortuneMsg = mir_a2u(FortuneMsgA); - - - if (lstrlen(FortuneMsg) > 17) - msg = (TCHAR *)mir_realloc(msg, (lstrlen(msg) + 1 + lstrlen(FortuneMsg) - 17) * sizeof(TCHAR)); - - MoveMemory(msg + i + lstrlen(FortuneMsg), msg + i + 17, (lstrlen(msg) - i - 16) * sizeof(TCHAR)); - CopyMemory(msg + i, FortuneMsg, lstrlen(FortuneMsg) * sizeof(TCHAR)); - - - mir_free(FortuneMsg); - CallService(MS_FORTUNEMSG_FREEMEMORY, 0, (LPARAM)FortuneMsgA); - - } - else if (!_tcsnicmp(msg+i, _T("%statusfortunemsg%"), 18)) - { - TCHAR *FortuneMsg; - - char *FortuneMsgA; - - - if (!ServiceExists(MS_FORTUNEMSG_GETSTATUSMSG)) - continue; - - - FortuneMsgA = (char*)CallService(MS_FORTUNEMSG_GETSTATUSMSG, (WPARAM)status, 0); - FortuneMsg = mir_a2u(FortuneMsgA); - - - if (lstrlen(FortuneMsg) > 18) - msg = (TCHAR *)mir_realloc(msg, (lstrlen(msg) + 1 + lstrlen(FortuneMsg) - 18) * sizeof(TCHAR)); - - MoveMemory(msg + i + lstrlen(FortuneMsg), msg + i + 18, (lstrlen(msg) - i - 17) * sizeof(TCHAR)); - CopyMemory(msg + i, FortuneMsg, lstrlen(FortuneMsg) * sizeof(TCHAR)); - - - mir_free(FortuneMsg); - CallService(MS_FORTUNEMSG_FREEMEMORY, 0, (LPARAM)FortuneMsgA); - - } else if (!_tcsnicmp(msg + i, _T("%time%"), 6)) { MIRANDA_IDLE_INFO mii = {0}; diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp index b98b9d5c40..9fa19e2e40 100644 --- a/plugins/SimpleStatusMsg/src/msgbox.cpp +++ b/plugins/SimpleStatusMsg/src/msgbox.cpp @@ -458,10 +458,7 @@ VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control) else DeleteMenu(hmenuTrackPopup, 8, MF_BYPOSITION); - if (ServiceExists(MS_FORTUNEMSG_GETSTATUSMSG)) - DeleteMenu(hmenuTrackPopup, ID__FORTUNEAWAYMSG, MF_BYCOMMAND); - else - DeleteMenu(hmenuTrackPopup, 7, MF_BYPOSITION); + DeleteMenu(hmenuTrackPopup, 7, MF_BYPOSITION); int m_selection = TrackPopupMenu(hmenuTrackPopup, TPM_LEFTALIGN | TPM_RETURNCMD, pt.x, pt.y, 0, hwnd, NULL); switch (m_selection) -- cgit v1.2.3