Coding style and whitespace cleanup.

48 files changed, 100 insertions, 101 deletions

diff --git a/em-format/e-mail-extension-registry.c b/em-format/e-mail-extension-registry.c
index 2589a8d503..12bca0115b 100644
--- a/em-format/e-mail-extension-registry.c
+++ b/em-format/e-mail-extension-registry.c
@@ -69,13 +69,13 @@ mail_extension_registry_finalize (GObject *object)
 }
 
 void
-e_mail_extension_registry_class_init (EMailExtensionRegistryClass *klass)
+e_mail_extension_registry_class_init (EMailExtensionRegistryClass *class)
 {
 	GObjectClass *object_class;
 
-	g_type_class_add_private (klass, sizeof (EMailExtensionRegistryPrivate));
+	g_type_class_add_private (class, sizeof (EMailExtensionRegistryPrivate));
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = mail_extension_registry_finalize;
 }
 
@@ -250,7 +250,7 @@ e_mail_parser_extension_registry_init (EMailParserExtensionRegistry *parser_ereg
 }
 
 static void
-e_mail_parser_extension_registry_class_init (EMailParserExtensionRegistryClass *klass)
+e_mail_parser_extension_registry_class_init (EMailParserExtensionRegistryClass *class)
 {
 }
 
@@ -279,7 +279,7 @@ e_mail_formatter_extension_registry_init (EMailFormatterExtensionRegistry *forma
 }
 
 static void
