aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-11 19:58:55 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2009-11-13 23:59:22 +0800
commit07e4c25c4a39705b7b6ecaaac6c8e001d611a713 (patch)
tree125dbbe78d78e7ba14ec528dca1e2828c33da306
parent04840e3d006887d8c3909a8397b982a8b68d5252 (diff)
downloadgsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.tar
gsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.tar.gz
gsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.tar.bz2
gsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.tar.lz
gsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.tar.xz
gsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.tar.zst
gsoc2013-empathy-07e4c25c4a39705b7b6ecaaac6c8e001d611a713.zip
tp_chat_check_if_ready: split the test checking if the TpChat is ready
-rw-r--r--libempathy/empathy-tp-chat.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libempathy/empathy-tp-chat.c b/libempathy/empathy-tp-chat.c
index 83faaff39..79136156a 100644
--- a/libempathy/empathy-tp-chat.c
+++ b/libempathy/empathy-tp-chat.c
@@ -777,10 +777,15 @@ tp_chat_check_if_ready (EmpathyTpChat *chat)
{
EmpathyTpChatPriv *priv = GET_PRIV (chat);
- if (priv->ready || priv->user == NULL ||
- (priv->members == NULL && priv->remote_contact == NULL)) {
+ if (priv->ready)
+ return;
+
+ if (priv->user == NULL)
+ return;
+
+ /* We need either the members (room) or the remote contact (private chat) */
+ if (priv->members == NULL && priv->remote_contact == NULL)
return;
- }
DEBUG ("Ready!");