[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 9badfa4c294bc452cbdc0b998ff8e7380047167d
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue Dec 7 00:56:54 2010 +0200

    Always fill list of available output modules in KTTS job manager.
    
    Module list used to be empty when default module was unknown.
    kcmkttsd_permanent_settings_jobmgr_fixes.diff patch updated with the fix.
---
 debian/changelog                                   |    2 +
 .../kcmkttsd_permanent_settings_jobmgr_fixes.diff  |   24 ++++++++++----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index acc4e2e..bedd463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ kdeaccessibility (4:4.4.5-3) UNRELEASED; urgency=low
     fix to the kcmkttsd_permanent_settings_jobmgr_fixes.diff patch as it
     triggers this crash by using broken piece of upstream code.
     (Closes: #606166)
+  * Fill list of available output modules in KTTS job manager even when default
+    module is unknown (kcmkttsd_permanent_settings_jobmgr_fixes.diff updated).
 
  -- 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 60b7020..65517bb 100644
--- a/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
+++ b/debian/patches/kcmkttsd_permanent_settings_jobmgr_fixes.diff
@@ -124,20 +124,18 @@ be RC bug free).
 +{
 +    m_ui->moduleComboBox->clear();
 +    bool wasSet = false;
-+    if (!tc.outputModule().isEmpty())
++    QStringList modules = m_kspeech->outputModules();
++    int i = 0;
++
++    foreach (const QString module, modules)
 +    {
-+        QStringList modules = m_kspeech->outputModules();
-+        int i = 0;
-+        foreach (const QString module, modules)
++        m_ui->moduleComboBox->addItem(module);
++        if (module == tc.outputModule())
 +        {
-+            m_ui->moduleComboBox->addItem(module);
-+            if (module == tc.outputModule())
-+            {
-+                m_ui->moduleComboBox->setCurrentIndex(i);
-+                wasSet = true;
-+            }
-+            i++;
++            m_ui->moduleComboBox->setCurrentIndex(i);
++            wasSet = true;
 +        }
++        i++;
 +    }
 +    if (wasSet)
 +    {
@@ -184,8 +182,10 @@ be RC bug free).
  
  void KttsJobMgr::slot_moduleChanged(const QString & module)
  {
-+    if (module.isEmpty())
++    if (module.isEmpty()) {
++        m_ui->languageComboBox->clear();
 +        return;
++    }
 +
      kDebug() << "changing the output module to " << module;
      m_kspeech->setOutputModule(module);

-- 
KDE Accessibility module packaging