From 4982a2b85b8022d75914970dd04f8ef32b5200f1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 15 Feb 2015 15:27:09 +0000
Subject: code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@12126 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 protocols/Gadu-Gadu/src/gg_proto.cpp | 31 +++++++++++++++----------------
 protocols/Steam/src/steam_proto.cpp  |  3 +--
 protocols/Tlen/src/tlen_svc.cpp      | 13 ++++++-------
 protocols/WhatsApp/src/proto.cpp     |  2 +-
 4 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index d2ccaed460..e2abec4873 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -778,22 +778,21 @@ int GGPROTO::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
 {
 	switch( eventType ) {
 	case EV_PROTO_ONLOAD:
-		{
-			HookProtoEvent(ME_OPT_INITIALISE, &GGPROTO::options_init);
-			HookProtoEvent(ME_USERINFO_INITIALISE, &GGPROTO::details_init);
-
-			// Init misc stuff
-			gg_icolib_init();
-			initpopups();
-			gc_init();
-			keepalive_init();
-			img_init();
-			block_init();
-
-			// Try to fetch user avatar
-			getOwnAvatar();
-			break;
-		}
+		HookProtoEvent(ME_OPT_INITIALISE, &GGPROTO::options_init);
+		HookProtoEvent(ME_USERINFO_INITIALISE, &GGPROTO::details_init);
+
+		// Init misc stuff
+		gg_icolib_init();
+		initpopups();
+		gc_init();
+		keepalive_init();
+		img_init();
+		block_init();
+
+		// Try to fetch user avatar
+		getOwnAvatar();
+		break;
+
 	case EV_PROTO_ONEXIT:
 		// Stop avatar request thread
 		pth_avatar.dwThreadId = 0;
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp
index 63305fbb6d..5e796d06eb 100644
--- a/protocols/Steam/src/steam_proto.cpp
+++ b/protocols/Steam/src/steam_proto.cpp
@@ -411,8 +411,7 @@ int __cdecl CSteamProto::UserIsTyping(MCONTACT hContact, int type)
 
 int __cdecl CSteamProto::OnEvent(PROTOEVENTTYPE eventType, WPARAM wParam, LPARAM lParam)
 {
-	switch (eventType)
-	{
+	switch (eventType) {
 	case EV_PROTO_ONLOAD:
 		return this->OnModulesLoaded(wParam, lParam);
 
diff --git a/protocols/Tlen/src/tlen_svc.cpp b/protocols/Tlen/src/tlen_svc.cpp
index b1e35e62b3..98dbafca2b 100644
--- a/protocols/Tlen/src/tlen_svc.cpp
+++ b/protocols/Tlen/src/tlen_svc.cpp
@@ -1186,14 +1186,13 @@ int TlenProtocol::OnEvent(PROTOEVENTTYPE iEventType, WPARAM wParam, LPARAM lPara
 	case EV_PROTO_ONLOAD:    return OnModulesLoaded(0, 0);
 	case EV_PROTO_ONOPTIONS: return OptionsInit(wParam, lParam);
 	case EV_PROTO_ONEXIT:    return PreShutdown(0, 0);
+
 	case EV_PROTO_ONRENAME:
-		{
-			CLISTMENUITEM mi = { sizeof(mi) };
-			mi.flags = CMIM_NAME | CMIF_TCHAR;
-			mi.ptszName = m_tszUserName;
-			Menu_ModifyItem(hMenuRoot, &mi);
-			/* FIXME: Rename network user as well */
-		}
+		CLISTMENUITEM mi = { sizeof(mi) };
+		mi.flags = CMIM_NAME | CMIF_TCHAR;
+		mi.ptszName = m_tszUserName;
+		Menu_ModifyItem(hMenuRoot, &mi);
+		/* FIXME: Rename network user as well */
 	}
 	return 1;
 }
diff --git a/protocols/WhatsApp/src/proto.cpp b/protocols/WhatsApp/src/proto.cpp
index aa09bbac80..d058005b51 100644
--- a/protocols/WhatsApp/src/proto.cpp
+++ b/protocols/WhatsApp/src/proto.cpp
@@ -76,7 +76,7 @@ int WhatsAppProto::OnEvent(PROTOEVENTTYPE evType, WPARAM wParam, LPARAM lParam)
 		HookProtoEvent(ME_GC_EVENT, &WhatsAppProto::onGroupChatEvent);
 		HookProtoEvent(ME_GC_BUILDMENU, &WhatsAppProto::OnChatMenu);
 	}
-	return 0;
+	return TRUE;
 }
 
 DWORD_PTR WhatsAppProto::GetCaps(int type, MCONTACT hContact)
-- 
cgit v1.2.3