new sorting functions applied

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

2 files changed, 13 insertions, 13 deletions

diff --git a/src/core/stduserinfo/contactinfo.cpp b/src/core/stduserinfo/contactinfo.cpp
index 1d78f2cc13..06a9a6c2e7 100644
--- a/src/core/stduserinfo/contactinfo.cpp
+++ b/src/core/stduserinfo/contactinfo.cpp
@@ -68,7 +68,7 @@ static INT_PTR CALLBACK EditUserPhoneDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);

 			if (szText[0]) SetWindowText(hwndDlg, TranslateT("Edit phone number"));

 			TranslateDialogDefault(hwndDlg);

-			if (mir_strlen(szText)>4 && !lstrcmpA(szText+mir_strlen(szText)-4, " SMS")) {

+			if (mir_strlen(szText)>4 && !mir_strcmp(szText+mir_strlen(szText)-4, " SMS")) {

 				CheckDlgButton(hwndDlg, IDC_SMS, BST_CHECKED);

 				szText[mir_strlen(szText)-4] = '\0';

 			}

@@ -328,7 +328,7 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				if ( !db_get_ts(hContact, szProto, "Cellular", &dbv)) {

 					lvi.pszText = TranslateT("Mobile");

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					if (mir_strlen(dbv.pszVal)>4 && !lstrcmpA(dbv.pszVal+mir_strlen(dbv.pszVal)-4, " SMS")) {

+					if (mir_strlen(dbv.pszVal)>4 && !mir_strcmp(dbv.pszVal+mir_strlen(dbv.pszVal)-4, " SMS")) {

 						ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 2, _T("y"));

 						dbv.ptszVal[mir_tstrlen(dbv.ptszVal)-4] = '\0';

 					}

@@ -359,7 +359,7 @@ INT_PTR CALLBACK ContactDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 					lvi.pszText = idstr2;

 					mir_sntprintf(idstr2, SIZEOF(idstr2), TranslateT("Custom %d"), i+1);

 					ListView_InsertItem(GetDlgItem(hwndDlg, IDC_PHONES), &lvi);

-					if (mir_tstrlen(dbv.ptszVal)>4 && !lstrcmp(dbv.ptszVal+mir_tstrlen(dbv.ptszVal)-4, _T(" SMS"))) {

+					if (mir_tstrlen(dbv.ptszVal)>4 && !mir_tstrcmp(dbv.ptszVal+mir_tstrlen(dbv.ptszVal)-4, _T(" SMS"))) {

 						ListView_SetItemText(GetDlgItem(hwndDlg, IDC_PHONES), lvi.iItem, 2, _T("y"));

 						dbv.ptszVal[mir_tstrlen(dbv.ptszVal)-4] = '\0';

 					}

diff --git a/src/core/stduserinfo/userinfo.cpp b/src/core/stduserinfo/userinfo.cpp
index 4c49f3ab64..e3a48d3837 100644
--- a/src/core/stduserinfo/userinfo.cpp
+++ b/src/core/stduserinfo/userinfo.cpp
@@ -78,18 +78,18 @@ static int PageSortProc(OPTIONSDIALOGPAGE *item1, OPTIONSDIALOGPAGE *item2)
 {

 	int res;

 	TCHAR *s1 = getTitle(item1), *s2 = getTitle(item2);

-	if (!lstrcmp(s1, TranslateT("Summary"))) return -1;

-	if (!lstrcmp(s2, TranslateT("Summary"))) return 1;

-	if (res = lstrcmp(s1, s2)) return res;

+	if (!mir_tstrcmp(s1, TranslateT("Summary"))) return -1;

+	if (!mir_tstrcmp(s2, TranslateT("Summary"))) return 1;

+	if (res = mir_tstrcmp(s1, s2)) return res;

 

 	s1 = getTab(item1), s2 = getTab(item2);

 	if (s1 && !s2) return -1;

 	if (!s1 && s2) return 1;

 	if (!s1 && !s2) return 0;

 

-	if (s1 && !lstrcmp(s1, TranslateT("General"))) return -1;

-	if (s2 && !lstrcmp(s2, TranslateT("General"))) return 1;

-	return lstrcmp(s1, s2);

+	if (s1 && !mir_tstrcmp(s1, TranslateT("General"))) return -1;

+	if (s2 && !mir_tstrcmp(s2, TranslateT("General"))) return 1;

+	return mir_tstrcmp(s1, s2);

 }

 

 static INT_PTR ShowDetailsDialogCommand(WPARAM wParam, LPARAM)

@@ -182,13 +182,13 @@ static void CreateDetailsTabs(HWND hwndDlg, DetailsData *dat, DetailsPageData *p
 	TabCtrl_DeleteAllItems(hwndTab);

 	for (int i = 0; i < dat->pageCount; i++) {

 		DetailsPageData &odp = dat->opd[i];

-		if (!odp.ptszTab || lstrcmp(odp.ptszTitle, ppg->ptszTitle))

+		if (!odp.ptszTab || mir_tstrcmp(odp.ptszTitle, ppg->ptszTitle))

 			continue;

 

 		tie.pszText = TranslateTH(odp.hLangpack, odp.ptszTab);

 		tie.lParam = i;

 		TabCtrl_InsertItem(hwndTab, pages, &tie);

-		if (!lstrcmp(odp.ptszTab, ppg->ptszTab))

+		if (!mir_tstrcmp(odp.ptszTab, ppg->ptszTab))

 			sel = pages;

 		pages++;

 	}

@@ -299,7 +299,7 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				p.ptszTab = odp[i].ptszTab;

 				p.hLangpack = odp[i].hLangpack;

 

-				if (i && p.ptszTab && !lstrcmp(dat->opd[i - 1].ptszTitle, p.ptszTitle)) {

+				if (i && p.ptszTab && !mir_tstrcmp(dat->opd[i - 1].ptszTitle, p.ptszTitle)) {

 					p.hItem = dat->opd[i - 1].hItem;

 					continue;

 				}

@@ -313,7 +313,7 @@ static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 					tvis.item.pszText = p.ptszTitle;

 				else

 					tvis.item.pszText = TranslateTH(p.hLangpack, p.ptszTitle);

-				if (ptszLastTab && !lstrcmp(tvis.item.pszText, ptszLastTab))

+				if (ptszLastTab && !mir_tstrcmp(tvis.item.pszText, ptszLastTab))

 					dat->currentPage = i;

 				p.hItem = TreeView_InsertItem(hwndTree, &tvis);

 			}