aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy/empathy-tp-group.c
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy/empathy-tp-group.c')
-rw-r--r--libempathy/empathy-tp-group.c13
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) {