Coding style and whitespace cleanup.

22 files changed, 197 insertions, 101 deletions

diff --git a/e-util/e-activity.c b/e-util/e-activity.c
index 0b4089cca2..231de505b4 100644
--- a/e-util/e-activity.c
+++ b/e-util/e-activity.c
@@ -332,7 +332,8 @@ e_activity_class_init (EActivityClass *class)
 static void
 e_activity_init (EActivity *activity)
 {
-	activity->priv = G_TYPE_INSTANCE_GET_PRIVATE (activity, E_TYPE_ACTIVITY, EActivityPrivate);
+	activity->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		activity, E_TYPE_ACTIVITY, EActivityPrivate);
 }
 
 EActivity *
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 4f399d351e..6d24dcde65 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -257,7 +257,8 @@ e_alert_dialog_class_init (EAlertDialogClass *class)
 static void
 e_alert_dialog_init (EAlertDialog *dialog)
 {
-	dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog, E_TYPE_ALERT_DIALOG, EAlertDialogPrivate);
+	dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		dialog, E_TYPE_ALERT_DIALOG, EAlertDialogPrivate);
 }
 
 GtkWidget *
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 7df5ca9fe1..20199bc638 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -254,20 +254,30 @@ e_alert_load (const gchar *path)
 						button->stock_id = stock_id;
 						xmlFree (tmp);
 					}
-					tmp = (gchar *)xmlGetProp(scan, (const guchar *)"label");
+					tmp = (gchar *) xmlGetProp (
+						scan, (xmlChar *) "label");
 					if (tmp) {
-						label = g_strdup (dgettext (table->translation_domain, tmp));
+						label = g_strdup (
+							dgettext (table->
+							translation_domain,
+							tmp));
 						button->label = label;
 						xmlFree (tmp);
 					}
-					tmp = (gchar *)xmlGetProp(scan, (const guchar *)"response");
+					tmp = (gchar *) xmlGetProp (
+						scan, (xmlChar *) "response");
 					if (tmp) {
-						button->response_id = map_response (tmp);
+						button->response_id =
+							map_response (tmp);
 						xmlFree (tmp);
 					}
 
 					if (stock_id == NULL && label == NULL) {
-						g_warning("Error file '%s': missing button details in error '%s'", path, e->id);
+						g_warning (
+							"Error file '%s': "
+							"missing button "
+							"details in error "
+							"'%s'", path, e->id);
 						g_free (stock_id);
 						g_free (label);
 						g_free (button);
@@ -362,7 +372,9 @@ alert_format_string (const gchar *format,
 		if (id < args->len) {
 			g_string_append (string, args->pdata[id]);
 		} else
-			g_warning("Error references argument %d not supplied by caller", id);
+			g_warning (
+				"Error references argument %d "
+				"not supplied by caller", id);
 		format = end + 1;
 	}
 
@@ -651,7 +663,8 @@ e_alert_class_init (EAlertClass *class)
 static void
 e_alert_init (EAlert *alert)
 {
-	alert->priv = G_TYPE_INSTANCE_GET_PRIVATE (alert, E_TYPE_ALERT, EAlertPrivate);
+	alert->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		alert, E_TYPE_ALERT, EAlertPrivate);
 
 	g_queue_init (&alert->priv->actions);
 }
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index acf318c939..ad651314f5 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -49,7 +49,9 @@ e_bit_array_insert_real (EBitArray *eba, gint row)
 	if (eba->bit_count >= 0) {
 		/* Add another word if needed. */
 		if ((eba->bit_count & 0x1f) == 0) {
-			eba->data = g_renew (guint32, eba->data, (eba->bit_count >> 5) + 1);
+			eba->data = g_renew (
+				guint32, eba->data,
+				(eba->bit_count >> 5) + 1);
 			eba->data[eba->bit_count >> 5] = 0;
 		}
 
@@ -95,7 +97,9 @@ e_bit_array_delete_real (EBitArray *eba, gint row, gboolean move_selection_mode)
 			eba->data[box] &= eba->data[box + 1] >> 31;
 
 			for (i = box + 1; i < last; i++) {
-				eba->data[i] = (eba->data[i] << 1) | (eba->data[i + 1] >> 31);
+				eba->data[i] =
+					(eba->data[i] << 1) |
+					(eba->data[i + 1] >> 31);
 			}
 			/* this over-runs our memory! */
 			/*eba->data[i] = eba->data[i] << 1; */
@@ -106,7 +110,8 @@ e_bit_array_delete_real (EBitArray *eba, gint row, gboolean move_selection_mode)
 			eba->data = g_renew (guint32, eba->data, eba->bit_count >> 5);
 		}
 		if (move_selection_mode && selected && eba->bit_count > 0) {
-			e_bit_array_select_single_row (eba, row == eba->bit_count ? row - 1 : row);
+			e_bit_array_select_single_row (
+				eba, row == eba->bit_count ? row - 1 : row);
 		}
 	}
 }
