[SCM] KDE Accessibility module packaging branch, master, updated. debian/4.4.5-2-7-g3c3dd8c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit a72f991a2b8857f70fb7cf80d0f0af65be43710c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Dec 19 18:03:31 2010 +0200

    Do not send invalid settings (module, language) to speech-dispatcher.
    
    This tends to cause a crash deep inside speech-dispatcher library.
    (Closes: #607326)
    Improvements made to kcmkttsd_permanent_settings_jobmgr_fixes.diff directly.
---
 debian/changelog                                   |    3 ++
 .../kcmkttsd_permanent_settings_jobmgr_fixes.diff  |   29 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0df8f72..e7d7369 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdeaccessibility (4:4.4.5-4) UNRELEASED; urgency=low
 
+  * Do not send invalid settings (module, language) to speech-dispatcher
+    because this tends to cause a crash deep inside speech-dispatcher library.
+    (Closes: #607326)
 
  -- Modestas Vainius <modax at debian.org>  Sun, 19 Dec 2010 17:58:54 +0200
 
diff --git a/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff b/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
index 65517bb..323ac24 100644
--- a/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
+++ b/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
@@ -404,6 +404,35 @@ be RC bug free).
  int Speaker::getCurrentJobNum()
  { 
      return 0;// TODO: ask speech dispatcher if it's needed...
+@@ -819,6 +852,9 @@ QStringList Speaker::outputModules()
+ 
+ QStringList Speaker::languagesByModule(const QString & module)
+ {
++    if (module.isEmpty())
++        return QStringList();
++
+     QStringList languages;
+     if (spd_set_output_module(d->connection, module.toUtf8().data()) == 0)
+     {
+@@ -850,12 +886,18 @@ void Speaker::setVolume(int volume)
+ 
+ void Speaker::setOutputModule(const QString & module)
+ {
++    if (module.isEmpty())
++        return;
++
+     int result = spd_set_output_module(d->connection, module.toUtf8().data());
+     // discard result for now, TODO: add error reporting
+ }
+ 
+ void Speaker::setLanguage(const QString & language)
+ {
++    if (language.isEmpty())
++        return;
++
+     int result = spd_set_language(d->connection, language.toUtf8().data());
+     // discard result for now, TODO: add error reporting
+ }
 --- a/kttsd/kttsd/speaker.h
 +++ b/kttsd/kttsd/speaker.h
 @@ -380,6 +380,8 @@ public:

-- 
KDE Accessibility module packaging