* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- *
+ *
* Authors: Xavier Claessens <xclaesse@gmail.com>
*/
#include <string.h>
+#include <glib.h>
+
#include <gtk/gtk.h>
-#include <glade/glade.h>
+#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <libempathy/empathy-debug.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 <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 <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-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;
+ TpAccountManager *account_manager;
+ EmpathyNotifyManager *notify_mgr;
+ gboolean showing_event_icon;
+ guint blink_timeout;
+ EmpathyEventManager *event_manager;
+ EmpathyEvent *event;
+ NotifyNotification *notification;
+
+ GtkWindow *window;
+ GtkUIManager *ui_manager;
+ GtkWidget *popup_menu;
+ GtkAction *show_window_item;
+ GtkAction *new_message_item;
+ GtkAction *status_item;
+} EmpathyStatusIconPriv;
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_set_visibility (EmpathyStatusIcon *icon,
- gboolean visible,
- gboolean store)
+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 (store) {
- empathy_conf_set_bool (empathy_conf_get (),
- EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN, !visible);
+ if (!priv->event) {
+ return;
}
- if (!visible) {
- empathy_window_iconify (priv->window, priv->icon);
+ /* 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 {
- 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));
- }
+ /* inhibit other updates for this event */
+ empathy_event_inhibit_updates (priv->event);
}
}
static void
-status_icon_notify_visibility_cb (EmpathyConf *conf,
- const gchar *key,
- gpointer user_data)
+notification_close_helper (EmpathyStatusIconPriv *priv)
{
- EmpathyStatusIcon *icon = user_data;
- gboolean hidden = FALSE;
-
- if (empathy_conf_get_bool (conf, key, &hidden)) {
- status_icon_set_visibility (icon, !hidden, FALSE);
+ if (priv->notification) {
+ notify_notification_close (priv->notification, NULL);
+ g_object_unref (priv->notification);
+ priv->notification = NULL;
}
}
static void
-status_icon_toggle_visibility (EmpathyStatusIcon *icon)
+notification_action_cb (NotifyNotification *notification,
+ gchar *action,
+ EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- gboolean visible;
- visible = gtk_window_is_active (priv->window);
- status_icon_set_visibility (icon, !visible, TRUE);
+ if (priv->event)
+ empathy_event_activate (priv->event);
}
static void
-status_icon_update_tooltip (EmpathyStatusIcon *icon)
+status_icon_update_notification (EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- const gchar *tooltip = NULL;
+ GdkPixbuf *pixbuf = NULL;
- if (priv->event) {
- tooltip = priv->event->message;
+ if (!empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
+ /* always close the notification if this happens */
+ notification_close_helper (priv);
+ return;
}
- if (!tooltip) {
- tooltip = empathy_idle_get_status (priv->idle);
+ if (priv->event) {
+ gchar *message_esc = NULL;
+
+ if (priv->event->message != NULL)
+ message_esc = g_markup_escape_text (priv->event->message, -1);
+
+ if (priv->notification) {
+ notify_notification_update (priv->notification,
+ priv->event->header, message_esc,
+ NULL);
+ } else {
+ priv->notification = notify_notification_new_with_status_icon
+ (priv->event->header, message_esc, NULL, priv->icon);
+ notify_notification_set_timeout (priv->notification,
+ NOTIFY_EXPIRES_DEFAULT);
+
+ 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"),
+ (NotifyActionCallback) notification_action_cb,
+ icon,
+ NULL);
+ }
+
+ g_signal_connect (priv->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 (priv->notification,
+ pixbuf);
+ g_object_unref (pixbuf);
+ }
+
+ notify_notification_show (priv->notification, NULL);
+
+ g_free (message_esc);
+ } else {
+ notification_close_helper (priv);
}
+}
+
+static void
+status_icon_update_tooltip (EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- gtk_status_icon_set_tooltip (priv->icon, tooltip);
+ if (priv->event) {
+ gchar *tooltip = NULL;
+
+ if (priv->event->message != NULL)
+ tooltip = g_markup_printf_escaped ("<i>%s</i>\n%s",
+ priv->event->header,
+ priv->event->message);
+ else
+ tooltip = g_markup_printf_escaped ("<i>%s</i>",
+ priv->event->header);
+ gtk_status_icon_set_tooltip_markup (priv->icon, tooltip);
+ g_free (tooltip);
+ } else {
+ 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 (msg);
+ }
}
static void
if (priv->event && priv->showing_event_icon) {
icon_name = priv->event->icon_name;
} else {
- McPresence state;
+ TpConnectionPresenceType state;
+
+ 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;
+ }
- 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);
+ if (icon_name != NULL)
+ 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;
+ if (event->must_ack) {
+ 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,
+ (GSourceFunc) status_icon_blink_timeout_cb,
+ icon);
+ }
}
static void
-status_icon_idle_notify_cb (EmpathyStatusIcon *icon)
+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);
+
+ /* 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;
+ }
+}
+
+static void
+status_icon_event_updated_cb (EmpathyEventManager *manager,
+ EmpathyEvent *event,
+ EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+ if (event != priv->event) {
+ return;
+ }
+
+ if (empathy_notify_manager_notification_is_enabled (priv->notify_mgr)) {
+ status_icon_update_notification (icon);
+ }
+
status_icon_update_tooltip (icon);
}
+static void
+status_icon_set_visibility (EmpathyStatusIcon *icon,
+ gboolean visible,
+ gboolean store)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+
+ if (store) {
+ empathy_conf_set_bool (empathy_conf_get (),
+ EMPATHY_PREFS_UI_MAIN_WINDOW_HIDDEN, !visible);
+ }
+
+ if (!visible) {
+ empathy_window_iconify (priv->window, priv->icon);
+ } else {
+ empathy_window_present (GTK_WINDOW (priv->window));
+ }
+}
+
+static void
+status_icon_notify_visibility_cb (EmpathyConf *conf,
+ 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);
+ }
+}
+
+static void
+status_icon_toggle_visibility (EmpathyStatusIcon *icon)
+{
+ EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+ gboolean visible;
+
+ visible = gtk_window_is_active (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);
+ g_object_unref (priv->notification);
+ priv->notification = NULL;
+ }
+ }
+}
+
static gboolean
status_icon_delete_event_cb (GtkWidget *widget,
GdkEvent *event,
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);
}
}
static void
-status_icon_show_hide_window_cb (GtkWidget *widget,
+status_icon_show_hide_window_cb (GtkToggleAction *action,
EmpathyStatusIcon *icon)
{
gboolean visible;
- visible = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget));
+ visible = gtk_toggle_action_get_active (action);
status_icon_set_visibility (icon, visible, TRUE);
}
static void
-status_icon_new_message_cb (GtkWidget *widget,
+status_icon_new_message_cb (GtkAction *action,
EmpathyStatusIcon *icon)
{
empathy_new_message_dialog_show (NULL);
}
static void
-status_icon_quit_cb (GtkWidget *window,
+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 ();
EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
+ GtkWidget *menu_item;
GtkWidget *submenu;
gboolean show;
g_signal_handlers_block_by_func (priv->show_window_item,
status_icon_show_hide_window_cb,
icon);
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (priv->show_window_item),
- show);
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (priv->show_window_item),
+ show);
g_signal_handlers_unblock_by_func (priv->show_window_item,
status_icon_show_hide_window_cb,
icon);
+ menu_item = gtk_ui_manager_get_widget (priv->ui_manager, "/menu/status");
submenu = empathy_presence_chooser_create_menu ();
- gtk_menu_item_set_submenu (GTK_MENU_ITEM (priv->status_item),
- submenu);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_item), submenu);
gtk_menu_popup (GTK_MENU (priv->popup_menu),
NULL, NULL,
status_icon_create_menu (EmpathyStatusIcon *icon)
{
EmpathyStatusIconPriv *priv = GET_PRIV (icon);
- GladeXML *glade;
+ GtkBuilder *gui;
gchar *filename;
- filename = empathy_file_lookup ("empathy-status-icon.glade", "src");
- glade = empathy_glade_get_file (filename,
- "tray_menu",
- NULL,
- "tray_menu", &priv->popup_menu,
- "tray_show_list", &priv->show_window_item,
- "tray_new_message", &priv->message_item,
- "tray_status", &priv->status_item,
+ filename = empathy_file_lookup ("empathy-status-icon.ui", "src");
+ gui = empathy_builder_get_file (filename,
+ "ui_manager", &priv->ui_manager,
+ "menu", &priv->popup_menu,
+ "show_list", &priv->show_window_item,
+ "new_message", &priv->new_message_item,
+ "status", &priv->status_item,
NULL);
g_free (filename);
- empathy_glade_connect (glade,
- icon,
- "tray_show_list", "toggled", status_icon_show_hide_window_cb,
- "tray_new_message", "activate", status_icon_new_message_cb,
- "tray_quit", "activate", status_icon_quit_cb,
+ 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 (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;
+ g_object_ref (priv->ui_manager);
+ g_object_unref (gui);
}
static void
-status_icon_top_event_notify_cb (EmpathyStatusIcon *icon)
+status_icon_status_changed_cb (TpAccount *account,
+ TpConnectionStatus current,
+ TpConnectionStatus previous,
+ TpConnectionStatusReason reason,
+ gchar *dbus_error_name,
+ GHashTable *details,
+ 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);
- }
+ gtk_action_set_sensitive (priv->new_message_item,
+ empathy_account_manager_get_accounts_connected (NULL));
}
static void
g_source_remove (priv->blink_timeout);
}
- empathy_disconnect_account_status_changed (priv->token);
+ 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->filter);
- g_object_unref (priv->mc);
+ 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
}
static void
-status_icon_status_changed_cb (MissionControl *mc,
- TpConnectionStatus status,
- McPresence presence,
- TpConnectionStatusReason reason,
- const gchar *unique_name,
- EmpathyStatusIcon *icon)
+account_manager_prepared_cb (GObject *source_object,
+ GAsyncResult *result,
+ gpointer user_data)
{
- GList *accounts, *l;
- guint connection_status = 1;
- EmpathyStatusIconPriv *priv;
+ GList *list, *l;
+ TpAccountManager *account_manager = TP_ACCOUNT_MANAGER (source_object);
+ EmpathyStatusIcon *icon = user_data;
+ GError *error = NULL;
- priv = GET_PRIV (icon);
+ if (!tp_account_manager_prepare_finish (account_manager, result, &error)) {
+ DEBUG ("Failed to prepare account manager: %s", error->message);
+ g_error_free (error);
+ return;
+ }
- /* Check for a connected account */
- accounts = mc_accounts_list_by_enabled (TRUE);
- for (l = accounts; l; l = l->next) {
- connection_status = mission_control_get_connection_status (priv->mc,
- l->data,
- NULL);
- if (connection_status == 0)
- break;
+ 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",
+ G_CALLBACK (status_icon_status_changed_cb),
+ G_OBJECT (icon));
}
- mc_accounts_list_free (accounts);
+ g_list_free (list);
- gtk_widget_set_sensitive (priv->message_item, connection_status == 0);
+ status_icon_presence_changed_cb (icon);
}
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->token = empathy_connect_to_account_status_changed (priv->mc,
- G_CALLBACK (status_icon_status_changed_cb),
- icon, NULL);
+ priv->account_manager = tp_account_manager_dup ();
+ priv->event_manager = empathy_event_manager_dup_singleton ();
+
+ tp_account_manager_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 (),
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),
- icon);
- g_signal_connect_swapped (priv->filter, "notify::top-event",
- G_CALLBACK (status_icon_top_event_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),
+ icon);
+ g_signal_connect (priv->event_manager, "event-removed",
+ G_CALLBACK (status_icon_event_removed_cb),
+ icon);
+ g_signal_connect (priv->event_manager, "event-updated",
+ G_CALLBACK (status_icon_event_updated_cb),
+ icon);
g_signal_connect (priv->icon, "activate",
G_CALLBACK (status_icon_activate_cb),
icon);
g_signal_connect (priv->icon, "popup-menu",
G_CALLBACK (status_icon_popup_menu_cb),
icon);
+
+ priv->notify_mgr = empathy_notify_manager_dup_singleton ();
}
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_after (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