summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/delphi/m_clistint.inc2
-rw-r--r--include/m_clistint.h4
-rw-r--r--libs/win32/mir_app.libbin146888 -> 147138 bytes
-rw-r--r--libs/win64/mir_app.libbin142642 -> 142872 bytes
-rw-r--r--plugins/Clist_blind/src/clistopts.cpp2
-rw-r--r--plugins/Clist_modern/src/modern_clcopts.cpp4
-rw-r--r--plugins/Clist_nicer/src/clistopts.cpp2
-rw-r--r--src/core/stdclist/src/clistopts.cpp2
-rw-r--r--src/mir_app/src/clc.h1
-rw-r--r--src/mir_app/src/clistcore.cpp1
-rw-r--r--src/mir_app/src/clistgroups.cpp4
-rw-r--r--src/mir_app/src/clistmod.cpp2
-rw-r--r--src/mir_app/src/contact.cpp4
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
15 files changed, 16 insertions, 14 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 204f10168e..5382bd1f68 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -408,7 +408,7 @@ type
(* contact.c *)
pfnChangeContactIcon : procedure (hContact:TMCONTACT; iIcon:int; add:int); cdecl;
- pfnLoadContactTree : procedure ; cdecl;
+ blablablabla2 : procedure; cdecl;
pfnCompareContacts : function (var contact1:TClcContact; var contact2:TClcContact):int; cdecl;
pfnSetHideOffline : function (wParam:WPARAM; lParam:LPARAM):int; cdecl;
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 646e970ce6..12087d3858 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -254,6 +254,8 @@ EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM l
EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, DWORD dwItem, ClcContact **contact, ClcGroup **subgroup, int *isVisible);
EXTERN_C MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd);
+EXTERN_C MIR_APP_DLL(void) Clist_LoadContactTree(void);
+
// calculates account's index by its position in status bar
EXTERN_C MIR_APP_DLL(int) Clist_GetAccountIndex(int iPos);
@@ -407,7 +409,7 @@ struct CLIST_INTERFACE
/* contact.c */
void (*pfnChangeContactIcon)(MCONTACT hContact, int iIcon);
- void (*pfnLoadContactTree)(void);
+ int (*blablabla2)();
int (*pfnCompareContacts)(const ClcContact *contact1, const ClcContact *contact2);
int (*pfnSetHideOffline)(int newValue); // TRUE, FALSE or -1 to revert the current setting
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index bed68894f4..80cc02b690 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 d7b235e3b1..7fee2e1dc4 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp
index 7192649702..040723c622 100644
--- a/plugins/Clist_blind/src/clistopts.cpp
+++ b/plugins/Clist_blind/src/clistopts.cpp
@@ -163,7 +163,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
}
pcli->pfnTrayIconIconsChanged();
- pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */
+ Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */
pcli->pfnInvalidateDisplayNameCacheEntry(INVALID_CONTACT_ID); /* force reshuffle */
return TRUE;
}
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp
index a1feb71243..9be0e4f3cd 100644
--- a/plugins/Clist_modern/src/modern_clcopts.cpp
+++ b/plugins/Clist_modern/src/modern_clcopts.cpp
@@ -561,7 +561,7 @@ static INT_PTR CALLBACK DlgProcClistOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
db_set_b(0, "CList", "NoOfflineBottom", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_NOOFFLINEMOVE));
db_set_b(0, "CList", "PlaceOfflineToRoot", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_OFFLINETOROOT));
- pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */
+ Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */
Clist_InitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */
ClcOptionsChanged(); // Used to force loading avatar an list height related options
return TRUE;
@@ -740,7 +740,7 @@ static INT_PTR CALLBACK DlgProcTrayOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
| IsDlgButtonChecked(hwndDlg, IDC_ICON_ALL_V) << 3);
pcli->pfnTrayIconIconsChanged();
- pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */
+ Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */
Clist_InitAutoRebuild(pcli->hwndContactTree); /* force reshuffle */
ClcOptionsChanged(); // Used to force loading avatar an list height related options
return TRUE;
diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp
index 44fab1e82e..ff94f0b4c9 100644
--- a/plugins/Clist_nicer/src/clistopts.cpp
+++ b/plugins/Clist_nicer/src/clistopts.cpp
@@ -173,7 +173,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
HideShowNotifyFrame();
SendMessage(pcli->hwndContactTree, WM_SIZE, 0, 0);
SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0);
- pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */
+ Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */
Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);
PostMessage(pcli->hwndContactList, CLUIINTM_REDRAW, 0, 0);
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 677608a472..6263f4dbf9 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -180,7 +180,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
}
pcli->pfnTrayIconIconsChanged();
- pcli->pfnLoadContactTree(); /* this won't do job properly since it only really works when changes happen */
+ Clist_LoadContactTree(); /* this won't do job properly since it only really works when changes happen */
pcli->pfnInvalidateDisplayNameCacheEntry(INVALID_CONTACT_ID); /* force reshuffle */
return TRUE;
}
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index b451b55a12..ea0f9db7ad 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -176,7 +176,6 @@ void fnDrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);
/* contact.c */
void fnChangeContactIcon(MCONTACT hContact, int iIcon);
-void fnLoadContactTree(void);
int fnSetHideOffline(int iValue);
/* docking.c */
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 8a3da4abc4..587694c495 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -165,7 +165,6 @@ void InitClistCore()
cli.pfnOnCreateClc = fnOnCreateClc;
cli.pfnChangeContactIcon = fnChangeContactIcon;
- cli.pfnLoadContactTree = fnLoadContactTree;
cli.pfnSetHideOffline = fnSetHideOffline;
cli.pfnDocking_ProcessWindowMessage = fnDocking_ProcessWindowMessage;
diff --git a/src/mir_app/src/clistgroups.cpp b/src/mir_app/src/clistgroups.cpp
index 5660cc9c91..65c2010e2e 100644
--- a/src/mir_app/src/clistgroups.cpp
+++ b/src/mir_app/src/clistgroups.cpp
@@ -252,7 +252,7 @@ MIR_APP_DLL(int) Clist_GroupDelete(MGROUP hGroup)
}
SetCursor(LoadCursor(nullptr, IDC_ARROW));
- cli.pfnLoadContactTree();
+ Clist_LoadContactTree();
const CLISTGROUPCHANGE grpChg = { sizeof(grpChg), pGroup->groupName+1, nullptr };
NotifyEventHooks(hGroupChangeEvent, 0, (LPARAM)&grpChg);
@@ -421,7 +421,7 @@ MIR_APP_DLL(int) Clist_GroupSetFlags(MGROUP hGroup, LPARAM iNewFlags)
pGroup->save();
if ((oldval & GROUPF_HIDEOFFLINE) != (pGroup->groupName[0] & GROUPF_HIDEOFFLINE))
- cli.pfnLoadContactTree();
+ Clist_LoadContactTree();
return 0;
}
diff --git a/src/mir_app/src/clistmod.cpp b/src/mir_app/src/clistmod.cpp
index 11760fbd2b..b648a1d530 100644
--- a/src/mir_app/src/clistmod.cpp
+++ b/src/mir_app/src/clistmod.cpp
@@ -193,7 +193,7 @@ static int ContactListModulesLoaded(WPARAM, LPARAM)
for (auto &it : accounts)
AddProtoIconIndex(it);
- cli.pfnLoadContactTree();
+ Clist_LoadContactTree();
LoadCLUIModule();
diff --git a/src/mir_app/src/contact.cpp b/src/mir_app/src/contact.cpp
index 8970bd293b..b54be64837 100644
--- a/src/mir_app/src/contact.cpp
+++ b/src/mir_app/src/contact.cpp
@@ -35,7 +35,7 @@ static int GetContactStatus(MCONTACT hContact)
return db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE);
}
-void fnLoadContactTree(void)
+MIR_APP_DLL(void) Clist_LoadContactTree(void)
{
int hideOffline = db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT);
for (auto &hContact : Contacts()) {
@@ -75,6 +75,6 @@ int fnSetHideOffline(int iValue)
default:
return -1;
}
- cli.pfnLoadContactTree();
+ Clist_LoadContactTree();
return iValue;
}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 73871eaabc..33df2c32ed 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -543,3 +543,4 @@ Menu_GetProtocolMenu @562
ExtraIcon_Reload @563
ExtraIcon_SetAll @564
Clist_GetStatusModeDescription @565
+Clist_LoadContactTree @566
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 11abf96af6..2c09d971ca 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -543,3 +543,4 @@ Menu_GetProtocolMenu @562
ExtraIcon_Reload @563
ExtraIcon_SetAll @564
Clist_GetStatusModeDescription @565
+Clist_LoadContactTree @566
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 21:14:29 +0000