From 3c514e9ef4462510df55e56895685515a9c4c27b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Sun, 13 Oct 2013 08:17:50 +0000 Subject: Show Nick instead of UID in group chat user menu git-svn-id: http://svn.miranda-ng.org/main/trunk@6477 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/core/stdchat/src/tools.cpp | 4 ++-- src/core/stdchat/src/window.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 01af1e84c6..4cddc0190e 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -717,8 +717,8 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO else if (iIndex == 0) { TCHAR szTemp[30]; - if (pszUID) - mir_sntprintf(szTemp, SIZEOF(szTemp), TranslateT("&Message %s"), pszUID); + if (pszWordText) + mir_sntprintf(szTemp, SIZEOF(szTemp), TranslateT("&Message %s"), pszWordText); else lstrcpyn(szTemp, TranslateT("&Message"), SIZEOF(szTemp)); diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index 05dbc4e997..22c5fbe05d 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1070,7 +1070,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, if (hti.pt.x == -1 && hti.pt.y == -1) hti.pt.y += height - 4; ClientToScreen(hwnd, &hti.pt); - uID = CreateGCMenu(hwnd, &hMenu, 0, hti.pt, parentdat, uinew.pszUID, NULL); + uID = CreateGCMenu(hwnd, &hMenu, 0, hti.pt, parentdat, uinew.pszUID, uinew.pszNick); switch (uID) { case 0: -- cgit v1.2.3