diff options
| author | Robert Pösel <robyer@seznam.cz> | 2013-10-13 08:17:50 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2013-10-13 08:17:50 +0000 |
| commit | 3c514e9ef4462510df55e56895685515a9c4c27b (patch) | |
| tree | 5ab73f64e0ef66c89d3825d823066d885c30a8f0 | |
| parent | 570fc8a9888f51c7a397b4d309762e7d313ef158 (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
| -rw-r--r-- | plugins/Scriver/src/chat/tools.cpp | 4 | ||||
| -rw-r--r-- | plugins/Scriver/src/chat/window.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/tools.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdchat/src/tools.cpp | 4 | ||||
| -rw-r--r-- | src/core/stdchat/src/window.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index ae6439183e..c42af74d93 100644 --- a/plugins/Scriver/src/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp @@ -688,8 +688,8 @@ UINT CreateGCMenu(HWND hwnd, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *s 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"), 24);
diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index 96a5676002..7bebdeccbb 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -923,7 +923,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, si, uinew.pszUID, NULL);
+ uID = CreateGCMenu(hwnd, &hMenu, 0, hti.pt, si, uinew.pszUID, uinew.pszNick);
switch (uID) {
case 0:
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index c305c27fdd..78e6ae288b 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -945,8 +945,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"), 24);
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index f92e15b9a4..28e5f4e985 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -1665,7 +1665,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, hti.pt.y += height - 4;
ClientToScreen(hwnd, &hti.pt);
- UINT uID = CreateGCMenu(hwnd, &hMenu, 0, hti.pt, parentdat, uinew.pszUID, NULL);
+ UINT uID = CreateGCMenu(hwnd, &hMenu, 0, hti.pt, parentdat, uinew.pszUID, uinew.pszNick);
switch (uID) {
case 0:
break;
@@ -2844,7 +2844,7 @@ LABEL_SHOWWINDOW: pt.y = (short) HIWORD(((ENLINK *) lParam)->lParam);
ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt);
CopyMemory(&uiNew, ui, sizeof(USERINFO));
- UINT uID = CreateGCMenu(hwndDlg, &hMenu, 0, pt, si, uiNew.pszUID, NULL);
+ UINT uID = CreateGCMenu(hwndDlg, &hMenu, 0, pt, si, uiNew.pszUID, uiNew.pszNick);
switch (uID) {
case 0:
break;
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:
|