[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=23cc574

The following commit has been merged in the master branch:
commit 23cc57443f2edea979b15625d356a2972b8f1d77
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Dec 27 15:06:46 2011 +0000

    Use new item role to get the account, plus minor review comments
    
    REVIEW: 103553
---
 src/kcm-telepathy-accounts.cpp | 9 ++++++++-
 src/main-widget.ui             | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index de7f864..83de8ed 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -308,6 +308,9 @@ void KCMTelepathyAccounts::onEditAccountClicked()
     }
 
     QModelIndex index = m_currentListView->currentIndex();
+    if (!index.isValid()) {
+        return;
+    }
     AccountItem *item = index.data(AccountsListModel::AccountItemRole).value<AccountItem*>();
 
     if (!item)
@@ -320,12 +323,16 @@ void KCMTelepathyAccounts::onEditAccountClicked()
 
 void KCMTelepathyAccounts::onEditIdentityClicked()
 {
+    if (!m_accountManager->isReady()) {
+        return;
+    }
+    
     QModelIndex index = m_currentListView->currentIndex();
     if (!index.isValid()) {
         return;
     }
 
-    AccountItem *item = m_accountsListModel->itemForIndex(m_currentModel->mapToSource(index));
+    AccountItem *item = index.data(AccountsListModel::AccountItemRole).value<AccountItem*>();
 
     if (!item) {
         return;
diff --git a/src/main-widget.ui b/src/main-widget.ui
index 62af7b6..419bf0d 100644
--- a/src/main-widget.ui
+++ b/src/main-widget.ui
@@ -163,6 +163,9 @@
            <property name="enabled">
             <bool>false</bool>
            </property>
+           <property name="toolTip">
+            <string>Edit how you appear to others. Requires the account to be online.</string>
+           </property>
            <property name="text">
             <string>Edit Identity</string>
            </property>

-- 
ktp-accounts-kcm packaging