From 78dc54f9e392b45492a2b726d6268c41f594eb41 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 8 Apr 2014 17:54:19 +0000 Subject: bunch of mc related fixes git-svn-id: http://svn.miranda-ng.org/main/trunk@8892 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/msgdialog.cpp | 4 ++-- plugins/Scriver/src/msglog.cpp | 2 +- plugins/Scriver/src/msgs.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/Scriver') diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 2a1e787b1a..61c4cb3658 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1759,9 +1759,9 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP smaddInfo.targetMessage = EM_REPLACESEL; smaddInfo.targetWParam = TRUE; smaddInfo.Protocolname = dat->szProto; - if (dat->szProto!=NULL && strcmp(dat->szProto,"MetaContacts") == 0) { + if (dat->szProto != NULL && strcmp(dat->szProto, META_PROTO) == 0) { MCONTACT hContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)dat->windowData.hContact, 0); - if (hContact!=NULL) { + if (hContact != NULL) { smaddInfo.Protocolname = GetContactProto(hContact); } } diff --git a/plugins/Scriver/src/msglog.cpp b/plugins/Scriver/src/msglog.cpp index efedaa061e..2871ed490e 100644 --- a/plugins/Scriver/src/msglog.cpp +++ b/plugins/Scriver/src/msglog.cpp @@ -917,7 +917,7 @@ void StreamInEvents(HWND hwndDlg, HANDLE hDbEventFirst, int count, int fAppend) smre.cbSize = sizeof(SMADD_RICHEDIT3); smre.hwndRichEditControl = GetDlgItem(hwndDlg, IDC_LOG); smre.Protocolname = dat->szProto; - if (dat->szProto != NULL && strcmp(dat->szProto, "MetaContacts") == 0) { + if (dat->szProto != NULL && strcmp(dat->szProto, META_PROTO) == 0) { MCONTACT hContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM)dat->windowData.hContact, 0); if (hContact != NULL) smre.Protocolname = GetContactProto(hContact); diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 0a77faa6fc..8ca0b613d7 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -62,7 +62,7 @@ static int SRMMStatusToPf2(int status) int IsAutoPopup(MCONTACT hContact) { if (g_dat.flags & SMF_AUTOPOPUP) { char *szProto = GetContactProto(hContact); - if (strcmp(szProto, "MetaContacts") == 0 ) { + if (strcmp(szProto, META_PROTO) == 0) { hContact = (MCONTACT)CallService(MS_MC_GETMOSTONLINECONTACT, hContact, 0); if (hContact != NULL) szProto = GetContactProto(hContact); -- cgit v1.2.3