diff options
| author | George Hazan <ghazan@miranda.im> | 2018-04-05 18:40:11 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-04-05 18:40:11 +0300 |
| commit | bfd3e12ac032ccfee48848f419598ff5dcb9f697 (patch) | |
| tree | 893efd16fe91ce997bad43151a7cdc88a54def76 /src | |
| parent | 1bc38e87f4f75b9c665c7cb3fe470b79e7ed9281 (diff) | |
CLIST_INTERFACE::pfnLoadContactTree => Clist_LoadContactTree
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdclist/src/clistopts.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/clc.h | 1 | ||||
| -rw-r--r-- | src/mir_app/src/clistcore.cpp | 1 | ||||
| -rw-r--r-- | src/mir_app/src/clistgroups.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/clistmod.cpp | 2 | ||||
| -rw-r--r-- | src/mir_app/src/contact.cpp | 4 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 |
8 files changed, 8 insertions, 8 deletions
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
|