[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.15+dfsg-1-14-g7c4912d
Julian Taylor
jtaylor.debian at googlemail.com
Wed Apr 20 23:11:46 UTC 2011
The following commit has been merged in the master branch:
commit 3161e684df53764ddfb6356f042d005629113727
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Wed Apr 20 20:49:47 2011 +0200
add three new patches:
* 09_do-not-strip-leading-slash-from-command-line.patch
* 10_fix-single-instance-ipc-in-mono.patch
* 11_disable-multiple-instance-support.patch
diff --git a/debian/patches/09_do-not-strip-leading-slash-from-command-line.patch b/debian/patches/09_do-not-strip-leading-slash-from-command-line.patch
new file mode 100644
index 0000000..535ca14
--- /dev/null
+++ b/debian/patches/09_do-not-strip-leading-slash-from-command-line.patch
@@ -0,0 +1,33 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Wed, 20 Apr 2011 20:33:40 +0200
+Subject: do not strip leading slash from command line
+
+Applied-Upstream: 2.16
+---
+ KeePass/Util/CommandLineArgs.cs | 5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/KeePass/Util/CommandLineArgs.cs b/KeePass/Util/CommandLineArgs.cs
+index a62006c..4d0ef50 100644
+--- a/KeePass/Util/CommandLineArgs.cs
++++ b/KeePass/Util/CommandLineArgs.cs
+@@ -24,6 +24,8 @@ using System.Diagnostics;
+ using System.IO;
+ using System.Xml.Serialization;
+
++using KeePassLib.Native;
++
+ namespace KeePass.Util
+ {
+ public sealed class CommandLineArgs
+@@ -102,7 +104,8 @@ namespace KeePass.Util
+
+ if(str.StartsWith("--")) str = str.Remove(0, 2);
+ else if(str.StartsWith("-")) str = str.Remove(0, 1);
+- else if(str.StartsWith("/")) str = str.Remove(0, 1);
++ else if(str.StartsWith("/") && !NativeLib.IsUnix())
++ str = str.Remove(0, 1);
+ else return new KeyValuePair<string, string>(string.Empty, str);
+
+ int posDbl = str.IndexOf(':');
+--
diff --git a/debian/patches/10_fix-single-instance-ipc-in-mono.patch b/debian/patches/10_fix-single-instance-ipc-in-mono.patch
new file mode 100644
index 0000000..a304333
--- /dev/null
+++ b/debian/patches/10_fix-single-instance-ipc-in-mono.patch
@@ -0,0 +1,50 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Wed, 20 Apr 2011 20:28:10 +0200
+Subject: fix single instance ipc in mono
+
+Applied-Upstream: 2.16
+---
+ KeePass/Program.cs | 8 ++++++--
+ KeePass/Util/IpcBroadcast.cs | 2 +-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/KeePass/Program.cs b/KeePass/Program.cs
+index 9cd0417..36f41bc 100644
+--- a/KeePass/Program.cs
++++ b/KeePass/Program.cs
+@@ -346,7 +346,7 @@ namespace KeePass
+ #endif
+
+ try { m_nAppMessage = NativeMethods.RegisterWindowMessage(m_strWndMsgID); }
+- catch(Exception) { Debug.Assert(false); }
++ catch(Exception) { Debug.Assert(KeePassLib.Native.NativeLib.IsUnix()); }
+
+ if(m_cmdLineArgs[AppDefs.CommandLineOptions.ExitAll] != null)
+ {
+@@ -504,7 +504,11 @@ namespace KeePass
+
+ private static void ActivatePreviousInstance(string[] args)
+ {
+- if(m_nAppMessage == 0) { Debug.Assert(false); return; }
++ if((m_nAppMessage == 0) && !KeePassLib.Native.NativeLib.IsUnix())
++ {
++ Debug.Assert(false);
++ return;
++ }
+
+ try
+ {
+diff --git a/KeePass/Util/IpcBroadcast.cs b/KeePass/Util/IpcBroadcast.cs
+index 1bc7d3a..20f0522 100644
+--- a/KeePass/Util/IpcBroadcast.cs
++++ b/KeePass/Util/IpcBroadcast.cs
+@@ -143,7 +143,7 @@ namespace KeePass.Util
+ public delegate void CallPrivDelegate(int msg, int lParam);
+ private void CallPriv(int msg, int lParam)
+ {
+- Program.MainForm.ProcessAppMessage(new IntPtr(msg), new IntPtr(0));
++ Program.MainForm.ProcessAppMessage(new IntPtr(msg), new IntPtr(lParam));
+ }
+ }
+ }
+--
diff --git a/debian/patches/11_disable-multiple-instance-support.patch b/debian/patches/11_disable-multiple-instance-support.patch
new file mode 100644
index 0000000..5c8d47d
--- /dev/null
+++ b/debian/patches/11_disable-multiple-instance-support.patch
@@ -0,0 +1,39 @@
+From: Julian Taylor <jtaylor.debian at googlemail.com>
+Date: Wed, 20 Apr 2011 18:43:49 +0200
+Subject: disable multiple instance support
+
+ipc between them is broken
+---
+ KeePass/Forms/OptionsForm.cs | 4 ++--
+ KeePass/Program.cs | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
+index 68ef6d4..2292e5e 100644
+--- a/KeePass/Forms/OptionsForm.cs
++++ b/KeePass/Forms/OptionsForm.cs
+@@ -388,8 +388,8 @@ namespace KeePass.Forms
+ m_lvAdvanced.Groups.Add(lvg);
+ m_cdxAdvanced.CreateItem(Program.Config.Application.Start, "OpenLastFile",
+ m_lvAdvanced, lvg, KPRes.AutoRememberOpenLastFile);
+- m_cdxAdvanced.CreateItem(Program.Config.Integration, "LimitToSingleInstance",
+- m_lvAdvanced, lvg, KPRes.LimitSingleInstance);
++ //m_cdxAdvanced.CreateItem(Program.Config.Integration, "LimitToSingleInstance",
++ // m_lvAdvanced, lvg, KPRes.LimitSingleInstance);
+ m_cdxAdvanced.CreateItem(Program.Config.Application.Start, "CheckForUpdate",
+ m_lvAdvanced, lvg, KPRes.CheckForUpdAtStart);
+ m_cdxAdvanced.CreateItem(Program.Config.Application.Start, "MinimizedAndLocked",
+diff --git a/KeePass/Program.cs b/KeePass/Program.cs
+index 36f41bc..6008908 100644
+--- a/KeePass/Program.cs
++++ b/KeePass/Program.cs
+@@ -383,7 +383,7 @@ namespace KeePass
+ }
+
+ Mutex mSingleLock = TrySingleInstanceLock(AppDefs.MutexName, true);
+- if((mSingleLock == null) && m_appConfig.Integration.LimitToSingleInstance)
++ if((mSingleLock == null)) // && m_appConfig.Integration.LimitToSingleInstance)
+ {
+ ActivatePreviousInstance(args);
+ MainCleanUp();
+--
diff --git a/debian/patches/series b/debian/patches/series
index 46b1027..23940c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,6 @@
06_add-translation-search-paths.patch
07_fix-quicksearch-losing-results-on-defocus.patch
08_work-around-quicksearch-crash.patch
+09_do-not-strip-leading-slash-from-command-line.patch
+10_fix-single-instance-ipc-in-mono.patch
+11_disable-multiple-instance-support.patch
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list