diff options
author | Jan Holesovsky <kendy@collabora.com> | 2020-04-16 11:28:32 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2020-04-16 12:43:37 +0200 |
commit | cf1cd4dd1d25651978dfc6c278e8f9923bba171a (patch) | |
tree | 11584d08cbf4a05afd23a8adab12752898452282 | |
parent | cypress: mobile: add test for text indent changes in Calc. (diff) | |
download | online-cf1cd4dd1d25651978dfc6c278e8f9923bba171a.tar.gz online-cf1cd4dd1d25651978dfc6c278e8f9923bba171a.zip |
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@gmail.com>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | wsd/LOOLWSD.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c29f10e086..725f137254 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 a8bfd4ad11..e40ec7a47a 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" } }; |