0.8.11claws49

* src/mimeview.c
        fix mime type guessing when no mime type is found for a file

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 27b31a71c34c2152a72a9f479e6fe7ecbcfeb440..d0f636cf7ef402e6f25e12282f3641b515c6373d 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2003-03-26 [christoph] 0.8.11claws49
+
+       * src/mimeview.c
+               fix mime type guessing when no mime type is found for a file
+
 2003-03-25 [christoph] 0.8.11claws48
 
        * src/mimeview.c

diff --git a/configure.ac b/configure.ac
index b3964ccfa9c1b696ef71b534dc694dcd460de124..f9f7cf14afd029600fe1e0245ef604bf952ab511 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws48
+EXTRA_VERSION=claws49
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mimeview.c b/src/mimeview.c
index 7d7ddf6192a7f72c967118c490fe11908e7dd1f6..14b27166b5b66a4ce3e9d6c5e3e1cb28591c77ea 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -511,7 +511,7 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
 static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinfo)
 {
        gchar *content_type = NULL;
-       MimeViewer *viewer;
+       MimeViewer *viewer = NULL;
 
        if ((partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) &&
            (partinfo->name != NULL)) {
@@ -520,8 +520,10 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
                content_type = g_strdup(partinfo->content_type);
        }
 
-       viewer = get_viewer_for_content_type(mimeview, content_type);
-       g_free(content_type);
+       if (content_type != NULL) {
+               viewer = get_viewer_for_content_type(mimeview, content_type);
+               g_free(content_type);
+       }
 
        return viewer;
 }