summaryrefslogtreecommitdiff
path: root/plugins/PluginUpdater/src/Notifications.cpp
diff options
context:
space:
mode:
authorTobias Weimer <wishmaster51@googlemail.com>2013-12-08 17:21:38 +0000
committerTobias Weimer <wishmaster51@googlemail.com>2013-12-08 17:21:38 +0000
commit234b9ad1ccfa557306cd5ec488ec47c78cdf0cc8 (patch)
treea59e8ad42cd1e4d7887e0f2c4cac3d6fd977f613 /plugins/PluginUpdater/src/Notifications.cpp
parent34a4eb364a9f9db66c56153e93eb9ab70e0f670b (diff)
try to fix installing plugins which have been deselected
git-svn-id: http://svn.miranda-ng.org/main/trunk@7087 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/PluginUpdater/src/Notifications.cpp')
-rw-r--r--plugins/PluginUpdater/src/Notifications.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp
index b6ad025454..15b28ab0c6 100644
--- a/plugins/PluginUpdater/src/Notifications.cpp
+++ b/plugins/PluginUpdater/src/Notifications.cpp
@@ -115,7 +115,7 @@ static void MakePopupAction(POPUPACTION &pa, int id)
void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType)
{
- if ( !ServiceExists(MS_POPUP_ADDPOPUP) || !db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) ) {
+ if ( !ServiceExists(MS_POPUP_ADDPOPUPT) || !db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) ) {
char setting[100];
mir_snprintf(setting, SIZEOF(setting), "Popups%dM", Number);
if (db_get_b(NULL, MODNAME, setting, DEFAULT_MESSAGE_ENABLED)) {
@@ -207,7 +207,7 @@ INT_PTR CALLBACK DlgDownloadPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
bool PrepareEscalation()
{
// First try to create a file near Miranda32.exe
- wchar_t szPath[MAX_PATH];
+ TCHAR szPath[MAX_PATH];
GetModuleFileName(NULL, szPath, SIZEOF(szPath));
TCHAR *ext = _tcsrchr(szPath, '.');
if (ext != NULL)
@@ -234,11 +234,11 @@ bool PrepareEscalation()
return false;
}
- wchar_t cmdLine[100], *p;
+ TCHAR cmdLine[100], *p;
GetModuleFileName(NULL, szPath, ARRAYSIZE(szPath));
- if ((p = wcsrchr(szPath, '\\')) != 0)
- wcscpy(p+1, L"pu_stub.exe");
- mir_sntprintf(cmdLine, SIZEOF(cmdLine), L"%d", GetCurrentProcessId());
+ if ((p = _tcsrchr(szPath, '\\')) != 0)
+ _tcscpy(p+1, _T("pu_stub.exe"));
+ mir_sntprintf(cmdLine, SIZEOF(cmdLine), _T("%d"), GetCurrentProcessId());
// Launch a stub
SHELLEXECUTEINFO sei = { sizeof(sei) };