From: Felix Tiede <info@pc-tiede.de>
Date: Sat, 19 Nov 2016 08:33:49 +0000 (+0100)
Subject: Extend OEM configurability to dolphin desktop file.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~987
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d7a4726544f1559649e3cc17b37c2eb958ee7a72;p=nextcloud-desktop.git

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.
---

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
deleted file mode 100644
index bf60f79da..000000000
--- a/shell_integration/dolphin/ownclouddolphinactionplugin.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Service
-Name=OwncloudAction
-ServiceTypes=KFileItemAction/Plugin
-MimeType=application/octet-stream;inode/directory;
-X-KDE-Library=ownclouddolphinactionplugin
diff --git a/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in b/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in
new file mode 100644
index 000000000..9d8a062ca
--- /dev/null
+++ b/shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Service
+Name=@APPLICATION_NAME@Action
+ServiceTypes=KFileItemAction/Plugin
+MimeType=application/octet-stream;inode/directory;
+X-KDE-Library=@APPLICATION_EXECUTABLE@dolphinactionplugin