From f5a2a6da0378e95c5eb330e0ec4dc2aeca2e7fd2 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Wed, 20 May 2015 22:58:41 +0000
Subject: warning fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@13725 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Exchange/src/MirandaExchange.cpp | 4 ++--
 plugins/FavContacts/src/menu.cpp         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp
index ba0bc86861..0eebaae966 100644
--- a/plugins/Exchange/src/MirandaExchange.cpp
+++ b/plugins/Exchange/src/MirandaExchange.cpp
@@ -593,7 +593,6 @@ HRESULT CMirandaExchange::isMapiSessionOK( LPMAPISESSION )
 
 HRESULT CMirandaExchange::CheckForNewMails( int &nNewMails)
 {
-	HRESULT hRes;
 	if ( m_nNumberOfHeaders>0 && NULL != m_HeadersKeeper )
 	{
 		for( UINT i=0; i<m_nNumberOfHeaders; i++ )
@@ -610,6 +609,7 @@ HRESULT CMirandaExchange::CheckForNewMails( int &nNewMails)
 	
 	m_nNumberOfHeaders = 0;
 
+	HRESULT hRes;
 	try
 	{
 		if ( m_lpMAPISession != NULL && (isMapiSessionOK(m_lpMAPISession)== S_OK) && m_lpInbox != NULL && m_bFolderInboxOK )
@@ -634,7 +634,7 @@ HRESULT CMirandaExchange::CheckForNewMails( int &nNewMails)
 	}
 	catch (...)
 	{
-
+		hRes = E_FAIL;
 	}
 
 	return hRes;
diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index 903590bd88..ae4e4ab87f 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -201,7 +201,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL)
 		if (options->bSysColors) {
 			FillRect(hdcTemp, &lpdis->rcItem, GetSysColorBrush(COLOR_HIGHLIGHT));
 			clBack = GetSysColor(COLOR_HIGHLIGHT);
-			clLine1 = GetSysColor(COLOR_HIGHLIGHTTEXT);
+			clLine1 = clLine2 = GetSysColor(COLOR_HIGHLIGHTTEXT);
 		}
 		else {
 			clBack = g_Options.clBackSel;
@@ -213,7 +213,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL)
 		if (options->bSysColors) {
 			FillRect(hdcTemp, &lpdis->rcItem, GetSysColorBrush(COLOR_MENU));
 			clBack = GetSysColor(COLOR_MENU);
-			clLine1 = GetSysColor(COLOR_MENUTEXT);
+			clLine1 = clLine2 = GetSysColor(COLOR_MENUTEXT);
 		}
 		else {
 			clBack = g_Options.clBack;
-- 
cgit v1.2.3