diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 18:12:47 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-07-03 18:17:21 +0200 |
| commit | da5356b099c2504b3e9238f1afce410233847f9d (patch) | |
| tree | cbf5bc0bf312a8be2060ef03028b34dd4bdc58bd /shell/source | |
| parent | 6845c370a7371a142458fc18716687d6c97d397a (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
Diffstat (limited to 'shell/source')
| -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 1fd5230fcf93..bd8d51c0be3e 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -37,7 +37,6 @@ #include "uno/current_context.hxx" -#include <cstdlib> #include <string.h> #include <errno.h> #include <unistd.h> @@ -146,11 +145,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())); |