if we end up with an application/octet-stream part, pre-snoop it so we set

2004-05-19  Not Zed  <NotZed@Ximian.com>

        * em-inline-filter.c (emif_add_part): if we end up with an
        application/octet-stream part, pre-snoop it so we set the right
        mime type to start with.  Fixes #58554.

        * em-format.c (emf_snoop_part): removed, now in em-utils.

        * em-utils.c (em_utils_snoop_type): rah rah, snoop a mime part's
        type.

        * em-format-html.c (efh_text_plain): Revert jeff's fix for #56290.
        Ugh, we already have all the citation info in local data.  Removed
        the need for gconf too.

svn path=/trunk/; revision=25974

1 files changed, 3 insertions, 27 deletions

diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index f2d346378a..684d60aed6 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -31,8 +31,6 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#include <gconf/gconf-client.h>
-
 #include <gal/util/e-iconv.h>
 #include <gal/util/e-util.h>	/* for e_utf8_strftime, what about e_time_format_time? */
 #include "e-util/e-time-utils.h"
@@ -635,9 +633,8 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 	CamelDataWrapper *dw;
 	CamelContentType *type;
 	const char *format;
-	guint32 rgb, flags;
+	guint32 flags;
 	int i, count, len;
-	GConfClient *gconf;
 	
 	camel_stream_printf (stream,
 			     "<table bgcolor=\"#%06x\" cellspacing=0 cellpadding=1 width=100%%><tr><td>\n"
@@ -693,30 +690,9 @@ efh_text_plain(EMFormatHTML *efh, CamelStream *stream, CamelMimePart *part, EMFo
 		camel_object_unref(inline_filter);
 		camel_content_type_unref(ct);
 	}
-	
-	gconf = gconf_client_get_default ();
-	if (gconf_client_get_bool (gconf, "/apps/evolution/mail/display/mark_citations", NULL)) {
-		GError *err = NULL;
-		GdkColor colour;
-		char *str;
-		
-		str = gconf_client_get_string (gconf, "/apps/evolution/mail/display/citation_colour", &err);
-		if (err == NULL) {
-			gdk_color_parse (str, &colour);
-			rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8);
-		} else {
-			/* default colour */
-			g_error_free (err);
-			rgb = 0x737373;
-		}
-		g_free (str);
-	} else {
-		rgb = 0;
-	}
-	g_object_unref (gconf);
-	
+
 	filtered_stream = camel_stream_filter_new_with_stream(stream);
-	html_filter = camel_mime_filter_tohtml_new(flags, rgb);
+	html_filter = camel_mime_filter_tohtml_new(flags, efh->citation_colour);
 	camel_stream_filter_add(filtered_stream, html_filter);
 	camel_object_unref(html_filter);