- MS_CLIST_GETSTATUSMODEDESCRIPTION replaced with the direct clist call

- crazy & obsolete constant GSMDF_PREFIXONLINE removed

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

7 files changed, 64 insertions, 87 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
index 2093489499..8220db57cb 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/msgoptions.cpp
@@ -70,7 +70,7 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				if ( !( protoModeMsgFlags & Proto_Status2Flag( statusModeList[i] )))

 					continue;

 

-				int j = SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_ADDSTRING,0,(LPARAM)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION,statusModeList[i],GSMDF_TCHAR));

+				int j = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)pcli->pfnGetStatusModeDescription(statusModeList[i], 0));

 				SendDlgItemMessage( hwndDlg, IDC_STATUS, CB_SETITEMDATA, j, statusModeList[i] );

 				settings = ( AAMSGSETTING** )realloc(settings, (count+1)*sizeof(AAMSGSETTING*));

 				settings[count] = ( AAMSGSETTING* )malloc(sizeof(AAMSGSETTING));

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
index 329b83a986..9eb70c5307 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
+++ b/plugins/StatusPlugins/AdvancedAutoAway/options.cpp
@@ -136,8 +136,8 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 		{

 			for ( int i=0; i < optionSettings->getCount(); i++ ) {

 				TAAAProtoSetting& p = (*optionSettings)[i];

-				int item = SendDlgItemMessage( hwndDlg, IDC_PROTOCOL, CB_ADDSTRING, 0, ( LPARAM )p.tszAccName );

-				SendDlgItemMessage( hwndDlg, IDC_PROTOCOL, CB_SETITEMDATA, item, (LPARAM)&p );

+				int item = SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_ADDSTRING, 0, (LPARAM)p.tszAccName );

+				SendDlgItemMessage(hwndDlg, IDC_PROTOCOL, CB_SETITEMDATA, item, (LPARAM)&p );

 			}

 		}

 		// set cursor to first protocol

@@ -178,9 +178,9 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 					else

 						flags = 0;

 					for(i=0;i<sizeof(statusModeList)/sizeof(statusModeList[0]);i++) {

-						if ((flags&statusModePf2List[i])  || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) {

-							lvItem.pszText = ( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR );

-							lvItem.lParam = ( LPARAM )statusModePf2List[i];

+						if ((flags&statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE) || (bSettingSame)) {

+							lvItem.pszText = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);

+							lvItem.lParam = (LPARAM)statusModePf2List[i];

 							ListView_InsertItem(hList,&lvItem);

 							ListView_SetCheckState(hList, lvItem.iItem, setting->statusFlags&statusModePf2List[i]?TRUE:FALSE);

 							lvItem.iItem++;

@@ -202,11 +202,11 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 					SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_RESETCONTENT, 0, 0);

 					for ( i=0; i < SIZEOF(statusModeList); i++ ) {

 						if ( (flags & statusModePf2List[i]) || statusModePf2List[i] == PF2_OFFLINE || bSettingSame ) {

-							TCHAR *statusMode = ( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR );

-							item = SendDlgItemMessage(hwndDlg,IDC_LV1STATUS,CB_ADDSTRING,0,(LPARAM)statusMode);

-							item = SendDlgItemMessage(hwndDlg,IDC_LV2STATUS,CB_ADDSTRING,0,(LPARAM)statusMode);

-							SendDlgItemMessage(hwndDlg,IDC_LV1STATUS,CB_SETITEMDATA,item,(LPARAM)statusModeList[i]);

-							SendDlgItemMessage(hwndDlg,IDC_LV2STATUS,CB_SETITEMDATA,item,(LPARAM)statusModeList[i]);

+							TCHAR *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);

+							item = SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);

+							item = SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);

+							SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]);

