#include <telepathy-glib/util.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-images.h>
#include <libempathy-gtk/empathy-new-message-dialog.h>
+#include <libempathy-gtk/empathy-new-call-dialog.h>
+#include <libempathy-gtk/empathy-notify-manager.h>
#include "empathy-accounts-dialog.h"
#include "empathy-status-icon.h"
#include "empathy-preferences.h"
#include "empathy-event-manager.h"
-#include "empathy-misc.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
#include <libempathy/empathy-debug.h>
#define GET_PRIV(obj) EMPATHY_GET_PRIV (obj, EmpathyStatusIcon)
typedef struct {
GtkStatusIcon *icon;
- EmpathyIdle *idle;
TpAccountManager *account_manager;
+ EmpathyNotifyManager *notify_mgr;
gboolean showing_event_icon;
guint blink_timeout;
EmpathyEventManager *event_manager;
GtkAction *show_window_item;
GtkAction *new_message_item;
GtkAction *status_item;
- gboolean notify_supports_actions;
} EmpathyStatusIconPriv;
G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
GdkPixbuf *pixbuf = NULL;
- if (!empathy_notification_is_enabled ()) {
+ if (!empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
/* always close the notification if this happens */
notification_close_helper (priv);
return;
if (priv->event) {
gchar *message_esc = NULL;
- gchar *header_esc = NULL;
if (priv->event->message != NULL)
message_esc = g_markup_escape_text (priv->event->message, -1);
- if (priv->event->header != NULL)
- header_esc = g_markup_escape_text (priv->event->header, -1);
-
if (priv->notification) {
notify_notification_update (priv->notification,
- header_esc, message_esc,
+ priv->event->header, message_esc,
NULL);
} else {
priv->notification = notify_notification_new_with_status_icon
- (header_esc, message_esc, NULL, priv->icon);
+ (priv->event->header, message_esc, NULL, priv->icon);
notify_notification_set_timeout (priv->notification,
NOTIFY_EXPIRES_DEFAULT);
- if (priv->notify_supports_actions) {
+ if (empathy_notify_manager_has_capability (priv->notify_mgr,
+ EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS) &&
+ priv->event->type != EMPATHY_EVENT_TYPE_PRESENCE) {
notify_notification_add_action (priv->notification,
"respond",
_("Respond"),
G_CALLBACK (status_icon_notification_closed_cb), icon);
}
- pixbuf = empathy_misc_get_pixbuf_for_notification (priv->event->contact,
+ pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
+ priv->notify_mgr, priv->event->contact,
priv->event->icon_name);
if (pixbuf != NULL) {
notify_notification_show (priv->notification, NULL);
g_free (message_esc);
- g_free (header_esc);
} else {
notification_close_helper (priv);
}
status_icon_update_tooltip (EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- gchar *tooltip = NULL;
if (priv->event) {
+ gchar *tooltip = NULL;
+
if (priv->event->message != NULL)
tooltip = g_markup_printf_escaped ("<i>%s</i>\n%s",
priv->event->header,
tooltip = g_markup_printf_escaped ("<i>%s</i>",
priv->event->header);
gtk_status_icon_set_tooltip_markup (priv->icon, tooltip);
+ g_free (tooltip);
} else {
- tooltip = g_strdup (empathy_idle_get_status (priv->idle));
- gtk_status_icon_set_tooltip_text (priv->icon, tooltip);
- }
+ TpConnectionPresenceType type;
+ gchar *msg;
+
+ type = tp_account_manager_get_most_available_presence (
+ priv->account_manager, NULL, &msg);
+
+ if (!EMP_STR_EMPTY (msg)) {
+ gtk_status_icon_set_tooltip_text (priv->icon, msg);
+ }
+ else {
+ gtk_status_icon_set_tooltip_text (priv->icon,
+ empathy_presence_get_default_message (type));
+ }
- g_free (tooltip);
+ g_free (msg);
+ }
}
static void
} else {
TpConnectionPresenceType state;
- state = empathy_idle_get_state (priv->idle);
+ state = tp_account_manager_get_most_available_presence (
+ priv->account_manager, NULL, NULL);
+
+ /* An unset presence type here doesn't make sense. Force it
+ * to be offline. */
+ if (state == TP_CONNECTION_PRESENCE_TYPE_UNSET) {
+ state = TP_CONNECTION_PRESENCE_TYPE_OFFLINE;
+ }
+
icon_name = empathy_icon_name_for_presence (state);
}
return;
}
- if (empathy_notification_is_enabled ()) {
+ if (empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
status_icon_update_notification (icon);
}
if (!visible) {
empathy_window_iconify (priv->window, priv->icon);
} else {
- empathy_window_present (GTK_WINDOW (priv->window), TRUE);
+ empathy_window_present (GTK_WINDOW (priv->window));
}
}
}
static void
-status_icon_idle_notify_cb (EmpathyStatusIcon *icon)
+status_icon_presence_changed_cb (EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
status_icon_update_icon (icon);
status_icon_update_tooltip (icon);
- if (!empathy_notification_is_enabled ()) {
+ if (!empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
/* dismiss the outstanding notification if present */
if (priv->notification) {
empathy_new_message_dialog_show (NULL);
}
+static void
+status_icon_new_call_cb (GtkAction *action,
+ EmpathyStatusIcon *icon)
+{
+ empathy_new_call_dialog_show (NULL);
+}
+
static void
status_icon_quit_cb (GtkAction *action,
EmpathyStatusIcon *icon)
empathy_builder_connect (gui, icon,
"show_list", "toggled", status_icon_show_hide_window_cb,
"new_message", "activate", status_icon_new_message_cb,
+ "new_call", "activate", status_icon_new_call_cb,
"quit", "activate", status_icon_quit_cb,
NULL);
}
g_object_unref (priv->icon);
- g_object_unref (priv->idle);
g_object_unref (priv->account_manager);
g_object_unref (priv->event_manager);
g_object_unref (priv->ui_manager);
+ g_object_unref (priv->notify_mgr);
}
static void
G_OBJECT (icon));
}
g_list_free (list);
+
+ status_icon_presence_changed_cb (icon);
}
static void
{
EmpathyStatusIconPriv *priv = G_TYPE_INSTANCE_GET_PRIVATE (icon,
EMPATHY_TYPE_STATUS_ICON, EmpathyStatusIconPriv);
- GList *list, *l;
icon->priv = priv;
priv->icon = gtk_status_icon_new ();
priv->account_manager = tp_account_manager_dup ();
- priv->idle = empathy_idle_dup_singleton ();
priv->event_manager = empathy_event_manager_dup_singleton ();
tp_account_manager_prepare_async (priv->account_manager, NULL,
icon);
status_icon_create_menu (icon);
- status_icon_idle_notify_cb (icon);
- g_signal_connect_swapped (priv->idle, "notify",
- G_CALLBACK (status_icon_idle_notify_cb),
+ g_signal_connect_swapped (priv->account_manager,
+ "most-available-presence-changed",
+ G_CALLBACK (status_icon_presence_changed_cb),
icon);
g_signal_connect (priv->event_manager, "event-added",
G_CALLBACK (status_icon_event_added_cb),
G_CALLBACK (status_icon_popup_menu_cb),
icon);
- /* Query the notification daemon to check if it supports actions */
- priv->notify_supports_actions = FALSE;
- list = notify_get_server_caps ();
- for (l = list; l != NULL; l = g_list_next (l)) {
- gchar *caps = l->data;
- if (!tp_strdiff (caps, "actions"))
- priv->notify_supports_actions = TRUE;
- g_free (caps);
- }
- g_list_free (list);
+ priv->notify_mgr = empathy_notify_manager_dup_singleton ();
}
EmpathyStatusIcon *
projects / empathy.git / blobdiff