aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/empathy-event-manager.c9
-rw-r--r--src/empathy-status-icon.c2
2 files changed, 6 insertions, 5 deletions
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index 9ab20b769..f657cae35 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -865,8 +865,9 @@ event_manager_ft_got_contact_cb (TpConnection *connection,
}
static void
-dummy_process_func (EventPriv *event)
+event_manager_auth_process_func (EventPriv *event)
{
+ empathy_event_approve ((EmpathyEvent *) event);
}
/* If there is a file-transfer, media, or auth channel consider it as
@@ -1015,10 +1016,10 @@ approve_channels (TpSimpleApprover *approver,
}
else if (channel_type == TP_IFACE_QUARK_CHANNEL_TYPE_SERVER_AUTHENTICATION)
{
- /* We need a process function or this will time out after
- * NOTIFICATION_TIMEOUT seconds, which is undesirable. */
event_manager_add (approval->manager, account, NULL, EMPATHY_EVENT_TYPE_AUTH,
- NULL, NULL, NULL, approval, dummy_process_func, NULL);
+ GTK_STOCK_DIALOG_AUTHENTICATION, tp_account_get_display_name (account),
+ _("Password required"), approval,
+ event_manager_auth_process_func, NULL);
}
else
{
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 0c834a670..38a68d433 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -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);