+							SendDlgItemMessage(hwndDlg, IDC_LV2STATUS, CB_SETITEMDATA, item, (LPARAM)statusModeList[i]);

 							if (statusModeList[i] == setting->lv1Status) {

 								SendDlgItemMessage(hwndDlg,IDC_LV1STATUS,CB_SETCURSEL,(WPARAM)item,0);

 

@@ -229,9 +229,8 @@ static INT_PTR CALLBACK DlgProcAutoAwayRulesOpts(HWND hwndDlg, UINT msg, WPARAM
 				setting->lv1Status = (int)SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_LV1STATUS, CB_GETCURSEL, 0, 0), 0);

 				{

 					TCHAR setNaStr[256];

-					mir_sntprintf(setNaStr, SIZEOF(setNaStr), TranslateT("minutes of %s mode"),

-						CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, setting->lv1Status, GSMDF_TCHAR ));

-					SetDlgItemText(hwndDlg,IDC_SETNASTR,setNaStr);

+					mir_sntprintf(setNaStr, SIZEOF(setNaStr), TranslateT("minutes of %s mode"), pcli->pfnGetStatusModeDescription(setting->lv1Status, 0));

+					SetDlgItemText(hwndDlg, IDC_SETNASTR, setNaStr);

 				}

 				break;

 

diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
index 5e9ad4e953..1e710ba312 100644
--- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
+++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp
@@ -950,9 +950,8 @@ static int ProcessPopup(int reason, LPARAM lParam)
 			PROTOCOLSETTINGEX **ps = (PROTOCOLSETTINGEX **)lParam;

 			for (int i = 0; i < connectionSettings.getCount(); i++)

 				if (_tcslen(ps[i]->tszAccName) > 0 && strlen(ps[i]->szName) > 0)

-					if ( db_get_b(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE))

-					{

-						mir_sntprintf(protoInfoLine, SIZEOF(protoInfoLine), TranslateT("%s\t(will be set to %s)\r\n"), ps[i]->tszAccName, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)ps[i]->status, GSMDF_TCHAR));

+					if ( db_get_b(NULL, MODULENAME, SETTING_PUSHOWEXTRA, TRUE)) {

+						mir_sntprintf(protoInfoLine, SIZEOF(protoInfoLine), TranslateT("%s\t(will be set to %s)\r\n"), ps[i]->tszAccName, pcli->pfnGetStatusModeDescription(ps[i]->status, GSMDF_TCHAR));

 						_tcsncat(protoInfo, protoInfoLine, SIZEOF(protoInfo) - _tcslen(protoInfo)-1);

 					}

 

diff --git a/plugins/StatusPlugins/StartupStatus/options.cpp b/plugins/StatusPlugins/StartupStatus/options.cpp
index 63394872ca..6da11df8f7 100644
--- a/plugins/StatusPlugins/StartupStatus/options.cpp
+++ b/plugins/StatusPlugins/StartupStatus/options.cpp
@@ -128,40 +128,33 @@ static char* GetCMDL(TSettingsList& protoSettings)
 /////////////////////////////////////////////////////////////////////////////////////////

 // Link processing

 

-static char* GetLinkDescription(TSettingsList& protoSettings)

+static TCHAR* GetLinkDescription(TSettingsList& protoSettings)

 {

 	if ( protoSettings.getCount() == 0 )

 		return NULL;

 

-	char *pnt, *desc;

-	pnt = desc = ( char* )malloc(strlen(SHORTCUT_DESC) + 1);

-	strcpy(desc, SHORTCUT_DESC);

-	pnt = desc + strlen(desc);

-	for ( int i=0; i < protoSettings.getCount(); i++ ) {

-		char szName[128];

-		CallProtoService(protoSettings[i].szName, PS_GETNAME, sizeof(szName), (LPARAM)szName );

-

-		char* status;

-		if ( protoSettings[i].status == ID_STATUS_LAST )

-			status = Translate("<last>");

-		else if ( protoSettings[i].status == ID_STATUS_CURRENT )

-			status = Translate("<current>");

-		else if ( protoSettings[i].status >= MIN_STATUS && protoSettings[i].status <= MAX_STATUS )

-			status = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)protoSettings[i].status, 0);

+	CMString result( _T(SHORTCUT_DESC));

