[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=a257792

The following commit has been merged in the master branch:
commit a257792593fb31706db3a4d210686c8699d34b3f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Fri Apr 1 20:53:00 2011 +0100

    Added Review Comments
    
    Reviewed by Dario Freddi
    REVIEW: 101008
---
 add-contact-dialog.cpp |  7 +++----
 add-contact-dialog.h   |  2 +-
 main-widget.cpp        | 14 ++++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/add-contact-dialog.cpp b/add-contact-dialog.cpp
index 81a42ec..78ba4ca 100644
--- a/add-contact-dialog.cpp
+++ b/add-contact-dialog.cpp
@@ -28,7 +28,7 @@ SubscribableAccountsModel::SubscribableAccountsModel(QObject *parent)
 
 bool SubscribableAccountsModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
-    AccountsModelItem* item = sourceModel()->index(source_row, 0, source_parent).data(AccountsModel::ItemRole).value<AccountsModelItem*>());
+    AccountsModelItem* item = sourceModel()->index(source_row, 0, source_parent).data(AccountsModel::ItemRole).value<AccountsModelItem*>();
 
     if (item) {
         Tp::AccountPtr account = item->account();
@@ -68,11 +68,10 @@ AddContactDialog::~AddContactDialog()
 Tp::AccountPtr AddContactDialog::account() const
 {
     QVariant itemData = ui->accountCombo->itemData(ui->accountCombo->currentIndex(),AccountsModel::ItemRole);
-    AccountsModelItem* item = itemData.value<AccountsModelItem*>());
+    AccountsModelItem* item = itemData.value<AccountsModelItem*>();
     if (item) {
         return item->account();
-    }
-    else {
+    } else {
         return Tp::AccountPtr();
     }
 }
diff --git a/add-contact-dialog.h b/add-contact-dialog.h
index 0df1073..c9bfbd0 100644
--- a/add-contact-dialog.h
+++ b/add-contact-dialog.h
@@ -17,7 +17,7 @@ class AddContactDialog : public KDialog
 
 public:
     explicit AddContactDialog(AccountsModel* accountModel, QWidget *parent = 0);
-    ~AddContactDialog();
+    virtual ~AddContactDialog();
     Tp::AccountPtr account() const;
     const QString screenName() const;
 
diff --git a/main-widget.cpp b/main-widget.cpp
index ebcf46e..99c6761 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -29,6 +29,8 @@
 #include <QtGui/QCheckBox>
 #include <QtGui/QPushButton>
 #include <QtGui/QToolButton>
+#include <QtCore/QWeakPointer>
+
 
 #include <TelepathyQt4/PendingReady>
 #include <TelepathyQt4/PendingChannelRequest>
@@ -285,8 +287,7 @@ void MainWidget::onAccountStateChanged(bool enabled)
 
     if(enabled) {
         findChild<AccountButton *>(account->uniqueIdentifier())->show();
-    }
-    else {
+    } else {
         findChild<AccountButton *>(account->uniqueIdentifier())->hide();
         showMessageToUser(i18n("Account %1 was disabled!").arg(account->displayName()),
                           MainWidget::SystemMessageError);
@@ -454,13 +455,14 @@ void MainWidget::toggleSearchWidget(bool show)
 }
 
 void MainWidget::onAddContactRequest() {
-    AddContactDialog dialog(m_model, this);
-    if (dialog.exec() == QDialog::Accepted) {
-        Tp::AccountPtr account = dialog.account();
-        QStringList identifiers = QStringList() << dialog.screenName();
+    QWeakPointer<AddContactDialog> dialog = new AddContactDialog(m_model, this);
+    if (dialog.data()->exec() == QDialog::Accepted) {
+	Tp::AccountPtr account = dialog.data()->account();
+        QStringList identifiers = QStringList() << dialog.data()->screenName();
         Tp::PendingContacts* pendingContacts = account->connection()->contactManager()->contactsForIdentifiers(identifiers);
         connect(pendingContacts, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onAddContactRequestFoundContacts(Tp::PendingOperation*)));
     }
+    delete dialog.data();
 }
 
 void MainWidget::onAddContactRequestFoundContacts(Tp::PendingOperation *operation) {

-- 
ktp-contact-list packaging