From 33ed395de0eb385315d949c77b4e1289a6684112 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 31 Mar 2013 19:09:56 +0000
Subject: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@4267 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/SecureIM/src/svcs_srmm.cpp | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

(limited to 'plugins/SecureIM/src/svcs_srmm.cpp')

diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp
index 005f93f76e..bfc3a3e371 100644
--- a/plugins/SecureIM/src/svcs_srmm.cpp
+++ b/plugins/SecureIM/src/svcs_srmm.cpp
@@ -1,33 +1,29 @@
 #include "commonheaders.h"
 
-
-int __cdecl onWindowEvent(WPARAM wParam, LPARAM lParam) {
-
+int __cdecl onWindowEvent(WPARAM wParam, LPARAM lParam)
+{
 	MessageWindowEventData *mwd = (MessageWindowEventData *)lParam;
-	if (mwd->uType == MSG_WINDOW_EVT_OPEN || mwd->uType == MSG_WINDOW_EVT_OPENING) {
+	if (mwd->uType == MSG_WINDOW_EVT_OPEN || mwd->uType == MSG_WINDOW_EVT_OPENING)
 		ShowStatusIcon(mwd->hContact);
-	}
+
 	return 0;
 }
 
-
-int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
+int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam)
+{
 	HANDLE hContact = (HANDLE)wParam;
 	if ( isProtoMetaContacts(hContact))
 		hContact = getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
 
 	StatusIconClickData *sicd = (StatusIconClickData *)lParam;
-	if ( strcmp(sicd->szModule, MODULENAME) != 0 ||
-		!isSecureProtocol(hContact)) return 0; // not our event
-
-	BOOL isPGP = isContactPGP(hContact);
-	BOOL isGPG = isContactGPG(hContact);
-	BOOL isSecured = isContactSecured(hContact)&SECURED;
-	BOOL isChat = isChatRoom(hContact);
-
-	if ( !isPGP && !isGPG && !isChat ) {
-		if (isSecured)	Service_DisableIM(wParam,0);
-		else		Service_CreateIM(wParam,0);
+	if ( strcmp(sicd->szModule, MODULENAME) != 0 || !isSecureProtocol(hContact))
+		return 0; // not our event
+
+	if ( !isContactPGP(hContact) && !isContactGPG(hContact) && !isChatRoom(hContact)) {
+		if (isContactSecured(hContact) & SECURED)
+			Service_DisableIM(wParam,0);
+		else
+			Service_CreateIM(wParam,0);
 	}
 
 	return 0;
-- 
cgit v1.2.3