]> git.0d.be Git - empathy.git/blobdiff - src/empathy-status-icon.c
Add -Wformat and and fix some compile warnings with gcc 4.3. Fixes bug #537129 (Cosim...
[empathy.git] / src / empathy-status-icon.c
index aee16682b06b574574cdbbaf575eaeefa131a35b..3c2e7a679202627c0327c180ba13760a0899ce91 100644 (file)
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
 
-#include <libmissioncontrol/mission-control.h>
+#include <telepathy-glib/util.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/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-contact-dialogs.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-accounts-dialog.h>
 #include <libempathy-gtk/empathy-images.h>
 #include <libempathy-gtk/empathy-new-message-dialog.h>
+#include <libempathy-gtk/empathy-contact-dialogs.h>
 
 #include "empathy-status-icon.h"
 #include "empathy-preferences.h"
 
-
-#define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
-                      EMPATHY_TYPE_STATUS_ICON, EmpathyStatusIconPriv))
-
-#define DEBUG_DOMAIN "StatusIcon"
+#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
+#include <libempathy/empathy-debug.h>
 
 /* Number of ms to wait when blinking */
 #define BLINK_TIMEOUT 500
 
 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;
-};
-
-typedef void (*EventActivatedFunc) (StatusIconEvent *event);
+#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;
+} EmpathyStatusIconPriv;
+
+typedef void (*StatusIconEventFunc) (EmpathyStatusIcon *icon,
+                                    gpointer           user_data);
 
 struct _StatusIconEvent {
-       gchar              *icon_name;
-       gchar              *message;
-       EventActivatedFunc  func;
-       gpointer            user_data;
+       gchar               *icon_name;
+       gchar               *message;
+       StatusIconEventFunc  func;
+       gpointer             user_data;
+       TpChannel           *channel;
+       EmpathyStatusIcon   *icon;
 };
 
-
-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,
-                                                  TpConn                 *tp_conn,
-                                                  TpChan                 *tp_chan,
-                                                  EmpathyStatusIcon      *icon);
-static void       status_icon_call_filter_new_channel (EmpathyFilter          *filter,
-                                                  TpConn                 *tp_conn,
-                                                  TpChan                 *tp_chan,
-                                                  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);
-
 G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
 
 static void
-status_icon_notify_visibility_cb (EmpathyConf *conf,
-                                 const gchar *key,
-                                 gpointer     user_data)
+status_icon_update_tooltip (EmpathyStatusIcon *icon)
 {
-       EmpathyStatusIcon *icon = user_data;
-       gboolean           hidden = FALSE;
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       const gchar           *tooltip = NULL;
 
-       if (empathy_conf_get_bool (conf, key, &hidden)) {
-               status_icon_set_visibility (icon, !hidden, FALSE);
+       if (priv->events) {
+               tooltip = ((StatusIconEvent*)priv->events->data)->message;
        }
-}
-
-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)
-{
-       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);
-
-       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);
+       if (!tooltip) {
+               tooltip = empathy_idle_get_status (priv->idle);
        }
-       g_list_free (pendings);
+
+       gtk_status_icon_set_tooltip (priv->icon, tooltip);      
 }
 
 static void
-status_icon_finalize (GObject *object)
+status_icon_update_icon (EmpathyStatusIcon *icon)
 {
-       EmpathyStatusIconPriv *priv;
-
-       priv = GET_PRIV (object);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       const gchar           *icon_name;
 
-       g_list_foreach (priv->events, (GFunc) status_icon_event_free, NULL);
-       g_list_free (priv->events);
+       if (priv->events && priv->showing_event_icon) {
+               icon_name = ((StatusIconEvent*)priv->events->data)->icon_name;
+       } else {
+               McPresence state;
 
-       if (priv->blink_timeout) {
-               g_source_remove (priv->blink_timeout);
+               state = empathy_idle_get_state (priv->idle);
+               icon_name = empathy_icon_name_for_presence (state);
        }
 
-       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);
+       gtk_status_icon_set_from_icon_name (priv->icon, icon_name);
 }
 
