summaryrefslogtreecommitdiffstats
path: root/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
diff options
context:
space:
mode:
authorFrancois Andriot <[email protected]>2012-08-19 18:59:10 +0200
committerFrancois Andriot <[email protected]>2012-08-19 18:59:10 +0200
commit24f013d747376aa82d3e1428b269359137b8d2af (patch)
tree1504b9276be0a66861b0c4a0b41a80cf26f9d261 /redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
parent2c5e188a829058ed023b0c2bdd1b6c78037c50ae (diff)
downloadtde-packaging-24f013d747376aa82d3e1428b269359137b8d2af.tar.gz
tde-packaging-24f013d747376aa82d3e1428b269359137b8d2af.zip
RHEL/Fedora: updates many packaging
Diffstat (limited to 'redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch')
-rw-r--r--redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch24
1 files changed, 19 insertions, 5 deletions
diff --git a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
index 7b22862d3..93a4796a4 100644
--- a/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
+++ b/redhat/kdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
@@ -1,10 +1,24 @@
-commit 2cc2e3a2f6d1afd47cc076b89215ac41a0d41a92
-Author: Darrell Anderson <[email protected]>
-Date: 1336512887 -0500
+commit 7da06e558a75c035ea881347e9da69ef9ee57927
+Author: Timothy Pearson <[email protected]>
+Date: 1343199702 -0500
- Fix kmix not autostarting in the user's session.
- This resolves bug report 503.
+ 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