diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-16 08:51:54 +0200 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-11-16 08:51:54 +0200 |
| commit | 46f48e58a81256148f74e5d753c708dd1ff3d563 (patch) | |
| tree | 8acb91d4fa98981e6af252a0f5e85d6101799540 /options.cpp | |
| parent | f499a663032ad79a2e5ccfe6195b36f8645ca9f0 (diff) | |
| parent | 6cf18be1f2a73e501cf855de4db7dd57a52581d5 (diff) | |
Merge branch 'new_gpg' into new_gpg_autoexchange
Conflicts:
main.cpp
Diffstat (limited to 'options.cpp')
| -rw-r--r-- | options.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/options.cpp b/options.cpp index 90fc4f4..c0debec 100644 --- a/options.cpp +++ b/options.cpp @@ -93,7 +93,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA LVITEM item = {0}; TCHAR *tmp = NULL; char *tmp2 = NULL; - extern bool bIsMiranda09; + extern bool bIsMiranda09, bJabberAPI; NMLISTVIEW * hdr = (NMLISTVIEW *) lParam; switch (msg) { @@ -178,6 +178,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA mir_free(tmp); CheckStateLoadDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog", 0); EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09); + EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI)); { string keyinfo = "Current private key id: "; char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", ""); @@ -366,6 +367,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA case WM_NOTIFY: { + EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && IsDlgButtonChecked(hwndDlg, IDC_JABBER_API))); if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1)) { if(hdr->hdr.code == NM_CLICK) |