@@ -327,7 +332,9 @@ e_bit_array_change_range (EBitArray *eba, gint start, gint end, gboolean grow)
 		last = BOX (end);
 
 		if (i == last) {
-			OPERATE (eba, i, BITMASK_LEFT (start) | BITMASK_RIGHT (end), grow);
+			OPERATE (
+				eba, i, BITMASK_LEFT (start) |
+				BITMASK_RIGHT (end), grow);
 		} else {
 			OPERATE (eba, i, BITMASK_LEFT (start), grow);
 			if (grow)
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 17646e00f8..14765f853b 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -187,7 +187,8 @@ e_config_class_init (EConfigClass *class)
 static void
 e_config_init (EConfig *config)
 {
-	config->priv = G_TYPE_INSTANCE_GET_PRIVATE (config, E_TYPE_CONFIG, EConfigPrivate);
+	config->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		config, E_TYPE_CONFIG, EConfigPrivate);
 }
 
 /**
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 4127a9c930..10ea83b30b 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -109,7 +109,8 @@ e_event_class_init (EEventClass *class)
 static void
 e_event_init (EEvent *event)
 {
-	event->priv = G_TYPE_INSTANCE_GET_PRIVATE (event, E_TYPE_EVENT, EEventPrivate);
+	event->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		event, E_TYPE_EVENT, EEventPrivate);
 
 	g_queue_init (&event->priv->events);
 }
@@ -380,11 +381,13 @@ emph_event_handle (EEvent *ee, EEventItem *item, gpointer data)
 {
 	EEventHook *hook = data;
 
-	/* FIXME: we could/should just remove the items we added to the event handler */
+	/* FIXME We could/should just remove the items
+	 *       we added to the event handler. */
 	if (!hook->hook.plugin->enabled)
 		return;
 
-	e_plugin_invoke (hook->hook.plugin, (gchar *)item->user_data, ee->target);
+	e_plugin_invoke (
+		hook->hook.plugin, (gchar *)item->user_data, ee->target);
 }
 
 static void
@@ -449,7 +452,8 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 
 	d(printf("loading event hook\n"));
 
-	if (((EPluginHookClass *)e_event_hook_parent_class)->construct (eph, ep, root) == -1)
+	if (((EPluginHookClass *)e_event_hook_parent_class)->
+		construct (eph, ep, root) == -1)
 		return -1;
 
 	class = E_EVENT_HOOK_GET_CLASS (eph);
