[empathy] factor out add_notification_actions



commit 3103575b755da0765275fb3b774e2e8f8a88bd46
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Tue Jul 6 13:56:55 2010 +0200

    factor out add_notification_actions

 src/empathy-status-icon.c |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index b1a0cd6..1e9c867 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -119,6 +119,20 @@ notification_action_cb (NotifyNotification *notification,
 }
 
 static void
+add_notification_actions (EmpathyStatusIcon *self,
+			  NotifyNotification *notification)
+{
+	EmpathyStatusIconPriv *priv = GET_PRIV (self);
+
+	if (priv->event->type ==EMPATHY_EVENT_TYPE_PRESENCE)
+		return;
+
+	notify_notification_add_action (notification,
+		"respond", _("Respond"), (NotifyActionCallback) notification_action_cb,
+		self, NULL);
+}
+
+static void
 status_icon_update_notification (EmpathyStatusIcon *icon)
 {
 	EmpathyStatusIconPriv *priv = GET_PRIV (icon);
@@ -172,15 +186,8 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
 			}
 
 			if (empathy_notify_manager_has_capability (priv->notify_mgr,
-			           EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS) &&
-			           priv->event->type != EMPATHY_EVENT_TYPE_PRESENCE) {
-				notify_notification_add_action (notification,
-					"respond",
-					_("Respond"),
-					(NotifyActionCallback) notification_action_cb,
-					icon,
-					NULL);
-			}
+			           EMPATHY_NOTIFY_MANAGER_CAP_ACTIONS))
+				add_notification_actions (icon, notification);
 
 			g_signal_connect (notification, "closed",
 					  G_CALLBACK (status_icon_notification_closed_cb), icon);



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