File fix-kde-browser-check.patch of Package xdg-utils

Overview Repositories Revisions Requests Users Attributes Meta

File fix-kde-browser-check.patch of Package xdg-utils (Revision cefbf35aad0159d2fa878e91d227bc29)

Currently displaying revision cefbf35aad0159d2fa878e91d227bc29 , Show latest

Index: xdg-utils-20160610/scripts/xdg-settings.in
===================================================================
--- xdg-utils-20160610.orig/scripts/xdg-settings.in
+++ xdg-utils-20160610/scripts/xdg-settings.in
@@ -226,6 +226,14 @@ check_browser_kde()
     fi
     browser="`read_kde_browser`"
     binary="`resolve_kde_browser`"
+
+    # The browser may contain a relative entry to the binary starting with !
+    if [ x"!" == x"${browser:0:1}" ]; then
+        # get the full path
+        browser="`binary_to_desktop_file ${browser:1}`"
+        binary="`desktop_file_to_binary $browser`"
+    fi
+
     # Because KDE will use the handler for MIME type text/html if this value
     # is empty, we allow either the empty string or a match to $check here.
     if [ x"$binary" != x -a x"$binary" != x"$check" ]; then
@@ -575,16 +583,23 @@ check_url_scheme_handler_kde()
     fi
     if [ x"$1" = "mailto" ]; then
         binary="`read_kde_config emaildefaults PROFILE_Default EmailClient`"
+        # The field may contain a relative entry to the binary starting with !
+        if [ x"!" == x"${binary:0:1}" ]; then
+            # get the full path
+            desktop_file="`binary_to_desktop_file ${binary:1}`"
+            binary="`desktop_file_to_binary $desktop_file`"
+        fi
+        if [ x"$binary" != x"$check" ]; then
+            echo no
+            exit_success
+        fi
+    else
+        handler="`get_browser_mime x-scheme-handler/$1`"
+        binary="`desktop_file_to_binary "$handler"`"
         if [ x"$binary" != x"$check" ]; then
             echo no
             exit_success
         fi
-    fi
-    handler="`get_browser_mime x-scheme-handler/$1`"
-    binary="`desktop_file_to_binary "$handler"`"
-    if [ x"$binary" != x"$check" ]; then
-        echo no
-        exit_success
     fi
     echo yes
     exit_success

Places

File fix-kde-browser-check.patch of Package xdg-utils (Revision cefbf35aad0159d2fa878e91d227bc29)

Places