aboutsummaryrefslogtreecommitdiffstats
path: root/src/empathy-status-icon.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/empathy-status-icon.c')
-rw-r--r--src/empathy-status-icon.c23
1 files changed, 3 insertions, 20 deletions
diff --git a/src/empathy-status-icon.c b/src/empathy-status-icon.c
index 197b22401..d19075318 100644
--- a/src/empathy-status-icon.c
+++ b/src/empathy-status-icon.c
@@ -101,7 +101,7 @@ status_icon_notification_closed_cb (NotifyNotification *notification,
/* the notification has been closed by the user, see the
* DesktopNotification spec.
*/
- if (reason == 2) {
+ if (reason == NOTIFICATION_CLOSED_DISMISSED) {
g_idle_add ((GSourceFunc) activate_event, priv->event);
} else {
/* inhibit other updates for this event */
@@ -109,24 +109,6 @@ status_icon_notification_closed_cb (NotifyNotification *notification,
}
}
-static GdkPixbuf *
-get_pixbuf_for_event (EmpathyEvent *event)
-{
- GdkPixbuf *pixbuf = NULL;
-
- if (event->contact != NULL) {
- pixbuf = empathy_pixbuf_avatar_from_contact_scaled (event->contact,
- 48, 48);
- }
-
- if (!pixbuf) {
- pixbuf = empathy_pixbuf_from_icon_name_sized
- (event->icon_name, 48);
- }
-
- return pixbuf;
-}
-
static void
notification_close_helper (EmpathyStatusIconPriv *priv)
{
@@ -150,7 +132,8 @@ status_icon_update_notification (EmpathyStatusIcon *icon)
}
if (priv->event) {
- pixbuf = get_pixbuf_for_event (priv->event);
+ pixbuf = empathy_misc_get_pixbuf_for_notification (priv->event->contact,
+ priv->event->icon_name);
if (priv->notification) {
notify_notification_update (priv->notification,