summaryrefslogtreecommitdiffstats
path: root/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-10-11 12:01:56 +0200
committerFrançois Andriot <[email protected]>2014-10-11 12:01:56 +0200
commite0568ac6b074ec72e6bdb4b0ab5fc5e0794ca6f9 (patch)
tree138be7bee662821f84eeb57f55f2dea678860bff /redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
parent93915c7dddafd2f8e81bb0d9859d41d1e2c0e175 (diff)
downloadtde-packaging-e0568ac6b074ec72e6bdb4b0ab5fc5e0794ca6f9.tar.gz
tde-packaging-e0568ac6b074ec72e6bdb4b0ab5fc5e0794ca6f9.zip
RPM Packaging: update and cleanup tdemultimedia
Diffstat (limited to 'redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch')
-rw-r--r--redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch34
1 files changed, 0 insertions, 34 deletions
diff --git a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch b/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
deleted file mode 100644
index 93a4796a4..000000000
--- a/redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-commit 7da06e558a75c035ea881347e9da69ef9ee57927
-Author: Timothy Pearson <[email protected]>
-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