[Telepathy-commits] [telepathy-qt4/master] Move initial continueIntrospection to Channel constructor, otherwise the priv pointer won't have been initialized

Olli Salli olli.salli at collabora.co.uk
Fri Sep 19 05:28:30 PDT 2008


---
 TelepathyQt4/cli-channel.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/TelepathyQt4/cli-channel.cpp b/TelepathyQt4/cli-channel.cpp
index 20c0f22..a070fee 100644
--- a/TelepathyQt4/cli-channel.cpp
+++ b/TelepathyQt4/cli-channel.cpp
@@ -68,7 +68,6 @@ struct Channel::Private
                        SLOT(onClosed()));
 
         introspectQueue.enqueue(&Private::introspectMain);
-        continueIntrospection();
     }
 
     void introspectMain()
@@ -202,6 +201,7 @@ Channel::Channel(const QString& serviceName,
     : ChannelInterface(serviceName, objectPath, parent),
       mPriv(new Private(*this))
 {
+    mPriv->continueIntrospection();
 }
 
 Channel::Channel(const QDBusConnection& connection,
@@ -211,6 +211,7 @@ Channel::Channel(const QDBusConnection& connection,
     : ChannelInterface(connection, serviceName, objectPath, parent),
       mPriv(new Private(*this))
 {
+    mPriv->continueIntrospection();
 }
 
 Channel::~Channel()
-- 
1.5.6.5




More information about the Telepathy-commits mailing list