From 5e922d7bf61f5168eb063713f2d7f68f89b6066c Mon Sep 17 00:00:00 2001
From: Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com>
Date: Fri, 29 Apr 2016 15:54:29 -0400
Subject: [PATCH] desktop entry: do not hardcode the icon path
To conform to the freedesktop standard, we should not hardcode the
icon path, nor provide its file extension.
Change-Id: If7f27e3dff46161904536cac47003359ed303fb5
Tuleap: #517
---
CMakeLists.txt | 16 ++--------------
gnome-ring.desktop.in => gnome-ring.desktop | 2 +-
....autostart.in => gnome-ring.desktop.autostart | 2 +-
3 files changed, 4 insertions(+), 16 deletions(-)
rename gnome-ring.desktop.in => gnome-ring.desktop (77%)
rename gnome-ring.desktop.autostart.in => gnome-ring.desktop.autostart (76%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12bd8b58..71a221a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -379,30 +379,18 @@ CONFIGURE_FILE (
"${PROJECT_BINARY_DIR}/config.h"
)
-# generate .desktop file
-CONFIGURE_FILE (
- "${PROJECT_SOURCE_DIR}/gnome-ring.desktop.in"
- "${PROJECT_BINARY_DIR}/gnome-ring.desktop"
-)
-
-# generate .desktop file for autostart
-CONFIGURE_FILE (
- "${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart.in"
- "${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart"
-)
-
INSTALL(TARGETS gnome-ring
RUNTIME DESTINATION bin
)
# install .desktop in XDG desktop dir so that it is recognized by the system
-INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
)
# install .desktop in the gnome-ring data dir, so that it can be copied to the
# autostart dir by the client
-INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart
+INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
PERMISSIONS
diff --git a/gnome-ring.desktop.in b/gnome-ring.desktop
similarity index 77%
rename from gnome-ring.desktop.in
rename to gnome-ring.desktop
index e246103c..12d44186 100644
--- a/gnome-ring.desktop.in
+++ b/gnome-ring.desktop
@@ -2,7 +2,7 @@
Name=Ring
Comment=Ring is a secured and distributed communication software.
Exec=gnome-ring
-Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg
+Icon=ring
StartupNotify=true
Terminal=false
Type=Application
diff --git a/gnome-ring.desktop.autostart.in b/gnome-ring.desktop.autostart
similarity index 76%
rename from gnome-ring.desktop.autostart.in
rename to gnome-ring.desktop.autostart
index 1dac7913..bdd4d2f8 100644
--- a/gnome-ring.desktop.autostart.in
+++ b/gnome-ring.desktop.autostart
@@ -2,7 +2,7 @@
Name=Ring
Comment=Ring is a secured and distributed communication software.
Exec=gnome-ring --restore-last-window-state
-Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg
+Icon=ring
StartupNotify=true
Terminal=false
Type=Application
--
GitLab