diff --git a/e-util/e-extension.c b/e-util/e-extension.c
index 9c61110911..baf6b49fa4 100644
--- a/e-util/e-extension.c
+++ b/e-util/e-extension.c
@@ -161,7 +161,8 @@ e_extension_class_init (EExtensionClass *class)
 static void
 e_extension_init (EExtension *extension)
 {
-	extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (extension, E_TYPE_EXTENSION, EExtensionPrivate);
+	extension->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		extension, E_TYPE_EXTENSION, EExtensionPrivate);
 }
 
 /**
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 8a859ac378..087ac7a162 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -468,18 +468,29 @@ struct {
 	{ "http://www.foo.com, 555-9999", "http://www.foo.com" },
 	{ "|http://www.foo.com|555-9999|", "http://www.foo.com" },
 	{ "foo http://www.foo.com/ bar", "http://www.foo.com/" },
-	{ "foo http://www.foo.com/index.html bar", "http://www.foo.com/index.html" },
+	{ "foo http://www.foo.com/index.html bar",
+	  "http://www.foo.com/index.html" },
 	{ "foo http://www.foo.com/q?99 bar", "http://www.foo.com/q?99" },
-	{ "foo http://www.foo.com/;foo=bar&baz=quux bar", "http://www.foo.com/;foo=bar&baz=quux" },
-	{ "foo http://www.foo.com/index.html#anchor bar", "http://www.foo.com/index.html#anchor" },
-	{ "http://www.foo.com/index.html; foo", "http://www.foo.com/index.html" },
-	{ "http://www.foo.com/index.html: foo", "http://www.foo.com/index.html" },
-	{ "http://www.foo.com/index.html-- foo", "http://www.foo.com/index.html" },
-	{ "http://www.foo.com/index.html?", "http://www.foo.com/index.html" },
-	{ "http://www.foo.com/index.html!", "http://www.foo.com/index.html" },
-	{ "\"http://www.foo.com/index.html\"", "http://www.foo.com/index.html" },
-	{ "'http://www.foo.com/index.html'", "http://www.foo.com/index.html" },
-	{ "http://bob@www.foo.com/bar/baz/", "http://bob@www.foo.com/bar/baz/" },
+	{ "foo http://www.foo.com/;foo=bar&baz=quux bar",
+	  "http://www.foo.com/;foo=bar&baz=quux" },
+	{ "foo http://www.foo.com/index.html#anchor bar",
+	  "http://www.foo.com/index.html#anchor" },
+	{ "http://www.foo.com/index.html; foo",
+	  "http://www.foo.com/index.html" },
+	{ "http://www.foo.com/index.html: foo",
+	  "http://www.foo.com/index.html" },
+	{ "http://www.foo.com/index.html-- foo",
+	  "http://www.foo.com/index.html" },
+	{ "http://www.foo.com/index.html?",
+	  "http://www.foo.com/index.html" },
+	{ "http://www.foo.com/index.html!",
+	  "http://www.foo.com/index.html" },
+	{ "\"http://www.foo.com/index.html\"",
+	  "http://www.foo.com/index.html" },
+	{ "'http://www.foo.com/index.html'",
+	  "http://www.foo.com/index.html" },
+	{ "http://bob@www.foo.com/bar/baz/",
+	  "http://bob@www.foo.com/bar/baz/" },
 	{ "http no match http", NULL },
 	{ "http: no match http:", NULL },
 	{ "http:// no match http://", NULL },
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 700d4b885c..ac41024e73 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -533,7 +533,8 @@ emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 
 	d (printf ("loading import hook\n"));
 
-	if (E_PLUGIN_HOOK_CLASS (e_import_hook_parent_class)->construct (eph, ep, root) == -1)
+	if (E_PLUGIN_HOOK_CLASS (e_import_hook_parent_class)->
+		construct (eph, ep, root) == -1)
 		return -1;
 
 	class = E_IMPORT_HOOK_GET_CLASS (eph)->import_class;
diff --git a/e-util/e-import.h b/e-util/e-import.h
index ea3f22cbdf..4fc3294e3b 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -78,7 +78,8 @@ typedef void		(*EImportImportFunc)	(EImport *ei,
 /* The global target types, implementors may add additional ones */
 enum _e_import_target_t {
 	E_IMPORT_TARGET_URI,	/* simple file */
-	E_IMPORT_TARGET_HOME,	/* a home-directory thing, i.e. old applications */
+	E_IMPORT_TARGET_HOME,	/* a home-directory thing,
+				 * i.e. old applications */
 	E_IMPORT_TARGET_LAST = 256
 };
 
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 5e4daa81d1..148dc414a8 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -138,14 +138,16 @@ get_dir (gboolean make)
 					return NULL;
 				}
 
