summaryrefslogtreecommitdiff
path: root/telepathy-glib
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-01-17 15:02:13 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-05-12 12:30:41 +0200
commita24526a08c468cac853d26615cf66fed3137ccc2 (patch)
tree361638b624cbc00703d51ca5930b5427315d48e2 /telepathy-glib
parent343e602c8ad7d9550265b4793f63cc2427c8419a (diff)
prepare core features of subclass before core of super classes
Diffstat (limited to 'telepathy-glib')
-rw-r--r--telepathy-glib/proxy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/telepathy-glib/proxy.c b/telepathy-glib/proxy.c
index ab798599..90fd2c10 100644
--- a/telepathy-glib/proxy.c
+++ b/telepathy-glib/proxy.c
@@ -2057,7 +2057,7 @@ tp_proxy_poll_features (TpProxy *self,
/* Core features have to be prepared first */
if (!core_prepared (self) &&
- !req->core)
+ req != self->priv->prepare_requests->data)
{
DEBUG ("%p: core features not ready yet, nothing prepared", self);
continue;