diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2014-03-03 09:54:38 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2014-03-03 09:54:38 +0000 |
| commit | 3e0cbcdd0e1cdaf4e8f13c0f9dc444a4e4b720f7 (patch) | |
| tree | dfb4fbd9fe39bcc9164fc6daa8b47013473bb23a /plugins | |
| parent | d95abae24facf8ef8dafbcc1a400d9c1e1f7fd87 (diff) | |
- 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
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/PluginUpdater/src/Utils.cpp | 2 | ||||
| -rw-r--r-- | plugins/UserInfoEx/src/psp_anniversary.cpp | 10 |
2 files changed, 7 insertions, 5 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;
}
|