From 1042a84dd1f01c249a946ec708d3dae2881ecfab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 28 Jan 2016 15:17:43 +0000 Subject: atavism removed: CLISTEVENT::cbSize git-svn-id: http://svn.miranda-ng.org/main/trunk@16180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NotesAndReminders/src/reminders.cpp | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) (limited to 'plugins/NotesAndReminders/src') diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp index e356728c4a..87222c5e08 100644 --- a/plugins/NotesAndReminders/src/reminders.cpp +++ b/plugins/NotesAndReminders/src/reminders.cpp @@ -186,9 +186,7 @@ static void RemoveReminderSystemEvent(REMINDERDATA *p) for (i=0; ; i++) { - CLISTEVENT *pev; - - pev = (CLISTEVENT*) CallService(MS_CLIST_GETEVENT,(WPARAM)INVALID_HANDLE_VALUE,i); + CLISTEVENT *pev = (CLISTEVENT*) CallService(MS_CLIST_GETEVENT,(WPARAM)INVALID_HANDLE_VALUE,i); if (!pev) break; @@ -685,23 +683,18 @@ static void UpdateReminderEvent(REMINDERDATA *pReminder, UINT nElapsedSeconds, B static void FireReminder(REMINDERDATA *pReminder, BOOL *pHasPlayedSound) { - DWORD dwSoundMask; - if (pReminder->SystemEventQueued) return; // add a system event { - CLISTEVENT ev = { 0 }; - - ev.cbSize = sizeof(ev); - ev.hIcon = g_hReminderIcon; - ev.flags = CLEF_URGENT; - ev.lParam = (LPARAM)pReminder->uid; - ev.pszService = MODULENAME"/OpenTriggeredReminder"; - ev.pszTooltip = Translate("Reminder"); - - CallService(MS_CLIST_ADDEVENT,0,(LPARAM)&ev); + CLISTEVENT ev = {}; + ev.hIcon = g_hReminderIcon; + ev.flags = CLEF_URGENT; + ev.lParam = (LPARAM)pReminder->uid; + ev.pszService = MODULENAME"/OpenTriggeredReminder"; + ev.pszTooltip = Translate("Reminder"); + CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&ev); } pReminder->SystemEventQueued = TRUE; @@ -713,7 +706,7 @@ static void FireReminder(REMINDERDATA *pReminder, BOOL *pHasPlayedSound) return; } - dwSoundMask = 1 << pReminder->SoundSel; + DWORD dwSoundMask = 1 << pReminder->SoundSel; pReminder->RepeatSoundTTL = pReminder->RepeatSound; -- cgit v1.2.3