From 92a701741ab376c6bd8ac20f832f55e55324abdc Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 13 Jul 2012 21:37:56 +0000 Subject: Updater removal - stage 1 git-svn-id: http://svn.miranda-ng.org/main/trunk@956 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/main.cpp | 29 +---------------------------- protocols/IcqOscarJ/icq_proto.cpp | 3 --- protocols/MRA/Mra.cpp | 1 - protocols/Omegle/main.cpp | 28 ---------------------------- protocols/Quotes/Forex.cpp | 24 ------------------------ protocols/Twitter/main.cpp | 24 ------------------------ protocols/YAMN/main.cpp | 20 -------------------- 7 files changed, 1 insertion(+), 128 deletions(-) (limited to 'protocols') diff --git a/protocols/FacebookRM/main.cpp b/protocols/FacebookRM/main.cpp index 2cf6e13f18..ecdab519bc 100644 --- a/protocols/FacebookRM/main.cpp +++ b/protocols/FacebookRM/main.cpp @@ -91,32 +91,6 @@ static int protoUninit(PROTO_INTERFACE* proto) return EXIT_SUCCESS; } -int OnModulesLoaded(WPARAM,LPARAM) -{ - if ( ServiceExists( MS_UPDATE_REGISTER )) - { - Update upd = {sizeof(upd)}; - char curr_version[30]; - - upd.szComponentName = pluginInfo.shortName; - upd.szUpdateURL = UPDATER_AUTOREGISTER; - upd.szBetaVersionURL = "http://robyer.info/miranda/facebookRM/version.html"; - upd.szBetaChangelogURL = "http://robyer.info/miranda/facebookRM/changelog.html"; - upd.pbBetaVersionPrefix = reinterpret_cast("Facebook RM "); - upd.cpbBetaVersionPrefix = (int)strlen(reinterpret_cast(upd.pbBetaVersionPrefix)); - #ifdef _WIN64 - upd.szBetaUpdateURL = "http://robyer.info/stahni/facebookRM_x64.zip"; - #else - upd.szBetaUpdateURL = "http://robyer.info/stahni/facebookRM.zip"; - #endif - upd.pbVersion = reinterpret_cast(CreateVersionStringPluginEx(&pluginInfo,curr_version)); - upd.cpbVersion = (int)strlen(reinterpret_cast(upd.pbVersion)); - CallService(MS_UPDATE_REGISTER,0,(LPARAM)&upd); - } - - return 0; -} - static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void) @@ -135,8 +109,7 @@ extern "C" int __declspec(dllexport) Load(void) pd.fnUninit = protoUninit; CallService(MS_PROTO_REGISTERMODULE,0,reinterpret_cast(&pd)); - g_hEvents[0] = HookEvent(ME_SYSTEM_MODULESLOADED,OnModulesLoaded); - + InitIcons(); InitContactMenus(); diff --git a/protocols/IcqOscarJ/icq_proto.cpp b/protocols/IcqOscarJ/icq_proto.cpp index ce46d9f719..1ada8888ca 100644 --- a/protocols/IcqOscarJ/icq_proto.cpp +++ b/protocols/IcqOscarJ/icq_proto.cpp @@ -334,9 +334,6 @@ int CIcqProto::OnModulesLoaded( WPARAM wParam, LPARAM lParam ) InitPopUps(); InitXStatusItems(FALSE); - // TODO: add beta builds support to devel builds :) - CallService(MS_UPDATE_REGISTERFL, 1683, (WPARAM)&pluginInfo); - if (hExtraXStatus == NULL) { if (HookProtoEvent(ME_CLIST_EXTRA_LIST_REBUILD, &CIcqProto::CListMW_ExtraIconsRebuild)) diff --git a/protocols/MRA/Mra.cpp b/protocols/MRA/Mra.cpp index 084c900912..99458125f5 100644 --- a/protocols/MRA/Mra.cpp +++ b/protocols/MRA/Mra.cpp @@ -267,7 +267,6 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam) LoadModules(); - CallService(MS_UPDATE_REGISTERFL,(WPARAM)MRA_PLUGIN_UPDATER_ID,(LPARAM)&pluginInfoEx); InterlockedExchange((volatile LONG*)&masMraSettings.dwGlobalPluginRunning,TRUE); diff --git a/protocols/Omegle/main.cpp b/protocols/Omegle/main.cpp index e34282c2cb..1e5686a316 100644 --- a/protocols/Omegle/main.cpp +++ b/protocols/Omegle/main.cpp @@ -91,32 +91,6 @@ static int protoUninit(PROTO_INTERFACE* proto) return EXIT_SUCCESS; } -int OnModulesLoaded(WPARAM,LPARAM) -{ - if ( ServiceExists( MS_UPDATE_REGISTER )) - { - Update upd = {sizeof(upd)}; - char curr_version[30]; - - upd.szComponentName = pluginInfo.shortName; - upd.szUpdateURL = UPDATER_AUTOREGISTER; - upd.szBetaVersionURL = "http://robyer.info/miranda/omegle/version.html"; - upd.szBetaChangelogURL = "http://robyer.info/miranda/omegle/changelog.html"; - upd.pbBetaVersionPrefix = reinterpret_cast("Omegle "); - upd.cpbBetaVersionPrefix = (int)strlen(reinterpret_cast(upd.pbBetaVersionPrefix)); - #ifdef _WIN64 - upd.szBetaUpdateURL = "http://robyer.info/stahni/omegle_x64.zip"; - #else - upd.szBetaUpdateURL = "http://robyer.info/stahni/omegle.zip"; - #endif - upd.pbVersion = reinterpret_cast(CreateVersionStringPluginEx(&pluginInfo,curr_version)); - upd.cpbVersion = (int)strlen(reinterpret_cast(upd.pbVersion)); - CallService(MS_UPDATE_REGISTER,0,(LPARAM)&upd); - } - - return 0; -} - static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void) @@ -135,8 +109,6 @@ extern "C" int __declspec(dllexport) Load(void) pd.fnUninit = protoUninit; CallService(MS_PROTO_REGISTERMODULE,0,reinterpret_cast(&pd)); - g_hEvents[0] = HookEvent(ME_SYSTEM_MODULESLOADED,OnModulesLoaded); - InitIcons(); //InitContactMenus(); diff --git a/protocols/Quotes/Forex.cpp b/protocols/Quotes/Forex.cpp index 4ea8c7e4d7..071da5c787 100644 --- a/protocols/Quotes/Forex.cpp +++ b/protocols/Quotes/Forex.cpp @@ -207,30 +207,6 @@ namespace { CHTTPSession::Init(); - if(ServiceExists(MS_UPDATE_REGISTER)) - { - Update update = {0}; - char szVersion[16]; - - update.szComponentName = Global_pluginInfo.shortName; - update.szVersionURL = "http://addons.miranda-im.org/details.php?action=viewfile&id=4021"; - update.pbVersionPrefix = (BYTE *)"Quotes "; - update.cpbVersionPrefix = (int)strlen((char *)update.pbVersionPrefix); - update.szUpdateURL = "http://addons.miranda-im.org/feed.php?dlfile=4021"; - - update.szBetaVersionURL = NULL; - update.pbBetaVersionPrefix = NULL; - update.cpbBetaVersionPrefix = 0; - update.szBetaUpdateURL = NULL; - - update.pbVersion = (BYTE*)CreateVersionString(Global_pluginInfo.version,szVersion); - update.cpbVersion = (int)strlen((char *)update.pbVersion); - - update.szBetaChangelogURL = NULL; - - CallService(MS_UPDATE_REGISTER,0,(WPARAM)&update); - } - HANDLE h = HookEvent(ME_CLIST_EXTRA_LIST_REBUILD,QuotesEventFunc_onExtraImageListRebuild); g_ahEvents.push_back(h); // QuotesEventFunc_onExtraImageListRebuild(0,0); diff --git a/protocols/Twitter/main.cpp b/protocols/Twitter/main.cpp index 5ac2aaa24c..4e595f8085 100644 --- a/protocols/Twitter/main.cpp +++ b/protocols/Twitter/main.cpp @@ -89,28 +89,6 @@ static int protoUninit(PROTO_INTERFACE *proto) return 0; } -int OnModulesLoaded(WPARAM,LPARAM) -{ - if(ServiceExists(MS_UPDATE_REGISTER)) { - Update upd = {sizeof(upd)}; - char curr_version[30]; - - upd.szComponentName = pluginInfo.shortName; - upd.szUpdateURL = UPDATER_AUTOREGISTER; - upd.szBetaVersionURL = "http://twosx.net/mim/twitter/updater/version.html"; - upd.szBetaChangelogURL = "http://twosx.net/mim/twitter/updater/changelog.html"; - upd.pbBetaVersionPrefix = reinterpret_cast("Twitter "); - upd.cpbBetaVersionPrefix = (int)strlen(reinterpret_cast(upd.pbBetaVersionPrefix)); - upd.szBetaUpdateURL = "http://twosx.net/mim/twitter/updater/twitter.zip"; - - upd.pbVersion = reinterpret_cast( CreateVersionStringPluginEx(&pluginInfo,curr_version)); - upd.cpbVersion = (int)strlen(reinterpret_cast(upd.pbVersion)); - CallService(MS_UPDATE_REGISTER,0,(LPARAM)&upd); - } - - return 0; -} - static HANDLE g_hEvents[1]; extern "C" int __declspec(dllexport) Load(void) @@ -128,8 +106,6 @@ extern "C" int __declspec(dllexport) Load(void) pd.fnUninit = protoUninit; CallService(MS_PROTO_REGISTERMODULE,0,reinterpret_cast(&pd)); - g_hEvents[0] = HookEvent(ME_SYSTEM_MODULESLOADED,OnModulesLoaded); - InitIcons(); InitContactMenus(); diff --git a/protocols/YAMN/main.cpp b/protocols/YAMN/main.cpp index 978a2fa233..2dd7f050b6 100644 --- a/protocols/YAMN/main.cpp +++ b/protocols/YAMN/main.cpp @@ -238,26 +238,6 @@ int SystemModulesLoaded(WPARAM, LPARAM) CheckMenuItems(); - //Use for the Updater plugin - if (ServiceExists(MS_UPDATE_REGISTER)) { - Update update = {0}; - char szVersion[16], szUrl[250]; - wsprintfA(szUrl, "http://www.miranda-fr.net/tweety/yamn/%s.zip", YAMN_FILENAME); - - update.szComponentName = pluginInfo.shortName; - update.pbVersion = (BYTE *)CreateVersionStringPluginEx((PLUGININFOEX *)&pluginInfo, szVersion); - update.cpbVersion = (int)strlen((char *)update.pbVersion); - update.szUpdateURL = "http://addons.miranda-im.org/feed.php?dlfile = 3411"; - update.szVersionURL = "http://addons.miranda-im.org/details.php?action = viewfile&id = 3411"; - update.pbVersionPrefix = (BYTE *)"YAMN 2in1 "; - update.szBetaUpdateURL = szUrl; - update.szBetaVersionURL = "http://www.miranda-fr.net/tweety/yamn/yamn_beta.html"; - update.pbBetaVersionPrefix = (BYTE *)"YAMN version "; - update.cpbVersionPrefix = (int)strlen((char *)update.pbVersionPrefix); - update.cpbBetaVersionPrefix = (int)strlen((char *)update.pbBetaVersionPrefix); - CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update); - } - if (ServiceExists(MS_FOLDERS_GET_PATH)) { hAccountFolder = FoldersRegisterCustomPathT(YAMN_DBMODULE, YAMN_DBMODULE" Account Folder", UserDirectory); FoldersGetCustomPathT(hAccountFolder, UserDirectory, MAX_PATH, UserDirectory); -- cgit v1.2.3