CLIST_INTERFACE::pfnDeleteItemFromTree => Clist_DeleteItemFromTree

14 files changed, 15 insertions, 13 deletions

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index a7f6097569..8883c966d4 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -326,7 +326,7 @@ type
     pfnAddItemToGroup                  : function  (var group:TClcGroup; iAboveItem:int):PClcContact; cdecl;

     pfnAddContactToGroup               : function  (var dat:TClcData; var group:TClcGroup; hContact:TMCONTACT):PClcContact; cdecl;

     pfnAddContactToTree                : procedure (hwnd:HWND; var dat:TClcData; hContact:TMCONTACT; updateTotalCount:int; checkHideOffline:int); cdecl;

-    pfnDeleteItemFromTree              : procedure (hwnd:HWND; hItem:TMCONTACT); cdecl;

+    blablablabla21                     : procedure; cdecl;

     pfnRebuildEntireList               : procedure (hwnd:HWND; var dat:TClcData); cdecl;

     pfnGetGroupContentsCount           : function  (var group:TClcGroup; visibleOnly:int):int; cdecl;

     pfnSortCLC                         : procedure (hwnd:HWND; var dat:TClcData; useInsertionSort:int); cdecl;

diff --git a/include/m_clistint.h b/include/m_clistint.h
index 9c49ac1201..b5f0ae991e 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -256,6 +256,7 @@ EXTERN_C MIR_APP_DLL(void)     Clist_CalcEipPosition(ClcData *dat, ClcContact *c
 EXTERN_C MIR_APP_DLL(void)     Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);

 EXTERN_C MIR_APP_DLL(int)      Clist_ClcStatusToPf2(int status);

 EXTERN_C MIR_APP_DLL(void)     Clist_DeleteFromContactList(HWND hwnd, ClcData *dat);

+EXTERN_C MIR_APP_DLL(void)     Clist_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);

 EXTERN_C MIR_APP_DLL(void)     Clist_DoSelectionDefaultAction(HWND hwnd, ClcData *dat);

 EXTERN_C MIR_APP_DLL(void)     Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);

 EXTERN_C MIR_APP_DLL(void)     Clist_EndRename(ClcData *dat, int save);

@@ -349,7 +350,7 @@ struct CLIST_INTERFACE
 	ClcContact*    (*pfnAddContactToGroup)(ClcData *dat, ClcGroup *group, MCONTACT hContact);

 				      

 	void           (*pfnAddContactToTree)(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

-	void           (*pfnDeleteItemFromTree)(HWND hwnd, MCONTACT hItem);

+	void           (*blablablabla21)();

 	void           (*pfnRebuildEntireList)(HWND hwnd, ClcData *dat);

 	int            (*pfnGetGroupContentsCount)(ClcGroup *group, int visibleOnly);

 	void           (*pfnSortCLC)(HWND hwnd, ClcData *dat, int useInsertionSort);

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 19be013574..f282b9dd99 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 48c49119a1..b956f0d481 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index ecc198f83c..29e4e4ccee 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1300,7 +1300,7 @@ static LRESULT clcOnIntmGroupChanged(ClcData *dat, HWND hwnd, UINT, WPARAM wPara
 		memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));

 		flags = contact->flags;

 	}

-	pcli->pfnDeleteItemFromTree(hwnd, wParam);

+	Clist_DeleteItemFromTree(hwnd, wParam);

 	if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) {

 		NMCLISTCONTROL nm;

 		pcli->pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index facfb11609..42c709ac6d 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -34,7 +34,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
 

 	switch (msg) {

 	case CLM_DELETEITEM:

-		pcli->pfnDeleteItemFromTree(hwnd, wParam);

+		Clist_DeleteItemFromTree(hwnd, wParam);

 		clcSetDelayTimer(TIMERID_DELAYEDRESORTCLC, hwnd, 1); //pcli->pfnSortCLC(hwnd, dat, 1);

 		clcSetDelayTimer(TIMERID_RECALCSCROLLBAR, hwnd, 2); //pcli->pfnRecalcScrollBar(hwnd, dat);

 		return 0;

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index dd858bec85..93906325b3 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -281,7 +281,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 				memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));

 				flags = contact->flags;

 			}

-			pcli->pfnDeleteItemFromTree(hwnd, wParam);

