diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-10 15:31:23 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-10 15:31:23 +0000 |
| commit | 6881b6b3e2dec0c4675b4c0b2bf6aff29fa860ed (patch) | |
| tree | 0bd2a0b78f26236c1516ace2764fa9851efd8a4b /src/core/stdmsg | |
| parent | cd997e12f2ecf29c927f9c8c36ade9261140b2c5 (diff) | |
fix for UTN in stdMsg
git-svn-id: http://svn.miranda-ng.org/main/trunk@5634 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdmsg')
| -rw-r--r-- | src/core/stdmsg/res/resource.rc | 9 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgs.cpp | 11 |
2 files changed, 8 insertions, 12 deletions
diff --git a/src/core/stdmsg/res/resource.rc b/src/core/stdmsg/res/resource.rc index 6d4fdf383e..7c98a710f4 100644 --- a/src/core/stdmsg/res/resource.rc +++ b/src/core/stdmsg/res/resource.rc @@ -123,7 +123,7 @@ BEGIN CONTROL "Show Formatting",IDC_SHOWFORMATTING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,169,10,126,10
END
-IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 252
+IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 234
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
@@ -264,12 +264,12 @@ END // TEXTINCLUDE
//
-1 TEXTINCLUDE
+1 TEXTINCLUDE
BEGIN
"..\\sxr\\resource.h\0"
END
-2 TEXTINCLUDE
+2 TEXTINCLUDE
BEGIN
"#include <winres.h>\r\n"
"#include <richedit.h>\r\n"
@@ -277,7 +277,7 @@ BEGIN "\0"
END
-3 TEXTINCLUDE
+3 TEXTINCLUDE
BEGIN
"\r\n"
"\0"
@@ -358,4 +358,3 @@ END /////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
-
diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index f2c1e28953..f595ce0164 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -158,15 +158,12 @@ static int TypingMessage(WPARAM wParam, LPARAM lParam) if (!(g_dat.flags & SMF_SHOWTYPING))
return 0;
- HWND hwnd;
- if (hwnd = WindowList_Find(g_dat.hMessageWindowList, (HANDLE)wParam)) {
- SendMessage(hwnd, DM_TYPING, 0, lParam);
- return 0;
- }
-
SkinPlaySound((lParam) ? "TNStart" : "TNStop");
- if (lParam && (g_dat.flags & SMF_SHOWTYPINGTRAY)) {
+ HWND hwnd = WindowList_Find(g_dat.hMessageWindowList, (HANDLE)wParam);
+ if (hwnd)
+ SendMessage(hwnd, DM_TYPING, 0, lParam);
+ else if (lParam && (g_dat.flags & SMF_SHOWTYPINGTRAY)) {
TCHAR szTip[256];
mir_sntprintf(szTip, SIZEOF(szTip), TranslateT("%s is typing a message"), (TCHAR *) CallService(MS_CLIST_GETCONTACTDISPLAYNAME, wParam, GCDNF_TCHAR));
|