Empathy code, freeze and UI exception: Auth requiered event is not visible on the Shell (#646061)

[Guillaume Desmottes <gdesmott gnome org>]

Hi everyone,

Now that bug #645932 has been fixed and most of Empathy notifications
are now displayed on the Shell (hourah!), we could make things ever
better and display a notification when Empathy needs user to provide his
password to connect the account:
https://bugzilla.gnome.org/show_bug.cgi?id=646061

Atm it's not very visible if, for any reason, the Empathy contact list
is not displayed when connecting.

This add a notification and a new translatable string ("Provide") so I
guess it's a bit late for 3.0 but maybe we could merge it for 3.0.1?
If you prefer to wait for 3.2 that's fine with me as well.


	G.

-- 
Guillaume Desmottes <gdesmott gnome org>
Jabber <cassidy jabber belnet be>
GPG 1024D/711E31B1 | 1B5A 1BA8 11AA F0F1 2169  E28A AC55 8671 711E 31B1

>From 721506f729075ebe70fd49c14ad6d4d12871fb7b Mon Sep 17 00:00:00 2001
From: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date: Tue, 29 Mar 2011 11:23:00 +0200
Subject: [PATCH] Display a notification for auth events

This makes them more visible when using the Shell (#646061).
---
 src/empathy-notifications-approver.c |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index af07447..a87a6d3 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -216,6 +216,13 @@ add_notification_actions (EmpathyNotificationsApprover *self,
         "accept", _("Accept"),
           (NotifyActionCallback) notification_accept_subscription_cb,
           self, NULL);
+      break;
+
+    case EMPATHY_EVENT_TYPE_AUTH:
+      notify_notification_add_action (notification,
+        "provide", _("Provide"), (NotifyActionCallback) notification_approve_cb,
+          self, NULL);
+      break;
 
     default:
       break;
@@ -368,9 +375,6 @@ event_added_cb (EmpathyEventManager *manager,
   if (self->priv->event != NULL)
     return;
 
-  if (event->type == EMPATHY_EVENT_TYPE_AUTH)
-    return;
-
   self->priv->event = event;
 
   update_notification (self);
@@ -384,9 +388,6 @@ event_removed_cb (EmpathyEventManager *manager,
   if (event != self->priv->event)
     return;
 
-  if (event->type == EMPATHY_EVENT_TYPE_AUTH)
-    return;
-
   self->priv->event = empathy_event_manager_get_top_event (
       self->priv->event_mgr);
 
@@ -401,9 +402,6 @@ event_updated_cb (EmpathyEventManager *manager,
   if (event != self->priv->event)
     return;
 
-  if (event->type == EMPATHY_EVENT_TYPE_AUTH)
-    return;
-
   if (empathy_notify_manager_notification_is_enabled (self->priv->notify_mgr))
     update_notification (self);
 }
-- 
1.7.4.1