From 3e0cbcdd0e1cdaf4e8f13c0f9dc444a4e4b720f7 Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Mon, 3 Mar 2014 09:54:38 +0000 Subject: - fixes #608 (Plugin Updater popup has wrong colors) - fixes #607 (Capitalization inconsistency) - fixes #606 (Can't add new anniversary in UserInfoEx) git-svn-id: http://svn.miranda-ng.org/main/trunk@8369 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/src/Utils.cpp | 2 +- plugins/UserInfoEx/src/psp_anniversary.cpp | 10 ++++++---- src/modules/extraicons/extraicons.cpp | 26 +++++++++++++------------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index 1d5824666c..ba1b78d64b 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..."), 4, 0); + ShowPopup(NULL, TranslateT("Plugin Updater"), TranslateT("Checking new updates..."), 2, 0); FILEURL pFileUrl; mir_sntprintf(pFileUrl.tszDownloadURL, SIZEOF(pFileUrl.tszDownloadURL), _T("%s/hashes.zip"), baseUrl); diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp index d27ce5f7a0..17a6c8b257 100644 --- a/plugins/UserInfoEx/src/psp_anniversary.cpp +++ b/plugins/UserInfoEx/src/psp_anniversary.cpp @@ -71,10 +71,7 @@ static INT_PTR CALLBACK DlgProc_AnniversaryEditor(HWND hDlg, UINT uMsg, WPARAM w EnableWindow(GetDlgItem(hDlg, IDOK), GetWindowTextLength((HWND)lParam) > 0); break; - case IDCANCEL: - return EndDialog(hDlg, LOWORD(wParam)); - - case IDOK: + case IDOK: { // read new description HWND hEdit = GetDlgItem(hDlg, EDIT_CATEGORY); int len = Edit_GetTextLength(hEdit); @@ -93,6 +90,11 @@ static INT_PTR CALLBACK DlgProc_AnniversaryEditor(HWND hDlg, UINT uMsg, WPARAM w pDlgEditAnniv->SetFlags(MAnnivDate::MADF_HASCUSTOM | MAnnivDate::MADF_CHANGED); } } + // fall through + case IDCANCEL: + return EndDialog(hDlg, LOWORD(wParam)); + + } } return FALSE; } diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index 389b8a1e07..0527126662 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -234,7 +234,7 @@ void KillModuleExtraIcons(int hLangpack) /////////////////////////////////////////////////////////////////////////////// -int ClistExtraListRebuild(WPARAM wParam, LPARAM lParam) +int ClistExtraListRebuild(WPARAM, LPARAM) { clistRebuildAlreadyCalled = TRUE; @@ -246,7 +246,7 @@ int ClistExtraListRebuild(WPARAM wParam, LPARAM lParam) return 0; } -int ClistExtraImageApply(WPARAM hContact, LPARAM lParam) +int ClistExtraImageApply(WPARAM hContact, LPARAM) { if (hContact == NULL) return 0; @@ -456,7 +456,7 @@ INT_PTR ExtraIcon_Register(WPARAM wParam, LPARAM lParam) return id; } -INT_PTR ExtraIcon_SetIcon(WPARAM wParam, LPARAM lParam) +INT_PTR ExtraIcon_SetIcon(WPARAM wParam, LPARAM) { if (wParam == 0) return -1; @@ -472,7 +472,7 @@ INT_PTR ExtraIcon_SetIcon(WPARAM wParam, LPARAM lParam) return extra->setIcon((int)ei->hExtraIcon, ei->hContact, ei->hImage); } -INT_PTR ExtraIcon_SetIconByName(WPARAM wParam, LPARAM lParam) +INT_PTR ExtraIcon_SetIconByName(WPARAM wParam, LPARAM) { if (wParam == 0) return -1; @@ -488,7 +488,7 @@ INT_PTR ExtraIcon_SetIconByName(WPARAM wParam, LPARAM lParam) return extra->setIconByName((int)ei->hExtraIcon, ei->hContact, ei->icoName); } -static INT_PTR svcExtraIcon_Add(WPARAM wParam, LPARAM lParam) +static INT_PTR svcExtraIcon_Add(WPARAM wParam, LPARAM) { return (INT_PTR)ExtraIcon_Add((HICON)wParam); } @@ -509,25 +509,25 @@ void LoadExtraIconsModule() clistSlotCount = LOWORD(ret); // Services - CreateServiceFunction(MS_EXTRAICON_REGISTER, &ExtraIcon_Register); - CreateServiceFunction(MS_EXTRAICON_SET_ICON, &ExtraIcon_SetIcon); + CreateServiceFunction(MS_EXTRAICON_REGISTER, ExtraIcon_Register); + CreateServiceFunction(MS_EXTRAICON_SET_ICON, ExtraIcon_SetIcon); CreateServiceFunction(MS_EXTRAICON_SET_ICON_BY_NAME, &ExtraIcon_SetIconByName); - CreateServiceFunction(MS_CLIST_EXTRA_ADD_ICON, &svcExtraIcon_Add); + CreateServiceFunction(MS_CLIST_EXTRA_ADD_ICON, svcExtraIcon_Add); hEventExtraClick = CreateHookableEvent(ME_CLIST_EXTRA_CLICK); hEventExtraImageApplying = CreateHookableEvent(ME_CLIST_EXTRA_IMAGE_APPLY); hEventExtraImageListRebuilding = CreateHookableEvent(ME_CLIST_EXTRA_LIST_REBUILD); // Icons - Icon_Register(NULL, "Contact List", iconList, SIZEOF(iconList)); + Icon_Register(NULL, "Contact list", iconList, SIZEOF(iconList)); // Hooks - HookEvent(ME_SYSTEM_MODULESLOADED, &ModulesLoaded); + HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); - HookEvent(ME_CLIST_EXTRA_LIST_REBUILD, &ClistExtraListRebuild); - HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, &ClistExtraImageApply); - HookEvent(ME_CLIST_EXTRA_CLICK, &ClistExtraClick); + HookEvent(ME_CLIST_EXTRA_LIST_REBUILD, ClistExtraListRebuild); + HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, ClistExtraImageApply); + HookEvent(ME_CLIST_EXTRA_CLICK, ClistExtraClick); DefaultExtraIcons_Load(); } -- cgit v1.2.3