[balsa/gtk3] Fix bgo #679869
- From: Peter Bloomfield <PeterB src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/gtk3] Fix bgo #679869
- Date: Fri, 13 Jul 2012 16:38:26 +0000 (UTC)
commit 55de2072fa10bb79ee8cdfb81b5fab97d642692a
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Fri Jul 13 12:37:11 2012 -0400
Fix bgo #679869
* libbalsa/mime.c (process_mime_part): build
--with-html-widget=no; fixes bgo #679869 (Aljosha).
ChangeLog | 5 +++++
libbalsa/mime.c | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 83179d0..0228674 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13 Peter Bloomfield
+
+ * libbalsa/mime.c (process_mime_part): build
+ --with-html-widget=no; fixes bgo #679869 (Aljosha).
+
2012-07-04 Peter Bloomfield
* src/main-window.c: manage sensitivity of check mail button in
diff --git a/libbalsa/mime.c b/libbalsa/mime.c
index 2cf8fdd..befa971 100644
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@ -51,7 +51,9 @@ process_mime_part(LibBalsaMessage * message, LibBalsaMessageBody * body,
gboolean flow)
{
gchar *res = NULL;
+#ifdef HAVE_HTML_WIDGET
size_t allocated;
+#endif /* HAVE_HTML_WIDGET */
GString *reply = NULL;
gchar *mime_type;
LibBalsaHTMLType html_type;
@@ -78,15 +80,19 @@ process_mime_part(LibBalsaMessage * message, LibBalsaMessageBody * body,
if (ignore_html && html_type)
break;
+#ifdef HAVE_HTML_WIDGET
allocated = libbalsa_message_body_get_content(body, &res, NULL);
if (!res)
return NULL;
-#ifdef HAVE_HTML_WIDGET
if (html_type) {
allocated = libbalsa_html_filter(html_type, &res, allocated);
libbalsa_html_to_string(&res, allocated);
}
+#else /* HAVE_HTML_WIDGET */
+ libbalsa_message_body_get_content(body, &res, NULL);
+ if (!res)
+ return NULL;
#endif /* HAVE_HTML_WIDGET */
if (flow && libbalsa_message_body_is_flowed(body)) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]