From b18e263d2e56de145d702a20a66bfca2631a65aa Mon Sep 17 00:00:00 2001 From: Felix Riemann Date: Mon, 5 Jan 2015 19:06:26 +0100 Subject: EomThumbnail: Load thumbnail frame from a GResource Also optimize the frame's filesize. origin commit: https://gitlab.gnome.org/GNOME/eog/commit/65720c0 --- data/pixmaps/Makefile.am | 5 +---- data/pixmaps/thumbnail-frame.png | Bin 908 -> 474 bytes src/eom-thumbnail.c | 4 +++- src/eom.gresource.xml | 1 + 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/pixmaps/Makefile.am b/data/pixmaps/Makefile.am index e1ba2dd..d2ae97c 100644 --- a/data/pixmaps/Makefile.am +++ b/data/pixmaps/Makefile.am @@ -1,9 +1,6 @@ pixmapsdir = $(pkgdatadir)/pixmaps -pixmaps_DATA = \ - thumbnail-frame.png - EXTRA_DIST = \ - $(pixmaps_DATA) + thumbnail-frame.png -include $(top_srcdir)/git.mk diff --git a/data/pixmaps/thumbnail-frame.png b/data/pixmaps/thumbnail-frame.png index c2605d5..d06e5bf 100644 Binary files a/data/pixmaps/thumbnail-frame.png and b/data/pixmaps/thumbnail-frame.png differ diff --git a/src/eom-thumbnail.c b/src/eom-thumbnail.c index 67b7137..e4cc56a 100644 --- a/src/eom-thumbnail.c +++ b/src/eom-thumbnail.c @@ -534,6 +534,8 @@ eom_thumbnail_init (void) } if (frame == NULL) { - frame = gdk_pixbuf_new_from_file (EOM_DATA_DIR "/pixmaps/thumbnail-frame.png", NULL); + frame = gdk_pixbuf_new_from_resource ( + "/org/mate/eom/ui/pixmaps/thumbnail-frame.png", + NULL); } } diff --git a/src/eom.gresource.xml b/src/eom.gresource.xml index d1d2599..66826c6 100644 --- a/src/eom.gresource.xml +++ b/src/eom.gresource.xml @@ -6,6 +6,7 @@ eom-multiple-save-as-dialog.ui eom-ui.xml metadata-sidebar.ui + pixmaps/thumbnail-frame.png -- cgit v1.2.1