-				/* make sure this is a directory and belongs to us... */
+				/* make sure this is a directory and
+				 * belongs to us... */
 				if (!S_ISDIR (st.st_mode) || st.st_uid != getuid ()) {
 					/* eek! this is bad... */
 					g_string_free (path, TRUE);
 					return NULL;
 				}
 			} else {
-				/* some other error...do not pass go, do not collect $200 */
+				/* some other error...do not pass go,
+				 * do not collect $200 */
 				g_string_free (path, TRUE);
 				return NULL;
 			}
diff --git a/e-util/e-module.c b/e-util/e-module.c
index 56add2b27f..cc397a9001 100644
--- a/e-util/e-module.c
+++ b/e-util/e-module.c
@@ -199,7 +199,8 @@ e_module_class_init (EModuleClass *class)
 static void
 e_module_init (EModule *module)
 {
-	module->priv = G_TYPE_INSTANCE_GET_PRIVATE (module, E_TYPE_MODULE, EModulePrivate);
+	module->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		module, E_TYPE_MODULE, EModulePrivate);
 }
 
 /**
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index e606e713f6..a6ecb834c8 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -520,7 +520,8 @@ e_plugin_ui_hook_init (EPluginUIHook *hook)
 
 	registry = g_hash_table_new (g_direct_hash, g_direct_equal);
 
-	hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (hook, E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookPrivate);
+	hook->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		hook, E_TYPE_PLUGIN_UI_HOOK, EPluginUIHookPrivate);
 	hook->priv->ui_definitions = ui_definitions;
 	hook->priv->callbacks = callbacks;
 	hook->priv->registry = registry;
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index db717e8dcd..d3579b7d89 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -154,8 +154,6 @@ ep_construct (EPlugin *ep, xmlNodePtr root)
 
 	ep->name = e_plugin_xml_prop_domain(root, "name", ep->domain);
 
-	pd(printf("creating plugin '%s' '%s'\n", ep->name?ep->name:"un-named", ep->id));
-
 	node = root->children;
 	while (node) {
 		if (strcmp((gchar *)node->name, "hook") == 0) {
@@ -173,12 +171,15 @@ ep_construct (EPlugin *ep, xmlNodePtr root)
 
 			if (ep->enabled
 			    && eph_types != NULL
-			    && (type = g_hash_table_lookup (eph_types, class)) != NULL) {
+			    && (type = g_hash_table_lookup (
+					eph_types, class)) != NULL) {
 				g_free (class);
 				hook = g_object_new (G_OBJECT_CLASS_TYPE (type), NULL);
 				res = type->construct (hook, ep, node);
 				if (res == -1) {
-					g_warning("Plugin '%s' failed to load hook", ep->name);
+					g_warning (
+						"Plugin '%s' failed to "
+						"load hook", ep->name);
 					g_object_unref (hook);
 					goto fail;
 				} else {
@@ -188,7 +189,8 @@ ep_construct (EPlugin *ep, xmlNodePtr root)
 				g_free (class);
 			}
 		} else if (strcmp((gchar *)node->name, "description") == 0) {
-			ep->description = e_plugin_xml_content_domain (node, ep->domain);
+			ep->description =
+				e_plugin_xml_content_domain (node, ep->domain);
 		} else if (strcmp((gchar *)node->name, "author") == 0) {
 			gchar *name = e_plugin_xml_prop(node, "name");
 			gchar *email = e_plugin_xml_prop(node, "email");
@@ -353,7 +355,6 @@ ep_load_plugin (xmlNodePtr root, struct _plugin_doc *pdoc)
 	 * which is checked when a new type is registered. */
 	class = g_hash_table_lookup (ep_types, prop);
 	if (class == NULL) {
-		pd(printf("Delaying loading of plugin '%s' unknown type '%s'\n", id, prop));
 		g_free (id);
 		xmlFree (prop);
 		return NULL;
@@ -404,22 +405,20 @@ ep_load (const gchar *filename, gint load_level)
 				if ((atoi (plugin_load_level) == load_level) ) {
 					ep = ep_load_plugin (root, pdoc);
 
-					if (ep) {
-						if (load_level == 1)
-							e_plugin_invoke (ep, "load_plugin_type_register_function", NULL);
-					}
+					if (ep && load_level == 1)
+						e_plugin_invoke (ep, "load_plugin_type_register_function", NULL);
 				}
 			} else if (load_level == 2) {
 				ep = ep_load_plugin (root, pdoc);
 			}
 
 			if (ep) {
-				pd(printf ("\nloading plugin [%s] at load_level [%d]\n", ep->name, load_level));
-
-				/* README: May be we can use load_levels to achieve the same thing.
-				   But it may be confusing for a plugin writer */
-				is_system_plugin = e_plugin_xml_prop (root, "system_plugin");
-				if (is_system_plugin && !strcmp (is_system_plugin, "true")) {
+				/* README: Maybe we can use load_levels to
+				 * achieve the same thing.  But it may be
+				 * confusing for a plugin writer. */
+				is_system_plugin =
+					e_plugin_xml_prop (root, "system_plugin");
+				if (g_strcmp0 (is_system_plugin, "true") == 0) {
 					e_plugin_enable (ep, TRUE);
 					ep->flags |= E_PLUGIN_FLAGS_SYSTEM_PLUGIN;
 				} else
@@ -559,8 +558,9 @@ e_plugin_load_plugins (void)
 
 			while ((d = g_dir_read_name (dir))) {
 				if (g_str_has_suffix  (d, ".eplug")) {
-					gchar * name = g_build_filename (path, d, NULL);
+					gchar *name;
 
+					name = g_build_filename (path, d, NULL);
 					ep_load (name, i);
 					g_free (name);
 				}
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 2a455b3e45..7ca11c5d37 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -68,17 +68,24 @@ EProfileEvent *
 e_profile_event_peek (void)
 {
 	if (e_profile_event == NULL) {
-		e_profile_event = g_object_new (e_profile_event_get_type (), NULL);
-		e_event_construct(&e_profile_event->popup, "org.gnome.evolution.profile.events");
+		e_profile_event = g_object_new (
+			e_profile_event_get_type (), NULL);
+		e_event_construct (
+			&e_profile_event->popup,
+			"org.gnome.evolution.profile.events");
 	}
 
 	return e_profile_event;
 }
 
 EProfileEventTarget *
-e_profile_event_target_new (EProfileEvent *eme, const gchar *id, const gchar *uid, guint32 flags)
+e_profile_event_target_new (EProfileEvent *eme,
+                            const gchar *id,
+                            const gchar *uid,
+                            guint32 flags)
 {
-	EProfileEventTarget *t = e_event_target_new (&eme->popup, E_PROFILE_EVENT_TARGET, sizeof (*t));
+	EProfileEventTarget *t = e_event_target_new (
+		&eme->popup, E_PROFILE_EVENT_TARGET, sizeof (*t));
 	GTimeVal tv;
 
 	t->id = g_strdup (id);
@@ -133,10 +140,12 @@ e_profile_event_hook_class_init (EProfileEventHookClass *class)
 {
 	gint i;
 
-	((EPluginHookClass *)class)->id = "org.gnome.evolution.profile.events:1.0";
+	((EPluginHookClass *)class)->id =
+		"org.gnome.evolution.profile.events:1.0";
 
 	for (i=0;emeh_targets[i].type;i++)
-		e_event_hook_class_add_target_map ((EEventHookClass *)class, &emeh_targets[i]);
+		e_event_hook_class_add_target_map (
+			(EEventHookClass *) class, &emeh_targets[i]);
 
 	((EEventHookClass *)class)->event = (EEvent *)e_profile_event_peek ();
 }
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 7b8a320782..f089b22d75 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -109,7 +109,8 @@ e_signature_list_class_init (ESignatureListClass *class)
 static void
 e_signature_list_init (ESignatureList *signature_list)
 {
-	signature_list->priv = G_TYPE_INSTANCE_GET_PRIVATE (signature_list, E_TYPE_SIGNATURE_LIST, ESignatureListPrivate);
+	signature_list->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		signature_list, E_TYPE_SIGNATURE_LIST, ESignatureListPrivate);
 }
 
 static GSList *
@@ -161,13 +162,16 @@ gconf_signatures_changed (GConfClient *client,
 					 * it from "old_sigs" and update it. */
 					found = TRUE;
 					e_iterator_delete (iter);
-					if (e_signature_set_from_xml (signature, l->data))
+					if (e_signature_set_from_xml (
+							signature, l->data))
 						g_signal_emit (
 							signature_list,
 							signals[SIGNATURE_CHANGED],
 							0, signature);
 
-					have_autogen |= e_signature_get_autogenerated (signature);
+					have_autogen |=
+						e_signature_get_autogenerated (
+						signature);
 
 					break;
 				}
@@ -184,7 +188,8 @@ gconf_signatures_changed (GConfClient *client,
 			/* Must be a new signature */
 			signature = e_signature_new_from_xml (l->data);
 			if (signature) {
-				have_autogen |= e_signature_get_autogenerated (signature);
+				have_autogen |=
+					e_signature_get_autogenerated (signature);
 
 				e_list_append (E_LIST (signature_list), signature);
 				new_sigs = g_slist_prepend (new_sigs, signature);
@@ -205,7 +210,10 @@ gconf_signatures_changed (GConfClient *client,
 		while (l != NULL) {
 			n = l->next;
 			signature = l->data;
-			g_signal_emit (signature_list, signals[SIGNATURE_ADDED], 0, signature);
+			g_signal_emit (
+				signature_list,
+				signals[SIGNATURE_ADDED], 0,
+				signature);
 			g_object_unref (signature);
 			g_slist_free_1 (l);
 			l = n;
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 7bd2b74bf0..a7ab2519ef 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -319,7 +319,8 @@ e_signature_class_init (ESignatureClass *class)
 static void
 e_signature_init (ESignature *signature)
 {
-	signature->priv = G_TYPE_INSTANCE_GET_PRIVATE (signature, E_TYPE_SIGNATURE, ESignaturePrivate);
+	signature->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		signature, E_TYPE_SIGNATURE, ESignaturePrivate);
 }
 
 /**
@@ -453,12 +454,15 @@ e_signature_set_from_xml (ESignature *signature, const gchar *xml)
 	cur = node->children;
 	while (cur) {
 		if (!strcmp ((gchar *)cur->name, "filename")) {
-			changed |= xml_set_content (cur, &signature->priv->filename);
-			changed |= xml_set_bool (cur, "script", &signature->priv->is_script);
+			changed |= xml_set_content (
+				cur, &signature->priv->filename);
+			changed |= xml_set_bool (
+				cur, "script", &signature->priv->is_script);
 			break;
 		} else if (!strcmp ((gchar *)cur->name, "script")) {
 			/* this is for handling 1.4 signature script definitions */
-			changed |= xml_set_content (cur, &signature->priv->filename);
+			changed |= xml_set_content (
+				cur, &signature->priv->filename);
 			if (!e_signature_get_is_script (signature)) {
 				e_signature_set_is_script (signature, TRUE);
 				changed = TRUE;
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 808af66242..2630a6608f 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -37,14 +37,18 @@ G_DEFINE_TYPE (
 	e_sorter_array,
 	E_SORTER_TYPE)
 
-static void	esa_sort               (ESorterArray *esa);
-static void	esa_backsort           (ESorterArray *esa);
-
-static gint	esa_model_to_sorted           (ESorter *sorter, gint row);
-static gint	esa_sorted_to_model           (ESorter *sorter, gint row);
-static void	esa_get_model_to_sorted_array (ESorter *sorter, gint **array, gint *count);
-static void	esa_get_sorted_to_model_array (ESorter *sorter, gint **array, gint *count);
-static gboolean esa_needs_sorting             (ESorter *esa);
+static void	esa_sort			(ESorterArray *esa);
+static void	esa_backsort			(ESorterArray *esa);
+
+static gint	esa_model_to_sorted		(ESorter *sorter, gint row);
+static gint	esa_sorted_to_model		(ESorter *sorter, gint row);
+static void	esa_get_model_to_sorted_array	(ESorter *sorter,
+						 gint **array,
+						 gint *count);
+static void	esa_get_sorted_to_model_array	(ESorter *sorter,
+						 gint **array,
+						 gint *count);
+static gboolean	esa_needs_sorting		(ESorter *esa);
 
 #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL)
 
diff --git a/e-util/e-ui-manager.c b/e-util/e-ui-manager.c
index 238df39e9f..52196626d4 100644
--- a/e-util/e-ui-manager.c
+++ b/e-util/e-ui-manager.c
@@ -159,7 +159,8 @@ e_ui_manager_class_init (EUIManagerClass *class)
 static void
 e_ui_manager_init (EUIManager *ui_manager)
 {
-	ui_manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (ui_manager, E_TYPE_UI_MANAGER, EUIManagerPrivate);
+	ui_manager->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ui_manager, E_TYPE_UI_MANAGER, EUIManagerPrivate);
 }
 
 /**
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index 46d6a6c996..0fc5a8b5da 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -168,7 +168,8 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 			ibl = bytes - (ib - string);
 			if (ibl > bytes) ibl = 0;
 
-			/* FIXME: this is wrong... what if the destination charset is 16 or 32 bit? */
+			/* FIXME This is wrong.  What if the destination
+			 *       charset is 16 or 32 bit? */
 			*ob++ = '_';
 			obl--;
 		}
@@ -181,7 +182,9 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 }
 
 gchar *
-e_utf8_to_charset_string_sized (const gchar *charset, const gchar *string, gint bytes)
+e_utf8_to_charset_string_sized (const gchar *charset,
+                                const gchar *string,
+                                gint bytes)
 {
 	iconv_t ic;
 	gchar *ret;
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 8f91558823..5fdfed901b 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -712,9 +712,11 @@ e_format_number (gint number)
 		case 0:
 			divider = epow10 (last_count);
 			if (number >= divider) {
-				group = g_strdup_printf("%0*d", last_count, number % divider);
+				group = g_strdup_printf (
+					"%0*d", last_count, number % divider);
 			} else {
-				group = g_strdup_printf("%d", number % divider);
+				group = g_strdup_printf (
+					"%d", number % divider);
 			}
 			number /= divider;
 			break;
@@ -1132,9 +1134,11 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
 
 	if (fail_pos) {
 		if (fail_pos > decimal_point_pos)
-			fail_pos = (gchar *)nptr + (fail_pos - copy) - (decimal_point_len - 1);
+			fail_pos =
+				(gchar *) nptr + (fail_pos - copy) -
+				(decimal_point_len - 1);
 		else
-			fail_pos = (gchar *)nptr + (fail_pos - copy);
+			fail_pos = (gchar *) nptr + (fail_pos - copy);
 	}
 
 	g_free (copy);
@@ -1296,41 +1300,58 @@ get_font_options (void)
 
 	/* Antialiasing */
 	if (fo_antialiasing == NULL)
-		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
+		cairo_font_options_set_antialias (
+			font_options, CAIRO_ANTIALIAS_DEFAULT);
 	else if (strcmp (fo_antialiasing, "grayscale") == 0)
-		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_GRAY);
+		cairo_font_options_set_antialias (
+			font_options, CAIRO_ANTIALIAS_GRAY);
 	else if (strcmp (fo_antialiasing, "rgba") == 0)
-		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_SUBPIXEL);
+		cairo_font_options_set_antialias (
+			font_options, CAIRO_ANTIALIAS_SUBPIXEL);
 	else if (strcmp (fo_antialiasing, "none") == 0)
-		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_NONE);
+		cairo_font_options_set_antialias (
+			font_options, CAIRO_ANTIALIAS_NONE);
 	else
-		cairo_font_options_set_antialias (font_options, CAIRO_ANTIALIAS_DEFAULT);
+		cairo_font_options_set_antialias (
+			font_options, CAIRO_ANTIALIAS_DEFAULT);
 
 	if (fo_hinting == NULL)
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
+		cairo_font_options_set_hint_style (
+			font_options, CAIRO_HINT_STYLE_DEFAULT);
 	else if (strcmp (fo_hinting, "full") == 0)
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_FULL);
+		cairo_font_options_set_hint_style (
+			font_options, CAIRO_HINT_STYLE_FULL);
 	else if (strcmp (fo_hinting, "medium") == 0)
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_MEDIUM);
+		cairo_font_options_set_hint_style (
+			font_options, CAIRO_HINT_STYLE_MEDIUM);
 	else if (strcmp (fo_hinting, "slight") == 0)
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_SLIGHT);
+		cairo_font_options_set_hint_style (
+			font_options, CAIRO_HINT_STYLE_SLIGHT);
 	else if (strcmp (fo_hinting, "none") == 0)
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_NONE);
+		cairo_font_options_set_hint_style (
+			font_options, CAIRO_HINT_STYLE_NONE);
 	else
