summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Pösel <robyer@seznam.cz>2013-10-13 08:17:50 +0000
committerRobert Pösel <robyer@seznam.cz>2013-10-13 08:17:50 +0000
commit3c514e9ef4462510df55e56895685515a9c4c27b (patch)
tree5ab73f64e0ef66c89d3825d823066d885c30a8f0 /src
parent570fc8a9888f51c7a397b4d309762e7d313ef158 (diff)
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
Diffstat (limited to 'src')
-rw-r--r--src/core/stdchat/src/tools.cpp4
-rw-r--r--src/core/stdchat/src/window.cpp2
2 files changed, 3 insertions, 3 deletions
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: