[Libreoffice-commits] core.git: desktop/source desktop/unx distro-configs/LibreOfficeFlatpak.conf distro-configs/LibreOfficeXdgApp.conf

[Stephan Bergmann]

 desktop/source/app/officeipcthread.cxx |    2 -
 desktop/unx/source/start.c             |    2 -
 distro-configs/LibreOfficeFlatpak.conf |   44 +++++++++++++++++++++++++++++++++
 distro-configs/LibreOfficeXdgApp.conf  |   44 ---------------------------------
 4 files changed, 46 insertions(+), 46 deletions(-)

New commits:
commit 982b887bf9686b8b02960aae7dcc38a3b7c49ea8
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed May 11 10:02:26 2016 +0200

    xdg-app got renamed to Flatpak
    
    Change-Id: Ib5ea4ad5b6033ee1634ea2f245742f862a40042d

diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index e9feb5c..75bd51e 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -730,7 +730,7 @@ RequestHandler::Status RequestHandler::Enable(bool ipc)
     enum class Kind { Pipe, Dbus };
     Kind kind = Kind::Pipe;
 #if ENABLE_DBUS
-    if (std::getenv("LIBO_XDGAPP") != nullptr) {
+    if (std::getenv("LIBO_FLATPAK") != nullptr) {
         kind = Kind::Dbus;
     }
 #endif
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index 3b23124..893c79c 100644
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -757,7 +757,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS( argc, argv )
     if ( pUsePlugin && !strcmp(pUsePlugin, "svp") )
         args->bInhibitSplash = sal_True;
 
-    if ( !args->bInhibitPipe && getenv("LIBO_XDGAPP") == NULL )
+    if ( !args->bInhibitPipe && getenv("LIBO_FLATPAK") == NULL )
     {
         int fd = 0;
         pPipePath = get_pipe_path( args->pAppPath );
diff --git a/distro-configs/LibreOfficeXdgApp.conf b/distro-configs/LibreOfficeFlatpak.conf
similarity index 96%
rename from distro-configs/LibreOfficeXdgApp.conf
rename to distro-configs/LibreOfficeFlatpak.conf
index 28a4d31..d5d6686 100644
--- a/distro-configs/LibreOfficeXdgApp.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -1,6 +1,6 @@
 --disable-odk
 --enable-release-build
---with-extra-buildid=xdg-app version
+--with-extra-buildid=Flatpak version
 --with-lang=ALL
 --with-system-libs
 --with-vendor=The Document Foundation