[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=0c75199

The following commit has been merged in the master branch:
commit 0c7519990ab483a96b85f9aae9c6fa7580907a5c
Author: Dominik Cermak <d.cermak at arcor.de>
Date:   Thu Dec 29 23:26:07 2011 +0100

    Get the AccountManager from main widget when it's ready
    
    Don't access it if it's not set.
---
 contact-list-widget_p.h |  1 -
 context-menu.cpp        | 17 +++++++++++++++--
 context-menu.h          |  8 ++++++--
 main-widget.cpp         |  1 +
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/contact-list-widget_p.h b/contact-list-widget_p.h
index a7c22f5..a6a3a3d 100644
--- a/contact-list-widget_p.h
+++ b/contact-list-widget_p.h
@@ -41,7 +41,6 @@ public:
     AccountsModel          *model;
     GroupsModel            *groupsModel;
     AccountsFilterModel    *modelFilter;
-    Tp::AccountManagerPtr   accountManager;
     ContactDelegate        *delegate;
     ContactDelegateCompact *compactDelegate;
     QRect                   dropIndicatorRect;
diff --git a/context-menu.cpp b/context-menu.cpp
index 00d0b55..b2cb7b2 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -55,12 +55,21 @@ ContextMenu::~ContextMenu()
 
 }
 
+void ContextMenu::setAccountManager(const Tp::AccountManagerPtr &accountManager)
+{
+    m_accountManager = accountManager;
+}
+
 KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
 {
     if (!index.isValid()) {
         return 0;
     }
 
+    if (m_accountManager.isNull()) {
+        return 0;
+    }
+
     m_currentIndex = index;
 
     Tp::ContactPtr contact = index.data(AccountsModel::ItemRole).value<ContactModelItem*>()->contact();
@@ -171,7 +180,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
             QMenu* groupAddMenu = menu->addMenu(i18n("Move to Group"));
 
             QStringList groupList;
-            QList<Tp::AccountPtr> accounts = m_mainWidget->d_ptr->accountManager->allAccounts();
+            QList<Tp::AccountPtr> accounts = m_accountManager->allAccounts();
             foreach (const Tp::AccountPtr &account, accounts) {
                 if (!account->connection().isNull()) {
                     groupList.append(account->connection()->contactManager()->allKnownGroups());
@@ -448,6 +457,10 @@ void ContextMenu::onRenameGroupTriggered()
 
 void ContextMenu::onDeleteGroupTriggered()
 {
+    if (m_accountManager.isNull()) {
+        return;
+    }
+
     GroupsModelItem *groupItem = m_currentIndex.data(AccountsModel::ItemRole).value<GroupsModelItem*>();
 
     if (KMessageBox::warningContinueCancel(m_mainWidget,
@@ -465,7 +478,7 @@ void ContextMenu::onDeleteGroupTriggered()
                     m_mainWidget, SLOT(onGenericOperationFinished(Tp::PendingOperation*)));
         }
 
-        foreach (const Tp::AccountPtr &account, m_mainWidget->d_ptr->accountManager->allAccounts()) {
+        foreach (const Tp::AccountPtr &account, m_accountManager->allAccounts()) {
             if (account->connection()) {
                 Tp::PendingOperation *operation = account->connection()->contactManager()->removeGroup(groupItem->groupName());
                 connect(operation, SIGNAL(finished(Tp::PendingOperation*)),
diff --git a/context-menu.h b/context-menu.h
index 278c2d1..48d0f9f 100644
--- a/context-menu.h
+++ b/context-menu.h
@@ -24,6 +24,8 @@
 #include <QModelIndex>
 #include <QStringList>
 
+#include <TelepathyQt/Types>
+
 #include "contact-list-widget.h"
 
 class AccountsModel;
@@ -40,6 +42,7 @@ public:
 
     KMenu* groupContextMenu(const QModelIndex &index);
     KMenu* contactContextMenu(const QModelIndex &index);
+    void setAccountManager(const Tp::AccountManagerPtr &accountManager);
 
 private Q_SLOTS:
     void onAddContactToGroupTriggered();
@@ -59,8 +62,9 @@ private Q_SLOTS:
     void onOpenLinkTriggered(QAction *action);      /** triggered from custom contact menu when user clicks contact link */
 
 private:
-    ContactListWidget  *m_mainWidget;
-    QModelIndex         m_currentIndex;
+    ContactListWidget     *m_mainWidget;
+    QModelIndex            m_currentIndex;
+    Tp::AccountManagerPtr  m_accountManager;
 };
 
 #endif // CONTEXT_MENU_H
diff --git a/main-widget.cpp b/main-widget.cpp
index d45ac03..a906e24 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -275,6 +275,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
     m_accountButtons->setAccountManager(m_accountManager);
     m_presenceChooser->setAccountManager(m_accountManager);
     m_contactsListView->setAccountManager(m_accountManager);
+    m_contextMenu->setAccountManager(m_accountManager);
 }
 
 void MainWidget::showMessageToUser(const QString& text, const MainWidget::SystemMessageType type)

-- 
ktp-contact-list packaging