"PopUp" everywhere was replaced to "Popup"

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

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp
index 0816172bf8..94a93d5e43 100644
--- a/plugins/PluginUpdater/src/Notifications.cpp
+++ b/plugins/PluginUpdater/src/Notifications.cpp
@@ -31,7 +31,7 @@ void PopupAction(HWND hWnd, BYTE action)
 	case PCA_DONOTHING:

 		return;

 	}

-	PUDeletePopUp(hWnd);

+	PUDeletePopup(hWnd);

 }

 

 static LRESULT CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

@@ -45,13 +45,13 @@ static LRESULT CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 				case IDYES:

 					if (IsWindow(pmpd->hDialog))

 						EndDialog(pmpd->hDialog, LOWORD(wParam));

-					PUDeletePopUp(hDlg);

+					PUDeletePopup(hDlg);

 					break;

 

 				case IDNO:

 					if (IsWindow(pmpd->hDialog))

 						EndDialog(pmpd->hDialog, LOWORD(wParam));

-					PUDeletePopUp(hDlg);

+					PUDeletePopup(hDlg);

 					break;

 				}

 			}

@@ -116,7 +116,7 @@ static void MakePopupAction(POPUPACTION &pa, int id)
 

 void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType)

 {	

-	if ( !ServiceExists(MS_POPUP_ADDPOPUP) || !db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) ) {

+	if ( !ServiceExists(MS_POPUP_ADDPOPUP) || !db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) ) {

 		char setting[100];

 		mir_snprintf(setting, SIZEOF(setting), "Popups%dM", Number);

 		if (db_get_b(NULL, MODNAME, setting, DEFAULT_MESSAGE_ENABLED)) {

diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp
index 35970f383c..9f4d228139 100644
--- a/plugins/PluginUpdater/src/Options.cpp
+++ b/plugins/PluginUpdater/src/Options.cpp
@@ -171,7 +171,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 	return FALSE;

 }

 

-INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)

+INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	int i;

 	char str[20] = {0}, str2[20] = {0};

@@ -404,9 +404,9 @@ int OptInit(WPARAM wParam, LPARAM lParam)
 

 	if ( ServiceExists(MS_POPUP_ADDPOPUP)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);

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

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

 		odp.ptszTitle = LPGENT("Plugin Updater");

-		odp.pfnDlgProc = DlgPopUpOpts;

+		odp.pfnDlgProc = DlgPopupOpts;

 		Options_AddPage(wParam, &odp);

 	}

 	return 0;