From 415fff736ae596aa02d3f909a5fd2b0d46f0cb56 Mon Sep 17 00:00:00 2001
From: cramblitt <cramblitt@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 10 Oct 2006 01:13:49 +0000
Subject: [PATCH] Text priority when speaking clipboard or file but msg
 priority when testing talkers.

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeaccessibility@594071 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 4 +++-
 kttsd/kttsjobmgr/kttsjobmgr.cpp | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 26e7fd8a..ec1c8374 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -1840,7 +1840,6 @@ void KCMKttsMgr::kttsdStarted()
         m_kspeech = new OrgKdeKSpeechInterface("org.kde.kttsd", "/KSpeech", QDBusConnection::sessionBus());
         m_kspeech->setParent(this);
         m_kspeech->setApplicationName("KCMKttsMgr");
-        m_kspeech->setDefaultPriority(KSpeech::jpMessage);
         m_kspeech->setIsSystemManager(true);
         // Connect KTTSD DBUS signals to our slots.
         connect(m_kspeech, SIGNAL(kttsdStarted()),
@@ -2466,7 +2465,10 @@ void KCMKttsMgr::slotNotifyTestButton_clicked()
         }
         if (!msg.isEmpty()) {
             m_kspeech->setDefaultTalker(item->text(nlvcTalker));
+            int savePriority = m_kspeech->defaultPriority();
+            m_kspeech->setDefaultPriority(KSpeech::jpMessage);
             m_kspeech->say(msg, 0);
+            m_kspeech->setDefaultPriority(savePriority);
         }
     }
 }
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index e3d9e4ae..d51d40d0 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -443,7 +443,8 @@ void KttsJobMgrPart::slot_speak_clipboard()
     // Speak it.
     if ( !text.isEmpty() )
     {
-        int jobNum = m_kspeech->say(text, sayOptions);
+        m_kspeech->say(text, sayOptions);
+        // int jobNum = m_kspeech->say(text, sayOptions);
         // kDebug() << "KttsJobMgrPart::slot_speak_clipboard: started jobNum " << jobNum << endl;
         // Set flag so that the job we just created will be selected when textSet signal is received.
         m_selectOnTextSet = true;
-- 
2.11.4.GIT