[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=6f9835a

The following commit has been merged in the master branch:
commit 6f9835a0ae589c9065b431b69b3e5961ac5a6dd0
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Nov 30 13:55:25 2011 +0100

    Automatically remove @yahoo.* part from Yahoo! account if user enteres it
    
    REVIEW: 103281
    BUG: 287190
---
 plugins/haze/yahoo-main-options-widget.cpp | 18 ++++++++++++++++++
 plugins/haze/yahoo-main-options-widget.h   |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/plugins/haze/yahoo-main-options-widget.cpp b/plugins/haze/yahoo-main-options-widget.cpp
index 25d163e..01b1ca3 100644
--- a/plugins/haze/yahoo-main-options-widget.cpp
+++ b/plugins/haze/yahoo-main-options-widget.cpp
@@ -45,3 +45,21 @@ YahooMainOptionsWidget::~YahooMainOptionsWidget()
 
     delete m_ui;
 }
+
+void YahooMainOptionsWidget::submit()
+{
+    Tp::ProtocolParameter parameter = parameterModel()->parameter("account");
+    QModelIndex index = parameterModel()->indexForParameter(parameter);
+    if (index.isValid()) {
+        QString account = m_ui->accountLineEdit->text();
+
+        if (account.contains(QLatin1Char('@'))) {
+            int atIndex = account.indexOf(QLatin1Char('@'));
+
+            //update the model with the account value from the text box.
+            parameterModel()->setData(index, account.left(atIndex), Qt::EditRole);
+        }
+    }
+
+    AbstractAccountParametersWidget::submit();
+}
diff --git a/plugins/haze/yahoo-main-options-widget.h b/plugins/haze/yahoo-main-options-widget.h
index 592e582..3c5581e 100644
--- a/plugins/haze/yahoo-main-options-widget.h
+++ b/plugins/haze/yahoo-main-options-widget.h
@@ -34,6 +34,9 @@ class YahooMainOptionsWidget
 public:
     YahooMainOptionsWidget(ParameterEditModel* model, QWidget* parent = 0);
     virtual ~YahooMainOptionsWidget();
+
+    void submit();
+
 private:
     Q_DISABLE_COPY(YahooMainOptionsWidget);
     Ui::YahooMainOptionsWidget* m_ui;

-- 
ktp-accounts-kcm packaging