diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-03-15 21:47:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-03-15 21:47:10 +0000 |
| commit | 9d482ed81c2a6a3361a5a9b2d0efbfc4b6b815c5 (patch) | |
| tree | e5b304c159f7c79ab44926eee439eb93288acec6 /plugins/TabSRMM/src/sendlater.cpp | |
| parent | 7fe6e93058f0e9253e2a79d7fc2d7a136784f791 (diff) | |
- POPUPDATAT_V2 replaced with POPUPDATAT in all possible cases;
- fix: wrong popup initialization code;
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@4057 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/sendlater.cpp')
| -rw-r--r-- | plugins/TabSRMM/src/sendlater.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index 4b62744ec7..709198ef4f 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -125,8 +125,6 @@ void CSendLaterJob::writeFlags() CSendLaterJob::~CSendLaterJob()
{
if (fSuccess || fFailed) {
- POPUPDATAT_V2 ppd = {0};
-
if ((sendLater->haveErrorPopups() && fFailed) || (sendLater->haveSuccessPopups() && fSuccess)) {
bool fShowPopup = true;
@@ -138,9 +136,8 @@ CSendLaterJob::~CSendLaterJob() if (PluginConfig.g_PopupAvail && fShowPopup) {
TCHAR *tszName = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
- ZeroMemory((void*)&ppd, sizeof(ppd));
+ POPUPDATAT ppd = {0};
ppd.lchContact = hContact;
- ppd.cbSize = sizeof(ppd);
mir_sntprintf(ppd.lptzContactName, MAX_CONTACTNAME, _T("%s"), tszName ? tszName : TranslateT("'(Unknown Contact)'"));
TCHAR *msgPreview = Utils::GetPreviewWithEllipsis(reinterpret_cast<TCHAR *>(&pBuf[lstrlenA((char *)pBuf) + 1]), 100);
if (fSuccess) {
@@ -162,7 +159,7 @@ CSendLaterJob::~CSendLaterJob() ppd.lchIcon = fFailed ? PluginConfig.g_iconErr : PluginConfig.g_IconMsgEvent;
ppd.PluginData = (void*)hContact;
ppd.iSeconds = fFailed ? -1 : nen_options.iDelayMsg;
- CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&ppd, 0);
+ PUAddPopUpT(&ppd);
}
}
if (fFailed && (bCode == JOB_AGE || bCode == JOB_REMOVABLE) && szId[0] == 'S')
|