From c0274fa5abfcfb59a4c8ae4d113d705ea0272c4c Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 3 Sep 2018 18:25:42 +0300 Subject: popup code cleaning --- plugins/Popup/src/notifications.cpp | 2 +- plugins/Popup/src/services.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/Popup/src') diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index fdd18a93cc..f86d235189 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -73,7 +73,7 @@ void FreePopupClass(POPUPTREEDATA *ptd) { if (ptd->typ == 2) { mir_free(ptd->pupClass.pszName); - mir_free(ptd->pupClass.pszDescription); + mir_free(ptd->pupClass.pszDescription.w); } mir_free(ptd->pszTreeRoot); mir_free(ptd->pszDescription); diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index 77ab39de01..3490c2a25f 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -368,12 +368,12 @@ INT_PTR Popup_RegisterPopupClass(WPARAM, LPARAM lParam) ptd->pszTreeRoot = mir_a2u(pc->pszName); ptd->pupClass.pszName = mir_strdup(pc->pszName); if (pc->flags & PCF_UNICODE) { - ptd->pupClass.pwszDescription = mir_wstrdup(pc->pwszDescription); - ptd->pszDescription = mir_wstrdup(pc->pwszDescription); + ptd->pupClass.pszDescription.w = mir_wstrdup(pc->pszDescription.w); + ptd->pszDescription = mir_wstrdup(pc->pszDescription.w); } else { - ptd->pupClass.pszDescription = mir_strdup(pc->pszDescription); - ptd->pszDescription = mir_a2u(pc->pszDescription); + ptd->pupClass.pszDescription.a = mir_strdup(pc->pszDescription.a); + ptd->pszDescription = mir_a2u(pc->pszDescription.a); } LoadClassSettings(ptd, PU_MODULCLASS); -- cgit v1.2.3