GNU bug report logs - #49986
Valid .desktop files

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49986 in the body.
You can then email your comments to 49986 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Peter Oliver <p.d.oliver <at> mavit.org.uk>
To: bug-gnu-emacs <at> gnu.org
Subject: Valid .desktop files
Date: Tue, 10 Aug 2021 21:13:23 +0100 (BST)

[Message part 1 (text/plain, inline)]

Here are three patches related to our .desktop files.  Two improve adherence to the Freedesktop.org Desktop Entry Specification, and one improves convenience for users.

Thanks.

-- 
Peter Oliver

[0001-Valid-quoting-in-.desktop-files.patch (text/plain, attachment)]

[0002-Hint-that-emacsclient.desktop-should-match-a-search-.patch (text/plain, attachment)]

[0003-Drop-redundant-keywords-in-.desktop-files.patch (text/plain, attachment)]

Message #8 received at 49986 <at> debbugs.gnu.org (full text, mbox):

From: Peter Oliver <p.d.oliver <at> mavit.org.uk>
To: Peter Münster <pm <at> a16n.net>, 49986 <at> debbugs.gnu.org
Subject: Re: bug#49986: Valid .desktop files
Date: Tue, 10 Aug 2021 22:30:31 +0100 (BST)

[Message part 1 (text/plain, inline)]

On Tue, 10 Aug 2021, Peter Münster wrote:

> "echo"?
>
> I guess, that was for testing... ;)

Thanks, indeed so.  A fixed version is attached.

-- 
Peter Oliver

[0001-Valid-quoting-in-.desktop-files.patch (text/plain, ATTACHMENT)]

From a301cae39f82ceb4af4d9c174cd6b7b8b6342326 Mon Sep 17 00:00:00 2001
From: Peter Oliver <git <at> mavit.org.uk>
Date: Wed, 7 Jul 2021 22:04:01 +0100
Subject: [PATCH 1/3] Valid quoting in .desktop files

* etc/emacsclient.desktop, emacsclient-mail.desktop (Exec): Quote
according to the rules in the Freedesktop.org Desktop Entry
Specification.
---
 etc/emacsclient-mail.desktop | 4 ++--
 etc/emacsclient.desktop      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/emacsclient-mail.desktop b/etc/emacsclient-mail.desktop
index 8d51dcdd2f..f96e8a3c97 100644
--- a/etc/emacsclient-mail.desktop
+++ b/etc/emacsclient-mail.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Categories=Network;Email;
 Comment=GNU Emacs is an extensible, customizable text editor - and more
-Exec=sh -c 'exec emacsclient --alternate-editor= --display="$DISPLAY" --eval "(message-mailto \"%u\")"'
+Exec=sh -c "exec emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" --eval \\\\(message-mailto\\\\ \\\\\\"%u\\\\\\"\\\\)"
 Icon=emacs
 Name=Emacs (Mail, Client)
 MimeType=x-scheme-handler/mailto;
@@ -12,7 +12,7 @@ Actions=new-window;new-instance;
 
 [Desktop Action new-window]
 Name=New Window
-Exec=emacsclient --alternate-editor= --create-frame --eval '(message-mailto "%u")'
+Exec=emacsclient --alternate-editor= --create-frame --eval "(message-mailto \\"%u\\")"
 
 [Desktop Action new-instance]
 Name=New Instance
diff --git a/etc/emacsclient.desktop b/etc/emacsclient.desktop
index cd45463093..0feec67da5 100644
--- a/etc/emacsclient.desktop
+++ b/etc/emacsclient.desktop
@@ -3,7 +3,7 @@ Name=Emacs (Client)
 GenericName=Text Editor
 Comment=Edit text
 MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=sh -c 'if [ -n "$*" ]; then exec emacsclient --alternate-editor= --display="$DISPLAY" "$@"; else exec emacsclient --alternate-editor= --create-frame; fi' placeholder %F
+Exec=sh -c "if [ -n \\"\\$*\\" ]; then exec emacsclient --alternate-editor= --display=\\"\\$DISPLAY\\" \\"\\$@\\"; else exec emacsclient --alternate-editor= --create-frame; fi" placeholder %F
 Icon=emacs
 Type=Application
 Terminal=false
-- 
2.31.1

Message #11 received at 49986 <at> debbugs.gnu.org (full text, mbox):

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Peter Oliver <p.d.oliver <at> mavit.org.uk>
Cc: Peter Münster <pm <at> a16n.net>, 49986 <at> debbugs.gnu.org
Subject: Re: bug#49986: Valid .desktop files
Date: Wed, 11 Aug 2021 14:05:41 +0200

Peter Oliver <p.d.oliver <at> mavit.org.uk> writes:

> On Tue, 10 Aug 2021, Peter Münster wrote:
>
>> "echo"?
>>
>> I guess, that was for testing... ;)
>
> Thanks, indeed so.  A fixed version is attached.

Thanks; all three patches applied to Emacs 28.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.