Extend OEM configurability to dolphin desktop file.
authorFelix Tiede <info@pc-tiede.de>
Sat, 19 Nov 2016 08:33:49 +0000 (09:33 +0100)
committerOlivier Goffart <ogoffart@woboq.com>
Tue, 29 Nov 2016 17:36:26 +0000 (18:36 +0100)
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
shell_integration/dolphin/ownclouddolphinactionplugin.desktop [deleted file]
shell_integration/dolphin/ownclouddolphinactionplugin.desktop.in [new file with mode: 0644]

index 33ab47f4feda747e2186d15cb8a40fabf80f8a9d..6bf9c0e6b3aed9e1ae28a80b2d577ee9ffcd7820 100644 (file)
@@ -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 (file)
index bf60f79..0000000
+++ /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 (file)
index 0000000..9d8a062
--- /dev/null
@@ -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