Coding style and whitespace cleanup.

90 files changed, 178 insertions, 196 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index c23a05ba6f..e7d1390716 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -34,7 +34,6 @@
 static void fill_in_info (EContactEditorFullname *editor);
 static void extract_info (EContactEditorFullname *editor);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_NAME,
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index e03d00cffd..16ee8690c7 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -99,7 +99,6 @@ static void	sensitize_ok			(EContactEditor *ce);
 
 static EABEditorClass *parent_class = NULL;
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_SOURCE_CLIENT,
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index eba8bdafa1..7eefdf8fc0 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -46,7 +46,6 @@ static void e_minicard_label_resize_children ( EMinicardLabel *e_minicard_label
 
 static void set_colors (EMinicardLabel *label);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_WIDTH,
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index dd06fee149..f7ebabf246 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -55,7 +55,6 @@ static gboolean	e_minicard_view_widget_real_focus_in_event
 						(GtkWidget *widget,
 						 GdkEventFocus *event);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_CLIENT,
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index bc63ab8221..690fe7796f 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -45,7 +45,6 @@ static void e_minicard_view_drag_data_get (GtkWidget *widget,
 					  guint time,
 					  EMinicardView *view);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_ADAPTER,
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index a88ac8d718..652851877b 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -65,7 +65,6 @@ e_minicard_field_destroy (EMinicardField *field)
 	g_free (field);
 }
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_WIDTH,
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 358633c04a..a6293f584f 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -419,7 +419,7 @@ contact_display_load_status_changed (WebKitWebView *web_view,
 
 static void
 contact_display_update_actions (EWebView *web_view,
-				GdkEventButton *event)
+                                GdkEventButton *event)
 {
 	GtkActionGroup *action_group;
 	gboolean scheme_is_internal_mailto;
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 310b4d55db..cc4988d5b3 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -1112,13 +1112,13 @@ eab_contact_formatter_finalize (GObject *object)
 }
 
 static void
