← Back to branch summary

~ubuntu-branches/ubuntu/trusty/keepass2/trusty-proposed

« back to all changes in this revision

Viewing changes to KeePass/Forms/KeyPromptForm.cs

  • Committer: Package Import Robot
  • Author(s): Julian Taylor
  • Date: 2011-12-30 15:45:59 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20111230154559-3en1b9v90hswvs1w
Tags: 2.18+dfsg-1
* New upstream release
  - refresh patches
  - drop upstream applied patches:
    explicitly-PUT-for-webdav-writes.patch
    prefer-4.0-framework-if-available.patch
* add patch to improve autotype when dealing with multiple keyboard layouts
  - Thanks to amiryal for the patch
* disable initial autoupdate popup via patch
* update years in debian/copyright

Show diffs side-by-side

added added

removed removed

Lines of Context:
KeePass/Forms/KeyPromptForm.cs
1
1
/*
2
2
  KeePass Password Safe - The Open-Source Password Manager
3
 
  Copyright (C) 2003-2011 Dominik Reichl <dominik.reichl@t-online.de>
 
3
  Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl@t-online.de>
4
4
 
5
5
  This program is free software; you can redistribute it and/or modify
6
6
  it under the terms of the GNU General Public License as published by
253
253
                                KeyProvider kp = Program.KeyProviderPool.Get(strKeyFile);
254
254
                                if((kp != null) && m_bSecureDesktop)
255
255
                                {
256
 
                                        if(kp.GetKeyMightShowGui)
 
256
                                        if(!kp.SecureDesktopCompatible)
257
257
                                        {
258
 
                                                MessageService.ShowWarning(KPRes.KeyProvWithGuiOnSD,
259
 
                                                        KPRes.KeyProvWithGuiOnSDHint);
 
258
                                                MessageService.ShowWarning(KPRes.KeyProvIncmpWithSD,
 
259
                                                        KPRes.KeyProvIncmpWithSDHint);
260
260
                                                return false;
261
261
                                        }
262
262
                                }
263
263
 
264
 
                                KeyProviderQueryContext ctxKP = new KeyProviderQueryContext(m_ioInfo, false);
 
264
                                KeyProviderQueryContext ctxKP = new KeyProviderQueryContext(
 
265
                                        m_ioInfo, false, m_bSecureDesktop);
265
266
 
266
267
                                bool bPerformHash;
267
268
                                byte[] pbProvKey = Program.KeyProviderPool.GetKey(strKeyFile, ctxKP,
385
386
                        }
386
387
 
387
388
                        m_secPassword.EnableProtection(bHide);
 
389
 
 
390
                        if(!m_bInitializing) UIUtil.SetFocus(m_tbPassword, this);
388
391
                }
389
392
 
390
393
                private void OnBtnOK(object sender, EventArgs e)