diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-09 01:30:37 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2008-05-09 01:30:37 +0800 |
| commit | 5567b074722bf1243a52086d34a80e04c2e11867 (patch) | |
| tree | 8b7e8fbe3b7a8d7e5df7120d5bc5ad5aa72ba096 /libempathy/empathy-tp-group.c | |
| parent | bf9501fd22788339f5d5b30b47713ca880c36574 (diff) | |
| download | gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.tar gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.tar.gz gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.tar.bz2 gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.tar.lz gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.tar.xz gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.tar.zst gsoc2013-empathy-5567b074722bf1243a52086d34a80e04c2e11867.zip | |
Make _get_invitation more reliable
svn path=/trunk/; revision=1092
Diffstat (limited to 'libempathy/empathy-tp-group.c')
| -rw-r--r-- | libempathy/empathy-tp-group.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libempathy/empathy-tp-group.c b/libempathy/empathy-tp-group.c index 29a786dc0..ca7ff491f 100644 --- a/libempathy/empathy-tp-group.c +++ b/libempathy/empathy-tp-group.c @@ -949,11 +949,16 @@ empathy_tp_group_get_invitation (EmpathyTpGroup *group, } } - if (invitation && priv->members && !priv->members->next) { - contact = priv->members->data; + if (invitation) { + contact = invitation->actor; } - if (!invitation && priv->remote_pendings && !priv->remote_pendings->next) { - contact = priv->remote_pendings->data; + if (!invitation) { + if (priv->remote_pendings) { + contact = priv->remote_pendings->data; + } + else if (priv->members) { + contact = priv->members->data; + } } if (remote_contact && contact) { |