-eab_contact_formatter_class_init (EABContactFormatterClass *klass)
+eab_contact_formatter_class_init (EABContactFormatterClass *class)
 {
 	GObjectClass *object_class;
 
-	g_type_class_add_private (klass, sizeof (EABContactFormatterClass));
+	g_type_class_add_private (class, sizeof (EABContactFormatterClass));
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = eab_contact_formatter_finalize;
 	object_class->set_property = eab_contact_formatter_set_property;
 	object_class->get_property = eab_contact_formatter_get_property;
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index ced8414ef9..24a64f5799 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -90,7 +90,6 @@ static gboolean e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeS
 								   gint *start_x,
 								   gint *end_x);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_MEETING_TIME_SELECTOR
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index d02a9f618c..f67ab9142e 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -65,7 +65,7 @@ string_is_empty (const gchar *value)
 
 gint
 get_position_in_array (GPtrArray *objects,
-		       gpointer item)
+                       gpointer item)
 {
 	gint i;
 
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 049a0142df..c457300365 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -38,7 +38,6 @@ static void e_text_event_processor_get_property (GObject *object,
 						 GValue *value,
 						 GParamSpec *pspec);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_ALLOW_NEWLINES
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
+}
diff --git a/libemail-engine/e-mail-utils.c b/libemail-engine/e-mail-utils.c
index 964de9810f..235cd9459a 100644
--- a/libemail-engine/e-mail-utils.c
+++ b/libemail-engine/e-mail-utils.c
@@ -380,7 +380,7 @@ search_address_in_addressbooks (ESourceRegistry *registry,
                                 gboolean (*check_contact) (EContact *contact,
                                                            gpointer user_data),
                                 gpointer user_data,
-				GCancellable *cancellable)
+                                GCancellable *cancellable)
 {
 	GList *list, *link;
 	GList *addr_sources = NULL;
@@ -601,7 +601,7 @@ gboolean
 em_utils_in_addressbook (ESourceRegistry *registry,
                          CamelInternetAddress *iaddr,
                          gboolean local_only,
-			 GCancellable *cancellable)
+                         GCancellable *cancellable)
 {
 	const gchar *addr;
 
@@ -656,7 +656,7 @@ CamelMimePart *
 em_utils_contact_photo (ESourceRegistry *registry,
                         CamelInternetAddress *cia,
                         gboolean local_only,
-			GCancellable *cancellable)
+                        GCancellable *cancellable)
 {
 	const gchar *addr = NULL;
 	CamelMimePart *part = NULL;
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index 9e821a0fcf..27476d90ae 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -429,7 +429,7 @@ static MailMsgInfo fetch_mail_info = {
 /* ouch, a 'do everything' interface ... */
 void
 mail_fetch_mail (CamelStore *store,
-                 CamelFetchType fetch_type, 
+                 CamelFetchType fetch_type,
                  gint fetch_count,
                  const gchar *type,
                  MailProviderFetchLockFunc lock_func,
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 3a06deacd5..dab8c3be1c 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -163,7 +163,7 @@ static GtkActionEntry image_entries[] = {
 
 static void
 mail_display_update_actions (EWebView *web_view,
-			     GdkEventButton *event)
+                             GdkEventButton *event)
 {
 	WebKitHitTestResult *hit_test;
 	WebKitHitTestResultContext context;
@@ -181,7 +181,7 @@ mail_display_update_actions (EWebView *web_view,
 		G_OBJECT (hit_test),
 		"context", &context,
 	        "image-uri", &image_src,
-	        NULL);
+		NULL);
 
 	if (!(context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE))
 		return;
diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c
index 309e2bdeef..07a3b4daed 100644
--- a/mail/e-mail-printer.c
+++ b/mail/e-mail-printer.c
@@ -729,13 +729,13 @@ emp_finalize (GObject *object)
 }
 
 static void
-e_mail_printer_class_init (EMailPrinterClass *klass)
+e_mail_printer_class_init (EMailPrinterClass *class)
 {
 	GObjectClass *object_class;
 
-	g_type_class_add_private (klass, sizeof (EMailPrinterPrivate));
+	g_type_class_add_private (class, sizeof (EMailPrinterPrivate));
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->set_property = emp_set_property;
 	object_class->get_property = emp_get_property;
 	object_class->finalize = emp_finalize;
@@ -750,8 +750,9 @@ e_mail_printer_class_init (EMailPrinterClass *klass)
 			G_PARAM_READWRITE |
 			G_PARAM_CONSTRUCT_ONLY));
 
-	signals[SIGNAL_DONE] =	g_signal_new ("done",
-		G_TYPE_FROM_CLASS (klass),
+	signals[SIGNAL_DONE] = g_signal_new (
+		"done",
+		G_TYPE_FROM_CLASS (class),
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (EMailPrinterClass, done),
 		NULL, NULL,
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index 0f0d68ec9d..5bd4bd2ab2 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -537,7 +537,7 @@ free_message_printing_context (struct _MessagePrintingContext *context)
 
 static void
 mail_reader_do_print_message (GObject *object,
-			      GAsyncResult *result,
+                              GAsyncResult *result,
                               gpointer user_data)
 {
 	EMailReader *reader = E_MAIL_READER (object);
@@ -845,7 +845,7 @@ html_contains_nonwhitespace (const gchar *html,
 
 static void
 mail_reader_reply_message_parsed (GObject *object,
-				  GAsyncResult *result,
+                                  GAsyncResult *result,
                                   gpointer user_data)
 {
 	EShell *shell;
@@ -1543,8 +1543,8 @@ struct mail_reader_parse_message_run_data_ {
 
 static void
 mail_reader_parse_message_run (GSimpleAsyncResult *simple,
-			       GObject *object,
-			       GCancellable *cancellable)
+                               GObject *object,
+                               GCancellable *cancellable)
 {
 	EMailReader *reader = E_MAIL_READER (object);
 	CamelObjectBag *registry;
@@ -1627,7 +1627,7 @@ e_mail_reader_parse_message (EMailReader *reader,
 
 EMailPartList *
 e_mail_reader_parse_message_finish (EMailReader *reader,
-				    GAsyncResult *result)
+                                    GAsyncResult *result)
 {
 	struct mail_reader_parse_message_run_data_ *data;
 	EMailPartList *part_list;
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index e4ef4e258e..487d9ff275 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -3111,7 +3111,7 @@ struct format_parser_async_closure_ {
 
 static void
 set_mail_display_part_list (GObject *object,
-			    GAsyncResult *result,
+                            GAsyncResult *result,
                             gpointer user_data)
 {
 	EMailPartList *part_list;
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index ec17a84c82..0f185c2031 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -187,8 +187,8 @@ get_empty_image_stream (gsize *len)
 
 static void
 handle_contact_photo_request (GSimpleAsyncResult *res,
-			      GObject *object,
-			      GCancellable *cancellable)
+                              GObject *object,
+                              GCancellable *cancellable)
 {
 	EMailRequest *request = E_MAIL_REQUEST (object);
 	const gchar *email;
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)
 {
 
 }
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index a88bad4815..c683eb922c 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -233,8 +233,8 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch,
 
 static void
 epech_load_from_settings (GSettings *settings,
-			  const gchar *key,
-			  CustomHeaderOptionsDialog *mch)
+                          const gchar *key,
+                          CustomHeaderOptionsDialog *mch)
 {
 	CustomHeaderOptionsDialogPrivate *priv;
 	EmailCustomHeaderDetails temp_header_details= {-1, -1, NULL, NULL};
diff --git a/shell/e-shell-settings.c b/shell/e-shell-settings.c
index 6338e9886d..a5952be887 100644
--- a/shell/e-shell-settings.c
+++ b/shell/e-shell-settings.c
@@ -50,8 +50,8 @@ static gpointer parent_class;
 
 static gboolean
 shell_settings_value_equal (const GValue *v1,
-			    const GValue *v2,
-			    gboolean is_debug)
+                            const GValue *v2,
+                            gboolean is_debug)
 {
 	if (!v1 || !v2)
 		return v1 == v2;
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 414a287f45..a213082702 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -34,7 +34,6 @@
 
 G_DEFINE_TYPE (GalViewInstanceSaveAsDialog, gal_view_instance_save_as_dialog, GTK_TYPE_DIALOG)
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_INSTANCE
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index db5ad51319..888563c0d8 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -49,7 +49,6 @@ static void e_canvas_vbox_real_add_item (ECanvasVbox *e_canvas_vbox, GnomeCanvas
 static void e_canvas_vbox_real_add_item_start (ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item);
 static void e_canvas_vbox_resize_children (GnomeCanvasItem *item);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_WIDTH,
diff --git a/widgets/misc/e-spell-entry.c b/widgets/misc/e-spell-entry.c
index 79f0d8a816..c232dbc948 100644
--- a/widgets/misc/e-spell-entry.c
+++ b/widgets/misc/e-spell-entry.c
@@ -777,19 +777,19 @@ e_spell_entry_finalize (GObject *object)
 }
 
 static void
-e_spell_entry_class_init (ESpellEntryClass *klass)
+e_spell_entry_class_init (ESpellEntryClass *class)
 {
 	GObjectClass *object_class;
 	GtkWidgetClass *widget_class;
 
-	g_type_class_add_private (klass, sizeof (ESpellEntryPrivate));
+	g_type_class_add_private (class, sizeof (ESpellEntryPrivate));
 
-	object_class = G_OBJECT_CLASS (klass);
+	object_class = G_OBJECT_CLASS (class);
 	object_class->set_property = spell_entry_set_property;
 	object_class->get_property = spell_entry_get_property;
 	object_class->finalize = e_spell_entry_finalize;
 
-	widget_class  = GTK_WIDGET_CLASS (klass);
+	widget_class  = GTK_WIDGET_CLASS (class);
 	widget_class->draw = e_spell_entry_draw;
 	widget_class->button_press_event = e_spell_entry_button_press;
 
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index 1c03ab8995..20b5569a85 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -1221,7 +1221,7 @@ web_view_stop_loading (EWebView *web_view)
 
 static void
 web_view_update_actions (EWebView *web_view,
-			 GdkEventButton *event)
+                         GdkEventButton *event)
 {
 	GtkActionGroup *action_group;
 	gboolean can_copy;
@@ -2820,7 +2820,7 @@ e_web_view_stop_loading (EWebView *web_view)
 
 void
 e_web_view_update_actions (EWebView *web_view,
-			   GdkEventButton *event)
+                           GdkEventButton *event)
 {
 	g_return_if_fail (E_IS_WEB_VIEW (web_view));
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 6c1a9ab365..19791fb229 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -40,7 +40,6 @@ static void e_table_field_chooser_set_property (GObject *object, guint property_
 static void e_table_field_chooser_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_dispose (GObject *object);
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_FULL_HEADER,
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index a63646b3f8..937a3cce26 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -47,7 +47,6 @@
 #define etgc_get_type e_table_group_container_get_type
 G_DEFINE_TYPE (ETableGroupContainer, etgc, E_TYPE_TABLE_GROUP)
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_HEIGHT,
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index aface8e697..730a7b7160 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -41,7 +41,6 @@
 #define etgl_get_type e_table_group_leaf_get_type
 G_DEFINE_TYPE (ETableGroupLeaf, etgl, E_TYPE_TABLE_GROUP)
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_HEIGHT,
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 2728a7ebd9..68516d5b4d 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -34,7 +34,6 @@
 #include "e-table-defines.h"
 #include "e-table-header.h"
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_SORT_INFO,
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 0e6b4623a3..7dc50c4782 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -35,7 +35,6 @@
 
 #define d(x)
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_SORT_INFO
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index b872e72cbc..240227f162 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -58,7 +58,6 @@ static void e_reflow_resize_children (GnomeCanvasItem *item);
 
 G_DEFINE_TYPE (EReflow, e_reflow, GNOME_TYPE_CANVAS_GROUP)
 
-/* The arguments we take */
 enum {
 	PROP_0,
 	PROP_MINIMUM_WIDTH,