From 9eac2e98feef1eb23dae4d3c2172bc20fde8ea79 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 27 Oct 2009 12:39:48 +0000 Subject: Perhaps it is smarter to just leave the CRLF in the patch file... --- truecrypt/build/truecrypt-6.3_diropen.patch | 86 ++++++++++++++--------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'truecrypt') diff --git a/truecrypt/build/truecrypt-6.3_diropen.patch b/truecrypt/build/truecrypt-6.3_diropen.patch index e84c5e7e..0a33a00f 100644 --- a/truecrypt/build/truecrypt-6.3_diropen.patch +++ b/truecrypt/build/truecrypt-6.3_diropen.patch @@ -1,46 +1,46 @@ ---- truecrypt-6.3-source.orig/Main/UserInterface.cpp 2009-10-21 15:11:12.000000000 +0200 +--- 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:26:44.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"); + // 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,34 @@ - catch (exception &e) { ShowError (e); } - } - } -+ if (desktop == L"XFCE") -+ { -+ args.push_back (string (path)); -+ try -+ { -+ Process::Execute ("thunar", args, 2000); -+ } -+ catch (TimeOut&) { } -+ catch (exception&) -+ { -+ try -+ { -+ Process::Execute ("xdg-open", args, 2000); -+ } -+ 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 - } - + catch (exception &e) { ShowError (e); } + } + } ++ if (desktop == L"XFCE") ++ { ++ args.push_back (string (path)); ++ try ++ { ++ Process::Execute ("thunar", args, 2000); ++ } ++ catch (TimeOut&) { } ++ catch (exception&) ++ { ++ try ++ { ++ Process::Execute ("xdg-open", args, 2000); ++ } ++ 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 + } + -- cgit v1.2.3