new sorting functions applied

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

10 files changed, 18 insertions, 18 deletions

diff --git a/protocols/Yahoo/src/avatar.cpp b/protocols/Yahoo/src/avatar.cpp
index 1acdb1fe5f..7bff4a98e8 100644
--- a/protocols/Yahoo/src/avatar.cpp
+++ b/protocols/Yahoo/src/avatar.cpp
@@ -399,7 +399,7 @@ void CYahooProto::ext_got_picture(const char *me, const char *who, const char *p
 			LOG(("[ext_yahoo_got_picture] My Checksum: %d", mcksum));

 

 			if (!getString("AvatarURL", &dbv)) {

-					if (lstrcmpiA(pic_url, dbv.pszVal) == 0) {

+					if (mir_strcmpi(pic_url, dbv.pszVal) == 0) {

 						DBVARIANT dbv2;

 						/*time_t  ts;

 						DWORD	ae;*/

diff --git a/protocols/Yahoo/src/file_transfer.cpp b/protocols/Yahoo/src/file_transfer.cpp
index 1cfe32740f..16327f356c 100644
--- a/protocols/Yahoo/src/file_transfer.cpp
+++ b/protocols/Yahoo/src/file_transfer.cpp
@@ -89,7 +89,7 @@ y_filetransfer* find_ft(const char *ft_token, const char *who)
 	

 	for(l = file_transfers; l; l = y_list_next(l)) {

 		f = (y_filetransfer* )l->data;

-		if (lstrcmpA(f->ftoken, ft_token) == 0 && lstrcmpA(f->who, who) == 0) {

+		if (mir_strcmp(f->ftoken, ft_token) == 0 && mir_strcmp(f->who, who) == 0) {

 			LOG(("[find_ft] Got it!"));

 			return f;

 		}

diff --git a/protocols/Yahoo/src/ignore.cpp b/protocols/Yahoo/src/ignore.cpp
index 4c7cb47225..1f87658371 100644
--- a/protocols/Yahoo/src/ignore.cpp
+++ b/protocols/Yahoo/src/ignore.cpp
@@ -37,7 +37,7 @@ int CYahooProto::BuddyIgnored(const char *who)
 	while (l != NULL) {

 		struct yahoo_buddy *b = (struct yahoo_buddy *) l->data;

 			

-		if (lstrcmpiA(b->id, who) == 0) {

+		if (mir_strcmpi(b->id, who) == 0) {

 			//LOG(("User '%s' on our Ignore List. Dropping Message.", who));

 			return 1;

 		}

diff --git a/protocols/Yahoo/src/im.cpp b/protocols/Yahoo/src/im.cpp
index 03f45a3f37..54a4d9d1cf 100644
--- a/protocols/Yahoo/src/im.cpp
+++ b/protocols/Yahoo/src/im.cpp
@@ -212,7 +212,7 @@ int __cdecl CYahooProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)
 	db_unset(hContact, "CList", "Hidden");

 

 	// NUDGES

-	if (!lstrcmpA(pre->szMessage, "<ding>") && ServiceExists("NUDGE/Send")) {

+	if (!mir_strcmp(pre->szMessage, "<ding>") && ServiceExists("NUDGE/Send")) {

 		debugLogA("[YahooRecvMessage] Doing Nudge Service!");

 		NotifyEventHooks(hYahooNudge, hContact, pre->timestamp);

 		return 0;

diff --git a/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp b/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp
index dbad69d900..1ff4870a9a 100644
--- a/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp
+++ b/protocols/Yahoo/src/libyahoo2/libyahoo2.cpp
@@ -3144,7 +3144,7 @@ static void yahoo_process_ignore(struct yahoo_input_data *yid, struct yahoo_pack
 			while (buddy) {
 				struct yahoo_buddy *b = (struct yahoo_buddy *) buddy->data;
 				
-				if (lstrcmpiA(b->id, who) == 0) 
+				if (mir_strcmpi(b->id, who) == 0) 
 					break;
 				
 				buddy = buddy->next;
diff --git a/protocols/Yahoo/src/main.cpp b/protocols/Yahoo/src/main.cpp
index 8078e72d67..feeb9715c6 100644
--- a/protocols/Yahoo/src/main.cpp
+++ b/protocols/Yahoo/src/main.cpp
@@ -72,7 +72,7 @@ extern "C" BOOL WINAPI DllMain(HINSTANCE hinst,DWORD /*fdwReason*/,LPVOID /*lpvR
 

 static int CompareProtos( const CYahooProto* p1, const CYahooProto* p2 )

 {

-	return lstrcmp(p1->m_tszUserName, p2->m_tszUserName);

+	return mir_tstrcmp(p1->m_tszUserName, p2->m_tszUserName);

 }

 

 LIST<CYahooProto> g_instances( 1, CompareProtos );

diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp
index 36459e2a96..3dc9c9fbd6 100644
--- a/protocols/Yahoo/src/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
@@ -102,7 +102,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 				reconnectRequired = true;
 			}
 			else {
-				if(lstrcmpA(str, dbv.pszVal))
+				if(mir_strcmp(str, dbv.pszVal))
 					reconnectRequired = true;
 				db_free(&dbv);
 			}
@@ -113,7 +113,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 				reconnectRequired = true;
 			}
 			else {
-				if(lstrcmpA(str, dbv.pszVal))
+				if(mir_strcmp(str, dbv.pszVal))
 					reconnectRequired = true;
 				db_free(&dbv);
 			}
@@ -220,7 +220,7 @@ static INT_PTR CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wPar
 				reconnectRequired = true;
 			}
 			else {
-				if(lstrcmpA(str, dbv.pszVal))
+				if(mir_strcmp(str, dbv.pszVal))
 					reconnectRequired = true;
 				db_free(&dbv);
 			}
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index 74d562df93..635463a261 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -775,7 +775,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				reconnectRequired = true;

 			}

 			else {

-				if(lstrcmpA(str, dbv.pszVal))

+				if(mir_strcmp(str, dbv.pszVal))

 					reconnectRequired = true;

 				db_free(&dbv);

 			}

@@ -787,7 +787,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				reconnectRequired = true;

 			}

 			else {

-				if(lstrcmpA(str, dbv.pszVal))

+				if(mir_strcmp(str, dbv.pszVal))

 					reconnectRequired = true;

 				db_free(&dbv);

 			}

diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp
index 46e84b09c6..d030ba7c75 100644
--- a/protocols/Yahoo/src/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
@@ -115,7 +115,7 @@ int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char *
 	mir_tstrncpy(ppd.lptzText, msg, SIZEOF(ppd.lptzText));

 

 	if (szURL != NULL) {

-		ppd.lchIcon = LoadIconEx( !lstrcmpiA(szURL, "http://mail.yahoo.com") ? "mail" : "calendar");

+		ppd.lchIcon = LoadIconEx( !mir_strcmpi(szURL, "http://mail.yahoo.com") ? "mail" : "calendar");

 		ppd.PluginData = (void*)strdup(szURL);

 	}

 	else ppd.lchIcon = LoadIconEx("yahoo");

diff --git a/protocols/Yahoo/src/yahoo.cpp b/protocols/Yahoo/src/yahoo.cpp
index 67a150e60a..05d56e98c1 100644
--- a/protocols/Yahoo/src/yahoo.cpp
+++ b/protocols/Yahoo/src/yahoo.cpp
@@ -289,7 +289,7 @@ MCONTACT CYahooProto::getbuddyH(const char *yahoo_id)
 		if (getString(hContact, YAHOO_LOGINID, &dbv))

 			continue;

 

-		int tCompareResult = lstrcmpiA( dbv.pszVal, yahoo_id );

+		int tCompareResult = mir_strcmpi( dbv.pszVal, yahoo_id );

 		db_free(&dbv);

 		if ( tCompareResult )

 			continue;

@@ -609,7 +609,7 @@ void CYahooProto::ext_got_stealth(char *stealthlist)
 

 		for(s = stealth; s && *s; s++) {

 

-			if (lstrcmpiA(*s, dbv.pszVal) == 0) {

+			if (mir_strcmpi(*s, dbv.pszVal) == 0) {

 				debugLogA("GOT id = %s", dbv.pszVal);

 				found = 1;

 				break;

@@ -1240,9 +1240,9 @@ INT_PTR CYahooProto::ext_connect(const char *h, int p, int type)
 void CYahooProto::ext_send_http_request(enum yahoo_connection_type type, const char *method, const char *url, 

 		const char *cookies, long content_length, yahoo_get_fd_callback callback, void *callback_data)

 {

-/*	if (lstrcmpiA(method, "GET") == 0) 

+/*	if (mir_strcmpi(method, "GET") == 0) 

 		yahoo_http_get(id, url, cookies, callback, callback_data);

-	else if (lstrcmpiA(method, "POST") == 0) 

+	else if (mir_strcmpi(method, "POST") == 0) 

 		yahoo_http_post(id, url, cookies, content_length, callback, callback_data);

 	else 

 		LOG(("ERROR: Unknown method: %s", method));

@@ -1269,7 +1269,7 @@ void CYahooProto::ext_send_http_request(enum yahoo_connection_type type, const c
 		//return;

 	} else {

 		nlhr.cbSize=sizeof(nlhr);

-		nlhr.requestType=(lstrcmpiA(method, "GET") == 0) ? REQUEST_GET : REQUEST_POST;

+		nlhr.requestType=(mir_strcmpi(method, "GET") == 0) ? REQUEST_GET : REQUEST_POST;

 		nlhr.flags=NLHRF_DUMPASTEXT|NLHRF_HTTP11;

 		nlhr.szUrl=(char *)path;

 		nlhr.headers = httpHeaders;

@@ -1471,7 +1471,7 @@ char * CYahooProto::ext_send_https_request(struct yahoo_data *yd, const char *ho
 		for (i=0; i < nlhrReply->headersCount; i++) {

 			//LOG(("%s: %s", nlhrReply->headers[i].szName, nlhrReply->headers[i].szValue));

 			

-			if (lstrcmpiA(nlhrReply->headers[i].szName, "Set-Cookie") == 0) {

+			if (mir_strcmpi(nlhrReply->headers[i].szName, "Set-Cookie") == 0) {

 				//LOG(("Found Cookie... Yum yum..."));

 				

 				if (nlhrReply->headers[i].szValue[0] == 'B' && nlhrReply->headers[i].szValue[1] == '=') {