+	for (int i=0; i < protoSettings.getCount(); i++) {

+		TSSSetting &p = protoSettings[i];

+

+		TCHAR *status;

+		if ( p.status == ID_STATUS_LAST)

+			status = TranslateT("<last>");

+		else if (p.status == ID_STATUS_CURRENT)

+			status = TranslateT("<current>");

+		else if (p.status >= MIN_STATUS && p.status <= MAX_STATUS )

+			status = pcli->pfnGetStatusModeDescription(p.status, 0);

 		if (status == NULL)

-			status = "<unknown>";

-

-		desc = ( char* )realloc(desc, strlen(desc) + strlen(szName) + strlen(status) + 4);

-		pnt = desc + strlen(desc);

-		*pnt++ = '\r';

-		strcpy(pnt, szName);

-		pnt += strlen(szName);

-		*pnt++ = ':';

-		*pnt++ = ' ';

-		strcpy(pnt, status);

+			status = TranslateT("<unknown>");

+

+		result.AppendChar('\r');

+		result.Append(p.tszAccName);

+		result.AppendChar(':');

+		result.AppendChar(' ');

+		result.Append(status);

 	}

 

-	return desc;

+	return mir_tstrndup(result, result.GetLength());

 }

 

 HRESULT CreateLink(TSettingsList& protoSettings)

@@ -170,7 +163,7 @@ HRESULT CreateLink(TSettingsList& protoSettings)
 	IShellLink* psl;

 	TCHAR savePath[MAX_PATH];

 	char *args = GetCMDLArguments(protoSettings);

-	char *desc = GetLinkDescription(protoSettings);

+	TCHAR *desc = GetLinkDescription(protoSettings);

 

 	if (SHGetSpecialFolderPath(NULL, savePath, 0x10, FALSE))

 		_tcscat(savePath, _T(SHORTCUT_FILENAME));

@@ -185,13 +178,8 @@ HRESULT CreateLink(TSettingsList& protoSettings)
 		TCHAR path[MAX_PATH];

 		GetModuleFileName(NULL, path, SIZEOF(path));

 		psl->SetPath(path);

-

-			TCHAR* p = mir_a2t( desc );

-			psl->SetDescription( p );

-			mir_free( p );

-			p = mir_a2t( args );

-			psl->SetArguments( p );

-			mir_free( p );

+		psl->SetDescription(desc);

+		psl->SetArguments( _A2T(args));

 

 		// Query IShellLink for the IPersistFile interface for saving the

 		// shortcut in persistent storage.

@@ -628,13 +616,12 @@ static INT_PTR CALLBACK StatusProfilesOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wP
 				SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_RESETCONTENT, 0, 0);

 				for ( int i=0; i < SIZEOF(statusModeList); i++ ) {

 					if ( (flags&statusModePf2List[i]) || (statusModeList[i] == ID_STATUS_OFFLINE)) {

-						TCHAR* szStatus = ( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR);

-						if ( szStatus != NULL ) {

-							int item = SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_ADDSTRING, 0, (LPARAM)szStatus);

-							SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_SETITEMDATA, (WPARAM)item, (LPARAM)statusModeList[i]);

-							if (ps->status == statusModeList[i])

-								SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_SETCURSEL, (WPARAM)item, 0);

-				}	}	}

+						int item = SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_ADDSTRING, 0, (LPARAM)pcli->pfnGetStatusModeDescription(statusModeList[i], 0));

+						SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_SETITEMDATA, (WPARAM)item, (LPARAM)statusModeList[i]);

+						if (ps->status == statusModeList[i])

+							SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_SETCURSEL, (WPARAM)item, 0);

+					}

+				}

 

 				int item = SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_ADDSTRING, 0, (LPARAM)TranslateT("<current>"));

 				SendDlgItemMessage(hwndDlg, IDC_STATUS, LB_SETITEMDATA, (WPARAM)item, (LPARAM)ID_STATUS_CURRENT);

