diff options
| author |   Eric Hameleers <alien@slackware.com> | 2010-07-21 17:25:11 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2010-07-21 17:25:11 +0000 |
| commit | ae2f9ecea84e043269841bf81ab335f9bc45ba3d (patch) | |
| tree | a2dad430753a1e036b6dec9a71a35604c7af398a /truecrypt | |
| parent | 6db2ce7a6726d1bb0465c710bfe02ed680ae4b29 (diff) | |
| download | asb-ae2f9ecea84e043269841bf81ab335f9bc45ba3d.tar.gz asb-ae2f9ecea84e043269841bf81ab335f9bc45ba3d.tar.xz | |
Initial revision
Diffstat (limited to 'truecrypt')
| -rw-r--r-- | truecrypt/build/truecrypt-7.0_diropen.patch | 47 | ||||
| -rw-r--r-- | truecrypt/build/truecrypt-7.0_umount.patch | 27 |
2 files changed, 74 insertions, 0 deletions
diff --git a/truecrypt/build/truecrypt-7.0_diropen.patch b/truecrypt/build/truecrypt-7.0_diropen.patch new file mode 100644 index 00000000..730b560f --- /dev/null +++ b/truecrypt/build/truecrypt-7.0_diropen.patch @@ -0,0 +1,47 @@ +diff -uar truecrypt-6.3a-source.orig/Main/UserInterface.cpp truecrypt-6.3a-source/Main/UserInterface.cpp +--- truecrypt-6.3a-source.orig/Main/UserInterface.cpp 2009-11-22 16:10:08.000000000 +0100 ++++ truecrypt-6.3a-source/Main/UserInterface.cpp 2010-04-04 16:36:49.000000000 +0200 +@@ -812,7 +812,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"); +@@ -845,6 +845,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.0_umount.patch b/truecrypt/build/truecrypt-7.0_umount.patch new file mode 100644 index 00000000..7de2b346 --- /dev/null +++ b/truecrypt/build/truecrypt-7.0_umount.patch @@ -0,0 +1,27 @@ +diff -uar truecrypt-6.3a-source.orig/Core/Unix/Linux/CoreLinux.cpp truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp +--- truecrypt-6.3a-source.orig/Core/Unix/Linux/CoreLinux.cpp 2009-11-22 16:09:54.000000000 +0100 ++++ truecrypt-6.3a-source/Core/Unix/Linux/CoreLinux.cpp 2010-04-04 16:47:42.000000000 +0200 +@@ -90,13 +90,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; + } |