[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=7efea63

The following commit has been merged in the master branch:
commit 7efea63212481e469288fcf3c1bf28ced26583ba
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Mon Oct 29 13:43:27 2012 -0700

    Move message "click checkbox to enable" message out of the model.
    
    It is not data, and very view independent so should be in the delegate
---
 KTp/Models/accounts-list-model.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/KTp/Models/accounts-list-model.cpp b/KTp/Models/accounts-list-model.cpp
index e19c108..bd7dbf7 100644
--- a/KTp/Models/accounts-list-model.cpp
+++ b/KTp/Models/accounts-list-model.cpp
@@ -284,13 +284,9 @@ const KIcon AccountsListModel::connectionStateIcon(const Tp::AccountPtr &account
 
 const QString AccountsListModel::connectionStatusReason(const Tp::AccountPtr &account) const
 {
-    if (!account->isEnabled()) {
-        return i18n("Click checkbox to enable");
-    }
-    else if (account->connectionStatusReason() == Tp::ConnectionStatusReasonRequested) {
+    if (account->connectionStatusReason() == Tp::ConnectionStatusReasonRequested) {
         return QString();
-    }
-    else {
+    } else {
         return KTp::ErrorDictionary::displayShortErrorMessage(account->connectionError());
     }
 }

-- 
ktp-common-internals packaging