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/Clist_nicer | |
| 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/Clist_nicer')
| -rw-r--r-- | plugins/Clist_nicer/CLUIFrames/cluiframes.cpp | 3 | ||||
| -rw-r--r-- | plugins/Clist_nicer/SRC/init.cpp | 6 | ||||
| -rw-r--r-- | plugins/Clist_nicer/skineditor/main.cpp | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp index 18cd015a8d..0a6d6a0a55 100644 --- a/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/CLUIFrames/cluiframes.cpp @@ -639,7 +639,6 @@ int CLUIFramesGetalClientFrame(void) alclientFrame = i;
return i;
}
- //pluginLink
return -1;
}
@@ -2309,7 +2308,7 @@ int CLUIFramesResize(const RECT newsize) INT_PTR CLUIFramesUpdateFrame(WPARAM wParam, LPARAM lParam)
{
- int pos;
+ int pos;
if (FramesSysNotStarted)
return -1;
if (wParam == -1) {
diff --git a/plugins/Clist_nicer/SRC/init.cpp b/plugins/Clist_nicer/SRC/init.cpp index c5daa292b4..cef1931bc4 100644 --- a/plugins/Clist_nicer/SRC/init.cpp +++ b/plugins/Clist_nicer/SRC/init.cpp @@ -34,7 +34,6 @@ #include "../cluiframes/cluiframes.h"
HINSTANCE g_hInst = 0;
-PLUGINLINK *pluginLink;
CLIST_INTERFACE* pcli = NULL;
int hLangpack;
@@ -214,14 +213,13 @@ static int fnIconFromStatusMode( const char* szProto, int status, HANDLE hContac { return IconFromStatusMode( szProto, status, hContact, NULL );
}
-extern "C" int __declspec(dllexport) CListInitialise(PLUGINLINK * link)
+extern "C" int __declspec(dllexport) CListInitialise()
{
int rc = 0;
DBVARIANT dbv;
int i;
char szProfilePath[MAX_PATH];
- pluginLink = link;
mir_getTMI(&tmi);
mir_getLP( &pluginInfo );
@@ -373,7 +371,7 @@ LBL_Error: }
// a plugin loader aware of CList exports will never call this.
-extern "C" int __declspec(dllexport) Load(PLUGINLINK * link)
+extern "C" int __declspec(dllexport) Load(void)
{
return 1;
}
diff --git a/plugins/Clist_nicer/skineditor/main.cpp b/plugins/Clist_nicer/skineditor/main.cpp index b180316c28..f01fa15cd0 100644 --- a/plugins/Clist_nicer/skineditor/main.cpp +++ b/plugins/Clist_nicer/skineditor/main.cpp @@ -41,7 +41,6 @@ PLUGININFOEX pluginInfo = { };
HINSTANCE g_hInst = 0;
-PLUGINLINK *pluginLink;
int hLangpack;
StatusItems_t *StatusItems;
@@ -943,9 +942,8 @@ static int systemModulesLoaded(WPARAM wParam, LPARAM lParam) return 0;
}
-extern "C" int __declspec(dllexport) Load(PLUGINLINK * link)
+extern "C" int __declspec(dllexport) Load(void)
{
- pluginLink = link;
mir_getLP(&pluginInfo);
return(LoadModule());
}
|