From f9f5804b08b5091fbee68ad106deabffd1c8de70 Mon Sep 17 00:00:00 2001 From: Benedikt Heine Date: Fri, 28 Dec 2018 18:48:13 +0100 Subject: [PATCH] Remove notification_icon_get wrapper --- src/draw.c | 4 ++-- src/icon.c | 5 ----- src/icon.h | 8 -------- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/draw.c b/src/draw.c index bae6a30..e1032c0 100644 --- a/src/draw.c +++ b/src/draw.c @@ -270,8 +270,8 @@ static struct colored_layout *layout_init_shared(cairo_t *c, const struct notifi pango_layout_set_ellipsize(cl->l, ellipsize); } - if (settings.icon_position != ICON_OFF) { - cl->icon = icon_get_for_notification(n); + if (settings.icon_position != ICON_OFF && n->icon) { + cl->icon = gdk_pixbuf_to_cairo_surface(n->icon); } else { cl->icon = NULL; } diff --git a/src/icon.c b/src/icon.c index f7acadd..a0b9f5d 100644 --- a/src/icon.c +++ b/src/icon.c @@ -222,9 +222,4 @@ GdkPixbuf *get_pixbuf_from_raw_image(const struct raw_image *raw_image) return pixbuf; } -cairo_surface_t *icon_get_for_notification(const struct notification *n) -{ - return gdk_pixbuf_to_cairo_surface(n->icon); -} - /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */ diff --git a/src/icon.h b/src/icon.h index 7b4e3e5..841611d 100644 --- a/src/icon.h +++ b/src/icon.h @@ -41,13 +41,5 @@ GdkPixbuf *get_pixbuf_from_icon(const char *iconname); */ GdkPixbuf *get_pixbuf_from_raw_image(const struct raw_image *raw_image); -/** - * Get a cairo surface with the appropriate icon for the notification, scaled - * according to the current settings - * - * @return a cairo_surface_t pointer or NULL if no icon could be retrieved. - */ -cairo_surface_t *icon_get_for_notification(const struct notification *n); - #endif /* vim: set tabstop=8 shiftwidth=8 expandtab textwidth=0: */