diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-06-27 13:58:25 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-06-27 13:58:25 +0000 |
| commit | 81e8caf42867b65677efe2bffaa52ecff7303c3a (patch) | |
| tree | 846f06ef51787c58205cd87546976bda29556680 /plugins/UserInfoEx | |
| parent | d9da7f147fbe91d2e70721de96907ae1d273b591 (diff) | |
no more pluginLink in load()
git-svn-id: http://svn.miranda-ng.org/main/trunk@652 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/UserInfoEx')
| -rw-r--r-- | plugins/UserInfoEx/ex_import/tinyxml.h | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/init.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/plugins/UserInfoEx/ex_import/tinyxml.h b/plugins/UserInfoEx/ex_import/tinyxml.h index b8246f4953..34e1c25517 100644 --- a/plugins/UserInfoEx/ex_import/tinyxml.h +++ b/plugins/UserInfoEx/ex_import/tinyxml.h @@ -209,7 +209,7 @@ public: 1,1). If the returns values are 0 or less, then the parser does not have a row and column value. - Generally, the row and column value will be set when the TiXmlDocument::Load(), + Generally, the row and column value will be set when the TiXmlDocument::Load(void), TiXmlDocument::LoadFile(), or any TiXmlNode::Parse() is called. It will NOT be set when the DOM was created from operator>>. diff --git a/plugins/UserInfoEx/init.cpp b/plugins/UserInfoEx/init.cpp index d1a1a47bcc..b7a757be19 100644 --- a/plugins/UserInfoEx/init.cpp +++ b/plugins/UserInfoEx/init.cpp @@ -72,7 +72,6 @@ static HANDLE ghModernToolBarLoaded = NULL; static HANDLE ghShutdownHook = NULL;
static HANDLE ghPrebuildStatusMenu = NULL;
int hLangpack;
-PLUGINLINK* pluginLink = NULL;
/*
============================================================================================
@@ -293,13 +292,13 @@ extern "C" INT __declspec(dllexport) Unload(VOID) *
* @return 0
**/
-extern "C" INT __declspec(dllexport) Load(PLUGINLINK *link)
+extern "C" INT __declspec(dllexport) Load(void)
{
INITCOMMONCONTROLSEX ccEx;
- pluginLink = link;
+
mir_getLP(&pluginInfo);
- if (link && CoreCheck())
+ if (CoreCheck())
{
// init common controls
ccEx.dwSize = sizeof(ccEx);
|