Drop Chandler and Filter, do not use MC for dispatching channels, do it ourself.

svn path=/trunk/; revision=967

1 files changed, 168 insertions, 568 deletions

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 18788fb7d..cd086d199 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -27,18 +27,10 @@
 #include <glade/glade.h>
 #include <glib/gi18n.h>
 
-#include <libmissioncontrol/mission-control.h>
-
-#include <libempathy/empathy-contact-list.h>
-#include <libempathy/empathy-contact-manager.h>
-#include <libempathy/empathy-contact.h>
-#include <libempathy/empathy-tp-chat.h>
 #include <libempathy/empathy-debug.h>
 #include <libempathy/empathy-utils.h>
 #include <libempathy/empathy-idle.h>
-#include <libempathy/empathy-filter.h>
 
-#include <libempathy-gtk/empathy-contact-dialogs.h>
 #include <libempathy-gtk/empathy-presence-chooser.h>
 #include <libempathy-gtk/empathy-conf.h>
 #include <libempathy-gtk/empathy-ui-utils.h>
@@ -48,7 +40,7 @@
 
 #include "empathy-status-icon.h"
 #include "empathy-preferences.h"
-
+#include "empathy-filter.h"
 
 #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
 		       EMPATHY_TYPE_STATUS_ICON, EmpathyStatusIconPriv))
@@ -61,88 +53,52 @@
 typedef struct _StatusIconEvent StatusIconEvent;
 
 struct _EmpathyStatusIconPriv {
-	GtkStatusIcon         *icon;
-	EmpathyContactManager *manager;
-	EmpathyFilter         *text_filter;
-	EmpathyFilter         *call_filter;
-	EmpathyIdle           *idle;
-	MissionControl        *mc;
-	GList                 *events;
-	gboolean               showing_event_icon;
-	StatusIconEvent       *flash_state_event;
-	guint                  blink_timeout;
-
-	GtkWindow             *window;
-	GtkWidget             *popup_menu;
-	GtkWidget             *show_window_item;
-	GtkWidget             *message_item;
-	GtkWidget             *status_item;
+	GtkStatusIcon      *icon;
+	EmpathyIdle        *idle;
+	EmpathyFilter      *filter;
+	EmpathyFilterEvent *event;
+	gboolean            showing_event_icon;
+	guint               blink_timeout;
+
+	GtkWindow          *window;
+	GtkWidget          *popup_menu;
+	GtkWidget          *show_window_item;
+	GtkWidget          *message_item;
+	GtkWidget          *status_item;
 };
 
-typedef void (*EventActivatedFunc) (StatusIconEvent *event);
+G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
 
