"PopUp" everywhere was replaced to "Popup"

git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 22 insertions, 22 deletions

diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp
index 813a223306..97cbc22653 100644
--- a/protocols/IcqOscarJ/src/fam_03buddy.cpp
+++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp
@@ -572,7 +572,7 @@ void CIcqProto::handleUserOnline(BYTE *buf, WORD wLen, serverthread_info *info)
 			icq_sendRemoveContact(dwUIN, NULL);

 			AddToSpammerList(dwUIN);

 			if (getSettingByte(NULL, "PopupsSpamEnabled", DEFAULT_SPAM_POPUPS_ENABLED))

-				ShowPopUpMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM);

+				ShowPopupMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM);

 			CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);

 

 			NetLog_Server("Contact %u deleted", dwUIN);

diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp
index 2a4766d1a8..ac3a7c9795 100644
--- a/protocols/IcqOscarJ/src/fam_04message.cpp
+++ b/protocols/IcqOscarJ/src/fam_04message.cpp
@@ -2959,7 +2959,7 @@ void CIcqProto::handleTypingNotification(BYTE *buf, WORD wLen, WORD wFlags, DWOR
 			char *nick = NickFromHandleUtf(hContact);

 

 			null_snprintf(szMsg, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" has closed the message window."), szFormat, MAX_PATH), nick);

-			ShowPopUpMsg(hContact, ICQTranslateUtfStatic(LPGEN("ICQ Note"), szFormat, MAX_PATH), szMsg, LOG_NOTE);

+			ShowPopupMsg(hContact, ICQTranslateUtfStatic(LPGEN("ICQ Note"), szFormat, MAX_PATH), szMsg, LOG_NOTE);

 			SAFE_FREE((void**)&nick);

 

 			NetLog_Server("%s has closed the message window.", strUID(dwUin, szUid));

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index e43d1dc719..166f81ce79 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -31,7 +31,7 @@
 

 #include <win2k.h>

 

-extern BOOL bPopUpService;

+extern BOOL bPopupService;

 

 static const char* szLogLevelDescr[] = {

 	LPGEN("Display all problems"),

@@ -606,12 +606,12 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
 	odp.pfnDlgProc = DlgProcIcqPrivacyOpts;

 	Options_AddPage(wParam, &odp);

 

-	if (bPopUpService) {

+	if (bPopupService) {

 		odp.position = 100000000;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);

 		odp.groupPosition = 900000000;

 		odp.pfnDlgProc = DlgProcIcqPopupOpts;

-		odp.ptszGroup = LPGENT("PopUps");

+		odp.ptszGroup = LPGENT("Popups");

 		odp.ptszTab = NULL;

 		Options_AddPage(wParam, &odp);

 	}

diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp
index e978f6e5af..bef035a294 100644
--- a/protocols/IcqOscarJ/src/icq_popups.cpp
+++ b/protocols/IcqOscarJ/src/icq_popups.cpp
@@ -24,12 +24,12 @@
 // -----------------------------------------------------------------------------

 //  DESCRIPTION:

 //

-//  PopUp Plugin stuff

+//  Popup Plugin stuff

 //

 // -----------------------------------------------------------------------------

 #include "icqoscar.h"

 

-extern BOOL bPopUpService;

+extern BOOL bPopupService;

 

 static const UINT icqPopupsControls[] = {

 	IDC_POPUPS_LOG_ENABLED, IDC_POPUPS_SPAM_ENABLED, IDC_PREVIEW, IDC_USESYSICONS, IDC_POPUP_LOG0_TIMEOUT,

@@ -102,11 +102,11 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		switch (LOWORD(wParam)) {

 		case IDC_PREVIEW:

 			{

-				ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Note"),    LOG_NOTE);

-				ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Warning"), LOG_WARNING);

-				ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Error"),   LOG_ERROR);

-				ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Fatal"),   LOG_FATAL);

-				ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Spambot"), POPTYPE_SPAM);

+				ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Note"),    LOG_NOTE);

+				ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Warning"), LOG_WARNING);

+				ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Error"),   LOG_ERROR);

+				ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Fatal"),   LOG_FATAL);

+				ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Spambot"), POPTYPE_SPAM);

 			}

 			return FALSE;

 

@@ -200,9 +200,9 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	return FALSE;

 }

 

-int CIcqProto::ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType)

+int CIcqProto::ShowPopupMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType)

 {

-	if (bPopUpService && getSettingByte(NULL, "PopupsEnabled", DEFAULT_POPUPS_ENABLED))

+	if (bPopupService && getSettingByte(NULL, "PopupsEnabled", DEFAULT_POPUPS_ENABLED))

 	{

 		POPUPDATAT ppd = { 0 };

 		LPCTSTR rsIcon;

@@ -284,7 +284,7 @@ int CIcqProto::ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *sz
 		ppd.PluginWindowProc = NULL;

 		ppd.PluginData = NULL;

 		ppd.iSeconds = ppd.iSeconds;

-		return PUAddPopUpT(&ppd);

+		return PUAddPopupT(&ppd);

 	}

 	return -1; // Failure

 }

