Coding style and whitespace cleanup.

12 files changed, 43 insertions, 45 deletions

diff --git a/modules/audio-inline/e-mail-formatter-audio-inline.c b/modules/audio-inline/e-mail-formatter-audio-inline.c
index 92e8ca94f1..d03fb915d9 100644
--- a/modules/audio-inline/e-mail-formatter-audio-inline.c
+++ b/modules/audio-inline/e-mail-formatter-audio-inline.c
@@ -335,15 +335,15 @@ e_mail_formatter_audio_inline_constructed (GObject *object)
 }
 
 static void
-e_mail_formatter_audio_inline_class_init (EMailFormatterAudioInlineClass *klass)
+e_mail_formatter_audio_inline_class_init (EMailFormatterAudioInlineClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_formatter_audio_inline_constructed;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
 }
 
@@ -375,7 +375,7 @@ e_mail_formatter_audio_inline_type_register (GTypeModule *type_module)
 }
 
 static void
-e_mail_formatter_audio_inline_class_finalize (EMailFormatterAudioInlineClass *klass)
+e_mail_formatter_audio_inline_class_finalize (EMailFormatterAudioInlineClass *class)
 {
 
 }
diff --git a/modules/audio-inline/e-mail-parser-audio-inline.c b/modules/audio-inline/e-mail-parser-audio-inline.c
index 2084f18a54..95926bae29 100644
--- a/modules/audio-inline/e-mail-parser-audio-inline.c
+++ b/modules/audio-inline/e-mail-parser-audio-inline.c
@@ -173,20 +173,20 @@ e_mail_parser_audio_inline_constructed (GObject *object)
 }
 
 static void
-e_mail_parser_audio_inline_class_init (EMailParserAudioInlineClass *klass)
+e_mail_parser_audio_inline_class_init (EMailParserAudioInlineClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_parser_audio_inline_constructed;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
 }
 
 static void
-e_mail_parser_audio_inline_class_finalize (EMailParserAudioInlineClass *klass)
+e_mail_parser_audio_inline_class_finalize (EMailParserAudioInlineClass *class)
 {
 
 }
diff --git a/modules/cal-config-contacts/e-source-contacts.c b/modules/cal-config-contacts/e-source-contacts.c
index 5f6b43224a..8e8eac3be6 100644
--- a/modules/cal-config-contacts/e-source-contacts.c
+++ b/modules/cal-config-contacts/e-source-contacts.c
@@ -122,7 +122,7 @@ e_source_contacts_class_init (ESourceContactsClass *class)
 			"include-me",
 			"Include Me",
 			"Include this address book in the contacts calendar",
-			FALSE,  /* see constructed() */
+			FALSE,  /* see constructed () */
 			G_PARAM_READWRITE |
 			E_SOURCE_PARAM_SETTING));
 }
diff --git a/modules/calendar/e-cal-shell-settings.c b/modules/calendar/e-cal-shell-settings.c
index ade121d9c7..7f6527b531 100644
--- a/modules/calendar/e-cal-shell-settings.c
+++ b/modules/calendar/e-cal-shell-settings.c
@@ -105,9 +105,9 @@ transform_icaltimezone_to_string (GBinding *binding,
 
 static gboolean
 transform_weekdays_settings_to_evolution (GBinding *binding,
-					  const GValue *source_value,
-					  GValue *target_value,
-					  gpointer user_data)
+                                          const GValue *source_value,
+                                          GValue *target_value,
+                                          gpointer user_data)
 {
 	GDateWeekday weekday;
 
@@ -178,9 +178,9 @@ transform_weekdays_settings_to_evolution (GBinding *binding,
 
 static gboolean
 transform_weekdays_evolution_to_settings (GBinding *binding,
-					  const GValue *source_value,
-					  GValue *target_value,
-					  gpointer user_data)
+                                          const GValue *source_value,
+                                          GValue *target_value,
+                                          gpointer user_data)
 {
 	GDateWeekday weekday;
 
diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index f386420613..bf64a96f67 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -172,16 +172,16 @@ e_mail_formatter_itip_finalize (GObject *object)
 }
 
 static void
-e_mail_formatter_itip_class_init (EMailFormatterItipClass *klass)
+e_mail_formatter_itip_class_init (EMailFormatterItipClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_formatter_itip_constructed;
 	object_class->finalize = e_mail_formatter_itip_finalize;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
 }
 
@@ -211,7 +211,7 @@ e_mail_formatter_itip_type_register (GTypeModule *type_module)
 }
 
 static void
-e_mail_formatter_itip_class_finalize (EMailFormatterItipClass *klass)
+e_mail_formatter_itip_class_finalize (EMailFormatterItipClass *class)
 {
 
 }
diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c
index 3c5532998b..53630b5a88 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -289,21 +289,21 @@ e_mail_parser_itip_finalize (GObject *object)
 }
 
 static void
-e_mail_parser_itip_class_init (EMailParserItipClass *klass)
+e_mail_parser_itip_class_init (EMailParserItipClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_parser_itip_constructed;
 	object_class->finalize = e_mail_parser_itip_finalize;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
 }
 
 static void
-e_mail_parser_itip_class_finalize (EMailParserItipClass *klass)
+e_mail_parser_itip_class_finalize (EMailParserItipClass *class)
 {
 
 }
diff --git a/modules/mail/e-mail-config-format-html.c b/modules/mail/e-mail-config-format-html.c
index 4b53d2dc28..e146739f67 100644
--- a/modules/mail/e-mail-config-format-html.c
+++ b/modules/mail/e-mail-config-format-html.c
@@ -123,14 +123,12 @@ mail_config_format_html_constructed (GObject *object)
 		extensible, "animate-images",
 		G_BINDING_SYNC_CREATE);
 
