From 8a74e7495ce5ad39de4f5c25121a84d35df90c36 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sun, 20 May 2018 15:08:48 +0300
Subject: CMPlugin to receive a reference to PLUGININFOEX

---
 plugins/GmailNotifier/src/notify.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'plugins/GmailNotifier/src/notify.cpp')

diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp
index 8222d5c4cf..359b39e926 100644
--- a/plugins/GmailNotifier/src/notify.cpp
+++ b/plugins/GmailNotifier/src/notify.cpp
@@ -74,7 +74,7 @@ static void __cdecl Login_ThreadFunc(Account *curAcc)
 int OpenBrowser(WPARAM hContact, LPARAM)
 {
 	char *proto = GetContactProto(hContact);
-	if (proto && !mir_strcmp(proto, MODULE_NAME)) {
+	if (proto && !mir_strcmp(proto, MODULENAME)) {
 		Account *curAcc = GetAccountByContact(hContact);
 		PUDeletePopup(curAcc->popUpHwnd);
 		pcli->pfnRemoveEvent(curAcc->hContact, 1);
@@ -82,7 +82,7 @@ int OpenBrowser(WPARAM hContact, LPARAM)
 			return FALSE;
 
 		if (curAcc->oldResults_num != 0) {
-			db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_NONEW);
+			db_set_w(curAcc->hContact, MODULENAME, "Status", ID_STATUS_NONEW);
 			curAcc->oldResults_num = 0;
 			DeleteResults(curAcc->results.next);
 			curAcc->results.next = nullptr;
@@ -134,21 +134,21 @@ void NotifyUser(Account *curAcc)
 		PUDeletePopup(curAcc->popUpHwnd);
 		pcli->pfnRemoveEvent(curAcc->hContact, 1);
 		if (curAcc->oldResults_num != 0)
-			db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_NONEW);
+			db_set_w(curAcc->hContact, MODULENAME, "Status", ID_STATUS_NONEW);
 		break;
 
 	case -1:
-		db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_AWAY);
+		db_set_w(curAcc->hContact, MODULENAME, "Status", ID_STATUS_AWAY);
 		break;
 
 	default:
-		db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_OCCUPIED);
+		db_set_w(curAcc->hContact, MODULENAME, "Status", ID_STATUS_OCCUPIED);
 		int newMails = (curAcc->oldResults_num == -1) ? (curAcc->results_num) : (curAcc->results_num - curAcc->oldResults_num);
 		if (opt.LogThreads&&newMails > 0) {
 			DBEVENTINFO dbei = {};
 			dbei.eventType = EVENTTYPE_MESSAGE;
 			dbei.flags = DBEF_READ;
-			dbei.szModule = MODULE_NAME;
+			dbei.szModule = MODULENAME;
 			dbei.timestamp = time(0);
 
 			resultLink *prst = curAcc->results.next;
@@ -166,7 +166,7 @@ void NotifyUser(Account *curAcc)
 			cle.hContact = curAcc->hContact;
 			cle.hDbEvent = 1;
 			cle.flags = CLEF_URGENT;
-			cle.hIcon = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_OCCUPIED);
+			cle.hIcon = Skin_LoadProtoIcon(MODULENAME, ID_STATUS_OCCUPIED);
 			cle.pszService = "GmailMNotifier/Notifying";
 			cle.szTooltip.a = curAcc->results.next->content;
 			pcli->pfnAddEvent(&cle);
@@ -176,7 +176,7 @@ void NotifyUser(Account *curAcc)
 			POPUPDATA ppd = { 0 };
 
 			ppd.lchContact = curAcc->hContact;
-			ppd.lchIcon = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_OCCUPIED);
+			ppd.lchIcon = Skin_LoadProtoIcon(MODULENAME, ID_STATUS_OCCUPIED);
 			mir_strcpy(ppd.lpzContactName, curAcc->results.content);
 			resultLink *prst = curAcc->results.next;
 			for (int i = 0; i < 5 && i < newMails; i++) {
-- 
cgit v1.2.3