diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2020-04-16 11:28:32 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2020-04-16 14:31:08 +0200 |
| commit | 3c735207da6caf46925bb38737c47e9c4a3136be (patch) | |
| tree | 32f09a766722a15555a3edb227ebb121012ca481 | |
| parent | 261f7efdb39bdc05051a6a88aa06de66c6a0e008 (diff) | |
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>
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92358
| -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 6ba0b045c..d2ad138cb 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 89075fd16..0ec80f59f 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -942,7 +942,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" } }; |