summaryrefslogtreecommitdiff
path: root/protocols/MSN/src/msn_mail.cpp
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-05-19 12:36:06 +0000
committerRobert Pösel <robyer@seznam.cz>2013-05-19 12:36:06 +0000
commit8bbf210610804623aa581f3a547fc782fed9c118 (patch)
treeb824cb7b0aba1740501e861ee78dbd49bac65022 /protocols/MSN/src/msn_mail.cpp
parent02f6b3a61924a143b3a6db44d3428a651a3b979c (diff)
"PopUp" everywhere was replaced to "Popup"
git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MSN/src/msn_mail.cpp')
-rw-r--r--protocols/MSN/src/msn_mail.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index cbd45e8f92..87d6dbebed 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -220,7 +220,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
TCHAR tBuffer2[512];
int UnreadMessages = mUnreadMessages;
int UnreadJunkEmails = mUnreadJunkEmails;
- bool ShowPopUp = isInitial;
+ bool ShowPopup = isInitial;
MimeHeaders tFileInfo;
tFileInfo.readFromBuffer(msgBody);
@@ -277,7 +277,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
mir_sntprintf(tBuffer, SIZEOF(tBuffer), msgtxt, mimeFromW, Fromaddr);
mir_free(mimeFromW);
mir_free(mimeSubjectW);
- ShowPopUp = true;
+ ShowPopup = true;
}
else
{
@@ -292,7 +292,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
if (UnreadMessages == mUnreadMessages && UnreadJunkEmails == mUnreadJunkEmails && !isInitial)
return;
- ShowPopUp &= mUnreadMessages != 0 || (mUnreadJunkEmails != 0 && !getByte("DisableHotmailJunk", 0));
+ ShowPopup &= mUnreadMessages != 0 || (mUnreadJunkEmails != 0 && !getByte("DisableHotmailJunk", 0));
HANDLE hContact = MSN_HContactFromEmail(MyOptions.szEmail);
if (hContact)
@@ -300,7 +300,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1);
displayEmailCount(hContact);
- if (ShowPopUp && !getByte("DisableHotmailTray", 1))
+ if (ShowPopup && !getByte("DisableHotmailTray", 1))
{
CLISTEVENT cle = {0};
@@ -321,7 +321,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
SendBroadcast(NULL, ACKTYPE_EMAIL, ACKRESULT_STATUS, NULL, 0);
// Disable to notify receiving hotmail
- if (ShowPopUp && !getByte("DisableHotmail", 0))
+ if (ShowPopup && !getByte("DisableHotmail", 0))
{
SkinPlaySound(mailsoundname);
@@ -342,7 +342,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
szUrl);
}
- if (!getByte("RunMailerOnHotmail", 0) || !ShowPopUp || isInitial)
+ if (!getByte("RunMailerOnHotmail", 0) || !ShowPopup || isInitial)
return;
char mailerpath[MAX_PATH];