diff options
Diffstat (limited to 'plugins/Clist_nicer/src/clistmod.cpp')
| -rw-r--r-- | plugins/Clist_nicer/src/clistmod.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index 0b7bbc04b5..03933ec48c 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -38,18 +38,15 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM) return(g_maxStatus == ID_STATUS_OFFLINE ? pcli->currentDesiredStatusMode : g_maxStatus);
}
-int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON *phIcon)
+int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact)
{
- if (phIcon != nullptr)
- *phIcon = nullptr;
-
char *szFinalProto;
int finalStatus;
if (szProto != nullptr && !mir_strcmp(szProto, META_PROTO) && hContact != 0 && !(cfg::dat.dwFlags & CLUI_USEMETAICONS)) {
MCONTACT hSubContact = db_mc_getMostOnline(hContact);
szFinalProto = GetContactProto(hSubContact);
- finalStatus = (status == 0) ? (WORD)db_get_w(hSubContact, szFinalProto, "Status", ID_STATUS_OFFLINE) : status;
+ finalStatus = (status == 0) ? db_get_w(hSubContact, szFinalProto, "Status", ID_STATUS_OFFLINE) : status;
hContact = hSubContact;
}
else {
@@ -57,14 +54,6 @@ int IconFromStatusMode(const char *szProto, int status, MCONTACT hContact, HICON finalStatus = status;
}
- if (status >= ID_STATUS_CONNECTING && status < ID_STATUS_OFFLINE && phIcon != nullptr) {
- if (szProto) {
- char szBuf[128];
- mir_snprintf(szBuf, "%s_conn", szProto);
- *phIcon = IcoLib_GetIcon(szBuf);
- }
- }
-
return coreCli.pfnIconFromStatusMode(szFinalProto, finalStatus, hContact);
}
|