diff options
author | Eric Hameleers <alien@slackware.com> | 2009-10-27 12:02:06 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2009-10-27 12:02:06 +0000 |
commit | cd1f1a17088c9ac8377b05311da3346a78d2c732 (patch) | |
tree | a07ccb8b31f62bc9646ab0817399e96b5307ed7f /truecrypt | |
parent | 757f4fbec7bf1ccde5833782be5301e59ac91f32 (diff) | |
download | asb-cd1f1a17088c9ac8377b05311da3346a78d2c732.tar.gz asb-cd1f1a17088c9ac8377b05311da3346a78d2c732.tar.xz |
This is a better patch
Diffstat (limited to 'truecrypt')
-rw-r--r-- | truecrypt/build/truecrypt-6.3_diropen.patch | 37 |
1 files changed, 27 insertions, 10 deletions
diff --git a/truecrypt/build/truecrypt-6.3_diropen.patch b/truecrypt/build/truecrypt-6.3_diropen.patch index 2dc3745e..646dad77 100644 --- a/truecrypt/build/truecrypt-6.3_diropen.patch +++ b/truecrypt/build/truecrypt-6.3_diropen.patch @@ -1,11 +1,28 @@ ---- truecrypt-6.3-source.orig/Main/UserInterface.cpp 2009-10-21 15:11:12.000000000 +0200 -+++ truecrypt-6.3-source/Main/UserInterface.cpp 2009-10-27 12:33:27.000000000 +0100 -@@ -818,7 +818,7 @@ - args.push_back (string (path));
- try
- {
-- Process::Execute ("nautilus", args, 2000);
-+ Process::Execute ("xdg-open", args, 2000);
+--- truecrypt-6.3-source/Main/UserInterface.cpp.orig 2009-10-21 15:11:12.000000000 +0200 ++++ truecrypt-6.3-source/Main/UserInterface.cpp 2009-10-27 13:01:45.000000000 +0100 +@@ -811,7 +811,7 @@ + // MIME handler for directory seems to be unavailable through wxWidgets
+ wxString desktop = GetTraits()->GetDesktopEnvironment();
+
+- if (desktop == L"GNOME" || desktop.empty())
++ if (desktop == L"GNOME")
+ {
+ args.push_back ("--no-default-window");
+ args.push_back ("--no-desktop");
+@@ -844,6 +844,16 @@ + catch (exception &e) { ShowError (e); }
}
- catch (TimeOut&) { }
- catch (exception &e) { ShowError (e); }
+ }
++ else
++ {
++ args.push_back (string (path));
++ try
++ {
++ Process::Execute ("xdg-open", args, 2000);
++ }
++ catch (TimeOut&) { }
++ catch (exception &e) { ShowError (e); }
++ }
+ #endif
+ }
+
|