- all static protocol services replaced with functions;

- m_protomod.h removed as useless

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

8 files changed, 16 insertions, 16 deletions

diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index 3cdf2a23d3..aaf414c3ad 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -482,7 +482,7 @@ static int _GetNetVisibleProtoCount()
 {

 	int i, count, netProtoCount;

 	PROTOACCOUNT **accs;

-	ProtoEnumAccounts(&count, &accs);

+	Proto_EnumAccounts(&count, &accs);

 	for (i = 0, netProtoCount = 0; i < count; i++) {

 		if (pcli->pfnGetProtocolVisibility(accs[i]->szModuleName) == 0)

 			continue;

@@ -620,7 +620,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			int AccNum, i, siS, siV, item;

 			PROTOACCOUNT **acc;

 

-			ProtoEnumAccounts(&AccNum, &acc);

+			Proto_EnumAccounts(&AccNum, &acc);

 

 			for (siS = siV = -1, i = 0; i < AccNum; i++)

 			{

diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 4e30d4d18c..466948d15f 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -203,7 +203,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce)
 		pdnce->getName();

 

 	else if (pdnce->isUnknown && pdnce->m_cache_cszProto && pdnce->m_bProtoNotExists == TRUE && g_flag_bOnModulesLoadedCalled) {

-		if (ProtoGetAccount(pdnce->m_cache_cszProto) == NULL) {

+		if (Proto_GetAccount(pdnce->m_cache_cszProto) == NULL) {

 			pdnce->m_bProtoNotExists = FALSE;

 			pdnce->getName();

 		}

diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp
index 49725c9527..a0430c6172 100644
--- a/plugins/Clist_modern/src/modern_clisttray.cpp
+++ b/plugins/Clist_modern/src/modern_clisttray.cpp
@@ -382,7 +382,7 @@ VOID CALLBACK cliTrayCycleTimerProc(HWND, UINT, UINT_PTR, DWORD)
 

 	PROTOACCOUNT **acc;

 	int AccNum;

-	ProtoEnumAccounts(&AccNum, &acc);

+	Proto_EnumAccounts(&AccNum, &acc);

 

 	// looking for the appropriate account to show its icon

 	int t = pcli->cycleStep;

@@ -453,7 +453,7 @@ int GetGoodAccNum(bool *bDiffers, bool *bConn)
 {

 	PROTOACCOUNT **acc;

 	int AccNum, i;

-	ProtoEnumAccounts(&AccNum, &acc);

+	Proto_EnumAccounts(&AccNum, &acc);

 

 	if (bConn)

 		*bConn = FALSE;

@@ -535,7 +535,7 @@ int cliTrayIconInit(HWND hwnd)
 		if (!szProto)

 			break;

 

-		PROTOACCOUNT *pa = ProtoGetAccount(szProto);

+		PROTOACCOUNT *pa = Proto_GetAccount(szProto);

 		if (!pa || !pa->ppro)

 			pcli->pfnTrayIconAdd(hwnd, NULL, NULL, CListTray_GetGlobalStatus(0, 0));

 		else

@@ -554,7 +554,7 @@ int cliTrayIconInit(HWND hwnd)
 	case TRAY_ICON_MODE_ALL:

 		PROTOACCOUNT **acc;

 		int AccNum, i;

-		ProtoEnumAccounts(&AccNum, &acc);

+		Proto_EnumAccounts(&AccNum, &acc);

 

 		for (i = AccNum; i--;) {

 			if (!acc[i]->bIsVirtual && acc[i]->bIsVisible && !acc[i]->bDynDisabled && acc[i]->ppro)

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 3f8bc898f0..8c663dfcd0 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -911,7 +911,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 

 		if (szAccoName[0]) {

 			// second try to find by protocol name

-			PROTOACCOUNT *acc = ProtoGetAccount(szAccoName);

+			PROTOACCOUNT *acc = Proto_GetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

 				mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, acc->szProtoName);

 				if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

@@ -953,7 +953,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 

 		if (szAccoName[0]) {

 			// second try to find by protocol name

-			PROTOACCOUNT *acc = ProtoGetAccount(szAccoName);

+			PROTOACCOUNT *acc = Proto_GetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

 				mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("proto_conn_%S.dll"), acc->szProtoName);

 				if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

@@ -1081,10 +1081,10 @@ void CLUI_DisconnectAll()
 {

 	PROTOACCOUNT **accs;

 	int nProtoCount;

-	ProtoEnumAccounts(&nProtoCount, &accs);

+	Proto_EnumAccounts(&nProtoCount, &accs);

 

 	for (int nProto = 0; nProto < nProtoCount; nProto++)

-		if (IsAccountEnabled(accs[nProto]))

+		if (Proto_IsAccountEnabled(accs[nProto]))

 			CallProtoService(accs[nProto]->szModuleName, PS_SETSTATUS, ID_STATUS_OFFLINE, 0);

 }

 

diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp
index 8cd7237eb1..272daa123c 100644
--- a/plugins/Clist_modern/src/modern_contact.cpp
+++ b/plugins/Clist_modern/src/modern_contact.cpp
@@ -84,7 +84,7 @@ int GetProtoIndex(char * szName)
 	if (szName) {

 		PROTOACCOUNT **accs = NULL;

 		int accCount = 0;

-		ProtoEnumAccounts(&accCount, &accs);

+		Proto_EnumAccounts(&accCount, &accs);

 

 		for (int i = 0; i < accCount; i++)

 			if (!mir_strcmpi(szName, accs[i]->szModuleName))

diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp
index 0637c9a3bc..7d785529e3 100644
--- a/plugins/Clist_modern/src/modern_statusbar.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar.cpp
@@ -172,7 +172,7 @@ int ModernDrawStatusBarWorker(HWND hWnd, HDC hDC)
 

 	int protoCount;

 	PROTOACCOUNT **accs;

-	ProtoEnumAccounts(&protoCount, &accs);

+	Proto_EnumAccounts(&protoCount, &accs);

 	if (protoCount == 0)

 		return 0;

 

@@ -800,7 +800,7 @@ LRESULT CALLBACK ModernStatusProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 

 						int protoCount;

 						PROTOACCOUNT **accs;

-						ProtoEnumAccounts(&protoCount, &accs);

+						Proto_EnumAccounts(&protoCount, &accs);

 

 						bool first = true;

 						for (int pos = 0; pos < protoCount; pos++) {

diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp
index acf1c22e7e..7625191703 100644
--- a/plugins/Clist_modern/src/modern_statusbar_options.cpp
+++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp
@@ -163,7 +163,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 			int count;

 			PROTOACCOUNT **accs;

-			ProtoEnumAccounts(&count, &accs);

+			Proto_EnumAccounts(&count, &accs);

 

 			SendMessage(hwndComboBox, CB_ADDSTRING, 0, (LPARAM)TranslateT("<<Global>>"));

 			SendMessage(hwndComboBox, CB_SETITEMDATA, 0, 0);

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 3a73313d86..9da5d24f42 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -216,7 +216,7 @@ static int FillDialog(HWND hwnd)
 	ListView_InsertColumn(GetDlgItem(hwnd, IDC_PROTOCOLS), 0, &lvc);

 

 	// fill protocols...

-	ProtoEnumAccounts(&protoCount, &accs);

+	Proto_EnumAccounts(&protoCount, &accs);

 

 	item.mask = LVIF_TEXT;

 	item.iItem = 1000;