* Authors: Xavier Claessens <xclaesse@gmail.com>
*/
-#include <config.h>
-
-#include <string.h>
-
-#include <glib.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
-
-#include <libnotify/notification.h>
-#include <libnotify/notify.h>
-
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
-
-#include <libempathy/empathy-gsettings.h>
-#include <libempathy/empathy-utils.h>
-
-#include <libempathy-gtk/empathy-presence-chooser.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 "config.h"
#include "empathy-status-icon.h"
-#include "empathy-preferences.h"
+
#include "empathy-event-manager.h"
+#include "empathy-gsettings.h"
+#include "empathy-new-call-dialog.h"
+#include "empathy-new-message-dialog.h"
+#include "empathy-presence-chooser.h"
+#include "empathy-ui-utils.h"
+#include "empathy-utils.h"
#define DEBUG_FLAG EMPATHY_DEBUG_DISPATCHER
-#include <libempathy/empathy-debug.h>
+#include "empathy-debug.h"
/* Number of ms to wait when blinking */
#define BLINK_TIMEOUT 500
typedef struct {
GtkStatusIcon *icon;
TpAccountManager *account_manager;
- EmpathyNotifyManager *notify_mgr;
gboolean showing_event_icon;
guint blink_timeout;
EmpathyEventManager *event_manager;
EmpathyEvent *event;
- NotifyNotification *notification;
GSettings *gsettings_ui;
- GtkWindow *window;
+ GtkWidget *window;
GtkUIManager *ui_manager;
GtkWidget *popup_menu;
GtkAction *show_window_item;
G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
-static void
-status_icon_notification_closed_cb (NotifyNotification *notification,
- EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
- g_object_unref (notification);
-
- if (priv->notification == notification) {
- priv->notification = NULL;
- }
-
- if (!priv->event) {
- return;
- }
-
- /* inhibit other updates for this event */
- empathy_event_inhibit_updates (priv->event);
-}
-
-static void
-notification_close_helper (EmpathyStatusIconPriv *priv)
-{
- if (priv->notification != NULL) {
- notify_notification_close (priv->notification, NULL);
- priv->notification = NULL;
- }
-}
-
-static void
-notification_approve_cb (NotifyNotification *notification,
- gchar *action,
- EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
- if (priv->event)
- empathy_event_approve (priv->event);
-}
-
-static void
-notification_decline_cb (NotifyNotification *notification,
- gchar *action,
- EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
- if (priv->event)
- empathy_event_decline (priv->event);
-}
-
-static void
-add_notification_actions (EmpathyStatusIcon *self,
- NotifyNotification *notification)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (self);
-
- switch (priv->event->type) {
- case EMPATHY_EVENT_TYPE_CHAT:
- notify_notification_add_action (notification,
- "respond", _("Respond"), (NotifyActionCallback) notification_approve_cb,
- self, NULL);
- break;
-
- case EMPATHY_EVENT_TYPE_VOIP:
- notify_notification_add_action (notification,
- "reject", _("Reject"), (NotifyActionCallback) notification_decline_cb,
- self, NULL);
-
- notify_notification_add_action (notification,
- "answer", _("Answer"), (NotifyActionCallback) notification_approve_cb,
- self, NULL);
- break;
-
- case EMPATHY_EVENT_TYPE_TRANSFER:
- case EMPATHY_EVENT_TYPE_INVITATION:
- notify_notification_add_action (notification,
- "decline", _("Decline"), (NotifyActionCallback) notification_decline_cb,
- self, NULL);
-
- notify_notification_add_action (notification,
- "accept", _("Accept"), (NotifyActionCallback) notification_approve_cb,
- self, NULL);
- break;
-
- default:
- break;
- }
-}
-
-static void
-status_icon_update_notification (EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- GdkPixbuf *pixbuf = NULL;
-
- 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;
- gboolean has_x_canonical_append;
- NotifyNotification *notification = priv->notification;
-
- if (priv->event->message != NULL)
- message_esc = g_markup_escape_text (priv->event->message, -1);
-
- has_x_canonical_append =
- empathy_notify_manager_has_capability (priv->notify_mgr,
- EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND);
-
- if (notification != NULL && ! has_x_canonical_append) {
- /* if the notification server supports x-canonical-append, it is
- better to not use notify_notification_update to avoid
- overwriting the current notification message */
- notify_notification_update (notification,
- priv->event->header, message_esc,
- NULL);
- } else {
- /* if the notification server supports x-canonical-append,
- the hint will be added, so that the message from the
- just created notification will be automatically appended
- to an existing notification with the same title.
- In this way the previous message will not be lost: the new
- message will appear below it, in the same notification */
- notification = notify_notification_new_with_status_icon
- (priv->event->header, message_esc, NULL, priv->icon);
-
- if (priv->notification == NULL) {
- priv->notification = notification;
- }
-
- notify_notification_set_timeout (notification,
- NOTIFY_EXPIRES_DEFAULT);
-
- if (has_x_canonical_append) {
- notify_notification_set_hint_string (notification,
- EMPATHY_NOTIFY_MANAGER_CAP_X_CANONICAL_APPEND, "");
- }
-
- if (empathy_notify_manager_has_capability (priv->notify_mgr,
- EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS))
- add_notification_actions (icon, notification);
-
- g_signal_connect (notification, "closed",
- G_CALLBACK (status_icon_notification_closed_cb), icon);
- }
-
- pixbuf = empathy_notify_manager_get_pixbuf_for_notification (
- priv->notify_mgr, priv->event->contact,
- priv->event->icon_name);
-
- if (pixbuf != NULL) {
- notify_notification_set_icon_from_pixbuf (notification, pixbuf);
- g_object_unref (pixbuf);
- }
-
- notify_notification_show (notification, NULL);
-
- g_free (message_esc);
- } else {
- notification_close_helper (priv);
- }
-}
-
static void
status_icon_update_tooltip (EmpathyStatusIcon *icon)
{
DEBUG ("New event %p", event);
priv->event = event;
- if (event->must_ack) {
+ if (event->must_ack || event->type == EMPATHY_EVENT_TYPE_AUTH) {
priv->showing_event_icon = TRUE;
status_icon_update_icon (icon);
status_icon_update_tooltip (icon);
}
- status_icon_update_notification (icon);
if (!priv->blink_timeout && priv->showing_event_icon) {
priv->blink_timeout = g_timeout_add (BLINK_TIMEOUT,
status_icon_update_tooltip (icon);
status_icon_update_icon (icon);
- /* update notification anyway, as it's safe and we might have been
- * changed presence in the meanwhile
- */
- status_icon_update_notification (icon);
-
if (!priv->event && priv->blink_timeout) {
g_source_remove (priv->blink_timeout);
priv->blink_timeout = 0;
return;
}
- if (empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
- status_icon_update_notification (icon);
- }
-
status_icon_update_tooltip (icon);
}
}
if (!visible) {
- empathy_window_iconify (priv->window, priv->icon);
+ gtk_widget_hide (priv->window);
} else {
empathy_window_present (GTK_WINDOW (priv->window));
}
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
gboolean visible;
- visible = gtk_window_is_active (priv->window);
+ visible = gtk_window_is_active (GTK_WINDOW (priv->window));
status_icon_set_visibility (icon, !visible, TRUE);
}
static void
status_icon_presence_changed_cb (EmpathyStatusIcon *icon)
{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
status_icon_update_icon (icon);
status_icon_update_tooltip (icon);
-
- if (!empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
- /* dismiss the outstanding notification if present */
-
- if (priv->notification) {
- notify_notification_close (priv->notification, NULL);
- priv->notification = NULL;
- }
- }
}
static gboolean
GdkEventKey *event,
EmpathyStatusIcon *icon)
{
- if (event->keyval == GDK_Escape) {
+ if (event->keyval == GDK_KEY_Escape) {
status_icon_set_visibility (icon, FALSE, TRUE);
}
return FALSE;
status_icon_quit_cb (GtkAction *action,
EmpathyStatusIcon *icon)
{
- gtk_main_quit ();
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+ gtk_widget_destroy (priv->window);
}
static void
GtkWidget *submenu;
gboolean show;
- show = empathy_window_get_is_visible (GTK_WINDOW (priv->window));
+ show = gtk_widget_get_visible (priv->window);
g_signal_handlers_block_by_func (priv->show_window_item,
status_icon_show_hide_window_cb,
g_source_remove (priv->blink_timeout);
}
- if (priv->notification) {
- notify_notification_close (priv->notification, NULL);
- g_object_unref (priv->notification);
- priv->notification = NULL;
- }
-
g_object_unref (priv->icon);
g_object_unref (priv->account_manager);
g_object_unref (priv->event_manager);
g_object_unref (priv->ui_manager);
- g_object_unref (priv->notify_mgr);
g_object_unref (priv->gsettings_ui);
g_object_unref (priv->window);
}
EmpathyStatusIcon *icon = user_data;
GError *error = NULL;
- if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+ if (!tp_proxy_prepare_finish (account_manager, result, &error)) {
DEBUG ("Failed to prepare account manager: %s", error->message);
g_error_free (error);
return;
}
- list = tp_account_manager_get_valid_accounts (account_manager);
+ list = tp_account_manager_dup_valid_accounts (account_manager);
for (l = list; l != NULL; l = l->next) {
tp_g_signal_connect_object (l->data, "status-changed",
G_CALLBACK (status_icon_status_changed_cb),
icon, 0);
}
- g_list_free (list);
+ g_list_free_full (list, g_object_unref);
status_icon_presence_changed_cb (icon);
}
priv->account_manager = tp_account_manager_dup ();
priv->event_manager = empathy_event_manager_dup_singleton ();
- tp_account_manager_prepare_async (priv->account_manager, NULL,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
account_manager_prepared_cb, icon);
/* make icon listen and respond to MAIN_WINDOW_HIDDEN changes */
g_signal_connect (priv->icon, "popup-menu",
G_CALLBACK (status_icon_popup_menu_cb),
icon);
-
- priv->notification = NULL;
- priv->notify_mgr = empathy_notify_manager_dup_singleton ();
}
EmpathyStatusIcon *
G_CALLBACK (status_icon_delete_event_cb),
icon);
- should_hide = g_settings_get_boolean (priv->gsettings_ui,
+ if (!hide_contact_list) {
+ should_hide = g_settings_get_boolean (priv->gsettings_ui,
EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN);
-
- if (gtk_window_is_active (priv->window) == should_hide) {
- status_icon_set_visibility (icon, !should_hide, FALSE);
+ } else {
+ should_hide = TRUE;
}
+ status_icon_set_visibility (icon, !should_hide, FALSE);
+
return icon;
}