summaryrefslogtreecommitdiffstats
path: root/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
blob: 93a4796a4df803a32943520eb0f4dbaf8bf3e43f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
commit 7da06e558a75c035ea881347e9da69ef9ee57927
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date:   1343199702 -0500

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


diff --git a/kmix/KMixApp.cpp b/kmix/KMixApp.cpp
index d1df895..10e7b6a 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 5051363..d2da702 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