#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-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"
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;
GtkUIManager *ui_manager;
G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
-static gboolean
-activate_event (EmpathyEvent *event)
-{
- empathy_event_activate (event);
-
- return FALSE;
-}
-
-static void
-status_icon_notification_closed_cb (NotifyNotification *notification,
- EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- EmpathyNotificationClosedReason reason = 0;
-
-#ifdef notify_notification_get_closed_reason
- reason = notify_notification_get_closed_reason (notification);
-#endif
-
- g_object_unref (notification);
-
- if (priv->notification == notification) {
- priv->notification = NULL;
- }
-
- if (!priv->event) {
- return;
- }
-
- /* the notification has been closed by the user, see the
- * DesktopNotification spec.
- */
- if (reason == EMPATHY_NOTIFICATION_CLOSED_DISMISSED) {
- /* use an idle here, as this callback is called from a
- * DBus signal handler inside libnotify, and we might call
- * a *_run_* method when activating the event.
- */
- g_idle_add ((GSourceFunc) activate_event, priv->event);
- } else {
- /* 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_action_cb (NotifyNotification *notification,
- gchar *action,
- EmpathyStatusIcon *icon)
-{
- EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-
- if (priv->event)
- empathy_event_activate (priv->event);
-}
-
-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) &&
- priv->event->type != EMPATHY_EVENT_TYPE_PRESENCE) {
- notify_notification_add_action (notification,
- "respond",
- _("Respond"),
- (NotifyActionCallback) notification_action_cb,
- icon,
- NULL);
- }
-
- 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)
{
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);
}
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
if (store) {
- empathy_conf_set_bool (empathy_conf_get (),
- EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN, !visible);
+ g_settings_set_boolean (priv->gsettings_ui,
+ EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+ !visible);
}
if (!visible) {
}
static void
-status_icon_notify_visibility_cb (EmpathyConf *conf,
+status_icon_notify_visibility_cb (GSettings *gsettings,
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);
- }
+ hidden = g_settings_get_boolean (gsettings, key);
+ status_icon_set_visibility (icon, !hidden, FALSE);
}
static void
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;
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);
}
static void
list = tp_account_manager_get_valid_accounts (account_manager);
for (l = list; l != NULL; l = l->next) {
- empathy_signal_connect_weak (l->data, "status-changed",
+ tp_g_signal_connect_object (l->data, "status-changed",
G_CALLBACK (status_icon_status_changed_cb),
- G_OBJECT (icon));
+ icon, 0);
}
g_list_free (list);
account_manager_prepared_cb, 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);
+ priv->gsettings_ui = g_settings_new (EMPATHY_PREFS_UI_SCHEMA);
+ g_signal_connect (priv->gsettings_ui,
+ "changed::" EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
+ G_CALLBACK (status_icon_notify_visibility_cb),
+ icon);
status_icon_create_menu (icon);
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 *
icon);
if (!hide_contact_list) {
- empathy_conf_get_bool (empathy_conf_get (),
- EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN,
- &should_hide);
+ should_hide = g_settings_get_boolean (priv->gsettings_ui,
+ EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN);
} else {
should_hide = TRUE;
}
- if (gtk_window_is_active (priv->window) == should_hide) {
- status_icon_set_visibility (icon, !should_hide, FALSE);
- }
+ status_icon_set_visibility (icon, !should_hide, FALSE);
return icon;
}
projects / empathy.git / blobdiff