empathy r1252 - trunk/libempathy-gtk

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Jul 15 14:00:49 2008
New Revision: 1252
URL: http://svn.gnome.org/viewvc/empathy?rev=1252&view=rev

Log:
Remove the contact pending event when the contact is not pending anymore.


Modified:
   trunk/libempathy-gtk/empathy-event-manager.c

Modified: trunk/libempathy-gtk/empathy-event-manager.c
==============================================================================
--- trunk/libempathy-gtk/empathy-event-manager.c	(original)
+++ trunk/libempathy-gtk/empathy-event-manager.c	Tue Jul 15 14:00:49 2008
@@ -318,10 +318,22 @@
 				   gboolean             is_pending,
 				   EmpathyEventManager *manager)
 {
-	GString *str;
+	EmpathyEventManagerPriv *priv = GET_PRIV (manager);
+	GString                 *str;
 
 	if (!is_pending) {
-		/* FIXME: remove event if any */
+		GSList *l;
+
+		for (l = priv->events; l; l = l->next) {
+			EventPriv *event = l->data;
+
+			if (event->public.contact == contact &&
+			    event->func == event_pending_subscribe_func) {
+				event_remove (event);
+				break;
+			}
+		}
+
 		return;
 	}