[empathy] status-icon: don't approve event if notification bubble has been dismissed



commit c8ed0aa2975b0e549e28c5e65d262e362a94c507
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Wed Apr 7 11:22:03 2010 +0200

    status-icon: don't approve event if notification bubble has been dismissed
    
    This code was broken anyway so we don't change the current behaviour.

 src/empathy-status-icon.c |   28 ++--------------------------
 1 files changed, 2 insertions(+), 26 deletions(-)
---
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 3822340..36953a3 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -77,24 +77,11 @@ typedef struct {
 
 G_DEFINE_TYPE (EmpathyStatusIcon, empathy_status_icon, G_TYPE_OBJECT);
 
-static gboolean
-activate_event (EmpathyEvent *event)
-{
-	empathy_event_activate (event);
-
-	return FALSE;
-}
-
 static void
 status_icon_notification_closed_cb (NotifyNotification *notification,
 				    EmpathyStatusIcon  *icon)
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
-	EmpathyNotificationClosedReason reason = 0;
-
-#ifdef notify_notification_get_closed_reason
-	reason = notify_notification_get_closed_reason (notification);
-#endif
 
 	g_object_unref (notification);
 
@@ -106,19 +93,8 @@ status_icon_notification_closed_cb (NotifyNotification *notification,
 		return;
 	}
 
-	/* the notification has been closed by the user, see the
-	 * DesktopNotification spec.
-	 */
-	if (reason == EMPATHY_NOTIFICATION_CLOSED_DISMISSED) {
-		/* use an idle here, as this callback is called from a
-		 * DBus signal handler inside libnotify, and we might call
-		 * a *_run_* method when activating the event.
-		 */
-		g_idle_add ((GSourceFunc) activate_event, priv->event);
-	} else {
-		/* inhibit other updates for this event */
-		empathy_event_inhibit_updates (priv->event);
-	}
+	/* inhibit other updates for this event */
+	empathy_event_inhibit_updates (priv->event);
 }
 
 static void



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