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

[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.

[Ricardo Salveti (rsalveti)]

Code looks good, just need to test it (trying to get a silo).

=== modified file 'libtelephonyservice/callmanager.cpp'
--- libtelephonyservice/callmanager.cpp	2015-01-28 14:51:24 +0000
+++ libtelephonyservice/callmanager.cpp	2015-02-13 17:36:59 +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()) {