Merge branch 'change-audio'

[empathy.git] / src / empathy-status-icon.c

diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 0c834a670c14c909fd708f1132ff409f411b11ec..008ea47014d5aba9e130a36dd5cd5d884022a3d0 100644 (file)
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -62,7 +62,7 @@ typedef struct {
        EmpathyEvent        *event;
        GSettings           *gsettings_ui;
 
-       GtkWindow           *window;
+       GtkWidget           *window;
        GtkUIManager        *ui_manager;
        GtkWidget           *popup_menu;
        GtkAction           *show_window_item;
@@ -159,7 +159,7 @@ status_icon_event_added_cb (EmpathyEventManager *manager,
        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);
@@ -222,7 +222,7 @@ status_icon_set_visibility (EmpathyStatusIcon *icon,
        }
 
        if (!visible) {
-               empathy_window_iconify (priv->window, priv->icon);
+               gtk_widget_hide (priv->window);
        } else {
                empathy_window_present (GTK_WINDOW (priv->window));
        }
@@ -246,7 +246,7 @@ status_icon_toggle_visibility (EmpathyStatusIcon *icon)
        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);
 }
 
@@ -334,7 +334,7 @@ status_icon_popup_menu_cb (GtkStatusIcon     *status_icon,
        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,