diff options
| -rw-r--r-- | plugins/Clist_nicer/src/clc.h | 28 | ||||
| -rw-r--r-- | plugins/Clist_nicer/src/clcitems.cpp | 12 |
2 files changed, 15 insertions, 25 deletions
diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h index ba06b835be..e6ab80b103 100644 --- a/plugins/Clist_nicer/src/clc.h +++ b/plugins/Clist_nicer/src/clc.h @@ -105,16 +105,14 @@ typedef struct _OrderTreeData struct TExtraCache
{
MCONTACT hContact;
- HANDLE hTimeZone;
- uint8_t valid;
- wchar_t *statusMsg;
- uint8_t bStatusMsgValid;
- uint32_t dwCFlags;
- uint32_t dwDFlags; // display flags for caching only
- StatusItems_t *status_item, *proto_status_item;
- uint32_t dwLastMsgTime;
- uint32_t msgFrequency;
- BOOL isChatRoom;
+ HANDLE hTimeZone;
+ wchar_t *statusMsg;
+ uint8_t bStatusMsgValid;
+ uint32_t dwCFlags;
+ uint32_t dwDFlags; // display flags for caching only
+ uint32_t dwLastMsgTime;
+ uint32_t msgFrequency;
+ StatusItems_t *status_item, *proto_status_item;
};
struct ClcCacheEntry : public ClcCacheEntryBase
@@ -123,16 +121,16 @@ struct ClcCacheEntry : public ClcCacheEntryBase struct ClcContact : public ClcContactBase
{
BOOL bIsMeta;
- uint8_t xStatus;
+ uint8_t xStatus;
int xStatusIcon;
MCONTACT hSubContact;
char *metaProto;
- uint32_t codePage;
- uint16_t wStatus;
+ uint32_t codePage;
+ uint16_t wStatus;
int avatarLeft, extraIconRightBegin;
int isRtl;
- uint32_t cFlags;
- uint8_t bSecondLine;
+ uint32_t cFlags;
+ uint8_t bSecondLine;
AVATARCACHEENTRY *ace;
TExtraCache *pExtra;
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 7682c77ca5..bc042fcc0c 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -320,16 +320,8 @@ void GetExtendedInfo(ClcContact *contact, ClcData *dat) if (contact->pce->szProto == nullptr || contact->hContact == 0)
return;
- TExtraCache *p = contact->pExtra;
- if (p == nullptr)
- return;
-
- p->msgFrequency = g_plugin.getDword(contact->hContact, "mf_freq", 0x7fffffff);
- if (p->valid)
- return;
-
- p->valid = TRUE;
- p->isChatRoom = Contact::IsGroupChat(contact->hContact, contact->pce->szProto);
+ if (auto *p = contact->pExtra)
+ p->msgFrequency = g_plugin.getDword(contact->hContact, "mf_freq", 0x7fffffff);
}
void LoadSkinItemToCache(TExtraCache *cEntry)
|