[Libreoffice-commits] online.git: configure.ac wsd/LOOLWSD.cpp

[Jan Holesovsky (via logerrit)]

 configure.ac    |    1 +
 wsd/LOOLWSD.cpp |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cf1cd4dd1d25651978dfc6c278e8f9923bba171a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Thu Apr 16 11:28:32 2020 +0200
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Apr 16 12:43:37 2020 +0200

    Welcome: Better default when the welcome.enabled is not present in config.
    
    Change-Id: Ia528f1cdf16af9b9724c31f9b1df8b51efb664fb
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92341
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/configure.ac b/configure.ac
index c29f10e08..725f13725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -601,6 +601,7 @@ AC_SUBST(MAX_DOCUMENTS)
 ENABLE_WELCOME_MESSAGE=false
 AS_IF([test "$enable_welcome_message" = "yes"],
       [ENABLE_WELCOME_MESSAGE="true"])
+AC_DEFINE_UNQUOTED([ENABLE_WELCOME_MESSAGE],["$ENABLE_WELCOME_MESSAGE"],[Should the Release notes message on startup should be enabled be default?])
 AC_SUBST(ENABLE_WELCOME_MESSAGE)
 
 VEREIGN_URL=
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index a8bfd4ad1..e40ec7a47 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -937,7 +937,7 @@ void LOOLWSD::initialize(Application& self)
             { "trace.path[@compress]", "true" },
             { "trace.path[@snapshot]", "false" },
             { "trace[@enable]", "false" },
-            { "welcome.enable", "true" },
+            { "welcome.enable", ENABLE_WELCOME_MESSAGE },
             { "welcome.path", "loleaflet/welcome" }
           };