diff --git a/plugins/StatusPlugins/StartupStatus/startupstatus.h b/plugins/StatusPlugins/StartupStatus/startupstatus.h
index f7ab3e1b92..817fed7cc1 100644
--- a/plugins/StatusPlugins/StartupStatus/startupstatus.h
+++ b/plugins/StatusPlugins/StartupStatus/startupstatus.h
@@ -31,8 +31,8 @@
 

 struct TSSSetting : public PROTOCOLSETTINGEX, public MZeroedObject

 {

-	TSSSetting( PROTOACCOUNT* pa );

-	TSSSetting( int profile, PROTOACCOUNT* pa );

+	TSSSetting(PROTOACCOUNT *pa);

+	TSSSetting(int profile, PROTOACCOUNT *pa);

 	~TSSSetting();

 };

 

diff --git a/plugins/StatusPlugins/commonstatus.h b/plugins/StatusPlugins/commonstatus.h
index 9cd3eeb508..b04e095f21 100644
--- a/plugins/StatusPlugins/commonstatus.h
+++ b/plugins/StatusPlugins/commonstatus.h
@@ -38,6 +38,7 @@
 #include <m_protosvc.h>

 #include <m_clist.h>

 #include <m_clistint.h>

+#include <m_string.h>

 #include <m_langpack.h>

 #include <m_popup.h>

 #include <m_variables.h>

diff --git a/plugins/StatusPlugins/confirmdialog.cpp b/plugins/StatusPlugins/confirmdialog.cpp
index 5a0c1f5b41..33271696fb 100644
--- a/plugins/StatusPlugins/confirmdialog.cpp
+++ b/plugins/StatusPlugins/confirmdialog.cpp
@@ -68,10 +68,8 @@ static INT_PTR CALLBACK StatusMessageDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam
 

 		{

 			TCHAR desc[ 512 ];

-			mir_sntprintf(desc, SIZEOF(desc),

-				TranslateT("Set %s message for %s."),

-				CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, GetActualStatus(protoSetting), GSMDF_TCHAR ),

-				protoSetting->tszAccName );

+			mir_sntprintf(desc, SIZEOF(desc), TranslateT("Set %s message for %s."), 

+				pcli->pfnGetStatusModeDescription(GetActualStatus(protoSetting), 0), protoSetting->tszAccName);

 			SetDlgItemText(hwndDlg, IDC_DESCRIPTION, desc);

 		}

 		break;

@@ -121,13 +119,13 @@ static int SetStatusList(HWND hwndDlg)
 			ListView_InsertItem(hList,&lvItem);

 

 		int actualStatus;

-		switch( (*confirmSettings)[i].status ) {

+		switch((*confirmSettings)[i].status) {

 			case ID_STATUS_LAST:    actualStatus = (*confirmSettings)[i].lastStatus;   break;

 			case ID_STATUS_CURRENT: actualStatus = CallProtoService((*confirmSettings)[i].szName,PS_GETSTATUS, 0, 0); break;

 			default:                actualStatus = (*confirmSettings)[i].status;

 		}

-		TCHAR* status = ( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, actualStatus, GSMDF_TCHAR );

-		switch( (*confirmSettings)[i].status ) {

+		TCHAR* status = pcli->pfnGetStatusModeDescription(actualStatus, 0);

+		switch((*confirmSettings)[i].status) {

 		case ID_STATUS_LAST:

 			mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), TranslateT("<last>"), status);

 			ListView_SetItemText(hList, lvItem.iItem, 1, buf);

@@ -271,9 +269,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 					// LAST STATUS

 					if (proto->status == ID_STATUS_LAST) {

 						TCHAR last[80];

-						mir_sntprintf(last, SIZEOF(last), _T("%s (%s)"),

-							TranslateT("<last>"),

-							CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, proto->lastStatus, GSMDF_TCHAR ));

+						mir_sntprintf(last, SIZEOF(last), _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

 						ListView_SetItemText(GetDlgItem(hwndDlg,IDC_STARTUPLIST), lvItem.iItem, 1, last);

 						actualStatus = proto->lastStatus;

 					}

@@ -282,14 +278,11 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 					else if (proto->status == ID_STATUS_CURRENT) {

 						int currentStatus = CallProtoService(proto->szName,PS_GETSTATUS, 0, 0);

 						TCHAR current[80];

-						mir_sntprintf(current, SIZEOF(current), _T("%s (%s)"),

-							TranslateT("<current>"),

-							CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, currentStatus, GSMDF_TCHAR ));

+						mir_sntprintf(current, SIZEOF(current), _T("%s (%s)"), TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

 						ListView_SetItemText(GetDlgItem(hwndDlg,IDC_STARTUPLIST), lvItem.iItem, 1, current);

 						actualStatus = currentStatus;

 					}

-					else ListView_SetItemText(GetDlgItem(hwndDlg,IDC_STARTUPLIST), lvItem.iItem, 1,

-						( TCHAR* )CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, proto->status, GSMDF_TCHAR ));

