Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Private/timar/config #10587

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Private/timar/config #10587

merged 3 commits into from
Nov 25, 2024

Conversation

timar
Copy link
Member

@timar timar commented Nov 22, 2024

Some cleanup wrt. welcome and home_mode.

Before the fix we got, e.g.
  ./configure: line 19348: linux-gnu: command not found

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I99b02b677a46de6a62625627e25bcc940fae410e
coolwsd-welcome.xml was not added to the tar.gz distribution
therefore in practice the <welcome> section was never added
to coolwsd.xml in release builds of Collabora Online.

The fix follows other examples, where the config fragment is
in configure.ac, not in separate file.

Also a little more explanation is added to the description of
the setting.

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: If30563ca515c9c9451e32d3baa75cf97c5888c52
- We got a query from a customer wrt. <home_mode> in coolwsd.xml.
  It is the best not to include this setting in COOL builds, because
  it is for CODE users. The condition in configure.ac is whether we
  define welcome URL. We define welcome URL for CODE builds only.
  (But it's a legacy that may be cleaned up in the future, because
  we do not use that welcome URL actually, not even in CODE. We
  replaced the remote welcome screen to internal welcome dialog
  long ago. We may find a better way to make disctinction in configure.ac
  between CODE and COOL builds.)
- The description of the setting was vague, probably it's not a secret,
  what it does.
- The feedback.show setting was unnecessary. It was never in coolwsd.xml.
  In COOL we don't have feedback URL, so feedback dialog is never
  displayed and there is no visible Send Feedback button (or menu item).
  In CODE home mode we suppress the feedback popup. By default we
  enable the feedback popup in CODE.

Signed-off-by: Andras Timar <andras.timar@collabora.com>
Change-Id: I158aede7c64f88ac3add843ff7ae9cca8b38aa94
@timar timar requested a review from vmiklos November 24, 2024 18:55
Copy link
Contributor

@vmiklos vmiklos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anything problematic with these changes, thanks.

@vmiklos vmiklos merged commit b8a1e77 into master Nov 25, 2024
13 checks passed
@vmiklos vmiklos deleted the private/timar/config branch November 25, 2024 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants