diff options
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Alarms/src/alarmlist.cpp | 2 | ||||
-rw-r--r-- | plugins/BuddyExpectator/src/BuddyExpectator.cpp | 4 | ||||
-rw-r--r-- | plugins/Clist_nicer/src/init.cpp | 4 | ||||
-rw-r--r-- | plugins/ContactsPlus/src/main.cpp | 2 | ||||
-rw-r--r-- | plugins/FileAsMessage/src/dialog.cpp | 4 | ||||
-rw-r--r-- | plugins/GmailNotifier/src/notify.cpp | 2 | ||||
-rw-r--r-- | plugins/NewXstatusNotify/src/main.cpp | 3 | ||||
-rw-r--r-- | plugins/NotesAndReminders/src/reminders.cpp | 25 | ||||
-rw-r--r-- | plugins/SMS/src/receive.cpp | 4 | ||||
-rw-r--r-- | plugins/Scriver/src/msgs.cpp | 4 | ||||
-rw-r--r-- | plugins/TabSRMM/src/globals.cpp | 1 | ||||
-rw-r--r-- | plugins/TabSRMM/src/mim.cpp | 3 | ||||
-rw-r--r-- | plugins/TabSRMM/src/msgdlgutils.cpp | 1 | ||||
-rw-r--r-- | plugins/UserInfoEx/src/svc_reminder.cpp | 2 | ||||
-rw-r--r-- | plugins/YAMN/src/browser/mailbrowser.cpp | 18 |
15 files changed, 31 insertions, 48 deletions
diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index 0c0d224de1..1d394db194 100644 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -555,7 +555,7 @@ void DoAlarm(ALARM *alarm) if (alarm->action & AAF_SYSTRAY)
{
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.hIcon = hIconSystray;
cle.ptszTooltip = alarm->szTitle;
cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index ceefadb950..17d334e030 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -278,7 +278,7 @@ void ReturnNotify(MCONTACT hContact, TCHAR *message) }
if (options.iShowEvent > 0) {
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hIcon = hIcon;
cle.pszService = "BuddyExpectator/actionReturned";
@@ -317,7 +317,7 @@ void GoneNotify(MCONTACT hContact, TCHAR *message) }
if (options.iShowEvent2 > 0) {
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hIcon = hIcon;
cle.pszService = "BuddyExpectator/actionStillAbsent";
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index be03a06270..f51fe04ad3 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -49,8 +49,8 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY); int ShowHide(WPARAM wParam, LPARAM lParam);
int ClcShutdown(WPARAM wParam, LPARAM lParam);
-CListEvent *AddEvent(CLISTEVENT *cle);
-ClcGroup *AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);
+CListEvent* AddEvent(CLISTEVENT *cle);
+ClcGroup* AddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD flags, int groupId, int calcTotalMembers);
int AddContactToGroup(struct ClcData *dat, ClcGroup *group, MCONTACT hContact);
int AddInfoItemToGroup(ClcGroup *group, int flags, const TCHAR *pszText);
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 5ec186bf19..33ffa53e20 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -76,7 +76,7 @@ static int HookDBEventAdded(WPARAM hContact, LPARAM hDbEvent) TCHAR caToolTip[128];
mir_sntprintf(caToolTip, _T("%s %s"), TranslateT("Contacts received from"), pcli->pfnGetContactDisplayName(hContact, 0));
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hDbEvent = hDbEvent;
cle.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 8864263545..6a62142159 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -463,9 +463,7 @@ void FILEECHO::incomeRequest(char *param) // else
if (!IsWindowVisible(hDlg) && !AutoMin)
{
- CLISTEVENT cle;
- memset(&cle, 0, sizeof(cle));
- cle.cbSize = sizeof(cle);
+ CLISTEVENT cle = {};
cle.hContact = hContact;
cle.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SMALLICON));
cle.flags = CLEF_URGENT;
diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp index a4f6c054ea..b4991cfaa5 100644 --- a/plugins/GmailNotifier/src/notify.cpp +++ b/plugins/GmailNotifier/src/notify.cpp @@ -87,7 +87,7 @@ void NotifyUser(Account *curAcc) }
}
if (opt.notifierOnTray&&newMails > 0) {
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.hContact = curAcc->hContact;
cle.hDbEvent = 1;
cle.flags = CLEF_URGENT;
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index ee1910fd42..571870f566 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -311,8 +311,7 @@ void GetStatusText(MCONTACT hContact, WORD newStatus, WORD oldStatus, TCHAR *stz void BlinkIcon(MCONTACT hContact, HICON hIcon, TCHAR *stzText)
{
- CLISTEVENT cle = { 0 };
- cle.cbSize = sizeof(cle);
+ CLISTEVENT cle = {};
cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
cle.hContact = hContact;
cle.hDbEvent = hContact;
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;
diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp index 775ad114a1..766cca7866 100644 --- a/plugins/SMS/src/receive.cpp +++ b/plugins/SMS/src/receive.cpp @@ -234,7 +234,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent) memcpy(pszServiceFunctionName, SMS_READ, sizeof(SMS_READ));
mir_sntprintf(szToolTip, TranslateT("SMS Message from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.flags = CLEF_TCHAR;
cle.hContact = hContact;
cle.hDbEvent = hDbEvent;
@@ -257,7 +257,7 @@ int handleNewMessage(WPARAM hContact, LPARAM hDbEvent) memcpy(pszServiceFunctionName, SMS_READ_ACK, sizeof(SMS_READ_ACK));
mir_sntprintf(szToolTip, TranslateT("SMS Confirmation from %s"), pcli->pfnGetContactDisplayName(hContact, 0));
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.flags = CLEF_TCHAR;
cle.hContact = hContact;
cle.hDbEvent = hDbEvent;
diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index a7e3db3628..e8cf42c21d 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -123,7 +123,7 @@ static int MessageEventAdded(WPARAM hContact, LPARAM lParam) TCHAR *contactName = (TCHAR*)pcli->pfnGetContactDisplayName(hContact, 0);
TCHAR toolTip[256];
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.flags = CLEF_TCHAR;
cle.hContact = hContact;
cle.hDbEvent = hDbEvent;
@@ -223,7 +223,6 @@ static int TypingMessage(WPARAM hContact, LPARAM lParam) pcli->pfnRemoveEvent(hContact, 1);
CLISTEVENT cle = {};
- cle.cbSize = sizeof(cle);
cle.hContact = hContact;
cle.hDbEvent = 1;
cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR;
@@ -297,7 +296,6 @@ static void RestoreUnreadMessageAlerts(void) TCHAR toolTip[256];
CLISTEVENT cle = {};
- cle.cbSize = sizeof(cle);
cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
cle.pszService = "SRMsg/ReadMessage";
cle.flags = CLEF_TCHAR;
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index 2c0e32a1e5..e3ea4f20e9 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -561,7 +561,6 @@ void CGlobals::RestoreUnreadMessageAlerts(void) TCHAR toolTip[256];
CLISTEVENT cle = {};
- cle.cbSize = sizeof(cle);
cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
cle.pszService = "SRMsg/ReadMessage";
cle.flags = CLEF_TCHAR;
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index c2bb842037..9febb58db2 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -314,7 +314,6 @@ int CMimAPI::TypingMessage(WPARAM hContact, LPARAM mode) pcli->pfnRemoveEvent(hContact, 1); CLISTEVENT cle = {}; - cle.cbSize = sizeof(cle); cle.hContact = hContact; cle.hDbEvent = 1; cle.flags = CLEF_ONLYAFEW | CLEF_TCHAR; @@ -545,7 +544,7 @@ nowindowcreate: if (!nen_options.bTraySupport) { TCHAR toolTip[256], *contactName; - CLISTEVENT cle = { sizeof(cle) }; + CLISTEVENT cle = {}; cle.hContact = hContact; cle.hDbEvent = hDbEvent; cle.flags = CLEF_TCHAR; diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index f7b32970e7..c669c187cb 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -773,7 +773,6 @@ void TSAPI FlashOnClist(HWND hwndDlg, TWindowData *dat, MEVENT hEvent, DBEVENTIN if ((GetForegroundWindow() != dat->pContainer->hwnd || dat->pContainer->hwndActive != hwndDlg) && !(dbei->flags & DBEF_SENT) && dbei->eventType == EVENTTYPE_MESSAGE && !(dat->dwFlagsEx & MWF_SHOW_FLASHCLIST)) {
CLISTEVENT cle = {};
- cle.cbSize = sizeof(cle);
cle.hContact = (MCONTACT)dat->hContact;
cle.hDbEvent = hEvent;
cle.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index 44467f2fac..ceddb9aaba 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -310,7 +310,7 @@ static void NotifyFlashCListIcon(MCONTACT hContact, const CEvent &evt) TCHAR szMsg[MAX_PATH];
- CLISTEVENT cle = { sizeof(cle) };
+ CLISTEVENT cle = {};
cle.hContact = hContact;
cle.flags = CLEF_URGENT|CLEF_TCHAR;
cle.hDbEvent = NULL;
diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index ea390d7cd8..644c849372 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -638,16 +638,14 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D char sMsg[250]; mir_snprintf(sMsg, Translate("%s : %d new mail message(s), %d total"), ActualAccount->Name, MN->Real.PopupNC + MN->Virtual.PopupNC, MN->Real.PopupTC + MN->Virtual.PopupTC); if (!(nflags & YAMN_ACC_CONTNOEVENT)) { - CLISTEVENT cEvent; - cEvent.cbSize = sizeof(CLISTEVENT); - cEvent.hContact = ActualAccount->hContact; - cEvent.hIcon = g_LoadIconEx(2); - cEvent.hDbEvent = ActualAccount->hContact; - cEvent.lParam = ActualAccount->hContact; - cEvent.pszService = MS_YAMN_CLISTDBLCLICK; - cEvent.pszTooltip = sMsg; - cEvent.flags = 0; - CallServiceSync(MS_CLIST_ADDEVENT, 0, (LPARAM)&cEvent); + CLISTEVENT evt = {};
+ evt.hContact = ActualAccount->hContact; + evt.hIcon = g_LoadIconEx(2); + evt.hDbEvent = ActualAccount->hContact; + evt.lParam = ActualAccount->hContact; + evt.pszService = MS_YAMN_CLISTDBLCLICK; + evt.pszTooltip = sMsg; + CallServiceSync(MS_CLIST_ADDEVENT, 0, (LPARAM)&evt); } db_set_s(ActualAccount->hContact, "CList", "StatusMsg", sMsg); |