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/Alarms | |
| 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/Alarms')
| -rw-r--r-- | plugins/Alarms/alarms.cpp | 6 | ||||
| -rw-r--r-- | plugins/Alarms/common.h | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/plugins/Alarms/alarms.cpp b/plugins/Alarms/alarms.cpp index 19af4e7883..27a5c53a97 100644 --- a/plugins/Alarms/alarms.cpp +++ b/plugins/Alarms/alarms.cpp @@ -20,7 +20,6 @@ There is no warranty. TCHAR szGamePrefix[] = COMMANDPREFIX;
HINSTANCE hInst;
-PLUGINLINK *pluginLink;
int hLangpack;
HANDLE hTopToolbarButton;
@@ -300,11 +299,10 @@ static int MainDeInit(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);
- mir_getLP(&pluginInfo);
// ensure datetime picker is loaded
INITCOMMONCONTROLSEX ccx;
ccx.dwSize = sizeof(ccx);
diff --git a/plugins/Alarms/common.h b/plugins/Alarms/common.h index b86cd036c0..36ac58ea3b 100644 --- a/plugins/Alarms/common.h +++ b/plugins/Alarms/common.h @@ -46,23 +46,22 @@ #define MODULE "Alarm"
extern HINSTANCE hInst;
-extern PLUGINLINK *pluginLink;
extern HANDLE hTopToolbarButton;
typedef struct ALARM_tag {
- unsigned short id;
+ unsigned short id;
TCHAR *szTitle;
TCHAR *szDesc;
Occurrence occurrence;
- BOOL snoozer;
- SYSTEMTIME time;
- unsigned short action;
- TCHAR *szCommand;
- TCHAR *szCommandParams;
- BYTE sound_num;
+ BOOL snoozer;
+ SYSTEMTIME time;
+ unsigned short action;
+ TCHAR *szCommand;
+ TCHAR *szCommandParams;
+ BYTE sound_num;
int flags;
- DWORD trigger_id;
+ DWORD trigger_id;
} ALARM;
#ifndef MIID_ALARMS
|