diff options
| author | Felix Riemann <[email protected]> | 2015-01-05 19:06:26 +0100 |
|---|---|---|
| committer | raveit65 <[email protected]> | 2018-08-13 19:08:02 +0200 |
| commit | b18e263d2e56de145d702a20a66bfca2631a65aa (patch) | |
| tree | e6174dee4bf56e976a8887ccd2abc45bea7c3bc4 | |
| parent | b1fb22db626d4d1f37c70dbe75dcd05900a39af2 (diff) | |
| download | eom-b18e263d2e56de145d702a20a66bfca2631a65aa.tar.bz2 eom-b18e263d2e56de145d702a20a66bfca2631a65aa.tar.xz | |
EomThumbnail: Load thumbnail frame from a GResource
Also optimize the frame's filesize.
origin commit:
https://gitlab.gnome.org/GNOME/eog/commit/65720c0
| -rw-r--r-- | data/pixmaps/Makefile.am | 5 | ||||
| -rw-r--r-- | data/pixmaps/thumbnail-frame.png | bin | 908 -> 474 bytes | |||
| -rw-r--r-- | src/eom-thumbnail.c | 4 | ||||
| -rw-r--r-- | 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 Binary files differindex c2605d5..d06e5bf 100644 --- a/data/pixmaps/thumbnail-frame.png +++ b/data/pixmaps/thumbnail-frame.png 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 @@ <file compressed="true" preprocess="xml-stripblanks">eom-multiple-save-as-dialog.ui</file> <file compressed="true" preprocess="xml-stripblanks">eom-ui.xml</file> <file compressed="true" preprocess="xml-stripblanks">metadata-sidebar.ui</file> + <file>pixmaps/thumbnail-frame.png</file> </gresource> </gresources> |
