diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-01 19:08:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-01 19:08:53 +0000 |
| commit | 84567ddcd9ff730cdcb7815b6ba0007d693cd52b (patch) | |
| tree | 3ee57fc2ac744c030e86df86fcf56aaa8845938b /protocols/MRA/src/MraPopUp.cpp | |
| parent | 856648d8c6f14c7d57aba610588f52c79ec18987 (diff) | |
VERY EXPERIMENTAL VERSION OF MEA, DON'T USE IN PRODUCTION
git-svn-id: http://svn.miranda-ng.org/main/trunk@5897 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/MRA/src/MraPopUp.cpp')
| -rw-r--r-- | protocols/MRA/src/MraPopUp.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index 135ba88f80..896b06f7ee 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -212,22 +212,22 @@ LRESULT CALLBACK MraPopupDlgProc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM l return DefWindowProc(hWndDlg, msg, wParam, lParam);
}
-void CMraProto::MraPopupShowFromContactW(HANDLE hContact, DWORD dwType, DWORD dwFlags, LPWSTR lpszMessage)
+void CMraProto::MraPopupShowFromContactW(HANDLE hContact, DWORD dwType, DWORD dwFlags, LPCWSTR lpszMessage)
{
- WCHAR szNick[MAX_EMAIL_LEN], szEMail[MAX_EMAIL_LEN], szTitle[MAX_CONTACTNAME];
-
- mraGetStaticStringW(hContact, "Nick", szNick, SIZEOF(szNick), NULL);
- mraGetStaticStringW(hContact, "e-mail", szEMail, SIZEOF(szEMail), NULL);
- if (hContact) {
- mir_sntprintf(szTitle, SIZEOF(szTitle), L"%s <%s>", szNick, szEMail);
- }else {
- mir_sntprintf(szTitle, SIZEOF(szTitle), L"%s: %s <%s>", m_tszUserName, szNick, szEMail);
- }
+ WCHAR szTitle[MAX_CONTACTNAME];
+ CMStringW szNick, szEmail;
+ mraGetStringW(hContact, "Nick", szNick);
+ mraGetStringW(hContact, "e-mail", szEmail);
+ if (hContact)
+ mir_snwprintf(szTitle, SIZEOF(szTitle), L"%s <%s>", szNick, szEmail);
+ else
+ mir_snwprintf(szTitle, SIZEOF(szTitle), L"%s: %s <%s>", m_tszUserName, szNick, szEmail);
+
MraPopupShowW(hContact, dwType, dwFlags, szTitle, lpszMessage);
}
-void CMraProto::MraPopupShowW(HANDLE hContact, DWORD dwType, DWORD dwFlags, LPWSTR lpszTitle, LPWSTR lpszMessage)
+void CMraProto::MraPopupShowW(HANDLE hContact, DWORD dwType, DWORD dwFlags, LPWSTR lpszTitle, LPCWSTR lpszMessage)
{
if (getByte("PopupsEnabled", MRA_DEFAULT_POPUPS_ENABLED))
if (GetBit(getDword("PopupsEventFilter", MRA_DEFAULT_POPUPS_EVENT_FILTER), dwType))
|