From ba98b563d26e476fc565810146c6a902509c2922 Mon Sep 17 00:00:00 2001
From: Michael Webster <miketwebster@gmail.com>
Date: Mon, 31 May 2021 11:34:43 -0400
Subject: [PATCH] Clean up the desktop file and rename it so that it passes
 desktop-file- validate.

---
 data/cinnamon-screensaver.desktop.in  | 13 -------------
 data/meson.build                      | 10 +---------
 data/org.cinnamon.ScreenSaver.desktop |  8 ++++++++
 3 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100644 data/cinnamon-screensaver.desktop.in
 create mode 100644 data/org.cinnamon.ScreenSaver.desktop

diff --git a/data/cinnamon-screensaver.desktop.in b/data/cinnamon-screensaver.desktop.in
deleted file mode 100644
index 06a9aea..0000000
--- a/data/cinnamon-screensaver.desktop.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Screensaver
-Comment=Launch screensaver and locker program
-Icon=preferences-desktop-screensaver
-Exec=cinnamon-screensaver
-OnlyShowIn=X-Cinnamon;
-NoDisplay=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=cinnamon-screensaver
-X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=@VERSION@
-DBusActivatable=true
\ No newline at end of file
diff --git a/data/meson.build b/data/meson.build
index 1215f5d..c3852dd 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -5,14 +5,6 @@ if pamdir == ''
   pamdir = sysconfdir
 endif
 
-desktop = configure_file(
-  output: 'cinnamon-screensaver.desktop',
-  input: 'cinnamon-screensaver.desktop.in',
-  # meson 0.49
-  # configuration: { 'VERSION': meson.project_version() }
-  configuration: misc_conf
-)
-
 dbus_service = configure_file(
   output: 'org.cinnamon.ScreenSaver.service',
   input: 'org.cinnamon.ScreenSaver.service.in',
@@ -34,5 +26,5 @@ else
   )
 endif
 
-install_data(desktop, install_dir: join_paths(datadir, 'applications'))
+install_data('org.cinnamon.ScreenSaver.desktop', install_dir: join_paths(datadir, 'applications'))
 install_data(dbus_service, install_dir: dbus_services_dir)
diff --git a/data/org.cinnamon.ScreenSaver.desktop b/data/org.cinnamon.ScreenSaver.desktop
new file mode 100644
index 0000000..a1234a1
--- /dev/null
+++ b/data/org.cinnamon.ScreenSaver.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Screensaver
+Comment=Launch screensaver and locker program
+Exec=cinnamon-screensaver
+OnlyShowIn=X-Cinnamon;
+NoDisplay=true
+DBusActivatable=true
\ No newline at end of file