* 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-utils.h>
-#include <libempathy/empathy-idle.h>
+#include "config.h"
+#include "empathy-status-icon.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-notify-manager.h>
+#include <tp-account-widgets/tpaw-builder.h>
+#include <tp-account-widgets/tpaw-utils.h>
-#include "empathy-accounts-dialog.h"
-#include "empathy-status-icon.h"
-#include "empathy-preferences.h"
#include "empathy-event-manager.h"
-#include "empathy-misc.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
#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;
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 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
- if (priv->notification) {
- g_object_unref (priv->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) {
- notify_notification_close (priv->notification, NULL);
- g_object_unref (priv->notification);
- 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_notification_is_enabled ()) {
- /* 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,
- NULL);
- } else {
- priv->notification = notify_notification_new_with_status_icon
- (header_esc, message_esc, NULL, priv->icon);
- notify_notification_set_timeout (priv->notification,
- NOTIFY_EXPIRES_DEFAULT);
-
- if (empathy_notify_manager_has_capability (priv->notify_mgr, "actions")) {
- notify_notification_add_action (priv->notification,
- "respond",
- _("Respond"),
- (NotifyActionCallback) notification_action_cb,
- icon,
- NULL);
- }
-
- g_signal_connect (priv->notification, "closed",
- G_CALLBACK (status_icon_notification_closed_cb), icon);
- }
-
- pixbuf = empathy_misc_get_pixbuf_for_notification (priv->event->contact,
- priv->event->icon_name);
-
- if (pixbuf != NULL) {
- notify_notification_set_icon_from_pixbuf (priv->notification,
- pixbuf);
- g_object_unref (pixbuf);
- }
-
- notify_notification_show (priv->notification, NULL);
-
- g_free (message_esc);
- g_free (header_esc);
- } else {
- notification_close_helper (priv);
- }
-}
-
static void
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);
- g_free (tooltip);
+ if (!TPAW_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 (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. */
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_notification_is_enabled ()) {
- 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) {
- empathy_window_iconify (priv->window, priv->icon);
+ gtk_widget_hide (priv->window);
} else {
- empathy_window_present (GTK_WINDOW (priv->window), TRUE);
+ tpaw_window_present (GTK_WINDOW (priv->window));
}
}
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
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_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 ()) {
- /* dismiss the outstanding notification if present */
-
- if (priv->notification) {
- notify_notification_close (priv->notification, NULL);
- g_object_unref (priv->notification);
- 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;
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)
{
- 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,
gchar *filename;
filename = empathy_file_lookup ("empathy-status-icon.ui", "src");
- gui = empathy_builder_get_file (filename,
+ gui = tpaw_builder_get_file (filename,
"ui_manager", &priv->ui_manager,
"menu", &priv->popup_menu,
"show_list", &priv->show_window_item,
NULL);
g_free (filename);
- empathy_builder_connect (gui, icon,
+ tpaw_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_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->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);
+ g_object_unref (priv->gsettings_ui);
+ g_object_unref (priv->window);
}
static void
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) {
- 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);
+ g_list_free_full (list, g_object_unref);
+
+ status_icon_presence_changed_cb (icon);
}
static void
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,
+ tp_proxy_prepare_async (priv->account_manager, NULL,
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);
- 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_signal_connect (priv->icon, "popup-menu",
G_CALLBACK (status_icon_popup_menu_cb),
icon);
-
- /* Query the notification daemon to check if it supports actions */
- 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