Merge lp:~mandel/ubuntu-download-manager/emit-finish into lp:ubuntu-download-manager

[Manuel de la Peña]

Connect to the destroyed signal to ensure that all signals are emitted BEFORE we remove the object from DBus.

Connect to the destroyed signal to ensure that all signals are emitted BEFORE we remove the object from DBus.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/5/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armfh-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/5/rebuild

review: Needs Fixing (continuous-integration)

[Alejandro J. Cura (alecu)]

+1

review: Approve

=== modified file 'libubuntudownloadmanager/download_queue.cpp'
--- libubuntudownloadmanager/download_queue.cpp	2013-07-20 15:53:38 +0000
+++ libubuntudownloadmanager/download_queue.cpp	2013-07-21 10:55:28 +0000
@@ -16,6 +16,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDebug>
+#include <QSignalMapper>
 #include "download_queue.h"
 
 /*
@@ -28,6 +30,7 @@
     Q_DECLARE_PUBLIC(DownloadQueue)
 public:
     explicit DownloadQueuePrivate(SystemNetworkInfo* networkInfo, DownloadQueue* parent);
+    ~DownloadQueuePrivate();
 
     void add(Download* download, DownloadAdaptor* adaptor);
     void add(const QPair<Download*, DownloadAdaptor*>& value);
@@ -38,12 +41,14 @@
     QHash<QString, Download*> downloads();
 
     void onDownloadStateChanged();
+    void onDestroyed(const QString& path);
     void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
 
 private:
     void updateCurrentDownload();
 
 private:
+    QSignalMapper* _mapper;
     QString _current;
     DownloadList _downloads;  // quick for access
     QStringList _sortedPaths; // keep the order in witch the downloads have been added
@@ -57,8 +62,19 @@
     q_ptr(parent)
 {
     Q_Q(DownloadQueue);
+    _mapper = new QSignalMapper();
+
     q->connect(_networkInfo, SIGNAL(currentNetworkModeChanged(QNetworkInfo::NetworkMode)),
         q, SLOT(onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode)));
+
+    q->connect(_mapper, SIGNAL(mapped(const QString&)),
+        q, SLOT(onDestroyed(const QString&)));
+}
+
+DownloadQueuePrivate::~DownloadQueuePrivate()
+{
+    if (_mapper != NULL)
+        delete _mapper;
 }
 
 void DownloadQueuePrivate::add(Download* download, DownloadAdaptor* adaptor)
@@ -82,15 +98,22 @@
 
 void DownloadQueuePrivate::remove(const QString& path)
 {
+    qDebug() << __FUNCTION__ << path;
+
     Q_Q(DownloadQueue);
+
     QPair<Download*, DownloadAdaptor*> pair = _downloads[path];
-    pair.first->deleteLater();
-    pair.second->deleteLater();
     _sortedPaths.removeOne(path);
     _downloads.remove(path);
 
-    // emit the signal that it was removed
-    emit q->downloadRemoved(path);
+    // connect to the adaptor destroyed event to ensure that we have emitted all signals, else
+    // we might have a race condition where the object path is removed from dbus to early
+    q->connect(pair.second, SIGNAL(destroyed(QObject*)),
+        _mapper, SLOT(map(QObject*)));
+    _mapper->setMapping(pair.first, path);
+
+    pair.second->deleteLater();
+    pair.first->deleteLater();
 }
 
 QString DownloadQueuePrivate::currentDownload()
@@ -154,6 +177,13 @@
     }
 }
 
+void DownloadQueuePrivate::onDestroyed(const QString &path)
+{
+    qDebug() << __FUNCTION__;
+    Q_Q(DownloadQueue);
+    emit q->downloadRemoved(path);
+}
+
 void DownloadQueuePrivate::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode)
 {
     Q_UNUSED(mode);

=== modified file 'libubuntudownloadmanager/download_queue.h'
--- libubuntudownloadmanager/download_queue.h	2013-07-12 10:45:37 +0000
+++ libubuntudownloadmanager/download_queue.h	2013-07-21 10:55:28 +0000
@@ -49,6 +49,7 @@
 
 private:
     Q_PRIVATE_SLOT(d_func(), void onDownloadStateChanged())
+    Q_PRIVATE_SLOT(d_func(), void onDestroyed(const QString& path))
     Q_PRIVATE_SLOT(d_func(), void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode))
 
 private: