summaryrefslogtreecommitdiff
path: root/src/empathy-notifications-approver.c
diff options
context:
space:
mode:
authorJonny Lamb <jonnylamb@gnome.org>2010-12-15 08:56:03 +0000
committerJonny Lamb <jonnylamb@gnome.org>2010-12-15 08:56:03 +0000
commit2ec9b6e89141999f919f8a3bd4a44fd8abad86ff (patch)
tree10f81107c111564ec160d173db3b265a9573c4ff /src/empathy-notifications-approver.c
parent2e38a9c56cdac919f424107928dbbf35d69a41ed (diff)
parent225ca2e12b053a6c8ece18179d470f01ed1d6fb7 (diff)
Merge branch 'sasl-gui'
Diffstat (limited to 'src/empathy-notifications-approver.c')
-rw-r--r--src/empathy-notifications-approver.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/empathy-notifications-approver.c b/src/empathy-notifications-approver.c
index 0bfe03274..e0d540cdc 100644
--- a/src/empathy-notifications-approver.c
+++ b/src/empathy-notifications-approver.c
@@ -314,7 +314,11 @@ 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);
}
@@ -326,6 +330,9 @@ 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);
@@ -340,6 +347,9 @@ 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);
}