[Xfce4-commits] [apps/ristretto] 01/01: Fix opening of PPM files

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

f   2   4   0   4       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/ristretto.

commit 4d03ad59054fa48a0615ea0c055574ebe777442d
Author: Igor <f2404 at yandex.ru>
Date:   Sun Apr 7 20:21:58 2019 -0400

    Fix opening of PPM files
    
    Bug #14709
---
 src/file.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/file.c b/src/file.c
index 5d2020f..7c9ecd4 100644
--- a/src/file.c
+++ b/src/file.c
@@ -412,11 +412,14 @@ rstto_file_get_content_type ( RsttoFile *r_file )
                 content_type = magic_file (magic, file_path);
                 if ( NULL != content_type )
                 {
-                    /* "image/x-ms-bmp" isn't supported by gdk_pixbuf_loader_new_with_mime_type ()
-                       see https://bugzilla.xfce.org/show_bug.cgi?id=13489 */
+                    /* image types that aren't supported by gdk_pixbuf_loader_new_with_mime_type () */
                     if ( g_strcmp0 (content_type, "image/x-ms-bmp") == 0 )
                     {
-                        content_type = "image/bmp";
+                        content_type = "image/bmp"; // bug #13489
+                    }
+                    else if ( g_strcmp0 (content_type, "image/x-portable-greymap") == 0 )
+                    {
+                        content_type = "image/x-portable-graymap"; // bug #14709
                     }
 
                     r_file->priv->content_type = g_strdup (content_type);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.