+			Clist_DeleteItemFromTree(hwnd, wParam);

 			if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !CLVM_GetContactHiddenStatus(wParam, nullptr, dat)) {

 				pcli->pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

 				if (Clist_FindItem(hwnd, dat, wParam, &contact, nullptr, nullptr)) {

diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index 31d18d02c2..a486029bb9 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -429,7 +429,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 		break;

 

 	case INTM_CONTACTDELETED:

-		cli.pfnDeleteItemFromTree(hwnd, wParam);

+		Clist_DeleteItemFromTree(hwnd, wParam);

 		SortClcByTimer(hwnd);

 		break;

 

@@ -444,7 +444,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 				cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

 				Clist_NotifyNewContact(hwnd, wParam);

 			}

-			else cli.pfnDeleteItemFromTree(hwnd, wParam);

+			else Clist_DeleteItemFromTree(hwnd, wParam);

 

 			dat->bNeedsResort = true;

 			SortClcByTimer(hwnd);

@@ -461,7 +461,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
 				memcpy(iExtraImage, contact->iExtraImage, sizeof(iExtraImage));

 				flags = contact->flags;

 			}

-			cli.pfnDeleteItemFromTree(hwnd, wParam);

+			Clist_DeleteItemFromTree(hwnd, wParam);

 			if (GetWindowLongPtr(hwnd, GWL_STYLE) & CLS_SHOWHIDDEN || !db_get_b(wParam, "CList", "Hidden", 0)) {

 				NMCLISTCONTROL nm;

 				cli.pfnAddContactToTree(hwnd, dat, wParam, 1, 1);

diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index 5427afd777..9bddc54ad2 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -64,7 +64,6 @@ void fnFreeContact(ClcContact *p);
 void fnFreeGroup(ClcGroup *group);

 

 void fnAddContactToTree(HWND hwnd, ClcData *dat, MCONTACT hContact, int updateTotalCount, int checkHideOffline);

-void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem);

 void fnRebuildEntireList(HWND hwnd, ClcData *dat);

 int  fnGetGroupContentsCount(ClcGroup *group, int visibleOnly);

 void fnSortCLC(HWND hwnd, ClcData *dat, int useInsertionSort);

diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index 7b03b4c79c..51a90d5fc3 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -298,7 +298,7 @@ ClcGroup* fnRemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact,
 	return group;
 }
 
-void fnDeleteItemFromTree(HWND hwnd, MCONTACT hItem)
+MIR_APP_DLL(void) Clist_DeleteItemFromTree(HWND hwnd, MCONTACT hItem)
 {
 	ClcData *dat = (ClcData*)GetWindowLongPtr(hwnd, 0);
 	dat->bNeedsResort = true;
diff --git a/src/mir_app/src/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp
index b96d80711d..a05f84dc9e 100644
--- a/src/mir_app/src/clcmsgs.cpp
+++ b/src/mir_app/src/clcmsgs.cpp
@@ -81,7 +81,7 @@ LRESULT fnProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wPar
 		break;

 

 	case CLM_DELETEITEM:

-		cli.pfnDeleteItemFromTree(hwnd, wParam);

+		Clist_DeleteItemFromTree(hwnd, wParam);

 		cli.pfnSortCLC(hwnd, dat, 1);

 		cli.pfnRecalcScrollBar(hwnd, dat);

 		break;

diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index d02bf30d1b..d397005691 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -82,8 +82,8 @@ void InitClistCore()
 	cli.pfnAddInfoItemToGroup = fnAddInfoItemToGroup;

 	cli.pfnAddContactToGroup = fnAddContactToGroup;

 	cli.pfnAddContactToTree = fnAddContactToTree;

-	cli.pfnDeleteItemFromTree = fnDeleteItemFromTree;

-	cli.pfnRebuildEntireList = fnRebuildEntireList;

+	

+	cli.pfnRebuildEntireList = fnRebuildEntireList;	

 	cli.pfnGetGroupContentsCount = fnGetGroupContentsCount;

 	cli.pfnSortCLC = fnSortCLC;

 

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 21405afe61..0e6f53b6dd 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -573,3 +573,4 @@ Clist_DoSelectionDefaultAction @592
 Clist_EnsureVisible @593

 Clist_GetGroupCountsText @594

 Clist_SaveStateAndRebuildList @595

+Clist_DeleteItemFromTree @596

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 695cefa63e..929ffeae10 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -573,3 +573,4 @@ Clist_DoSelectionDefaultAction @592
 Clist_EnsureVisible @593

 Clist_GetGroupCountsText @594

 Clist_SaveStateAndRebuildList @595

+Clist_DeleteItemFromTree @596