From 8bbf210610804623aa581f3a547fc782fed9c118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20P=C3=B6sel?= <robyer@seznam.cz>
Date: Sun, 19 May 2013 12:36:06 +0000
Subject: "PopUp" everywhere was replaced to "Popup"

git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NewXstatusNotify/src/main.cpp    | 6 +++---
 plugins/NewXstatusNotify/src/options.cpp | 8 ++++----
 plugins/NewXstatusNotify/src/popup.cpp   | 2 +-
 plugins/NewXstatusNotify/src/xstatus.cpp | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/NewXstatusNotify')

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 9d135f31ee..765bc23f4f 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -534,7 +534,7 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, HANDLE hContact)
 				ppd.PluginWindowProc = PopupDlgProc;
 				ppd.PluginData = NULL;
 				ppd.iSeconds = opt.PopupTimeout;
-				PUAddPopUpT(&ppd);
+				PUAddPopupT(&ppd);
 				mir_free(str);
 			}
 			mir_free(smi.newstatusmsg);
@@ -687,7 +687,7 @@ void ShowStatusChangePopup(HANDLE hContact, char *szProto, WORD oldStatus, WORD
 	pdp->hAwayMsgProcess = NULL;
 	ppd.PluginData = pdp;
 	ppd.iSeconds = opt.PopupTimeout;
-	PUAddPopUpT(&ppd);
+	PUAddPopupT(&ppd);
 }
 
 void BlinkIcon(HANDLE hContact, char* szProto, WORD status)
@@ -1060,7 +1060,7 @@ void InitMainMenuItem()
 {
 	CLISTMENUITEM mi = { sizeof(mi) };
 	mi.flags = CMIF_TCHAR;
-	mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUP) ? _T("PopUps") : NULL;
+	mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUP) ? _T("Popups") : NULL;
 	mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;
 	hEnableDisableMenu = Menu_AddMainMenuItem(&mi);
 
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp
index c522654ebd..8399ce547b 100644
--- a/plugins/NewXstatusNotify/src/options.cpp
+++ b/plugins/NewXstatusNotify/src/options.cpp
@@ -287,7 +287,7 @@ void EnablePopupTextControls(HWND hwndDlg, BOOL bEnable)
 	//EnableWindow(GetDlgItem(hwndDlg, IDC_READAWAYMSG), bEnable);
 }
 
-INT_PTR CALLBACK DlgProcPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	switch (msg)
 	{
@@ -418,7 +418,7 @@ INT_PTR CALLBACK DlgProcPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 									break;
 							}
 
-							PUAddPopUpT(&ppd);
+							PUAddPopupT(&ppd);
 						}
 
 						return FALSE;
@@ -1049,10 +1049,10 @@ int OptionsInitialize(WPARAM wParam, LPARAM lParam)
 
 	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
 		odp.pszTitle = LPGEN("Status Notify");
-		odp.pszGroup = LPGEN("PopUps");
+		odp.pszGroup = LPGEN("Popups");
 		odp.pszTab = LPGEN("General");
 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
-		odp.pfnDlgProc = DlgProcPopUpOpts;
+		odp.pfnDlgProc = DlgProcPopupOpts;
 		Options_AddPage(wParam, &odp);
 
 		odp.pszTab = LPGEN("Extra status");
diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index e082e59595..8a0e5b19f2 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -106,7 +106,7 @@ void PopupAction(HWND hWnd, BYTE action)
 			return;
 		}
 
-		PUDeletePopUp(hWnd);
+		PUDeletePopup(hWnd);
 	}
 }
 
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 3394286462..ea0acee828 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -207,7 +207,7 @@ void ShowPopup(XSTATUSCHANGE *xsc)
 
 	ppd.PluginWindowProc = (WNDPROC)PopupDlgProc;
 	ppd.iSeconds = opt.PopupTimeout; 
-	PUAddPopUpT(&ppd);
+	PUAddPopupT(&ppd);
 }
 
 void PlayXStatusSound(int action)
-- 
cgit v1.2.3