From ab53b72bf7067feb9dede0fd76b5a3cbc13863b9 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 2 Jun 2015 15:55:48 +0000
Subject: - old PNG conversion code (png2dib, dib2png) removed; - m_png.h also
 removed; - all calls of LoadImage replaced with CallService(MS_IMG_LOAD); -
 four invalid CloseHandle() calls removed; - massive code cleaning for Popup,
 HistoryStats & SplashScreen plugins

git-svn-id: http://svn.miranda-ng.org/main/trunk@13974 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/services.cpp | 79 ++++++++++++++++++++++--------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

(limited to 'plugins/Popup/src/services.cpp')

diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index 1d54e21027..69b06749d8 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -284,28 +284,29 @@ INT_PTR Popup_Query(WPARAM wParam, LPARAM)
 		return 0;
 
 	switch (wParam) {
-	case PUQS_ENABLEPOPUPS: {
-		if (PopupOptions.ModuleIsEnabled) return 1; // They're already ON!!!
-		else { // Module was disabled.
-			svcEnableDisableMenuCommand(0, 0);
-			return 0;
-		}
-	}
-	case PUQS_DISABLEPOPUPS: {
-		if (!(PopupOptions.ModuleIsEnabled)) return 1; // They're already OFF!!!
-		else {
-			svcEnableDisableMenuCommand(0, 0);
-			return 0;
-		}
-	}
+	case PUQS_ENABLEPOPUPS:
+		if (PopupOptions.ModuleIsEnabled)
+			return 1; // They're already ON!!!
+		
+		// Module was disabled.
+		svcEnableDisableMenuCommand(0, 0);
+		return 0;
+
+	case PUQS_DISABLEPOPUPS:
+		if (!(PopupOptions.ModuleIsEnabled))
+			return 1; // They're already OFF!!!
+
+		svcEnableDisableMenuCommand(0, 0);
+		return 0;
+
 	case PUQS_GETSTATUS:
 		return (PopupOptions.ModuleIsEnabled);
+
 	default:
 		return -1;
 	}
 }
 
-
 //===== Popup/RegisterActions
 INT_PTR Popup_RegisterActions(WPARAM wParam, LPARAM lParam)
 {
@@ -427,9 +428,11 @@ INT_PTR Popup_UnregisterPopupClass(WPARAM, LPARAM lParam)
 }
 
 //===== Popup/AddPopupClass		(for core class api support)
-INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam) {
+INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam)
+{
 	POPUPDATACLASS *pdc = (POPUPDATACLASS *)lParam;
-	if (!pdc || (pdc->cbSize != sizeof(POPUPDATACLASS))) return 1;
+	if (!pdc || (pdc->cbSize != sizeof(POPUPDATACLASS)))
+		return 1;
 
 	POPUPCLASS *pc;
 	if (wParam)
@@ -443,27 +446,27 @@ INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam) {
 			pc = NULL;
 		mir_free(group);
 	}
-	if (pc) {
-		POPUPDATA2 ppd2 = { sizeof(ppd2) };
-		ppd2.colorBack = pc->colorBack;
-		ppd2.colorText = pc->colorText;
-		ppd2.lchIcon = pc->hIcon;
-		ppd2.iSeconds = pc->iSeconds;
-		ppd2.PluginWindowProc = pc->PluginWindowProc;
-		if (pc->flags & PCF_UNICODE) {
-			ppd2.flags = PU2_UNICODE;
-			ppd2.lptzTitle = (TCHAR*)pdc->ptszTitle;
-			ppd2.lptzText = (TCHAR*)pdc->ptszText;
-		}
-		else {
-			ppd2.flags = PU2_ANSI;
-			ppd2.lpzTitle = (char *)pdc->pszTitle;
-			ppd2.lpzText = (char *)pdc->pszText;
-		}
-		ppd2.lchContact = pdc->hContact;
-		ppd2.PluginData = pdc->PluginData;
+	if (pc == NULL)
+		return 1;
 
-		return Popup_AddPopup2((WPARAM)&ppd2, pc->lParam);
+	POPUPDATA2 ppd2 = { sizeof(ppd2) };
+	ppd2.colorBack = pc->colorBack;
+	ppd2.colorText = pc->colorText;
+	ppd2.lchIcon = pc->hIcon;
+	ppd2.iSeconds = pc->iSeconds;
+	ppd2.PluginWindowProc = pc->PluginWindowProc;
+	if (pc->flags & PCF_UNICODE) {
+		ppd2.flags = PU2_UNICODE;
+		ppd2.lptzTitle = (TCHAR*)pdc->ptszTitle;
+		ppd2.lptzText = (TCHAR*)pdc->ptszText;
 	}
-	return 1;
+	else {
+		ppd2.flags = PU2_ANSI;
+		ppd2.lpzTitle = (char *)pdc->pszTitle;
+		ppd2.lpzText = (char *)pdc->pszText;
+	}
+	ppd2.lchContact = pdc->hContact;
+	ppd2.PluginData = pdc->PluginData;
+
+	return Popup_AddPopup2((WPARAM)&ppd2, pc->lParam);
 }
-- 
cgit v1.2.3