#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include <telepathy-glib/account-manager.h>
-#include <telepathy-glib/util.h>
+#include <telepathy-glib/telepathy-glib.h>
#include <libempathy/empathy-gsettings.h>
#include <libempathy/empathy-utils.h>
EmpathyEvent *event;
GSettings *gsettings_ui;
- GtkWindow *window;
+ GtkWidget *window;
GtkUIManager *ui_manager;
GtkWidget *popup_menu;
GtkAction *show_window_item;
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);
}
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);
}
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,
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 */