Reverted some broken plugins settings.

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

4 files changed, 8 insertions, 8 deletions

diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp
index c8b50a49a2..2cc4187bf1 100644
--- a/plugins/Weather/src/weather_contacts.cpp
+++ b/plugins/Weather/src/weather_contacts.cpp
@@ -202,7 +202,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE), (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));

 

 		// other checkbox options

-		CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopup", FALSE));

+		CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopUp", FALSE));

 		CheckDlgButton(hwndDlg, IDC_DAutoUpdate, db_get_b(hContact, WEATHERPROTONAME, "DAutoUpdate", FALSE));

 		CheckDlgButton(hwndDlg, IDC_Internal, db_get_b(hContact, WEATHERPROTONAME, "History", 0));

 

@@ -389,7 +389,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			db_set_b(hContact, WEATHERPROTONAME, "History", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Internal));

 			db_set_b(hContact, WEATHERPROTONAME, "Overwrite", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Overwrite));

 			db_set_b(hContact, WEATHERPROTONAME, "File", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));

-			db_set_b(hContact, WEATHERPROTONAME, "DPopup", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop));

+			db_set_b(hContact, WEATHERPROTONAME, "DPopUp", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop));

 			db_set_b(hContact, WEATHERPROTONAME, "DAutoUpdate", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DAutoUpdate));

 

 			// re-enable the protocol and update the data for the station

diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp
index b1fdff274b..57df8cd08d 100644
--- a/plugins/Weather/src/weather_opt.cpp
+++ b/plugins/Weather/src/weather_opt.cpp
@@ -185,10 +185,10 @@ void LoadOptions(void)
 	// advanced

 	opt.DisCondIcon = db_get_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", false);

 	// popup options

-	opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopup", true);

+	opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopUp", true);

 	opt.UpdatePopup = db_get_b(NULL, WEATHERPROTONAME, "UpdatePopup", true);

 	opt.AlertPopup = db_get_b(NULL, WEATHERPROTONAME, "AlertPopup", true);

-	opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopupOnChange", true);

+	opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopUpOnChange", true);

 	opt.ShowWarnings = db_get_b(NULL, WEATHERPROTONAME, "ShowWarnings", true);

 	// popup colors

 	opt.BGColour = db_get_dw(NULL, WEATHERPROTONAME, "BackgroundColour", GetSysColor(COLOR_BTNFACE));

@@ -254,10 +254,10 @@ void SaveOptions(void)
 	// advanced

 	db_set_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", (BYTE)opt.DisCondIcon);

 	// popup options

-	db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup);

+	db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup);

 	db_set_b(NULL, WEATHERPROTONAME, "UpdatePopup", (BYTE)opt.UpdatePopup);

 	db_set_b(NULL, WEATHERPROTONAME, "AlertPopup", (BYTE)opt.AlertPopup);

-	db_set_b(NULL, WEATHERPROTONAME, "PopupOnChange", (BYTE)opt.PopupOnChange);

+	db_set_b(NULL, WEATHERPROTONAME, "PopUpOnChange", (BYTE)opt.PopupOnChange);

 	db_set_b(NULL, WEATHERPROTONAME, "ShowWarnings", (BYTE)opt.ShowWarnings);

 	// popup colors

 	db_set_dw(NULL, WEATHERPROTONAME, "BackgroundColour", opt.BGColour);

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index 0ad926e5a1..d8396532fd 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -36,7 +36,7 @@ int WeatherPopup(WPARAM wParam, LPARAM lParam)
 {

 	// determine if the popup should display or not

 	if (opt.UsePopup && opt.UpdatePopup && (!opt.PopupOnChange || (BOOL)lParam) &&

-	      !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopup", 0)) 

+	      !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopUp", 0)) 

 	{

 		POPUPDATAT ppd = {0};

 		WEATHERINFO winfo;

diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp
index 95777c3fd5..a6cee642ff 100644
--- a/plugins/Weather/src/weather_update.cpp
+++ b/plugins/Weather/src/weather_update.cpp
@@ -102,7 +102,7 @@ int UpdateWeather(HANDLE hContact)
 	// have weather alert issued?

 	dbres = db_get_ts(hContact, WEATHERCONDITION, "Alert", &dbv);

 	if ( !dbres && dbv.ptszVal[0] != 0) {

-		if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopup", 0) && Ch) {

+		if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopUp", 0) && Ch) {

 			// display alert popup

 			wsprintf(str, _T("Alert for %s%c%s"), winfo.city, 255, dbv.ptszVal);

 			WPShowMessage(str, SM_WEATHERALERT);