diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 18:12:47 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-07-04 11:12:56 +0200 |
| commit | 7383812ad0c49c2c05d35b0ac4f5622e29d4d13c (patch) | |
| tree | d4b7c0e6ef7d45761d01aa2d4ae58929e0699aa7 | |
| parent | 6e0eafe576436ec229c6d90f654ff1b11ff9bdfd (diff) | |
Revert "Workaround to call /app/bin/xdg-open when run under flatpak"
This reverts commit 28a03248b1d1649e157b788e43dfe8326f165379 (and removes a
stry empty line). There is no more need for our own /app/bin/xdg-open, as
xdg-open in the freedesktop.org (and thus also GNOME) runtime (see
<https://github.com/flatpak/flatpak-xdg-utils/blob/master/src/xdg-open.c>) by
now knows to ask the Desktop portal, too.
Change-Id: Ie4141d02ba5f43c0264afcfae9edfc2d3a8cdb16
(cherry picked from commit da5356b099c2504b3e9238f1afce410233847f9d)
Reviewed-on: https://gerrit.libreoffice.org/39483
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index def9d67cdae6..d76557ae2910 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -38,7 +38,6 @@ #include "uno/current_context.hxx" -#include <cstdlib> #include <string.h> #include <errno.h> #include <unistd.h> @@ -147,11 +146,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar aBuffer.append("open --"); #else // Just use xdg-open on non-Mac - if (std::getenv("LIBO_FLATPAK") != nullptr) { - aBuffer.append("/app/bin/xdg-open"); - } else { - aBuffer.append("/usr/bin/xdg-open"); - } + aBuffer.append("/usr/bin/xdg-open"); #endif aBuffer.append(" "); escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding())); |