-		cairo_font_options_set_hint_style (font_options, CAIRO_HINT_STYLE_DEFAULT);
+		cairo_font_options_set_hint_style (
+			font_options, CAIRO_HINT_STYLE_DEFAULT);
 
 	if (fo_subpixel_order == NULL)
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
+		cairo_font_options_set_subpixel_order (
+			font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
 	else if (strcmp (fo_subpixel_order, "rgb") == 0)
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_RGB);
+		cairo_font_options_set_subpixel_order (
+			font_options, CAIRO_SUBPIXEL_ORDER_RGB);
 	else if (strcmp (fo_subpixel_order, "bgr") == 0)
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_BGR);
+		cairo_font_options_set_subpixel_order (
+			font_options, CAIRO_SUBPIXEL_ORDER_BGR);
 	else if (strcmp (fo_subpixel_order, "vrgb") == 0)
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VRGB);
+		cairo_font_options_set_subpixel_order (
+			font_options, CAIRO_SUBPIXEL_ORDER_VRGB);
 	else if (strcmp (fo_subpixel_order, "vbgr") == 0)
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_VBGR);
+		cairo_font_options_set_subpixel_order (
+			font_options, CAIRO_SUBPIXEL_ORDER_VBGR);
 	else
-		cairo_font_options_set_subpixel_order (font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
+		cairo_font_options_set_subpixel_order (
+			font_options, CAIRO_SUBPIXEL_ORDER_DEFAULT);
 
 	g_static_mutex_unlock (&fo_lock);
 
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index c83bbabf9d..f67cd514bd 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -75,7 +75,8 @@ e_xml_get_child_by_name_by_lang (const xmlNode *parent,
 	}
 	for (child = parent->xmlChildrenNode; child != NULL; child = child->next) {
 		if (xmlStrcmp (child->name, child_name) == 0) {
-			xmlChar *this_lang = xmlGetProp (child, (const guchar *)"lang");
+			xmlChar *this_lang = xmlGetProp (
+				child, (const guchar *)"lang");
 			if (this_lang == NULL) {
 				C = child;
 			} else if (xmlStrcmp (this_lang, (xmlChar *)lang) == 0) {