From 3342dd204597c09bb726dfc1d7a0acbfd2fd5d8f Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 15 Aug 2017 15:31:06 +0300
Subject: anonymous SRMM services got names

---
 plugins/Clist_nicer/src/clistevents.cpp | 6 +++---
 plugins/Clist_nicer/src/stdafx.h        | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'plugins/Clist_nicer')

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 7ea9af4889..e2cd2825d2 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -235,14 +235,14 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 CListEvent* AddEvent(CLISTEVENT *cle)
 {
 	CListEvent *p = coreCli.pfnAddEvent(cle);
-	if (p == NULL)
-		return NULL;
+	if (p == nullptr)
+		return nullptr;
 
 	if (p->hContact != 0 && p->hDbEvent != 1 && !(p->flags & CLEF_ONLYAFEW)) {
 		MENUITEMINFO mii = { 0 };
 		mii.cbSize = sizeof(mii);
 		mii.fMask = MIIM_DATA | MIIM_BITMAP | MIIM_ID;
-		if (p->pszService && !strncmp("SRMsg/ReadMessage", p->pszService, 17)) {
+		if (!mir_strncmp(MS_MSG_READMESSAGE, p->pszService, _countof(MS_MSG_READMESSAGE))) {
 			// dup check only for msg events
 			for (int j = 0; j < GetMenuItemCount(cfg::dat.hMenuNotify); j++) {
 				if (GetMenuItemInfo(cfg::dat.hMenuNotify, j, TRUE, &mii) != 0) {
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h
index 23fe833568..35c41717fb 100644
--- a/plugins/Clist_nicer/src/stdafx.h
+++ b/plugins/Clist_nicer/src/stdafx.h
@@ -42,6 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_database.h>
 #include <m_system.h>
 #include <m_langpack.h>
+#include <m_message.h>
 #include <m_avatars.h>
 #include <m_button.h>
 #include <m_options.h>
-- 
cgit v1.2.3