From c0274fa5abfcfb59a4c8ae4d113d705ea0272c4c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Mon, 3 Sep 2018 18:25:42 +0300
Subject: popup code cleaning

---
 plugins/YAPP/src/options.cpp  | 4 ++--
 plugins/YAPP/src/services.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'plugins/YAPP/src')

diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp
index ac6877707c..1e2b70f3f8 100644
--- a/plugins/YAPP/src/options.cpp
+++ b/plugins/YAPP/src/options.cpp
@@ -361,9 +361,9 @@ static INT_PTR CALLBACK DlgProcOptsClasses(HWND hwndDlg, UINT msg, WPARAM wParam
 			for (int i = 0; i < arNewClasses.getCount(); i++) {
 				POPUPCLASS *pc = arNewClasses[i];
 				if (pc->flags & PCF_UNICODE)
-					index = SendDlgItemMessageW(hwndDlg, IDC_LST_CLASSES, LB_ADDSTRING, 0, (LPARAM)pc->pwszDescription);
+					index = SendDlgItemMessageW(hwndDlg, IDC_LST_CLASSES, LB_ADDSTRING, 0, (LPARAM)pc->pszDescription.w);
 				else
-					index = SendDlgItemMessageA(hwndDlg, IDC_LST_CLASSES, LB_ADDSTRING, 0, (LPARAM)pc->pszDescription);
+					index = SendDlgItemMessageA(hwndDlg, IDC_LST_CLASSES, LB_ADDSTRING, 0, (LPARAM)pc->pszDescription.a);
 
 				SendDlgItemMessage(hwndDlg, IDC_LST_CLASSES, LB_SETITEMDATA, index, i);
 			}
diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp
index f507557c20..78c66f4f97 100644
--- a/plugins/YAPP/src/services.cpp
+++ b/plugins/YAPP/src/services.cpp
@@ -332,9 +332,9 @@ static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam)
 
 	pc->pszName = mir_strdup(pc->pszName);
 	if (pc->flags & PCF_UNICODE)
-		pc->pwszDescription = mir_wstrdup(pc->pwszDescription);
+		pc->pszDescription.w = mir_wstrdup(pc->pszDescription.w);
 	else
-		pc->pszDescription = mir_strdup(pc->pszDescription);
+		pc->pszDescription.a = mir_strdup(pc->pszDescription.a);
 	
 	char setting[256];
 	mir_snprintf(setting, "%s/Timeout", pc->pszName);
@@ -352,7 +352,7 @@ static INT_PTR RegisterPopupClass(WPARAM, LPARAM lParam)
 static void FreePopupClass(POPUPCLASS *pc)
 {
 	mir_free(pc->pszName);
-	mir_free(pc->pszDescription);
+	mir_free(pc->pszDescription.w);
 	mir_free(pc);
 }
 
-- 
cgit v1.2.3