diff options
Diffstat (limited to 'x11/kdebase3/files/patch-kcontrol-arts.cpp')
-rw-r--r-- | x11/kdebase3/files/patch-kcontrol-arts.cpp | 55 |
1 files changed, 18 insertions, 37 deletions
diff --git a/x11/kdebase3/files/patch-kcontrol-arts.cpp b/x11/kdebase3/files/patch-kcontrol-arts.cpp index e0e5a92ce25d..df11b254f150 100644 --- a/x11/kdebase3/files/patch-kcontrol-arts.cpp +++ b/x11/kdebase3/files/patch-kcontrol-arts.cpp @@ -1,39 +1,20 @@ -Index: kcontrol/arts/arts.cpp -=================================================================== -RCS file: /home/kde/kdebase/kcontrol/arts/arts.cpp,v -retrieving revision 1.100 -diff -u -3 -p -r1.100 arts.cpp ---- kcontrol/arts/arts.cpp 8 Nov 2003 23:43:47 -0000 1.100 -+++ kcontrol/arts/arts.cpp 29 Jan 2004 11:59:29 -0000 -@@ -51,6 +51,7 @@ - //#include <kparts/componentfactory.h> - //#include "midi.h" - #include "arts.h" -+#include <arts/artsversion.h> +--- kcontrol/arts/arts.cpp.orig Fri Mar 5 12:15:10 2004 ++++ kcontrol/arts/arts.cpp Fri Mar 5 12:08:16 2004 +@@ -541,13 +541,13 @@ - extern "C" { - void init_arts(); -@@ -601,7 +602,11 @@ void init_arts() - config->setGroup("Arts"); - bool startServer = config->readBoolEntry("StartServer",true); - bool startRealtime = config->readBoolEntry("StartRealtime",true); -+#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2 - QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f"); -+#else -+ QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f"); -+#endif - - delete config; - -@@ -652,7 +657,11 @@ QString KArtsModule::createArgs(bool net - args += QChar(' ') + addOptions; - - args += QString::fromLatin1(" -m artsmessage"); + connect(checkProcess, SIGNAL(processExited(KProcess*)), + this, SLOT(slotArtsdExited(KProcess*))); +- checkProcess->start(KProcess::Block); +- +- if (latestProcessStatus == 0) ++ if (checkProcess->start(KProcess::Block) == false) ++ realtimePossible = false; ++ else if (latestProcessStatus == 0) + realtimePossible = true; + else + realtimePossible = false; +- + -+#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2 - args += QString::fromLatin1(" -c drkonqi"); -+#endif -+ - args += QString::fromLatin1(" -l 3"); - args += QString::fromLatin1(" -f"); - + checked = true; + + } |