empathy r1244 - in trunk: libempathy-gtk src

[xclaesse svn gnome org]

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

Log:
Move event code from EmpathyStatusIcon to EmpathyEventManager


Added:
   trunk/libempathy-gtk/empathy-event-manager.c
   trunk/libempathy-gtk/empathy-event-manager.h
Modified:
   trunk/libempathy-gtk/Makefile.am
   trunk/src/empathy-status-icon.c

Modified: trunk/libempathy-gtk/Makefile.am
==============================================================================
--- trunk/libempathy-gtk/Makefile.am	(original)
+++ trunk/libempathy-gtk/Makefile.am	Tue Jul 15 14:00:37 2008
@@ -16,6 +16,7 @@
 lib_LTLIBRARIES = libempathy-gtk.la
 
 libempathy_gtk_la_SOURCES =             	\
+	totem-subtitle-encoding.c totem-subtitle-encoding.h \
 	empathy-account-chooser.c		\
 	empathy-chat.c				\
 	empathy-irc-network-dialog.c		\
@@ -47,7 +48,7 @@
 	empathy-cell-renderer-text.c		\
 	empathy-spell.c				\
 	empathy-contact-menu.c			\
-	totem-subtitle-encoding.c totem-subtitle-encoding.h
+	empathy-event-manager.c
 
 # do not distribute generated files
 nodist_libempathy_gtk_la_SOURCES =\
@@ -94,7 +95,8 @@
 	empathy-smiley-manager.h		\
 	empathy-cell-renderer-text.h		\
 	empathy-spell.h				\
-	empathy-contact-menu.h
+	empathy-contact-menu.h			\
+	empathy-event-manager.h
 
 libempathy_gtk_includedir = $(includedir)/libempathy-gtk/
 libempathy_gtk_include_HEADERS =		\

Added: trunk/libempathy-gtk/empathy-event-manager.c
==============================================================================
--- (empty file)
+++ trunk/libempathy-gtk/empathy-event-manager.c	Tue Jul 15 14:00:37 2008
@@ -0,0 +1,442 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007-2008 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * 
+ * Authors: Xavier Claessens <xclaesse gmail com>
+ */
+
+#include <config.h>
+
+#include <string.h>
+#include <glib/gi18n.h>
+
+#include <telepathy-glib/util.h>
+
+#include <libempathy/empathy-dispatcher.h>
+#include <libempathy/empathy-contact-manager.h>
+#include <libempathy/empathy-tp-chat.h>
+#include <libempathy/empathy-tp-group.h>
+#include <libempathy/empathy-utils.h>
+
+#include "empathy-event-manager.h"
+#include "empathy-images.h"
+#include "empathy-contact-dialogs.h"
+
+#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+#include <libempathy/empathy-debug.h>
+
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyEventManager)
+typedef struct {
+	EmpathyDispatcher     *dispatcher;
+	EmpathyContactManager *contact_manager;
+	GSList                *events;
+} EmpathyEventManagerPriv;
+
+typedef struct _EventPriv EventPriv;
+typedef void (*EventFunc) (EventPriv *event);
+
+struct _EventPriv {
+	EmpathyEvent         public;
+	TpChannel           *channel;
+	EmpathyEventManager *manager;
+	EventFunc            func;
+	gpointer             user_data;
+};
+
+enum {
+	EVENT_ADDED,
+	EVENT_REMOVED,
+	LAST_SIGNAL
+};
+
+static guint signals[LAST_SIGNAL];
+
+G_DEFINE_TYPE (EmpathyEventManager, empathy_event_manager, G_TYPE_OBJECT);
+
+static void event_remove (EventPriv *event);
+
+static void
+event_free (EventPriv *event)
+{
+	g_free (event->public.icon_name);
+	g_free (event->public.message);
+	if (event->channel) {
+		g_signal_handlers_disconnect_by_func (event->channel,
+						      event_remove,
+						      event);
+		g_object_unref (event->channel);
+	}
+	g_slice_free (EventPriv, event);
+}
+
+static void
+event_remove (EventPriv *event)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (event->manager);
+
+	DEBUG ("Removing event %p", event);
+	priv->events = g_slist_remove (priv->events, event);
+	g_signal_emit (event->manager, signals[EVENT_REMOVED], 0, event);
+	event_free (event);
+}
+
+static void
+event_manager_add (EmpathyEventManager *manager,
+		   const gchar         *icon_name,
+		   const gchar         *message,
+		   TpChannel           *channel,
+		   EventFunc            func,
+		   gpointer             user_data)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (manager);
+	EventPriv               *event;
+
+	event = g_slice_new0 (EventPriv);
+	event->public.icon_name = g_strdup (icon_name);
+	event->public.message = g_strdup (message);
+	event->manager = manager;
+	event->func = func;
+	event->user_data = user_data;
+
+	if (channel) {
+		event->channel = g_object_ref (channel);
+		g_signal_connect_swapped (channel, "invalidated",
+					  G_CALLBACK (event_remove),
+					  event);
+	}
+
+	DEBUG ("Adding event %p", event);
+	priv->events = g_slist_prepend (priv->events, event);
+	g_signal_emit (event->manager, signals[EVENT_ADDED], 0, event);
+}
+
+static void
+event_channel_process_func (EventPriv *event)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (event->manager);
+
+	/* This will emit "dispatch-channel" and the event will be removed
+	 * in the callback of that signal, no need to remove the event here. */	
+	empathy_dispatcher_channel_process (priv->dispatcher, event->channel);
+}
+
+static gboolean
+event_manager_chat_unref_idle (gpointer user_data)
+{
+	g_object_unref (user_data);
+	return FALSE;
+}
+
+static void
+event_manager_chat_message_received_cb (EmpathyTpChat       *tp_chat,
+					EmpathyMessage      *message,
+					EmpathyEventManager *manager)
+{
+	EmpathyContact  *sender;
+	gchar           *msg;
+	TpChannel       *channel;
+
+	g_idle_add (event_manager_chat_unref_idle, tp_chat);
+	g_signal_handlers_disconnect_by_func (tp_chat,
+					      event_manager_chat_message_received_cb,
+					      manager);
+
+	sender = empathy_message_get_sender (message);
+	msg = g_strdup_printf (_("New message from %s:\n%s"),
+			       empathy_contact_get_name (sender),
+			       empathy_message_get_body (message));
+
+	channel = empathy_tp_chat_get_channel (tp_chat);
+	event_manager_add (manager, EMPATHY_IMAGE_NEW_MESSAGE, msg, channel,
+			   event_channel_process_func, NULL);
+
+	g_free (msg);
+}
+
+static void
+event_manager_filter_channel_cb (EmpathyDispatcher   *dispatcher,
+				 TpChannel           *channel,
+				 EmpathyEventManager *manager)
+{
+	gchar *channel_type;
+
+	g_object_get (channel, "channel-type", &channel_type, NULL);
+	if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) {
+		EmpathyTpChat *tp_chat;
+
+		tp_chat = empathy_tp_chat_new (channel);
+		g_signal_connect (tp_chat, "message-received",
+				  G_CALLBACK (event_manager_chat_message_received_cb),
+				  manager);
+	}
+	else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
+		EmpathyTpGroup *tp_group;
+		EmpathyContact *contact;
+		gchar          *msg;
+
+		tp_group = empathy_tp_group_new (channel);
+		empathy_run_until_ready (tp_group);
+		empathy_tp_group_get_invitation (tp_group, &contact);
+		empathy_contact_run_until_ready (contact,
+						 EMPATHY_CONTACT_READY_NAME,
+						 NULL);
+
+		msg = g_strdup_printf (_("Incoming call from %s"),
+				       empathy_contact_get_name (contact));
+
+		event_manager_add (manager, EMPATHY_IMAGE_VOIP, msg, channel,
+				   event_channel_process_func, NULL);
+
+		g_free (msg);
+		g_object_unref (contact);
+		g_object_unref (tp_group);
+	}
+
+	g_free (channel_type);
+}
+
+static void
+event_manager_dispatch_channel_cb (EmpathyDispatcher   *dispatcher,
+				   TpChannel           *channel,
+				   EmpathyEventManager *manager)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (manager);
+	GSList                  *l;
+
+	for (l = priv->events; l; l = l->next) {
+		EventPriv *event = l->data;
+
+		if (event->channel &&
+		    empathy_proxy_equal (channel, event->channel)) {
+			event_remove (event);
+			break;
+		}
+	}
+}
+
+static void
+event_tube_process_func (EventPriv *event)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (event->manager);
+	EmpathyDispatcherTube   *tube = (EmpathyDispatcherTube*) event->user_data;
+
+	if (tube->activatable) {
+		empathy_dispatcher_tube_process (priv->dispatcher, tube);
+	} else {
+		GtkWidget *dialog;
+		gchar     *str;
+
+		/* Tell the user that the tube can't be handled */
+		str = g_strdup_printf (_("%s offered you an invitation, but "
+					 "you don't have the needed external "
+					 "application to handle it."),
+				       empathy_contact_get_name (tube->initiator));
+
+		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
+						 GTK_MESSAGE_ERROR,
+						 GTK_BUTTONS_OK,
+						 "%s", str);
+		gtk_window_set_title (GTK_WINDOW (dialog),
+				      _("Invitation Error"));
+		g_free (str);
+
+		gtk_widget_show (dialog);
+		g_signal_connect (dialog, "response",
+				  G_CALLBACK (gtk_widget_destroy),
+				  NULL);
+	}
+
+	empathy_dispatcher_tube_unref (tube);
+	event_remove (event);
+}
+
+static void
+event_manager_filter_tube_cb (EmpathyDispatcher     *dispatcher,
+			      EmpathyDispatcherTube *tube,
+			      EmpathyEventManager   *manager)
+{
+	const gchar *icon_name;
+	gchar       *msg;
+
+	empathy_contact_run_until_ready (tube->initiator,
+					 EMPATHY_CONTACT_READY_NAME, NULL);
+
+	if (tube->activatable) {
+		icon_name = GTK_STOCK_EXECUTE;
+		msg = g_strdup_printf (_("%s is offering you an invitation. An external "
+					 "application will be started to handle it."),
+				       empathy_contact_get_name (tube->initiator));
+	} else {
+		icon_name = GTK_STOCK_DIALOG_ERROR;
+		msg = g_strdup_printf (_("%s is offering you an invitation, but "
+					 "you don't have the needed external "
+					 "application to handle it."),
+				       empathy_contact_get_name (tube->initiator));
+	}
+
+	event_manager_add (manager, icon_name, msg, tube->channel,
+			   event_tube_process_func,
+			   empathy_dispatcher_tube_ref (tube));
+
+	g_free (msg);
+}
+
+static void
+event_pending_subscribe_func (EventPriv *event)
+{
+	EmpathyContact *contact = EMPATHY_CONTACT (event->user_data);
+
+	empathy_subscription_dialog_show (contact, NULL);
+
+	g_object_unref (contact);
+	event_remove (event);
+}
+
+static void
+event_manager_pendings_changed_cb (EmpathyContactList  *list,
+				   EmpathyContact      *contact,
+				   EmpathyContact      *actor,
+				   guint                reason,
+				   gchar               *message,
+				   gboolean             is_pending,
+				   EmpathyEventManager *manager)
+{
+	GString *str;
+
+	if (!is_pending) {
+		/* FIXME: remove event if any */
+		return;
+	}
+
+	empathy_contact_run_until_ready (contact,
+					 EMPATHY_CONTACT_READY_NAME,
+					 NULL);
+
+	str = g_string_new (NULL);
+	g_string_printf (str, _("Subscription requested by %s"),
+			 empathy_contact_get_name (contact));	
+	if (!G_STR_EMPTY (message)) {
+		g_string_append_printf (str, _("\nMessage: %s"), message);
+	}
+
+	event_manager_add (manager, GTK_STOCK_DIALOG_QUESTION, str->str, NULL,
+			   event_pending_subscribe_func,
+			   g_object_ref (contact));
+
+	g_string_free (str, TRUE);
+}
+
+static void
+event_manager_finalize (GObject *object)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (object);
+
+	g_slist_foreach (priv->events, (GFunc) event_free, NULL);
+	g_slist_free (priv->events);
+	g_object_unref (priv->contact_manager);
+	g_object_unref (priv->dispatcher);
+}
+
+static void
+empathy_event_manager_class_init (EmpathyEventManagerClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	object_class->finalize = event_manager_finalize;
+
+	signals[EVENT_ADDED] =
+		g_signal_new ("event-added",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0,
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__POINTER,
+			      G_TYPE_NONE,
+			      1, G_TYPE_POINTER);
+
+	signals[EVENT_REMOVED] =
+		g_signal_new ("event-removed",
+			      G_TYPE_FROM_CLASS (klass),
+			      G_SIGNAL_RUN_LAST,
+			      0,
+			      NULL, NULL,
+			      g_cclosure_marshal_VOID__POINTER,
+			      G_TYPE_NONE,
+			      1, G_TYPE_POINTER);
+
+	g_type_class_add_private (object_class, sizeof (EmpathyEventManagerPriv));
+}
+
+static void
+empathy_event_manager_init (EmpathyEventManager *manager)
+{
+	EmpathyEventManagerPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (manager,
+		EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerPriv);
+
+	manager->priv = priv;
+
+	priv->dispatcher = empathy_dispatcher_new ();
+	priv->contact_manager = empathy_contact_manager_new ();
+	g_signal_connect (priv->dispatcher, "filter-channel",
+			  G_CALLBACK (event_manager_filter_channel_cb),
+			  manager);
+	g_signal_connect (priv->dispatcher, "dispatch-channel",
+			  G_CALLBACK (event_manager_dispatch_channel_cb),
+			  manager);
+	g_signal_connect (priv->dispatcher, "filter-tube",
+			  G_CALLBACK (event_manager_filter_tube_cb),
+			  manager);
+	g_signal_connect (priv->contact_manager, "pendings-changed",
+			  G_CALLBACK (event_manager_pendings_changed_cb),
+			  manager);
+}
+
+EmpathyEventManager *
+empathy_event_manager_new (void)
+{
+	static EmpathyEventManager *manager = NULL;
+
+	if (!manager) {
+		manager = g_object_new (EMPATHY_TYPE_EVENT_MANAGER, NULL);
+		g_object_add_weak_pointer (G_OBJECT (manager), (gpointer) &manager);
+	} else {
+		g_object_ref (manager);
+	}
+
+	return manager;
+}
+
+EmpathyEvent *
+empathy_event_manager_get_top_event (EmpathyEventManager *manager)
+{
+	EmpathyEventManagerPriv *priv = GET_PRIV (manager);
+
+	return priv->events ? priv->events->data : NULL;
+}
+
+void
+empathy_event_activate (EmpathyEvent *event_public)
+{
+	EventPriv *event = (EventPriv*) event_public;
+
+	if (event->func) {
+		event->func (event);
+	} else {
+		event_remove (event);
+	}
+}
+

Added: trunk/libempathy-gtk/empathy-event-manager.h
==============================================================================
--- (empty file)
+++ trunk/libempathy-gtk/empathy-event-manager.h	Tue Jul 15 14:00:37 2008
@@ -0,0 +1,61 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2007-2008 Collabora Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Authors: Xavier Claessens <xclaesse gmail com>
+ */
+
+#ifndef __EMPATHY_EVENT_MANAGER_H__
+#define __EMPATHY_EVENT_MANAGER_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define EMPATHY_TYPE_EVENT_MANAGER         (empathy_event_manager_get_type ())
+#define EMPATHY_EVENT_MANAGER(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManager))
+#define EMPATHY_EVENT_MANAGER_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerClass))
+#define EMPATHY_IS_EVENT_MANAGER(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), EMPATHY_TYPE_EVENT_MANAGER))
+#define EMPATHY_IS_EVENT_MANAGER_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), EMPATHY_TYPE_EVENT_MANAGER))
+#define EMPATHY_EVENT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), EMPATHY_TYPE_EVENT_MANAGER, EmpathyEventManagerClass))
+
+typedef struct _EmpathyEventManager      EmpathyEventManager;
+typedef struct _EmpathyEventManagerClass EmpathyEventManagerClass;
+
+struct _EmpathyEventManager {
+	GObject parent;
+	gpointer priv;
+};
+
+struct _EmpathyEventManagerClass {
+	GObjectClass parent_class;
+};
+
+typedef struct {
+	gchar *icon_name;
+	gchar *message;
+} EmpathyEvent;
+
+GType                empathy_event_manager_get_type      (void) G_GNUC_CONST;
+EmpathyEventManager *empathy_event_manager_new           (void);
+EmpathyEvent *       empathy_event_manager_get_top_event (EmpathyEventManager *manager);
+void                 empathy_event_activate              (EmpathyEvent        *event);
+
+G_END_DECLS
+
+#endif /* __EMPATHY_EVENT_MANAGER_H__ */

