diff options
| author |   Eric Hameleers <alien@slackware.com> | 2011-09-22 09:44:08 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2011-09-22 09:44:08 +0000 |
| commit | 89fb5b400721cc8a642694da8698af3e01ed4749 (patch) | |
| tree | 8b662c32ac4e9c21756025d454a70cd4ae12fdd6 /truecrypt | |
| parent | 1d45ec61fdd99cc92e30d52cc13d5e47516a757f (diff) | |
| download | asb-89fb5b400721cc8a642694da8698af3e01ed4749.tar.gz asb-89fb5b400721cc8a642694da8698af3e01ed4749.tar.xz | |
Initial revision
Diffstat (limited to 'truecrypt')
| -rw-r--r-- | truecrypt/build/truecrypt-7.1_diropen.patch | 47 | ||||
| -rw-r--r-- | truecrypt/build/truecrypt-7.1_umount.patch | 27 |
2 files changed, 74 insertions, 0 deletions
diff --git a/truecrypt/build/truecrypt-7.1_diropen.patch b/truecrypt/build/truecrypt-7.1_diropen.patch new file mode 100644 index 00000000..b0036af2 --- /dev/null +++ b/truecrypt/build/truecrypt-7.1_diropen.patch @@ -0,0 +1,47 @@ +diff -uarN truecrypt-7.1-source.orig/Main/UserInterface.cpp truecrypt-7.1-source/Main/UserInterface.cpp +--- truecrypt-7.1-source.orig/Main/UserInterface.cpp 2011-09-01 15:15:42.000000000 +0200 ++++ truecrypt-7.1-source/Main/UserInterface.cpp 2011-09-22 11:33:15.731105392 +0200 +@@ -828,7 +828,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"); +@@ -861,6 +861,34 @@ + catch (exception &e) { ShowError (e); } + } + } ++ else 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 + } + diff --git a/truecrypt/build/truecrypt-7.1_umount.patch b/truecrypt/build/truecrypt-7.1_umount.patch new file mode 100644 index 00000000..df241933 --- /dev/null +++ b/truecrypt/build/truecrypt-7.1_umount.patch @@ -0,0 +1,27 @@ +diff -uarN truecrypt-7.1-source.orig/Core/Unix/Linux/CoreLinux.cpp truecrypt-7.1-source/Core/Unix/Linux/CoreLinux.cpp +--- truecrypt-7.1-source.orig/Core/Unix/Linux/CoreLinux.cpp 2011-09-01 15:15:42.000000000 +0200 ++++ truecrypt-7.1-source/Core/Unix/Linux/CoreLinux.cpp 2011-09-22 11:42:40.619115300 +0200 +@@ -91,13 +91,23 @@ + void CoreLinux::DetachLoopDevice (const DevicePath &devicePath) const + { + list <string> args; ++ list <string> args2; + args.push_back ("-d"); + args.push_back (devicePath); ++ /* args2 needed to umount loop device before detaching it ++ * by Enrico Lo Tauro (neongen) ++ */ ++ args2.push_back (devicePath); + + for (int t = 0; true; t++) + { + try + { ++ try ++ { ++ Process::Execute ("umount", args2); ++ } ++ catch (ExecutedProcessFailed&) { } + Process::Execute ("losetup", args); + break; + } |