diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-08 15:51:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-08 15:51:52 +0000 |
| commit | 6941b13721285765d6b8df94c1c87d4f78b8be68 (patch) | |
| tree | a388bc8c059fe4e1550b9bdbb1a6f66d065f57af /plugins/TabSRMM/src/chat | |
| parent | 78f56932d0c04a7b6d3b27fd98ffce64639a1953 (diff) | |
chat structures slightly cleaned (no changes so far)
git-svn-id: http://svn.miranda-ng.org/main/trunk@7547 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/chat')
| -rw-r--r-- | plugins/TabSRMM/src/chat/services.cpp | 8 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/tools.cpp | 6 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/TabSRMM/src/chat/services.cpp b/plugins/TabSRMM/src/chat/services.cpp index 735738e024..7eba873a60 100644 --- a/plugins/TabSRMM/src/chat/services.cpp +++ b/plugins/TabSRMM/src/chat/services.cpp @@ -577,8 +577,8 @@ INT_PTR Service_AddEvent(WPARAM wParam, LPARAM lParam) return GC_EVENT_ERROR;
int iRetVal = GC_EVENT_ERROR;
- char *pMod = NULL;
- TCHAR *pWnd = NULL;
+ LPCSTR pMod = NULL;
+ LPCTSTR pWnd = NULL;
GCDEST save_gcd;
GCEVENT save_gce;
SESSION_INFO *si = NULL;
@@ -663,7 +663,7 @@ INT_PTR Service_AddEvent(WPARAM wParam, LPARAM lParam) else
gce->ptszText = a2tf(gce->ptszText, gce->dwFlags);
}
- if (!gce->bIsMe && gce->pDest->pszID && gce->pszText && si)
+ if (!gce->bIsMe && gce->pDest->ptszID && gce->pszText && si)
bIsHighlighted = si->Highlight->match(gce, si, CMUCHighlight::MATCH_TEXT | CMUCHighlight::MATCH_NICKNAME) != 0;
break;
@@ -689,7 +689,7 @@ INT_PTR Service_AddEvent(WPARAM wParam, LPARAM lParam) }
// Decide which window (log) should have the event
- if (gcd->pszID) {
+ if (gcd->ptszID) {
pWnd = gcd->ptszID;
pMod = gcd->pszModule;
}
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index d5aa8f1538..bc1e8bd2d1 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -1038,7 +1038,7 @@ BOOL DoEventHookAsync(HWND hwnd, const TCHAR* pszID, const char* pszModule, int if (!(si->dwFlags & GC_UNICODE)) {
DWORD dwCP = M.GetDword(si->hContact, "ANSIcodepage", 0);
- gcd->pszID = mir_t2a(pszID);
+ gcd->ptszID = (LPTSTR)mir_t2a(pszID);
gch->pszUID = mir_t2a(pszUID);
gch->pszText = mir_t2a_cp(pszText, dwCP);
}
@@ -1066,7 +1066,7 @@ BOOL DoEventHook(const TCHAR* pszID, const char* pszModule, int iType, const TCH if (!(si->dwFlags & GC_UNICODE)) {
DWORD dwCP = M.GetDword(si->hContact, "ANSIcodepage", 0);
- gcd.pszID = mir_t2a(pszID);
+ gcd.ptszID = (LPTSTR)mir_t2a(pszID);
gch.pszUID = mir_t2a(pszUID);
gch.pszText = mir_t2a_cp(pszText, dwCP);
}
@@ -1080,7 +1080,7 @@ BOOL DoEventHook(const TCHAR* pszID, const char* pszModule, int iType, const TCH gch.pDest = &gcd;
NotifyEventHooks(hSendEvent, 0, (WPARAM)&gch);
- mir_free(gcd.pszID);
+ mir_free(gcd.ptszID);
mir_free(gch.ptszUID);
mir_free(gch.ptszText);
return TRUE;
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 2446a8265e..5cd0acf84e 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -2480,7 +2480,7 @@ LABEL_SHOWWINDOW: GCHOOK* gch = (GCHOOK*) lParam;
NotifyEventHooks(hSendEvent, 0, (WPARAM)gch);
if (gch->pDest) {
- mir_free(gch->pDest->pszID);
+ mir_free(gch->pDest->ptszID);
mir_free(gch->pDest->pszModule);
mir_free(gch->pDest);
}
|