New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
keepass: 2.40 -> 2.45 #88157
Merged
Merged
keepass: 2.40 -> 2.45 #88157
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,23 @@ | ||
From 830d0db80f2fce09e12c117f8338b8e4b05866ff Mon Sep 17 00:00:00 2001 | ||
From: Pascal Winkelmann <pascal@wnklmnn.de> | ||
Date: Tue, 19 May 2020 10:28:31 +0200 | ||
Subject: [PATCH] fixpaths | ||
|
||
--- | ||
KeePass/Native/NativeMethods.Unix.cs | 2 +- | ||
KeePass/UI/UISystemFonts.cs | 2 +- | ||
KeePass/Util/AppLocator.cs | 2 +- | ||
KeePass/Util/ClipboardUtil.Unix.cs | 14 +++++++------- | ||
KeePassLib/Native/ClipboardU.cs | 2 +- | ||
KeePassLib/Native/NativeLib.cs | 2 +- | ||
KeePassLib/Utility/MonoWorkarounds.cs | 4 ++-- | ||
7 files changed, 14 insertions(+), 14 deletions(-) | ||
|
||
diff --git a/KeePass/Native/NativeMethods.Unix.cs b/KeePass/Native/NativeMethods.Unix.cs | ||
index 7495a1c..4ef4727 100644 | ||
index 4c47258..79cfdb2 100644 | ||
--- a/KeePass/Native/NativeMethods.Unix.cs | ||
+++ b/KeePass/Native/NativeMethods.Unix.cs | ||
@@ -128,7 +128,7 @@ namespace KeePass.Native | ||
@@ -130,7 +130,7 @@ namespace KeePass.Native | ||
try | ||
{ | ||
Application.DoEvents(); // E.g. for clipboard updates | ||
|
@@ -11,10 +26,54 @@ index 7495a1c..4ef4727 100644 | |
Application.DoEvents(); // E.g. for clipboard updates | ||
return (strOutput ?? string.Empty); | ||
} | ||
diff --git a/KeePass/UI/UISystemFonts.cs b/KeePass/UI/UISystemFonts.cs | ||
index 08d6134..2bfa4a2 100644 | ||
--- a/KeePass/UI/UISystemFonts.cs | ||
+++ b/KeePass/UI/UISystemFonts.cs | ||
@@ -188,7 +188,7 @@ namespace KeePass.UI | ||
|
||
private static void UbuntuLoadFonts() | ||
{ | ||
- string strDef = NativeLib.RunConsoleApp("gsettings", | ||
+ string strDef = NativeLib.RunConsoleApp("@gsettings@", | ||
"get org.gnome.desktop.interface font-name"); | ||
if(strDef == null) return; | ||
|
||
diff --git a/KeePass/Util/AppLocator.cs b/KeePass/Util/AppLocator.cs | ||
index af02803..8a32c9d 100644 | ||
--- a/KeePass/Util/AppLocator.cs | ||
+++ b/KeePass/Util/AppLocator.cs | ||
@@ -429,7 +429,7 @@ namespace KeePass.Util | ||
if(NativeLib.GetPlatformID() == PlatformID.MacOSX) | ||
strArgPrefix = string.Empty; // FR 3535696 | ||
|
||
- string str = NativeLib.RunConsoleApp("whereis", strArgPrefix + strApp); | ||
+ string str = NativeLib.RunConsoleApp("@whereis@", strArgPrefix + strApp); | ||
if(str == null) return null; | ||
|
||
str = str.Trim(); | ||
diff --git a/KeePass/Util/ClipboardUtil.Unix.cs b/KeePass/Util/ClipboardUtil.Unix.cs | ||
index e93a22a..3fd9a2b 100644 | ||
index ab49ee2..7f6c50f 100644 | ||
--- a/KeePass/Util/ClipboardUtil.Unix.cs | ||
+++ b/KeePass/Util/ClipboardUtil.Unix.cs | ||
@@ -42,7 +42,7 @@ namespace KeePass.Util | ||
// string strGtk = GtkGetString(); | ||
// if(strGtk != null) return strGtk; | ||
|
||
- return (NativeLib.RunConsoleApp("pbpaste", "-pboard general") ?? | ||
+ return (NativeLib.RunConsoleApp("@pbpaste@", "-pboard general") ?? | ||
string.Empty); | ||
} | ||
|
||
@@ -50,7 +50,7 @@ namespace KeePass.Util | ||
{ | ||
// if(GtkSetString(str)) return; | ||
|
||
- NativeLib.RunConsoleApp("pbcopy", "-pboard general", str); | ||
+ NativeLib.RunConsoleApp("@pbcopy@", "-pboard general", str); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Neither is this. |
||
} | ||
|
||
private static string GetStringU() | ||
@@ -62,7 +62,7 @@ namespace KeePass.Util | ||
// "-out -selection clipboard"); | ||
// if(str != null) return str; | ||
|
@@ -51,20 +110,33 @@ index e93a22a..3fd9a2b 100644 | |
return; | ||
} | ||
diff --git a/KeePassLib/Native/ClipboardU.cs b/KeePassLib/Native/ClipboardU.cs | ||
index ddd8f57..150eb82 100644 | ||
index 291c51d..3c76380 100644 | ||
--- a/KeePassLib/Native/ClipboardU.cs | ||
+++ b/KeePassLib/Native/ClipboardU.cs | ||
@@ -27,7 +27,7 @@ namespace KeePassLib.Native | ||
{ | ||
internal static class ClipboardU | ||
{ | ||
- private const string XSel = "xsel"; | ||
+ private const string XSel = "@xsel@"; | ||
- internal const string XSel = "xsel"; | ||
+ internal const string XSel = "@xsel@"; | ||
private const string XSelV = "--version"; | ||
private const string XSelR = "--output --clipboard"; | ||
private const string XSelC = "--clear --clipboard"; | ||
diff --git a/KeePassLib/Native/NativeLib.cs b/KeePassLib/Native/NativeLib.cs | ||
index 2d227a3..243f4ee 100644 | ||
--- a/KeePassLib/Native/NativeLib.cs | ||
+++ b/KeePassLib/Native/NativeLib.cs | ||
@@ -145,7 +145,7 @@ namespace KeePassLib.Native | ||
// Mono returns PlatformID.Unix on Mac OS X, workaround this | ||
if(m_platID.Value == PlatformID.Unix) | ||
{ | ||
- if((RunConsoleApp("uname", null) ?? string.Empty).Trim().Equals( | ||
+ if((RunConsoleApp("@uname@", null) ?? string.Empty).Trim().Equals( | ||
"Darwin", StrUtil.CaseIgnoreCmp)) | ||
m_platID = PlatformID.MacOSX; | ||
} | ||
diff --git a/KeePassLib/Utility/MonoWorkarounds.cs b/KeePassLib/Utility/MonoWorkarounds.cs | ||
index 0da7019..f6a1022 100644 | ||
index e20bb3a..4fd875b 100644 | ||
--- a/KeePassLib/Utility/MonoWorkarounds.cs | ||
+++ b/KeePassLib/Utility/MonoWorkarounds.cs | ||
@@ -41,7 +41,7 @@ namespace KeePassLib.Utility | ||
|
@@ -76,7 +148,7 @@ index 0da7019..f6a1022 100644 | |
|
||
private static Dictionary<uint, bool> g_dForceReq = new Dictionary<uint, bool>(); | ||
private static Thread g_thFixClip = null; | ||
@@ -303,7 +303,7 @@ namespace KeePassLib.Utility | ||
@@ -335,7 +335,7 @@ namespace KeePassLib.Utility | ||
// } | ||
// else { Debug.Assert(false); } | ||
|
||
|
@@ -85,3 +157,6 @@ index 0da7019..f6a1022 100644 | |
"-id " + strHandle + " WM_CLASS") ?? string.Empty); | ||
|
||
if(strWmClass.IndexOf("\"" + PwDefs.ResClass + "\"", | ||
-- | ||
2.25.4 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,25 @@ | ||
From 4cb0b18f5326a07927453897180289a4b254ac4f Mon Sep 17 00:00:00 2001 | ||
From: Pascal Winkelmann <pascal@wnklmnn.de> | ||
Date: Tue, 19 May 2020 10:43:49 +0200 | ||
Subject: [PATCH] loadplugin | ||
|
||
--- | ||
KeePass/Forms/MainForm.cs | 2 +- | ||
1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
||
diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs | ||
index 3d5fca0..4c3f3d4 100644 | ||
index 347eaf5..b92e1e2 100644 | ||
--- a/KeePass/Forms/MainForm.cs | ||
+++ b/KeePass/Forms/MainForm.cs | ||
@@ -406,7 +406,$OUTPUT_LC$ @@ namespace KeePass.Forms | ||
m_pluginManager.Initialize(m_pluginDefaultHost); | ||
@@ -440,7 +440,7 @@ namespace KeePass.Forms | ||
ToolStripItemCollection tsicT = m_ctxTray.Items; | ||
ToolStripItem tsiPrevT = m_ctxTrayOptions; | ||
|
||
m_pluginManager.UnloadAllPlugins(); | ||
- if(AppPolicy.Current.Plugins) m_pluginManager.LoadAllPlugins(); | ||
- m_pluginManager.LoadAllPlugins(); | ||
$DO_LOADS$+ | ||
|
||
// Delete old files *after* loading plugins (when timestamps | ||
// of loaded plugins have been updated already) | ||
m_pluginManager.AddMenuItems(PluginMenuType.Main, tsicM, tsiPrevM); | ||
m_pluginManager.AddMenuItems(PluginMenuType.Group, tsicGM, tsiPrevGM); | ||
-- | ||
2.25.4 | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is never substituted, is it?