From 529c7d557a7dc8693c68c0fb66275e9fe999c0d2 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 19 Jan 2014 08:32:55 +0000 Subject: - StdChat-related data removed from core; - fix for displaying icons in chat log; git-svn-id: http://svn.miranda-ng.org/main/trunk@7743 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/chat/chat_opts.cpp | 2 -- src/modules/chat/chat_svc.cpp | 2 ++ src/modules/chat/log.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/modules') diff --git a/src/modules/chat/chat_opts.cpp b/src/modules/chat/chat_opts.cpp index d891331f2b..68f4710827 100644 --- a/src/modules/chat/chat_opts.cpp +++ b/src/modules/chat/chat_opts.cpp @@ -306,8 +306,6 @@ int OptionsInit(void) g_Settings->UserListFont = NULL; g_Settings->UserListHeadingsFont = NULL; g_Settings->MessageBoxFont = NULL; - g_Settings->iX = db_get_dw(NULL, "Chat", "roomx", -1); - g_Settings->iY = db_get_dw(NULL, "Chat", "roomy", -1); g_Settings->iWidth = db_get_dw(NULL, "Chat", "roomwidth", -1); g_Settings->iHeight = db_get_dw(NULL, "Chat", "roomheight", -1); diff --git a/src/modules/chat/chat_svc.cpp b/src/modules/chat/chat_svc.cpp index c8735ca7c8..de9e7dc464 100644 --- a/src/modules/chat/chat_svc.cpp +++ b/src/modules/chat/chat_svc.cpp @@ -66,6 +66,8 @@ void LoadChatIcons(void) ci.hIcons[ICON_STATUS3] = LoadIconEx("status3", FALSE); ci.hIcons[ICON_STATUS4] = LoadIconEx("status4", FALSE); ci.hIcons[ICON_STATUS5] = LoadIconEx("status5", FALSE); + + LoadMsgLogBitmaps(); } static int FontsChanged(WPARAM wParam, LPARAM lParam) diff --git a/src/modules/chat/log.cpp b/src/modules/chat/log.cpp index 18a95b518b..01e2c2c1ef 100644 --- a/src/modules/chat/log.cpp +++ b/src/modules/chat/log.cpp @@ -346,7 +346,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData) Log_Append(&buffer, &bufferEnd, &bufferAlloced, "\\par%s ", Log_SetStyle(0, 0)); // Insert icon - if (lin->iType & g_Settings->dwIconFlags || lin->bIsHighlighted&&g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT) { + if ((lin->iType & g_Settings->dwIconFlags) || lin->bIsHighlighted && (g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT)) { int iIndex = (lin->bIsHighlighted && g_Settings->dwIconFlags & GC_EVENT_HIGHLIGHT) ? ICON_HIGHLIGHT : EventToIcon(lin); Log_Append(&buffer, &bufferEnd, &bufferAlloced, "\\f0\\fs14"); while (bufferAlloced - bufferEnd < logIconBmpSize[0]) -- cgit v1.2.3