Modified: trunk/src/empathy-status-icon.c
==============================================================================
--- trunk/src/empathy-status-icon.c	(original)
+++ trunk/src/empathy-status-icon.c	Tue Jul 15 14:00:37 2008
@@ -25,24 +25,17 @@
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <telepathy-glib/util.h>
-
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-idle.h>
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-dispatcher.h>
-#include <libempathy/empathy-tp-chat.h>
-#include <libempathy/empathy-tp-group.h>
 
+#include <libempathy-gtk/empathy-event-manager.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>
 #include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-new-message-dialog.h>
-#include <libempathy-gtk/empathy-contact-dialogs.h>
 
 #include "empathy-accounts-dialog.h"
 #include "empathy-status-icon.h"
@@ -54,39 +47,24 @@
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500
 
-typedef struct _StatusIconEvent StatusIconEvent;
-
 #define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusIcon)
 typedef struct {
-	GtkStatusIcon      *icon;
-	EmpathyIdle        *idle;
-	MissionControl     *mc;
-	EmpathyDispatcher  *dispatcher;
-	EmpathyContactManager *contact_manager;
-	GSList             *events;
-	gboolean            showing_event_icon;
-	guint               blink_timeout;
-	gpointer            token;
-
-	GtkWindow          *window;
-	GtkWidget          *popup_menu;
-	GtkWidget          *show_window_item;
-	GtkWidget          *message_item;
-	GtkWidget          *status_item;
+	GtkStatusIcon       *icon;
+	EmpathyIdle         *idle;
+	MissionControl      *mc;
+	gboolean             showing_event_icon;
+	guint                blink_timeout;
+	gpointer             token;
+	EmpathyEventManager *event_manager;
+	EmpathyEvent        *event;
+
+	GtkWindow           *window;
+	GtkWidget           *popup_menu;
+	GtkWidget           *show_window_item;
+	GtkWidget           *message_item;
+	GtkWidget           *status_item;
 } EmpathyStatusIconPriv;
 