-e_mail_formatter_extension_registry_class_init (EMailFormatterExtensionRegistryClass *klass)
+e_mail_formatter_extension_registry_class_init (EMailFormatterExtensionRegistryClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-attachment-bar.c b/em-format/e-mail-formatter-attachment-bar.c
index 22da7e2b0d..ae86007faf 100644
--- a/em-format/e-mail-formatter-attachment-bar.c
+++ b/em-format/e-mail-formatter-attachment-bar.c
@@ -127,7 +127,7 @@ emfe_attachment_bar_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_attachment_bar_class_init (EMailFormatterAttachmentBarClass *klass)
+e_mail_formatter_attachment_bar_class_init (EMailFormatterAttachmentBarClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index 75e9ec76b7..d94e552c43 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -376,7 +376,7 @@ emfe_attachment_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_attachment_class_init (EMailFormatterAttachmentClass *klass)
+e_mail_formatter_attachment_class_init (EMailFormatterAttachmentClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-error.c b/em-format/e-mail-formatter-error.c
index 93b36b28bf..f99a5fb1e3 100644
--- a/em-format/e-mail-formatter-error.c
+++ b/em-format/e-mail-formatter-error.c
@@ -134,7 +134,7 @@ emfe_error_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_error_class_init (EMailFormatterErrorClass *klass)
+e_mail_formatter_error_class_init (EMailFormatterErrorClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index 75fa9b5aa9..0b9c25a4c6 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -585,7 +585,7 @@ emfe_headers_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_headers_class_init (EMailFormatterHeadersClass *klass)
+e_mail_formatter_headers_class_init (EMailFormatterHeadersClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-image.c b/em-format/e-mail-formatter-image.c
index 0ec8910f15..aa20e8ce51 100644
--- a/em-format/e-mail-formatter-image.c
+++ b/em-format/e-mail-formatter-image.c
@@ -165,7 +165,7 @@ emfe_image_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_image_class_init (EMailFormatterImageClass *klass)
+e_mail_formatter_image_class_init (EMailFormatterImageClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c
index bfbda51eab..11079d2653 100644
--- a/em-format/e-mail-formatter-message-rfc822.c
+++ b/em-format/e-mail-formatter-message-rfc822.c
@@ -250,7 +250,7 @@ emfe_message_rfc822_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_message_rfc822_class_init (EMailFormatterMessageRFC822Class *klass)
+e_mail_formatter_message_rfc822_class_init (EMailFormatterMessageRFC822Class *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-print-headers.c b/em-format/e-mail-formatter-print-headers.c
index 2ee2b665a7..a74b94f2cd 100644
--- a/em-format/e-mail-formatter-print-headers.c
+++ b/em-format/e-mail-formatter-print-headers.c
@@ -232,7 +232,7 @@ emfpe_headers_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_print_headers_class_init (EMailFormatterPrintHeadersClass *klass)
+e_mail_formatter_print_headers_class_init (EMailFormatterPrintHeadersClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-print.c b/em-format/e-mail-formatter-print.c
index a9109a647e..c97f2fd1fe 100644
--- a/em-format/e-mail-formatter-print.c
+++ b/em-format/e-mail-formatter-print.c
@@ -204,29 +204,29 @@ e_mail_formatter_print_finalize (GObject *object)
 }
 
 static void
-e_mail_formatter_print_class_init (EMailFormatterPrintClass *klass)
+e_mail_formatter_print_class_init (EMailFormatterPrintClass *class)
 {
 	GObjectClass *object_class;
 	EMailFormatterClass *formatter_class;
 
-	e_mail_formatter_print_parent_class = g_type_class_peek_parent (klass);
+	e_mail_formatter_print_parent_class = g_type_class_peek_parent (class);
 
-	formatter_class = E_MAIL_FORMATTER_CLASS (klass);
+	formatter_class = E_MAIL_FORMATTER_CLASS (class);
 	formatter_class->run = mail_formatter_print_run;
 	formatter_class->set_style = mail_formatter_set_style;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = e_mail_formatter_print_finalize;
 }
 
 static void
-e_mail_formatter_print_base_init (EMailFormatterPrintClass *klass)
+e_mail_formatter_print_base_init (EMailFormatterPrintClass *class)
 {
 	e_mail_formatter_print_internal_extensions_load (
 		E_MAIL_EXTENSION_REGISTRY (
-			E_MAIL_FORMATTER_CLASS (klass)->extension_registry));
+			E_MAIL_FORMATTER_CLASS (class)->extension_registry));
 
-	E_MAIL_FORMATTER_CLASS (klass)->text_html_flags =
+	E_MAIL_FORMATTER_CLASS (class)->text_html_flags =
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
diff --git a/em-format/e-mail-formatter-quote-attachment.c b/em-format/e-mail-formatter-quote-attachment.c
index f6cb44bf1c..655f676602 100644
--- a/em-format/e-mail-formatter-quote-attachment.c
+++ b/em-format/e-mail-formatter-quote-attachment.c
@@ -137,7 +137,7 @@ emfqe_attachment_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_attachment_class_init (EMailFormatterQuoteAttachmentClass *klass)
+e_mail_formatter_quote_attachment_class_init (EMailFormatterQuoteAttachmentClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index 8e7a57f8ce..5c31e39362 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -136,7 +136,7 @@ emqfe_headers_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_headers_class_init (EMailFormatterQuoteHeadersClass *klass)
+e_mail_formatter_quote_headers_class_init (EMailFormatterQuoteHeadersClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c b/em-format/e-mail-formatter-quote-message-rfc822.c
index 18ec0af348..fb5922c1af 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -162,7 +162,7 @@ emfqe_message_rfc822_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_message_rfc822_class_init (EMailFormatterQuoteMessageRFC822Class *klass)
+e_mail_formatter_quote_message_rfc822_class_init (EMailFormatterQuoteMessageRFC822Class *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-quote-text-enriched.c b/em-format/e-mail-formatter-quote-text-enriched.c
index a98046397c..9768259c02 100644
--- a/em-format/e-mail-formatter-quote-text-enriched.c
+++ b/em-format/e-mail-formatter-quote-text-enriched.c
@@ -115,7 +115,7 @@ emqfe_text_enriched_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_text_enriched_class_init (EMailFormatterQuoteTextEnrichedClass *klass)
+e_mail_formatter_quote_text_enriched_class_init (EMailFormatterQuoteTextEnrichedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-quote-text-html.c b/em-format/e-mail-formatter-quote-text-html.c
index 9f4159f4ed..21cb444818 100644
--- a/em-format/e-mail-formatter-quote-text-html.c
+++ b/em-format/e-mail-formatter-quote-text-html.c
@@ -117,7 +117,7 @@ emqfe_text_html_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_text_html_class_init (EMailFormatterQuoteTextHTMLClass *klass)
+e_mail_formatter_quote_text_html_class_init (EMailFormatterQuoteTextHTMLClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index 31974b2ed2..90ed5729ed 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -136,7 +136,7 @@ emqfe_text_plain_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_quote_text_plain_class_init (EMailFormatterQuoteTextPlainClass *klass)
+e_mail_formatter_quote_text_plain_class_init (EMailFormatterQuoteTextPlainClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-quote.c b/em-format/e-mail-formatter-quote.c
index 85016dbe55..74055ebd3e 100644
--- a/em-format/e-mail-formatter-quote.c
+++ b/em-format/e-mail-formatter-quote.c
@@ -159,33 +159,33 @@ e_mail_formatter_quote_finalize (GObject *object)
 }
 
 static void
-e_mail_formatter_quote_base_init (EMailFormatterQuoteClass *klass)
+e_mail_formatter_quote_base_init (EMailFormatterQuoteClass *class)
 {
 	e_mail_formatter_quote_internal_extensions_load (
 		E_MAIL_EXTENSION_REGISTRY (
-			E_MAIL_FORMATTER_CLASS (klass)->extension_registry));
+			E_MAIL_FORMATTER_CLASS (class)->extension_registry));
 
-	E_MAIL_FORMATTER_CLASS (klass)->text_html_flags =
+	E_MAIL_FORMATTER_CLASS (class)->text_html_flags =
 		CAMEL_MIME_FILTER_TOHTML_PRE |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES;
 }
 
 static void
-e_mail_formatter_quote_class_init (EMailFormatterQuoteClass *klass)
+e_mail_formatter_quote_class_init (EMailFormatterQuoteClass *class)
 {
 	GObjectClass *object_class;
 	EMailFormatterClass *formatter_class;
 
-	e_mail_formatter_quote_parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (EMailFormatterQuotePrivate));
+	e_mail_formatter_quote_parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EMailFormatterQuotePrivate));
 
-	formatter_class = E_MAIL_FORMATTER_CLASS (klass);
+	formatter_class = E_MAIL_FORMATTER_CLASS (class);
 	formatter_class->run = mail_formatter_quote_run;
 	formatter_class->create_context = mail_formatter_quote_create_context;
 	formatter_class->free_context = mail_formatter_quote_free_context;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = e_mail_formatter_quote_finalize;
 }
 
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index ea9d484cf8..6cc34d00cc 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -445,7 +445,7 @@ emfe_secure_button_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_secure_button_class_init (EMailFormatterSecureButtonClass *klass)
+e_mail_formatter_secure_button_class_init (EMailFormatterSecureButtonClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-source.c b/em-format/e-mail-formatter-source.c
index 2ec5bcbaab..518c2af050 100644
--- a/em-format/e-mail-formatter-source.c
+++ b/em-format/e-mail-formatter-source.c
@@ -152,7 +152,7 @@ emfe_source_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_source_class_init (EMailFormatterSourceClass *klass)
+e_mail_formatter_source_class_init (EMailFormatterSourceClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index a887ef141a..56dcdef4ee 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -128,7 +128,7 @@ emfe_text_enriched_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_text_enriched_class_init (EMailFormatterTextEnrichedClass *klass)
+e_mail_formatter_text_enriched_class_init (EMailFormatterTextEnrichedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index e06f6d7ca7..8834994496 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -350,7 +350,7 @@ emfe_text_html_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_text_html_class_init (EMailFormatterTextHTMLClass *klass)
+e_mail_formatter_text_html_class_init (EMailFormatterTextHTMLClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-text-plain.c b/em-format/e-mail-formatter-text-plain.c
index f63a2c228e..a8cb7f2943 100644
--- a/em-format/e-mail-formatter-text-plain.c
+++ b/em-format/e-mail-formatter-text-plain.c
@@ -186,7 +186,7 @@ emfe_text_plain_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_formatter_text_plain_class_init (EMailFormatterTextPlainClass *klass)
+e_mail_formatter_text_plain_class_init (EMailFormatterTextPlainClass *class)
 {
 }
 
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index 7f2108eb38..252f8e4576 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -435,7 +435,7 @@ e_mail_formatter_find_rfc822_end_iter (GSList *iter)
 
 gchar *
 e_mail_formatter_parse_html_mnemonics (const gchar *label,
-				       gchar **access_key)
+                                       gchar **access_key)
 {
 	const gchar *pos = NULL;
 	gchar ak = 0;
diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c
index 2bf8ac0de7..2957f867b1 100644
--- a/em-format/e-mail-formatter.c
+++ b/em-format/e-mail-formatter.c
@@ -77,7 +77,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static int signals[LAST_SIGNAL];
+static gint signals[LAST_SIGNAL];
 
 static void
 mail_formatter_run (EMailFormatter *formatter,
@@ -484,18 +484,18 @@ e_mail_formatter_finalize (GObject *object)
 }
 
 static void
-e_mail_formatter_base_init (EMailFormatterClass *klass)
+e_mail_formatter_base_init (EMailFormatterClass *class)
 {
-	klass->extension_registry = g_object_new (
+	class->extension_registry = g_object_new (
 		E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY, NULL);
 
 	e_mail_formatter_internal_extensions_load (
-			E_MAIL_EXTENSION_REGISTRY (klass->extension_registry));
+			E_MAIL_EXTENSION_REGISTRY (class->extension_registry));
 
 	e_extensible_load_extensions (
-		E_EXTENSIBLE (klass->extension_registry));
+		E_EXTENSIBLE (class->extension_registry));
 
-	klass->text_html_flags =
+	class->text_html_flags =
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_NL |
 		CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES |
@@ -504,9 +504,9 @@ e_mail_formatter_base_init (EMailFormatterClass *klass)
 }
 
 static void
-e_mail_formatter_base_finalize (EMailFormatterClass *klass)
+e_mail_formatter_base_finalize (EMailFormatterClass *class)
 {
-	g_object_unref (klass->extension_registry);
+	g_object_unref (class->extension_registry);
 }
 
 static void
@@ -518,37 +518,37 @@ e_mail_formatter_constructed (GObject *object)
 }
 
 static void
-e_mail_formatter_class_init (EMailFormatterClass *klass)
+e_mail_formatter_class_init (EMailFormatterClass *class)
 {
 	GObjectClass *object_class;
 	GdkColor *color;
 
-	e_mail_formatter_parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (EMailFormatterPrivate));
+	e_mail_formatter_parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EMailFormatterPrivate));
 
-	klass->run = mail_formatter_run;
+	class->run = mail_formatter_run;
 
 	/* EMailFormatter calls these directly */
-	klass->create_context = NULL;
-	klass->free_context = NULL;
-	klass->set_style = mail_formatter_set_style;
+	class->create_context = NULL;
+	class->free_context = NULL;
+	class->set_style = mail_formatter_set_style;
 
-	color = &klass->colors[E_MAIL_FORMATTER_COLOR_BODY];
+	color = &class->colors[E_MAIL_FORMATTER_COLOR_BODY];
 	gdk_color_parse ("#eeeeee", color);
 
-	color = &klass->colors[E_MAIL_FORMATTER_COLOR_CONTENT];
+	color = &class->colors[E_MAIL_FORMATTER_COLOR_CONTENT];
 	gdk_color_parse ("#ffffff", color);
 
-	color = &klass->colors[E_MAIL_FORMATTER_COLOR_FRAME];
+	color = &class->colors[E_MAIL_FORMATTER_COLOR_FRAME];
 	gdk_color_parse ("#3f3f3f", color);
 
-	color = &klass->colors[E_MAIL_FORMATTER_COLOR_HEADER];
+	color = &class->colors[E_MAIL_FORMATTER_COLOR_HEADER];
 	gdk_color_parse ("#eeeeee", color);
 
-	color = &klass->colors[E_MAIL_FORMATTER_COLOR_TEXT];
+	color = &class->colors[E_MAIL_FORMATTER_COLOR_TEXT];
 	gdk_color_parse ("#000000", color);
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_formatter_constructed;
 	object_class->get_property = e_mail_formatter_get_property;
 	object_class->set_property = e_mail_formatter_set_property;
diff --git a/em-format/e-mail-parser-application-mbox.c b/em-format/e-mail-parser-application-mbox.c
index 313d2c8787..c4c6b50968 100644
--- a/em-format/e-mail-parser-application-mbox.c
+++ b/em-format/e-mail-parser-application-mbox.c
@@ -189,7 +189,7 @@ empe_app_mbox_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_application_mbox_class_init (EMailParserApplicationMBoxClass *klass)
+e_mail_parser_application_mbox_class_init (EMailParserApplicationMBoxClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c
index 4fb7115cf1..444d02793f 100644
--- a/em-format/e-mail-parser-application-smime.c
+++ b/em-format/e-mail-parser-application-smime.c
@@ -174,7 +174,7 @@ empe_application_smime_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_application_smime_class_init (EMailParserApplicationSMIMEClass *klass)
+e_mail_parser_application_smime_class_init (EMailParserApplicationSMIMEClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-attachment-bar.c b/em-format/e-mail-parser-attachment-bar.c
index c50e807747..5df1afa7a1 100644
--- a/em-format/e-mail-parser-attachment-bar.c
+++ b/em-format/e-mail-parser-attachment-bar.c
@@ -96,7 +96,7 @@ empe_attachment_bar_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_attachment_bar_class_init (EMailParserAttachmentBarClass *klass)
+e_mail_parser_attachment_bar_class_init (EMailParserAttachmentBarClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-headers.c b/em-format/e-mail-parser-headers.c
index 249cc65619..92e93f6f51 100644
--- a/em-format/e-mail-parser-headers.c
+++ b/em-format/e-mail-parser-headers.c
@@ -60,7 +60,7 @@ static const gchar *parser_mime_types[] = { "application/vnd.evolution.headers",
 
 static void
 empe_headers_bind_dom (EMailPart *part,
-		       WebKitDOMElement *element)
+                       WebKitDOMElement *element)
 {
 	WebKitDOMDocument *document;
 	WebKitDOMElement *photo;
@@ -118,7 +118,7 @@ empe_headers_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_headers_class_init (EMailParserHeadersClass *klass)
+e_mail_parser_headers_class_init (EMailParserHeadersClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-image.c b/em-format/e-mail-parser-image.c
index 30769c67df..b252714215 100644
--- a/em-format/e-mail-parser-image.c
+++ b/em-format/e-mail-parser-image.c
@@ -123,7 +123,7 @@ empe_image_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_image_class_init (EMailParserImageClass *klass)
+e_mail_parser_image_class_init (EMailParserImageClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index d273f8b67d..e3c064a64e 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -181,7 +181,7 @@ empe_inlinepgp_encrypted_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_inline_pgp_encrypted_class_init (EMailParserInlinePGPEncryptedClass *klass)
+e_mail_parser_inline_pgp_encrypted_class_init (EMailParserInlinePGPEncryptedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index e86096e160..53ecaf831a 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -205,7 +205,7 @@ empe_inlinepgp_signed_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_inline_pgp_signed_class_init (EMailParserInlinePGPSignedClass *klass)
+e_mail_parser_inline_pgp_signed_class_init (EMailParserInlinePGPSignedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-message-deliverystatus.c b/em-format/e-mail-parser-message-deliverystatus.c
index fe2ec90b60..22f5d88e1f 100644
--- a/em-format/e-mail-parser-message-deliverystatus.c
+++ b/em-format/e-mail-parser-message-deliverystatus.c
@@ -92,7 +92,7 @@ empe_msg_deliverystatus_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_message_delivery_status_class_init (EMailParserMessageDeliveryStatusClass *klass)
+e_mail_parser_message_delivery_status_class_init (EMailParserMessageDeliveryStatusClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-message-external.c b/em-format/e-mail-parser-message-external.c
index aa65893ce3..3c99e2d5ca 100644
--- a/em-format/e-mail-parser-message-external.c
+++ b/em-format/e-mail-parser-message-external.c
@@ -187,7 +187,7 @@ empe_msg_external_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_message_external_class_init (EMailParserMessageExternalClass *klass)
+e_mail_parser_message_external_class_init (EMailParserMessageExternalClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-message-rfc822.c b/em-format/e-mail-parser-message-rfc822.c
index fe81811e35..f437ebd336 100644
--- a/em-format/e-mail-parser-message-rfc822.c
+++ b/em-format/e-mail-parser-message-rfc822.c
@@ -149,7 +149,7 @@ empe_msg_rfc822_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_message_rfc822_class_init (EMailParserMessageRFC822Class *klass)
+e_mail_parser_message_rfc822_class_init (EMailParserMessageRFC822Class *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-message.c b/em-format/e-mail-parser-message.c
index c9a64d2709..a761f4bd53 100644
--- a/em-format/e-mail-parser-message.c
+++ b/em-format/e-mail-parser-message.c
@@ -105,7 +105,7 @@ empe_message_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_message_class_init (EMailParserMessageClass *klass)
+e_mail_parser_message_class_init (EMailParserMessageClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-alternative.c b/em-format/e-mail-parser-multipart-alternative.c
index a5c04d1a17..2239279f6c 100644
--- a/em-format/e-mail-parser-multipart-alternative.c
+++ b/em-format/e-mail-parser-multipart-alternative.c
@@ -167,7 +167,7 @@ empe_mp_alternative_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_alternative_class_init (EMailParserMultipartAlternativeClass *klass)
+e_mail_parser_multipart_alternative_class_init (EMailParserMultipartAlternativeClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-appledouble.c b/em-format/e-mail-parser-multipart-appledouble.c
index 2567a1d52a..65b619f415 100644
--- a/em-format/e-mail-parser-multipart-appledouble.c
+++ b/em-format/e-mail-parser-multipart-appledouble.c
@@ -106,7 +106,7 @@ empe_mp_appledouble_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_apple_double_class_init (EMailParserMultipartAppleDoubleClass *klass)
+e_mail_parser_multipart_apple_double_class_init (EMailParserMultipartAppleDoubleClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-digest.c b/em-format/e-mail-parser-multipart-digest.c
index 78523b2d59..3b20ba83a8 100644
--- a/em-format/e-mail-parser-multipart-digest.c
+++ b/em-format/e-mail-parser-multipart-digest.c
@@ -150,7 +150,7 @@ empe_mp_digest_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_digest_class_init (EMailParserMultipartDigestClass *klass)
+e_mail_parser_multipart_digest_class_init (EMailParserMultipartDigestClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-encrypted.c b/em-format/e-mail-parser-multipart-encrypted.c
index 52d420048a..7cf724201d 100644
--- a/em-format/e-mail-parser-multipart-encrypted.c
+++ b/em-format/e-mail-parser-multipart-encrypted.c
@@ -196,7 +196,7 @@ empe_mp_encrypted_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_encrypted_class_init (EMailParserMultipartEncryptedClass *klass)
+e_mail_parser_multipart_encrypted_class_init (EMailParserMultipartEncryptedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index c622d46a0f..990a8f2a08 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -133,7 +133,7 @@ empe_mp_mixed_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_mixed_class_init (EMailParserMultipartMixedClass *klass)
+e_mail_parser_multipart_mixed_class_init (EMailParserMultipartMixedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index ec5988e325..548c1362d3 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -139,7 +139,7 @@ empe_mp_related_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_related_class_init (EMailParserMultipartRelatedClass *klass)
+e_mail_parser_multipart_related_class_init (EMailParserMultipartRelatedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-multipart-signed.c b/em-format/e-mail-parser-multipart-signed.c
index 798d3153ab..5dc07eb0ab 100644
--- a/em-format/e-mail-parser-multipart-signed.c
+++ b/em-format/e-mail-parser-multipart-signed.c
@@ -228,7 +228,7 @@ empe_mp_signed_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_multipart_signed_class_init (EMailParserMultipartSignedClass *klass)
+e_mail_parser_multipart_signed_class_init (EMailParserMultipartSignedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-secure-button.c b/em-format/e-mail-parser-secure-button.c
index e32bb78797..92a0f61958 100644
--- a/em-format/e-mail-parser-secure-button.c
+++ b/em-format/e-mail-parser-secure-button.c
@@ -80,7 +80,7 @@ empe_secure_button_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_secure_button_class_init (EMailParserSecureButtonClass *klass)
+e_mail_parser_secure_button_class_init (EMailParserSecureButtonClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-source.c b/em-format/e-mail-parser-source.c
index 8f06beebab..db08144fa2 100644
--- a/em-format/e-mail-parser-source.c
+++ b/em-format/e-mail-parser-source.c
@@ -84,7 +84,7 @@ empe_source_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_source_class_init (EMailParserSourceClass *klass)
+e_mail_parser_source_class_init (EMailParserSourceClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-text-enriched.c b/em-format/e-mail-parser-text-enriched.c
index e456fbb6fc..c23130763c 100644
--- a/em-format/e-mail-parser-text-enriched.c
+++ b/em-format/e-mail-parser-text-enriched.c
@@ -104,7 +104,7 @@ empe_text_enriched_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_text_enriched_class_init (EMailParserTextEnrichedClass *klass)
+e_mail_parser_text_enriched_class_init (EMailParserTextEnrichedClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-text-html.c b/em-format/e-mail-parser-text-html.c
index bf3cf0e1b7..b824931e09 100644
--- a/em-format/e-mail-parser-text-html.c
+++ b/em-format/e-mail-parser-text-html.c
@@ -114,7 +114,7 @@ empe_text_html_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_text_html_class_init (EMailParserTextHTMLClass *klass)
+e_mail_parser_text_html_class_init (EMailParserTextHTMLClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser-text-plain.c b/em-format/e-mail-parser-text-plain.c
index af6947ada1..00a7b53b18 100644
--- a/em-format/e-mail-parser-text-plain.c
+++ b/em-format/e-mail-parser-text-plain.c
@@ -229,7 +229,7 @@ empe_text_plain_mime_types (EMailExtension *extension)
 }
 
 static void
-e_mail_parser_text_plain_class_init (EMailParserTextPlainClass *klass)
+e_mail_parser_text_plain_class_init (EMailParserTextPlainClass *class)
 {
 }
 
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index a41f7694a6..5af3d61b32 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -192,32 +192,32 @@ e_mail_parser_init (EMailParser *parser)
 }
 
 static void
-e_mail_parser_base_init (EMailParserClass *klass)
+e_mail_parser_base_init (EMailParserClass *class)
 {
-	klass->extension_registry = g_object_new (
+	class->extension_registry = g_object_new (
 		E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY, NULL);
 
 	e_mail_parser_internal_extensions_load (
-		E_MAIL_EXTENSION_REGISTRY (klass->extension_registry));
+		E_MAIL_EXTENSION_REGISTRY (class->extension_registry));
 
-	e_extensible_load_extensions (E_EXTENSIBLE (klass->extension_registry));
+	e_extensible_load_extensions (E_EXTENSIBLE (class->extension_registry));
 }
 
 static void
-e_mail_parser_base_finalize (EMailParserClass *klass)
+e_mail_parser_base_finalize (EMailParserClass *class)
 {
-	g_object_unref (klass->extension_registry);
+	g_object_unref (class->extension_registry);
 }
 
 static void
-e_mail_parser_class_init (EMailParserClass *klass)
+e_mail_parser_class_init (EMailParserClass *class)
 {
 	GObjectClass *object_class;
 
-	parent_class = g_type_class_peek_parent (klass);
-	g_type_class_add_private (klass, sizeof (EMailParserPrivate));
+	parent_class = g_type_class_peek_parent (class);
+	g_type_class_add_private (class, sizeof (EMailParserPrivate));
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = e_mail_parser_finalize;
 	object_class->set_property = e_mail_parser_set_property;
 	object_class->get_property = e_mail_parser_get_property;
diff --git a/em-format/e-mail-part-list.c b/em-format/e-mail-part-list.c
index 0ad8a9198f..58ad7aa09d 100644
--- a/em-format/e-mail-part-list.c
+++ b/em-format/e-mail-part-list.c
@@ -22,7 +22,6 @@
 
 G_DEFINE_TYPE (EMailPartList, e_mail_part_list, G_TYPE_OBJECT)
 
-
 static CamelObjectBag *registry = NULL;
 G_LOCK_DEFINE_STATIC (registry);
 
@@ -55,11 +54,11 @@ e_mail_part_list_finalize (GObject *object)
 }
 
 static void
-e_mail_part_list_class_init (EMailPartListClass *klass)
+e_mail_part_list_class_init (EMailPartListClass *class)
 {
 	GObjectClass *object_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = e_mail_part_list_finalize;
 }
 
@@ -154,7 +153,7 @@ e_mail_part_list_get_registry (void)
 
 static void
 part_list_weak_ref_notify (gchar *mail_uri,
-			   EMailPartList *part_list)
+                           EMailPartList *part_list)
 {
 	CamelObjectBag *reg = e_mail_part_list_get_registry ();
 
@@ -172,8 +171,8 @@ part_list_weak_ref_notify (gchar *mail_uri,
  */
 void
 e_mail_part_list_registry_add (CamelObjectBag *registry,
-			       const gchar *mail_uri,
-			       EMailPartList *part_list)
+                               const gchar *mail_uri,
+                               EMailPartList *part_list)
 {
 	camel_object_bag_add (registry, mail_uri, part_list);
 
@@ -181,4 +180,4 @@ e_mail_part_list_registry_add (CamelObjectBag *registry,
 		G_OBJECT (part_list),
 		(GWeakNotify) part_list_weak_ref_notify,
 		g_strdup (mail_uri));
-}
\ No newline at end of file
+}