From dc7675340d11c55d7cc7ffde87adefbc869a25ab Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Fri, 22 Sep 2023 13:36:34 +0200 Subject: xdg-settings: read KDE browser settings the right way around prefer the modern setting and if that is not available fall back to the legacy setting. this ensures that clients can correctly identify the "modern" default browser rather than the legacy one (there is opportunity for disagreement between the two settings because of the defect fixed in d11b33ec7f24cfb1546f6b459611d440013bdc72) --- scripts/xdg-settings.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/xdg-settings.in b/scripts/xdg-settings.in index ed3554c..59e97cb 100755 --- a/scripts/xdg-settings.in +++ b/scripts/xdg-settings.in @@ -205,10 +205,11 @@ resolve_kde_browser_desktop() read_kde_browser() { - ret=`read_kde_config kdeglobals General BrowserApplication` + # since Plasma >= 5.19 + ret=`get_browser_mime "x-scheme-handler/http"` if [ -z "$ret" ]; then - # since Plasma >= 5.19 - ret=`get_browser_mime "x-scheme-handler/http"` + # older Plasma versions + ret=`read_kde_config kdeglobals General BrowserApplication` fi echo $ret -- cgit v1.2.3