new sorting functions applied

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

4 files changed, 10 insertions, 10 deletions

diff --git a/protocols/Xfire/src/all_statusmsg.cpp b/protocols/Xfire/src/all_statusmsg.cpp
index f09d3526a8..e542806744 100644
--- a/protocols/Xfire/src/all_statusmsg.cpp
+++ b/protocols/Xfire/src/all_statusmsg.cpp
@@ -67,7 +67,7 @@ BOOL BackupStatusMsg() {
 		mir_snprintf(ttemp, 128, "%s%s", temp[i]->szModuleName, PS_SETAWAYMSG);

 

 		//xfire wird geskipped, offline prots und invs prots auch, und locked status prots auch

-		if (!temp[i]->bIsEnabled || statusid == ID_STATUS_INVISIBLE || statusid == ID_STATUS_OFFLINE || !lstrcmpiA(temp[i]->szModuleName, protocolname) || !ServiceExists(ttemp) || db_get_b(NULL, temp[i]->szModuleName, "LockMainStatus", 0) == 1)

+		if (!temp[i]->bIsEnabled || statusid == ID_STATUS_INVISIBLE || statusid == ID_STATUS_OFFLINE || !mir_strcmpi(temp[i]->szModuleName, protocolname) || !ServiceExists(ttemp) || db_get_b(NULL, temp[i]->szModuleName, "LockMainStatus", 0) == 1)

 		{

 			XFireLog("-> Skip %s.", temp[i]->szModuleName);

 

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 92b3599b51..723431b1d4 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1001,7 +1001,7 @@ int ExtraImageApply1(WPARAM wparam, LPARAM lparam)
 {

 	MCONTACT hContact = (MCONTACT)wparam;

 	char *szProto = GetContactProto(hContact);

-	if (szProto != NULL && !lstrcmpiA(szProto, protocolname) && db_get_w(hContact, protocolname, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {

+	if (szProto != NULL && !mir_strcmpi(szProto, protocolname) && db_get_w(hContact, protocolname, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {

 		int gameid = db_get_w(hContact, protocolname, "GameId", 0);

 		if (gameid != 0)

 			ExtraIcon_SetIcon(hExtraIcon1, hContact, xgamelist.iconmngr.getGameIconHandle(gameid));

@@ -1014,7 +1014,7 @@ int ExtraImageApply2(WPARAM wparam, LPARAM lparam)
 	MCONTACT hContact = (MCONTACT)wparam;

 	// TODO: maybe need to fix extra icons

 	char *szProto = GetContactProto(hContact);

-	if (szProto != NULL && !lstrcmpiA(szProto, protocolname) && db_get_w(hContact, protocolname, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {

+	if (szProto != NULL && !mir_strcmpi(szProto, protocolname) && db_get_w(hContact, protocolname, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE) {

 		int gameid = db_get_w(hContact, protocolname, "VoiceId", 0);

 		if (gameid != 0)

 			ExtraIcon_SetIcon(hExtraIcon2, hContact, xgamelist.iconmngr.getGameIconHandle(gameid));

@@ -1302,7 +1302,7 @@ INT_PTR RecvMessage(WPARAM wParam, LPARAM lParam)
 	db_unset(ccs->hContact, "CList", "Hidden");

 

 	char *szProto = GetContactProto(ccs->hContact);

-	if (szProto != NULL && !lstrcmpiA(szProto, protocolname))

+	if (szProto != NULL && !mir_strcmpi(szProto, protocolname))

 		return CallService(MS_PROTO_RECVMSG, wParam, lParam);

 

 	return 1;

@@ -1668,7 +1668,7 @@ MCONTACT CList_AddContact(XFireContact xfc, bool InList, bool SetOnline, int cla
 BOOL IsXFireContact(MCONTACT hContact)

 {

 	char *szProto = GetContactProto(hContact);

-	if (szProto != NULL && !lstrcmpiA(szProto, protocolname))

+	if (szProto != NULL && !mir_strcmpi(szProto, protocolname))

 		return TRUE;

 

 	return FALSE;

@@ -3119,7 +3119,7 @@ void CreateGroup(char*grpn, char*field) {
 			i--;

 			break;

 		}

-		if (dbv.pszVal[0] != '\0' && !lstrcmpA(dbv.pszVal + 1, (char*)grp))	{

+		if (dbv.pszVal[0] != '\0' && !mir_strcmp(dbv.pszVal + 1, (char*)grp))	{

 			db_free(&dbv);

 			return;

 		}

diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index f7ee82d0ad..858683a167 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -264,7 +264,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 
 			GetDlgItemTextA(hwndDlg, IDC_LOGIN, login, SIZEOF(login));
 			dbv.pszVal = NULL;
-			if (db_get(NULL, protocolname, "login", &dbv) || lstrcmpA(login, dbv.pszVal))
+			if (db_get(NULL, protocolname, "login", &dbv) || mir_strcmp(login, dbv.pszVal))
 				reconnectRequired = 1;
 			if (dbv.pszVal != NULL)
 				db_free(&dbv);
@@ -289,7 +289,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			//nur wenn der nick erfolgreich übertragen wurde
 			GetDlgItemTextA(hwndDlg, IDC_NICK, login, SIZEOF(login));
 			dbv.pszVal = NULL;
-			if (db_get(NULL, protocolname, "Nick", &dbv) || lstrcmpA(login, dbv.pszVal))
+			if (db_get(NULL, protocolname, "Nick", &dbv) || mir_strcmp(login, dbv.pszVal))
 			{
 				if (CallService(XFIRE_SET_NICK, 0, (WPARAM)login))
 					db_set_s(NULL, protocolname, "Nick", login);
@@ -299,7 +299,7 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 
 			GetDlgItemTextA(hwndDlg, IDC_PASSWORD, str, SIZEOF(str));
 			dbv.pszVal = NULL;
-			if (db_get(NULL, protocolname, "password", &dbv) || lstrcmpA(str, dbv.pszVal))
+			if (db_get(NULL, protocolname, "password", &dbv) || mir_strcmp(str, dbv.pszVal))
 				reconnectRequired = 1;
 			if (dbv.pszVal != NULL)
 				db_free(&dbv);
diff --git a/protocols/Xfire/src/services.cpp b/protocols/Xfire/src/services.cpp
index 70a141f6b5..380308cc14 100644
--- a/protocols/Xfire/src/services.cpp
+++ b/protocols/Xfire/src/services.cpp
@@ -39,7 +39,7 @@ BOOL IsContactMySelf(std::string buddyusername) {
 

 	if (!db_get(NULL, protocolname, "login", &dbv))

 	{

-		if (!lstrcmpiA(dbv.pszVal, buddyusername.c_str()))

+		if (!mir_strcmpi(dbv.pszVal, buddyusername.c_str()))

 		{

 			db_free(&dbv);

 			return TRUE;