[Telepathy-commits] [telepathy-qt4/master] Add workaround trying QString instead of QDBusObjectPath for Account PropertiesChanged for "Connection"

[Olli Salli]

---
 TelepathyQt4/Client/account.cpp |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/TelepathyQt4/Client/account.cpp b/TelepathyQt4/Client/account.cpp
index 0b7f250..5ca870b 100644
--- a/TelepathyQt4/Client/account.cpp
+++ b/TelepathyQt4/Client/account.cpp
@@ -903,6 +903,12 @@ void Account::updateProperties(const QVariantMap &props)
 
     if (props.contains("Connection")) {
         QString path = qdbus_cast<QDBusObjectPath>(props["Connection"]).path();
+        if (!path) {
+            debug() << " The map contains \"Connection\" but it's empty as a QDBusObjectPath!";
+            debug() << " Trying QString (known bug in some MC/dbus-glib versions)";
+            path = qdbus_cast<QString>(props["Connection"]);
+        }
+
         debug() << " Connection Object Path:" << path;
         if (path == QLatin1String("/")) {
             path = QString();
-- 
1.5.6.5