From 81e8caf42867b65677efe2bffaa52ecff7303c3a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jun 2012 13:58:25 +0000 Subject: no more pluginLink in load() git-svn-id: http://svn.miranda-ng.org/main/trunk@652 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/W7UI/jumplistbuilder.h | 2 +- plugins/W7UI/main.cpp | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'plugins/W7UI') diff --git a/plugins/W7UI/jumplistbuilder.h b/plugins/W7UI/jumplistbuilder.h index f0e1cbd438..6a0bde2fd4 100644 --- a/plugins/W7UI/jumplistbuilder.h +++ b/plugins/W7UI/jumplistbuilder.h @@ -4,7 +4,7 @@ class CJumpListBuilder { public: - static void Load() + static void Load(void) { m_instance = new CJumpListBuilder; } diff --git a/plugins/W7UI/main.cpp b/plugins/W7UI/main.cpp index b26124db71..7f48f93070 100644 --- a/plugins/W7UI/main.cpp +++ b/plugins/W7UI/main.cpp @@ -26,10 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int LoadW7UI(); int UnloadW7UI(); -PLUGINLINK* pluginLink; -HINSTANCE g_hInst; - -int hLangpack; +HINSTANCE g_hInst; +int hLangpack; // {3625ACB8-794C-4727-88EA-76DBBAC6D200} #define MIID_W7UI { 0x3625acb8, 0x794c, 0x4727, { 0x88, 0xea, 0x76, 0xdb, 0xba, 0xc6, 0xd2, 0x0 } } @@ -67,11 +65,11 @@ extern "C" __declspec(dllexport) const MUUID *MirandaPluginInterfaces(void) return interfaces; } -extern "C" __declspec(dllexport) int Load(PLUGINLINK * link) +extern "C" __declspec(dllexport) int Load(void) { if (!IsWinVer7Plus()) return 1; - pluginLink = link; + mir_getLP(&pluginInfo); LoadW7UI(); -- cgit v1.2.3