From 1fcc1afe0d54bc1034dd500837050dd972e45161 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 26 Oct 2012 00:01:16 +0000
Subject: - old crap killed in NewXStatusNotify - code cleaning

git-svn-id: http://svn.miranda-ng.org/main/trunk@2081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Popup/src/history.cpp | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

(limited to 'plugins/Popup/src')

diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp
index 7da08ec60b..6775efe666 100644
--- a/plugins/Popup/src/history.cpp
+++ b/plugins/Popup/src/history.cpp
@@ -83,16 +83,9 @@ void PopupHistoryResize()
 	}
 	for(i = 0; i < toDelete; ++i){//free too old ones
 		POPUPDATA2 *ppd = &oldPopupHistory[(oldStart + i)%oldBuffer];
-		if (ppd->flags & PU2_UNICODE)
-		{
-			mir_free(ppd->lpwzTitle);
-			mir_free(ppd->lpwzText);
-		} else
-		{
-			mir_free(ppd->lpzTitle);
-			mir_free(ppd->lpzText);
-		}
-		if (ppd->lpzSkin) mir_free(ppd->lpzSkin);
+		mir_free(ppd->lpzTitle);
+		mir_free(ppd->lpzText);
+		mir_free(ppd->lpzSkin);
 	}
 	delete [] oldPopupHistory;
 }
@@ -102,16 +95,9 @@ void PopupHistoryUnload()
 	for (int i = 0; i < popupHistorySize; ++i)
 	{
 		POPUPDATA2 *ppd = &popupHistory[getHistoryIndex(i)];
-		if (ppd->flags & PU2_UNICODE)
-		{
-			mir_free(ppd->lpwzTitle);
-			mir_free(ppd->lpwzText);
-		} else
-		{
-			mir_free(ppd->lpzTitle);
-			mir_free(ppd->lpzText);
-		}
-		if (ppd->lpzSkin) mir_free(ppd->lpzSkin);
+		mir_free(ppd->lpzTitle);
+		mir_free(ppd->lpzText);
+		mir_free(ppd->lpzSkin);
 	}
 	delete [] popupHistory;
 	popupHistory = NULL;
@@ -286,11 +272,11 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				return TRUE;
 
 			LPMEASUREITEMSTRUCT lpmis;
-			lpmis = (LPMEASUREITEMSTRUCT) lParam; 
+			lpmis = (LPMEASUREITEMSTRUCT) lParam;
 			if (lpmis->itemID == -1)
 				return FALSE;
 			lpmis->itemHeight = 50;
-			return TRUE; 
+			return TRUE;
 		}
 		case WM_DRAWITEM:
 		{
-- 
cgit v1.2.3