From 4d4d11ebb1fcde6ccae9f28413b3f700c985a157 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sat, 15 Jul 2017 01:19:27 +0200 Subject: [PATCH] Rename pixbuf_new_from_file! to pixbuf_new_from_png! --- src/support_ui.rs | 2 +- src/ui_tray_icon.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/support_ui.rs b/src/support_ui.rs index ed1793037..4e9247295 100644 --- a/src/support_ui.rs +++ b/src/support_ui.rs @@ -51,7 +51,7 @@ pub fn pixbuf_new_from_theme(icon_name: &str, #[macro_export] /// Create a pixbuf from the given PNG file. Includes the file as bytes /// in the binary and decodes it. -macro_rules! pixbuf_new_from_file { +macro_rules! pixbuf_new_from_png { ($name:expr) => { { use gdk_pixbuf; diff --git a/src/ui_tray_icon.rs b/src/ui_tray_icon.rs index 67fc00e6d..87e123e2c 100644 --- a/src/ui_tray_icon.rs +++ b/src/ui_tray_icon.rs @@ -348,11 +348,11 @@ impl AudioPix { } } else { AudioPix { - muted: pixbuf_new_from_file!("../data/pixmaps/pnmixer-muted.png")?, - low: pixbuf_new_from_file!("../data/pixmaps/pnmixer-low.png")?, - medium: pixbuf_new_from_file!("../data/pixmaps/pnmixer-medium.png")?, - high: pixbuf_new_from_file!("../data/pixmaps/pnmixer-high.png")?, - off: pixbuf_new_from_file!("../data/pixmaps/pnmixer-off.png")?, + muted: pixbuf_new_from_png!("../data/pixmaps/pnmixer-muted.png")?, + low: pixbuf_new_from_png!("../data/pixmaps/pnmixer-low.png")?, + medium: pixbuf_new_from_png!("../data/pixmaps/pnmixer-medium.png")?, + high: pixbuf_new_from_png!("../data/pixmaps/pnmixer-high.png")?, + off: pixbuf_new_from_png!("../data/pixmaps/pnmixer-off.png")?, } } };