Skip to content
Snippets Groups Projects
Commit 5e922d7b authored by Stepan Salenikovich's avatar Stepan Salenikovich
Browse files

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
parent 50fd6af7
No related branches found
No related tags found
No related merge requests found
...@@ -379,30 +379,18 @@ CONFIGURE_FILE ( ...@@ -379,30 +379,18 @@ CONFIGURE_FILE (
"${PROJECT_BINARY_DIR}/config.h" "${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 INSTALL(TARGETS gnome-ring
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
) )
# install .desktop in XDG desktop dir so that it is recognized by the system # 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 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
) )
# install .desktop in the gnome-ring data dir, so that it can be copied to the # install .desktop in the gnome-ring data dir, so that it can be copied to the
# autostart dir by the client # autostart dir by the client
INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
DESTINATION DESTINATION
${CMAKE_INSTALL_PREFIX}/share/gnome-ring/ ${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
PERMISSIONS PERMISSIONS
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Name=Ring Name=Ring
Comment=Ring is a secured and distributed communication software. Comment=Ring is a secured and distributed communication software.
Exec=gnome-ring Exec=gnome-ring
Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg Icon=ring
StartupNotify=true StartupNotify=true
Terminal=false Terminal=false
Type=Application Type=Application
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Name=Ring Name=Ring
Comment=Ring is a secured and distributed communication software. Comment=Ring is a secured and distributed communication software.
Exec=gnome-ring --restore-last-window-state Exec=gnome-ring --restore-last-window-state
Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg Icon=ring
StartupNotify=true StartupNotify=true
Terminal=false Terminal=false
Type=Application Type=Application
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment