diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-25 02:01:42 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-08-05 19:34:03 +0200 |
| commit | 14c32f36c7a442404fbb7377691cbafa6b0f1c0e (patch) | |
| tree | 7ffb7222c912f8eac2a6e5ff22ec2f7e6b0fa5c9 | |
| parent | 4c81ea96cb6da1f1b46ca0125d24b6d3d9ae9423 (diff) | |
| download | tdemultimedia-14c32f36c7a442404fbb7377691cbafa6b0f1c0e.tar.gz tdemultimedia-14c32f36c7a442404fbb7377691cbafa6b0f1c0e.zip | |
Fix kmix autostart
This resolves Bug 503, and re-applies commit 2cc2e3a2 as part of the fix
(cherry picked from commit 7da06e558a75c035ea881347e9da69ef9ee57927)
| -rw-r--r-- | kmix/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kmix/KMixApp.cpp | 2 | ||||
| -rw-r--r-- | kmix/Makefile.am | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/kmix/CMakeLists.txt b/kmix/CMakeLists.txt index 9a5cd282..378bb214 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 307c8168..15b5c21f 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 |