Coding style and whitespace cleanup.

29 files changed, 631 insertions, 401 deletions

diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 5ef7c577e8..88dbb7189d 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -149,17 +149,17 @@ map_type (const gchar *nick)
 }
 
 /*
-  XML format:
-
- <error id="error-id" type="info|warning|question|error"?
-      response="default_response"? >
-  <primary>Primary error text.</primary>?
-  <secondary>Secondary error text.</secondary>?
-  <button stock="stock-button-id"? label="button label"?
-      response="response_id"? /> *
- </error>
+ * XML format:
+ *
+ * <error id="error-id" type="info|warning|question|error"?
+ *      response="default_response"? >
+ *  <primary> Primary error text.</primary>?
+ *  <secondary> Secondary error text.</secondary>?
+ *  <button stock="stock-button-id"? label="button label"?
+ *      response="response_id"? /> *
+ * </error>
+ */
 
-*/
 static void
 e_alert_load (const gchar *path)
 {
@@ -211,7 +211,7 @@ e_alert_load (const gchar *path)
 		g_warning("Error file '%s', domain '%s' already used, merging", path, tmp);
 	xmlFree (tmp);
 
-	for (error = root->children;error;error = error->next) {
+	for (error = root->children; error; error = error->next) {
 		if (!strcmp((gchar *)error->name, "error")) {
 			tmp = (gchar *)xmlGetProp(error, (const guchar *)"id");
 			if (tmp == NULL)
@@ -221,7 +221,7 @@ e_alert_load (const gchar *path)
 			e->id = g_strdup (tmp);
 
 			xmlFree (tmp);
-			lastbutton = (EAlertButton *)&e->buttons;
+			lastbutton = (EAlertButton *) &e->buttons;
 
 			tmp = (gchar *)xmlGetProp(error, (const guchar *)"type");
 			e->message_type = map_type (tmp);
@@ -234,7 +234,7 @@ e_alert_load (const gchar *path)
 				xmlFree (tmp);
 			}
 
-			for (scan = error->children;scan;scan=scan->next) {
+			for (scan = error->children; scan; scan = scan->next) {
 				if (!strcmp((gchar *)scan->name, "primary")) {
 					if ((tmp = (gchar *) xmlNodeGetContent (scan))) {
 						e->primary_text = g_strdup (
@@ -373,7 +373,7 @@ alert_format_string (const gchar *format,
 
 	while (format
 	       && (newstart = strchr (format, '{'))
-	       && (end = strchr (newstart+1, '}'))) {
+	       && (end = strchr (newstart + 1, '}'))) {
 		g_string_append_len (string, format, newstart - format);
 		id = atoi (newstart + 1);
 		if (id < args->len) {
@@ -435,7 +435,7 @@ alert_set_property (GObject *object,
                     const GValue *value,
                     GParamSpec *pspec)
 {
-	EAlert *alert = (EAlert*) object;
+	EAlert *alert = (EAlert *) object;
 
 	switch (property_id) {
 		case PROP_TAG:
@@ -476,7 +476,7 @@ alert_get_property (GObject *object,
                     GValue *value,
                     GParamSpec *pspec)
 {
-	EAlert *alert = (EAlert*) object;
+	EAlert *alert = (EAlert *) object;
 
 	switch (property_id) {
 		case PROP_TAG:
@@ -703,7 +703,8 @@ e_alert_init (EAlert *alert)
  * Returns: a new #EAlert
  **/
 EAlert *
-e_alert_new (const gchar *tag, ...)
+e_alert_new (const gchar *tag,
+             ...)
 {
 	EAlert *e;
 	va_list va;
@@ -716,7 +717,8 @@ e_alert_new (const gchar *tag, ...)
 }
 
 EAlert *
-e_alert_new_valist (const gchar *tag, va_list va)
+e_alert_new_valist (const gchar *tag,
+                    va_list va)
 {
 	EAlert *alert;
 	GPtrArray *args;
@@ -738,7 +740,8 @@ e_alert_new_valist (const gchar *tag, va_list va)
 }
 
 EAlert *
-e_alert_new_array (const gchar *tag, GPtrArray *args)
+e_alert_new_array (const gchar *tag,
+                   GPtrArray *args)
 {
 	return g_object_new (E_TYPE_ALERT, "tag", tag, "args", args, NULL);
 }
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index 476118284d..62156e9063 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -44,7 +44,8 @@ G_DEFINE_TYPE (
 	G_TYPE_OBJECT)
 
 static void
-e_bit_array_insert_real (EBitArray *eba, gint row)
+e_bit_array_insert_real (EBitArray *eba,
+                         gint row)
 {
 	gint box;
 	gint i;
@@ -73,7 +74,9 @@ e_bit_array_insert_real (EBitArray *eba, gint row)
 }
 
 static void
-e_bit_array_delete_real (EBitArray *eba, gint row, gboolean move_selection_mode)
+e_bit_array_delete_real (EBitArray *eba,
+                         gint row,
+                         gboolean move_selection_mode)
 {
 	gint box;
 	gint i;
@@ -120,7 +123,9 @@ e_bit_array_delete_real (EBitArray *eba, gint row, gboolean move_selection_mode)
 
 /* FIXME : Improve efficiency here. */
 void
-e_bit_array_delete (EBitArray *eba, gint row, gint count)
+e_bit_array_delete (EBitArray *eba,
+                    gint row,
+                    gint count)
 {
 	gint i;
 	for (i = 0; i < count; i++)
@@ -129,7 +134,9 @@ e_bit_array_delete (EBitArray *eba, gint row, gint count)
 
 /* FIXME : Improve efficiency here. */
 void
-e_bit_array_delete_single_mode (EBitArray *eba, gint row, gint count)
+e_bit_array_delete_single_mode (EBitArray *eba,
+                                gint row,
+                                gint count)
 {
 	gint i;
 	for (i = 0; i < count; i++)
@@ -138,7 +145,9 @@ e_bit_array_delete_single_mode (EBitArray *eba, gint row, gint count)
 
 /* FIXME : Improve efficiency here. */
 void
-e_bit_array_insert (EBitArray *eba, gint row, gint count)
+e_bit_array_insert (EBitArray *eba,
+                    gint row,
+                    gint count)
 {
 	gint i;
 	for (i = 0; i < count; i++)
@@ -147,7 +156,9 @@ e_bit_array_insert (EBitArray *eba, gint row, gint count)
 
 /* FIXME: Implement this more efficiently. */
 void
-e_bit_array_move_row (EBitArray *eba, gint old_row, gint new_row)
+e_bit_array_move_row (EBitArray *eba,
+                      gint old_row,
+                      gint new_row)
 {
 	e_bit_array_delete_real (eba, old_row, FALSE);
 	e_bit_array_insert_real (eba, new_row);
@@ -179,7 +190,7 @@ eba_dispose (GObject *object)
  */
 gboolean
 e_bit_array_value_at (EBitArray *eba,
-		      gint             n)
+                      gint n)
 {
 	if (eba->bit_count < n || eba->bit_count == 0)
 		return 0;
@@ -198,8 +209,8 @@ e_bit_array_value_at (EBitArray *eba,
  */
 void
 e_bit_array_foreach (EBitArray *eba,
-		     EForeachFunc     callback,
-		     gpointer         closure)
+                     EForeachFunc callback,
+                     gpointer closure)
 {
 	gint i;
 	gint last = (eba->bit_count + 31) / 32;
@@ -274,7 +285,7 @@ e_bit_array_select_all (EBitArray *eba)
 	}
 
 	/* need to zero out the bits corresponding to the rows not
-	   selected in the last full 32 bit mask */
+	 * selected in the last full 32 bit mask */
 	if (eba->bit_count % 32) {
 		gint unselected_mask = 0;
 		gint num_unselected_in_last_byte = 32 - eba->bit_count % 32;
@@ -317,7 +328,9 @@ e_bit_array_bit_count (EBitArray *eba)
 	(((object)->data[(i)]) &= (mask)))
 
 void
-e_bit_array_change_one_row (EBitArray *eba, gint row, gboolean grow)
+e_bit_array_change_one_row (EBitArray *eba,
+                            gint row,
+                            gboolean grow)
 {
 	gint i;
 	i = BOX (row);
@@ -326,7 +339,10 @@ e_bit_array_change_one_row (EBitArray *eba, gint row, gboolean grow)
 }
 
 void
-e_bit_array_change_range (EBitArray *eba, gint start, gint end, gboolean grow)
+e_bit_array_change_range (EBitArray *eba,
+                          gint start,
+                          gint end,
+                          gboolean grow)
 {
 	gint i, last;
 	if (start != end) {
@@ -351,7 +367,8 @@ e_bit_array_change_range (EBitArray *eba, gint start, gint end, gboolean grow)
 }
 
 void
-e_bit_array_select_single_row (EBitArray *eba, gint row)
+e_bit_array_select_single_row (EBitArray *eba,
+                               gint row)
 {
 	gint i;
 	for (i = 0; i < ((eba->bit_count + 31) / 32); i++) {
@@ -367,7 +384,8 @@ e_bit_array_select_single_row (EBitArray *eba, gint row)
 }
 
 void
-e_bit_array_toggle_single_row (EBitArray *eba, gint row)
+e_bit_array_toggle_single_row (EBitArray *eba,
+                               gint row)
 {
 	if (eba->data[BOX (row)] & BITMASK (row))
 		eba->data[BOX (row)] &= ~BITMASK (row);
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index b8d772c9b5..5ca20f8e74 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -37,7 +37,8 @@
 static GHashTable *pixbufs_cache = NULL;
 
 static void
-categories_changed_cb (gpointer object, gpointer user_data)
+categories_changed_cb (gpointer object,
+                       gpointer user_data)
 {
 	if (pixbufs_cache)
 		g_hash_table_remove_all (pixbufs_cache);
@@ -62,7 +63,8 @@ free_pixbuf_cb (gpointer ptr)
  * Returns: the icon configured for the given category
  */
 gboolean
-e_categories_config_get_icon_for (const gchar *category, GdkPixbuf **pixbuf)
+e_categories_config_get_icon_for (const gchar *category,
+                                  GdkPixbuf **pixbuf)
 {
 	const gchar *icon_file;
 
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 18b707092d..a19bbafb3d 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -242,7 +242,9 @@ e_config_init (EConfig *config)
  * Return value: @ep is returned.
  **/
 EConfig *
-e_config_construct (EConfig *ep, gint type, const gchar *id)
+e_config_construct (EConfig *ep,
+                    gint type,
+                    const gchar *id)
 {
 	g_return_val_if_fail (type == E_CONFIG_BOOK || type == E_CONFIG_ASSISTANT, NULL);
 
@@ -301,7 +303,10 @@ e_config_add_items (EConfig *ec,
  * the assistant to continue or the notebook to close.
  **/
 void
-e_config_add_page_check (EConfig *ec, const gchar *pageid, EConfigCheckFunc check, gpointer data)
+e_config_add_page_check (EConfig *ec,
+                         const gchar *pageid,
+                         EConfigCheckFunc check,
+                         gpointer data)
 {
 	struct _check_node *cn;
 
@@ -314,7 +319,8 @@ e_config_add_page_check (EConfig *ec, const gchar *pageid, EConfigCheckFunc chec
 }
 
 static struct _finish_page_node *
-find_page_finish (EConfig *config, const gchar *pageid)
+find_page_finish (EConfig *config,
+                  const gchar *pageid)
 {
 	GList *link;
 
@@ -341,7 +347,9 @@ find_page_finish (EConfig *config, const gchar *pageid)
  * With is_finish set on the pageid the page is treated as the last page in an assistant.
  **/
 void
-e_config_set_page_is_finish (EConfig *ec, const gchar *pageid, gboolean is_finish)
+e_config_set_page_is_finish (EConfig *ec,
+                             const gchar *pageid,
+                             gboolean is_finish)
 {
 	struct _finish_page_node *fp;
 
@@ -378,7 +386,8 @@ ec_add_static_items (EConfig *config)
 }
 
 static gint
-ep_cmp (gconstpointer ap, gconstpointer bp)
+ep_cmp (gconstpointer ap,
+        gconstpointer bp)
 {
 	struct _widget_node *a = *((gpointer *) ap);
 	struct _widget_node *b = *((gpointer *) bp);
@@ -387,7 +396,9 @@ ep_cmp (gconstpointer ap, gconstpointer bp)
 }
 
 static GList *
-ec_assistant_find_page (EConfig *ec, GtkWidget *page, gint *page_index)
+ec_assistant_find_page (EConfig *ec,
+                        GtkWidget *page,
+                        gint *page_index)
 {
 	struct _widget_node *node = NULL;
 	GList *link;
@@ -493,7 +504,8 @@ ec_assistant_check_current (EConfig *ec)
 }
 
 static gint
-ec_assistant_forward (gint current_page, gpointer user_data)
+ec_assistant_forward (gint current_page,
+                      gpointer user_data)
 {
 	GtkAssistant *assistant;
 	EConfig *ec = user_data;
@@ -645,10 +657,10 @@ ec_rebuild (EConfig *emp)
 		case E_CONFIG_BOOK:
 		case E_CONFIG_ASSISTANT:
 			/* Only one of BOOK or ASSISTANT may be define, it
-			   is used by the defining code to mark the
-			   type of the config window.  It is
-			   cross-checked with the code's defined
-			   type. */
+			 * is used by the defining code to mark the
+			 * type of the config window.  It is
+			 * cross-checked with the code's defined
+			 * type. */
 			if (root != NULL) {
 				g_warning("EConfig book/assistant redefined at: %s", item->path);
 				break;
@@ -776,9 +788,9 @@ ec_rebuild (EConfig *emp)
 		case E_CONFIG_PAGE:
 		case E_CONFIG_PAGE_PROGRESS:
 			/* CONFIG_PAGEs depend on the config type.
-			   E_CONFIG_BOOK:
+			 * E_CONFIG_BOOK:
 				The page is a VBox, stored in the notebook.
-			   E_CONFIG_ASSISTANT
+			 * E_CONFIG_ASSISTANT
 				The page is a VBox, stored in the GtkAssistant,
 				any sections automatically added inside it. */
 			sectionno = 0;
@@ -848,12 +860,12 @@ ec_rebuild (EConfig *emp)
 			sectionnode = NULL;
 			wn->widget = page;
 			if (page)
-				g_signal_connect(page, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
+				g_signal_connect (page, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
 			break;
 		case E_CONFIG_SECTION:
 		case E_CONFIG_SECTION_TABLE:
 			/* The section factory is always called with
-			   the parent vbox object.  Even for assistant pages. */
+			 * the parent vbox object.  Even for assistant pages. */
 			if (page == NULL) {
 				/*g_warning("EConfig section '%s' has no parent page", item->path);*/
 				section = NULL;
@@ -950,7 +962,7 @@ ec_rebuild (EConfig *emp)
 			sectionno++;
 			wn->widget = section;
 			if (section)
-				g_signal_connect(section, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
+				g_signal_connect (section, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
 			sectionnode = wn;
 			break;
 		case E_CONFIG_ITEM:
@@ -960,8 +972,8 @@ ec_rebuild (EConfig *emp)
 				wn->widget = NULL;
 
 			/* ITEMs are called with the section parent.
-			   The type depends on the section type,
-			   either a GtkTable, or a GtkVBox */
+			 * The type depends on the section type,
+			 * either a GtkTable, or a GtkVBox */
 			w = NULL;
 			if (section == NULL) {
 				wn->widget = NULL;
@@ -989,7 +1001,7 @@ ec_rebuild (EConfig *emp)
 
 			wn->widget = w;
 			if (w) {
-				g_signal_connect(w, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
+				g_signal_connect (w, "destroy", G_CALLBACK(gtk_widget_destroyed), &wn->widget);
 				itemno++;
 
 				if (gtk_widget_get_visible (w))
@@ -1062,14 +1074,16 @@ ec_rebuild (EConfig *emp)
  * initiate a e_config_target_changed() call where appropriate.
  **/
 void
-e_config_set_target (EConfig *emp, EConfigTarget *target)
+e_config_set_target (EConfig *emp,
+                     EConfigTarget *target)
 {
 	if (emp->target != target)
 		((EConfigClass *) G_OBJECT_GET_CLASS (emp))->set_target (emp, target);
 }
 
 static void
-ec_widget_destroy (GtkWidget *w, EConfig *ec)
+ec_widget_destroy (GtkWidget *w,
+                   EConfig *ec)
 {
 	if (ec->target) {
 		e_config_target_free (ec, ec->target);
@@ -1115,7 +1129,7 @@ e_config_create_widget (EConfig *emp)
 	while (link != NULL) {
 		struct _menu_node *mnode = link->data;
 
-		for (l=mnode->menu; l; l = l->next) {
+		for (l = mnode->menu; l; l = l->next) {
 			struct _EConfigItem *item = l->data;
 			struct _widget_node *wn = g_malloc0 (sizeof (*wn));
 
@@ -1130,14 +1144,14 @@ e_config_create_widget (EConfig *emp)
 
 	qsort (items->pdata, items->len, sizeof (items->pdata[0]), ep_cmp);
 
-	for (i=0;i<items->len;i++)
+	for (i = 0; i < items->len; i++)
 		p->widgets = g_list_append (p->widgets, items->pdata[i]);
 
 	g_ptr_array_free (items, TRUE);
 	ec_rebuild (emp);
 
 	/* auto-unref it */
-	g_signal_connect(emp->widget, "destroy", G_CALLBACK(ec_widget_destroy), emp);
+	g_signal_connect (emp->widget, "destroy", G_CALLBACK(ec_widget_destroy), emp);
 
 	/* FIXME: for some reason ec_rebuild puts the widget on page 1, this is just to override that */
 	if (emp->type == E_CONFIG_BOOK)
@@ -1151,7 +1165,9 @@ e_config_create_widget (EConfig *emp)
 }
 
 static void
-ec_dialog_response (GtkWidget *d, gint id, EConfig *ec)
+ec_dialog_response (GtkWidget *d,
+                    gint id,
+                    EConfig *ec)
 {
 	if (id == GTK_RESPONSE_OK)
 		e_config_commit (ec);
@@ -1179,7 +1195,9 @@ ec_dialog_response (GtkWidget *d, gint id, EConfig *ec)
  * Return value: The window widget.  This is also stored in @emp.window.
  **/
 GtkWidget *
-e_config_create_window (EConfig *emp, GtkWindow *parent, const gchar *title)
+e_config_create_window (EConfig *emp,
+                        GtkWindow *parent,
+                        const gchar *title)
 {
 	GtkWidget *window;
 
@@ -1236,7 +1254,7 @@ ec_call_page_check (EConfig *emp)
 static gboolean
 ec_idle_handler_for_rebuild (gpointer data)
 {
-	EConfig *emp = (EConfig*) data;
+	EConfig *emp = (EConfig *) data;
 
 	ec_rebuild (emp);
 	ec_call_page_check (emp);
@@ -1258,7 +1276,8 @@ ec_idle_handler_for_rebuild (gpointer data)
  * button for the Notebook mode.
  **/
 void
-e_config_target_changed (EConfig *emp, e_config_target_change_t how)
+e_config_target_changed (EConfig *emp,
+                         e_config_target_change_t how)
 {
 	if (how == E_CONFIG_TARGET_CHANGED_REBUILD) {
 		g_idle_add (ec_idle_handler_for_rebuild, emp);
@@ -1312,7 +1331,8 @@ e_config_commit (EConfig *config)
  * Return value: FALSE if the data is inconsistent/incomplete.
  **/
 gboolean
-e_config_page_check (EConfig *config, const gchar *pageid)
+e_config_page_check (EConfig *config,
+                     const gchar *pageid)
 {
 	GList *link;
 
@@ -1345,7 +1365,8 @@ e_config_page_check (EConfig *config, const gchar *pageid)
  * container or the GtkVBox object inside the assistant.
  **/
 GtkWidget *
-e_config_page_get (EConfig *ec, const gchar *pageid)
+e_config_page_get (EConfig *ec,
+                   const gchar *pageid)
 {
 	GList *link;
 
@@ -1380,13 +1401,14 @@ e_config_page_get (EConfig *ec, const gchar *pageid)
  * last configured and visible page.
  **/
 const gchar *
-e_config_page_next (EConfig *ec, const gchar *pageid)
+e_config_page_next (EConfig *ec,
+                    const gchar *pageid)
 {
 	GList *link;
 	gint found;
 
 	link = g_list_first (ec->priv->widgets);
-	found = pageid == NULL ? 1:0;
+	found = pageid == NULL ? 1 : 0;
 
 	while (link != NULL) {
 		struct _widget_node *wn = link->data;
@@ -1420,13 +1442,14 @@ e_config_page_next (EConfig *ec, const gchar *pageid)
  * first configured and visible page.
  **/
 const gchar *
-e_config_page_prev (EConfig *ec, const gchar *pageid)
+e_config_page_prev (EConfig *ec,
+                    const gchar *pageid)
 {
 	GList *link;
 	gint found;
 
 	link = g_list_last (ec->priv->widgets);
-	found = pageid == NULL ? 1:0;
+	found = pageid == NULL ? 1 : 0;
 
 	while (link != NULL) {
 		struct _widget_node *wn = link->data;
@@ -1542,7 +1565,8 @@ gpointer e_config_target_new (EConfig *ep, gint type, gsize size)
  * free custom targets.
  **/
 void
-e_config_target_free (EConfig *ep, gpointer o)
+e_config_target_free (EConfig *ep,
+                      gpointer o)
 {
 	EConfigTarget *t = o;
 
@@ -1554,27 +1578,26 @@ e_config_target_free (EConfig *ep, gpointer o)
 /* Config menu plugin handler */
 
 /*
-<e-plugin
-  class="org.gnome.mail.plugin.config:1.0"
-  id="org.gnome.mail.plugin.config.item:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.configMenu:1.0"
-        handler="HandleConfig">
-  <menu id="any" target="select">
-   <item
-    type="item|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    activate="ep_view_emacs"/>
-  </menu>
-  </extension>
-
-*/
+ * <e-plugin
+ *   class="org.gnome.mail.plugin.config:1.0"
+ *   id="org.gnome.mail.plugin.config.item:1.0"
+ *   type="shlib"
+ *   location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
+ *   name="imap"
+ *   description="IMAP4 and IMAP4v1 mail store">
+ *   <hook class="org.gnome.mail.configMenu:1.0"
+ *         handler="HandleConfig">
+ *   <menu id="any" target="select">
+ *    <item
+ *     type="item|toggle|radio|image|submenu|bar"
+ *     active
+ *     path="foo/bar"
+ *     label="label"
+ *     icon="foo"
+ *     activate="ep_view_emacs"/>
+ *   </menu>
+ * </e-plugin>
+ */
 
 #define emph ((EConfigHook *)eph)
 
@@ -1614,7 +1637,9 @@ ech_abort (EConfig *ec,
 }
 
 static gboolean
-ech_check (EConfig *ec, const gchar *pageid, gpointer data)
+ech_check (EConfig *ec,
+           const gchar *pageid,
+           gpointer data)
 {
 	EConfigHookGroup *group = data;
 	EConfigHookPageCheckData hdata;
@@ -1630,7 +1655,8 @@ ech_check (EConfig *ec, const gchar *pageid, gpointer data)
 }
 
 static void
-ech_config_factory (EConfig *emp, gpointer data)
+ech_config_factory (EConfig *emp,
+                    gpointer data)
 {
 	EConfigHookGroup *group = data;
 
@@ -1771,7 +1797,10 @@ ech_config_section_factory (EConfig *config,
 }
 
 static struct _EConfigItem *
-emph_construct_item (EPluginHook *eph, EConfigHookGroup *menu, xmlNodePtr root, EConfigHookTargetMap *map)
+emph_construct_item (EPluginHook *eph,
+                     EConfigHookGroup *menu,
+                     xmlNodePtr root,
+                     EConfigHookTargetMap *map)
 {
 	struct _EConfigItem *item;
 
@@ -1804,7 +1833,8 @@ error:
 }
 
 static EConfigHookGroup *
-emph_construct_menu (EPluginHook *eph, xmlNodePtr root)
+emph_construct_menu (EPluginHook *eph,
+                     xmlNodePtr root)
 {
 	EConfigHookGroup *menu;
 	xmlNodePtr node;
@@ -1853,7 +1883,9 @@ error:
 }
 
 static gint
-emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
+emph_construct (EPluginHook *eph,
+                EPlugin *ep,
+                xmlNodePtr root)
 {
 	xmlNodePtr node;
 	EConfigClass *class;
diff --git a/e-util/e-config.h b/e-util/e-config.h
index c2bdffb080..0535895b99 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -78,12 +78,12 @@ typedef GtkWidget *
 						 gpointer data);
 
 /* ok so this is all a bit bogussy
-   we need to map to glade stuff instead */
+ * we need to map to glade stuff instead */
 
 /* Add types?
-   if no factory, setup appropriate container ?
-   if factory, then assume that returns the right sort of object?
-   what about pages ?
+ * if no factory, setup appropriate container ?
+ * if factory, then assume that returns the right sort of object?
+ * what about pages ?
 */
 
 /**
@@ -318,7 +318,7 @@ void		e_config_target_free		(EConfig *config,
 /* config plugin target, they are closely integrated */
 
 /* To implement a basic config plugin, you just need to subclass
-   this and initialise the class target type tables */
+ * this and initialise the class target type tables */
 
 #include "e-util/e-plugin.h"
 
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index 53a0439068..c21d025794 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -101,7 +101,8 @@ ensure_loaded (void)
 }
 
 static const gchar *
-get_default_format (DTFormatKind kind, const gchar *key)
+get_default_format (DTFormatKind kind,
+                    const gchar *key)
 {
 	const gchar *res = NULL;
 
@@ -139,7 +140,8 @@ get_default_format (DTFormatKind kind, const gchar *key)
 }
 
 static const gchar *
-get_format_internal (const gchar *key, DTFormatKind kind)
+get_format_internal (const gchar *key,
+                     DTFormatKind kind)
 {
 	const gchar *res;
 
@@ -156,7 +158,9 @@ get_format_internal (const gchar *key, DTFormatKind kind)
 }
 
 static void
-set_format_internal (const gchar *key, const gchar *fmt, GKeyFile *keyfile)
+set_format_internal (const gchar *key,
+                     const gchar *fmt,
+                     GKeyFile *keyfile)
 {
 	ensure_loaded ();
 
@@ -174,7 +178,10 @@ set_format_internal (const gchar *key, const gchar *fmt, GKeyFile *keyfile)
 }
 
 static gchar *
-format_relative_date (time_t tvalue, time_t ttoday, const struct tm *value, const struct tm *today)
+format_relative_date (time_t tvalue,
+                      time_t ttoday,
+                      const struct tm *value,
+                      const struct tm *today)
 {
 	gchar *res = g_strdup (get_default_format (DTFormatKindDate, NULL));
 	GDate now, val;
@@ -215,44 +222,44 @@ format_relative_date (time_t tvalue, time_t ttoday, const struct tm *value, cons
 				switch (g_date_get_weekday (&val)) {
 				case 1:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Mon"));
 					break;
 				case 2:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Tue"));
 					break;
 				case 3:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Wed"));
 					break;
 				case 4:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Thu"));
 					break;
 				case 5:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Fri"));
 					break;
 				case 6:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Sat"));
 					break;
 				case 7:
 					/* Translators: This is used for abbreviated days in the future.
-				           You can use strftime modifiers here too, like "Next %a", to avoid
-					   repeated translation of the abbreviated day name. */
+				 *         You can use strftime modifiers here too, like "Next %a", to avoid
+					 * repeated translation of the abbreviated day name. */
 					res = g_strdup (C_ ("DateFmt", "Next Sun"));
 					break;
 				default:
@@ -269,7 +276,10 @@ format_relative_date (time_t tvalue, time_t ttoday, const struct tm *value, cons
 }
 
 static gchar *
-format_internal (const gchar *key, DTFormatKind kind, time_t tvalue, struct tm *tm_value)
+format_internal (const gchar *key,
+                 DTFormatKind kind,
+                 time_t tvalue,
+                 struct tm *tm_value)
 {
 	const gchar *fmt;
 	gchar buff[129];
@@ -332,7 +342,9 @@ format_internal (const gchar *key, DTFormatKind kind, time_t tvalue, struct tm *
 }
 
 static void
-fill_combo_formats (GtkWidget *combo, const gchar *key, DTFormatKind kind)
+fill_combo_formats (GtkWidget *combo,
+                    const gchar *key,
+                    DTFormatKind kind)
 {
 	const gchar *date_items[] = {
 		N_ ("Use locale default"),
@@ -449,7 +461,8 @@ update_preview_widget (GtkWidget *combo)
 }
 
 static void
-format_combo_changed_cb (GtkWidget *combo, gpointer user_data)
+format_combo_changed_cb (GtkWidget *combo,
+                         gpointer user_data)
 {
 	const gchar *key;
 	DTFormatKind kind;
@@ -478,12 +491,14 @@ format_combo_changed_cb (GtkWidget *combo, gpointer user_data)
 	update_preview_widget (combo);
 
 	/* save on every change only because 'unref_setup_keyfile' is never called :(
-	   how about in kill-bonobo? */
+	 * how about in kill - bonobo? */
 	save_keyfile (keyfile);
 }
 
 static gchar *
-gen_key (const gchar *component, const gchar *part, DTFormatKind kind)
+gen_key (const gchar *component,
+         const gchar *part,
+         DTFormatKind kind)
 {
 	const gchar *kind_str = NULL;
 
@@ -538,7 +553,12 @@ unref_setup_keyfile (gpointer ptr)
  * on user's changes.
  **/
 void
-e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *component, const gchar *part, DTFormatKind kind, const gchar *caption)
+e_datetime_format_add_setup_widget (GtkWidget *table,
+                                    gint row,
+                                    const gchar *component,
+                                    const gchar *part,
+                                    DTFormatKind kind,
+                                    const gchar *caption)
 {
 	GtkListStore *store;
 	GtkWidget *label, *combo, *preview, *align;
@@ -601,7 +621,10 @@ e_datetime_format_add_setup_widget (GtkWidget *table, gint row, const gchar *com
 }
 
 gchar *
-e_datetime_format_format (const gchar *component, const gchar *part, DTFormatKind kind, time_t value)
+e_datetime_format_format (const gchar *component,
+                          const gchar *part,
+                          DTFormatKind kind,
+                          time_t value)
 {
 	gchar *key, *res;
 
@@ -619,7 +642,10 @@ e_datetime_format_format (const gchar *component, const gchar *part, DTFormatKin
 }
 
 gchar *
-e_datetime_format_format_tm (const gchar *component, const gchar *part, DTFormatKind kind, struct tm *tm_time)
+e_datetime_format_format_tm (const gchar *component,
+                             const gchar *part,
+                             DTFormatKind kind,
+                             struct tm *tm_time)
 {
 	gchar *key, *res;
 
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 620719665b..fabd1951d3 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -38,7 +38,10 @@
  * button.
  **/
 void
-e_notice (gpointer parent, GtkMessageType type, const gchar *format, ...)
+e_notice (gpointer parent,
+          GtkMessageType type,
+          const gchar *format,
+          ...)
 {
 	GtkWidget *dialog;
 	va_list args;
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 60867315b0..12034f96f2 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -37,7 +37,8 @@
  * values for the items are provided as a -1-terminated array.
  */
 static gint
-value_to_index (const gint *value_map, gint value)
+value_to_index (const gint *value_map,
+                gint value)
 {
 	gint i;
 
@@ -52,7 +53,8 @@ value_to_index (const gint *value_map, gint value)
  * function above.
  */
 static gint
-index_to_value (const gint *value_map, gint index)
+index_to_value (const gint *value_map,
+                gint index)
 {
 	gint i;
 
@@ -75,7 +77,8 @@ index_to_value (const gint *value_map, gint index)
  * Sets the string value inside a #GtkEditable-derived widget.
  **/
 void
-e_dialog_editable_set (GtkWidget *widget, const gchar *value)
+e_dialog_editable_set (GtkWidget *widget,
+                       const gchar *value)
 {
 	gint pos = 0;
 
@@ -116,7 +119,9 @@ e_dialog_editable_get (GtkWidget *widget)
  * indices.
  **/
 void
-e_dialog_combo_box_set (GtkWidget *widget, gint value, const gint *value_map)
+e_dialog_combo_box_set (GtkWidget *widget,
+                        gint value,
+                        const gint *value_map)
 {
 	gint i;
 
@@ -146,7 +151,8 @@ e_dialog_combo_box_set (GtkWidget *widget, gint value, const gint *value_map)
  * combo box.
  **/
 gint
-e_dialog_combo_box_get (GtkWidget *widget, const gint *value_map)
+e_dialog_combo_box_get (GtkWidget *widget,
+                        const gint *value_map)
 {
 	gint active;
 	gint i;
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 4611995c91..ca978820e9 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -175,7 +175,8 @@ e_event_add_items (EEvent *event,
  * added, and may only be removed once.
  **/
 void
-e_event_remove_items (EEvent *event, gpointer handle)
+e_event_remove_items (EEvent *event,
+                      gpointer handle)
 {
 	struct _event_node *node = handle;
 
@@ -193,7 +194,8 @@ e_event_remove_items (EEvent *event, gpointer handle)
 }
 
 static gint
-ee_cmp (gconstpointer ap, gconstpointer bp)
+ee_cmp (gconstpointer ap,
+        gconstpointer bp)
 {
 	gint a = ((struct _event_info **) ap)[0]->item->priority;
 	gint b = ((struct _event_info **) bp)[0]->item->priority;
@@ -217,7 +219,9 @@ ee_cmp (gconstpointer ap, gconstpointer bp)
  * emission is complete.
  **/
 void
-e_event_emit (EEvent *event, const gchar *id, EEventTarget *target)
+e_event_emit (EEvent *event,
+              const gchar *id,
+              EEventTarget *target)
 {
 	EEventPrivate *p = event->priv;
 	GSList *events;
@@ -238,7 +242,7 @@ e_event_emit (EEvent *event, const gchar *id, EEventTarget *target)
 			struct _event_node *node = link->data;
 			GSList *l = node->events;
 
-			for (;l;l=g_slist_next (l)) {
+			for (; l; l = g_slist_next (l)) {
 				struct _event_info *info;
 
 				info = g_malloc0 (sizeof (*info));
@@ -253,7 +257,7 @@ e_event_emit (EEvent *event, const gchar *id, EEventTarget *target)
 		p->sorted = events = g_slist_sort (events, ee_cmp);
 	}
 
-	for (;events;events=g_slist_next (events)) {
+	for (; events; events = g_slist_next (events)) {
 		struct _event_info *info = events->data;
 		EEventItem *item = info->item;
 
@@ -325,42 +329,42 @@ e_event_target_free (EEvent *event,
 /* Event menu plugin handler */
 
 /*
-<e-plugin
-  class="org.gnome.mail.plugin.event:1.0"
-  id="org.gnome.mail.plugin.event.item:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.eventMenu:1.0"
-        handler="HandleEvent">
-  <menu id="any" target="select">
-   <item
-    type="item|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    mask="select_one"
-    activate="ep_view_emacs"/>
-  </menu>
-  </extension>
-
-  <hook class="org.gnome.evolution.mail.events:1.0">
-  <event id=".folder.changed"
-  target=""
-    priority="0"
-    handle="gotevent"
-    enable="new"
-    />
-  <event id=".message.read"
-    priority="0"
-    handle="gotevent"
-    mask="new"
-    />
-  </hook>
-
-*/
+ * <e-plugin
+ *  class="org.gnome.mail.plugin.event:1.0"
+ *  id="org.gnome.mail.plugin.event.item:1.0"
+ *  type="shlib"
+ *  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
+ *  name="imap"
+ *  description="IMAP4 and IMAP4v1 mail store">
+ *  <hook class="org.gnome.mail.eventMenu:1.0"
+ *      handler="HandleEvent">
+ *   <menu id="any" target="select">
+ *   <item
+ *    type="item|toggle|radio|image|submenu|bar"
+ *    active
+ *    path="foo/bar"
+ *    label="label"
+ *    icon="foo"
+ *    mask="select_one"
+ *    activate="ep_view_emacs"/>
+ *   </menu>
+ *  </hook>
+ *
+ * <hook class="org.gnome.evolution.mail.events:1.0">
+ * <event id=".folder.changed"
+ *  target=""
+ *  priority="0"
+ *  handle="gotevent"
+ *  enable="new"
+ *  />
+ * <event id=".message.read"
+ *  priority="0"
+ *  handle="gotevent"
+ *  mask="new"
+ *  />
+ * </hook>
+ *
+ */
 
 #define emph ((EEventHook *)eph)
 
@@ -377,7 +381,9 @@ G_DEFINE_TYPE (
 	E_TYPE_PLUGIN_HOOK)
 
 static void
-emph_event_handle (EEvent *ee, EEventItem *item, gpointer data)
+emph_event_handle (EEvent *ee,
+                   EEventItem *item,
+                   gpointer data)
 {
 	EEventHook *hook = data;
 
@@ -399,7 +405,9 @@ emph_free_item (EEventItem *item)
 }
 
 static void
-emph_free_items (EEvent *ee, GSList *items, gpointer data)
+emph_free_items (EEvent *ee,
+                 GSList *items,
+                 gpointer data)
 {
 	/*EPluginHook *eph = data;*/
 
@@ -408,7 +416,9 @@ emph_free_items (EEvent *ee, GSList *items, gpointer data)
 }
 
 static EEventItem *
-emph_construct_item (EPluginHook *eph, xmlNodePtr root, EEventHookClass *class)
+emph_construct_item (EPluginHook *eph,
+                     xmlNodePtr root,
+                     EEventHookClass *class)
 {
 	EEventItem *item;
 	EEventHookTargetMap *map;
@@ -444,7 +454,9 @@ error:
 }
 
 static gint
-emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
+emph_construct (EPluginHook *eph,
+                EPlugin *ep,
+                xmlNodePtr root)
 {
 	xmlNodePtr node;
 	EEventHookClass *class;
diff --git a/e-util/e-event.h b/e-util/e-event.h
index e7999dc5c2..90a3b735fb 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -21,9 +21,7 @@
  *
  */
 
-/*
-  This a bit 'whipped together', so is likely to change mid-term
-*/
+/* This a bit 'whipped together', so is likely to change mid-term */
 
 #ifndef E_EVENT_H
 #define E_EVENT_H
@@ -194,10 +192,10 @@ void		e_event_target_free		(EEvent *event,
 /* event plugin target, they are closely integrated */
 
 /* To implement a basic event menu plugin, you just need to subclass
-   this and initialise the class target type tables */
+ * this and initialise the class target type tables */
 
 /* For events, the plugin item talks to a specific instance, rather than
-   a set of instances of the hook handler */
+ * a set of instances of the hook handler */
 
 #include "e-util/e-plugin.h"
 
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 10e3519865..3a863da096 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -31,7 +31,10 @@
 #include "e-html-utils.h"
 
 static gchar *
-check_size (gchar **buffer, gint *buffer_size, gchar *out, gint len)
+check_size (gchar **buffer,
+            gint *buffer_size,
+            gchar *out,
+            gint len)
 {
 	if (out + len + 1> *buffer + *buffer_size) {
 		gint index = out - *buffer;
@@ -72,7 +75,8 @@ static gint special_chars[] = {
 /* www\.[A-Za-z0-9.-]+(/([^ "|]*[^ ,.!?;:>)\]}`'"|_-])+)             */
 
 static gchar *
-url_extract (const guchar **text, gboolean full_url)
+url_extract (const guchar **text,
+             gboolean full_url)
 {
 	const guchar *end = *text, *p;
 	gchar *out;
@@ -99,13 +103,15 @@ url_extract (const guchar **text, gboolean full_url)
 			return NULL;
 	}
 
-	out = g_strndup ((gchar *)*text, end - *text);
+	out = g_strndup ((gchar *) * text, end - *text);
 	*text = end;
 	return out;
 }
 
 static gchar *
-email_address_extract (const guchar **cur, gchar **out, const guchar *linestart)
+email_address_extract (const guchar **cur,
+                       gchar **out,
+                       const guchar *linestart)
 {
 	const guchar *start, *end, *dot;
 	gchar *addr;
@@ -141,7 +147,8 @@ email_address_extract (const guchar **cur, gchar **out, const guchar *linestart)
 }
 
 static gboolean
-is_citation (const guchar *c, gboolean saw_citation)
+is_citation (const guchar *c,
+             gboolean saw_citation)
 {
 	const guchar *p;
 
@@ -218,7 +225,9 @@ is_citation (const guchar *c, gboolean saw_citation)
  * Returns: a newly-allocated string containing HTML
  **/
 gchar *
-e_text_to_html_full (const gchar *input, guint flags, guint32 color)
+e_text_to_html_full (const gchar *input,
+                     guint flags,
+                     guint32 color)
 {
 	const guchar *cur, *next, *linestart;
 	gchar *buffer = NULL;
@@ -436,7 +445,8 @@ e_text_to_html_full (const gchar *input, guint flags, guint32 color)
 }
 
 gchar *
-e_text_to_html (const gchar *input, guint flags)
+e_text_to_html (const gchar *input,
+                guint flags)
 {
 	return e_text_to_html_full (input, flags, 0);
 }
@@ -506,7 +516,8 @@ struct {
 gint num_url_tests = G_N_ELEMENTS (url_tests);
 
 gint
-main (gint argc, gchar **argv)
+main (gint argc,
+      gchar **argv)
 {
 	gint i, errors = 0;
 	gchar *html, *url, *p;
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index afb879a4c2..894382e047 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -136,7 +136,9 @@ e_icon_factory_get_icon (const gchar *icon_name,
  * Returns: a scaled #GdkPixbuf
  **/
 GdkPixbuf *
-e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf, gint width, gint height)
+e_icon_factory_pixbuf_scale (GdkPixbuf *pixbuf,
+                             gint width,
+                             gint height)
 {
 	g_return_val_if_fail (pixbuf != NULL, NULL);
 
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 4b55895e66..ab3afc9f33 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -257,7 +257,8 @@ e_import_status (EImport *import,
  * no longer needed.
  **/
 GSList *
-e_import_get_importers (EImport *emp, EImportTarget *target)
+e_import_get_importers (EImport *emp,
+                        EImportTarget *target)
 {
 	GSList *importers = NULL;
 	GList *link;
@@ -328,7 +329,9 @@ e_import_class_add_importer (EImportClass *class,
  * classes will define the actual content of the target.
  **/
 gpointer
-e_import_target_new (EImport *ep, gint type, gsize size)
+e_import_target_new (EImport *ep,
+                     gint type,
+                     gsize size)
 {
 	EImportTarget *t;
 
@@ -355,7 +358,8 @@ e_import_target_new (EImport *ep, gint type, gsize size)
  * free custom targets.
  **/
 void
-e_import_target_free (EImport *ep, gpointer o)
+e_import_target_free (EImport *ep,
+                      gpointer o)
 {
 	EImportTarget *t = o;
 
@@ -388,27 +392,26 @@ e_import_target_new_home (EImport *import)
 /* Import menu plugin handler */
 
 /*
-<e-plugin
-  class="org.gnome.mail.plugin.import:1.0"
-  id="org.gnome.mail.plugin.import.item:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  name="imap"
-  description="IMAP4 and IMAP4v1 mail store">
-  <hook class="org.gnome.mail.importMenu:1.0"
-        handler="HandleImport">
-  <menu id="any" target="select">
-   <item
-    type="item|toggle|radio|image|submenu|bar"
-    active
-    path="foo/bar"
-    label="label"
-    icon="foo"
-    activate="ep_view_emacs"/>
-  </menu>
-  </extension>
-
-*/
+ * <e-plugin
+ *   class="org.gnome.mail.plugin.import:1.0"
+ *   id="org.gnome.mail.plugin.import.item:1.0"
+ *   type="shlib"
+ *   location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
+ *   name="imap"
+ *   description="IMAP4 and IMAP4v1 mail store">
+ *   <hook class="org.gnome.mail.importMenu:1.0"
+ *         handler="HandleImport">
+ *   <menu id="any" target="select">
+ *    <item
+ *     type="item|toggle|radio|image|submenu|bar"
+ *     active
+ *     path="foo/bar"
+ *     label="label"
+ *     icon="foo"
+ *     activate="ep_view_emacs"/>
+ *   </menu>
+ * </e-plugin>
+ */
 
 #define emph ((EImportHook *)eph)
 
@@ -472,7 +475,8 @@ eih_cancel (EImport *ei,
 }
 
 static void
-eih_free_importer (EImportImporter *im, gpointer data)
+eih_free_importer (EImportImporter *im,
+                   gpointer data)
 {
 	EImportHookImporter *ihook = (EImportHookImporter *) im;
 
@@ -483,7 +487,8 @@ eih_free_importer (EImportImporter *im, gpointer data)
 }
 
 static struct _EImportHookImporter *
-emph_construct_importer (EPluginHook *eph, xmlNodePtr root)
+emph_construct_importer (EPluginHook *eph,
+                         xmlNodePtr root)
 {
 	struct _EImportHookImporter *item;
 	EImportHookTargetMap *map;
@@ -530,7 +535,9 @@ error:
 }
 
 static gint
-emph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
+emph_construct (EPluginHook *eph,
+                EPlugin *ep,
+                xmlNodePtr root)
 {
 	xmlNodePtr node;
 	EImportClass *class;
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 4fc3294e3b..9d0eb5127a 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -242,7 +242,7 @@ EImportTargetHome *
 /* import plugin target, they are closely integrated */
 
 /* To implement a basic import plugin, you just need to subclass
-   this and initialise the class target type tables */
+ * this and initialise the class target type tables */
 
 #include "e-util/e-plugin.h"
 
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 2ce5a6717c..af9327f471 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -49,7 +49,8 @@
 #define TEMP_SCAN (60)
 
 static gint
-expire_dir_rec (const gchar *base, time_t now)
+expire_dir_rec (const gchar *base,
+                time_t now)
 {
 	GDir *dir;
 	const gchar *d;
@@ -157,7 +158,7 @@ get_dir (gboolean make)
 	d(printf("temp dir '%s'\n", path ? path->str : "(null)"));
 
 	/* fire off an expiry attempt no more often than TEMP_SCAN seconds */
-	if (path && (last+TEMP_SCAN) < now) {
+	if (path && (last + TEMP_SCAN) < now) {
 		last = now;
 		expire_dir_rec (path->str, now);
 	}
diff --git a/e-util/e-plugin-util.c b/e-util/e-plugin-util.c
index aa1b233754..7fd343d4b1 100644
--- a/e-util/e-plugin-util.c
+++ b/e-util/e-plugin-util.c
@@ -35,7 +35,8 @@
 #define EPU_CHECK_FALSE "epu-check-false-value"
 
 static gboolean
-epu_is_uri_proto (const gchar *uri, const gchar *protocol)
+epu_is_uri_proto (const gchar *uri,
+                  const gchar *protocol)
 {
 	gboolean res;
 
@@ -60,7 +61,8 @@ epu_is_uri_proto (const gchar *uri, const gchar *protocol)
  * Returns: whether given source's uri is of the given protocol.
  **/
 gboolean
-e_plugin_util_is_source_proto (ESource *source, const gchar *protocol)
+e_plugin_util_is_source_proto (ESource *source,
+                               const gchar *protocol)
 {
 	gchar *uri;
 	gboolean res;
@@ -85,7 +87,8 @@ e_plugin_util_is_source_proto (ESource *source, const gchar *protocol)
  * Returns: whether given groups' base uri is of the given protocol.
  **/
 gboolean
-e_plugin_util_is_group_proto (ESourceGroup *group, const gchar *protocol)
+e_plugin_util_is_group_proto (ESourceGroup *group,
+                              const gchar *protocol)
 {
 	g_return_val_if_fail (E_IS_SOURCE_GROUP (group), FALSE);
 	g_return_val_if_fail (protocol != NULL, FALSE);
@@ -158,7 +161,9 @@ e_plugin_util_uri_no_proto (SoupURI *uri)
 }
 
 static void
-epu_update_source_property (ESource *source, GObject *object, const gchar *value)
+epu_update_source_property (ESource *source,
+                            GObject *object,
+                            const gchar *value)
 {
 	const gchar *property_name;
 
@@ -172,7 +177,8 @@ epu_update_source_property (ESource *source, GObject *object, const gchar *value
 }
 
 static void
-epu_entry_changed_cb (GObject *entry, ESource *source)
+epu_entry_changed_cb (GObject *entry,
+                      ESource *source)
 {
 	g_return_if_fail (GTK_IS_ENTRY (entry));
 
@@ -180,7 +186,8 @@ epu_entry_changed_cb (GObject *entry, ESource *source)
 }
 
 static void
-epu_check_toggled_cb (GObject *button, ESource *source)
+epu_check_toggled_cb (GObject *button,
+                      ESource *source)
 {
 	const gchar *true_value, *false_value;
 
@@ -208,7 +215,10 @@ epu_check_toggled_cb (GObject *button, ESource *source)
  * Returns: pointer to newly added #GtkEntry
  **/
 GtkWidget *
-e_plugin_util_add_entry (GtkWidget *parent, const gchar *label, ESource *source, const gchar *source_property)
+e_plugin_util_add_entry (GtkWidget *parent,
+                         const gchar *label,
+                         ESource *source,
+                         const gchar *source_property)
 {
 	GtkWidget *entry, *lbl = NULL;
 	const gchar *value;
@@ -254,7 +264,9 @@ e_plugin_util_add_entry (GtkWidget *parent, const gchar *label, ESource *source,
 
 	if (source) {
 		g_object_set_data_full (G_OBJECT (entry), EPU_SP_NAME, g_strdup (source_property), g_free);
-		g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (epu_entry_changed_cb), source);
+		g_signal_connect (
+			entry, "changed",
+			G_CALLBACK (epu_entry_changed_cb), source);
 	}
 
 	return entry;
@@ -278,7 +290,12 @@ e_plugin_util_add_entry (GtkWidget *parent, const gchar *label, ESource *source,
  * Returns: pointer to newly added #GtkCheckButton
  **/
 GtkWidget *
-e_plugin_util_add_check (GtkWidget *parent, const gchar *label, ESource *source, const gchar *source_property, const gchar *true_value, const gchar *false_value)
+e_plugin_util_add_check (GtkWidget *parent,
+                         const gchar *label,
+                         ESource *source,
+                         const gchar *source_property,
+                         const gchar *true_value,
+                         const gchar *false_value)
 {
 	GtkWidget *check;
 	const gchar *value;
@@ -318,14 +335,18 @@ e_plugin_util_add_check (GtkWidget *parent, const gchar *label, ESource *source,
 		g_object_set_data_full (G_OBJECT (check), EPU_SP_NAME, g_strdup (source_property), g_free);
 		g_object_set_data_full (G_OBJECT (check), EPU_CHECK_TRUE, g_strdup (true_value), g_free);
 		g_object_set_data_full (G_OBJECT (check), EPU_CHECK_FALSE, g_strdup (false_value), g_free);
-		g_signal_connect (G_OBJECT (check), "toggled", G_CALLBACK (epu_check_toggled_cb), source);
+		g_signal_connect (
+			check, "toggled",
+			G_CALLBACK (epu_check_toggled_cb), source);
 	}
 
 	return check;
 }
 
 static void
-epu_update_refresh_value (GtkWidget *spin, GtkWidget *combobox, ESource *source)
+epu_update_refresh_value (GtkWidget *spin,
+                          GtkWidget *combobox,
+                          ESource *source)
 {
 	gchar *value;
 	gint setting = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
@@ -356,7 +377,8 @@ epu_update_refresh_value (GtkWidget *spin, GtkWidget *combobox, ESource *source)
 }
 
 static void
-epu_refresh_spin_changed_cb (GtkWidget *spin, ESource *source)
+epu_refresh_spin_changed_cb (GtkWidget *spin,
+                             ESource *source)
 {
 	g_return_if_fail (spin != NULL);
 	g_return_if_fail (GTK_IS_SPIN_BUTTON (spin));
@@ -365,7 +387,8 @@ epu_refresh_spin_changed_cb (GtkWidget *spin, ESource *source)
 }
 
 static void
-epu_refresh_combo_changed_cb (GtkWidget *combobox, ESource *source)
+epu_refresh_combo_changed_cb (GtkWidget *combobox,
+                              ESource *source)
 {
 	g_return_if_fail (combobox != NULL);
 	g_return_if_fail (GTK_IS_COMBO_BOX (combobox));
@@ -387,7 +410,10 @@ epu_refresh_combo_changed_cb (GtkWidget *combobox, ESource *source)
  * Returns: a new refresh control widget
  **/
 GtkWidget *
-e_plugin_util_add_refresh (GtkWidget *parent, const gchar *label, ESource *source, const gchar *source_property)
+e_plugin_util_add_refresh (GtkWidget *parent,
+                           const gchar *label,
+                           ESource *source,
+                           const gchar *source_property)
 {
 	GtkWidget *lbl = NULL, *hbox, *spin, *combo;
 	const gchar *value;
@@ -457,8 +483,12 @@ e_plugin_util_add_refresh (GtkWidget *parent, const gchar *label, ESource *sourc
 	g_object_set_data (G_OBJECT (spin), "refresh-combo", combo);
 	g_object_set_data (G_OBJECT (hbox), "refresh-spin", spin);
 	g_object_set_data (G_OBJECT (hbox), "refresh-combo", combo);
-	g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (epu_refresh_combo_changed_cb), source);
-	g_signal_connect (G_OBJECT (spin), "value-changed", G_CALLBACK (epu_refresh_spin_changed_cb), source);
+	g_signal_connect (
+		combo, "changed",
+		G_CALLBACK (epu_refresh_combo_changed_cb), source);
+	g_signal_connect (
+		spin, "value-changed",
+		G_CALLBACK (epu_refresh_spin_changed_cb), source);
 
 	if (parent)
 		gtk_table_attach (GTK_TABLE (parent), hbox, 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 52bbe101cb..17650f045a 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -40,29 +40,29 @@
 #define phd(x)
 
 /*
-<camel-plugin
-  class="org.gnome.camel.plugin.provider:1.0"
-  id="org.gnome.camel.provider.imap:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
-  factory="camel_imap_provider_new">
- <name>imap</name>
- <description>IMAP4 and IMAP4v1 mail store</description>
- <class-data class="org.gnome.camel.plugin.provider:1.0"
-   protocol="imap"
-   domain="mail"
-   flags="remote,source,storage,ssl"/>
-</camel-plugin>
-
-<camel-plugin
-  class="org.gnome.camel.plugin.sasl:1.0"
-  id="org.gnome.camel.sasl.plain:1.0"
-  type="shlib"
-  location="/opt/gnome2/lib/camel/1.0/libcamelsasl.so"
-  factory="camel_sasl_plain_new">
- <name>PLAIN</name>
- <description>SASL PLAIN authentication mechanism</description>
-</camel-plugin>
+ * <camel-plugin
+ *   class="org.gnome.camel.plugin.provider:1.0"
+ *   id="org.gnome.camel.provider.imap:1.0"
+ *   type="shlib"
+ *   location="/opt/gnome2/lib/camel/1.0/libcamelimap.so"
+ *   factory="camel_imap_provider_new">
+ *  <name>imap</name>
+ *  <description>IMAP4 and IMAP4v1 mail store</description>
+ *  <class-data class="org.gnome.camel.plugin.provider:1.0"
+ *    protocol="imap"
+ *    domain="mail"
+ *    flags="remote,source,storage,ssl"/>
+ * </camel-plugin>
+ * 
+ * <camel-plugin
+ *   class="org.gnome.camel.plugin.sasl:1.0"
+ *   id="org.gnome.camel.sasl.plain:1.0"
+ *   type="shlib"
+ *   location="/opt/gnome2/lib/camel/1.0/libcamelsasl.so"
+ *   factory="camel_sasl_plain_new">
+ *  <name>PLAIN</name>
+ *  <description>SASL PLAIN authentication mechanism</description>
+ * </camel-plugin>
 */
 
 /* EPlugin stuff */
@@ -105,7 +105,8 @@ ep_check_enabled (const gchar *id)
 }
 
 static void
-ep_set_enabled (const gchar *id, gint state)
+ep_set_enabled (const gchar *id,
+                gint state)
 {
 	GConfClient *client;
 
@@ -133,7 +134,8 @@ ep_set_enabled (const gchar *id, gint state)
 }
 
 static gint
-ep_construct (EPlugin *ep, xmlNodePtr root)
+ep_construct (EPlugin *ep,
+              xmlNodePtr root)
 {
 	xmlNodePtr node;
 	gint res = -1;
@@ -159,7 +161,7 @@ ep_construct (EPlugin *ep, xmlNodePtr root)
 	node = root->children;
 	while (node) {
 		if (strcmp((gchar *)node->name, "hook") == 0) {
-			struct _EPluginHook *hook;
+			EPluginHook *hook;
 			EPluginHookClass *type;
 			gchar *class = e_plugin_xml_prop(node, "class");
 
@@ -213,7 +215,8 @@ fail:
 }
 
 static void
-ep_enable (EPlugin *ep, gint state)
+ep_enable (EPlugin *ep,
+           gint state)
 {
 	GSList *iter;
 
@@ -328,7 +331,8 @@ e_plugin_init (EPlugin *ep)
 }
 
 static EPlugin *
-ep_load_plugin (xmlNodePtr root, struct _plugin_doc *pdoc)
+ep_load_plugin (xmlNodePtr root,
+                struct _plugin_doc *pdoc)
 {
 	gchar *prop, *id;
 	EPluginClass *class;
@@ -375,7 +379,8 @@ ep_load_plugin (xmlNodePtr root, struct _plugin_doc *pdoc)
 }
 
 static gint
-ep_load (const gchar *filename, gint load_level)
+ep_load (const gchar *filename,
+         gint load_level)
 {
 	xmlDocPtr doc;
 	xmlNodePtr root;
@@ -545,8 +550,8 @@ e_plugin_load_plugins (void)
 		GCONF_VALUE_STRING, NULL);
 	g_object_unref (client);
 
-	for (i=0; i < 3; i++) {
-		for (l = ep_path;l;l = g_slist_next (l)) {
+	for (i = 0; i < 3; i++) {
+		for (l = ep_path; l; l = g_slist_next (l)) {
 			GDir *dir;
 			const gchar *d;
 			gchar *path = l->data;
@@ -577,7 +582,9 @@ e_plugin_load_plugins (void)
 }
 
 static void
-ep_list_plugin (gpointer key, gpointer val, gpointer dat)
+ep_list_plugin (gpointer key,
+                gpointer val,
+                gpointer dat)
 {
 	GSList **l = (GSList **) dat;
 
@@ -615,7 +622,8 @@ e_plugin_list_plugins (void)
  * Return value: The return from the construct virtual method.
  **/
 gint
-e_plugin_construct (EPlugin *ep, xmlNodePtr root)
+e_plugin_construct (EPlugin *ep,
+                    xmlNodePtr root)
 {
 	EPluginClass *class;
 
@@ -641,7 +649,9 @@ e_plugin_construct (EPlugin *ep, xmlNodePtr root)
  * Return value: The return of the plugin invocation.
  **/
 gpointer
-e_plugin_invoke (EPlugin *ep, const gchar *name, gpointer data)
+e_plugin_invoke (EPlugin *ep,
+                 const gchar *name,
+                 gpointer data)
 {
 	EPluginClass *class;
 
@@ -668,7 +678,8 @@ e_plugin_invoke (EPlugin *ep, const gchar *name, gpointer data)
  * Return value: the symbol value, or %NULL if not found
  **/
 gpointer
-e_plugin_get_symbol (EPlugin *ep, const gchar *name)
+e_plugin_get_symbol (EPlugin *ep,
+                     const gchar *name)
 {
 	EPluginClass *class;
 
@@ -690,7 +701,8 @@ e_plugin_get_symbol (EPlugin *ep, const gchar *name)
  * THIS IS NOT FULLY IMPLEMENTED YET
  **/
 void
-e_plugin_enable (EPlugin *ep, gint state)
+e_plugin_enable (EPlugin *ep,
+                 gint state)
 {
 	EPluginClass *class;
 
@@ -741,7 +753,8 @@ e_plugin_get_configure_widget (EPlugin *ep)
  * such property exists.
  **/
 gchar *
-e_plugin_xml_prop (xmlNodePtr node, const gchar *id)
+e_plugin_xml_prop (xmlNodePtr node,
+                   const gchar *id)
 {
 	xmlChar *xml_prop;
 	gchar *glib_prop = NULL;
@@ -769,7 +782,9 @@ e_plugin_xml_prop (xmlNodePtr node, const gchar *id)
  * such property exists.
  **/
 gchar *
-e_plugin_xml_prop_domain (xmlNodePtr node, const gchar *id, const gchar *domain)
+e_plugin_xml_prop_domain (xmlNodePtr node,
+                          const gchar *id,
+                          const gchar *domain)
 {
 	gchar *p, *out;
 
@@ -797,7 +812,9 @@ e_plugin_xml_prop_domain (xmlNodePtr node, const gchar *id, const gchar *domain)
  * Return value: The value if set, or @def if not.
  **/
 gint
-e_plugin_xml_int (xmlNodePtr node, const gchar *id, gint def)
+e_plugin_xml_int (xmlNodePtr node,
+                  const gchar *id,
+                  gint def)
 {
 	gchar *p = (gchar *) xmlGetProp (node, (const guchar *) id);
 
@@ -845,7 +862,8 @@ e_plugin_xml_content (xmlNodePtr node)
  * Return value: The node content, allocated in GLib memory.
  **/
 gchar *
-e_plugin_xml_content_domain (xmlNodePtr node, const gchar *domain)
+e_plugin_xml_content_domain (xmlNodePtr node,
+                             const gchar *domain)
 {
 	gchar *p, *out;
 
@@ -867,7 +885,9 @@ G_DEFINE_TYPE (
 	G_TYPE_OBJECT)
 
 static gint
-eph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
+eph_construct (EPluginHook *eph,
+               EPlugin *ep,
+               xmlNodePtr root)
 {
 	eph->plugin = ep;
 
@@ -875,7 +895,8 @@ eph_construct (EPluginHook *eph, EPlugin *ep, xmlNodePtr root)
 }
 
 static void
-eph_enable (EPluginHook *eph, gint state)
+eph_enable (EPluginHook *eph,
+            gint state)
 {
 	/* NOOP */
 }
@@ -903,7 +924,8 @@ e_plugin_hook_init (EPluginHook *hook)
  * THIS IS NOT FULY IMEPLEMENTED YET
  **/
 void
-e_plugin_hook_enable (EPluginHook *eph, gint state)
+e_plugin_hook_enable (EPluginHook *eph,
+                      gint state)
 {
 	EPluginHookClass *class;
 
@@ -932,7 +954,7 @@ e_plugin_hook_enable (EPluginHook *eph, gint state)
  **/
 guint32
 e_plugin_hook_mask (xmlNodePtr root,
-                    const struct _EPluginHookTargetKey *map,
+                    const EPluginHookTargetKey *map,
                     const gchar *prop)
 {
 	gchar *val, *p, *start, c;
@@ -952,7 +974,7 @@ e_plugin_hook_mask (xmlNodePtr root,
 		if (start != p) {
 			gint i;
 
-			for (i=0;map[i].key;i++) {
+			for (i = 0; map[i].key; i++) {
 				if (!strcmp (map[i].key, start)) {
 					mask |= map[i].value;
 					break;
@@ -985,7 +1007,7 @@ e_plugin_hook_mask (xmlNodePtr root,
  **/
 guint32
 e_plugin_hook_id (xmlNodePtr root,
-                  const struct _EPluginHookTargetKey *map,
+                  const EPluginHookTargetKey *map,
                   const gchar *prop)
 {
 	gchar *val;
@@ -995,7 +1017,7 @@ e_plugin_hook_id (xmlNodePtr root,
 	if (val == NULL)
 		return ~0;
 
-	for (i=0;map[i].key;i++) {
+	for (i = 0; map[i].key; i++) {
 		if (!strcmp (map[i].key, val)) {
 			xmlFree (val);
 			return map[i].value;
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 057e80d743..1815665134 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -89,7 +89,7 @@ struct _EPlugin {
 
 	guint32 flags;
 
-	guint enabled:1;
+	guint enabled : 1;
 };
 
 /**
@@ -273,8 +273,8 @@ guint32		e_plugin_hook_id		(xmlNodePtr root,
 						 const gchar *prop);
 
 /* README: Currently there is only one flag.
-   But we may need more in the future and hence makes
-   sense to keep as an enum */
+ * But we may need more in the future and hence makes
+ * sense to keep as an enum */
 
 typedef enum _EPluginFlags {
 	E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0
diff --git a/e-util/e-poolv.c b/e-util/e-poolv.c
index b30149d617..ca95286f69 100644
--- a/e-util/e-poolv.c
+++ b/e-util/e-poolv.c
@@ -87,7 +87,10 @@ e_poolv_new (guint size)
  * Returns: @poolv
  **/
 EPoolv *
-e_poolv_set (EPoolv *poolv, gint index, gchar *str, gint freeit)
+e_poolv_set (EPoolv *poolv,
+             gint index,
+             gchar *str,
+             gint freeit)
 {
 	g_return_val_if_fail (poolv != NULL, NULL);
 	g_return_val_if_fail (index >= 0 && index < poolv->length, NULL);
@@ -126,7 +129,8 @@ e_poolv_set (EPoolv *poolv, gint index, gchar *str, gint freeit)
  * Returns: string at that index.
  **/
 const gchar *
-e_poolv_get (EPoolv *poolv, gint index)
+e_poolv_get (EPoolv *poolv,
+             gint index)
 {
 	g_return_val_if_fail (poolv != NULL, NULL);
 	g_return_val_if_fail (index >= 0 && index < poolv->length, NULL);
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 43c943ac05..1f03cd3305 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -117,7 +117,8 @@ e_signature_list_init (ESignatureList *signature_list)
 }
 
 static GSList *
-add_autogen (ESignatureList *list, GSList *new_sigs)
+add_autogen (ESignatureList *list,
+             GSList *new_sigs)
 {
 	ESignature *autogen;
 
@@ -241,7 +242,8 @@ gconf_signatures_changed (GConfClient *client,
 }
 
 static gpointer
-copy_func (gconstpointer data, gpointer closure)
+copy_func (gconstpointer data,
+           gpointer closure)
 {
 	GObject *object = (GObject *) data;
 
@@ -251,7 +253,8 @@ copy_func (gconstpointer data, gpointer closure)
 }
 
 static void
-free_func (gpointer data, gpointer closure)
+free_func (gpointer data,
+           gpointer closure)
 {
 	g_object_unref (data);
 }
@@ -285,7 +288,8 @@ e_signature_list_new (GConfClient *gconf)
 }
 
 void
-e_signature_list_construct (ESignatureList *signature_list, GConfClient *gconf)
+e_signature_list_construct (ESignatureList *signature_list,
+                            GConfClient *gconf)
 {
 	g_return_if_fail (GCONF_IS_CLIENT (gconf));
 
@@ -359,7 +363,8 @@ e_signature_list_save (ESignatureList *signature_list)
  * event.
  **/
 void
-e_signature_list_add (ESignatureList *signature_list, ESignature *signature)
+e_signature_list_add (ESignatureList *signature_list,
+                      ESignature *signature)
 {
 	e_list_append ((EList *) signature_list, signature);
 	g_signal_emit (signature_list, signals[SIGNATURE_ADDED], 0, signature);
@@ -373,7 +378,8 @@ e_signature_list_add (ESignatureList *signature_list, ESignature *signature)
  * Signal that the details of an signature have changed.
  **/
 void
-e_signature_list_change (ESignatureList *signature_list, ESignature *signature)
+e_signature_list_change (ESignatureList *signature_list,
+                         ESignature *signature)
 {
 	/* maybe the signature should do this itself ... */
 	g_signal_emit (signature_list, signals[SIGNATURE_CHANGED], 0, signature);
@@ -389,7 +395,8 @@ e_signature_list_change (ESignatureList *signature_list, ESignature *signature)
  * then reset the default to the first signature.
  **/
 void
-e_signature_list_remove (ESignatureList *signature_list, ESignature *signature)
+e_signature_list_remove (ESignatureList *signature_list,
+                         ESignature *signature)
 {
 	/* not sure if need to ref but no harm */
 	g_object_ref (signature);
@@ -417,7 +424,7 @@ e_signature_list_find_by_name (ESignatureList *signature_list,
 	g_return_val_if_fail (E_IS_SIGNATURE_LIST (signature_list), NULL);
 
 	/* this could use a callback for more flexibility ...
-	   ... but this makes the common cases easier */
+	 * ... but this makes the common cases easier */
 
 	if (signature_name == NULL)
 		return NULL;
@@ -461,7 +468,7 @@ e_signature_list_find_by_uid (ESignatureList *signature_list,
 	g_return_val_if_fail (E_IS_SIGNATURE_LIST (signature_list), NULL);
 
 	/* this could use a callback for more flexibility ...
-	   ... but this makes the common cases easier */
+	 * ... but this makes the common cases easier */
 
 	if (signature_uid == NULL)
 		return NULL;
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 434ba1c4b4..185378d565 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -404,7 +404,8 @@ e_signature_uid_from_xml (const gchar *xml)
  * Returns: %TRUE if the signature was loaded or %FALSE otherwise
  **/
 gboolean
-e_signature_set_from_xml (ESignature *signature, const gchar *xml)
+e_signature_set_from_xml (ESignature *signature,
+                          const gchar *xml)
 {
 	gboolean changed = FALSE;
 	xmlNodePtr node, cur;
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 074d45d639..b36eb06007 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -55,7 +55,9 @@ static gboolean	esa_needs_sorting		(ESorter *esa);
 #define ESA_NEEDS_SORTING(esa) (((ESorterArray *) (esa))->compare != NULL)
 
 static gint
-esort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
+esort_callback (gconstpointer data1,
+                gconstpointer data2,
+                gpointer user_data)
 {
 	ESorterArray *esa = user_data;
 	gint ret_val;
@@ -125,7 +127,8 @@ esa_backsort (ESorterArray *esa)
 }
 
 static gint
-esa_model_to_sorted (ESorter *es, gint row)
+esa_model_to_sorted (ESorter *es,
+                     gint row)
 {
 	ESorterArray *esa = E_SORTER_ARRAY (es);
 
@@ -142,7 +145,8 @@ esa_model_to_sorted (ESorter *es, gint row)
 }
 
 static gint
-esa_sorted_to_model (ESorter *es, gint row)
+esa_sorted_to_model (ESorter *es,
+                     gint row)
 {
 	ESorterArray *esa = (ESorterArray *) es;
 
@@ -159,7 +163,9 @@ esa_sorted_to_model (ESorter *es, gint row)
 }
 
 static void
-esa_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
+esa_get_model_to_sorted_array (ESorter *es,
+                               gint **array,
+                               gint *count)
 {
 	ESorterArray *esa = E_SORTER_ARRAY (es);
 	if (array || count) {
@@ -173,7 +179,9 @@ esa_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
 }
 
 static void
-esa_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
+esa_get_sorted_to_model_array (ESorter *es,
+                               gint **array,
+                               gint *count)
 {
 	ESorterArray *esa = E_SORTER_ARRAY (es);
 	if (array || count) {
@@ -204,14 +212,16 @@ e_sorter_array_clean (ESorterArray *esa)
 }
 
 void
-e_sorter_array_set_count  (ESorterArray *esa, gint count)
+e_sorter_array_set_count (ESorterArray *esa,
+                          gint count)
 {
 	e_sorter_array_clean (esa);
 	esa->rows = count;
 }
 
 void
-e_sorter_array_append  (ESorterArray *esa, gint count)
+e_sorter_array_append (ESorterArray *esa,
+                       gint count)
 {
 	gint i;
 	g_free (esa->backsorted);
@@ -239,10 +249,10 @@ e_sorter_array_append  (ESorterArray *esa, gint count)
 }
 
 ESorterArray *
-e_sorter_array_construct  (ESorterArray *esa,
-			   ECreateCmpCacheFunc create_cmp_cache,
-			   ECompareRowsFunc  compare,
-			   gpointer      closure)
+e_sorter_array_construct (ESorterArray *esa,
+                          ECreateCmpCacheFunc create_cmp_cache,
+                          ECompareRowsFunc compare,
+                          gpointer closure)
 {
 	esa->create_cmp_cache = create_cmp_cache;
 	esa->compare = compare;
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 9e255e89f2..de10916634 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -69,24 +69,30 @@ e_sorter_new (void)
 }
 
 static gint
-es_model_to_sorted (ESorter *es, gint row)
+es_model_to_sorted (ESorter *es,
+                    gint row)
 {
 	return row;
 }
 
 static gint
-es_sorted_to_model (ESorter *es, gint row)
+es_sorted_to_model (ESorter *es,
+                    gint row)
 {
 	return row;
 }
 
 static void
-es_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
+es_get_model_to_sorted_array (ESorter *es,
+                              gint **array,
+                              gint *count)
 {
 }
 
 static void
-es_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
+es_get_sorted_to_model_array (ESorter *es,
+                              gint **array,
+                              gint *count)
 {
 }
 
@@ -97,7 +103,8 @@ es_needs_sorting (ESorter *es)
 }
 
 gint
-e_sorter_model_to_sorted (ESorter *es, gint row)
+e_sorter_model_to_sorted (ESorter *es,
+                          gint row)
 {
 	g_return_val_if_fail (es != NULL, -1);
 	g_return_val_if_fail (row >= 0, -1);
@@ -109,7 +116,8 @@ e_sorter_model_to_sorted (ESorter *es, gint row)
 }
 
 gint
-e_sorter_sorted_to_model (ESorter *es, gint row)
+e_sorter_sorted_to_model (ESorter *es,
+                          gint row)
 {
 	g_return_val_if_fail (es != NULL, -1);
 	g_return_val_if_fail (row >= 0, -1);
@@ -121,7 +129,9 @@ e_sorter_sorted_to_model (ESorter *es, gint row)
 }
 
 void
-e_sorter_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
+e_sorter_get_model_to_sorted_array (ESorter *es,
+                                    gint **array,
+                                    gint *count)
 {
 	g_return_if_fail (es != NULL);
 
@@ -130,7 +140,9 @@ e_sorter_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
 }
 
 void
-e_sorter_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
+e_sorter_get_sorted_to_model_array (ESorter *es,
+                                    gint **array,
+                                    gint *count)
 {
 	g_return_if_fail (es != NULL);
 
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 84e7c9e148..d5267d5b30 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -111,7 +111,7 @@ e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass
 {
   ETextEventProcessorClass *processor_class;
 
-  processor_class = (ETextEventProcessorClass*) klass;
+  processor_class = (ETextEventProcessorClass *) klass;
 
   processor_class->event = e_text_event_processor_emacs_like_event;
 }
@@ -131,9 +131,9 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep,
 	/* Warning from the Intel compiler here:
 	 * e-text-event-processor-emacs-like.c(136): warning #589:
 	 *   transfer of control bypasses initialization of:
-         *   variable "key" (declared at line 194)
-         *  switch (event->type) {
-         *  ^
+ *       *   variable "key" (declared at line 194)
+ *       *  switch (event->type) {
+ *       *  ^
 	 */
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index e5624f917a..e8594620c2 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -30,11 +30,11 @@
 #include "e-util.h"
 
 static void e_text_event_processor_set_property (GObject *object,
-						 guint prop_id,
+						 guint property_id,
 						 const GValue *value,
 						 GParamSpec *pspec);
 static void e_text_event_processor_get_property (GObject *object,
-						 guint prop_id,
+						 guint property_id,
 						 GValue *value,
 						 GParamSpec *pspec);
 
@@ -61,7 +61,7 @@ e_text_event_processor_class_init (ETextEventProcessorClass *klass)
 {
 	GObjectClass *object_class;
 
-	object_class = (GObjectClass*) klass;
+	object_class = (GObjectClass *) klass;
 
 	object_class->set_property = e_text_event_processor_set_property;
 	object_class->get_property = e_text_event_processor_get_property;
@@ -107,13 +107,13 @@ e_text_event_processor_handle_event (ETextEventProcessor *tep,
 /* Set_arg handler for the text item */
 static void
 e_text_event_processor_set_property (GObject *object,
-				     guint prop_id,
-				     const GValue *value,
-				     GParamSpec *pspec)
+                                     guint property_id,
+                                     const GValue *value,
+                                     GParamSpec *pspec)
 {
 	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_ALLOW_NEWLINES:
 		tep->allow_newlines = g_value_get_boolean (value);
 		break;
@@ -125,18 +125,18 @@ e_text_event_processor_set_property (GObject *object,
 /* Get_arg handler for the text item */
 static void
 e_text_event_processor_get_property (GObject *object,
-				     guint prop_id,
-				     GValue *value,
-				     GParamSpec *pspec)
+                                     guint property_id,
+                                     GValue *value,
+                                     GParamSpec *pspec)
 {
 	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_ALLOW_NEWLINES:
 		g_value_set_boolean (value, tep->allow_newlines);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index de22525898..d92244107a 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -49,7 +49,9 @@
 /* FIXME: this has not been ported fully yet - non ASCII people beware. */
 
 gchar *
-e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string)
+e_utf8_from_gtk_event_key (GtkWidget *widget,
+                           guint keyval,
+                           const gchar *string)
 {
 	gint unival;
 	gchar *utf;
@@ -73,7 +75,9 @@ e_utf8_from_gtk_event_key (GtkWidget *widget, guint keyval, const gchar *string)
 }
 
 gchar *
-e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
+e_utf8_from_iconv_string_sized (iconv_t ic,
+                                const gchar *string,
+                                gint bytes)
 {
 	gchar *new, *ob;
 	const gchar *ib;
@@ -85,7 +89,7 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 		gint i;
 		/* iso-8859-1 */
 		ib = (gchar *) string;
-		new = ob = (gchar *) g_new (unsigned char, bytes * 2 + 1);
+		new = ob = (gchar *) g_new (guchar, bytes * 2 + 1);
 		for (i = 0; i < (bytes); i++) {
 			ob += e_unichar_to_utf8 (ib[i], ob);
 		}
@@ -124,7 +128,9 @@ e_utf8_from_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 }
 
 gchar *
-e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
+e_utf8_to_iconv_string_sized (iconv_t ic,
+                              const gchar *string,
+                              gint bytes)
 {
 	gchar *new, *ob;
 	const gchar *ib;
@@ -137,7 +143,7 @@ e_utf8_to_iconv_string_sized (iconv_t ic, const gchar *string, gint bytes)
 		const gchar *u;
 		gunichar uc;
 
-		new = (gchar *) g_new (unsigned char, bytes * 4 + 1);
+		new = (gchar *) g_new (guchar, bytes * 4 + 1);
 		u = string;
 		len = 0;
 
@@ -201,7 +207,8 @@ e_utf8_to_charset_string_sized (const gchar *charset,
 }
 
 gchar *
-e_utf8_from_locale_string_sized (const gchar *string, gint bytes)
+e_utf8_from_locale_string_sized (const gchar *string,
+                                 gint bytes)
 {
 	iconv_t ic;
 	gchar *ret;
@@ -256,7 +263,8 @@ e_utf8_ensure_valid (const gchar *string)
  **/
 
 gint
-e_unichar_to_utf8 (gint c, gchar *outbuf)
+e_unichar_to_utf8 (gint c,
+                   gchar *outbuf)
 {
   gsize len = 0;
   gint first;
@@ -307,10 +315,11 @@ e_unichar_to_utf8 (gint c, gchar *outbuf)
 }
 
 gchar *
-e_unicode_get_utf8 (const gchar *text, gunichar *out)
+e_unicode_get_utf8 (const gchar *text,
+                    gunichar *out)
 {
 	*out = g_utf8_get_char (text);
-	return (*out == (gunichar)-1) ? NULL : g_utf8_next_char (text);
+	return (*out == (gunichar) - 1) ? NULL : g_utf8_next_char (text);
 }
 
 gchar *
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 4b47f64918..8ededeeb9d 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -566,7 +566,8 @@ e_str_without_underscores (const gchar *string)
 }
 
 gint
-e_str_compare (gconstpointer x, gconstpointer y)
+e_str_compare (gconstpointer x,
+               gconstpointer y)
 {
 	if (x == NULL || y == NULL) {
 		if (x == y)
@@ -579,7 +580,8 @@ e_str_compare (gconstpointer x, gconstpointer y)
 }
 
 gint
-e_str_case_compare (gconstpointer x, gconstpointer y)
+e_str_case_compare (gconstpointer x,
+                    gconstpointer y)
 {
 	gchar *cx, *cy;
 	gint res;
@@ -603,7 +605,8 @@ e_str_case_compare (gconstpointer x, gconstpointer y)
 }
 
 gint
-e_collate_compare (gconstpointer x, gconstpointer y)
+e_collate_compare (gconstpointer x,
+                   gconstpointer y)
 {
 	if (x == NULL || y == NULL) {
 		if (x == y)
@@ -616,7 +619,8 @@ e_collate_compare (gconstpointer x, gconstpointer y)
 }
 
 gint
-e_int_compare (gconstpointer x, gconstpointer y)
+e_int_compare (gconstpointer x,
+               gconstpointer y)
 {
 	gint nx = GPOINTER_TO_INT (x);
 	gint ny = GPOINTER_TO_INT (y);
@@ -727,13 +731,13 @@ e_format_number (gint number)
 }
 
 /* Perform a binary search for key in base which has nmemb elements
-   of size bytes each.  The comparisons are done by (*compare)().  */
+ * of size bytes each.  The comparisons are done by (*compare)().  */
 void
 e_bsearch (gconstpointer key,
            gconstpointer base,
            gsize nmemb,
            gsize size,
-	   ESortCompareFunc compare,
+           ESortCompareFunc compare,
            gpointer closure,
            gsize *start,
            gsize *end)
@@ -813,7 +817,9 @@ e_bsearch (gconstpointer key,
  */
 
 gsize
-e_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
+e_strftime_fix_am_pm (gchar *str,
+                      gsize max,
+                      const gchar *fmt,
                       const struct tm *tm)
 {
 	gchar buf[10];
@@ -823,7 +829,7 @@ e_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
 
 	if (strstr(fmt, "%p")==NULL && strstr(fmt, "%P")==NULL) {
 		/* No AM/PM involved - can use the fmt string directly */
-		ret=e_strftime (str, max, fmt, tm);
+		ret = e_strftime (str, max, fmt, tm);
 	} else {
 		/* Get the AM/PM symbol from the locale */
 		e_strftime (buf, 10, "%p", tm);
@@ -831,11 +837,11 @@ e_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
 		if (buf[0]) {
 			/* AM/PM have been defined in the locale
 			 * so we can use the fmt string directly. */
-			ret=e_strftime (str, max, fmt, tm);
+			ret = e_strftime (str, max, fmt, tm);
 		} else {
 			/* No AM/PM defined by locale
 			 * must change to 24 hour clock. */
-			ffmt=g_strdup (fmt);
+			ffmt = g_strdup (fmt);
 			for (sp=ffmt; (sp=strstr(sp, "%l")); sp++) {
 				/* Maybe this should be 'k', but I have never
 				 * seen a 24 clock actually use that format. */
@@ -844,7 +850,7 @@ e_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
 			for (sp=ffmt; (sp=strstr(sp, "%I")); sp++) {
 				sp[1]='H';
 			}
-			ret=e_strftime (str, max, ffmt, tm);
+			ret = e_strftime (str, max, ffmt, tm);
 			g_free (ffmt);
 		}
 	}
@@ -853,7 +859,9 @@ e_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
 }
 
 gsize
-e_utf8_strftime_fix_am_pm (gchar *str, gsize max, const gchar *fmt,
+e_utf8_strftime_fix_am_pm (gchar *str,
+                           gsize max,
+                           const gchar *fmt,
                            const struct tm *tm)
 {
 	gsize sz, ret;
@@ -1004,7 +1012,8 @@ e_get_weekday_name (GDateWeekday weekday,
  * Returns: the gdouble value
  **/
 gdouble
-e_flexible_strtod (const gchar *nptr, gchar **endptr)
+e_flexible_strtod (const gchar *nptr,
+                   gchar **endptr)
 {
 	gchar *fail_pos;
 	gdouble val;
@@ -1032,7 +1041,7 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
 	p = nptr;
 
 	/* Skip leading space */
-	while (isspace ((guchar)*p))
+	while (isspace ((guchar) * p))
 		p++;
 
 	/* Skip leading optional sign */
@@ -1044,40 +1053,40 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
 		p += 2;
 		/* HEX - find the (optional) decimal point */
 
-		while (isxdigit ((guchar)*p))
+		while (isxdigit ((guchar) * p))
 			p++;
 
 		if (*p == '.') {
 			decimal_point_pos = p++;
 
-			while (isxdigit ((guchar)*p))
+			while (isxdigit ((guchar) * p))
 				p++;
 
 			if (*p == 'p' || *p == 'P')
 				p++;
 			if (*p == '+' || *p == '-')
 				p++;
-			while (isdigit ((guchar)*p))
+			while (isdigit ((guchar) * p))
 				p++;
 			end = p;
 		} else if (strncmp (p, decimal_point, decimal_point_len) == 0) {
 			return strtod (nptr, endptr);
 		}
 	} else {
-		while (isdigit ((guchar)*p))
+		while (isdigit ((guchar) * p))
 			p++;
 
 		if (*p == '.') {
 			decimal_point_pos = p++;
 
-			while (isdigit ((guchar)*p))
+			while (isdigit ((guchar) * p))
 				p++;
 
 			if (*p == 'e' || *p == 'E')
 				p++;
 			if (*p == '+' || *p == '-')
 				p++;
-			while (isdigit ((guchar)*p))
+			while (isdigit ((guchar) * p))
 				p++;
 			end = p;
 		} else if (strncmp (p, decimal_point, decimal_point_len) == 0) {
@@ -1143,7 +1152,10 @@ e_flexible_strtod (const gchar *nptr, gchar **endptr)
  * Returns: the pointer to the buffer with the converted string
  **/
 gchar *
-e_ascii_dtostr (gchar *buffer, gint buf_len, const gchar *format, gdouble d)
+e_ascii_dtostr (gchar *buffer,
+                gint buf_len,
+                const gchar *format,
+                gdouble d)
 {
 	struct lconv *locale_data;
 	const gchar *decimal_point;
@@ -1188,15 +1200,15 @@ e_ascii_dtostr (gchar *buffer, gint buf_len, const gchar *format, gdouble d)
 		if (*p == '+' || *p == '-')
 			p++;
 
-		while (isdigit ((guchar)*p))
+		while (isdigit ((guchar) * p))
 			p++;
 
 		if (strncmp (p, decimal_point, decimal_point_len) == 0) {
 			*p = '.';
 			p++;
 			if (decimal_point_len > 1) {
-				rest_len = strlen (p + (decimal_point_len-1));
-				memmove (p, p + (decimal_point_len-1),
+				rest_len = strlen (p + (decimal_point_len - 1));
+				memmove (p, p + (decimal_point_len - 1),
 					 rest_len);
 				p[rest_len] = 0;
 			}
@@ -1274,7 +1286,8 @@ e_file_lock_exists (void)
  *          not be determined
  **/
 gchar *
-e_util_guess_mime_type (const gchar *filename, gboolean localfile)
+e_util_guess_mime_type (const gchar *filename,
+                        gboolean localfile)
 {
 	gchar *mime_type = NULL;
 
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 653b44eb5d..0247f91e27 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -151,7 +151,7 @@ e_xml_get_child_by_name_by_lang_list (const xmlNode *parent,
 		language_names = g_get_language_names ();
 		while (*language_names != NULL)
 			lang_list = g_list_append (
-				(GList *) lang_list, (gchar *)*language_names++);
+				(GList *) lang_list, (gchar *) * language_names++);
 	}
 	return e_xml_get_child_by_name_by_lang_list_with_score
 		(parent,name,
@@ -374,7 +374,8 @@ e_xml_set_double_prop_by_name (xmlNode *parent,
 }
 
 gchar *
-e_xml_get_string_prop_by_name (const xmlNode *parent, const xmlChar *prop_name)
+e_xml_get_string_prop_by_name (const xmlNode *parent,
+                               const xmlChar *prop_name)
 {
 	g_return_val_if_fail (parent != NULL, NULL);
 	g_return_val_if_fail (prop_name != NULL, NULL);
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index 9b0e609560..3de48b6e01 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -183,7 +183,7 @@ new_id (void)
 /* Syncs a value from GConf to an object property */
 static void
 prop_binding_sync_pref_to_prop (PropBinding *binding,
-                                GConfValue  *pref_value)
+                                GConfValue *pref_value)
 {
 	GValue src_value, value;
 
@@ -370,9 +370,9 @@ done:
 /* Called when a GConf value bound to an object property has changed */
 static void
 prop_binding_pref_changed (GConfClient *client,
-                           guint        cnxn_id,
-                           GConfEntry  *entry,
-                           gpointer     user_data)
+                           guint cnxn_id,
+                           GConfEntry *entry,
+                           gpointer user_data)
 {
 	GConfValue *gconf_value;
 	PropBinding *binding;
@@ -419,8 +419,8 @@ prop_binding_perform_scheduled_sync (PropBinding *binding)
 
 /* Called when an object property has changed */
 static void
-prop_binding_prop_changed (GObject     *object,
-                           GParamSpec  *param_spec,
+prop_binding_prop_changed (GObject *object,
+                           GParamSpec *param_spec,
                            PropBinding *binding)
 {
 	if (binding->delayed_mode) {
@@ -482,10 +482,10 @@ prop_binding_object_destroyed (gpointer user_data,
  **/
 guint
 gconf_bridge_bind_property_full (GConfBridge *bridge,
-                                 const gchar  *key,
-                                 GObject     *object,
-                                 const gchar  *prop,
-                                 gboolean     delayed_sync)
+                                 const gchar *key,
+                                 GObject *object,
+                                 const gchar *prop,
+                                 gboolean delayed_sync)
 {
 	GParamSpec *pspec;
 	PropBinding *binding;
@@ -582,7 +582,7 @@ prop_binding_unblock_cb (gpointer hkey,
 }
 
 void
-gconf_bridge_block_property_bindings (GConfBridge  *bridge,
+gconf_bridge_block_property_bindings (GConfBridge *bridge,
                                       const gchar *key)
 {
 	g_return_if_fail (bridge != NULL);
@@ -594,7 +594,7 @@ gconf_bridge_block_property_bindings (GConfBridge  *bridge,
 }
 
 void
-gconf_bridge_unblock_property_bindings (GConfBridge  *bridge,
+gconf_bridge_unblock_property_bindings (GConfBridge *bridge,
                                         const gchar *key)
 {
 	g_return_if_fail (bridge != NULL);
@@ -702,9 +702,9 @@ window_binding_perform_scheduled_sync (WindowBinding *binding)
 
 /* Called when the window han been resized or moved */
 static gboolean
-window_binding_configure_event_cb (GtkWindow         *window,
+window_binding_configure_event_cb (GtkWindow *window,
                                    GdkEventConfigure *event,
-                                   WindowBinding     *binding)
+                                   WindowBinding *binding)
 {
         /* re-postpone by cancel of the previous request */
 	if (binding->sync_timeout_id > 0)
@@ -720,9 +720,9 @@ window_binding_configure_event_cb (GtkWindow         *window,
 
 /* Called when the window state is being changed */
 static gboolean
-window_binding_state_event_cb (GtkWindow           *window,
+window_binding_state_event_cb (GtkWindow *window,
                                GdkEventWindowState *event,
-                               WindowBinding       *binding)
+                               WindowBinding *binding)
 {
 	if (binding->sync_timeout_id > 0)
 		g_source_remove (binding->sync_timeout_id);
@@ -731,7 +731,7 @@ window_binding_state_event_cb (GtkWindow           *window,
 	    && (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) != 0
 	    && (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) == 0) {
 		/* the window was restored from a maximized state; make sure its
-		   width and height is the one user stored before maximization */
+		 * width and height is the one user stored before maximization */
 		gint width, height;
 
 		width = GPOINTER_TO_INT (g_object_get_data (
@@ -760,7 +760,7 @@ window_binding_state_event_cb (GtkWindow           *window,
 
 /* Called when the window is being unmapped */
 static gboolean
-window_binding_unmap_cb (GtkWindow     *window,
+window_binding_unmap_cb (GtkWindow *window,
                          WindowBinding *binding)
 {
         /* Force sync */
@@ -814,10 +814,10 @@ window_binding_window_destroyed (gpointer user_data,
  **/
 guint
 gconf_bridge_bind_window (GConfBridge *bridge,
-                          const gchar  *key_prefix,
-                          GtkWindow   *window,
-                          gboolean     bind_size,
-                          gboolean     bind_pos)
+                          const gchar *key_prefix,
+                          GtkWindow *window,
+                          gboolean bind_size,
+                          gboolean bind_pos)
 {
 	WindowBinding *binding;
 
@@ -985,7 +985,7 @@ window_binding_unbind (WindowBinding *binding)
 /* Fills a GtkListStore with the string list from @value */
 static void
 list_store_binding_sync_pref_to_store (ListStoreBinding *binding,
-                                       GConfValue       *value)
+                                       GConfValue *value)
 {
 	GSList *list, *l;
 	GtkTreeIter iter;
@@ -1071,9 +1071,9 @@ list_store_binding_sync_store_to_pref (ListStoreBinding *binding)
 /* Pref changed: sync */
 static void
 list_store_binding_pref_changed (GConfClient *client,
-                                 guint        cnxn_id,
-                                 GConfEntry  *entry,
-                                 gpointer     user_data)
+                                 guint cnxn_id,
+                                 GConfEntry *entry,
+                                 gpointer user_data)
 {
 	GConfValue *gconf_value;
 	ListStoreBinding *binding;
@@ -1144,8 +1144,8 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding)
  * Return value: The ID of the new binding.
  **/
 guint
-gconf_bridge_bind_string_list_store (GConfBridge  *bridge,
-                                     const gchar   *key,
+gconf_bridge_bind_string_list_store (GConfBridge *bridge,
+                                     const gchar *key,
                                      GtkListStore *list_store)
 {
 	GtkTreeModel *tree_model;
@@ -1301,7 +1301,7 @@ unbind (Binding *binding)
  **/
 void
 gconf_bridge_unbind (GConfBridge *bridge,
-                     guint        binding_id)
+                     guint binding_id)
 {
 	g_return_if_fail (bridge != NULL);
 	g_return_if_fail (binding_id > 0);
@@ -1319,7 +1319,7 @@ gconf_bridge_unbind (GConfBridge *bridge,
 /* This is the same dialog as used in eel */
 static void
 error_handler (GConfClient *client,
-               GError      *error)
+               GError *error)
 {
 	static gboolean shown_dialog = FALSE;