Fix leak on error variable

[claws.git] / src / plugins / litehtml_viewer / lh_viewer.c

diff --git a/src/plugins/litehtml_viewer/lh_viewer.c b/src/plugins/litehtml_viewer/lh_viewer.c
index e3e1fdbc786f97e3dafd3a1ec625d76eb53d02c9..2d2fc504431ad9aa8ae417ddc702551372d6ecaf 100644 (file)
--- a/src/plugins/litehtml_viewer/lh_viewer.c
+++ b/src/plugins/litehtml_viewer/lh_viewer.c
@@ -86,13 +86,32 @@ static void lh_show_mimepart(MimeViewer *_viewer, const gchar *infile,
 {
        debug_print("LH: show_mimepart\n");
        LHViewer *viewer = (LHViewer *)_viewer;
-       gchar *utf8 = procmime_get_part_as_string(partinfo, TRUE);
+       gchar *string = procmime_get_part_as_string(partinfo, TRUE);
+       gchar *utf8 = NULL;
 
-       if (utf8 == NULL) {
+       if (string == NULL) {
                g_warning("LH: couldn't get MIME part file\n");
                return;
        }
 
+       gchar *charset = procmime_mimeinfo_get_parameter(partinfo, "charset");
+       if (charset != NULL && g_ascii_strcasecmp("utf-8", charset) != 0) {
+               gsize length;
+               GError *error = NULL;
+               debug_print("LH: converting mimepart to UTF-8 from %s\n", charset);
+               utf8 = g_convert(string, -1, "utf-8", charset, NULL, &length, &error);
+               if (error) {
+                       g_warning("LH: failed mimepart conversion to UTF-8: %s", error->message);
+                       g_free(string);
+                       g_error_free(error);
+                       return;
+               }
+               debug_print("LH: successfully converted %" G_GSIZE_FORMAT " bytes\n", length);
+       } else {
+               utf8 = string;
+       }
+
+       lh_widget_set_partinfo(viewer->widget, partinfo);
        lh_widget_open_html(viewer->widget, utf8);
        g_free(utf8);
 }
@@ -106,13 +125,10 @@ static void lh_clear_viewer(MimeViewer *_viewer)
 
 static void lh_destroy_viewer(MimeViewer *_viewer)
 {
-       debug_print("LH: destroy_viewer\n");
-
-       /* Just in case. */
-       lh_clear_viewer(_viewer);
+       LHViewer *viewer = (LHViewer *)_viewer;
 
-//     LHViewer *viewer = (LHViewer *)_viewer;
-//     lh_widget_destroy(viewer->widget);
+       debug_print("LH: destroy_viewer\n");
+       g_free(viewer);
 }
 
 static void lh_print_viewer (MimeViewer *_viewer)