diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-12 15:32:48 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-12 15:32:48 +0000 |
| commit | 4ae9916b55bd3dc17479563f1b3bb5ac3755315d (patch) | |
| tree | 79dfef94e077e7bf8eab42ff3478b8f463cc84ce | |
| parent | 1abc0fb06f39f97db893e33cd7fcffb92536b1db (diff) | |
click on nicklist in tabsrmm's chats should substitute a nick, not a user id
git-svn-id: http://svn.miranda-ng.org/main/trunk@7615 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/TabSRMM/src/chat/options.cpp | 4 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index ed3ebd8f2d..0d2e849f18 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -1243,12 +1243,12 @@ void LoadGlobalSettings(void) g_Settings.crPUBkgColour = M.GetDword("Chat", "PopupColorBG", GetSysColor(COLOR_WINDOW));
g_Settings.crPUTextColour = M.GetDword("Chat", "PopupColorText", 0);
g_Settings.bClassicIndicators = M.GetBool("Chat", "ClassicIndicators", false);
- //MAD
+
g_Settings.bLogClassicIndicators = M.GetBool("Chat", "LogClassicIndicators", false);
g_Settings.bAlternativeSorting = M.GetBool("Chat", "AlternativeSorting", true);
g_Settings.bAnnoyingHighlight = M.GetBool("Chat", "AnnoyingHighlight", false);
g_Settings.bCreateWindowOnHighlight = M.GetBool("Chat", "CreateWindowOnHighlight", true);
- //MAD_
+
g_Settings.bLogSymbols = M.GetBool("Chat", "LogSymbols", true);
g_Settings.bClickableNicks = M.GetBool("Chat", "ClickableNicks", true);
g_Settings.bColorizeNicks = M.GetBool("Chat", "ColorizeNicks", true);
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 69a21e790f..35d66b459c 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -2942,13 +2942,13 @@ LABEL_SHOWWINDOW: if (g_Settings.bDoubleClick4Privat ? GetKeyState(VK_SHIFT) & 0x8000 : !(GetKeyState(VK_SHIFT) & 0x8000)) {
LRESULT lResult = (LRESULT)SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_GETSEL, 0, 0);
int start = LOWORD(lResult);
- TCHAR* pszName = (TCHAR*)_alloca(sizeof(TCHAR) * (lstrlen(ui->pszUID) + 3));
+ CMString tszName;
if (start == 0)
- mir_sntprintf(pszName, lstrlen(ui->pszUID) + 3, _T("%s: "), ui->pszUID);
+ tszName.Format(_T("%s: "), ui->pszNick);
else
- mir_sntprintf(pszName, lstrlen(ui->pszUID) + 2, _T("%s "), ui->pszUID);
+ tszName.Format(_T("%s "), ui->pszNick);
- SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_REPLACESEL, FALSE, (LPARAM)pszName);
+ SendMessage(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE), EM_REPLACESEL, FALSE, (LPARAM)tszName.GetString());
PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0);
SetFocus(GetDlgItem(hwndDlg, IDC_CHAT_MESSAGE));
}
|