Kaydet (Commit) da5356b0 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Revert "Workaround to call /app/bin/xdg-open when run under flatpak"

This reverts commit 28a03248 (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
üst 6845c370
......@@ -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()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment