summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-25 02:01:42 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-07-25 02:01:42 -0500
commit7da06e558a75c035ea881347e9da69ef9ee57927 (patch)
tree5a1660e25f7f1f82da6ecd15f5557ab9e36986a0
parent7c4773527abd12669ca3833b96b4f57f2e18d648 (diff)
downloadtdemultimedia-7da06e558a75c035ea881347e9da69ef9ee57927.tar.gz
tdemultimedia-7da06e558a75c035ea881347e9da69ef9ee57927.zip
Fix kmix autostart
This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix
-rw-r--r--kmix/CMakeLists.txt1
-rw-r--r--kmix/KMixApp.cpp2
-rw-r--r--kmix/Makefile.am2
3 files changed, 4 insertions, 1 deletions
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt
index a8a419f7..237c95d4 100644
--- a/kmix/CMakeLists.txt
+++ b/kmix/CMakeLists.txt
@@ -26,6 +26,7 @@ link_directories(
##### other data ################################
install( FILES kmix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kmix.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixui.rc DESTINATION ${DATA_INSTALL_DIR}/kmix )
install( FILES restore_kmix_volumes.desktop DESTINATION ${AUTOSTART_INSTALL_DIR} )
install( FILES kmixapplet.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets )
diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index d1df895b..10e7b6ae 100644
--- a/kmix/KMixApp.cpp
+++ b/kmix/KMixApp.cpp
@@ -28,6 +28,8 @@
KMixApp::KMixApp()
: KUniqueApplication(), m_kmix( 0 )
{
+ // We handle autostart via standard autostart-enabled .desktop file instead of the session manager
+ disableSessionManagement();
}
diff --git a/kmix/Makefile.am b/kmix/Makefile.am
index 50513635..d2da7028 100644
--- a/kmix/Makefile.am
+++ b/kmix/Makefile.am
@@ -49,7 +49,7 @@ xdg_apps_DATA = kmix.desktop
rcdir = $(kde_datadir)/kmix
rc_DATA = kmixui.rc
-autostart_DATA = restore_kmix_volumes.desktop
+autostart_DATA = kmix.desktop restore_kmix_volumes.desktop
autostartdir = $(datadir)/autostart
lnkdir = $(kde_datadir)/kicker/applets