1 files changed, 18 insertions, 18 deletions

diff --git a/plugins/GmailNotifier/src/options.cpp b/plugins/GmailNotifier/src/options.cpp
index f329cbf2e0..652a674981 100644
--- a/plugins/GmailNotifier/src/options.cpp
+++ b/plugins/GmailNotifier/src/options.cpp
@@ -8,10 +8,10 @@ static void SaveButton(HWND hwndDlg,HWND hwndCombo, int curIndex) {
 		SendMessageA(hwndCombo, CB_DELETESTRING, curIndex, 0);

 		SendMessageA(hwndCombo, CB_INSERTSTRING, curIndex, (LPARAM)acc[curIndex].name);

 		SendMessageA(hwndCombo, CB_SETCURSEL, curIndex, 0);

-		db_set_s(acc[curIndex].hContact, pluginName, "name", acc[curIndex].name);

-		db_set_s(acc[curIndex].hContact, pluginName, "Nick", acc[curIndex].name);

+		db_set_s(acc[curIndex].hContact, MODULE_NAME, "name", acc[curIndex].name);

+		db_set_s(acc[curIndex].hContact, MODULE_NAME, "Nick", acc[curIndex].name);

 		GetDlgItemTextA(hwndDlg, IDC_PASS, acc[curIndex].pass, _countof(acc[curIndex].pass));

-		db_set_s(acc[curIndex].hContact, pluginName, "Password", acc[curIndex].pass);

+		db_set_s(acc[curIndex].hContact, MODULE_NAME, "Password", acc[curIndex].pass);

 	}

 }

 static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -77,7 +77,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		}

 		{

 			DBVARIANT dbv;

-			if (!db_get_s(NULL, pluginName, "OpenUsePrgPath", &dbv)) {

+			if (!db_get_s(NULL, MODULE_NAME, "OpenUsePrgPath", &dbv)) {

 				mir_strcpy(str, dbv.pszVal);

 				db_free(&dbv);

 			}

@@ -150,7 +150,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			SetDlgItemTextA(hwndDlg, IDC_PASS, "");

 			SetFocus(hwndCombo);

 			acc[curIndex].hContact = CallService(MS_DB_CONTACT_ADD, 0, 0);

-			Proto_AddToContact(acc[curIndex].hContact, pluginName);

+			Proto_AddToContact(acc[curIndex].hContact, MODULE_NAME);

 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

 			break;

 		

@@ -202,20 +202,20 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			if (opt.circleTime > 0) {

 				KillTimer(NULL, hTimer);

 				hTimer = SetTimer(NULL, 0, opt.circleTime * 60000, TimerProc);

-				db_set_dw(NULL, pluginName, "circleTime", opt.circleTime);

+				db_set_dw(NULL, MODULE_NAME, "circleTime", opt.circleTime);

 			}

 			opt.notifierOnTray = IsDlgButtonChecked(hwndDlg, IDC_OPTTRAY);

 			opt.notifierOnPop = IsDlgButtonChecked(hwndDlg, IDC_OPTPOP);

-			db_set_dw(NULL, pluginName, "notifierOnTray", opt.notifierOnTray);

-			db_set_dw(NULL, pluginName, "notifierOnPop", opt.notifierOnPop);

+			db_set_dw(NULL, MODULE_NAME, "notifierOnTray", opt.notifierOnTray);

+			db_set_dw(NULL, MODULE_NAME, "notifierOnPop", opt.notifierOnPop);

 

 			opt.popupDuration = GetDlgItemInt(hwndDlg, IDC_DURATION, NULL, TRUE);

-			db_set_dw(NULL, pluginName, "popupDuration", opt.popupDuration);

+			db_set_dw(NULL, MODULE_NAME, "popupDuration", opt.popupDuration);

 

 			opt.popupBgColor = SendDlgItemMessage(hwndDlg, IDC_BGCOLOR, CPM_GETCOLOUR, 0, opt.popupBgColor);

 			opt.popupTxtColor = SendDlgItemMessage(hwndDlg, IDC_TEXTCOLOR, CPM_GETCOLOUR, 0, opt.popupBgColor);

-			db_set_dw(NULL, pluginName, "popupBgColor", opt.popupBgColor);

-			db_set_dw(NULL, pluginName, "popupTxtColor", opt.popupTxtColor);

+			db_set_dw(NULL, MODULE_NAME, "popupBgColor", opt.popupBgColor);

+			db_set_dw(NULL, MODULE_NAME, "popupTxtColor", opt.popupTxtColor);

 

 			if (IsDlgButtonChecked(hwndDlg, IDC_SYSDEF) == BST_CHECKED)

 				opt.OpenUsePrg = 0;

@@ -226,8 +226,8 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			}

 			GetDlgItemTextA(hwndDlg, IDC_PRG, str, _countof(str));

 

-			db_set_dw(NULL, pluginName, "OpenUsePrg", opt.OpenUsePrg);

-			db_set_s(NULL, pluginName, "OpenUsePrgPath", str);

+			db_set_dw(NULL, MODULE_NAME, "OpenUsePrg", opt.OpenUsePrg);

+			db_set_s(NULL, MODULE_NAME, "OpenUsePrgPath", str);

 

 			opt.ShowCustomIcon = IsDlgButtonChecked(hwndDlg, IDC_SHOWICON);

 			opt.UseOnline = IsDlgButtonChecked(hwndDlg, IDC_ONLINE);

@@ -238,14 +238,14 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			else if (IsDlgButtonChecked(hwndDlg, IDC_AUTOLOGIN) == BST_INDETERMINATE)

 				opt.AutoLogin = 2;

 			opt.LogThreads = IsDlgButtonChecked(hwndDlg, IDC_LOGTHREADS);

-			db_set_dw(NULL, pluginName, "ShowCustomIcon", opt.ShowCustomIcon);

-			db_set_dw(NULL, pluginName, "UseOnline", opt.UseOnline);

-			db_set_dw(NULL, pluginName, "AutoLogin", opt.AutoLogin);

-			db_set_dw(NULL, pluginName, "LogThreads", opt.LogThreads);

+			db_set_dw(NULL, MODULE_NAME, "ShowCustomIcon", opt.ShowCustomIcon);

+			db_set_dw(NULL, MODULE_NAME, "UseOnline", opt.UseOnline);

+			db_set_dw(NULL, MODULE_NAME, "AutoLogin", opt.AutoLogin);

+			db_set_dw(NULL, MODULE_NAME, "LogThreads", opt.LogThreads);

 

 			ID_STATUS_NONEW = opt.UseOnline ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE;

 			for (int i = 0; i < acc_num; i++)

-				db_set_w(acc[i].hContact, pluginName, "Status", ID_STATUS_NONEW);

+				db_set_w(acc[i].hContact, MODULE_NAME, "Status", ID_STATUS_NONEW);

 		}

 		return TRUE;