[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=f559ea2

The following commit has been merged in the master branch:
commit f559ea2425e29d80152380b3bac8baae042ba932
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Oct 29 09:09:12 2012 +0100

    Update combo box values in haze-icq plugin
---
 plugins/haze/yahoo-server-settings-widget.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/plugins/haze/yahoo-server-settings-widget.cpp b/plugins/haze/yahoo-server-settings-widget.cpp
index 4cc66d5..5d139a0 100644
--- a/plugins/haze/yahoo-server-settings-widget.cpp
+++ b/plugins/haze/yahoo-server-settings-widget.cpp
@@ -20,6 +20,8 @@
 
 #include "yahoo-server-settings-widget.h"
 
+#include <KCMTelepathyAccounts/ParameterEditModel>
+
 YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
                                                      QWidget *parent)
  : AbstractAccountParametersWidget(model, parent)
@@ -38,6 +40,11 @@ YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
     //other
     handleParameter(QLatin1String("proxy-ssl"), QVariant::Bool, m_ui->SslProxy, 0);
     handleParameter(QLatin1String("ignore-invites"), QVariant::Bool, m_ui->ignoreInvites, 0);
+
+    // update combo box for charset parameter
+    m_ui->charsetComboBox->setCurrentItem(parameterModel()->data(
+            parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("charset"))),
+            ParameterEditModel::ValueRole).toString());
 }
 
 YahooServerSettingsWidget::~YahooServerSettingsWidget()

-- 
ktp-accounts-kcm packaging