-typedef void (*StatusIconEventFunc) (EmpathyStatusIcon *icon,
-				     gpointer           user_data);
-
-struct _StatusIconEvent {
-	gchar               *icon_name;
-	gchar               *message;
-	StatusIconEventFunc  func;
-	gpointer             user_data;
-	TpChannel           *channel;
-	EmpathyStatusIcon   *icon;
-};
-
 G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
 
 static void
@@ -95,8 +73,8 @@
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 	const gchar           *tooltip = NULL;
 
-	if (priv->events) {
-		tooltip = ((StatusIconEvent*)priv->events->data)->message;
+	if (priv->event) {
+		tooltip = priv->event->message;
 	}
 
 	if (!tooltip) {
@@ -112,8 +90,8 @@
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 	const gchar           *icon_name;
 
-	if (priv->events && priv->showing_event_icon) {
-		icon_name = ((StatusIconEvent*)priv->events->data)->icon_name;
+	if (priv->event && priv->showing_event_icon) {
+		icon_name = priv->event->icon_name;
 	} else {
 		McPresence state;
 
@@ -135,130 +113,55 @@
 	return TRUE;
 }
 
-static void status_icon_channel_invalidated_cb (TpProxy *channel, guint domain,
-						gint code, gchar *message,
-						EmpathyStatusIcon *icon);
-
-static void
-status_icon_event_free (StatusIconEvent *event)
-{
-	g_free (event->icon_name);
-	g_free (event->message);
-	if (event->channel) {
-		g_signal_handlers_disconnect_by_func (event->channel,
-						      status_icon_channel_invalidated_cb,
-						      event->icon);
-		g_object_unref (event->channel);
-	}
-	g_slice_free (StatusIconEvent, event);
-}
-
 static void
-status_icon_event_remove (EmpathyStatusIcon *icon,
-			  StatusIconEvent   *event)
+status_icon_event_added_cb (EmpathyEventManager *manager,
+			    EmpathyEvent        *event,
+			    EmpathyStatusIcon   *icon)
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	GSList                *l;
 
-	if (!(l = g_slist_find (priv->events, event))) {
+	if (priv->event) {
 		return;
 	}
 
-	priv->events = g_slist_delete_link (priv->events, l);		
-	status_icon_event_free (event);
-	status_icon_update_tooltip (icon);
-	status_icon_update_icon (icon);
+	DEBUG ("New event %p", event);
 
-	if (!priv->events && priv->blink_timeout) {
-		g_source_remove (priv->blink_timeout);
-		priv->blink_timeout = 0;
-	}
-}
+	priv->event = event;
+	priv->showing_event_icon = TRUE;
 
-static void
-status_icon_event_remove_by_channel (EmpathyStatusIcon *icon,
-				     TpChannel         *channel)
-{
-	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	GSList                *l;
-
-	for (l = priv->events; l; l = l->next) {
-		StatusIconEvent *event = l->data;
-
-		if (event->channel &&
-		    empathy_proxy_equal (event->channel, channel)) {
-			DEBUG ("Found event '%s'", event->message);
-			status_icon_event_remove (icon, event);
-			break;
-		}
-	}
-}
+	status_icon_update_icon (icon);
+	status_icon_update_tooltip (icon);
 
-static void
-status_icon_event_activate (EmpathyStatusIcon *icon,
-			    StatusIconEvent   *event)
-{
-	if (event->func) {
-		event->func (icon, event->user_data);
+	if (!priv->blink_timeout) {
+		priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
+						     (GSourceFunc) status_icon_blink_timeout_cb,
+						     icon);
 	}
-	status_icon_event_remove (icon, event);
 }
 
 static void
-status_icon_event_add (EmpathyStatusIcon   *icon,
-		       const gchar         *icon_name,
-		       const gchar         *message,
-		       StatusIconEventFunc  func,
-		       gpointer             user_data,
-		       TpChannel           *channel)
+status_icon_event_removed_cb (EmpathyEventManager *manager,
+			      EmpathyEvent        *event,
+			      EmpathyStatusIcon   *icon)
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	StatusIconEvent       *event;
-	gboolean               had_events;
 
-	DEBUG ("Adding event: %s", message);
+	if (event != priv->event) {
+		return;
+	}
 
-	event = g_slice_new0 (StatusIconEvent);
-	event->icon_name = g_strdup (icon_name);
-	event->message = g_strdup (message);
-	event->func = func;
-	event->user_data = user_data;
-	event->icon = icon;
+	priv->event = empathy_event_manager_get_top_event (priv->event_manager);
 
-	if (channel) {
-		event->channel = g_object_ref (channel);
-		g_signal_connect (channel, "invalidated",
-				  G_CALLBACK (status_icon_channel_invalidated_cb),
-				  icon);
-	}
+	status_icon_update_tooltip (icon);
+	status_icon_update_icon (icon);
 
-	had_events = (priv->events != NULL);
-	priv->events = g_slist_append (priv->events, event);
-	if (!had_events) {
-		priv->showing_event_icon = TRUE;
-		status_icon_update_icon (icon);
-		status_icon_update_tooltip (icon);
-
-		if (!priv->blink_timeout) {
-			priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
-							     (GSourceFunc) status_icon_blink_timeout_cb,
-							     icon);
-		}
+	if (!priv->event && priv->blink_timeout) {
+		g_source_remove (priv->blink_timeout);
+		priv->blink_timeout = 0;
 	}
 }
 
 static void
-status_icon_channel_invalidated_cb (TpProxy           *channel,
-				    guint              domain,
-				    gint               code,
-				    gchar             *message,
-				    EmpathyStatusIcon *icon)
-{
-	DEBUG ("%s", message);
-	status_icon_event_remove_by_channel (icon, TP_CHANNEL (channel));
-}
-
-static void
 status_icon_set_visibility (EmpathyStatusIcon *icon,
 			    gboolean           visible,
 			    gboolean           store)
@@ -344,10 +247,10 @@
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-	DEBUG ("Activated: %s", priv->events ? "event" : "toggle");
+	DEBUG ("%s", priv->event ? "event" : "toggle");
 
-	if (priv->events) {
-		status_icon_event_activate (icon, priv->events->data);
+	if (priv->event) {
+		empathy_event_activate (priv->event);
 	} else {
 		status_icon_toggle_visibility (icon);
 	}
@@ -439,215 +342,6 @@
 }
 
 static void
-status_icon_channel_process (EmpathyStatusIcon *icon,
-			     gpointer           user_data)
-{
-	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	TpChannel             *channel = TP_CHANNEL (user_data);
-
-	empathy_dispatcher_channel_process (priv->dispatcher, channel);
-}
-
-static gboolean
-status_icon_chat_unref_idle (gpointer user_data)
-{
-	g_object_unref (user_data);
-	return FALSE;
-}
-
-static void
-status_icon_chat_message_received_cb (EmpathyTpChat     *tp_chat,
-				      EmpathyMessage    *message,
-				      EmpathyStatusIcon *icon)
-{
-	EmpathyContact  *sender;
-	gchar           *msg;
-	TpChannel       *channel;
-
-	g_idle_add (status_icon_chat_unref_idle, tp_chat);
-	g_signal_handlers_disconnect_by_func (tp_chat,
-					      status_icon_chat_message_received_cb,
-					      icon);
-
-	sender = empathy_message_get_sender (message);
-	msg = g_strdup_printf (_("New message from %s:\n%s"),
-			       empathy_contact_get_name (sender),
-			       empathy_message_get_body (message));
-
-	channel = empathy_tp_chat_get_channel (tp_chat);
-	status_icon_event_add (icon, EMPATHY_IMAGE_NEW_MESSAGE, msg,
-			       status_icon_channel_process,
-			       channel, channel);
-
-	g_free (msg);
-}
-
-static void
-status_icon_filter_channel_cb (EmpathyDispatcher *dispatcher,
-			       TpChannel         *channel,
-			       EmpathyStatusIcon *icon)
-{
-	gchar *channel_type;
-
-	g_object_get (channel, "channel-type", &channel_type, NULL);
-	if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_TEXT)) {
-		EmpathyTpChat *tp_chat;
-
-		tp_chat = empathy_tp_chat_new (channel);
-		g_signal_connect (tp_chat, "message-received",
-				  G_CALLBACK (status_icon_chat_message_received_cb),
-				  icon);
-	}
-	else if (!tp_strdiff (channel_type, TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA)) {
-		EmpathyTpGroup *tp_group;
-		EmpathyContact *contact;
-		gchar          *msg;
-
-		tp_group = empathy_tp_group_new (channel);
-		empathy_run_until_ready (tp_group);
-		empathy_tp_group_get_invitation (tp_group, &contact);
-		empathy_contact_run_until_ready (contact,
-						 EMPATHY_CONTACT_READY_NAME,
-						 NULL);
-
-		msg = g_strdup_printf (_("Incoming call from %s"),
-				       empathy_contact_get_name (contact));
-
-		status_icon_event_add (icon, EMPATHY_IMAGE_VOIP, msg,
-				       status_icon_channel_process,
-				       channel, channel);
-
-		g_free (msg);
-		g_object_unref (contact);
-		g_object_unref (tp_group);
-	}
-
-	g_free (channel_type);
-}
-
-static void
-status_icon_dispatch_channel_cb (EmpathyDispatcher *dispatcher,
-				 TpChannel         *channel,
-				 EmpathyStatusIcon *icon)
-{
-	status_icon_event_remove_by_channel (icon, channel);
-}
-
-static void
-status_icon_tube_process (EmpathyStatusIcon *icon,
-			  gpointer           user_data)
-{
-	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	EmpathyDispatcherTube *tube = (EmpathyDispatcherTube*) user_data;
-
-	if (tube->activatable) {
-		empathy_dispatcher_tube_process (priv->dispatcher, tube);
-	} else {
-		GtkWidget *dialog;
-		gchar     *str;
-
-		/* Tell the user that the tube can't be handled */
-		str = g_strdup_printf (_("%s offered you an invitation, but "
-					 "you don't have the needed external "
-					 "application to handle it."),
-				       empathy_contact_get_name (tube->initiator));
-
-		dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL,
-						 GTK_MESSAGE_ERROR,
-						 GTK_BUTTONS_OK,
-						 "%s", str);
-		gtk_window_set_title (GTK_WINDOW (dialog),
-				      _("Invitation Error"));
-		g_free (str);
-
-		gtk_widget_show (dialog);
-		g_signal_connect (dialog, "response",
-				  G_CALLBACK (gtk_widget_destroy),
-				  NULL);
-	}
-
-	empathy_dispatcher_tube_unref (tube);
-}
-
-static void
-status_icon_filter_tube_cb (EmpathyDispatcher     *dispatcher,
-			    EmpathyDispatcherTube *tube,
-			    EmpathyStatusIcon     *icon)
-{
-	const gchar *icon_name;
-	gchar       *msg;
-
-	empathy_contact_run_until_ready (tube->initiator,
-					 EMPATHY_CONTACT_READY_NAME, NULL);
-
-	if (tube->activatable) {
-		icon_name = GTK_STOCK_EXECUTE;
-		msg = g_strdup_printf (_("%s is offering you an invitation. An external "
-					 "application will be started to handle it."),
-				       empathy_contact_get_name (tube->initiator));
-	} else {
-		icon_name = GTK_STOCK_DIALOG_ERROR;
-		msg = g_strdup_printf (_("%s is offering you an invitation, but "
-					 "you don't have the needed external "
-					 "application to handle it."),
-				       empathy_contact_get_name (tube->initiator));
-	}
-
-	status_icon_event_add (icon, icon_name, msg, status_icon_tube_process,
-			       empathy_dispatcher_tube_ref (tube),
-			       tube->channel);
-
-	g_free (msg);
-}
-
-static void
-status_icon_pending_subscribe (EmpathyStatusIcon *icon,
-			       gpointer           user_data)
-{
-	EmpathyContact *contact = EMPATHY_CONTACT (user_data);
-
-	empathy_subscription_dialog_show (contact, NULL);
-	g_object_unref (contact);
-}
-
-static void
-status_icon_pendings_changed_cb (EmpathyContactList *list,
-				 EmpathyContact     *contact,
-				 EmpathyContact     *actor,
-				 guint               reason,
-				 gchar              *message,
-				 gboolean            is_pending,
-				 EmpathyStatusIcon  *icon)
-{
-	GString *str;
-
-	if (!is_pending) {
-		/* FIXME: remove event if any */
-		return;
-	}
-
-	DEBUG ("New local pending contact");
-
-	empathy_contact_run_until_ready (contact,
-					 EMPATHY_CONTACT_READY_NAME,
-					 NULL);
-
-	str = g_string_new (NULL);
-	g_string_printf (str, _("Subscription requested by %s"),
-			 empathy_contact_get_name (contact));	
-	if (!G_STR_EMPTY (message)) {
-		g_string_append_printf (str, _("\nMessage: %s"), message);
-	}
-
-	status_icon_event_add (icon, GTK_STOCK_DIALOG_QUESTION, str->str,
-			       status_icon_pending_subscribe,
-			       g_object_ref (contact),
-			       NULL);
-
-	g_string_free (str, TRUE);
-}
-
-static void
 status_icon_finalize (GObject *object)
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (object);
@@ -657,13 +351,11 @@
 	}
 
 	empathy_disconnect_account_status_changed (priv->token);
