From 52fe3f7be13509bd336c5efa28b8310a23211034 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 11 Apr 2013 16:47:12 +0000 Subject: - Srmm_ModifyIcon helper applied instead of CallService(MS_MSG_MODIFYICON) - various fixes related to SRMM icons; - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@4426 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Scriver/src/chat/window.cpp | 2 +- plugins/Scriver/src/msgdialog.cpp | 6 +++--- plugins/Scriver/src/msgs.cpp | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'plugins/Scriver') diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index 8802af4fc6..97f6ab1afd 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -1264,7 +1264,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam) StatusIconData sid = { sizeof(sid) }; sid.szModule = SRMMMOD; - CallService(MS_MSG_MODIFYICON, (WPARAM)si->windowData.hContact, (LPARAM)&sid); + Srmm_ModifyIcon(si->windowData.hContact, &sid); } break; diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 25652a8c7e..0149cbd1a5 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1266,7 +1266,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP db_get_b(NULL, SRMMMOD, SRMSGSET_TYPINGNEW, SRMSGDEFSET_TYPINGNEW))); db_set_b(dat->windowData.hContact, SRMMMOD, SRMSGSET_TYPING, (BYTE)!typingNotify); sid.flags = typingNotify ? MBF_DISABLED : 0; - CallService(MS_MSG_MODIFYICON, (WPARAM)dat->windowData.hContact, (LPARAM)&sid); + Srmm_ModifyIcon(dat->windowData.hContact, &sid); } break; @@ -1503,7 +1503,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP sid.cbSize = sizeof(sid); sid.szModule = SRMMMOD; sid.flags = MBF_DISABLED; - CallService(MS_MSG_MODIFYICON, (WPARAM)dat->windowData.hContact, (LPARAM)&sid); + Srmm_ModifyIcon(dat->windowData.hContact, &sid); sid.dwId = 1; if (IsTypingNotificationSupported(dat) && g_dat.flags2 & SMF2_SHOWTYPINGSWITCH) sid.flags = (db_get_b(dat->windowData.hContact, SRMMMOD, SRMSGSET_TYPING, @@ -1511,7 +1511,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP else sid.flags = MBF_HIDDEN; - CallService(MS_MSG_MODIFYICON, (WPARAM)dat->windowData.hContact, (LPARAM)&sid); + Srmm_ModifyIcon(dat->windowData.hContact, &sid); } break; diff --git a/plugins/Scriver/src/msgs.cpp b/plugins/Scriver/src/msgs.cpp index 7b58fba856..a3d99babb8 100644 --- a/plugins/Scriver/src/msgs.cpp +++ b/plugins/Scriver/src/msgs.cpp @@ -383,15 +383,11 @@ void ChangeStatusIcons() { StatusIconData sid = { sizeof(sid) }; sid.szModule = SRMMMOD; - sid.hIcon = CopyIcon(GetCachedIcon("scriver_UNICODEON")); - sid.hIconDisabled = CopyIcon(GetCachedIcon("scriver_UNICODEOFF")); - CallService(MS_MSG_MODIFYICON, 0, (LPARAM)&sid); - sid.dwId = 1; sid.hIcon = CopyIcon(GetCachedIcon("scriver_TYPING")); sid.hIconDisabled = CopyIcon(GetCachedIcon("scriver_TYPINGOFF")); sid.flags = MBF_HIDDEN; - CallService(MS_MSG_MODIFYICON, 0, (LPARAM)&sid); + Srmm_ModifyIcon(NULL, &sid); } int StatusIconPressed(WPARAM wParam, LPARAM lParam) -- cgit v1.2.3