#include <gtk/gtk.h>
#include <glade/glade.h>
-#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
-#include <libempathy/empathy-debug.h>
#include <libempathy/empathy-utils.h>
#include <libempathy/empathy-idle.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 "empathy-accounts-dialog.h"
#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))
+#include "empathy-event-manager.h"
-#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;
- EmpathyIdle *idle;
- MissionControl *mc;
- EmpathyFilter *filter;
- EmpathyFilterEvent *event;
- gboolean showing_event_icon;
- guint blink_timeout;
- gpointer token;
-
- GtkWindow *window;
- GtkWidget *popup_menu;
- GtkWidget *show_window_item;
- GtkWidget *message_item;
- GtkWidget *status_item;
-};
+#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusIcon)
+typedef struct {
+ 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;
G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
+static void
+status_icon_update_tooltip (EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+ const gchar *tooltip = NULL;
+
+ if (priv->event) {
+ tooltip = priv->event->message;
+ }
+
+ if (!tooltip) {
+ tooltip = empathy_idle_get_status (priv->idle);
+ }
+
+ gtk_status_icon_set_tooltip (priv->icon, tooltip);
+}
+
+static void
+status_icon_update_icon (EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+ const gchar *icon_name;
+
+ if (priv->event && priv->showing_event_icon) {
+ icon_name = priv->event->icon_name;
+ } else {
+ McPresence state;
+
+ 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 gboolean
+status_icon_blink_timeout_cb (EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+ priv->showing_event_icon = !priv->showing_event_icon;
+ status_icon_update_icon (icon);
+
+ return TRUE;
+}
+
+static void
+status_icon_event_added_cb (EmpathyEventManager *manager,
+ EmpathyEvent *event,
+ EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+ if (priv->event) {
+ return;
+ }
+
+ DEBUG ("New event %p", event);
+
+ priv->event = event;
+ 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);
+ }
+}
+
+static void
+status_icon_event_removed_cb (EmpathyEventManager *manager,
+ EmpathyEvent *event,
+ EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+ if (event != priv->event) {
+ return;
+ }
+
+ priv->event = empathy_event_manager_get_top_event (priv->event_manager);
+
+ status_icon_update_tooltip (icon);
+ status_icon_update_icon (icon);
+
+ if (!priv->event && priv->blink_timeout) {
+ g_source_remove (priv->blink_timeout);
+ priv->blink_timeout = 0;
+ }
+}
+
static void
status_icon_set_visibility (EmpathyStatusIcon *icon,
gboolean visible,
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");
- empathy_accounts_dialog_show (GTK_WINDOW (priv->window));
+ DEBUG ("No enabled account, Showing account dialog");
+ empathy_accounts_dialog_show (GTK_WINDOW (priv->window), NULL);
}
}
}
status_icon_set_visibility (icon, !visible, TRUE);
}
-static void
-status_icon_update_tooltip (EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- const gchar *tooltip = NULL;
-
- if (priv->event) {
- tooltip = priv->event->message;
- }
-
- if (!tooltip) {
- tooltip = empathy_idle_get_status (priv->idle);
- }
-
- gtk_status_icon_set_tooltip (priv->icon, tooltip);
-}
-
-static void
-status_icon_update_icon (EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- const gchar *icon_name;
-
- if (priv->event && priv->showing_event_icon) {
- icon_name = priv->event->icon_name;
- } else {
- McPresence state;
-
- 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)
{
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 = GET_PRIV (icon);
- empathy_debug (DEBUG_DOMAIN, "Activated: %s",
- priv->event ? "event" : "toggle");
+ DEBUG ("%s", priv->event ? "event" : "toggle");
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);
-
- if (!priv->event && priv->blink_timeout) {
- g_source_remove (priv->blink_timeout);
- priv->blink_timeout = 0;
- }
+ empathy_event_activate (priv->event);
} else {
status_icon_toggle_visibility (icon);
}
g_object_unref (glade);
}
-static gboolean
-status_icon_blink_timeout_cb (EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
- priv->showing_event_icon = !priv->showing_event_icon;
- status_icon_update_icon (icon);
-
- return TRUE;
-}
-
-static void
-status_icon_top_event_notify_cb (EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
- 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);
-
- if (!priv->blink_timeout) {
- priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
- (GSourceFunc) status_icon_blink_timeout_cb,
- icon);
- }
-}
-
static void
status_icon_finalize (GObject *object)
{
g_object_unref (priv->icon);
g_object_unref (priv->idle);
- g_object_unref (priv->filter);
g_object_unref (priv->mc);
+ g_object_unref (priv->event_manager);
}
static void
const gchar *unique_name,
EmpathyStatusIcon *icon)
{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
GList *accounts, *l;
- guint connection_status;
- EmpathyStatusIconPriv *priv;
-
- priv = GET_PRIV (icon);
+ guint connection_status = 1;
/* Check for a connected account */
accounts = mc_accounts_list_by_enabled (TRUE);
connection_status = mission_control_get_connection_status (priv->mc,
l->data,
NULL);
- if (connection_status == 0)
+ if (connection_status == 0) {
break;
+ }
}
mc_accounts_list_free (accounts);
static void
empathy_status_icon_init (EmpathyStatusIcon *icon)
{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+ EmpathyStatusIconPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (icon,
+ EMPATHY_TYPE_STATUS_ICON, EmpathyStatusIconPriv);
+ icon->priv = priv;
priv->icon = gtk_status_icon_new ();
priv->mc = empathy_mission_control_new ();
priv->idle = empathy_idle_new ();
- priv->filter = empathy_filter_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);
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->event_manager, "event-added",
+ G_CALLBACK (status_icon_event_added_cb),
+ icon);
+ 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),
icon);
}
EmpathyStatusIcon *
-empathy_status_icon_new (GtkWindow *window)
+empathy_status_icon_new (GtkWindow *window, gboolean hide_contact_list)
{
EmpathyStatusIconPriv *priv;
EmpathyStatusIcon *icon;
priv->window = g_object_ref (window);
+ 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);
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
- &should_hide);
+ if (!hide_contact_list) {
+ empathy_conf_get_bool (empathy_conf_get (),
+ EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+ &should_hide);
+ } else {
+ should_hide = TRUE;
+ }
if (gtk_window_is_active (priv->window) == should_hide) {
status_icon_set_visibility (icon, !should_hide, FALSE);
projects / empathy.git / blobdiff