- CLISTMENUITEM::pszContactOwner removed, because it's supported only by contact's menu;

- Menu_AddContactMenuItem now receives parameter szProto;
- Menu_Add* helpers are converted into real functions;

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

1 files changed, 8 insertions, 8 deletions

diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp
index e1aff5e67e..9ec7111750 100644
--- a/plugins/GmailNotifier/src/notify.cpp
+++ b/plugins/GmailNotifier/src/notify.cpp
@@ -3,7 +3,7 @@
 int OpenBrowser(WPARAM hContact, LPARAM lParam)

 {

 	char *proto = GetContactProto(hContact);

-	if (proto && !mir_strcmp(proto, pluginName)) {

+	if (proto && !mir_strcmp(proto, MODULE_NAME)) {

 		Account *curAcc = GetAccountByContact(hContact);

 		PUDeletePopup(curAcc->popUpHwnd);

 		CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)curAcc->hContact, (LPARAM)1);

@@ -11,7 +11,7 @@ int OpenBrowser(WPARAM hContact, LPARAM lParam)
 			return FALSE;

 

 		if (curAcc->oldResults_num != 0) {

-			db_set_w(curAcc->hContact, pluginName, "Status", ID_STATUS_NONEW);

+			db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_NONEW);

 			curAcc->oldResults_num = 0;

 			DeleteResults(curAcc->results.next);

 			curAcc->results.next = NULL;

@@ -61,21 +61,21 @@ void NotifyUser(Account *curAcc)
 		PUDeletePopup(curAcc->popUpHwnd);

 		CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)curAcc->hContact, (LPARAM)1);

 		if (curAcc->oldResults_num != 0)

-			db_set_w(curAcc->hContact, pluginName, "Status", ID_STATUS_NONEW);

+			db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_NONEW);

 		break;

 	

 	case -1:

-		db_set_w(curAcc->hContact, pluginName, "Status", ID_STATUS_AWAY);

+		db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_AWAY);

 		break;

 	

 	default:

-		db_set_w(curAcc->hContact, pluginName, "Status", ID_STATUS_OCCUPIED);

+		db_set_w(curAcc->hContact, MODULE_NAME, "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 = { sizeof(dbei) };

 			dbei.eventType = EVENTTYPE_MESSAGE;

 			dbei.flags = DBEF_READ;

-			dbei.szModule = pluginName;

+			dbei.szModule = MODULE_NAME;

 			dbei.timestamp = time(NULL);

 

 			resultLink *prst = curAcc->results.next;

@@ -91,7 +91,7 @@ void NotifyUser(Account *curAcc)
 			cle.hContact = curAcc->hContact;

 			cle.hDbEvent = 1;

 			cle.flags = CLEF_URGENT;

-			cle.hIcon = Skin_LoadProtoIcon(pluginName, ID_STATUS_OCCUPIED);

+			cle.hIcon = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_OCCUPIED);

 			cle.pszService = "GmailMNotifier/Notifying";

 			cle.pszTooltip = curAcc->results.next->content;

 			CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)curAcc->hContact, (LPARAM)1);

@@ -102,7 +102,7 @@ void NotifyUser(Account *curAcc)
 			POPUPDATA ppd = { 0 };

 

 			ppd.lchContact = curAcc->hContact;

-			ppd.lchIcon = Skin_LoadProtoIcon(pluginName, ID_STATUS_OCCUPIED);

+			ppd.lchIcon = Skin_LoadProtoIcon(MODULE_NAME, ID_STATUS_OCCUPIED);

 			mir_strcpy(ppd.lpzContactName, curAcc->results.content);

 			resultLink *prst = curAcc->results.next;

 			for (int i = 0; i < 5 && i < newMails; i++) {