midori.desktop.in format fix

Bug #1117543 reported by Samuli Suominen
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Midori Web Browser
Fix Released
Undecided
Unassigned

Bug Description

Need X- to be a "valid" desktop file:

/usr/share/applications/midori.desktop: error: file contains group "Private Shortcut Group", but groups extending the format should start with "X-"
/usr/share/applications/midori.desktop: error: file contains group "TabNew Shortcut Group", but groups extending the format should start with "X-"
/usr/share/applications/midori.desktop: error: file contains group "WindowNew Shortcut Group", but groups extending the format should start with "X-"

from `desktop-file-validate` command using latest desktop-file-utils (so it's using latest spec, or is supposed to)

easy fix, don't see a problem with:

--- data/midori.desktop.in
+++ data/midori.desktop.in
@@ -17,17 +17,17 @@
 X-Osso-Service=midori
 X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private

-[TabNew Shortcut Group]
+[X-TabNew Shortcut Group]
 _Name=New Tab
 Exec=midori -e TabNew
 TargetEnvironment=Unity

-[WindowNew Shortcut Group]
+[X-WindowNew Shortcut Group]
 _Name=New Window
 Exec=midori -e WindowNew
 TargetEnvironment=Unity

-[Private Shortcut Group]
+[X-Private Shortcut Group]
 _Name=New Private Browsing Window
 Exec=midori --private
 TargetEnvironment=Unity

Revision history for this message
Samuli Suominen (ssuominen) wrote :

One more, for this:

 * /usr/share/applications/midori-private.desktop: error: value "Pantheon;" for key "NotShowIn" in group "Desktop Entry" contains an unregistered value "Pantheon"; values extending the format should start with "X-"

As I don't expect Pantheon to get added to the list of major desktops to the spec just yet, so we shouid propable fix it here for now:

--- data/midori-private.desktop.in
+++ data/midori-private.desktop.in
@@ -9,7 +9,7 @@
 Icon=midori
 Terminal=false
 StartupNotify=true
-NotShowIn=Pantheon
+NotShowIn=X-Pantheon
 X-Osso-Type=application/x-executable
 X-Osso-Service=midori

Revision history for this message
Samuli Suominen (ssuominen) wrote :

That should be X-Pantheon with ending semi-colon ; (silly launchpad ate it?)

Revision history for this message
Samuli Suominen (ssuominen) wrote :
Revision history for this message
Samuli Suominen (ssuominen) wrote :

Arg, forgot that semi-colon again. Correct patch is this.

Revision history for this message
Cris Dywan (kalikiana) wrote :

Prefixing with X- is not a solution because these keys aren't read by Midori but by launchers and docks (Unity, Plank, Docky, AWN, GNOME Shell).

Turns out, the Desktop Entry spec as of 1.1 supports this under a different name. The new naming works in Plank, so I pushed a patch to use the new names. See http://git.xfce.org/apps/midori/commit/?id=9310cfeab34607cca1c93e5cb485bf87160b3233
We'll need to wait for Pantheon to be recognized by validation/ added to the spec. The X- won't be understood by application code.

Changed in midori:
status: New → Fix Committed
Cris Dywan (kalikiana)
Changed in midori:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.