-EmpathyStatusIcon *
-empathy_status_icon_new (GtkWindow *window)
+static gboolean
+status_icon_blink_timeout_cb (EmpathyStatusIcon *icon)
 {
-       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);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-       if (gtk_window_is_active (priv->window) == should_hide) {
-               status_icon_set_visibility (icon, !should_hide, FALSE);
-       }
+       priv->showing_event_icon = !priv->showing_event_icon;
+       status_icon_update_icon (icon);
 
-       return icon;
+       return TRUE;
 }
 
-static void
-status_icon_text_filter_new_channel (EmpathyFilter     *filter,
-                                    TpConn            *tp_conn,
-                                    TpChan            *tp_chan,
-                                    EmpathyStatusIcon *icon)
-{
-       EmpathyStatusIconPriv *priv;
-       McAccount             *account;
-       EmpathyTpChat         *tp_chat;
-
-       priv = GET_PRIV (icon);
-
-       account = mission_control_get_account_for_connection (priv->mc, tp_conn, NULL);
-
-       empathy_debug (DEBUG_DOMAIN, "New text channel to be filtered for contact %s",
-                      empathy_inspect_channel (account, tp_chan));
-
-       tp_chat = empathy_tp_chat_new (account, tp_chan, FALSE);
-       g_object_set_data (G_OBJECT (tp_chat), "filter", filter);
-       g_object_unref (account);
-
-       g_signal_connect (tp_chat, "message-received",
-                         G_CALLBACK (status_icon_message_received_cb),
-                         icon);
-}
+static void status_icon_channel_invalidated_cb (TpProxy *channel, guint domain,
+                                               gint code, gchar *message,
+                                               EmpathyStatusIcon *icon);
 
 static void
