From d3d2badface649cd1009bdf9ca6f369be0d50700 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 31 May 2010 04:13:40 +0000
Subject: [PATCH] - add explicit braces to avoid ambiguous 'else' - fix
 deprecated conversion from string constant to 'char*'

svn path=/trunk/; revision=47484
---
 reactos/dll/win32/browseui/internettoolbar.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/reactos/dll/win32/browseui/internettoolbar.cpp b/reactos/dll/win32/browseui/internettoolbar.cpp
index c4f6bd004af..bfad8a5bd9c 100644
--- a/reactos/dll/win32/browseui/internettoolbar.cpp
+++ b/reactos/dll/win32/browseui/internettoolbar.cpp
@@ -414,10 +414,16 @@ HRESULT STDMETHODCALLTYPE CMenuCallback::CallbackSM(LPSMDATA psmd, UINT uMsg, WP
 			{
 			SMINFO *infoPtr = (SMINFO *)lParam;
 			if ((infoPtr->dwMask & SMIM_FLAGS) != 0)
+			{
 				if (psmd->uId == FCIDM_MENU_FAVORITES)
+				{
 					infoPtr->dwFlags |= SMIF_DROPCASCADE;
-				else{
-				 	infoPtr->dwFlags |= SMIF_TRACKPOPUP;}
+				}
+				else
+				{
+				 	infoPtr->dwFlags |= SMIF_TRACKPOPUP;
+				}
+			}
 			if ((infoPtr->dwMask & SMIM_ICON) != 0)
 				infoPtr->iIcon = -1;
 			}
@@ -1213,7 +1219,7 @@ LRESULT CInternetToolbar::OnSearch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO
 	CComPtr<IObjectWithSite>				objectWithSite;
 	CComPtr<IContextMenu>					contextMenu;
 	CMINVOKECOMMANDINFO						commandInfo;
-	char									*searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}";
+	const char								*searchGUID = "{169A0691-8DF9-11d1-A1C4-00C04FD75D13}";
 	HRESULT									hResult;
 
 	// TODO: Query shell if this command is enabled first