From d7a4726544f1559649e3cc17b37c2eb958ee7a72 Mon Sep 17 00:00:00 2001 From: Felix Tiede Date: Sat, 19 Nov 2016 09:33:49 +0100 Subject: [PATCH] Extend OEM configurability to dolphin desktop file. OEM configurability creates binaries with OEM names which the .desktop file doesn't take into account and thus dolphin integration does not work if OEM changes the binary's name(s). These changes are now integrated into the .desktop file at compile time. --- shell_integration/dolphin/CMakeLists.txt | 1 + ...nplugin.desktop => ownclouddolphinactionplugin.desktop.in} | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) rename shell_integration/dolphin/{ownclouddolphinactionplugin.desktop => ownclouddolphinactionplugin.desktop.in} (56%) diff --git a/shell_integration/dolphin/CMakeLists.txt b/shell_integration/dolphin/CMakeLists.txt index 33ab47f4f..6bf9c0e6b 100644 --- a/shell_integration/dolphin/CMakeLists.txt +++ b/shell_integration/dolphin/CMakeLists.txt @@ -49,5 +49,6 @@ target_link_libraries(${OWNCLOUDDOLPHINOVERLAYPLUGIN} KF5::CoreAddons KF5::KIOCo set(OWNCLOUDDOLPHINACTIONPLUGIN ${APPLICATION_EXECUTABLE}dolphinactionplugin) add_library(${OWNCLOUDDOLPHINACTIONPLUGIN} MODULE ownclouddolphinactionplugin.cpp) target_link_libraries(${OWNCLOUDDOLPHINACTIONPLUGIN} KF5::CoreAddons KF5::KIOCore KF5::KIOWidgets ${OWNCLOUDDOLPHINHELPER}) +configure_file(ownclouddolphinactionplugin.desktop.in ownclouddolphinactionplugin.desktop ESCAPE_QUOTES @ONLY) install(FILES ownclouddolphinactionplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME ${OWNCLOUDDOLPHINACTIONPLUGIN}.desktop) install(TARGETS ${OWNCLOUDDOLPHINACTIONPLUGIN} DESTINATION ${KDE_INSTALL_PLUGINDIR}) diff --git a/shell_integration/dolphin/ownclouddolphinactionplugin.desktop b/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in similarity index 56% rename from shell_integration/dolphin/ownclouddolphinactionplugin.desktop rename to shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in index bf60f79da..9d8a062ca 100644 --- a/shell_integration/dolphin/ownclouddolphinactionplugin.desktop +++ b/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Name=OwncloudAction +Name=@APPLICATION_NAME@Action ServiceTypes=KFileItemAction/Plugin MimeType=application/octet-stream;inode/directory; -X-KDE-Library=ownclouddolphinactionplugin +X-KDE-Library=@APPLICATION_EXECUTABLE@dolphinactionplugin -- 2.30.2