+					else ListView_SetItemText(GetDlgItem(hwndDlg,IDC_STARTUPLIST), lvItem.iItem, 1, pcli->pfnGetStatusModeDescription(proto->status, 0));

 

 					if ((!((CallProtoService(proto->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_1, 0)&PF1_MODEMSGSEND)&~PF1_INDIVMODEMSG)) || (!(CallProtoService(proto->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_3, 0)&Proto_Status2Flag(actualStatus))))

 						EnableWindow(GetDlgItem(hwndDlg, IDC_SETSTSMSG), FALSE);

@@ -351,7 +344,7 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 

 				// last

 				TCHAR buf[100];

-				mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, GSMDF_TCHAR));

+				mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), TranslateT("<last>"), pcli->pfnGetStatusModeDescription(proto->lastStatus, 0));

 				int item = SendDlgItemMessage( hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)buf );

 				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, ID_STATUS_LAST);

 				if (proto->status == ID_STATUS_LAST) {

@@ -361,23 +354,21 @@ static INT_PTR CALLBACK ConfirmDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARA
 

 				// current

 				int currentStatus = CallProtoService(proto->szName,PS_GETSTATUS, 0, 0);

-				mir_sntprintf( buf, SIZEOF(buf), _T("%s (%s)"),

-					TranslateT("<current>"),

-					CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, currentStatus, GSMDF_TCHAR));

-				item = SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_ADDSTRING, 0, (LPARAM)buf);

-				SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_SETITEMDATA, item, ID_STATUS_CURRENT);

+				mir_sntprintf(buf, SIZEOF(buf), _T("%s (%s)"), TranslateT("<current>"), pcli->pfnGetStatusModeDescription(currentStatus, 0));

+				item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)buf);

+				SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, ID_STATUS_CURRENT);

 				if (proto->status == ID_STATUS_CURRENT) {

-					SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_SETCURSEL, item, 0);

+					SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETCURSEL, item, 0);

 					actualStatus = currentStatus;

 				}

 

 				for (int i=0; i < SIZEOF(statusModeList); i++) {

 					if ( ((flags & statusModePf2List[i]) || (statusModePf2List[i] == PF2_OFFLINE)) && (!((!(flags) & Proto_Status2Flag(statusModePf2List[i]))) || ((CallProtoService(proto->szName, PS_GETCAPS, (WPARAM)PFLAGNUM_5, 0)&Proto_Status2Flag(statusModePf2List[i]))))) {

-						TCHAR* statusMode = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, statusModeList[i], GSMDF_TCHAR);

-						item = SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_ADDSTRING, 0, (LPARAM)statusMode);

-						SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_SETITEMDATA, item, statusModeList[i]);

+						TCHAR *statusMode = pcli->pfnGetStatusModeDescription(statusModeList[i], 0);

+						item = SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_ADDSTRING, 0, (LPARAM)statusMode);

+						SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETITEMDATA, item, statusModeList[i]);

 						if (statusModeList[i] == proto->status)

-							SendDlgItemMessage(hwndDlg,IDC_STATUS,CB_SETCURSEL, item, 0);

+							SendDlgItemMessage(hwndDlg, IDC_STATUS, CB_SETCURSEL, item, 0);

 					}

 				}