diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-09-11 23:49:15 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-09-11 23:49:15 +0300 |
| commit | e09448dd03e3647717166e92ee818e395041993a (patch) | |
| tree | 2733f155bb5fd9313ea08255209da75f738bcedf /plugins/PluginUpdater/src | |
| parent | b0f44b16bd1138de85a5d17bb42151742f9c8298 (diff) | |
| parent | 9834746e6a7e5cf04a32273155265bc3a2f57180 (diff) | |
Merge branch 'master' of https://github.com/miranda-ng/miranda-ng
Diffstat (limited to 'plugins/PluginUpdater/src')
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 8 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/PluginUpdater.cpp | 4 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Utils.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 6d54f2e342..8aada80df1 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -87,7 +87,7 @@ static void ApplyUpdates(void *param) // interrupt update as we require all components to be updated
Netlib_CloseHandle(nlc);
PostMessage(hDlg, UM_ERROR, 0, 0);
- SkinPlaySound("updatefailed");
+ Skin_PlaySound("updatefailed");
return;
}
SetStringText(hwndList, i, TranslateT("Succeeded."));
@@ -121,7 +121,7 @@ static void ApplyUpdates(void *param) }
}
}
- SkinPlaySound("updatecompleted");
+ Skin_PlaySound("updatecompleted");
#if MIRANDA_VER < 0x0A00
// 4) Change title of clist
@@ -429,7 +429,7 @@ static void DlgUpdateSilent(void *param) if (!DownloadFile(pFileUrl, nlc)) {
// interrupt update as we require all components to be updated
Netlib_CloseHandle(nlc);
- SkinPlaySound("updatefailed");
+ Skin_PlaySound("updatefailed");
delete &UpdateFiles;
return;
}
@@ -473,7 +473,7 @@ static void DlgUpdateSilent(void *param) }
}
delete &UpdateFiles;
- SkinPlaySound("updatecompleted");
+ Skin_PlaySound("updatecompleted");
#if MIRANDA_VER < 0x0A00
// 4) Change title of clist
diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp index 9c09f5a6f9..49507acd15 100644 --- a/plugins/PluginUpdater/src/PluginUpdater.cpp +++ b/plugins/PluginUpdater/src/PluginUpdater.cpp @@ -126,8 +126,8 @@ extern "C" __declspec(dllexport) int Load(void) InitEvents();
// add sounds
- SkinAddNewSoundEx("updatecompleted", LPGEN("Plugin Updater"), LPGEN("Update completed"));
- SkinAddNewSoundEx("updatefailed", LPGEN("Plugin Updater"), LPGEN("Update failed"));
+ Skin_AddSound("updatecompleted", LPGENW("Plugin Updater"), LPGENW("Update completed"));
+ Skin_AddSound("updatefailed", LPGENW("Plugin Updater"), LPGENW("Update failed"));
#if MIRANDA_VER >= 0x0A00
// Upgrade old settings
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index c136c5c20c..7554c723ef 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -163,14 +163,14 @@ bool ParseHashes(const wchar_t *ptszUrl, ptrW &baseUrl, SERVLIST &arHashes) if (!ret) {
Netlib_LogfW(hNetlibUser,L"Downloading list of available updates from %s failed",baseUrl);
ShowPopup(TranslateT("Plugin Updater"), TranslateT("An error occurred while checking for new updates."), POPUP_TYPE_ERROR);
- SkinPlaySound("updatefailed");
+ Skin_PlaySound("updatefailed");
return false;
}
if(!unzip(pFileUrl.tszDiskPath, g_tszTempPath, NULL,true)) {
Netlib_LogfW(hNetlibUser,L"Unzipping list of available updates from %s failed",baseUrl);
ShowPopup(TranslateT("Plugin Updater"), TranslateT("An error occurred while checking for new updates."), POPUP_TYPE_ERROR);
- SkinPlaySound("updatefailed");
+ Skin_PlaySound("updatefailed");
return false;
}
|