summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/delphi/m_clistint.inc2
-rw-r--r--include/m_clistint.h5
-rw-r--r--libs/win32/mir_app.libbin147138 -> 147398 bytes
-rw-r--r--libs/win64/mir_app.libbin142872 -> 143112 bytes
-rw-r--r--plugins/Clist_modern/src/modern_clistsettings.cpp6
-rw-r--r--plugins/Clist_nicer/src/clc.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/clistevents.cpp6
-rw-r--r--src/mir_app/src/clistmod.cpp2
-rw-r--r--src/mir_app/src/clistsettings.cpp8
-rw-r--r--src/mir_app/src/contact.cpp2
-rw-r--r--src/mir_app/src/mir_app.def1
-rw-r--r--src/mir_app/src/mir_app64.def1
14 files changed, 19 insertions, 18 deletions
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 5382bd1f68..a0abfb9c17 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -407,8 +407,8 @@ type
pfnOnCreateClc : procedure ; cdecl;
(* contact.c *)
- pfnChangeContactIcon : procedure (hContact:TMCONTACT; iIcon:int; add:int); cdecl;
blablablabla2 : procedure; cdecl;
+ blablablabla3 : 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 12087d3858..db88b62361 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -252,6 +252,7 @@ EXTERN_C MIR_APP_DLL(HANDLE) Clist_ContactToItemHandle(ClcContact *contact, DWOR
EXTERN_C MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam);
EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);
+EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);
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);
@@ -408,8 +409,8 @@ struct CLIST_INTERFACE
void (*pfnOnCreateClc)(void);
/* contact.c */
- void (*pfnChangeContactIcon)(MCONTACT hContact, int iIcon);
- int (*blablabla2)();
+ int (*blablabla2)();
+ int (*blablabla3)();
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 80cc02b690..809fcde091 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 7fee2e1dc4..60da632517 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp
index 908fe8083e..0349d110f8 100644
--- a/plugins/Clist_modern/src/modern_clistsettings.cpp
+++ b/plugins/Clist_modern/src/modern_clistsettings.cpp
@@ -95,7 +95,7 @@ int GetContactCachedStatus(MCONTACT hContact)
int ContactAdded(WPARAM hContact, LPARAM)
{
if (!MirandaExiting())
- pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(GetContactProto(hContact), ID_STATUS_OFFLINE, hContact));
+ Clist_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(GetContactProto(hContact), ID_STATUS_OFFLINE, hContact));
return 0;
}
@@ -170,7 +170,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
else if (!strcmp(cws->szSetting, "Hidden")) {
pdnce->bIsHidden = cws->value.bVal;
if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0)
- pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(pdnce->szProto, pdnce->getStatus(), hContact));
+ Clist_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(pdnce->szProto, pdnce->getStatus(), hContact));
Clist_Broadcast(CLM_AUTOREBUILD, 0, 0);
}
@@ -183,7 +183,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
if (!strcmp(cws->szSetting, "p")) {
pdnce->szProto = GetContactProto(hContact);
char *szProto = (cws->value.type == DBVT_DELETED) ? nullptr : cws->value.pszVal;
- pcli->pfnChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(szProto, pdnce->getStatus(), hContact));
+ Clist_ChangeContactIcon(hContact, pcli->pfnIconFromStatusMode(szProto, pdnce->getStatus(), hContact));
}
}
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index c56b4265d7..9f87d88961 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -125,7 +125,7 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam)
szProto_s = nullptr;
else
szProto_s = cws->value.pszVal;
- pcli->pfnChangeContactIcon(hContact, IconFromStatusMode(szProto_s, szProto_s == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto_s, "Status", ID_STATUS_OFFLINE), hContact, nullptr));
+ Clist_ChangeContactIcon(hContact, IconFromStatusMode(szProto_s, szProto_s == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto_s, "Status", ID_STATUS_OFFLINE), hContact, nullptr));
}
// something is being written to a protocol module
if (!__strcmp(szProto, cws->szModule)) {
diff --git a/src/mir_app/src/clc.h b/src/mir_app/src/clc.h
index ea0f9db7ad..9556bbb635 100644
--- a/src/mir_app/src/clc.h
+++ b/src/mir_app/src/clc.h
@@ -175,7 +175,6 @@ void fnCluiProtocolStatusChanged(int, const char*);
void fnDrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);
/* contact.c */
-void fnChangeContactIcon(MCONTACT hContact, int iIcon);
int fnSetHideOffline(int iValue);
/* docking.c */
diff --git a/src/mir_app/src/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 587694c495..aa2dc60f76 100644
--- a/src/mir_app/src/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -164,7 +164,6 @@ void InitClistCore()
cli.pfnInvalidateRect = fnInvalidateRect;
cli.pfnOnCreateClc = fnOnCreateClc;
- cli.pfnChangeContactIcon = fnChangeContactIcon;
cli.pfnSetHideOffline = fnSetHideOffline;
cli.pfnDocking_ProcessWindowMessage = fnDocking_ProcessWindowMessage;
diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp
index 23ad631518..cb38afa82b 100644
--- a/src/mir_app/src/clistevents.cpp
+++ b/src/mir_app/src/clistevents.cpp
@@ -142,7 +142,7 @@ static VOID CALLBACK IconFlashTimer(HWND, UINT, UINT_PTR idEvent, DWORD)
if (g_cliEvents[j].hContact == e.hContact)
break;
if (j >= i)
- cli.pfnChangeContactIcon(e.hContact, iconsOn || disableIconFlash ? e.imlIconIndex : 0);
+ Clist_ChangeContactIcon(e.hContact, iconsOn || disableIconFlash ? e.imlIconIndex : 0);
// decrease eflashes in any case - no need to collect all events
if (e.flags & CLEF_ONLYAFEW)
@@ -189,7 +189,7 @@ CListEvent* fnAddEvent(CLISTEVENT *cle)
flashTimerId = SetTimer(nullptr, 0, db_get_w(0, "CList", "IconFlashTime", 550), IconFlashTimer);
cli.pfnTrayIconUpdateWithImageList(p->imlIconIndex, p->szTooltip.w, szProto);
}
- cli.pfnChangeContactIcon(cle->hContact, p->imlIconIndex);
+ Clist_ChangeContactIcon(cle->hContact, p->imlIconIndex);
return p;
}
@@ -212,7 +212,7 @@ int fnRemoveEvent(MCONTACT hContact, MEVENT dbEvent)
// Update contact's icon
char *szProto = GetContactProto(hContact);
- cli.pfnChangeContactIcon(pEvent->hContact, Clist_GetContactIcon(pEvent->hContact));
+ Clist_ChangeContactIcon(pEvent->hContact, Clist_GetContactIcon(pEvent->hContact));
// Free any memory allocated to the event
g_cliEvents.remove(pEvent);
diff --git a/src/mir_app/src/clistmod.cpp b/src/mir_app/src/clistmod.cpp
index b648a1d530..e425e82a17 100644
--- a/src/mir_app/src/clistmod.cpp
+++ b/src/mir_app/src/clistmod.cpp
@@ -388,7 +388,7 @@ int fnShowHide()
return 0;
}
-void fnChangeContactIcon(MCONTACT hContact, int iIcon)
+MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon)
{
Clist_BroadcastAsync(INTM_ICONCHANGED, hContact, iIcon);
diff --git a/src/mir_app/src/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp
index fa2fa2bad7..986813dcc3 100644
--- a/src/mir_app/src/clistsettings.cpp
+++ b/src/mir_app/src/clistsettings.cpp
@@ -132,7 +132,7 @@ wchar_t* fnGetContactDisplayName(MCONTACT hContact, int mode)
int ContactAdded(WPARAM hContact, LPARAM)
{
- cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(GetContactProto(hContact), ID_STATUS_OFFLINE, 0));
+ Clist_ChangeContactIcon(hContact, cli.pfnIconFromStatusMode(GetContactProto(hContact), ID_STATUS_OFFLINE, 0));
return 0;
}
@@ -197,13 +197,13 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
}
else if (!strcmp(cws->szSetting, "Status")) {
if (!db_get_b(hContact, "CList", "Hidden", 0))
- cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact));
+ Clist_ChangeContactIcon(hContact, cli.pfnIconFromStatusMode(cws->szModule, cws->value.wVal, hContact));
}
}
else if (!strcmp(cws->szModule, "CList")) {
if (!strcmp(cws->szSetting, "Hidden")) {
if (cws->value.type == DBVT_DELETED || cws->value.bVal == 0)
- cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(szProto, szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact));
+ Clist_ChangeContactIcon(hContact, cli.pfnIconFromStatusMode(szProto, szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact));
}
else if (!strcmp(cws->szSetting, "MyHandle")) {
ClcCacheEntry *pdnce = cli.pfnGetCacheEntry(hContact);
@@ -221,7 +221,7 @@ int ContactSettingChanged(WPARAM hContact, LPARAM lParam)
szProto = nullptr;
else
szProto = cws->value.pszVal;
- cli.pfnChangeContactIcon(hContact,
+ Clist_ChangeContactIcon(hContact,
cli.pfnIconFromStatusMode(szProto, szProto == nullptr ? ID_STATUS_OFFLINE : db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE), hContact));
}
}
diff --git a/src/mir_app/src/contact.cpp b/src/mir_app/src/contact.cpp
index b54be64837..fd3049ba58 100644
--- a/src/mir_app/src/contact.cpp
+++ b/src/mir_app/src/contact.cpp
@@ -41,7 +41,7 @@ MIR_APP_DLL(void) Clist_LoadContactTree(void)
for (auto &hContact : Contacts()) {
int status = GetContactStatus(hContact);
if ((!hideOffline || status != ID_STATUS_OFFLINE) && !db_get_b(hContact, "CList", "Hidden", 0))
- cli.pfnChangeContactIcon(hContact, cli.pfnIconFromStatusMode(GetContactProto(hContact), status, hContact));
+ Clist_ChangeContactIcon(hContact, cli.pfnIconFromStatusMode(GetContactProto(hContact), status, hContact));
}
Clist_EndRebuild();
}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 33df2c32ed..96f3129575 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -544,3 +544,4 @@ ExtraIcon_Reload @563
ExtraIcon_SetAll @564
Clist_GetStatusModeDescription @565
Clist_LoadContactTree @566
+Clist_ChangeContactIcon @567
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 2c09d971ca..d0587fc20f 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -544,3 +544,4 @@ ExtraIcon_Reload @563
ExtraIcon_SetAll @564
Clist_GetStatusModeDescription @565
Clist_LoadContactTree @566
+Clist_ChangeContactIcon @567
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:15:04 +0000