From 9263c0341134cc0079cf78b64319cc81d035317b Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 22 Dec 2013 17:31:01 +0000
Subject: =?UTF-8?q?more=20cleaning=20for=20=D0=B3=D1=88=D1=82=D0=B0=D1=89?=
 =?UTF-8?q?=D1=83=D1=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.miranda-ng.org/main/trunk@7341 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/UserInfoEx/src/Flags/svc_flags.cpp    | 32 +++++++++++++--------------
 plugins/UserInfoEx/src/Flags/svc_flagsicons.h |  1 -
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'plugins/UserInfoEx/src/Flags')

diff --git a/plugins/UserInfoEx/src/Flags/svc_flags.cpp b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
index 46907cc5ec..9ee871bd61 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flags.cpp
+++ b/plugins/UserInfoEx/src/Flags/svc_flags.cpp
@@ -34,7 +34,6 @@ struct	CountryListEntry *countries;
 static	HANDLE hExtraIconSvc = INVALID_HANDLE_VALUE;
 /* hook */
 static HANDLE hApplyIconHook = NULL;
-static HANDLE hMsgWndEventHook = NULL;
 static HANDLE hSettingChangedHook = NULL;
 
 static int OnContactSettingChanged(WPARAM wParam,LPARAM lParam);
@@ -211,7 +210,8 @@ void SvcFlagsEnableExtraIcons(BYTE bColumn, BYTE bUpdateDB)
  * message winsow status icon functions
  ***********************************************************************************************************/
 
-MsgWndData::MsgWndData(HWND hwnd, HANDLE hContact) {
+MsgWndData::MsgWndData(HWND hwnd, HANDLE hContact)
+{
 	m_hwnd = hwnd;
 	m_hContact = hContact;
 	m_countryID = (int)ServiceDetectContactOriginCountry((WPARAM)m_hContact, 0);
@@ -224,7 +224,8 @@ MsgWndData::MsgWndData(HWND hwnd, HANDLE hContact) {
 	FlagsIconUpdate();
 }
 
-MsgWndData::~MsgWndData() {
+MsgWndData::~MsgWndData()
+{
 	FlagsIconUnset();			//check if realy need
 }
 
@@ -360,23 +361,23 @@ static int OnStatusIconsChanged(WPARAM wParam, LPARAM lParam)
 
 static int OnContactSettingChanged(WPARAM wParam, LPARAM lParam)
 {
-	if ((HANDLE)wParam == NULL) return 0;
-	DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam;
+	if ((HANDLE)wParam == NULL)
+		return 0;
 
 	/* user details update */
+	DBCONTACTWRITESETTING *dbcws = (DBCONTACTWRITESETTING*)lParam;
 	if (!lstrcmpA(dbcws->szSetting, SET_CONTACT_COUNTRY) ||
-		!lstrcmpA(dbcws->szSetting, SET_CONTACT_ORIGIN_COUNTRY) ||
-		!lstrcmpA(dbcws->szSetting, SET_CONTACT_COMPANY_COUNTRY))
+		 !lstrcmpA(dbcws->szSetting, SET_CONTACT_ORIGIN_COUNTRY) ||
+		 !lstrcmpA(dbcws->szSetting, SET_CONTACT_COMPANY_COUNTRY))
 	{
 		/* Extra Image */
-		CallFunctionBuffered(SetExtraImage, wParam, TRUE, EXTRAIMAGE_REFRESHDELAY);
+		SetExtraImage(wParam);
+
 		/* Status Icon */
-		if (hMsgWndEventHook) {
-			int i = gMsgWndList.getIndex((MsgWndData*)&wParam);
-			if (i != -1) {
-				gMsgWndList[i]->ContryIDchange((int)ServiceDetectContactOriginCountry(wParam, 0));
-				gMsgWndList[i]->FlagsIconUpdate();
-			}
+		int i = gMsgWndList.getIndex((MsgWndData*)&wParam);
+		if (i != -1) {
+			gMsgWndList[i]->ContryIDchange((int)ServiceDetectContactOriginCountry(wParam, 0));
+			gMsgWndList[i]->FlagsIconUpdate();
 		}
 	}
 	return 0;
@@ -423,7 +424,7 @@ void SvcFlagsOnModulesLoaded()
 	SvcFlagsEnableExtraIcons(db_get_b(NULL, MODNAME, SET_CLIST_EXTRAICON_FLAGS2, 0), FALSE);
 
 	/* Status Icon */
-	hMsgWndEventHook = HookEvent(ME_MSG_WINDOWEVENT, OnMsgWndEvent);
+	HookEvent(ME_MSG_WINDOWEVENT, OnMsgWndEvent);
 }
 
 /**
@@ -439,7 +440,6 @@ void SvcFlagsUnloadModule()
 	//Uninit ExtraImg
 	UnhookEvent(hApplyIconHook);
 	//Uninit message winsow
-	UnhookEvent(hMsgWndEventHook);
 	for (int i = 0; i < gMsgWndList.getCount(); i++) {
 		//this should not happen
 		delete gMsgWndList[i];
diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.h b/plugins/UserInfoEx/src/Flags/svc_flagsicons.h
index 362e2d9c68..ee9c6641df 100644
--- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.h
+++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.h
@@ -30,7 +30,6 @@ HICON	LoadFlag(int countryNumber);
 HANDLE LoadFlagHandle(int countryNumber);
 
 void InitIcons();
-//void SvcFlagsOnModulesLoaded();
 void UninitIcons();
 
 #endif /* _UINFOEX_FLAGSICONS_H_INCLUDED_ */
-- 
cgit v1.2.3