summaryrefslogtreecommitdiff
path: root/src/core/stdpopup
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-03-05 21:10:22 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-03-05 21:10:22 +0300
commitd9fddc0cfa9066eb1b5ad3f4807b37426ae6ca88 (patch)
treef09baaf9b91477d009cedc5bd77449b0fa3e3af7 /src/core/stdpopup
parent8a1ff32e54b39ceef22df61bda17bbfda94918fc (diff)
Popup:
- wiping out checks for service presence; - code cleaning
Diffstat (limited to 'src/core/stdpopup')
-rw-r--r--src/core/stdpopup/src/services.cpp4
-rw-r--r--src/core/stdpopup/stdpopup.vcxproj2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/stdpopup/src/services.cpp b/src/core/stdpopup/src/services.cpp
index 31cb9c49ef..f01f16e83a 100644
--- a/src/core/stdpopup/src/services.cpp
+++ b/src/core/stdpopup/src/services.cpp
@@ -292,7 +292,7 @@ static INT_PTR ShowMessage(WPARAM wParam, LPARAM lParam)
mir_wstrcpy(pd.lpwzContactName, lParam == SM_WARNING ? L"Warning" : L"Notification");
pd.lchIcon = LoadIcon(nullptr, lParam == SM_WARNING ? IDI_WARNING : IDI_INFORMATION);
wcsncpy(pd.lpwzText, _A2T((char *)wParam), MAX_SECONDLINE); pd.lpwzText[MAX_SECONDLINE-1] = 0;
- CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&pd, 0);
+ PUAddPopupW(&pd);
}
return 0;
}
@@ -307,7 +307,7 @@ static INT_PTR ShowMessageW(WPARAM wParam, LPARAM lParam)
mir_wstrcpy(pd.lpwzContactName, lParam == SM_WARNING ? L"Warning" : L"Notification");
pd.lchIcon = LoadIcon(nullptr, lParam == SM_WARNING ? IDI_WARNING : IDI_INFORMATION);
wcsncpy(pd.lpwzText, (wchar_t *)wParam, MAX_SECONDLINE);
- CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&pd, 0);
+ PUAddPopupW(&pd);
}
return 0;
}
diff --git a/src/core/stdpopup/stdpopup.vcxproj b/src/core/stdpopup/stdpopup.vcxproj
index bf4b3a03c2..9df692162b 100644
--- a/src/core/stdpopup/stdpopup.vcxproj
+++ b/src/core/stdpopup/stdpopup.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>StdPopup</ProjectName>
- <ProjectGuid>{B6FC188B-8E54-4197-9444-8BADE9AA75E2}</ProjectGuid>
+ <ProjectGuid>{713067DF-65EE-480B-A000-B2A323495F16}</ProjectGuid>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\..\build\vc.common\core.props" />