Skip to content
This repository was archived by the owner on Jun 11, 2024. It is now read-only.

Commit 5e922d7

Browse files
author
Stepan Salenikovich
committed
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
1 parent 50fd6af commit 5e922d7

File tree

3 files changed

+4
-16
lines changed

3 files changed

+4
-16
lines changed

CMakeLists.txt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -379,30 +379,18 @@ CONFIGURE_FILE (
379379
"${PROJECT_BINARY_DIR}/config.h"
380380
)
381381

382-
# generate .desktop file
383-
CONFIGURE_FILE (
384-
"${PROJECT_SOURCE_DIR}/gnome-ring.desktop.in"
385-
"${PROJECT_BINARY_DIR}/gnome-ring.desktop"
386-
)
387-
388-
# generate .desktop file for autostart
389-
CONFIGURE_FILE (
390-
"${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart.in"
391-
"${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart"
392-
)
393-
394382
INSTALL(TARGETS gnome-ring
395383
RUNTIME DESTINATION bin
396384
)
397385

398386
# install .desktop in XDG desktop dir so that it is recognized by the system
399-
INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop
387+
INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop
400388
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
401389
)
402390

403391
# install .desktop in the gnome-ring data dir, so that it can be copied to the
404392
# autostart dir by the client
405-
INSTALL(FILES ${PROJECT_BINARY_DIR}/gnome-ring.desktop.autostart
393+
INSTALL(FILES ${PROJECT_SOURCE_DIR}/gnome-ring.desktop.autostart
406394
DESTINATION
407395
${CMAKE_INSTALL_PREFIX}/share/gnome-ring/
408396
PERMISSIONS

gnome-ring.desktop.in renamed to gnome-ring.desktop

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name=Ring
33
Comment=Ring is a secured and distributed communication software.
44
Exec=gnome-ring
5-
Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg
5+
Icon=ring
66
StartupNotify=true
77
Terminal=false
88
Type=Application

gnome-ring.desktop.autostart.in renamed to gnome-ring.desktop.autostart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Name=Ring
33
Comment=Ring is a secured and distributed communication software.
44
Exec=gnome-ring --restore-last-window-state
5-
Icon=@RING_INSTALL_PREFIX@/share/icons/hicolor/scalable/apps/ring.svg
5+
Icon=ring
66
StartupNotify=true
77
Terminal=false
88
Type=Application

0 commit comments

Comments
 (0)