diff --git a/protocols/IcqOscarJ/src/icq_popups.h b/protocols/IcqOscarJ/src/icq_popups.h
index 95e997a826..5214329cbd 100644
--- a/protocols/IcqOscarJ/src/icq_popups.h
+++ b/protocols/IcqOscarJ/src/icq_popups.h
@@ -24,7 +24,7 @@
 // -----------------------------------------------------------------------------

 //  DESCRIPTION:

 //

-//  Headers for PopUp Plugin support

+//  Headers for Popup Plugin support

 //

 // -----------------------------------------------------------------------------

 #ifndef __ICQ_POPUPS_H

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 561fe3e60b..81d15edf0e 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -553,7 +553,7 @@ struct CIcqProto : public PROTO_INTERFACE
 	BOOL   unpackUID(BYTE **ppBuf, WORD *pwLen, DWORD *pdwUIN, uid_str *ppszUID);

 

 	//----| icq_popups.cpp |--------------------------------------------------------------

-	int    ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType);

+	int    ShowPopupMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType);

 

 	//----| icq_proto.cpp |--------------------------------------------------------------

 	void   __cdecl CheekySearchThread( void* );

diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp
index 017025ea03..58f71046f4 100644
--- a/protocols/IcqOscarJ/src/init.cpp
+++ b/protocols/IcqOscarJ/src/init.cpp
@@ -35,7 +35,7 @@
 HINSTANCE hInst;

 int hLangpack;

 CLIST_INTERFACE *pcli;

-BOOL bPopUpService = FALSE;

+BOOL bPopupService = FALSE;

 

 HANDLE   hExtraXStatus;

 

@@ -91,7 +91,7 @@ IconItem g_IconsList[4] =
 

 int ModuleLoad(WPARAM wParam, LPARAM lParam)

 {

-	bPopUpService = ServiceExists(MS_POPUP_ADDPOPUP);

+	bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);

 	return 0;

 }

 

diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp
index 402863a456..881fe82cba 100644
--- a/protocols/IcqOscarJ/src/log.cpp
+++ b/protocols/IcqOscarJ/src/log.cpp
@@ -29,7 +29,7 @@
 // -----------------------------------------------------------------------------

 #include "icqoscar.h"

 

-extern BOOL bPopUpService;

+extern BOOL bPopupService;

 

 static const char *szLevelDescr[] = {LPGEN("ICQ Note"), LPGEN("ICQ Warning"), LPGEN("ICQ Error"), LPGEN("ICQ Fatal")};

 

@@ -46,9 +46,9 @@ void __cdecl CIcqProto::icq_LogMessageThread(void* arg)
 	if (!err)

 		return;

 

-	if (bPopUpService && getSettingByte(NULL, "PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED))

+	if (bPopupService && getSettingByte(NULL, "PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED))

 	{

-		ShowPopUpMsg(NULL, err->szTitle, err->szMsg, err->bLevel); 

+		ShowPopupMsg(NULL, err->szTitle, err->szMsg, err->bLevel); 

 

 		SAFE_FREE((void**)&err->szMsg);

 		SAFE_FREE((void**)&err);