-struct _StatusIconEvent {
-	gchar              *icon_name;
-	gchar              *message;
-	EventActivatedFunc  func;
-	gpointer            user_data;
-};
+static void
+status_icon_set_visibility (EmpathyStatusIcon *icon,
+			    gboolean           visible,
+			    gboolean           store)
+{
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
+	if (store) {
+		empathy_conf_set_bool (empathy_conf_get (),
+				       EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN, !visible);
+	}
 
-static void       empathy_status_icon_class_init  (EmpathyStatusIconClass *klass);
-static void       empathy_status_icon_init        (EmpathyStatusIcon      *icon);
-static void       status_icon_finalize            (GObject                *object);
-static void       status_icon_text_filter_new_channel (EmpathyFilter      *filter,
-						   TpChannel              *channel,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_call_filter_new_channel (EmpathyFilter      *filter,
-						   TpChannel              *channel,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_message_received_cb (EmpathyTpChat          *tp_chat,
-						   EmpathyMessage         *message,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_idle_notify_cb      (EmpathyStatusIcon      *icon);
-static void       status_icon_update_tooltip      (EmpathyStatusIcon      *icon);
-static void       status_icon_set_from_state      (EmpathyStatusIcon      *icon);
-static void       status_icon_set_visibility      (EmpathyStatusIcon      *icon,
-						   gboolean                visible,
-						   gboolean                store);
-static void       status_icon_toggle_visibility   (EmpathyStatusIcon      *icon);
-static void       status_icon_activate_cb         (GtkStatusIcon          *status_icon,
-						   EmpathyStatusIcon      *icon);
-static gboolean   status_icon_delete_event_cb     (GtkWidget              *widget,
-						   GdkEvent               *event,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_popup_menu_cb       (GtkStatusIcon          *status_icon,
-						   guint                   button,
-						   guint                   activate_time,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_create_menu         (EmpathyStatusIcon      *icon);
-static void       status_icon_new_message_cb      (GtkWidget              *widget,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_quit_cb             (GtkWidget              *window,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_show_hide_window_cb (GtkWidget              *widget,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_pendings_changed_cb (EmpathyContactManager  *manager,
-						   EmpathyContact         *contact,
-						   EmpathyContact         *actor,
-						   guint                   reason,
-						   gchar                  *message,
-						   gboolean                is_pending,
-						   EmpathyStatusIcon      *icon);
-static void       status_icon_event_subscribe_cb  (StatusIconEvent        *event);
-static void       status_icon_event_flash_state_cb (StatusIconEvent       *event);
-static void       status_icon_event_msg_cb        (StatusIconEvent        *event);
-static StatusIconEvent * status_icon_event_new    (EmpathyStatusIcon      *icon,
-						   const gchar            *icon_name,
-						   const gchar            *message);
-static void       status_icon_event_remove        (EmpathyStatusIcon      *icon,
-						   StatusIconEvent        *event);
-static gboolean   status_icon_event_timeout_cb    (EmpathyStatusIcon      *icon);
-static void       status_icon_event_free          (StatusIconEvent        *event);
+	if (!visible) {
+		empathy_window_iconify (priv->window, priv->icon);
+	} else {
+		GList *accounts;
 
-G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
+		empathy_window_present (GTK_WINDOW (priv->window), TRUE);
+	
+		/* Show the accounts dialog if there is no enabled accounts */
+		accounts = mc_accounts_list_by_enabled (TRUE);
+		if (accounts) {
+			mc_accounts_list_free (accounts);
+		} else {
+			empathy_debug (DEBUG_DOMAIN,
+				      "No enabled account, Showing account dialog");
+			empathy_accounts_dialog_show (GTK_WINDOW (priv->window));
+		}
+	}
+}
 
 static void
 status_icon_notify_visibility_cb (EmpathyConf *conf,
@@ -158,389 +114,112 @@ status_icon_notify_visibility_cb (EmpathyConf *conf,
 }
 
 static void
-empathy_status_icon_class_init (EmpathyStatusIconClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	object_class->finalize = status_icon_finalize;
-
-	g_type_class_add_private (object_class, sizeof (EmpathyStatusIconPriv));
-}
-
-static void
-empathy_status_icon_init (EmpathyStatusIcon *icon)
+status_icon_toggle_visibility (EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-	GList                 *pendings, *l;
-
-	priv = GET_PRIV (icon);
-
-	priv->icon = gtk_status_icon_new ();
-	priv->manager = empathy_contact_manager_new ();
-	priv->mc = empathy_mission_control_new ();
-	priv->text_filter = empathy_filter_new ("org.gnome.Empathy.ChatFilter",
-						"/org/gnome/Empathy/ChatFilter",
-						TP_IFACE_CHANNEL_TYPE_TEXT,
-						MC_FILTER_PRIORITY_DIALOG,
-						MC_FILTER_FLAG_INCOMING);
-	priv->call_filter = empathy_filter_new ("org.gnome.Empathy.CallFilter",
-						"/org/gnome/Empathy/CallFilter",
-						TP_IFACE_CHANNEL_TYPE_STREAMED_MEDIA,
-						MC_FILTER_PRIORITY_DIALOG,
-						MC_FILTER_FLAG_INCOMING);
-
-	priv->idle = empathy_idle_new ();
-
-	/* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */
-	empathy_conf_notify_add (empathy_conf_get (),
-				 EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
-				 status_icon_notify_visibility_cb,
-				 icon);
-
-	status_icon_create_menu (icon);
-	status_icon_idle_notify_cb (icon);
-
-	g_signal_connect (priv->text_filter, "new-channel",
-			  G_CALLBACK (status_icon_text_filter_new_channel),
-			  icon);
-	g_signal_connect (priv->call_filter, "new-channel",
-			  G_CALLBACK (status_icon_call_filter_new_channel),
-			  icon);
-	g_signal_connect_swapped (priv->idle, "notify",
-				  G_CALLBACK (status_icon_idle_notify_cb),
-				  icon);
-	g_signal_connect (priv->icon, "activate",
-			  G_CALLBACK (status_icon_activate_cb),
-			  icon);
-	g_signal_connect (priv->icon, "popup-menu",
-			  G_CALLBACK (status_icon_popup_menu_cb),
-			  icon);
-	g_signal_connect (priv->manager, "pendings-changed",
-			  G_CALLBACK (status_icon_pendings_changed_cb),
-			  icon);
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+	gboolean               visible;
 
-	pendings = empathy_contact_list_get_pendings (EMPATHY_CONTACT_LIST (priv->manager));
-	for (l = pendings; l; l = l->next) {
-		EmpathyPendingInfo *info;
-
-		info = l->data;
-		status_icon_pendings_changed_cb (priv->manager,
-						 info->member,
-						 info->actor,
-						 0,
-						 info->message,
-						 TRUE,
-						 icon);
-		empathy_pending_info_free (info);
-	}
-	g_list_free (pendings);
+	visible = gtk_window_is_active (priv->window);
+	status_icon_set_visibility (icon, !visible, TRUE);
 }
 
 static void
-status_icon_finalize (GObject *object)
+status_icon_update_tooltip (EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-
-	priv = GET_PRIV (object);
-
-	g_list_foreach (priv->events, (GFunc) status_icon_event_free, NULL);
-	g_list_free (priv->events);
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+	const gchar           *tooltip = NULL;
 
-	if (priv->blink_timeout) {
-		g_source_remove (priv->blink_timeout);
+	if (priv->event) {
+		tooltip = priv->event->message;
 	}
 
-	g_object_unref (priv->icon);
-	g_object_unref (priv->window);
-	g_object_unref (priv->idle);
-	g_object_unref (priv->manager);
-	g_object_unref (priv->mc);
-	g_object_unref (priv->text_filter);
-	g_object_unref (priv->call_filter);
-}
-
-EmpathyStatusIcon *
-empathy_status_icon_new (GtkWindow *window)
-{
-	EmpathyStatusIconPriv *priv;
-	EmpathyStatusIcon     *icon;
-	gboolean               should_hide;
-
-	g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
-
-	icon = g_object_new (EMPATHY_TYPE_STATUS_ICON, NULL);
-	priv = GET_PRIV (icon);
-
-	priv->window = g_object_ref (window);
-
-	g_signal_connect (priv->window, "delete-event",
-			  G_CALLBACK (status_icon_delete_event_cb),
-			  icon);
-
-	empathy_conf_get_bool (empathy_conf_get (),
-			      EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
-			      &should_hide);
-
-	if (gtk_window_is_active (priv->window) == should_hide) {
-		status_icon_set_visibility (icon, !should_hide, FALSE);
+	if (!tooltip) {
+		tooltip = empathy_idle_get_status (priv->idle);
 	}
 
-	return icon;
-}
-
-static void
-status_icon_text_filter_new_channel (EmpathyFilter     *filter,
-				     TpChannel         *channel,
-				     EmpathyStatusIcon *icon)
-{
-	EmpathyTpChat *tp_chat;
-
-	empathy_debug (DEBUG_DOMAIN, "New text channel to be filtered for contact %p",
-		       channel);
-
-	tp_chat = empathy_tp_chat_new (channel, FALSE);
-	g_object_set_data (G_OBJECT (tp_chat), "filter", filter);
-	g_object_set_data (G_OBJECT (tp_chat), "channel", channel);
-
-	g_signal_connect (tp_chat, "message-received",
-			  G_CALLBACK (status_icon_message_received_cb),
-			  icon);
-}
-
-static void
-status_icon_message_received_cb (EmpathyTpChat     *tp_chat,
-				 EmpathyMessage    *message,
-				 EmpathyStatusIcon *icon)
-{
-	EmpathyContact  *sender;
-	gchar           *msg;
-	StatusIconEvent *event;
-
-	empathy_debug (DEBUG_DOMAIN, "Message received, add event");
-
-	g_signal_handlers_disconnect_by_func (tp_chat,
-			  		      status_icon_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));
-
-	event = status_icon_event_new (icon, EMPATHY_IMAGE_NEW_MESSAGE, msg);
-	event->func = status_icon_event_msg_cb;
-	event->user_data = tp_chat;
-	g_free (msg);
+	gtk_status_icon_set_tooltip (priv->icon, tooltip);	
 }
 
 static void
-status_icon_event_call_cb (StatusIconEvent *event)
+status_icon_update_icon (EmpathyStatusIcon *icon)
 {
-	EmpathyTpGroup *group;
-	EmpathyFilter  *filter;
-	TpChannel      *channel;
-
-	empathy_debug (DEBUG_DOMAIN, "Dispatching call channel");
-
-	group = event->user_data;
-	filter = g_object_get_data (G_OBJECT (group), "filter");
-	channel = g_object_get_data (G_OBJECT (group), "channel");
-	empathy_filter_process (filter, channel, TRUE);
-	g_object_unref (group);
-}
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+	const gchar           *icon_name;
 
-static void
-status_icon_call_filter_new_channel (EmpathyFilter     *filter,
-				     TpChannel         *channel,
-				     EmpathyStatusIcon *icon)
-{
-	EmpathyTpGroup     *group;
-	EmpathyPendingInfo *invitation;
-	EmpathyContact     *contact = NULL;
-
-	empathy_debug (DEBUG_DOMAIN, "New media channel to be filtered");
-
-	/* FIXME: We have to check if the user is member or local-pending to
-	 * know if it's an incoming or outgoing call because of the way we
-	 * request media channels MC can't know if it's incoming or outgoing */
-	group = empathy_tp_group_new (channel);
-	empathy_run_until_ready (group);
-
-	invitation = empathy_tp_group_get_invitation (group, &contact);	
-	if (!invitation) {
-		empathy_debug (DEBUG_DOMAIN, "Process OUTGOING call channel");
-		empathy_filter_process (filter, channel, TRUE);
+	if (priv->event && priv->showing_event_icon) {
+		icon_name = priv->event->icon_name;
 	} else {
-		StatusIconEvent *event;
-		gchar           *msg;
-
-		/* We are local pending, it's an incoming call, we need to ask
-		 * the user if he wants to accept the call. */
-		empathy_contact_run_until_ready (contact,
-						 EMPATHY_CONTACT_READY_NAME,
-						 NULL);
-
-		empathy_debug (DEBUG_DOMAIN, "INCOMING call, add event");
-
-		msg = g_strdup_printf (_("Incoming call from %s:\n%s"),
-				       empathy_contact_get_name (contact),
-				       invitation->message);
-
-		g_object_set_data (G_OBJECT (group), "filter", filter);
-		g_object_set_data (G_OBJECT (group), "channel", channel);
-		event = status_icon_event_new (icon, EMPATHY_IMAGE_VOIP, msg);
-		event->func = status_icon_event_call_cb;
-		event->user_data = group;
-		g_free (msg);
-	}
+		McPresence state;
 
-	if (contact) {
-		g_object_unref (contact);
+		state = empathy_idle_get_state (priv->idle);
+		icon_name = empathy_icon_name_for_presence (state);
 	}
+
+	gtk_status_icon_set_from_icon_name (priv->icon, icon_name);
 }
 
 static void
 status_icon_idle_notify_cb (EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-	McPresence             flash_state;
-
-	priv = GET_PRIV (icon);
-
-	flash_state = empathy_idle_get_flash_state (priv->idle);
-	if (flash_state != MC_PRESENCE_UNSET) {
-		const gchar *icon_name;
-
-		icon_name = empathy_icon_name_for_presence (flash_state);
-		if (!priv->flash_state_event) {
-			/* We are now flashing */
-			priv->flash_state_event = status_icon_event_new (icon, icon_name, NULL);
-			priv->flash_state_event->user_data = icon;
-			priv->flash_state_event->func = status_icon_event_flash_state_cb;
-		} else {
-			/* We are still flashing but with another state */
-			g_free (priv->flash_state_event->icon_name);
-			priv->flash_state_event->icon_name = g_strdup (icon_name);
-		}
-	}
-	else if (priv->flash_state_event) {
-		/* We are no more flashing */
-		status_icon_event_remove (icon, priv->flash_state_event);
-		priv->flash_state_event = NULL;
-	}
-
-	if (!priv->showing_event_icon) {
-		status_icon_set_from_state (icon);
-	}
-
+	status_icon_update_icon (icon);
 	status_icon_update_tooltip (icon);
 }
 
-static void
-status_icon_update_tooltip (EmpathyStatusIcon *icon)
-{
-	EmpathyStatusIconPriv *priv;
-	const gchar           *tooltip = NULL;
-
-	priv = GET_PRIV (icon);
-
-	if (priv->events) {
-		StatusIconEvent *event;
-
-		event = priv->events->data;
-		tooltip = event->message;
-	}
-
-	if (!tooltip) {
-		tooltip = empathy_idle_get_status (priv->idle);
-	}
-
-	gtk_status_icon_set_tooltip (priv->icon, tooltip);	
-}
-
-static void
-status_icon_set_from_state (EmpathyStatusIcon *icon)
+static gboolean
+status_icon_delete_event_cb (GtkWidget         *widget,
+			     GdkEvent          *event,
+			     EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-	McPresence             state;
-	const gchar           *icon_name;
-
-	priv = GET_PRIV (icon);
-
-	state = empathy_idle_get_state (priv->idle);
-	icon_name = empathy_icon_name_for_presence (state);
-	gtk_status_icon_set_from_icon_name (priv->icon, icon_name);
+	status_icon_set_visibility (icon, FALSE, TRUE);
+	return TRUE;
 }
 
 static void
-status_icon_set_visibility (EmpathyStatusIcon *icon,
-			    gboolean           visible,
-			    gboolean           store)
+status_icon_activate_cb (GtkStatusIcon     *status_icon,
+			 EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-
-	priv = GET_PRIV (icon);
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-	if (store) {
-		empathy_conf_set_bool (empathy_conf_get (),
-				       EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN, !visible);
-	}
+	empathy_debug (DEBUG_DOMAIN, "Activated: %s",
+		       priv->event ? "event" : "toggle");
 
-	if (!visible) {
-		empathy_window_iconify (priv->window, priv->icon);
-	} else {
-		GList *accounts;
+	if (priv->event) {
+		empathy_filter_activate_event (priv->filter, priv->event);
+		priv->event = empathy_filter_get_top_event (priv->filter);
+		status_icon_update_tooltip (icon);
+		status_icon_update_icon (icon);
 
-		empathy_window_present (GTK_WINDOW (priv->window), TRUE);
-	
-		/* Show the accounts dialog if there is no enabled accounts */
-		accounts = mc_accounts_list_by_enabled (TRUE);
-		if (accounts) {
-			mc_accounts_list_free (accounts);
-		} else {
-			empathy_debug (DEBUG_DOMAIN,
-				      "No enabled account, Showing account dialog");
-			empathy_accounts_dialog_show (GTK_WINDOW (priv->window));
+		if (!priv->event && priv->blink_timeout) {
+			g_source_remove (priv->blink_timeout);
+			priv->blink_timeout = 0;
 		}
+	} else {
+		status_icon_toggle_visibility (icon);
 	}
 }
 
 static void
-status_icon_toggle_visibility (EmpathyStatusIcon *icon)
+status_icon_show_hide_window_cb (GtkWidget         *widget,
+				 EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	gboolean               visible;
+	gboolean visible;
 
-	visible = gtk_window_is_active (priv->window);
-	status_icon_set_visibility (icon, !visible, TRUE);
+	visible = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+	status_icon_set_visibility (icon, visible, TRUE);
 }
 
 static void
-status_icon_activate_cb (GtkStatusIcon     *status_icon,
-			 EmpathyStatusIcon *icon)
+status_icon_new_message_cb (GtkWidget         *widget,
+			    EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-
-	priv = GET_PRIV (icon);
-
-	empathy_debug (DEBUG_DOMAIN, "Activated: %s",
-		       priv->events ? "event" : "toggle");
-
-	if (priv->events) {
-		status_icon_event_remove (icon, priv->events->data);
-	} else {
-		status_icon_toggle_visibility (icon);
-	}
+	empathy_new_message_dialog_show (NULL);
 }
 
-static gboolean
-status_icon_delete_event_cb (GtkWidget         *widget,
-			     GdkEvent          *event,
-			     EmpathyStatusIcon *icon)
+static void
+status_icon_quit_cb (GtkWidget         *window,
+		     EmpathyStatusIcon *icon)
 {
-	status_icon_set_visibility (icon, FALSE, TRUE);
-
-	return TRUE;
+	gtk_main_quit ();
 }
 
 static void
@@ -549,12 +228,10 @@ status_icon_popup_menu_cb (GtkStatusIcon     *status_icon,
 			   guint              activate_time,
 			   EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 	GtkWidget             *submenu;
 	gboolean               show;
 
-	priv = GET_PRIV (icon);
-
 	show = empathy_window_get_is_visible (GTK_WINDOW (priv->window));
 
 	g_signal_handlers_block_by_func (priv->show_window_item,
@@ -581,12 +258,10 @@ status_icon_popup_menu_cb (GtkStatusIcon     *status_icon,
 static void
 status_icon_create_menu (EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 	GladeXML              *glade;
 	gchar                 *filename;
 
-	priv = GET_PRIV (icon);
-
 	filename = empathy_file_lookup ("empathy-status-icon.glade", "src");
 	glade = empathy_glade_get_file (filename,
 				       "tray_menu",
@@ -608,191 +283,116 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 	g_object_unref (glade);
 }
 
-static void
-status_icon_new_message_cb (GtkWidget         *widget,
-			    EmpathyStatusIcon *icon)
+static gboolean
+status_icon_blink_timeout_cb (EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-	priv = GET_PRIV (icon);
+	priv->showing_event_icon = !priv->showing_event_icon;
+	status_icon_update_icon (icon);
 
-	empathy_new_message_dialog_show (NULL);
+	return TRUE;
 }
 
 static void
-status_icon_quit_cb (GtkWidget         *window,
-		     EmpathyStatusIcon *icon)
+status_icon_top_event_notify_cb (EmpathyStatusIcon *icon)
 {
-	gtk_main_quit ();
-}
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-static void
-status_icon_show_hide_window_cb (GtkWidget         *widget,
-				 EmpathyStatusIcon *icon)
-{
-	gboolean visible;
+	priv->event = empathy_filter_get_top_event (priv->filter);
+	priv->showing_event_icon = priv->event != NULL;
+	status_icon_update_icon (icon);
+	status_icon_update_tooltip (icon);
 
-	visible = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
-	status_icon_set_visibility (icon, visible, TRUE);
+	if (!priv->blink_timeout) {
+		priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
+						     (GSourceFunc) status_icon_blink_timeout_cb,
+						     icon);
+	}
 }
 
 static void
-status_icon_pendings_changed_cb (EmpathyContactManager *manager,
-				 EmpathyContact        *contact,
-				 EmpathyContact        *actor,
-				 guint                  reason,
-				 gchar                 *message,
-				 gboolean               is_pending,
-				 EmpathyStatusIcon     *icon)
+status_icon_finalize (GObject *object)
 {
-	EmpathyStatusIconPriv *priv;
-	StatusIconEvent       *event;
-	GString               *str;
-
-	priv = GET_PRIV (icon);
-
-	if (!is_pending) {
-		/* FIXME: We should remove the event */
-		return;
-	}
+	EmpathyStatusIconPriv *priv = GET_PRIV (object);
 
-	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);
+	if (priv->blink_timeout) {
+		g_source_remove (priv->blink_timeout);
 	}
 
-	event = status_icon_event_new (icon, GTK_STOCK_DIALOG_QUESTION, str->str);
-	event->user_data = g_object_ref (contact);
-	event->func = status_icon_event_subscribe_cb;
-
-	g_string_free (str, TRUE);
+	g_object_unref (priv->icon);
+	g_object_unref (priv->idle);
+	g_object_unref (priv->filter);
 }
 
 static void
-status_icon_event_subscribe_cb (StatusIconEvent *event)
+empathy_status_icon_class_init (EmpathyStatusIconClass *klass)
 {
-	EmpathyContact *contact;
-
-	contact = EMPATHY_CONTACT (event->user_data);
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	empathy_subscription_dialog_show (contact, NULL);
+	object_class->finalize = status_icon_finalize;
 
-	g_object_unref (contact);
+	g_type_class_add_private (object_class, sizeof (EmpathyStatusIconPriv));
 }
 
 static void
-status_icon_event_flash_state_cb (StatusIconEvent *event)
+empathy_status_icon_init (EmpathyStatusIcon *icon)
 {
-	EmpathyStatusIconPriv *priv;
-
-	priv = GET_PRIV (event->user_data);
-
-	empathy_idle_set_flash_state (priv->idle, MC_PRESENCE_UNSET);
-}
+	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-static void
-status_icon_event_msg_cb (StatusIconEvent *event)
-{
-	EmpathyFilter *filter;
-	EmpathyTpChat *tp_chat;
-	TpChannel     *channel;
+	priv->icon = gtk_status_icon_new ();
+	priv->idle = empathy_idle_new ();
+	priv->filter = empathy_filter_new ();
 
-	empathy_debug (DEBUG_DOMAIN, "Dispatching text channel");
+	/* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */
+	empathy_conf_notify_add (empathy_conf_get (),
+				 EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+				 status_icon_notify_visibility_cb,
+				 icon);
 
-	tp_chat = event->user_data;
-	filter = g_object_get_data (G_OBJECT (tp_chat), "filter");
-	channel = g_object_get_data (G_OBJECT (tp_chat), "channel");
-	empathy_filter_process (filter, channel, TRUE);
+	status_icon_create_menu (icon);
+	status_icon_idle_notify_cb (icon);
 
-	g_object_unref (tp_chat);
+	g_signal_connect_swapped (priv->idle, "notify",
+				  G_CALLBACK (status_icon_idle_notify_cb),
+				  icon);
+	g_signal_connect_swapped (priv->filter, "notify::top-event",
+				  G_CALLBACK (status_icon_top_event_notify_cb),
+				  icon);
+	g_signal_connect (priv->icon, "activate",
+			  G_CALLBACK (status_icon_activate_cb),
+			  icon);
+	g_signal_connect (priv->icon, "popup-menu",
+			  G_CALLBACK (status_icon_popup_menu_cb),
+			  icon);
 }
 
-static StatusIconEvent *
-status_icon_event_new (EmpathyStatusIcon *icon,
-		       const gchar       *icon_name,
-		       const gchar       *message)
+EmpathyStatusIcon *
+empathy_status_icon_new (GtkWindow *window)
 {
 	EmpathyStatusIconPriv *priv;
-	StatusIconEvent       *event;
-
-	priv = GET_PRIV (icon);
-
-	event = g_slice_new0 (StatusIconEvent);
-	event->icon_name = g_strdup (icon_name);	
-	event->message = g_strdup (message);
-
-	priv->events = g_list_append (priv->events, event);
-	if (!priv->blink_timeout) {
-		priv->showing_event_icon = FALSE;
-		priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
-						     (GSourceFunc) status_icon_event_timeout_cb,
-						     icon);
-		status_icon_event_timeout_cb (icon);
-		status_icon_update_tooltip (icon);
-	}
-
-	return event;
-}
+	EmpathyStatusIcon     *icon;
+	gboolean               should_hide;
 
-static void
-status_icon_event_remove (EmpathyStatusIcon *icon,
-			  StatusIconEvent   *event)
-{
-	EmpathyStatusIconPriv *priv;
+	g_return_val_if_fail (GTK_IS_WINDOW (window), NULL);
 
+	icon = g_object_new (EMPATHY_TYPE_STATUS_ICON, NULL);
 	priv = GET_PRIV (icon);
 
-	if (event->func) {
-		event->func (event);
-	}
-	priv->events = g_list_remove (priv->events, event);
-	status_icon_event_free (event);
-	priv->showing_event_icon = FALSE;
-	status_icon_update_tooltip (icon);
-	status_icon_set_from_state (icon);
-
-	if (priv->events) {
-		return;
-	}
-
-	if (priv->blink_timeout) {
-		g_source_remove (priv->blink_timeout);
-		priv->blink_timeout = 0;
-	}
-}
-
-static gboolean
-status_icon_event_timeout_cb (EmpathyStatusIcon *icon)
-{
-	EmpathyStatusIconPriv *priv;
-
-	priv = GET_PRIV (icon);
+	priv->window = g_object_ref (window);
 
-	priv->showing_event_icon = !priv->showing_event_icon;
+	g_signal_connect (priv->window, "delete-event",
+			  G_CALLBACK (status_icon_delete_event_cb),
+			  icon);
 
-	if (!priv->showing_event_icon) {
-		status_icon_set_from_state (icon);
-	} else {
-		StatusIconEvent *event;
+	empathy_conf_get_bool (empathy_conf_get (),
+			      EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+			      &should_hide);
 
-		event = priv->events->data;
-		gtk_status_icon_set_from_icon_name (priv->icon, event->icon_name);
+	if (gtk_window_is_active (priv->window) == should_hide) {
+		status_icon_set_visibility (icon, !should_hide, FALSE);
 	}
 
-	return TRUE;
-}
-
-static void
-status_icon_event_free (StatusIconEvent *event)
-{
-	g_free (event->icon_name);
-	g_free (event->message);
-	g_slice_free (StatusIconEvent, event);
+	return icon;
 }