[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=7e5ed51

The following commit has been merged in the master branch:
commit 7e5ed518308ab24f680562ddc7ecdad95a1948dd
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Sep 28 19:16:52 2011 +0200

    Remove error handling from contact list, this was moved to telepathy-kded-module
    
    Reviewed-by: David Edmundson
---
 main-widget.cpp | 27 ++++-----------------------
 main-widget.h   |  3 ++-
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index 77bed26..aa93617 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -336,8 +336,6 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     connect(m_groupsModel, SIGNAL(operationFinished(Tp::PendingOperation*)),
             this, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
 
-
-
     m_avatarButton->initialize(m_model, m_accountManager);
     m_accountButtons->setAccountManager(m_accountManager);
 
@@ -391,7 +389,6 @@ void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
         m_contactsListView->setExpanded(index, true);
         break;
     case Tp::ConnectionStatusDisconnected:
-        handleConnectionError(account);
         break;
     case Tp::ConnectionStatusConnecting:
         m_contactsListView->setExpanded(index, false);
@@ -1325,26 +1322,10 @@ QStringList MainWidget::extractLinksFromIndex(const QModelIndex& index)
     return links;
 }
 
-void MainWidget::handleConnectionError(const Tp::AccountPtr& account)
-{
-    QString connectionError = account->connectionError();
-
-    // ignore user disconnect
-    if (connectionError == "org.freedesktop.Telepathy.Error.Cancelled") {
-        return;
-    }
-
-    Tp::ConnectionStatusReason reason = account->connectionStatusReason();
-
-    if (reason == Tp::ConnectionStatusReasonAuthenticationFailed) {
-        showMessageToUser(i18n("Could not connect %1. Authentication failed (is your password correct?)", account->displayName()), MainWidget::SystemMessageError);
-    } else if (reason == Tp::ConnectionStatusReasonNetworkError) {
-        showMessageToUser(i18n("Could not connect %1. There was a network error, check your connection", account->displayName()), MainWidget::SystemMessageError);
-    } else {
-        // other errors
-        showMessageToUser(i18n("An unexpected error has occurred with %1: '%2'", account->displayName(), account->connectionError()), MainWidget::SystemMessageError);
-    }
-}
+///Was moved to telepathy-kded-module
+// void MainWidget::handleConnectionError(const Tp::AccountPtr& account)
+// {
+// }
 
 void MainWidget::groupContacts(bool enabled)
 {
diff --git a/main-widget.h b/main-widget.h
index 65f076d..876ff92 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -128,7 +128,8 @@ Q_SIGNALS:
 
 private:
     QStringList extractLinksFromIndex(const QModelIndex &index);    /** extract links from a QModelIndex pointing to a contact */
-    void handleConnectionError(const Tp::AccountPtr &account);      /** handle connection errors for given account. This method provides visual notification */
+    ///Was moved to telepathy-kded-module
+    //void handleConnectionError(const Tp::AccountPtr &account);      /** handle connection errors for given account. This method provides visual notification */
     void closeEvent(QCloseEvent *e);
 
     KMenu* contactContextMenu(const QModelIndex &index);

-- 
ktp-contact-list packaging