-status_icon_message_received_cb (EmpathyTpChat     *tp_chat,
-                                EmpathyMessage    *message,
-                                EmpathyStatusIcon *icon)
+status_icon_event_free (StatusIconEvent *event)
 {
-       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);
-}
-
-static void
-status_icon_call_member_added_cb (EmpathyTpGroup    *group,
-                                 EmpathyContact    *member,
-                                 EmpathyContact    *actor,
-                                 guint              reason,
-                                 const gchar       *message,
-                                 EmpathyStatusIcon *icon)
-{
-       EmpathyFilter *filter;
-
-       if (empathy_contact_is_user (member)) {
-               /* We are member, it's an outgoing call, we can dispatch
-                * the channel without asking the user */
-               empathy_debug (DEBUG_DOMAIN, "Process OUTGOING call channel");
-               filter = g_object_get_data (G_OBJECT (group), "filter");
-               empathy_filter_process (filter,
-                                       empathy_tp_group_get_channel (group),
-                                       TRUE);
-               g_object_unref (group);
+       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_call_cb (StatusIconEvent *event)
-{
-       EmpathyFilter  *filter;
-       EmpathyTpGroup *group;
-
-       empathy_debug (DEBUG_DOMAIN, "Dispatching call channel");
-
-       group = event->user_data;
-       filter = g_object_get_data (G_OBJECT (group), "filter");
-       empathy_filter_process (filter,
-                               empathy_tp_group_get_channel (group),
-                               TRUE);
-       g_object_unref (group);
-}
-
-static void
-status_icon_call_local_pending_cb (EmpathyTpGroup    *group,
-                                  EmpathyContact    *member,
-                                  EmpathyContact    *actor,
-                                  guint              reason,
-                                  const gchar       *message,
-                                  EmpathyStatusIcon *icon)
+status_icon_event_remove (EmpathyStatusIcon *icon,
+                         StatusIconEvent   *event)
 {
-       StatusIconEvent *event;
-
-       if (empathy_contact_is_user (member)) {
-               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 (member,
-                                                EMPATHY_CONTACT_READY_NAME,
-                                                NULL);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       GSList                *l;
 
-               empathy_debug (DEBUG_DOMAIN, "INCOMING call, add event");
+       if (!(l = g_slist_find (priv->events, event))) {
+               return;
+       }
 
-               msg = g_strdup_printf (_("Incoming call from %s:\n%s"),
-                                      empathy_contact_get_name (member),
-                                      message);
+       priv->events = g_slist_delete_link (priv->events, l);           
+       status_icon_event_free (event);
+       status_icon_update_tooltip (icon);
+       status_icon_update_icon (icon);
 
-               event = status_icon_event_new (icon, EMPATHY_IMAGE_VOIP, msg);
-               event->func = status_icon_event_call_cb;
-               event->user_data = group;
-               g_free (msg);
+       if (!priv->events && priv->blink_timeout) {
+               g_source_remove (priv->blink_timeout);
+               priv->blink_timeout = 0;
        }
 }
 
 static void
-status_icon_call_filter_new_channel (EmpathyFilter     *filter,
-                                    TpConn            *tp_conn,
-                                    TpChan            *tp_chan,
-                                    EmpathyStatusIcon *icon)
+status_icon_event_remove_by_channel (EmpathyStatusIcon *icon,
+                                    TpChannel         *channel)
 {
-       EmpathyStatusIconPriv *priv;
-       McAccount             *account;
-       EmpathyTpGroup        *group;
-
-       priv = GET_PRIV (icon);
-
-       account = mission_control_get_account_for_connection (priv->mc, tp_conn, NULL);
-
-       empathy_debug (DEBUG_DOMAIN, "New media channel to be filtered");
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       GSList                *l;
 
-       /* 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 (account, tp_chan);
-       g_object_set_data (G_OBJECT (group), "filter", filter);
-       g_object_unref (account);
+       for (l = priv->events; l; l = l->next) {
+               StatusIconEvent *event = l->data;
 
-       g_signal_connect (group, "member-added",
-                         G_CALLBACK (status_icon_call_member_added_cb),
-                         icon);
-       g_signal_connect (group, "local-pending",
-                         G_CALLBACK (status_icon_call_local_pending_cb),
-                         icon);
+               if (event->channel &&
+                   empathy_proxy_equal (event->channel, channel)) {
+                       DEBUG ("Found event '%s'", event->message);
+                       status_icon_event_remove (icon, event);
+                       break;
+               }
+       }
 }
 
 static void
-status_icon_idle_notify_cb (EmpathyStatusIcon *icon)
+status_icon_event_activate (EmpathyStatusIcon *icon,
+                           StatusIconEvent   *event)
 {
-       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);
+       if (event->func) {
+               event->func (icon, event->user_data);
        }
-
-       status_icon_update_tooltip (icon);
+       status_icon_event_remove (icon, event);
 }
 
 static void
-status_icon_update_tooltip (EmpathyStatusIcon *icon)
+status_icon_event_add (EmpathyStatusIcon   *icon,
+                      const gchar         *icon_name,
+                      const gchar         *message,
+                      StatusIconEventFunc  func,
+                      gpointer             user_data,
+                      TpChannel           *channel)
 {
-       EmpathyStatusIconPriv *priv;
-       const gchar           *tooltip = NULL;
-
-       priv = GET_PRIV (icon);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       StatusIconEvent       *event;
+       gboolean               had_events;
 
-       if (priv->events) {
-               StatusIconEvent *event;
+       DEBUG ("Adding event: %s", message);
 
-               event = priv->events->data;
-               tooltip = event->message;
+       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;
+
+       if (channel) {
+               event->channel = g_object_ref (channel);
+               g_signal_connect (channel, "invalidated",
+                                 G_CALLBACK (status_icon_channel_invalidated_cb),
+                                 icon);
        }
 
-       if (!tooltip) {
-               tooltip = empathy_idle_get_status (priv->idle);
-       }
+       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);
 
-       gtk_status_icon_set_tooltip (priv->icon, tooltip);      
+               if (!priv->blink_timeout) {
+                       priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
+                                                            (GSourceFunc) status_icon_blink_timeout_cb,
+                                                            icon);
+               }
+       }
 }
 
 static void
-status_icon_set_from_state (EmpathyStatusIcon *icon)
+status_icon_channel_invalidated_cb (TpProxy           *channel,
+                                   guint              domain,
+                                   gint               code,
+                                   gchar             *message,
+                                   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);
+       DEBUG ("%s", message);
+       status_icon_event_remove_by_channel (icon, TP_CHANNEL (channel));
 }
 
 static void
@@ -521,9 +263,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
                            gboolean           visible,
                            gboolean           store)
 {
-       EmpathyStatusIconPriv *priv;
-
-       priv = GET_PRIV (icon);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
        if (store) {
                empathy_conf_set_bool (empathy_conf_get (),
@@ -536,19 +276,31 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
                GList *accounts;
 
                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");
+                       DEBUG ("No enabled account, Showing account dialog");
                        empathy_accounts_dialog_show (GTK_WINDOW (priv->window));
                }
        }
 }
 
+static void
+status_icon_notify_visibility_cb (EmpathyConf *conf,
+                                 const gchar *key,
+                                 gpointer     user_data)
+{
+       EmpathyStatusIcon *icon = user_data;
+       gboolean           hidden = FALSE;
+
+       if (empathy_conf_get_bool (conf, key, &hidden)) {
+               status_icon_set_visibility (icon, !hidden, FALSE);
+       }
+}
+
 static void
 status_icon_toggle_visibility (EmpathyStatusIcon *icon)
 {
@@ -559,32 +311,70 @@ status_icon_toggle_visibility (EmpathyStatusIcon *icon)
        status_icon_set_visibility (icon, !visible, TRUE);
 }
 
+static void
+status_icon_idle_notify_cb (EmpathyStatusIcon *icon)
+{
+       status_icon_update_icon (icon);
+       status_icon_update_tooltip (icon);
+}
+
+static gboolean
+status_icon_delete_event_cb (GtkWidget         *widget,
+                            GdkEvent          *event,
+                            EmpathyStatusIcon *icon)
+{
+       status_icon_set_visibility (icon, FALSE, TRUE);
+       return TRUE;
+}
+
+static gboolean
+status_icon_key_press_event_cb  (GtkWidget *window,
+                                GdkEventKey *event,
+                                EmpathyStatusIcon *icon)
+{
+       if (event->keyval == GDK_Escape) {
+               status_icon_set_visibility (icon, FALSE, TRUE);
+       }
+       return FALSE;
+}
+                               
 static void
 status_icon_activate_cb (GtkStatusIcon     *status_icon,
                         EmpathyStatusIcon *icon)
 {
-       EmpathyStatusIconPriv *priv;
-
-       priv = GET_PRIV (icon);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
 
-       empathy_debug (DEBUG_DOMAIN, "Activated: %s",
-                      priv->events ? "event" : "toggle");
+       DEBUG ("Activated: %s", priv->events ? "event" : "toggle");
 
        if (priv->events) {
-               status_icon_event_remove (icon, priv->events->data);
+               status_icon_event_activate (icon, priv->events->data);
        } else {
                status_icon_toggle_visibility (icon);
        }
 }
 
-static gboolean
-status_icon_delete_event_cb (GtkWidget         *widget,
-                            GdkEvent          *event,
-                            EmpathyStatusIcon *icon)
+static void
+status_icon_show_hide_window_cb (GtkWidget         *widget,
+                                EmpathyStatusIcon *icon)
 {
-       status_icon_set_visibility (icon, FALSE, TRUE);
+       gboolean visible;
 
-       return TRUE;
+       visible = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+       status_icon_set_visibility (icon, visible, TRUE);
+}
+
+static void
+status_icon_new_message_cb (GtkWidget         *widget,
+                           EmpathyStatusIcon *icon)
+{
+       empathy_new_message_dialog_show (NULL);
+}
+
+static void
+status_icon_quit_cb (GtkWidget         *window,
+                    EmpathyStatusIcon *icon)
+{
+       gtk_main_quit ();
 }
 
 static void
@@ -593,12 +383,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,
@@ -625,12 +413,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",
@@ -653,53 +439,195 @@ status_icon_create_menu (EmpathyStatusIcon *icon)
 }
 
 static void
-status_icon_new_message_cb (GtkWidget         *widget,
-                           EmpathyStatusIcon *icon)
+status_icon_channel_process (EmpathyStatusIcon *icon,
+                            gpointer           user_data)
 {
-       EmpathyStatusIconPriv *priv;
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       TpChannel             *channel = TP_CHANNEL (user_data);
 
-       priv = GET_PRIV (icon);
+       empathy_dispatcher_channel_process (priv->dispatcher, channel);
+}
 
-       empathy_new_message_dialog_show (NULL);
+static gboolean
+status_icon_chat_unref_idle (gpointer user_data)
+{
+       g_object_unref (user_data);
+       return FALSE;
 }
 
 static void
-status_icon_quit_cb (GtkWidget         *window,
-                    EmpathyStatusIcon *icon)
+status_icon_chat_message_received_cb (EmpathyTpChat     *tp_chat,
+                                     EmpathyMessage    *message,
+                                     EmpathyStatusIcon *icon)
 {
-       gtk_main_quit ();
+       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_show_hide_window_cb (GtkWidget         *widget,
+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)
 {
-       gboolean visible;
+       status_icon_event_remove_by_channel (icon, channel);
+}
 
-       visible = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
-       status_icon_set_visibility (icon, visible, TRUE);
+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_pendings_changed_cb (EmpathyContactManager *manager,
-                                EmpathyContact        *contact,
-                                EmpathyContact        *actor,
-                                guint                  reason,
-                                gchar                 *message,
-                                gboolean               is_pending,
-                                EmpathyStatusIcon     *icon)
+status_icon_filter_tube_cb (EmpathyDispatcher     *dispatcher,
+                           EmpathyDispatcherTube *tube,
+                           EmpathyStatusIcon     *icon)
 {
-       EmpathyStatusIconPriv *priv;
-       StatusIconEvent       *event;
-       GString               *str;
+       const gchar *icon_name;
+       gchar       *msg;
 
-       priv = GET_PRIV (icon);
+       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: We should remove the event */
+               /* FIXME: remove event if any */
                return;
        }
 
+       DEBUG ("New local pending contact");
+
        empathy_contact_run_until_ready (contact,
                                         EMPATHY_CONTACT_READY_NAME,
                                         NULL);
@@ -711,132 +639,152 @@ status_icon_pendings_changed_cb (EmpathyContactManager *manager,
                g_string_append_printf (str, _("\nMessage: %s"), message);
        }
 
-       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;
+       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_event_subscribe_cb (StatusIconEvent *event)
+status_icon_finalize (GObject *object)
 {
-       EmpathyContact *contact;
+       EmpathyStatusIconPriv *priv = GET_PRIV (object);
 
-       contact = EMPATHY_CONTACT (event->user_data);
+       if (priv->blink_timeout) {
+               g_source_remove (priv->blink_timeout);
+       }
 
-       empathy_subscription_dialog_show (contact, NULL);
+       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 (contact);
+       g_object_unref (priv->icon);
+       g_object_unref (priv->idle);
+       g_object_unref (priv->mc);
+       g_object_unref (priv->contact_manager);
 }
 
 static void
-status_icon_event_flash_state_cb (StatusIconEvent *event)
+empathy_status_icon_class_init (EmpathyStatusIconClass *klass)
 {
-       EmpathyStatusIconPriv *priv;
+       GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-       priv = GET_PRIV (event->user_data);
+       object_class->finalize = status_icon_finalize;
 
-       empathy_idle_set_flash_state (priv->idle, MC_PRESENCE_UNSET);
+       g_type_class_add_private (object_class, sizeof (EmpathyStatusIconPriv));
 }
 
 static void
-status_icon_event_msg_cb (StatusIconEvent *event)
+status_icon_status_changed_cb (MissionControl           *mc,
+                              TpConnectionStatus        status,
+                              McPresence                presence,
+                              TpConnectionStatusReason  reason,
+                              const gchar              *unique_name,
+                              EmpathyStatusIcon        *icon)
 {
-       EmpathyFilter *filter;
-       EmpathyTpChat *tp_chat;
-
-       empathy_debug (DEBUG_DOMAIN, "Dispatching text channel");
-
-       tp_chat = event->user_data;
-       filter = g_object_get_data (G_OBJECT (tp_chat), "filter");
-       empathy_filter_process (filter,
-                               empathy_tp_chat_get_channel (tp_chat),
-                               TRUE);
-
-       g_object_unref (tp_chat);
-}
-
-static StatusIconEvent *
-status_icon_event_new (EmpathyStatusIcon *icon,
-                      const gchar       *icon_name,
-                      const gchar       *message)
-{
-       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);
+       EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+       GList                 *accounts, *l;
+       guint                  connection_status = 1;
+
+       /* Check for a connected account */
+       accounts = mc_accounts_list_by_enabled (TRUE);
+       for (l = accounts; l; l = l->next) {
+               connection_status = mission_control_get_connection_status (priv->mc,
+                                                                          l->data,
+                                                                          NULL);
+               if (connection_status == 0) {
+                       break;
+               }
        }
+       mc_accounts_list_free (accounts);
 
-       return event;
+       gtk_widget_set_sensitive (priv->message_item, connection_status == 0);
 }
 
 static void
-status_icon_event_remove (EmpathyStatusIcon *icon,
-                         StatusIconEvent   *event)
+empathy_status_icon_init (EmpathyStatusIcon *icon)
 {
-       EmpathyStatusIconPriv *priv;
+       EmpathyStatusIconPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (icon,
+               EMPATHY_TYPE_STATUS_ICON, EmpathyStatusIconPriv);
 
-       priv = GET_PRIV (icon);
+       icon->priv = priv;
+       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->token = empathy_connect_to_account_status_changed (priv->mc,
+                       G_CALLBACK (status_icon_status_changed_cb),
+                       icon, NULL);
 
-       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);
+       /* 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);
 
-       if (priv->events) {
-               return;
-       }
+       status_icon_create_menu (icon);
+       status_icon_idle_notify_cb (icon);
 
-       if (priv->blink_timeout) {
-               g_source_remove (priv->blink_timeout);
-               priv->blink_timeout = 0;
-       }
+       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),
+                         icon);
+       g_signal_connect (priv->contact_manager, "pendings-changed",
+                         G_CALLBACK (status_icon_pendings_changed_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 gboolean
-status_icon_event_timeout_cb (EmpathyStatusIcon *icon)
+EmpathyStatusIcon *
+empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list)
 {
        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->showing_event_icon = !priv->showing_event_icon;
+       priv->window = g_object_ref (window);
 
-       if (!priv->showing_event_icon) {
-               status_icon_set_from_state (icon);
-       } else {
-               StatusIconEvent *event;
+       g_signal_connect (priv->window, "key-press-event",
+                         G_CALLBACK (status_icon_key_press_event_cb),
+                         icon);
+
+       g_signal_connect (priv->window, "delete-event",
+                         G_CALLBACK (status_icon_delete_event_cb),
+                         icon);
 
-               event = priv->events->data;
-               gtk_status_icon_set_from_icon_name (priv->icon, event->icon_name);
+       if (!hide_contact_list) {
+               empathy_conf_get_bool (empathy_conf_get (),
+                                      EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+                                      &should_hide);
+       } else {
+               should_hide = TRUE;
        }
 
-       return TRUE;
-}
+       if (gtk_window_is_active (priv->window) == should_hide) {
+               status_icon_set_visibility (icon, !should_hide, FALSE);
+       }
 
-static void
-status_icon_event_free (StatusIconEvent *event)
-{
-       g_free (event->icon_name);
-       g_free (event->message);
-       g_slice_free (StatusIconEvent, event);
+       return icon;
 }