diff options
Diffstat (limited to 'protocols/MSN/src')
| -rw-r--r-- | protocols/MSN/src/msn_mail.cpp | 12 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_misc.cpp | 4 | ||||
| -rw-r--r-- | protocols/MSN/src/msn_opts.cpp | 8 |
3 files changed, 12 insertions, 12 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];
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 9e110b8fd0..bf31569fd8 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -941,7 +941,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara else if (tData->url != NULL)
CallService(MS_UTILS_OPENURL, 1, (LPARAM)tData->url);
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case WM_CONTEXTMENU:
@@ -950,7 +950,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara if (hContact)
CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1);
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 644fddaa6e..37c9ec9db6 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -474,9 +474,9 @@ static INT_PTR CALLBACK DlgProcMsnConnOpts(HWND hwndDlg, UINT msg, WPARAM wParam }
/////////////////////////////////////////////////////////////////////////////////////////
-// PopUp Options Dialog: style, position, color, font...
+// Popup Options Dialog: style, position, color, font...
-static INT_PTR CALLBACK DlgProcHotmailPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcHotmailPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
static bool bEnabled;
@@ -717,7 +717,7 @@ int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Notifications");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
- odp.pfnDlgProc = DlgProcHotmailPopUpOpts;
+ odp.pfnDlgProc = DlgProcHotmailPopupOpts;
Options_AddPage(wParam, &odp);
return 0;
@@ -737,7 +737,7 @@ void CMsnProto::LoadOptions(void) {
memset(&MyOptions, 0, sizeof(MyOptions));
- //PopUp Options
+ //Popup Options
MyOptions.ManageServer = getByte("ManageServer", TRUE) != 0;
MyOptions.ShowErrorsAsPopups = getByte("ShowErrorsAsPopups", TRUE) != 0;
MyOptions.SlowSend = getByte("SlowSend", FALSE) != 0;
|