diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-12 18:24:41 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-10-12 18:24:41 +0900 |
| commit | b72b2f09d3239813de7f3e4cf44310ca25561e64 (patch) | |
| tree | 02502370332e8fbb612ef4d1290998499a7e6ca1 /redhat/tdemultimedia/kdemultimedia-3.5.13-fix_kmix_autostart.patch | |
| parent | 9d54bb35b5fb67dd052757e3a22cb83acbba9c50 (diff) | |
| parent | 9806eb7f9c92362ca0d03e7410d1ecee9b61a38f (diff) | |
| download | tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.tar.gz tde-packaging-b72b2f09d3239813de7f3e4cf44310ca25561e64.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
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.patch | 34 |
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 <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 |