Merge lp:~ken-vandine/content-hub/dont_swallow_deactivate into lp:content-hub

[Ken VanDine]

Don't swallow QEvent::ApplicationDeactivate

Don't swallow QEvent::ApplicationDeactivate

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:238
http://jenkins.qa.ubuntu.com/job/content-hub-ci/275/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/275/rebuild

review: Approve (continuous-integration)

[Sebastien Bacher (seb128)]

works as it should, great bugfix!

review: Approve

[lp:~ken-vandine/content-hub/dont_swallow_deactivate]

239. By Ken VanDine on 2015-08-21

warn when we don't call the handler

[Michael Sheldon (michael-sheldon)]

Code looks good

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:239
http://jenkins.qa.ubuntu.com/job/content-hub-ci/276/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-vivid-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/276/rebuild

review: Approve (continuous-integration)

=== modified file 'src/com/ubuntu/content/hub.cpp'
--- src/com/ubuntu/content/hub.cpp	2014-08-04 17:56:09 +0000
+++ src/com/ubuntu/content/hub.cpp	2015-08-21 16:02:51 +0000
@@ -81,20 +81,17 @@
 
 bool cuc::Hub::eventFilter(QObject *obj, QEvent *event)
 {
-   if (event->type() == QEvent::ApplicationDeactivate)
-       return true;
-
    if (event->type() == QEvent::ApplicationActivate)
    {
        QString id = app_id();
-       if (id.isEmpty())
+       if (!id.isEmpty())
+       {
+           TRACE() << Q_FUNC_INFO << id << "Activated";
+           d->service->HandlerActive(id);
+       } else 
        {
            qWarning() << "APP_ID isn't set, the handler ignored";
-           return true;
        }
-       TRACE() << Q_FUNC_INFO << id << "Activated";
-       d->service->HandlerActive(id);
-       return true;
    }
    return QObject::eventFilter(obj, event);
 }