-
 	settings = g_settings_new ("org.gnome.evolution.mail");
 	g_signal_connect (settings, "changed", G_CALLBACK (headers_changed_cb), object);
 
 	g_object_set_data_full (
 		G_OBJECT (extensible), "reader-header-settings",
 		settings, g_object_unref);
-		
 
 	/* Initial synchronization */
 	headers_changed_cb (settings, NULL, object);
diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c b/modules/prefer-plain/e-mail-parser-prefer-plain.c
index 178edc7e6b..1906563caf 100644
--- a/modules/prefer-plain/e-mail-parser-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c
@@ -444,18 +444,18 @@ e_mail_parser_prefer_plain_finalize (GObject *object)
 }
 
 static void
-e_mail_parser_prefer_plain_class_init (EMailParserPreferPlainClass *klass)
+e_mail_parser_prefer_plain_class_init (EMailParserPreferPlainClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_parser_prefer_plain_constructed;
 	object_class->get_property = e_mail_parser_prefer_plain_get_property;
 	object_class->set_property = e_mail_parser_prefer_plain_set_property;
 	object_class->finalize = e_mail_parser_prefer_plain_finalize;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
 
 	g_object_class_install_property (
@@ -482,7 +482,7 @@ e_mail_parser_prefer_plain_class_init (EMailParserPreferPlainClass *klass)
 }
 
 void
-e_mail_parser_prefer_plain_class_finalize (EMailParserPreferPlainClass *klass)
+e_mail_parser_prefer_plain_class_finalize (EMailParserPreferPlainClass *class)
 {
 }
 
diff --git a/modules/text-highlight/text-highlight.c b/modules/text-highlight/text-highlight.c
index d5ebecb0f9..26f7708f76 100644
--- a/modules/text-highlight/text-highlight.c
+++ b/modules/text-highlight/text-highlight.c
@@ -272,20 +272,20 @@ e_mail_formatter_text_highlight_init (EMailFormatterTextHighlight *object)
 }
 
 static void
-e_mail_formatter_text_highlight_class_init (EMailFormatterTextHighlightClass *klass)
+e_mail_formatter_text_highlight_class_init (EMailFormatterTextHighlightClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = emfe_text_highlight_constructed;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
 }
 
 static void
-e_mail_formatter_text_highlight_class_finalize (EMailFormatterTextHighlightClass *klass)
+e_mail_formatter_text_highlight_class_finalize (EMailFormatterTextHighlightClass *class)
 {
 }
 
diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
index d2f1e7f843..79089a58af 100644
--- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
+++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
@@ -293,20 +293,20 @@ e_mail_parser_tnef_attachment_constructed (GObject *object)
 }
 
 static void
-e_mail_parser_tnef_attachment_class_init (EMailParserTnefAttachmentClass *klass)
+e_mail_parser_tnef_attachment_class_init (EMailParserTnefAttachmentClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_parser_tnef_attachment_constructed;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
 }
 
 void
-e_mail_parser_tnef_attachment_class_finalize (EMailParserTnefAttachmentClass *klass)
+e_mail_parser_tnef_attachment_class_finalize (EMailParserTnefAttachmentClass *class)
 {
 }
 
diff --git a/modules/vcard-inline/e-mail-formatter-vcard-inline.c b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
index 2fa6d2d024..0daa6d7521 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard-inline.c
@@ -221,15 +221,15 @@ e_mail_formatter_vcard_inline_constructed (GObject *object)
 }
 
 static void
-e_mail_formatter_vcard_inline_class_init (EMailFormatterVCardInlineClass *klass)
+e_mail_formatter_vcard_inline_class_init (EMailFormatterVCardInlineClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_formatter_vcard_inline_constructed;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_FORMATTER_EXTENSION_REGISTRY;
 }
 
@@ -260,7 +260,7 @@ e_mail_formatter_vcard_inline_type_register (GTypeModule *type_module)
 }
 
 static void
-e_mail_formatter_vcard_inline_class_finalize (EMailFormatterVCardInlineClass *klass)
+e_mail_formatter_vcard_inline_class_finalize (EMailFormatterVCardInlineClass *class)
 {
 
 }
diff --git a/modules/vcard-inline/e-mail-parser-vcard-inline.c b/modules/vcard-inline/e-mail-parser-vcard-inline.c
index 5ab297d049..e0efd87b15 100644
--- a/modules/vcard-inline/e-mail-parser-vcard-inline.c
+++ b/modules/vcard-inline/e-mail-parser-vcard-inline.c
@@ -407,20 +407,20 @@ e_mail_parser_vcard_inline_constructed (GObject *object)
 }
 
 static void
-e_mail_parser_vcard_inline_class_init (EMailParserVCardInlineClass *klass)
+e_mail_parser_vcard_inline_class_init (EMailParserVCardInlineClass *class)
 {
 	GObjectClass *object_class;
 	EExtensionClass *extension_class;
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->constructed = e_mail_parser_vcard_inline_constructed;
 
-	extension_class = E_EXTENSION_CLASS (klass);
+	extension_class = E_EXTENSION_CLASS (class);
 	extension_class->extensible_type = E_TYPE_MAIL_PARSER_EXTENSION_REGISTRY;
 }
 
 static void
-e_mail_parser_vcard_inline_class_finalize (EMailParserVCardInlineClass *klass)
+e_mail_parser_vcard_inline_class_finalize (EMailParserVCardInlineClass *class)
 {
 
 }