Merge lp:~tiagosh/telephony-service/fix-1421091 into lp:telephony-service

[Tiago Salem Herrmann]

Do not create instance of GreeterContacts to avoid dealock with unity.

Do not create instance of GreeterContacts to avoid dealock with unity.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1031
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/373/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-armhf-ci/41/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-vivid-i386-ci/41

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/373/rebuild

review: Approve (continuous-integration)

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2015-01-19 21:14:26 +0000
+++ libtelephonyservice/callmanager.cpp	2015-02-27 15:24:26 +0000
@@ -23,7 +23,6 @@
 #include "callmanager.h"
 #include "callentry.h"
 #include "telepathyhelper.h"
-#include "greetercontacts.h"
 #include "accountentry.h"
 
 #include <TelepathyQt/ContactManager>
@@ -273,7 +272,9 @@
     // for the availability of calls.
     // this is done only to get the live call view on clients as soon as possible, even before the
     // telepathy observer is configured
-    if (!GreeterContacts::instance()->isGreeterMode()) {
+    // Also, we have to avoid creating instances of GreeterContacts here to query if we are in greeter mode,
+    // otherwise we might end up with a deadlock: unity -> telephony-service -> unity
+    if (qgetenv("XDG_SESSION_CLASS") != "greeter") {
         QDBusInterface *phoneAppHandler = TelepathyHelper::instance()->handlerInterface();
         QDBusReply<bool> reply = phoneAppHandler->call("HasCalls");
         if (reply.isValid()) {