diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 11:57:29 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-04-01 11:57:54 +0200 |
commit | c906657cc0ff58e22ef2950878aa32b34cb71a99 (patch) | |
tree | e03f891fba73aa6f915f4e81f56ecbdab320f497 | |
parent | 131a8d2bfa6263a1817fca6a39c1664ff82a80bc (diff) |
HAVE_FEATURE_MACOSX_SANDBOX doesn't initiate IPC in RequestHandler::Enable
...so cannot return with IPC_STATUS_PIPE_ERROR anyway
Change-Id: If98bcc9b7cc1fbcc367e50759be0e8d6003d941b
-rw-r--r-- | desktop/source/app/app.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 99ddb0a477ac..cee382f6cf51 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -577,16 +577,8 @@ void Desktop::Init() RequestHandler::Status aStatus = RequestHandler::Enable(true); if ( aStatus == RequestHandler::IPC_STATUS_PIPE_ERROR ) { -#if HAVE_FEATURE_MACOSX_SANDBOX - // In a sandboxed LO, on 10.8.2 at least, creating the - // Unix domain socket fails. Ignore that as hopefully - // people running a sandboxed LO won't attempt starting it - // from the command-line or otherwise in tricky ways, so - // the normal OS X mechanism that prevents multiple - // instances of an app from being started should work - // fine. I hope. -#elif defined ANDROID - // Ignore crack pipe errors on Android, too +#if defined ANDROID + // Ignore crack pipe errors on Android #else // Keep using this oddly named BE_PATHINFO_MISSING value // for pipe-related errors on other platforms. Of course |