← Back to branch summary

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

« back to all changes in this revision

Viewing changes to KeePass/Ecas/EcasUtil.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/Ecas/EcasUtil.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
100
100
 
101
101
                        if(bSprCompile && !string.IsNullOrEmpty(str))
102
102
                        {
103
 
                                PwDatabase pd = null;
104
 
                                try { pd = Program.MainForm.ActiveDatabase; }
105
 
                                catch(Exception) { Debug.Assert(false); }
106
 
 
107
103
                                PwEntry pe = null;
108
104
                                try { pe = Program.MainForm.GetSelectedEntry(false); }
109
105
                                catch(Exception) { Debug.Assert(false); }
110
106
 
111
 
                                str = SprEngine.Compile(str, false, pe, pd, false, bSprForCommandLine);
 
107
                                PwDatabase pd = Program.MainForm.DocumentManager.SafeFindContainerOf(pe);
 
108
 
 
109
                                str = SprEngine.Compile(str, new SprContext(pe, pd,
 
110
                                        SprCompileFlags.All, false, bSprForCommandLine));
112
111
                        }
113
112
 
114
113
                        return str;