[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=afc019d

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

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

diff --git a/plugins/haze/icq-server-settings-widget.cpp b/plugins/haze/icq-server-settings-widget.cpp
index 5355dd0..d99b092 100644
--- a/plugins/haze/icq-server-settings-widget.cpp
+++ b/plugins/haze/icq-server-settings-widget.cpp
@@ -20,6 +20,8 @@
 
 #include "icq-server-settings-widget.h"
 
+#include <KCMTelepathyAccounts/ParameterEditModel>
+
 IcqServerSettingsWidget::IcqServerSettingsWidget(ParameterEditModel *model,
                                                      QWidget *parent)
  : AbstractAccountParametersWidget(model, parent)
@@ -34,6 +36,11 @@ IcqServerSettingsWidget::IcqServerSettingsWidget(ParameterEditModel *model,
     handleParameter(QLatin1String("allow-multiple-logins"), QVariant::Bool, m_ui->allowMultipleLoginsCheckBox, 0);
     handleParameter(QLatin1String("always-use-rv-proxy"), QVariant::Bool, m_ui->alwaysUseRvProxyCheckBox, 0);
     handleParameter(QLatin1String("charset"), QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
+
+    // update combo box for charset parameter
+    m_ui->charsetComboBox->setCurrentItem(parameterModel()->data(
+            parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("charset"))),
+            ParameterEditModel::ValueRole).toString());
 }
 
 IcqServerSettingsWidget::~IcqServerSettingsWidget()

-- 
ktp-accounts-kcm packaging