From d9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Nov 2014 21:20:14 +0000 Subject: new sorting functions applied git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IRCG/src/clist.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/IRCG/src/clist.cpp') diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp index 17373420c2..a4b9913dc1 100644 --- a/protocols/IRCG/src/clist.cpp +++ b/protocols/IRCG/src/clist.cpp @@ -182,24 +182,24 @@ MCONTACT CIrcProto::CList_FindContact(CONTACT *user) if (DBWildcard) CharLower(DBWildcard); if (IsChannel(user->name)) { - if (DBDefault && !lstrcmpi(DBDefault, user->name)) + if (DBDefault && !mir_tstrcmpi(DBDefault, user->name)) hContact_temp = (MCONTACT)-1; } - else if (user->ExactNick && DBNick && !lstrcmpi(DBNick, user->name)) + else if (user->ExactNick && DBNick && !mir_tstrcmpi(DBNick, user->name)) hContact_temp = hContact; - else if (user->ExactOnly && DBDefault && !lstrcmpi(DBDefault, user->name)) + else if (user->ExactOnly && DBDefault && !mir_tstrcmpi(DBDefault, user->name)) hContact_temp = hContact; else if (user->ExactWCOnly) { - if (DBWildcard && !lstrcmpi(DBWildcard, lowercasename) - || (DBWildcard && !lstrcmpi(DBNick, lowercasename) && !WCCmp(DBWildcard, lowercasename)) - || (!DBWildcard && !lstrcmpi(DBNick, lowercasename))) { + if (DBWildcard && !mir_tstrcmpi(DBWildcard, lowercasename) + || (DBWildcard && !mir_tstrcmpi(DBNick, lowercasename) && !WCCmp(DBWildcard, lowercasename)) + || (!DBWildcard && !mir_tstrcmpi(DBNick, lowercasename))) { hContact_temp = hContact; } } else if (_tcschr(user->name, ' ') == 0) { - if ((DBDefault && !lstrcmpi(DBDefault, user->name) || DBNick && !lstrcmpi(DBNick, user->name) || + if ((DBDefault && !mir_tstrcmpi(DBDefault, user->name) || DBNick && !mir_tstrcmpi(DBNick, user->name) || DBWildcard && WCCmp(DBWildcard, lowercasename)) && (WCCmp(DBUser, user->user) && WCCmp(DBHost, user->host))) { hContact_temp = hContact; -- cgit v1.2.3