empathy r1092 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Thu May  8 17:30:37 2008
New Revision: 1092
URL: http://svn.gnome.org/viewvc/empathy?rev=1092&view=rev

Log:
Make _get_invitation more reliable


Modified:
   trunk/libempathy/empathy-tp-group.c

Modified: trunk/libempathy/empathy-tp-group.c
==============================================================================
--- trunk/libempathy/empathy-tp-group.c	(original)
+++ trunk/libempathy/empathy-tp-group.c	Thu May  8 17:30:37 2008
@@ -949,11 +949,16 @@
 		}
 	}
 
-	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) {