[Xfce4-commits] [apps/ristretto] 01/01: Fix BMP files failing to load with libmagic

noreply at xfce.org noreply at xfce.org
Wed Jun 7 21:30:06 CEST 2017


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 751834055dfc8831bfe06ed5e493c69b8347668a
Author: Igor <f2404 at yandex.ru>
Date:   Wed Jun 7 15:27:42 2017 -0400

    Fix BMP files failing to load with libmagic
    
    Fixes https://bugzilla.xfce.org/show_bug.cgi?id=13489
---
 src/file.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/file.c b/src/file.c
index cf23b85..d9d046f 100644
--- a/src/file.c
+++ b/src/file.c
@@ -412,6 +412,13 @@ 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 */
+                    if ( g_strcmp0 (content_type, "image/x-ms-bmp") == 0 )
+                    {
+                        content_type = "image/bmp";
+                    }
+
                     r_file->priv->content_type = g_strdup (content_type);
                 }
             }

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


More information about the Xfce4-commits mailing list