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/MenuItemEx/src/main.cpp    | 14 +++++++-------
 plugins/MenuItemEx/src/options.cpp |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/MenuItemEx/src')

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index b3e5ae126e..ce77c69938 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -21,7 +21,7 @@ HGENMENU hmenuVis,hmenuOff,hmenuHide,hmenuIgnore,hmenuProto,hmenuAdded,hmenuAuth
 HGENMENU hmenuCopyID,hmenuRecvFiles,hmenuStatusMsg,hmenuCopyIP,hmenuCopyMirVer;
 static HGENMENU hIgnoreItem[9], hProtoItem[MAX_PROTOS];
 HICON hIcon[5];
-BOOL bMetaContacts = FALSE, bPopUpService = FALSE;
+BOOL bMetaContacts = FALSE, bPopupService = FALSE;
 PROTOACCOUNT **accs;
 OPENOPTIONSDIALOG ood;
 int protoCount;
@@ -229,7 +229,7 @@ void ShowPopup(char* szText, TCHAR* tszText, HANDLE hContact)
 	_tcsncpy(ppd.lptzText, text, MAX_SECONDLINE - 1);
 	ppd.iSeconds = -1;
 
-	PUAddPopUpT(&ppd);
+	PUAddPopupT(&ppd);
 	mir_free(text);
 }
 
@@ -649,7 +649,7 @@ INT_PTR onCopyID(WPARAM wparam,LPARAM lparam)
 	else strcpy(buffer, szID);
 
 	CopyToClipboard((HWND)lparam, buffer, 0);
-	if (CTRL_IS_PRESSED && bPopUpService)
+	if (CTRL_IS_PRESSED && bPopupService)
 		ShowPopup(buffer, 0, hContact);
 
 	return 0;
@@ -689,7 +689,7 @@ INT_PTR onCopyStatusMsg(WPARAM wparam,LPARAM lparam)
 	}
 
 	CopyToClipboard((HWND)lparam, 0, buffer);
-	if (CTRL_IS_PRESSED && bPopUpService)
+	if (CTRL_IS_PRESSED && bPopupService)
 		ShowPopup(0, buffer, (HANDLE)wparam);
 
 	return 0;
@@ -703,7 +703,7 @@ INT_PTR onCopyIP(WPARAM wparam,LPARAM lparam)
 	getIP((HANDLE)wparam,szProto,(LPSTR)&szIP);
 
 	CopyToClipboard((HWND)lparam, szIP, 0);
-	if (CTRL_IS_PRESSED && bPopUpService)
+	if (CTRL_IS_PRESSED && bPopupService)
 		ShowPopup(szIP, 0, (HANDLE)wparam);
 
 	return 0;
@@ -714,7 +714,7 @@ INT_PTR onCopyMirVer(WPARAM wparam,LPARAM lparam)
 	LPSTR msg = getMirVer((HANDLE)wparam);
 	if (msg) {
 		CopyToClipboard((HWND)lparam, msg, 0);
-		if (CTRL_IS_PRESSED && bPopUpService)
+		if (CTRL_IS_PRESSED && bPopupService)
 			ShowPopup(msg, 0, (HANDLE)wparam);
 
 		mir_free(msg);
@@ -1056,7 +1056,7 @@ static int ContactSettingChanged( WPARAM wParam, LPARAM lParam )
 
 static int ModuleLoad(WPARAM wParam, LPARAM lParam)
 {
-	bPopUpService = ServiceExists(MS_POPUP_ADDPOPUP);
+	bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);
 	bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT);
 	return 0;
 }
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp
index 2622d13692..e1695ee706 100644
--- a/plugins/MenuItemEx/src/options.cpp
+++ b/plugins/MenuItemEx/src/options.cpp
@@ -1,7 +1,7 @@
 #include "menuex.h"
 
 extern HINSTANCE hinstance;
-extern BOOL bPopUpService;
+extern BOOL bPopupService;
 
 struct {
 	int idc;
@@ -45,7 +45,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
 				CheckDlgButton(hdlg, checkboxes[i].idc, (flags & checkboxes[i].flag) ? BST_CHECKED : BST_UNCHECKED);
 			}
 
-			if (bPopUpService)
+			if (bPopupService)
 			{
 				for (i = 0; i < 4; i++)
 				{
-- 
cgit v1.2.3