From dcb9689364e44ce574140ad975a5918da58e75b8 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 26 Oct 2013 20:28:06 +0000 Subject: removed not needed code git-svn-id: http://svn.miranda-ng.org/main/trunk@6639 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ClientChangeNotify/src/ClientChangeNotify.cpp | 2 -- plugins/Clist_modern/src/modern_cluiframes.cpp | 4 ++-- plugins/MetaContacts/src/meta_main.cpp | 7 ------- plugins/Non-IM Contact/src/main.cpp | 2 -- plugins/Popup/src/main.cpp | 1 - plugins/UserInfoEx/src/init.cpp | 3 --- plugins/Weather/src/weather.cpp | 3 --- plugins/WebView/src/main.cpp | 3 --- 8 files changed, 2 insertions(+), 23 deletions(-) diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 1a19e8ef1d..313e1d3323 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -421,8 +421,6 @@ extern "C" int __declspec(dllexport) Load(void) HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded); DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &g_hMainThread, THREAD_SET_CONTEXT, false, 0); InitOptions(); - if (db_get_s(NULL, "KnownModules", MOD_NAME, (char*)NULL) == NULL) - db_set_s(NULL, "KnownModules", MOD_NAME, MOD_NAME); if (db_get_b(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1) { TCString Str; diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index cf71f9ad53..b265a0afee 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -1468,7 +1468,7 @@ static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam) g_pfwFrames[pos].order = tmpval; break; } - + if (lParam == 1) { if (i < 1) break; tmpval = g_pfwFrames[sd[i-1].realpos].order; @@ -4018,7 +4018,7 @@ int UnLoadCLUIFramesModule(void) if (g_pfwFrames[i].OwnerWindow && g_pfwFrames[i].OwnerWindow != (HWND)(-2) && g_pfwFrames[i].OwnerWindow != (HWND)(-1)) DestroyWindow(g_pfwFrames[i].OwnerWindow ); g_pfwFrames[i].OwnerWindow = (HWND)-2; - if (g_pfwFrames[i].UpdateRgn) DeleteObject(g_pfwFrames[i].UpdateRgn); + if (g_pfwFrames[i].UpdateRgn) DeleteObject(g_pfwFrames[i].UpdateRgn); mir_free_and_nil(g_pfwFrames[i].Name); mir_free_and_nil(g_pfwFrames[i].szName); diff --git a/plugins/MetaContacts/src/meta_main.cpp b/plugins/MetaContacts/src/meta_main.cpp index b712144bae..cdd2b6f20f 100644 --- a/plugins/MetaContacts/src/meta_main.cpp +++ b/plugins/MetaContacts/src/meta_main.cpp @@ -182,13 +182,6 @@ extern "C" __declspec(dllexport) int Load(void) db_unset(0, META_PROTO, "DisabledMessageShown"); - // add our modules to the KnownModules list - DBVARIANT dbv; - if ( db_get(NULL, "KnownModules", META_PROTO, &dbv)) - db_set_s(NULL, "KnownModules", META_PROTO, META_PROTO); - else - db_free(&dbv); - PROTOCOLDESCRIPTOR pd = { PROTOCOLDESCRIPTOR_V3_SIZE }; pd.szName = META_FILTER; pd.type = PROTOTYPE_FILTER; diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index a2a9537b88..912f9c08ab 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -188,8 +188,6 @@ extern "C" __declspec(dllexport) int Load() HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); - // known modules list - db_set_s(NULL, "KnownModules","Non-IM Contact", MODNAME); return 0; } diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 6761a28fae..50972b1b36 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -368,7 +368,6 @@ MIRAPI int Load(void) // Register in DBEditor++ UpgradeDb(); - db_set_s(NULL, "KnownModules", pluginInfoEx.shortName, MODULNAME); HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); HookEvent(ME_OPT_INITIALISE, OptionsInitialize); diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index cd97189e16..38cbd31b5a 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -96,9 +96,6 @@ static int OnModulesLoaded(WPARAM wParam, LPARAM lParam) RebuildMenu(); HookEvent( ME_CLIST_PREBUILDSTATUSMENU, (MIRANDAHOOK)RebuildAccount); - // install known modules strings to database - db_set_s(NULL, "KnownModules", MODULELONGNAME, USERINFO","MODNAME","MOD_MBIRTHDAY","MODNAMEFLAGS); - return 0; } diff --git a/plugins/Weather/src/weather.cpp b/plugins/Weather/src/weather.cpp index ddb205ea23..e477f1d14e 100644 --- a/plugins/Weather/src/weather.cpp +++ b/plugins/Weather/src/weather.cpp @@ -221,9 +221,6 @@ extern "C" int __declspec(dllexport) Load(void) // initialize weather protocol services InitServices(); - // add our modules to the KnownModules list - db_set_s(NULL, "KnownModules", "Weather Protocol", "Weather,WeatherCondition,Current"); - // add sound event SkinAddNewSoundExT("weatherupdated", _T(WEATHERPROTONAME), LPGENT("Weather Condition Changed")); SkinAddNewSoundExT("weatheralert", _T(WEATHERPROTONAME), LPGENT("Weather Alert Issued")); diff --git a/plugins/WebView/src/main.cpp b/plugins/WebView/src/main.cpp index 5125c6cbb2..9f642e8b28 100644 --- a/plugins/WebView/src/main.cpp +++ b/plugins/WebView/src/main.cpp @@ -190,9 +190,6 @@ extern "C" int __declspec(dllexport) Load() //add sound event to options SkinAddNewSoundExT("webviewalert", _T(MODULENAME), LPGENT("Alert Event")); - //add module to known list - db_set_s(NULL, "KnownModules", "Webview", MODULENAME); - //value is 1 if menu is disabled db_set_b(NULL, MODULENAME, MENU_IS_DISABLED_KEY, 1); -- cgit v1.2.3