[empathy/gnome-2-34: 37/60] status-icon: blink when we get a password request



commit 41433901d4d8aa182895a71c868c38dc16173573
Author: Jonny Lamb <jonnylamb gnome org>
Date:   Thu Dec 9 17:32:13 2010 +0000

    status-icon: blink when we get a password request
    
    Signed-off-by: Jonny Lamb <jonnylamb gnome org>

 src/empathy-event-manager.c |    9 +++++----
 src/empathy-status-icon.c   |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/src/empathy-event-manager.c b/src/empathy-event-manager.c
index e7b3958..2162586 100644
--- a/src/empathy-event-manager.c
+++ b/src/empathy-event-manager.c
@@ -854,8 +854,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
@@ -1004,10 +1005,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 97ab255..190498a 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -333,7 +333,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);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]