From 5a4f8dfc2d31195ca8478e6379fb93841b3909a2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 19 Aug 2013 20:41:58 +0000
Subject: obsolete code removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@5751 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/plugins/newplugins.cpp | 46 +++++++++-----------------------------
 1 file changed, 10 insertions(+), 36 deletions(-)

(limited to 'src/modules/plugins')

diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp
index f527dbabd2..f25393feab 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/modules/plugins/newplugins.cpp
@@ -31,7 +31,8 @@ void LoadExtraIconsModule();
 extern bool bModulesLoadedFired;
 
 static int sttComparePluginsByName(const pluginEntry* p1, const pluginEntry* p2)
-{	return lstrcmp(p1->pluginname, p2->pluginname);
+{
+	return lstrcmp(p1->pluginname, p2->pluginname);
 }
 
 LIST<pluginEntry>
@@ -75,7 +76,6 @@ bool hasMuuid(const MUUID* p, const MUUID& uuid)
 	return false;
 }
 
-
 bool hasMuuid(const BASIC_PLUGIN_INFO& bpi, const MUUID& uuid)
 {
 	if (bpi.Interfaces)
@@ -217,28 +217,6 @@ static bool validInterfaceList(MUUID *piface)
 	return true;
 }
 
-/*
- * historyeditor added by nightwish - plugin is problematic and can ruin database as it does not understand UTF-8 message
- * storage
- */
-
-static const TCHAR* modulesToSkip[] =
-{
-	_T("autoloadavatars.dll"), _T("multiwindow.dll"), _T("fontservice.dll"),
-	_T("icolib.dll"), _T("historyeditor.dll")
-};
-
-// The following plugins will be checked for a valid MUUID or they will not be loaded
-static const TCHAR* expiredModulesToSkip[] =
-{
-	_T("scriver.dll"), _T("nconvers.dll"), _T("tabsrmm.dll"), _T("nhistory.dll"),
-	_T("historypp.dll"), _T("help.dll"), _T("loadavatars.dll"), _T("tabsrmm_unicode.dll"),
-	_T("clist_nicer_plus.dll"), _T("changeinfo.dll"), _T("png2dib.dll"), _T("dbx_mmap.dll"),
-	_T("dbx_3x.dll"), _T("sramm.dll"), _T("srmm_mod.dll"), _T("srmm_mod (no Unicode).dll"),
-	_T("singlemodeSRMM.dll"), _T("msg_export.dll"), _T("clist_modern.dll"),
-	_T("clist_nicer.dll")
-};
-
 static int checkPI(BASIC_PLUGIN_INFO* bpi, PLUGININFOEX* pi)
 {
 	if (pi == NULL)
@@ -261,15 +239,6 @@ int checkAPI(TCHAR* plugin, BASIC_PLUGIN_INFO* bpi, DWORD mirandaVersion, int ch
 {
 	HINSTANCE h = NULL;
 
-	// this is evil but these plugins are buggy/old and people are blaming Miranda
-	// fontservice plugin is built into the core now
-	TCHAR* p = _tcsrchr(plugin, '\\');
-	if (p != NULL && ++p) {
-		for (int i=0; i < SIZEOF(modulesToSkip); i++)
-			if (lstrcmpi(p, modulesToSkip[i]) == 0)
-				return 0;
-	}
-
 	h = LoadLibrary(plugin);
 	if (h == NULL)
 		return 0;
@@ -545,7 +514,10 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic)
 					if ( !(p->pclass & PCLASS_CORE)) {
 						Plugin_UnloadDyn(pluginDefault[idx].pImpl);
 						pluginDefault[idx].pImpl = NULL;
-		}	}	}	}
+					}
+				}
+			}
+		}
 
 		RegisterModule(p->bpi.hInst);
 		if (p->bpi.Load() != 0)
@@ -744,7 +716,8 @@ void UnloadNewPlugins(void)
 		pluginEntry* p = pluginList[i];
 		if ( !(p->pclass & PCLASS_LAST) && (p->pclass & PCLASS_OK))
 			Plugin_Uninit(p);
-}	}
+	}
+}
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // Loads all plugins
@@ -778,7 +751,8 @@ int LoadNewPluginsModule(void)
 				pluginList_freeimg->pclass |= PCLASS_LOADED;
 			else
 				Plugin_Uninit(pluginList_freeimg);
-	}	}
+		}
+	}
 
 	// first load the clist cos alot of plugins need that to be present at Load(void)
 	pluginEntry* clist = getCListModule(exe, slice);
-- 
cgit v1.2.3