Skip to content

[kcookiejar] Fix reading "Accept For Session" cookie setting

Wolfgang Bauer requested to merge wbauer/kio:master into master

Since commit 23874cab, the "Cookies" KCM writes the option as "Accept For Session" (with spaces), probably by accident, which broke reading the saved setting.
The KCM has been adjusted later on (in commit efeda6c1) to accept both spellings when loading the settings.

But the daemon itself still only understands "AcceptForSession" (without spaces), so it still asks the user what to do with cookies in this case.

This patch applies the same fix to the daemon, so that changing the setting in the KCM actually works as expected.

CCBUG: 386325

Test Plan:

  • Open Konqueror's "Cookies" settings, choose "Accept For Session", click OK (maybe verify that ~/.config/kcookiejarrc contains the line "CookieGlobalAdvice=Accept For Session", with spaces)
  • Open a site that uses cookies, e.g. https://panopticlick.eff.org/, in Konqueror

Without this patch you still got asked what to do with the cookies, now they are silently accepted.
Still works the same with "CookieGlobalAdvice=AcceptForSession" (without spaces) in kcookiejarrc too.

Edited by Wolfgang Bauer

Merge request reports