From 3103575b755da0765275fb3b774e2e8f8a88bd46 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Tue, 6 Jul 2010 13:56:55 +0200 Subject: factor out add_notification_actions --- src/empathy-status-icon.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'src/empathy-status-icon.c') diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c index b1a0cd685..1e9c8679f 100644 --- a/src/empathy-status-icon.c +++ b/src/empathy-status-icon.c @@ -118,6 +118,20 @@ notification_action_cb (NotifyNotification *notification, empathy_event_activate (priv->event); } +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) { @@ -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); -- cgit v1.2.3