summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/delphi/m_clistint.inc2
-rw-r--r--include/m_clistint.h3
-rw-r--r--libs/win32/mir_app.libbin154384 -> 154674 bytes
-rw-r--r--libs/win64/mir_app.libbin149556 -> 149826 bytes
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_clcmsgs.cpp2
-rw-r--r--src/mir_app/src/clc.cpp10
-rw-r--r--src/mir_app/src/clc.h1
-rw-r--r--src/mir_app/src/clcitems.cpp2
-rw-r--r--src/mir_app/src/clcutils.cpp2
-rw-r--r--src/mir_app/src/clistcore.cpp1
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
13 files changed, 14 insertions, 13 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 3b9185bedf..a7f6097569 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -330,7 +330,7 @@ type
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;
- pfnSaveStateAndRebuildList : procedure (hwnd:HWND; var dat:TClcData); cdecl;
+ blablablabla20 : procedure; cdecl;
(* clcmsgs.c *)
pfnProcessExternalMessages : function (hwnd:HWND; var dat:TClcData; msg:uint; wParam:WPARAM; lParam:LPARAM):LRESULT; cdecl;
diff --git a/include/m_clistint.h b/include/m_clistint.h
index f0ab35c6ea..9c49ac1201 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -272,6 +272,7 @@ EXTERN_C MIR_APP_DLL(int) Clist_IsHiddenMode(ClcData *dat, int status);
EXTERN_C MIR_APP_DLL(void) Clist_LoadContactTree(void);
EXTERN_C MIR_APP_DLL(void) Clist_NotifyNewContact(HWND hwnd, MCONTACT hContact);
EXTERN_C MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat);
+EXTERN_C MIR_APP_DLL(void) Clist_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);
EXTERN_C MIR_APP_DLL(void) Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked);
EXTERN_C MIR_APP_DLL(int) Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);
@@ -352,7 +353,7 @@ struct CLIST_INTERFACE
void (*pfnRebuildEntireList)(HWND hwnd, ClcData *dat);
int (*pfnGetGroupContentsCount)(ClcGroup *group, int visibleOnly);
void (*pfnSortCLC)(HWND hwnd, ClcData *dat, int useInsertionSort);
- void (*pfnSaveStateAndRebuildList)(HWND hwnd, ClcData *dat);
+ void (*blablablabla20)();
/* clcmsgs.c */
LRESULT (*pfnProcessExternalMessages)(HWND hwnd, ClcData *dat, UINT msg, WPARAM wParam, LPARAM lParam);
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index cfcdebff31..19be013574 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 34780479d6..48c49119a1 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 23cca110e2..ecc198f83c 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1539,7 +1539,7 @@ static LRESULT clcOnIntmReloadOptions(ClcData *dat, HWND hwnd, UINT msg, WPARAM
{
corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
pcli->pfnLoadClcOptions(hwnd, dat, FALSE);
- pcli->pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
pcli->pfnSortCLC(hwnd, dat, 1);
if (IsWindowVisible(hwnd))
pcli->pfnInvalidateRect(GetParent(hwnd), nullptr, FALSE);
diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp
index 06f688619d..facfb11609 100644
--- a/plugins/Clist_modern/src/modern_clcmsgs.cpp
+++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp
@@ -41,7 +41,7 @@ LRESULT cli_ProcessExternalMessages(HWND hwnd, ClcData *dat, UINT msg, WPARAM wP
case CLM_AUTOREBUILD:
if (dat->bForceInDialog) {
- pcli->pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
pcli->bAutoRebuild = false;
}
else clcSetDelayTimer(TIMERID_REBUILDAFTER, hwnd);
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index a0a1f2f9f7..31d18d02c2 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -299,7 +299,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
case INTM_RELOADOPTIONS:
cli.pfnLoadClcOptions(hwnd, dat, FALSE);
- cli.pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
break;
case WM_THEMECHANGED:
@@ -414,7 +414,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
break; //only expanded has changed: no action reqd
}
}
- cli.pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
}
break;
@@ -790,7 +790,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
}
if (dat->bFilterSearch)
- cli.pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
if (dat->szQuickSearch[0]) {
int index;
@@ -800,7 +800,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
else {
MessageBeep(MB_OK);
dat->szQuickSearch[mir_wstrlen(dat->szQuickSearch) - 1] = '\0';
- cli.pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
}
cli.pfnInvalidateRect(hwnd, nullptr, FALSE);
Clist_EnsureVisible(hwnd, dat, dat->selection, 0);
@@ -872,7 +872,7 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam
case TIMERID_REBUILDAFTER:
KillTimer(hwnd, TIMERID_REBUILDAFTER);
cli.pfnInvalidateRect(hwnd, nullptr, FALSE);
- cli.pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
cli.bAutoRebuild = false;
break;
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index c8b0063219..5427afd777 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -68,7 +68,6 @@ 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);
-void fnSaveStateAndRebuildList(HWND hwnd, ClcData *dat);
int fnGetContactHiddenStatus(MCONTACT hContact, char *szProto, ClcData *dat);
/* clcmsgs.c */
diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index 0ab68940a7..7b03b4c79c 100644
--- a/src/mir_app/src/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -611,7 +611,7 @@ struct SavedInfoState_t
ClcContact contact;
};
-void fnSaveStateAndRebuildList(HWND hwnd, ClcData *dat)
+MIR_APP_DLL(void) Clist_SaveStateAndRebuildList(HWND hwnd, ClcData *dat)
{
Clist_HideInfoTip(dat);
KillTimer(hwnd, TIMERID_INFOTIP);
diff --git a/src/mir_app/src/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index 74e4039e38..c8ce0a8b68 100644
--- a/src/mir_app/src/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -362,7 +362,7 @@ MIR_APP_DLL(void) Clist_DoSelectionDefaultAction(HWND hwnd, ClcData *dat)
Clist_ContactDoubleClicked(contact->hContact);
if (dat->bFilterSearch && bSearchExisted)
- cli.pfnSaveStateAndRebuildList(hwnd, dat);
+ Clist_SaveStateAndRebuildList(hwnd, dat);
}
int fnFindRowByText(HWND hwnd, ClcData *dat, const wchar_t *text, int prefixOk)
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index eb10cce9fd..d02bf30d1b 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -86,7 +86,6 @@ void InitClistCore()
cli.pfnRebuildEntireList = fnRebuildEntireList;
cli.pfnGetGroupContentsCount = fnGetGroupContentsCount;
cli.pfnSortCLC = fnSortCLC;
- cli.pfnSaveStateAndRebuildList = fnSaveStateAndRebuildList;
cli.pfnProcessExternalMessages = fnProcessExternalMessages;
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index e88ae9c037..21405afe61 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -572,3 +572,4 @@ Clist_EndRename @591
Clist_DoSelectionDefaultAction @592
Clist_EnsureVisible @593
Clist_GetGroupCountsText @594
+Clist_SaveStateAndRebuildList @595
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 8e84b5fcd6..695cefa63e 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -572,3 +572,4 @@ Clist_EndRename @591
Clist_DoSelectionDefaultAction @592
Clist_EnsureVisible @593
Clist_GetGroupCountsText @594
+Clist_SaveStateAndRebuildList @595