summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-07-05 18:43:25 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-07-05 18:43:25 +0200
commit28a03248b1d1649e157b788e43dfe8326f165379 (patch)
tree685d747ac36846f53ce5ed601db2087078068790
parent9fee132c18b658c9ea9fb1114c1fefa56b57532a (diff)
Workaround to call /app/bin/xdg-open when run under flatpak
LibreOffice wants to open URLs by calling /usr/bin/xdg-open, which the flatpak org.gnome.Platform runtime does not provide. However, <https://github.com/flatpak/xdg-desktop-portal> will provide a Desktop portal through which an application can make an OpenURI request. So the idea is to include a fake xdg-open application in the LO flatpak, that will use gdbus to call that portal. However, I see no way to make the LO flatpak provide that as /usr/bin/xdg-open, so instead provide it as /app/bin/xdg-open and hack LO to use that path when run under flatpak (where the LIBO_FLATPAK environment variable is already used for the OfficeIPCThread). Change-Id: I63bc0bfb937ef767958ba4d34b0c3653e38ec868
-rw-r--r--shell/source/unix/exec/shellexec.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx
index cb9f2e53effe..7f12a80b76ef 100644
--- a/shell/source/unix/exec/shellexec.cxx
+++ b/shell/source/unix/exec/shellexec.cxx
@@ -37,6 +37,7 @@
#include "uno/current_context.hxx"
+#include <cstdlib>
#include <string.h>
#include <errno.h>
#include <unistd.h>
@@ -153,8 +154,11 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar
aBuffer.append("open --");
#else
// Just use xdg-open on non-Mac
-
- aBuffer.append("/usr/bin/xdg-open");
+ if (std::getenv("LIBO_FLATPAK") != nullptr) {
+ aBuffer.append("/app/bin/xdg-open");
+ } else {
+ aBuffer.append("/usr/bin/xdg-open");
+ }
#endif
aBuffer.append(" ");
escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding()));