From 159b565b390687258ee65a3b66596e118752063c Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:33:13 +0000 Subject: replace strcmp to mir_strcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13752 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewXstatusNotify/src/main.cpp | 14 +++++++------- plugins/NewXstatusNotify/src/xstatus.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/NewXstatusNotify') diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index c06d1bd639..7127d00345 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -379,7 +379,7 @@ int ContactStatusChanged(MCONTACT hContact, WORD oldStatus, WORD newStatus) char *szProto = GetContactProto(hContact); WORD myStatus = (WORD)CallProtoService(szProto, PS_GETSTATUS, 0, 0); - if (!strcmp(szProto, META_PROTO)) { //this contact is Meta + if (!mir_strcmp(szProto, META_PROTO)) { //this contact is Meta MCONTACT hSubContact = db_mc_getMostOnline(hContact); char *szSubProto = GetContactProto(hSubContact); if (szSubProto == NULL) @@ -479,7 +479,7 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) return 0; char *szProto = GetContactProto(hContact); - if (strcmp(cws->szModule, szProto)) + if (mir_strcmp(cws->szModule, szProto)) return 0; // we don't want to be notified if new chatroom comes online @@ -576,10 +576,10 @@ int ProcessExtraStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) } if (strstr(cws->szSetting, "XStatus")) { - if (strcmp(cws->szModule, szProto)) + if (mir_strcmp(cws->szModule, szProto)) return 0; - if (strcmp(cws->szSetting, "XStatusName") == 0) { + if (mir_strcmp(cws->szSetting, "XStatusName") == 0) { smi.compare = CompareStatusMsg(&smi, cws, "LastXStatusName"); if (smi.compare == COMPARE_SAME) { replaceStrT(smi.newstatusmsg, 0); @@ -594,7 +594,7 @@ int ProcessExtraStatus(DBCONTACTWRITESETTING *cws, MCONTACT hContact) xsc = NewXSC(hContact, szProto, TYPE_ICQ_XSTATUS, smi.compare, smi.newstatusmsg, NULL); ExtraStatusChanged(xsc); } - else if (!strcmp(cws->szSetting, "XStatusMsg")) { + else if (!mir_strcmp(cws->szSetting, "XStatusMsg")) { smi.compare = CompareStatusMsg(&smi, cws, "LastXStatusMsg"); if (smi.compare == COMPARE_SAME) { replaceStrT(smi.newstatusmsg, 0); @@ -790,11 +790,11 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam) if (ProcessExtraStatus(cws, hContact)) return 0; - if (!strcmp(cws->szSetting, "Status")) + if (!mir_strcmp(cws->szSetting, "Status")) if (ProcessStatus(cws, hContact)) return 0; - if (!strcmp(cws->szModule, "CList") && !strcmp(cws->szSetting, "StatusMsg")) + if (!mir_strcmp(cws->szModule, "CList") && !mir_strcmp(cws->szSetting, "StatusMsg")) if (ProcessStatusMessage(cws, hContact)) return 0; diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 42ec34c325..07bfbf22be 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -433,7 +433,7 @@ TCHAR* GetIcqXStatus(MCONTACT hContact, char *szProto, char *szValue, TCHAR *buf int statusID = db_get_b(hContact, szProto, "XStatusId", -1); if (statusID != -1) { if (!db_get_ts(hContact, szProto, szValue, &dbv)) { - if ((strcmp(szValue, "XStatusName") == 0) && dbv.ptszVal[0] == 0) + if ((mir_strcmp(szValue, "XStatusName") == 0) && dbv.ptszVal[0] == 0) GetDefaultXstatusName(statusID, szProto, buff, bufflen); else _tcsncpy(buff, dbv.ptszVal, bufflen); -- cgit v1.2.3