summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Riemann <friemann@gnome.org>2020-04-20 19:01:22 +0200
committerFelix Riemann <friemann@gnome.org>2020-04-20 19:01:22 +0200
commitfe857959faca9d5e8a84b884a38639b45e847f81 (patch)
treec983540461b552b9ff1b8a019c61035d49fe8d1c
parent889064ff252173e0a41c1ac1f6b1b16d4aeed612 (diff)
downloadeog-fe857959faca9d5e8a84b884a38639b45e847f81.tar.gz
Revert "Use plain gdk_pixbuf_loader_new(), not new_with_mime_type()"
This reverts commit 31d5eded183dd33bec9ac52c47a6f4a97c4eea33. Turns out that MIME detection based on file data only works for types that have magic bytes defined in the MIME database. Checking the MIME type in eog has the advantage that the filename is available as fallback. Fixes #124.
-rw-r--r--src/eog-image.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/eog-image.c b/src/eog-image.c
index 5c627c8e..55cb1916 100644
--- a/src/eog-image.c
+++ b/src/eog-image.c
@@ -990,7 +990,14 @@ eog_image_real_load (EogImage *img,
#endif
if (!use_rsvg) {
- loader = gdk_pixbuf_loader_new ();
+ loader = gdk_pixbuf_loader_new_with_mime_type (mime_type, error);
+
+ if (error && *error) {
+ g_error_free (*error);
+ *error = NULL;
+
+ loader = gdk_pixbuf_loader_new ();
+ }
g_signal_connect_object (G_OBJECT (loader),
"size-prepared",