Fix kmix autostart

This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix

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 )

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();
 }
 
 

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