e_mail_formatter_format_header: Remove unused CamelMedium param.

4 files changed, 8 insertions, 15 deletions

diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index 358ed01b65..9e43bb24e1 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -342,7 +342,7 @@ format_full_headers (EMailFormatter *formatter,
 		header = ((CamelMimePart *) part)->headers;
 		while (header != NULL) {
 			e_mail_formatter_format_header (
-				formatter, buffer, part, header,
+				formatter, buffer, header,
 				E_MAIL_FORMATTER_HEADER_FLAG_NOCOLUMNS, charset);
 			header = header->next;
 		}
@@ -393,7 +393,7 @@ format_full_headers (EMailFormatter *formatter,
 					mailer_shown = TRUE;
 
 					e_mail_formatter_format_header (
-						formatter, buffer, part,
+						formatter, buffer,
 						&xmailer, h->flags, charset);
 				} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
 					gchar *cp = header->value;
@@ -412,7 +412,7 @@ format_full_headers (EMailFormatter *formatter,
 				/* Showing an encoded "Face" header makes little sense */
 				} else if (!g_ascii_strcasecmp (header->name, h->name) && !face) {
 					e_mail_formatter_format_header (
-						formatter, buffer, part,
+						formatter, buffer,
 						header, h->flags, charset);
 				}
 
diff --git a/em-format/e-mail-formatter-print-headers.c b/em-format/e-mail-formatter-print-headers.c
index 39b6878da7..8a11e0f8d3 100644
--- a/em-format/e-mail-formatter-print-headers.c
+++ b/em-format/e-mail-formatter-print-headers.c
@@ -92,8 +92,7 @@ emfpe_headers_format (EMailFormatterExtension *extension,
 		if (header->value && *header->value) {
 			raw_header.value = header->value;
 			e_mail_formatter_format_header (
-				formatter, str,
-				CAMEL_MEDIUM (mime_part), &raw_header,
+				formatter, str, &raw_header,
 				header->flags | E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS,
 				"UTF-8");
 		} else {
@@ -108,8 +107,7 @@ emfpe_headers_format (EMailFormatterExtension *extension,
 
 			if (raw_header.value && *raw_header.value) {
 				e_mail_formatter_format_header (
-					formatter, str,
-					CAMEL_MEDIUM (mime_part), &raw_header,
+					formatter, str, &raw_header,
 					header->flags | E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS,
 					"UTF-8");
 			}
@@ -171,8 +169,7 @@ emfpe_headers_format (EMailFormatterExtension *extension,
 	if (tmp->len > 0) {
 		raw_header.value = tmp->str;
 		e_mail_formatter_format_header (
-			formatter, str,
-			CAMEL_MEDIUM (mime_part), &raw_header,
+			formatter, str, &raw_header,
 			E_MAIL_FORMATTER_HEADER_FLAG_BOLD |
 			E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS, "UTF-8");
 	}
@@ -203,8 +200,7 @@ emfpe_headers_format (EMailFormatterExtension *extension,
 		raw_header.name = _("Attachments");
 		raw_header.value = g_strdup_printf ("%d", attachments_count);
 		e_mail_formatter_format_header (
-			formatter, str,
-			CAMEL_MEDIUM (mime_part), &raw_header,
+			formatter, str, &raw_header,
 			E_MAIL_FORMATTER_HEADER_FLAG_BOLD |
 			E_MAIL_FORMATTER_HEADER_FLAG_NOLINKS, "UTF-8");
 		g_free (raw_header.value);
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index fe4c887756..409e2c6314 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -273,7 +273,6 @@ e_mail_formatter_canon_header_name (gchar *name)
 void
 e_mail_formatter_format_header (EMailFormatter *formatter,
                                 GString *buffer,
-                                CamelMedium *part,
                                 struct _camel_header_raw *header,
                                 guint32 flags,
                                 const gchar *charset)
@@ -284,9 +283,8 @@ e_mail_formatter_format_header (EMailFormatter *formatter,
 	gchar *str_field = NULL;
 	gint i;
 
-	/* XXX Not sure if buffer or part can be NULL.
-	 *     They're just passthrough parameters anyway. */
 	g_return_if_fail (E_IS_MAIL_FORMATTER (formatter));
+	g_return_if_fail (buffer != NULL);
 	g_return_if_fail (header != NULL);
 
 	name = g_alloca (strlen (header->name) + 1);
diff --git a/em-format/e-mail-formatter-utils.h b/em-format/e-mail-formatter-utils.h
index c9c19e4704..f24ee6f5b2 100644
--- a/em-format/e-mail-formatter-utils.h
+++ b/em-format/e-mail-formatter-utils.h
@@ -26,7 +26,6 @@ G_BEGIN_DECLS
 
 void		e_mail_formatter_format_header (EMailFormatter *formatter,
 						GString *buffer,
-						CamelMedium *part,
 						struct _camel_header_raw *header,
 						guint32 flags,
 						const gchar *charset);