Attachment 124300 Details for Bug 44163 – xdg-mime only return existing desktop files

[patch] xdg-mime only return existing desktop files

xdg-mime-return-existing-desktop-files.patch (text/plain), 1.15 KB, created by simon on 2016-06-03 07:26:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: simon

Created: 2016-06-03 07:26:18 UTC

Size: 1.15 KB

patch

obsolete

>commit 88deef3f4affa53680382540c2cd1ba9ce8e082d
>Author: Simon Lees <sflees@suse.de>
>Date:   Fri Jun 3 16:45:08 2016 +0930
>
>    xdg-mime only return desktop file for existing apps
>    
>    xdg-mime originally returned whatever was in the mimeapps.list
>    file, now it only returns the first desktop file that exists
>    and has a corrosponding binary that exists.
>    
>    fdo#44163
>
>diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
>index 61b12f1..4b0f2da 100644
>--- a/scripts/xdg-mime.in
>+++ b/scripts/xdg-mime.in
>@@ -372,8 +372,17 @@ check_mimeapps_list()
>     }
> ' "$mimeapps_list")
>             if [ -n "$result" ]; then
>-                echo "$result"
>-                exit_success
>+                # $result could be a ; separated list of .desktop files
>+                # use the first on the system
>+                IFS=\;
>+                for app in $result; do
>+                    IFS="$oldifs"
>+                    exists=$(desktop_file_to_binary "$app")
>+                    if [ -n "$exists" ]; then
>+                        echo "$app"
>+                        exit_success
>+                    fi
>+                done
>             fi
>         fi
>     done

Actions: View | Splinter Review

Attachments on bug 44163: 54838 | 124299 | 124300 | 127887 | 134577

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.