EomThumbnail: Load thumbnail frame from a GResource

fxri · raveit65 · commit b18e263d2e56 · 2018-08-13T19:08:02.000+02:00
Also optimize the frame's filesize. origin commit: https://gitlab.gnome.org/GNOME/eog/commit/65720c0
diff --git 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
diff --git 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
@@ -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>
 

Original file line number	Diff line number	Diff line change
`@@ -534,6 +534,8 @@ eom_thumbnail_init (void)`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`if (frame == NULL) {`
`537`		`- frame = gdk_pixbuf_new_from_file (EOM_DATA_DIR "/pixmaps/thumbnail-frame.png", NULL);`
	`537`	`+ frame = gdk_pixbuf_new_from_resource (`
	`538`	`+ "/org/mate/eom/ui/pixmaps/thumbnail-frame.png",`
	`539`	`+ NULL);`
`538`	`540`	`}`
`539`	`541`	`}`