[telepathy-qt4/master] ChannelRequest: Emit succeeded/failed even if not ready.
Andre Moreira Magalhaes (andrunko)
andre.magalhaes at collabora.co.uk
Fri Jun 12 08:30:15 PDT 2009
---
TelepathyQt4/channel-request.cpp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/TelepathyQt4/channel-request.cpp b/TelepathyQt4/channel-request.cpp
index c525806..8151d37 100644
--- a/TelepathyQt4/channel-request.cpp
+++ b/TelepathyQt4/channel-request.cpp
@@ -94,6 +94,13 @@ ChannelRequest::Private::Private(ChannelRequest *parent)
{
debug() << "Creating new ChannelRequest:" << parent->objectPath();
+ parent->connect(baseInterface,
+ SIGNAL(Failed(const QString &, const QString &)),
+ SIGNAL(failed(const QString &, const QString &)));
+ parent->connect(baseInterface,
+ SIGNAL(Succeeded()),
+ SIGNAL(succeeded()));
+
ReadinessHelper::Introspectables introspectables;
// As ChannelRequest does not have predefined statuses let's simulate one (0)
@@ -119,13 +126,6 @@ void ChannelRequest::Private::introspectMain(ChannelRequest::Private *self)
Q_ASSERT(self->properties != 0);
}
- self->parent->connect(self->baseInterface,
- SIGNAL(Failed(const QString &, const QString &)),
- SIGNAL(failed(const QString &, const QString &)));
- self->parent->connect(self->baseInterface,
- SIGNAL(Succeeded()),
- SIGNAL(succeeded()));
-
debug() << "Calling Properties::GetAll(ChannelRequest)";
QDBusPendingCallWatcher *watcher =
new QDBusPendingCallWatcher(
--
1.5.6.5
More information about the telepathy-commits
mailing list