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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 29328e5cb585bcaed3e1bec026e40e347f831149
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Dec 7 00:32:55 2010 +0200

    Fix kttsd crash on startup where there is no configured talkers.
    
    When there is no talkers in the config file (kttsdrc), kttsd crashes. Merge
    the fix to the kcmkttsd_permanent_settings_jobmgr_fixes.diff patch as it
    triggers this crash by using broken piece of upstream code. Solution is to
    patch up broken upstream code.
---
 debian/changelog                                   |    4 ++++
 .../kcmkttsd_permanent_settings_jobmgr_fixes.diff  |   10 ++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d55d6d..acc4e2e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 kdeaccessibility (4:4.4.5-3) UNRELEASED; urgency=low
 
+  * Fix kttsd crash on startup when there is no configured talkers. Merge the
+    fix to the kcmkttsd_permanent_settings_jobmgr_fixes.diff patch as it
+    triggers this crash by using broken piece of upstream code.
+    (Closes: #606166)
 
  -- Modestas Vainius <modax at debian.org>  Tue, 07 Dec 2010 00:14:46 +0200
 
diff --git a/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff b/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
index 249f935..60b7020 100644
--- a/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
+++ b/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
@@ -431,3 +431,13 @@ be RC bug free).
  }
  
  /**
+@@ -340,7 +335,8 @@ QString TalkerMgr::talkerCodeToTalkerId(
+  */
+ QString TalkerMgr::userDefaultTalker() const
+ {
+-    return m_loadedTalkerCodes[0].getTalkerCode();
++    return (m_loadedTalkerCodes.isEmpty()) ? QString() :
++        m_loadedTalkerCodes[0].getTalkerCode();
+ }
+ 
+ /**

-- 
KDE Accessibility module packaging