From a88aaaf491053ccd9f5bfb68f78c46c886d37844 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 7 Mar 2014 17:32:28 +0000 Subject: Minor bugfixes: - #607 (Capitalization inconsistency) - #609 (Unnecessary messagebox in Plugin Updater) - #613 (UserInfoEx writes wrong popup color settings to db) - #614 (NewAwaySys translation issue) git-svn-id: http://svn.miranda-ng.org/main/trunk@8454 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/src/Common.h | 2 +- plugins/PluginUpdater/src/Notifications.cpp | 5 ++++- plugins/PluginUpdater/src/Services.cpp | 4 ++-- plugins/PluginUpdater/src/Utils.cpp | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'plugins/PluginUpdater') diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h index 7d3bdc7167..0025df82d2 100644 --- a/plugins/PluginUpdater/src/Common.h +++ b/plugins/PluginUpdater/src/Common.h @@ -192,7 +192,7 @@ int CompareHashes(const ServListEntry *p1, const ServListEntry *p2); TCHAR* GetDefaultUrl(); BOOL DownloadFile(LPCTSTR tszURL, LPCTSTR tszLocal, int CRCsum, HANDLE &nlc); -void ShowPopup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType); +void ShowPopup(HWND hDlg, LPCTSTR Title, LPCTSTR Text, int Number, int ActType, bool NoMessageBox = false); void __stdcall RestartMe(void*); void __stdcall OpenPluginOptions(void*); BOOL AllowUpdateOnStartup(); diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp index e76ce083bb..0076c923f1 100644 --- a/plugins/PluginUpdater/src/Notifications.cpp +++ b/plugins/PluginUpdater/src/Notifications.cpp @@ -113,9 +113,12 @@ static void MakePopupAction(POPUPACTION &pa, int id) } } -void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType) +void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType, bool NoMessageBox) { if (!ServiceExists(MS_POPUP_ADDPOPUPT) || !db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) ) { + if(NoMessageBox){ + return; + } char setting[100]; mir_snprintf(setting, SIZEOF(setting), "Popups%dM", Number); if (db_get_b(NULL, MODNAME, setting, DEFAULT_MESSAGE_ENABLED)) { diff --git a/plugins/PluginUpdater/src/Services.cpp b/plugins/PluginUpdater/src/Services.cpp index cf5df545b9..0fb3bf4c1b 100644 --- a/plugins/PluginUpdater/src/Services.cpp +++ b/plugins/PluginUpdater/src/Services.cpp @@ -40,14 +40,14 @@ static INT_PTR srvParseHashes(WPARAM wParam, LPARAM lParam) return NULL; } -static INT_PTR srvFreeHashes(WPARAM wParam, LPARAM lParam) +static INT_PTR srvFreeHashes(WPARAM, LPARAM lParam) { SERVLIST *pList = (SERVLIST*)lParam; delete pList; return 0; } -static INT_PTR srvGetHashCount(WPARAM wParam, LPARAM lParam) +static INT_PTR srvGetHashCount(WPARAM, LPARAM lParam) { SERVLIST *pList = (SERVLIST*)lParam; return (pList == NULL) ? 0 : pList->getCount(); diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index ba1b78d64b..267e8ea2a6 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -211,7 +211,7 @@ bool ParseHashes(const TCHAR *ptszUrl, ptrT& baseUrl, SERVLIST& arHashes) // Download version info if (!opts.bSilent) - ShowPopup(NULL, TranslateT("Plugin Updater"), TranslateT("Checking new updates..."), 2, 0); + ShowPopup(NULL, TranslateT("Plugin Updater"), TranslateT("Checking new updates..."), 2, 0, true); FILEURL pFileUrl; mir_sntprintf(pFileUrl.tszDownloadURL, SIZEOF(pFileUrl.tszDownloadURL), _T("%s/hashes.zip"), baseUrl); -- cgit v1.2.3