summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-07-17 21:57:16 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-07-17 22:35:55 +0900
commit4317c3e7d68b9f0469855671eb48f063fbb93b37 (patch)
tree3839119e52a5a17e6ddc25a677903e186bda3dba
parent967cf90889abe8df9f6c262319a92a5c8a660f12 (diff)
downloadtdebase-4317c3e7d68b9f0469855671eb48f063fbb93b37.tar.gz
tdebase-4317c3e7d68b9f0469855671eb48f063fbb93b37.zip
Start media backend on TDE session startup. This resolves bug 2780.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 0066e3149204abc023fa441d0982c26c8b48ba3c)
-rw-r--r--tdeioslave/media/mediamanager/CMakeLists.txt1
-rw-r--r--tdeioslave/media/mediamanager/Makefile.am2
-rwxr-xr-xtdeioslave/media/mediamanager/mediabackend.desktop7
3 files changed, 10 insertions, 0 deletions
diff --git a/tdeioslave/media/mediamanager/CMakeLists.txt b/tdeioslave/media/mediamanager/CMakeLists.txt
index 21faaeaf7..a28515188 100644
--- a/tdeioslave/media/mediamanager/CMakeLists.txt
+++ b/tdeioslave/media/mediamanager/CMakeLists.txt
@@ -29,6 +29,7 @@ link_directories(
##### other data ################################
install( FILES mediamanager.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded )
+install( FILES mediabackend.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
##### kded_mediamanager (module) ################
diff --git a/tdeioslave/media/mediamanager/Makefile.am b/tdeioslave/media/mediamanager/Makefile.am
index 0641dd57e..108b4d19b 100644
--- a/tdeioslave/media/mediamanager/Makefile.am
+++ b/tdeioslave/media/mediamanager/Makefile.am
@@ -30,3 +30,5 @@ kded_mediamanager_la_LIBADD = $(LIB_TDESYCOCA) ../libmediacommon/libmediacommon.
servicesdir = $(kde_servicesdir)/kded
services_DATA = mediamanager.desktop
+autostart_DATA = mediabackend.desktop
+
diff --git a/tdeioslave/media/mediamanager/mediabackend.desktop b/tdeioslave/media/mediamanager/mediabackend.desktop
new file mode 100755
index 000000000..d9ef21939
--- /dev/null
+++ b/tdeioslave/media/mediamanager/mediabackend.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Exec=dcop kded kded loadModule mediamanager
+X-DCOP-ServiceType=wait
+Type=Service
+X-TDE-StartupNotify=false
+OnlyShowIn=TDE;
+X-TDE-autostart-phase=1