-	g_slist_foreach (priv->events, (GFunc) status_icon_event_free, NULL);
-	g_slist_free (priv->events);
 
 	g_object_unref (priv->icon);
 	g_object_unref (priv->idle);
 	g_object_unref (priv->mc);
-	g_object_unref (priv->contact_manager);
+	g_object_unref (priv->event_manager);
 }
 
 static void
@@ -713,8 +405,7 @@
 	priv->icon = gtk_status_icon_new ();
 	priv->mc = empathy_mission_control_new ();
 	priv->idle = empathy_idle_new ();
-	priv->dispatcher = empathy_dispatcher_new ();
-	priv->contact_manager = empathy_contact_manager_new ();
+	priv->event_manager = empathy_event_manager_new ();
 	priv->token = empathy_connect_to_account_status_changed (priv->mc,
 			G_CALLBACK (status_icon_status_changed_cb),
 			icon, NULL);
@@ -731,17 +422,11 @@
 	g_signal_connect_swapped (priv->idle, "notify",
 				  G_CALLBACK (status_icon_idle_notify_cb),
 				  icon);
-	g_signal_connect (priv->dispatcher, "filter-channel",
-			  G_CALLBACK (status_icon_filter_channel_cb),
-			  icon);
-	g_signal_connect (priv->dispatcher, "dispatch-channel",
-			  G_CALLBACK (status_icon_dispatch_channel_cb),
-			  icon);
-	g_signal_connect (priv->dispatcher, "filter-tube",
-			  G_CALLBACK (status_icon_filter_tube_cb),
+	g_signal_connect (priv->event_manager, "event-added",
+			  G_CALLBACK (status_icon_event_added_cb),
 			  icon);
-	g_signal_connect (priv->contact_manager, "pendings-changed",
-			  G_CALLBACK (status_icon_pendings_changed_cb),
+	g_signal_connect (priv->event_manager, "event-removed",
+			  G_CALLBACK (status_icon_event_removed_cb),
 			  icon);
 	g_signal_connect (priv->icon, "activate",
 			  G_CALLBACK (status_icon_activate_cb),