From 1202cf04c667c72fb30bd01608585283b9cc1914 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 13 Mar 2018 22:25:26 +0300 Subject: chat engine: - fixes #1174 (Group chat icons became "blank exe" icons if role cound exceeds 10); - unused chat api members removed; --- include/m_chat.h | 2 +- include/m_chat_int.h | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/m_chat.h b/include/m_chat.h index e5fa914151..c302e1e5b5 100644 --- a/include/m_chat.h +++ b/include/m_chat.h @@ -372,7 +372,7 @@ EXTERN_C MIR_APP_DLL(int) Chat_Event(GCEVENT*); EXTERN_C MIR_APP_DLL(void*) Chat_GetUserInfo(const char *szModule, const wchar_t *wszId); EXTERN_C MIR_APP_DLL(int) Chat_SetUserInfo(const char *szModule, const wchar_t *wszId, void *pItemData); -EXTERN_C MIR_APP_DLL(int) Chat_AddGroup(const char *szModule, const wchar_t *wszId, const wchar_t *wszText, HICON hIcon = nullptr); +EXTERN_C MIR_APP_DLL(int) Chat_AddGroup(const char *szModule, const wchar_t *wszId, const wchar_t *wszText); EXTERN_C MIR_APP_DLL(int) Chat_ChangeSessionName(const char *szModule, const wchar_t *wszId, const wchar_t *wszNewName); EXTERN_C MIR_APP_DLL(int) Chat_ChangeUserId(const char *szModule, const wchar_t *wszId, const wchar_t *wszOldId, const wchar_t *wszNewId); EXTERN_C MIR_APP_DLL(int) Chat_SendUserMessage(const char *szModule, const wchar_t *wszId, const wchar_t *wszText); diff --git a/include/m_chat_int.h b/include/m_chat_int.h index f90c7082a9..f3168a7fba 100644 --- a/include/m_chat_int.h +++ b/include/m_chat_int.h @@ -126,8 +126,8 @@ struct LOGINFO struct STATUSINFO { wchar_t *pszGroup; - HICON hIcon; - WORD Status; + int iIconIndex; + int iStatus; STATUSINFO *next; }; @@ -276,9 +276,7 @@ struct CHAT_MANAGER void (*MM_IconsChanged)(void); BOOL (*MM_RemoveAll)(void); - STATUSINFO* (*TM_AddStatus)(STATUSINFO **ppStatusList, const wchar_t *pszStatus, int* iCount); STATUSINFO* (*TM_FindStatus)(STATUSINFO *pStatusList, const wchar_t *pszStatus); - WORD (*TM_StringToWord)(STATUSINFO *pStatusList, const wchar_t *pszStatus); wchar_t* (*TM_WordToString)(STATUSINFO *pStatusList, WORD Status); BOOL (*TM_RemoveAll)(STATUSINFO** pStatusList); -- cgit v1.2.3