From 5750b26d1a312d0298381de81430a77d96192fb2 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 16 Jun 2012 11:03:30 +0000 Subject: another portion of unneeded MirandaPluginInterfaces removal git-svn-id: http://svn.miranda-ng.org/main/trunk@443 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SeenPlugin/main.c | 15 +------- plugins/SeenPlugin/options.c | 13 +------ plugins/SeenPlugin/resource.h | 4 -- plugins/SeenPlugin/resource.rc | 13 +------ plugins/SeenPlugin/utils.c | 47 +---------------------- plugins/SimpleAR/Src/Main.cpp | 7 ---- plugins/SplashScreen/src/main.cpp | 6 --- plugins/StatusPlugins/AdvancedAutoAway/main.cpp | 10 ----- plugins/StatusPlugins/KeepStatus/main.cpp | 10 ----- plugins/StatusPlugins/StartupStatus/main.cpp | 10 ----- plugins/StopSpamPlus/src/stopspam.cpp | 11 ------ plugins/TranslitSwitcher/Src/TranslitSwitcher.cpp | 6 --- plugins/UserGuide/main.c | 6 --- plugins/Variables/main.cpp | 9 ----- 14 files changed, 8 insertions(+), 159 deletions(-) (limited to 'plugins') diff --git a/plugins/SeenPlugin/main.c b/plugins/SeenPlugin/main.c index c1aefc32e2..8dd6f643e3 100644 --- a/plugins/SeenPlugin/main.c +++ b/plugins/SeenPlugin/main.c @@ -41,13 +41,8 @@ PLUGININFOEX pluginInfo={ "© 2001-2002 Heiko Schillinger, 2003 modified by Bruno Rino, 2005-7 Modified by YB", "http://forums.miranda-im.org/showthread.php?t=2822", 0, -#ifndef PERMITNSN - DEFMOD_RNDUSERONLINE, - { 0x0beac488,0x578d,0x458d,{0xbb, 0x93, 0x8f, 0x2f, 0x53, 0x9b, 0x2a, 0xe4}}/* 0beac488-578d-458d-bb93-8f2f539b2ae4 */ -#else 0, { 0x2d506d46,0xc94e,0x4ef8,{0x85, 0x37, 0xf1, 0x12, 0x33, 0xa8, 0x03, 0x81}}/* 2d506d46-c94e-4ef8-8537-f11233a80381 */ -#endif }; #define TRANSNUMBER 2 @@ -110,9 +105,7 @@ int MainInit(WPARAM wparam,LPARAM lparam) CallService("DBEditorpp/RegisterSingleModule", (WPARAM)S_MOD, 0); DBWriteContactSettingString(NULL,"Uninstall",Translate("Last seen"),S_MOD); -#ifndef PERMITNSN - SkinAddNewSoundEx("UserOnline",Translate("Alerts"),Translate("Online")); -#endif + if (ServiceExists(MS_TIPPER_ADDTRANSLATION)) { int i=0; for (i=0;icourStatus = isIdleEvent?DBGetContactSettingWord(hContact,cws->szModule,"Status",ID_STATUS_OFFLINE):cws->value.wVal; } } -#ifndef PERMITNSN - //Some useronline.c functionality - { - int newStatus,oldStatus; - newStatus=(cws->value.wVal|0x8000); - oldStatus=DBGetContactSettingWord(hContact,"UserOnline","OldStatus",ID_STATUS_OFFLINE); - DBWriteContactSettingWord(hContact,"UserOnline","OldStatus",(WORD)newStatus); - if(DBGetContactSettingByte(hContact,"CList","Hidden",0)) return 0; - if ((newStatus==ID_STATUS_ONLINE || newStatus==ID_STATUS_FREECHAT) && - oldStatus!=ID_STATUS_ONLINE && oldStatus!=ID_STATUS_FREECHAT) { - BYTE supp = db_byte_get(NULL, S_MOD, "SuppCListOnline", 3); //By default no online allert :P - BOOL willAlert = FALSE; - switch (supp) { - case 3: willAlert = FALSE; break; - case 2: willAlert = !IsWatchedProtocol(cws->szModule); break; - case 1: willAlert = IsWatchedProtocol(cws->szModule); break; - case 0: willAlert = TRUE; break; - } - if (willAlert) { - DWORD ticked = db_dword_get(NULL, "UserOnline", cws->szModule, GetTickCount()); - // only play the sound (or show event) if this event happens at least 10 secs after the proto went from offline - if ( GetTickCount() - ticked > (1000*10) ) { - CLISTEVENT cle; - char tooltip[256]; - - ZeroMemory(&cle,sizeof(cle)); - cle.cbSize=sizeof(cle); - cle.flags=CLEF_ONLYAFEW; - cle.hContact=hContact; - cle.hDbEvent=(HANDLE)(uniqueEventId++); - cle.hIcon=LoadSkinnedIcon(SKINICON_OTHER_USERONLINE); - cle.pszService="UserOnline/Description"; - mir_snprintf(tooltip,256,Translate("%s is Online"),(char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,0)); - cle.pszTooltip=tooltip; - CallService(MS_CLIST_ADDEVENT,0,(LPARAM)&cle); - - SkinPlaySound("UserOnline"); - } - } - } - } -#endif + return 0; } diff --git a/plugins/SimpleAR/Src/Main.cpp b/plugins/SimpleAR/Src/Main.cpp index ac9a2d002f..9fe60e4199 100644 --- a/plugins/SimpleAR/Src/Main.cpp +++ b/plugins/SimpleAR/Src/Main.cpp @@ -56,13 +56,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -static const MUUID interfaces[] = {{0x46bf191f, 0x8dfb, 0x4656, { 0x88, 0xb2, 0x4c, 0x20, 0xbe, 0x4c, 0xfa, 0x44}}, MIID_LAST}; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - BOOL WINAPI DllMain(HINSTANCE hinst,DWORD fdwReason,LPVOID lpvReserved) { hinstance=hinst; diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 008aa3b8f7..495d1969dc 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -69,12 +69,6 @@ PLUGININFOEX pluginInfo={ MIID_SPLASHSCREEN }; -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - static const MUUID interfaces[] = {MIID_SPLASHSCREEN, MIID_LAST}; - return interfaces; -} - extern "C" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { hInst = hinstDLL; diff --git a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp index 2e4f5f288a..9005e3d619 100644 --- a/plugins/StatusPlugins/AdvancedAutoAway/main.cpp +++ b/plugins/StatusPlugins/AdvancedAutoAway/main.cpp @@ -70,16 +70,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -///////////////////////////////////////////////////////////////////////////////////////// -// returns plugin's interfaces information - -static const MUUID interfaces[] = { MIID_AUTOAWAY, MIID_LAST }; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - ///////////////////////////////////////////////////////////////////////////////////////// // plugin's entry point diff --git a/plugins/StatusPlugins/KeepStatus/main.cpp b/plugins/StatusPlugins/KeepStatus/main.cpp index 1910dec585..3d79983cd4 100644 --- a/plugins/StatusPlugins/KeepStatus/main.cpp +++ b/plugins/StatusPlugins/KeepStatus/main.cpp @@ -70,16 +70,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -///////////////////////////////////////////////////////////////////////////////////////// -// returns plugin's interfaces information - -static const MUUID interfaces[] = { MIID_KEEPSTATUS, MIID_LAST }; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - ///////////////////////////////////////////////////////////////////////////////////////// // plugin's entry point diff --git a/plugins/StatusPlugins/StartupStatus/main.cpp b/plugins/StatusPlugins/StartupStatus/main.cpp index 3349351afa..da09885072 100644 --- a/plugins/StatusPlugins/StartupStatus/main.cpp +++ b/plugins/StatusPlugins/StartupStatus/main.cpp @@ -68,16 +68,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -///////////////////////////////////////////////////////////////////////////////////////// -// returns plugin's interfaces information - -static const MUUID interfaces[] = { MIID_STARTUPSTATUS, MIID_LAST }; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - ///////////////////////////////////////////////////////////////////////////////////////// // plugin's entry point diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp index 1ff5a0ef28..b7f1419c29 100644 --- a/plugins/StopSpamPlus/src/stopspam.cpp +++ b/plugins/StopSpamPlus/src/stopspam.cpp @@ -44,17 +44,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved) return TRUE; } - -///////////////////////////////////////////////////////////////////////////////////////// -// returns plugin's interfaces information - -static const MUUID interfaces[] = { MIID_STOPSPAM, MIID_LAST }; - -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { CLISTMENUITEM mi; diff --git a/plugins/TranslitSwitcher/Src/TranslitSwitcher.cpp b/plugins/TranslitSwitcher/Src/TranslitSwitcher.cpp index 1ec9f7f0e0..c1828bfc5b 100644 --- a/plugins/TranslitSwitcher/Src/TranslitSwitcher.cpp +++ b/plugins/TranslitSwitcher/Src/TranslitSwitcher.cpp @@ -54,12 +54,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -static const MUUID interfaces[] = {MIID_TS, MIID_LAST}; -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - //------------------------------------------------------------------------------------------------------- #define MS_TS_SWITCHLAYOUT "TranslitSwitcher/SwitchLayout" INT_PTR ServiceSwitch(WPARAM wParam, LPARAM lParam) diff --git a/plugins/UserGuide/main.c b/plugins/UserGuide/main.c index 8e63d94d08..0adc8dab7a 100644 --- a/plugins/UserGuide/main.c +++ b/plugins/UserGuide/main.c @@ -110,12 +110,6 @@ __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) return &pluginInfo; } -static const MUUID interfaces[] = {MIID_USERGUIDE, MIID_LAST}; -__declspec(dllexport) const MUUID* MirandaPluginInterfaces(void) -{ - return interfaces; -} - int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink=link; diff --git a/plugins/Variables/main.cpp b/plugins/Variables/main.cpp index 5cdd4c105c..ae3125ed91 100644 --- a/plugins/Variables/main.cpp +++ b/plugins/Variables/main.cpp @@ -77,15 +77,6 @@ extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD miranda return &pluginInfoEx; } -///////////////////////////////////////////////////////////////////////////////////////// -// MirandaPluginInterfaces - returns the protocol interface to the core - -static const MUUID interfaces[] = { MIID_VARIABLES, MIID_LAST }; -extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces( void ) -{ - return interfaces; -} - ///////////////////////////////////////////////////////////////////////////////////////// // Load - plugin's entry point -- cgit v1.2.3