Skip to content

Commit

Permalink
Rename the desktop file (#666)
Browse files Browse the repository at this point in the history
Using org.x.editor matches the name of the inhibitor and allows us to grab
the proper icon in Cinnamon's shutdown and logout dialogs.
  • Loading branch information
JosephMcc authored Dec 1, 2024
1 parent f3c7168 commit 3c654cd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions data/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
desktop = custom_target(
'desktop',
input: 'xed.desktop.in.in',
output: 'xed.desktop',
input: 'org.x.editor.desktop.in.in',
output: 'org.x.editor.desktop',
command: [intltool_merge, '-d', '-u', po_dir, '@INPUT@', '@OUTPUT@'],
install: true,
install_dir: desktopdir,
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion debian/xed.install
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ usr/bin/xed
usr/lib/*/xed/girepository-1.0/
usr/lib/*/xed/plugins/
usr/lib/*/xed/*.so
usr/share/applications/xed.desktop
usr/share/applications/org.x.editor.desktop
usr/share/dbus-1/
usr/share/man/

1 comment on commit 3c654cd

@darkshram
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change requires to update the appdata file at data/xed.appdata.xml.in, otherwise application centers might fail to install Xed:

Current content at line 3 of data/xed.appdata.xml.in:

<id>xed.desktop</id>

Required:

<id>org.x.editor.desktop</id>

Also, the appdata file installs now as /usr/shate/metainfo/xed.xml instead of /usr/share/metainfo/org.x.editor.appdata.xml. So, basically release 2.6.8 has bad logic with desktop and appdata files.

Please sign in to comment.