useless function removed

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

2 files changed, 17 insertions, 26 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index c3efe4d858..5645c0e45d 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -493,8 +493,7 @@ type
     pfnStub2           : function (_para1:int):int; cdecl;

 

     pfnGetProtocolVisibility : function (_para1:PAnsiChar):int; cdecl;

-    pfnGetProtoIndexByPos    : function (var proto:PPROTOCOLDESCRIPTOR;

-                               protoCnt:int; Pos:int):int; cdecl;

+    pfnGetProtoIndexByPos    : function (var proto:PPROTOCOLDESCRIPTOR; protoCnt:int; Pos:int):int; cdecl;

     pfnReloadProtoMenus      : procedure ; cdecl;

 

   (*************************************************************************************

@@ -509,26 +508,21 @@ type
     szTip             : TChar;

     bTrayMenuOnScreen : bool;

 

-    pfnGetIconFromStatusMode  : function  (hContact:TMCONTACT; szProto:PAnsiChar;

-                                status:int):HICON; cdecl;

+    pfnGetIconFromStatusMode  : function  (hContact:TMCONTACT; szProto:PAnsiChar; status:int):HICON; cdecl;

 

     pfnInitTray               : procedure ; cdecl;

-    pfnTrayIconAdd            : function  (hwnd:HWND; szProto:PAnsiChar; szIconProto:PAnsiChar;

-                                status:int):int; cdecl;

+    pfnUninitTray             : procedure ; cdecl;

+

+    pfnTrayIconAdd            : function  (hwnd:HWND; szProto:PAnsiChar; szIconProto:PAnsiChar; status:int):int; cdecl;

     pfnTrayIconDestroy        : function  (hwnd:HWND):int; cdecl;

     pfnTrayIconInit           : function  (hwnd:HWND):int; cdecl;

     pfnTrayIconMakeTooltip    : function  (szPrefix:TChar; szProto:PAnsiChar):TChar; cdecl;

     pfnTrayIconRemove         : procedure (hwnd:HWND; szProto:PAnsiChar); cdecl;

     pfnTrayIconSetBaseInfo    : function  (hIcon:HICON; szPreferredProto:PAnsiChar):int; cdecl;

     pfnTrayIconTaskbarCreated : procedure (hwnd:HWND); cdecl;

-    pfnTrayIconUpdate         : function  (hNewIcon:HICON; szNewTip:TChar;

-                                szPreferredProto:PAnsiChar; isBase:int):int; cdecl;

-

-    pfnUninitTray : procedure ; cdecl;

-    pfnLockTray   : procedure ; cdecl;

-    pfnUnlockTray : procedure ; cdecl;

+    pfnTrayIconUpdate         : function  (hNewIcon:HICON; szNewTip:TChar; szPreferredProto:PAnsiChar; isBase:int):int; cdecl;

 

-    pfnTrayCycleTimerProc : procedure(hwnd:HWND;message:uint;idEvent:uint_ptr;dwTime:dword); stdcall;

+    pfnTrayCycleTimerProc : procedure(hwnd:HWND; message:uint; idEvent:uint_ptr; dwTime:dword); stdcall;

 

   (*************************************************************************************

   * version 6 additions (0.8.0.x) - accounts

@@ -536,18 +530,17 @@ type
     pfnGetAccountIndexByPos : function (pos:int):int; cdecl;

     pfnConvertMenu: function( clitem:PCLISTMENUITEM; moitem:PMO_MenuItem):int; cdecl;

 

-	(*************************************************************************************

-	 * version 7 additions (0.11.0.x) - extra images

-	 *************************************************************************************)

+  (*************************************************************************************

+  * version 7 additions (0.11.0.x) - extra images

+  *************************************************************************************)

     pfnReloadExtraIcons: procedure; cdecl;

     pfnSetAllExtraIcons: procedure(hContact:TMCONTACT); cdecl;

 

-	(*************************************************************************************

-	 * Miranda NG additions

-	 *************************************************************************************)

-

-	  pfnGetContactIcon: function(hContact:TMCONTACT):int; cdecl;

-	  pfnTrayCalcChanged:function(szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;

+  (*************************************************************************************

+  * Miranda NG additions

+  *************************************************************************************)

+	 pfnGetContactIcon: function(hContact:TMCONTACT):int; cdecl;

+	 pfnTrayCalcChanged:function(szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl;

     pfnGetAverageMode:function(pNetProtoCount:pint):int; cdecl;

     pfnInitAutoRebuild:procedure(hwnd:HWND); cdecl;

   end;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 25a124d42e..b430c06324 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -446,6 +446,8 @@ typedef struct
 	HICON  (*pfnGetIconFromStatusMode)(MCONTACT hContact, const char *szProto, int status);

 

 	void   (*pfnInitTray)(void);

+	void   (*pfnUninitTray)(void);

+

 	int    (*pfnTrayIconAdd)(HWND hwnd, const char *szProto, const char *szIconProto, int status);

 	int    (*pfnTrayIconDestroy)(HWND hwnd);

 	int    (*pfnTrayIconInit)(HWND hwnd);

@@ -455,10 +457,6 @@ typedef struct
 	void   (*pfnTrayIconTaskbarCreated)(HWND hwnd);

 	int    (*pfnTrayIconUpdate)(HICON hNewIcon, const TCHAR *szNewTip, const char *szPreferredProto, int isBase);

 

-	void   (*pfnUninitTray)(void);

-	void   (*pfnLockTray)(void);

-	void   (*pfnUnlockTray)(void);

-

 	VOID   (CALLBACK *pfnTrayCycleTimerProc)(HWND hwnd, UINT message, UINT_PTR idEvent, DWORD dwTime);

 

 	/*************************************************************************************