From dc16fa8c5fa2e477b6ce896b8eb237462735baae Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 21 Jan 2014 13:17:19 +0000
Subject: fix for window flashing in StdChat & Scriver

git-svn-id: http://svn.miranda-ng.org/main/trunk@7809 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/chat/tools.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'plugins/TabSRMM/src')

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index a70018736a..f57a8b9f8c 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -338,16 +338,14 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT *gce, BOOL bHighlight
 			DoTrayIcon(si, gce);
 		}
 
-		/* TODO fix for 3.0 final !!! */
-#if !defined(__DELAYED_FOR_3_1)
-		if (g_Settings.bCreateWindowOnHighlight && 0 == dat)
+		if (g_Settings.bCreateWindowOnHighlight && dat == NULL)
 			wParamForHighLight = 1;
 
 		if (dat && g_Settings.bAnnoyingHighlight && params->bInactive && dat->pContainer->hwnd != GetForegroundWindow()) {
 			wParamForHighLight = 2;
 			params->hWnd = dat->hwnd;
 		}
-#endif
+
 		if (dat || !nen_options.iMUCDisable)
 			DoPopup(si, gce);
 		if (params->bInactive && si && si->hWnd)
@@ -600,14 +598,12 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 			AppendMenu(*hMenu, dwState | MF_CHECKED | MF_STRING, gcmi.Item[i].dwID, ptszText);
 	}
 
-#if !defined(__DELAYED_FOR_3_1)
 	if (iIndex == 0) {
 		AppendMenu(*hMenu, MF_SEPARATOR, 0, 0);
 		int pos = GetMenuItemCount(*hMenu);
 		InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20020, TranslateT("Highlight User..."));
 		InsertMenu(*hMenu, pos, MF_BYPOSITION, (UINT_PTR)20021, TranslateT("Edit Highlight List..."));
 	}
-#endif
 
 	return TrackPopupMenu(*hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);
 }
-- 
cgit v1.2.3