diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-18 18:51:50 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-07-18 23:38:47 +0200 |
| commit | 8180b6801dca2052a9d40411f9bbdcc96198c52f (patch) | |
| tree | 067df2a87d2d5642d799359b2322f5c472d5d466 | |
| parent | eff84b958c54985e0b81c44b2cd81722abeb9320 (diff) | |
tdf#109194 cleanse startup notification foo from env
So when the desktop environment does startup notification, this
DESKTOP_STARTUP_ID gets passed on to the launched application.
Problem is, XDG spec says app should read it from the env, then
discard - which LibreOffice never does.
When passed on to child processes, funny effects might ensue, so
let's just erase this at the end of VCL init, when I'm reasonably
sure every gtk/kde/whatnot backend did read it.
Change-Id: I1f758c7a02455028d2b520c144ffe32538621f19
Reviewed-on: https://gerrit.libreoffice.org/40153
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
| -rw-r--r-- | vcl/source/app/svmain.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 2264c8424ebf..325eef803b9a 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -57,6 +57,8 @@ #include <svsys.h> #include <process.h> #include <ole2.h> +#else +#include <stdlib.h> #endif #ifdef ANDROID @@ -362,6 +364,12 @@ bool InitVCL() DebugEventInjector::getCreate(); #endif +#ifndef _WIN32 + // Clear startup notification details for child processes + // See https://bugs.freedesktop.org/show_bug.cgi?id=11375 for discussion + unsetenv("DESKTOP_STARTUP_ID"); +#endif + return true; } |