[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=725de5f

The following commit has been merged in the master branch:
commit 725de5fb2a96949d75913a0be84c05e048b42735
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Mon Jan 9 18:03:19 2012 +0100

    Cut off only '@yahoo.*' from account name.
    
    Haze won't connect if the @yahoo.* part is left in the account name, but it works for @ymail.com and @rocketmail.com.
    
    Reviewed-by: Daniele E. Domenichelli
    BUG: 290195
---
 plugins/haze/yahoo-main-options-widget.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/haze/yahoo-main-options-widget.cpp b/plugins/haze/yahoo-main-options-widget.cpp
index 8dfc87b..d8bf7e1 100644
--- a/plugins/haze/yahoo-main-options-widget.cpp
+++ b/plugins/haze/yahoo-main-options-widget.cpp
@@ -47,11 +47,13 @@ void YahooMainOptionsWidget::submit()
     if (index.isValid()) {
         QString account = m_ui->accountLineEdit->text();
 
-        if (account.contains(QLatin1Char('@'))) {
+        if (account.contains(QLatin1String("@yahoo."))) {
             int atIndex = account.indexOf(QLatin1Char('@'));
 
             //update the model with the account value from the text box.
             parameterModel()->setData(index, account.left(atIndex), Qt::EditRole);
+        } else {
+            parameterModel()->setData(index, account, Qt::EditRole);
         }
     }
 

-- 
ktp-accounts-kcm packaging