diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-08-28 20:30:29 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-08-28 20:30:29 +0000 |
| commit | 86ffbe56a77e202ee195bc48a8d61b454e256b84 (patch) | |
| tree | 28cbb2e1bf93a80a00ad27ab1928c86ae792be73 /plugins/TabSRMM/src/chat | |
| parent | 515b07f0d98c647c5151867d75a6c8a05d329bfa (diff) | |
TabSEMM:
- minor leak fixed
- code cleaning
git-svn-id: http://svn.miranda-ng.org/main/trunk@15073 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM/src/chat')
| -rw-r--r-- | plugins/TabSRMM/src/chat/muchighlight.cpp | 1 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/options.cpp | 8 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/tools.cpp | 2 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 8 |
4 files changed, 5 insertions, 14 deletions
diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp index cef2d0b66e..aae914e5a4 100644 --- a/plugins/TabSRMM/src/chat/muchighlight.cpp +++ b/plugins/TabSRMM/src/chat/muchighlight.cpp @@ -181,7 +181,6 @@ skip_textpatterns: *
* @param Standard Windows dialog procedure parameters
*/
-
INT_PTR CALLBACK CMUCHighlight::dlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp index 8b857c7eb2..9adb9f46dc 100644 --- a/plugins/TabSRMM/src/chat/options.cpp +++ b/plugins/TabSRMM/src/chat/options.cpp @@ -345,7 +345,6 @@ void Chat_AddIcons(void) /*
* get icon by name from the core icon library service
*/
-
HICON LoadIconEx(char *pszIcoLibName)
{
char szTemp[256];
@@ -936,12 +935,7 @@ static UINT _eventorder[] = GC_EVENT_PART | GC_EVENT_TOPIC | GC_EVENT_ADDSTATUS | GC_EVENT_INFORMATION | GC_EVENT_QUIT | \
GC_EVENT_KICK | GC_EVENT_NOTICE)
-/**
- * Dialog procedure for group chat options tab #3 (event filter configuration)
- *
- * @return
- */
-
+// Dialog procedure for group chat options tab #3 (event filter configuration)
INT_PTR CALLBACK DlgProcOptions3(HWND hwndDlg, UINT uMsg, WPARAM, LPARAM lParam)
{
switch (uMsg) {
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index 5b82f8b8e4..265c7937d8 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -491,7 +491,6 @@ TCHAR* my_strstri(const TCHAR* s1, const TCHAR* s2) * log the event to the log file
* allows selective logging of wanted events
*/
-
BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
{
if (!si || !gce)
@@ -609,7 +608,6 @@ void DestroyGCMenu(HMENU *hMenu, int iIndex) * set all filters and notification config for a session
* uses per channel mask + filterbits, default config as backup
*/
-
void Chat_SetFilters(SESSION_INFO *si)
{
if (si == NULL)
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index a7490efb38..fbaf36318c 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -885,8 +885,6 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, dat->lastEnterTime = 0; return 0; } - if (wParam == VK_RETURN) - break; // fall through case WM_LBUTTONDOWN: @@ -1522,11 +1520,13 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, return FALSE; case WM_CONTEXTMENU: - TVHITTESTINFO hti; { SESSION_INFO *parentdat = dat->si; + if (parentdat == NULL) + break; int height = 0; + TVHITTESTINFO hti; hti.pt.x = GET_X_LPARAM(lParam); hti.pt.y = GET_Y_LPARAM(lParam); if (hti.pt.x == -1 && hti.pt.y == -1) { @@ -1559,7 +1559,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, break; case 20020: // add to highlight... - if (parentdat && ui) { + { THighLightEdit the = { THighLightEdit::CMD_ADD, parentdat, ui }; HWND hwndDlg = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_ADDHIGHLIGHT), parentdat->dat->pContainer->hwnd, CMUCHighlight::dlgProcAdd, (LPARAM)&the); TranslateDialogDefault(hwndDlg); |