finally that perversion with double protocol caching in clist died

2 files changed, 1 insertions, 11 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index ea5c91dcbc..724ad30bf7 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -292,8 +292,6 @@ type
     hwndStatus      : HWND;

     hMenuMain       : HMENU;

     hInst           : HMODULE;

-    hClcProtoCount  : int;

-    clcProto        : PClcProtoStatus;

 

   (* clc.h *)

     pfnContactListControlWndProc       : function(hwnd:HWND; msg:uint; wParam:WPARAM; lParam:LPARAM):LRESULT; stdcall;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index d0aeabd3d9..594fa70546 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -192,6 +192,7 @@ struct MenuProto
 	ptrA     szProto; 

 	HGENMENU pMenu;

 	HICON    hIcon;

+	int      iStatus;

 };

 

 /////////////////////////////////////////////////////////////////////////////////////////

@@ -295,12 +296,6 @@ EXTERN_C MIR_APP_DLL(int) Clist_GetAccountIndex(int iPos);
 /////////////////////////////////////////////////////////////////////////////////////////

 // CLIST_INTERFACE structure definition

 

-struct ClcProtoStatus

-{

-	char *szProto;

-	DWORD dwStatus;

-};

-

 struct ClcCacheEntryBase

 {

 	MCONTACT hContact;

@@ -316,9 +311,6 @@ struct CLIST_INTERFACE
 	HMENU hMenuMain;

 	HMODULE hInst;

 

-	int hClcProtoCount;

-	ClcProtoStatus *clcProto;

-

 	// clc.h

 	LRESULT        (CALLBACK *pfnContactListControlWndProc)(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);