diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2014-10-18 09:06:23 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2014-10-18 09:06:23 +0000 |
| commit | ade107d192bab45ffb4071612ee74668b93d5b4f (patch) | |
| tree | 006c37ccf76e192821da7615dcf59af45a113b2a | |
| parent | 61a9610ef402c562bf724de7ac56665cd99afee5 (diff) | |
don't show popup about updates when installing new components
git-svn-id: http://svn.miranda-ng.org/main/trunk@10822 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/PluginUpdater/src/Common.h | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgListNew.cpp | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Services.cpp | 2 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Utils.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h index 78ce570d65..b8707860a9 100644 --- a/plugins/PluginUpdater/src/Common.h +++ b/plugins/PluginUpdater/src/Common.h @@ -208,7 +208,7 @@ void UnloadNetlib(); void BackupFile(TCHAR *ptszSrcFileName, TCHAR *ptszBackFileName);
-bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes);
+bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes, bool isUpdate);
int CompareHashes(const ServListEntry *p1, const ServListEntry *p2);
int GetUpdateMode();
diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp index 7cc8a900a4..f5c921b287 100644 --- a/plugins/PluginUpdater/src/DlgListNew.cpp +++ b/plugins/PluginUpdater/src/DlgListNew.cpp @@ -345,7 +345,7 @@ static void GetList(void *) ptrT updateUrl( GetDefaultUrl()), baseUrl;
SERVLIST hashes(50, CompareHashes);
- if (!ParseHashes(updateUrl, baseUrl, hashes)) {
+ if (!ParseHashes(updateUrl, baseUrl, hashes, 0)) {
hListThread = NULL;
return;
}
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 5b23ee7bdc..048f480d1a 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -709,7 +709,7 @@ static void CheckUpdates(void *) ptrT updateUrl(GetDefaultUrl()), baseUrl;
SERVLIST hashes(50, CompareHashes);
- bool success = ParseHashes(updateUrl, baseUrl, hashes);
+ bool success = ParseHashes(updateUrl, baseUrl, hashes, 1);
if (success) {
FILELIST *UpdateFiles = new FILELIST(20);
VARST dirname(_T("%miranda_path%"));
diff --git a/plugins/PluginUpdater/src/Services.cpp b/plugins/PluginUpdater/src/Services.cpp index 9b44f0038d..948f32eb97 100644 --- a/plugins/PluginUpdater/src/Services.cpp +++ b/plugins/PluginUpdater/src/Services.cpp @@ -28,7 +28,7 @@ static INT_PTR srvParseHashes(WPARAM wParam, LPARAM lParam) SERVLIST *pList = new SERVLIST(50, CompareHashes);
ptrT baseUrl;
- if ( ParseHashes(ptszUrl, baseUrl, *pList)) {
+ if ( ParseHashes(ptszUrl, baseUrl, *pList, 0)) {
_tcsncpy(ptszBaseUrl, baseUrl, MAX_PATH);
return (INT_PTR)pList;
}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index 127054099a..bf1258d4d9 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -189,7 +189,7 @@ int CompareHashes(const ServListEntry *p1, const ServListEntry *p2) return _tcsicmp(p1->m_name, p2->m_name);
}
-bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes)
+bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes, bool isUpdate)
{
REPLACEVARSARRAY vars[2];
vars[0].lptzKey = _T("platform");
@@ -206,7 +206,7 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT &baseUrl, SERVLIST &arHashes) baseUrl = (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)ptszUrl, (LPARAM)&dat);
// Download version info
- if (!opts.bSilent)
+ if (!opts.bSilent && isUpdate)
ShowPopup(TranslateT("Plugin Updater"), TranslateT("Checking for new updates..."), POPUP_TYPE_INFO);
FILEURL pFileUrl;
|