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/SmileyAdd | |
| 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/SmileyAdd')
| -rw-r--r-- | plugins/SmileyAdd/main.cpp | 6 | ||||
| -rw-r--r-- | plugins/SmileyAdd/smileys.cpp | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/plugins/SmileyAdd/main.cpp b/plugins/SmileyAdd/main.cpp index 8c041ea78b..011bfbebeb 100644 --- a/plugins/SmileyAdd/main.cpp +++ b/plugins/SmileyAdd/main.cpp @@ -34,7 +34,7 @@ extern LIST<void> menuHandleArray; char* metaProtoName;
-PLUGINLINK *pluginLink;
+
//static globals
static HANDLE hHooks[7];
@@ -117,9 +117,9 @@ static int MirandaShutdown(WPARAM, LPARAM) return 0;
}
-extern "C" __declspec(dllexport) int Load(PLUGINLINK *link)
+extern "C" __declspec(dllexport) int Load(void)
{
- pluginLink = link;
+
mir_getLP(&pluginInfoEx);
if (ServiceExists(MS_SMILEYADD_REPLACESMILEYS))
diff --git a/plugins/SmileyAdd/smileys.cpp b/plugins/SmileyAdd/smileys.cpp index f94eb70580..2f16cee51e 100644 --- a/plugins/SmileyAdd/smileys.cpp +++ b/plugins/SmileyAdd/smileys.cpp @@ -795,9 +795,7 @@ void SmileyCategoryListType::ClearAndLoadAll(void) m_pSmileyPackStore->ClearAndFreeAll();
for (int i = 0; i < m_SmileyCategories.getCount(); i++)
- {
m_SmileyCategories[i].Load();
- }
}
@@ -847,9 +845,7 @@ void SmileyCategoryListType::AddAndLoad(const bkstring& name, const bkstring& di AddCategory(name, displayName, smcExt);
// Load only if other smileys have been loaded already
if (m_SmileyCategories.getCount() > 1)
- {
m_SmileyCategories[m_SmileyCategories.getCount()-1].Load();
- }
}
|