From c2b2e863cb97b6203b1be955a52096166462da8e Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 2 Nov 2010 11:16:48 +0100
Subject: Add forgotten cairo_destroy() calls

---
 widgets/table/e-table-header-utils.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 16e0a1948c..19a493b0f4 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -290,8 +290,10 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 	inner_width = button_width - 2 * (xthick + HEADER_PADDING);
 	inner_height = button_height - 2 * (ythick + HEADER_PADDING);
 
-	if (inner_width < 1 || inner_height < 1)
+	if (inner_width < 1 || inner_height < 1) {
+		cairo_destroy (cr);
 		return; /* nothing fits */
+	}
 
 	inner_x = x + xthick + HEADER_PADDING;
 	inner_y = y + ythick + HEADER_PADDING;
@@ -314,8 +316,10 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		g_return_if_reached ();
 	}
 
-	if (inner_width < 1)
+	if (inner_width < 1) {
+		cairo_destroy (cr);
 		return; /* nothing else fits */
+	}
 
 	layout = build_header_layout (widget, ecol->text);
         pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
-- 
cgit v1.2.3


From 0d4a84a5fe468d3f4c623501ac1943fc1c9f91f8 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Wed, 3 Nov 2010 11:19:28 +0100
Subject: Bug #632768 - Message list not realized when opening new folder

---
 widgets/table/e-tree.c | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 01db243b33..5f0effaac8 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -3637,23 +3637,25 @@ e_tree_set_info_message (ETree *tree, const gchar *info_message)
 	gtk_widget_get_allocation (widget, &allocation);
 
 	if (!tree->priv->info_text) {
-		tree->priv->info_text = gnome_canvas_item_new (
-			GNOME_CANVAS_GROUP (gnome_canvas_root (tree->priv->table_canvas)),
-			e_text_get_type (),
-			"line_wrap", TRUE,
-			"clip", TRUE,
-			"justification", GTK_JUSTIFY_LEFT,
-			"text", info_message,
-			"draw_background", FALSE,
-			"width", (gdouble) allocation.width - 60.0,
-			"clip_width", (gdouble) allocation.width - 60.0,
-			NULL);
+		if (allocation.width > 60) {
+			tree->priv->info_text = gnome_canvas_item_new (
+				GNOME_CANVAS_GROUP (gnome_canvas_root (tree->priv->table_canvas)),
+				e_text_get_type (),
+				"line_wrap", TRUE,
+				"clip", TRUE,
+				"justification", GTK_JUSTIFY_LEFT,
+				"text", info_message,
+				"draw_background", FALSE,
+				"width", (gdouble) allocation.width - 60.0,
+				"clip_width", (gdouble) allocation.width - 60.0,
+				NULL);
 
-		e_canvas_item_move_absolute (tree->priv->info_text, 30, 30);
+			e_canvas_item_move_absolute (tree->priv->info_text, 30, 30);
 
-		tree->priv->info_text_resize_id = g_signal_connect (
-			tree, "size_allocate",
-			G_CALLBACK (tree_size_allocate), tree);
+			tree->priv->info_text_resize_id = g_signal_connect (
+				tree, "size_allocate",
+				G_CALLBACK (tree_size_allocate), tree);
+		}
 	} else
 		gnome_canvas_item_set (tree->priv->info_text, "text", info_message, NULL);
 }
-- 
cgit v1.2.3


From a891b81cfb3430a764dab0d5644114c4dab22297 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 7 Nov 2010 21:13:03 -0500
Subject: Coding style and whitespace cleanup.

---
 widgets/table/e-cell-text.c                |  2 +-
 widgets/table/e-cell-tree.c                |  2 +-
 widgets/table/e-table-field-chooser-item.c |  2 +-
 widgets/table/e-table-header-item.c        |  1 -
 widgets/table/e-table-header-utils.c       |  2 +-
 widgets/table/e-table-item.c               | 10 +++++-----
 6 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 897e02ad19..a718f1d91e 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -734,7 +734,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 			cell_foreground = e_cell_text_get_color (text_view,
 								 color_spec);
 			if (cell_foreground)
-		                gdk_cairo_set_source_color (cr, cell_foreground);
+				gdk_cairo_set_source_color (cr, cell_foreground);
 		}
 	}
 
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index e0de5e047c..5771cbc053 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -649,7 +649,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 		/* now draw our icon if we're expandable */
 		if (expandable) {
 #if GTK_CHECK_VERSION (3, 0, 0)
-		        gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
+			gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
 #error Paint an expander here
 #endif
 		}
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index fb8f2babca..02c86b8136 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -180,7 +180,7 @@ etfci_update (GnomeCanvasItem *item,
               gint flags)
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double x1, y1, x2, y2;
+	gdouble x1, y1, x2, y2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)
 		GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update (
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 43400cae82..28d53ce971 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -969,7 +969,6 @@ ethi_unrealize (GnomeCanvasItem *item)
 
 	gtk_drag_dest_unset (GTK_WIDGET (item->canvas));
 
-
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)
 		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->unrealize)(item);
 }
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 19a493b0f4..56fa44a3c6 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -379,7 +379,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		}
 #endif
                 gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf,
-				             xpos, inner_y + (inner_height - clip_height) / 2);
+					     xpos, inner_y + (inner_height - clip_height) / 2);
                 cairo_paint (cr);
 	} else {
                 pango_layout_set_width (layout, inner_width * PANGO_SCALE);
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index b9d0f63c68..7c45bbe656 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -792,7 +792,7 @@ static void
 eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
-	double dx1, dy1, dx2, dy2;
+	gdouble dx1, dy1, dx2, dy2;
 	cairo_matrix_t i2c;
 
 	dx1 = x0;
@@ -1719,7 +1719,7 @@ eti_unrealize (GnomeCanvasItem *item)
 
 static void
 eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style,
-                    int x1, int y1, int x2, int y2)
+                    gint x1, gint y1, gint x2, gint y2)
 {
         cairo_save (cr);
 
@@ -1746,7 +1746,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 	gint f_x1, f_x2, f_y1, f_y2;
 	gboolean f_found;
 	cairo_matrix_t i2c;
-	double eti_base_x, eti_base_y, lower_right_y, lower_right_x;
+	gdouble eti_base_x, eti_base_y, lower_right_y, lower_right_x;
 	GtkWidget *canvas = GTK_WIDGET (item->canvas);
         GtkStyle *style = gtk_widget_get_style (canvas);
 	gint height_extra = eti->horizontal_draw_grid ? 1 : 0;
@@ -1990,7 +1990,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 		yd += height;
 
 		if (eti->horizontal_draw_grid) {
-		        eti_draw_grid_line (eti, cr, style, eti_base_x - x, yd, eti_base_x + eti->width - x, yd);
+			eti_draw_grid_line (eti, cr, style, eti_base_x - x, yd, eti_base_x + eti->width - x, yd);
 			yd++;
 		}
 	}
@@ -2001,7 +2001,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 		for (col = first_col; col <= last_col; col++) {
 			ETableCol *ecol = e_table_header_get_column (eti->header, col);
 
-		        eti_draw_grid_line (eti, cr, style, xd, y_offset, xd, yd - 1);
+			eti_draw_grid_line (eti, cr, style, xd, y_offset, xd, yd - 1);
 
 			/*
 			 * This looks wierd, but it is to draw the last line
-- 
cgit v1.2.3


From 1ca2b18e67672b7b2ec87c43e99d246a7208943d Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 7 Nov 2010 22:48:23 -0500
Subject: Fix distcheck errors.

---
 widgets/table/Makefile.am | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index b2afc9990e..04ce1c6f66 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -179,13 +179,10 @@ libetable_la_LIBADD =						\
 	$(GNOME_PLATFORM_LIBS)
 
 icons = 			\
-	add-col.xpm		\
 	arrow-down.xpm		\
 	arrow-up.xpm		\
-	add-col.xpm		\
 	check-empty.xpm		\
 	check-filled.xpm	\
-	remove-col.xpm		\
 	tree-expanded.xpm	\
 	tree-unexpanded.xpm
 
-- 
cgit v1.2.3


From abd2711b00f0c036d5a60e8a38bbdc83384f8822 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 10 Nov 2010 12:12:46 -0500
Subject: Drop accessibility support for ECellText.

The accessibility code for ECellText is unmaintained and crashes
constantly.  I'm evicting it from our code base until someone takes
ownership of the libgal accessibility support and deals with it.
---
 widgets/table/Makefile.am            |   2 -
 widgets/table/e-cell-text.c          |   4 -
 widgets/table/gal-a11y-e-cell-text.c | 726 -----------------------------------
 widgets/table/gal-a11y-e-cell-text.h |  63 ---
 4 files changed, 795 deletions(-)
 delete mode 100644 widgets/table/gal-a11y-e-cell-text.c
 delete mode 100644 widgets/table/gal-a11y-e-cell-text.h

(limited to 'widgets/table')

diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 04ce1c6f66..2764c96c81 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -73,7 +73,6 @@ libetable_la_SOURCES = 				\
 	gal-a11y-e-cell.c			\
 	gal-a11y-e-cell-popup.c			\
 	gal-a11y-e-cell-registry.c		\
-	gal-a11y-e-cell-text.c			\
 	gal-a11y-e-cell-toggle.c		\
 	gal-a11y-e-cell-tree.c			\
 	gal-a11y-e-cell-vbox.c			\
@@ -151,7 +150,6 @@ libetableinclude_HEADERS = 			\
 	gal-a11y-e-cell.h			\
 	gal-a11y-e-cell-popup.h			\
 	gal-a11y-e-cell-registry.h		\
-	gal-a11y-e-cell-text.h			\
 	gal-a11y-e-cell-toggle.h		\
 	gal-a11y-e-cell-tree.h			\
 	gal-a11y-e-cell-vbox.h			\
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index a718f1d91e..6ff43f1264 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -44,8 +44,6 @@
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
-#include "gal-a11y-e-cell-registry.h"
-#include "gal-a11y-e-cell-text.h"
 #include "text/e-text.h"
 #include <glib/gi18n.h>
 #include "e-util/e-text-event-processor.h"
@@ -1645,8 +1643,6 @@ e_cell_text_class_init (ECellTextClass *klass)
 			use_ellipsis_default = FALSE;
 		}
 	}
-
-	gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TEXT, gal_a11y_e_cell_text_new);
 }
 
 /* IM Context Callbacks */
diff --git a/widgets/table/gal-a11y-e-cell-text.c b/widgets/table/gal-a11y-e-cell-text.c
deleted file mode 100644
index cc3d6f3b7d..0000000000
--- a/widgets/table/gal-a11y-e-cell-text.c
+++ /dev/null
@@ -1,726 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#include <atk/atk.h>
-
-#include "a11y/gal-a11y-util.h"
-#include "table/e-cell-text.h"
-#include <glib/gi18n.h>
-
-#include "gal-a11y-e-cell-text.h"
-
-#define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yECellTextClass))
-static AtkObjectClass *parent_class;
-#define PARENT_TYPE (gal_a11y_e_cell_get_type ())
-
-/* Static functions */
-static void
-ect_dispose (GObject *object)
-{
-	GObjectClass *g_class;
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (object);
-	GalA11yECellText *gaet = GAL_A11Y_E_CELL_TEXT (object);
-
-	if (gaet->inserted_id != 0) {
-		ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-		if (ect) {
-			g_signal_handler_disconnect (ect, gaet->inserted_id);
-			g_signal_handler_disconnect (ect, gaet->deleted_id);
-		}
-
-		gaet->inserted_id = 0;
-		gaet->deleted_id = 0;
-	}
-
-	g_class = (GObjectClass *)parent_class;
-	if (g_class->dispose)
-		g_class->dispose (object);
-
-}
-
-static gboolean
-ect_check (gpointer a11y)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
-	ETableItem *item = gaec->item;
-
-	g_return_val_if_fail ((gaec->item != NULL), FALSE);
-	g_return_val_if_fail ((gaec->cell_view != NULL), FALSE);
-	g_return_val_if_fail ((gaec->cell_view->ecell != NULL), FALSE);
-
-	if (atk_state_set_contains_state (gaec->state_set, ATK_STATE_DEFUNCT))
-		return FALSE;
-
-	if (gaec->row < 0 || gaec->row >= item->rows
-		|| gaec->view_col <0 || gaec->view_col >= item->cols
-		|| gaec->model_col <0 || gaec->model_col >= e_table_model_column_count (item->table_model))
-		return FALSE;
-
-	if (!E_IS_CELL_TEXT (gaec->cell_view->ecell))
-		return FALSE;
-
-	return TRUE;
-}
-
-static G_CONST_RETURN gchar *
-ect_get_name (AtkObject * a11y)
-{
-	GalA11yECell *gaec;
-	gchar *name;
-
-	if (!ect_check (a11y))
-		return NULL;
-
-	gaec = GAL_A11Y_E_CELL (a11y);
-	name = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-	if (name != NULL) {
-		ATK_OBJECT_CLASS (parent_class)->set_name (a11y, name);
-		g_free (name);
-	}
-
-	if (a11y->name != NULL && strcmp (a11y->name, "")) {
-		return a11y->name;
-	} else {
-		return parent_class->get_name (a11y);
-	}
-}
-
-static gchar *
-ect_get_text (AtkText *text,
-	      gint start_offset,
-	      gint end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gchar *full_text;
-	gchar *ret_val;
-
-	if (!ect_check (text))
-		return NULL;
-
-	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-
-	if (end_offset == -1)
-		end_offset = strlen (full_text);
-	else
-		end_offset = g_utf8_offset_to_pointer (full_text, end_offset) - full_text;
-
-	start_offset = g_utf8_offset_to_pointer (full_text, start_offset) - full_text;
-
-	ret_val = g_strndup (full_text + start_offset, end_offset - start_offset);
-
-	g_free (full_text);
-
-	return ret_val;
-}
-
-static gchar *
-ect_get_text_after_offset (AtkText *text,
-			   gint offset,
-			   AtkTextBoundary boundary_type,
-			   gint *start_offset,
-			   gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gchar *
-ect_get_text_at_offset (AtkText *text,
-			gint offset,
-			AtkTextBoundary boundary_type,
-			gint *start_offset,
-			gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gunichar
-ect_get_character_at_offset (AtkText *text,
-			     gint offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gunichar ret_val;
-	gchar *at_offset;
-	gchar *full_text;
-
-	if (!ect_check (text))
-		return -1;
-
-	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-	at_offset = g_utf8_offset_to_pointer (full_text, offset);
-	ret_val = g_utf8_get_char_validated (at_offset, -1);
-	g_free (full_text);
-
-	return ret_val;
-}
-
-static gchar *
-ect_get_text_before_offset (AtkText *text,
-			    gint offset,
-			    AtkTextBoundary boundary_type,
-			    gint *start_offset,
-			    gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static gint
-ect_get_caret_offset (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gint start, end;
-
-	if (!ect_check (text))
-		return -1;
-
-	if (e_cell_text_get_selection (gaec->cell_view,
-				       gaec->view_col, gaec->row,
-				       &start, &end)) {
-		gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-		end = g_utf8_pointer_to_offset (full_text, full_text + end);
-		g_free (full_text);
-
-		return end;
-	}
-	else
-		return -1;
-}
-
-static AtkAttributeSet*
-ect_get_run_attributes (AtkText *text,
-			gint offset,
-			gint *start_offset,
-			gint *end_offset)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static AtkAttributeSet*
-ect_get_default_attributes (AtkText *text)
-{
-	/* Unimplemented */
-	return NULL;
-}
-
-static void
-ect_get_character_extents (AtkText *text,
-			   gint offset,
-			   gint *x,
-			   gint *y,
-			   gint *width,
-			   gint *height,
-			   AtkCoordType coords)
-{
-	/* Unimplemented */
-}
-
-static gint
-ect_get_character_count (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gint ret_val;
-	gchar *full_text;
-
-	if (!ect_check (text))
-		return -1;
-
-	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-
-	ret_val = g_utf8_strlen (full_text, -1);
-	g_free (full_text);
-	return ret_val;
-}
-
-static gint
-ect_get_offset_at_point (AtkText *text,
-			 gint x,
-			 gint y,
-			 AtkCoordType coords)
-{
-	/* Unimplemented */
-	return 0;
-}
-
-static gint
-ect_get_n_selections (AtkText *text)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gint selection_start, selection_end;
-
-	if (!ect_check (text))
-		return 0;
-
-	if (e_cell_text_get_selection (gaec->cell_view,
-				       gaec->view_col, gaec->row,
-				       &selection_start,
-				       &selection_end)
-	    && selection_start != selection_end)
-		return 1;
-	return 0;
-}
-
-static gchar *
-ect_get_selection (AtkText *text,
-		   gint selection_num,
-		   gint *start_offset,
-		   gint *end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gchar *ret_val;
-	gint selection_start, selection_end;
-
-	if (selection_num == 0
-	    && e_cell_text_get_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  &selection_start,
-					  &selection_end)
-	    && selection_start != selection_end) {
-		gint real_start, real_end, len;
-		gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-		len = strlen (full_text);
-		real_start = MIN (selection_start, selection_end);
-		real_end   = MAX (selection_start, selection_end);
-		real_start = MIN (MAX (0, real_start), len);
-		real_end   = MIN (MAX (0, real_end), len);
-
-		ret_val = g_strndup (full_text + real_start, real_end - real_start);
-
-		real_start = g_utf8_pointer_to_offset (full_text, full_text + real_start);
-		real_end   = g_utf8_pointer_to_offset (full_text, full_text + real_end);
-
-		if (start_offset)
-			*start_offset = real_start;
-		if (end_offset)
-			*end_offset = real_end;
-		g_free (full_text);
-	} else {
-		if (start_offset)
-			*start_offset = 0;
-		if (end_offset)
-			*end_offset = 0;
-		ret_val = NULL;
-	}
-
-	return ret_val;
-}
-
-static gboolean
-ect_add_selection (AtkText *text,
-		   gint start_offset,
-		   gint end_offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-
-	if (start_offset != end_offset) {
-		gint real_start, real_end, len;
-		gchar *full_text =
-			e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-
-		len = g_utf8_strlen (full_text, -1);
-		if (end_offset == -1)
-			end_offset = len;
-
-		real_start = MIN (start_offset, end_offset);
-		real_end   = MAX (start_offset, end_offset);
-
-		real_start = MIN (MAX (0, real_start), len);
-		real_end   = MIN (MAX (0, real_end), len);
-
-		real_start = g_utf8_offset_to_pointer (full_text, real_start) - full_text;
-		real_end   = g_utf8_offset_to_pointer (full_text, real_end) - full_text;
-		g_free (full_text);
-
-		if (e_cell_text_set_selection (gaec->cell_view,
-					       gaec->view_col, gaec->row,
-					       real_start, real_end)) {
-			g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-			return TRUE;
-		}
-	}
-
-	return FALSE;
-}
-
-static gboolean
-ect_remove_selection (AtkText *text,
-		      gint selection_num)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gint selection_start, selection_end;
-
-	if (selection_num == 0
-	    && e_cell_text_get_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  &selection_start,
-					  &selection_end)
-	    && selection_start != selection_end
-	    && e_cell_text_set_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  selection_end, selection_end)) {
-		g_signal_emit_by_name (ATK_OBJECT(text), "text_selection_changed");
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-ect_set_selection (AtkText *text,
-		   gint selection_num,
-		   gint start_offset,
-		   gint end_offset)
-{
-	if (selection_num == 0) {
-		atk_text_add_selection (text, start_offset, end_offset);
-		return TRUE;
-	}
-	else
-		return FALSE;
-}
-
-static gboolean
-ect_set_caret_offset (AtkText *text,
-		      gint offset)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	gchar *full_text;
-	gint len;
-
-	full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-
-	len = g_utf8_strlen (full_text, -1);
-	if (offset == -1)
-		offset = len;
-	else
-		offset = MIN (MAX (0, offset), len);
-
-	offset = g_utf8_offset_to_pointer (full_text, offset) - full_text;
-
-	g_free (full_text);
-
-	return e_cell_text_set_selection (gaec->cell_view,
-					  gaec->view_col, gaec->row,
-					  offset, offset);
-}
-
-static gboolean
-ect_set_run_attributes (AtkEditableText *text,
-			AtkAttributeSet *attrib_set,
-			gint start_offset,
-			gint end_offset)
-{
-	/* Unimplemented */
-	return FALSE;
-}
-
-static void
-ect_set_text_contents (AtkEditableText *text,
-		       const gchar *string)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	e_cell_text_set_value (ect, gaec->item->table_model, gaec->model_col, gaec->row, string);
-	e_table_item_enter_edit (gaec->item, gaec->view_col, gaec->row);
-}
-
-static void
-ect_insert_text (AtkEditableText *text,
-		 const gchar *string,
-		 gint length,
-		 gint *position)
-{
-	/* Utf8 unimplemented */
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-
-	gchar *full_text = e_cell_text_get_text_by_view (gaec->cell_view, gaec->model_col, gaec->row);
-	gchar *result = g_strdup_printf ("%.*s%.*s%s", *position, full_text, length, string, full_text + *position);
-
-	e_cell_text_set_value (ect, gaec->item->table_model, gaec->model_col, gaec->row, result);
-
-	*position += length;
-
-	g_free (result);
-	g_free (full_text);
-}
-
-static void
-ect_copy_text (AtkEditableText *text,
-	       gint start_pos,
-	       gint end_pos)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	if (start_pos != end_pos
-	    && atk_text_set_selection (ATK_TEXT (text), 0, start_pos, end_pos))
-		e_cell_text_copy_clipboard (gaec->cell_view,
-					    gaec->view_col, gaec->row);
-}
-
-static void
-ect_delete_text (AtkEditableText *text,
-		 gint start_pos,
-		 gint end_pos)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-	if (start_pos != end_pos
-	    && atk_text_set_selection (ATK_TEXT (text), 0, start_pos, end_pos))
-		e_cell_text_delete_selection (gaec->cell_view,
-					      gaec->view_col, gaec->row);
-}
-
-static void
-ect_cut_text (AtkEditableText *text,
-	      gint start_pos,
-	      gint end_pos)
-{
-	ect_copy_text (text, start_pos, end_pos);
-	ect_delete_text (text, start_pos, end_pos);
-}
-
-static void
-ect_paste_text (AtkEditableText *text,
-		gint position)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (text);
-
-	e_table_item_enter_edit (gaec->item, gaec->view_col, gaec->row);
-
-	if (atk_text_set_caret_offset (ATK_TEXT (text), position))
-		e_cell_text_paste_clipboard (gaec->cell_view,
-					     gaec->view_col, gaec->row);
-}
-
-static void
-ect_do_action_edit (AtkAction *action)
-{
-	GalA11yECell *a11y = GAL_A11Y_E_CELL (action);
-	ETableModel *e_table_model = a11y->item->table_model;
-
-	if (e_table_model_is_cell_editable (e_table_model, a11y->model_col, a11y->row)) {
-		e_table_item_enter_edit (a11y->item, a11y->view_col, a11y->row);
-	}
-}
-
-/* text signal handlers */
-static void
-ect_text_inserted_cb (ECellText *text, ECellView *cell_view, gint pos, gint len, gint row, gint model_col, gpointer data)
-{
-	GalA11yECellText *gaet;
-	GalA11yECell *gaec;
-
-	if (!ect_check (data))
-		return;
-	gaet = GAL_A11Y_E_CELL_TEXT (data);
-	gaec = GAL_A11Y_E_CELL (data);
-
-	if (cell_view == gaec->cell_view && row == gaec->row && model_col == gaec->model_col) {
-		g_signal_emit_by_name (gaet, "text_changed::insert", pos, len);
-
-	}
-}
-
-static void
-ect_text_deleted_cb (ECellText *text, ECellView *cell_view, gint pos, gint len, gint row, gint model_col, gpointer data)
-{
-	GalA11yECellText *gaet;
-	GalA11yECell *gaec;
-	if (!ect_check (data))
-		return;
-	gaet = GAL_A11Y_E_CELL_TEXT (data);
-	gaec = GAL_A11Y_E_CELL (data);
-	if (cell_view == gaec->cell_view && row == gaec->row && model_col == gaec->model_col) {
-		g_signal_emit_by_name (gaet, "text_changed::delete", pos, len);
-	 }
-}
-
-static void
-ect_atk_text_iface_init (AtkTextIface *iface)
-{
-	iface->get_text                = ect_get_text;
-	iface->get_text_after_offset   = ect_get_text_after_offset;
-	iface->get_text_at_offset      = ect_get_text_at_offset;
-	iface->get_character_at_offset = ect_get_character_at_offset;
-	iface->get_text_before_offset  = ect_get_text_before_offset;
-	iface->get_caret_offset        = ect_get_caret_offset;
-	iface->get_run_attributes      = ect_get_run_attributes;
-	iface->get_default_attributes  = ect_get_default_attributes;
-	iface->get_character_extents   = ect_get_character_extents;
-	iface->get_character_count     = ect_get_character_count;
-	iface->get_offset_at_point     = ect_get_offset_at_point;
-	iface->get_n_selections        = ect_get_n_selections;
-	iface->get_selection           = ect_get_selection;
-	iface->add_selection           = ect_add_selection;
-	iface->remove_selection        = ect_remove_selection;
-	iface->set_selection           = ect_set_selection;
-	iface->set_caret_offset        = ect_set_caret_offset;
-}
-
-static void
-ect_atk_editable_text_iface_init (AtkEditableTextIface *iface)
-{
-	iface->set_run_attributes = ect_set_run_attributes;
-	iface->set_text_contents  = ect_set_text_contents;
-	iface->insert_text        = ect_insert_text;
-	iface->copy_text          = ect_copy_text;
-	iface->cut_text           = ect_cut_text;
-	iface->delete_text        = ect_delete_text;
-	iface->paste_text         = ect_paste_text;
-}
-
-static void
-ect_class_init (GalA11yECellTextClass *klass)
-{
-	AtkObjectClass *a11y      = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-	parent_class              = g_type_class_ref (PARENT_TYPE);
-	a11y->get_name            = ect_get_name;
-	object_class->dispose     = ect_dispose;
-}
-
-static void
-ect_action_init (GalA11yECellText *a11y)
-{
-	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
-	ECellText *ect = E_CELL_TEXT (gaec->cell_view->ecell);
-	if (ect->editable && e_table_model_is_cell_editable (gaec->cell_view->e_table_model, gaec->model_col, gaec->row))
-		gal_a11y_e_cell_add_action (gaec,
-				    "edit",
-				    /* Translators: description of an "edit" action */
-				    _("begin editing this cell"),
-				    NULL,
-				    (ACTION_FUNC) ect_do_action_edit);
-}
-
-/**
- * gal_a11y_e_cell_text_get_type:
- * @void:
- *
- * Registers the &GalA11yECellText class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the &GalA11yECellText class.
- **/
-GType
-gal_a11y_e_cell_text_get_type (void)
-{
-	static GType type = 0;
-
-	if (!type) {
-		GTypeInfo info = {
-			sizeof (GalA11yECellTextClass),
-			(GBaseInitFunc) NULL,
-			(GBaseFinalizeFunc) NULL,
-			(GClassInitFunc) ect_class_init,
-			(GClassFinalizeFunc) NULL,
-			NULL, /* class_data */
-			sizeof (GalA11yECellText),
-			0,
-			(GInstanceInitFunc) NULL,
-			NULL /* value_cell_text */
-		};
-
-		static const GInterfaceInfo atk_text_info = {
-			(GInterfaceInitFunc) ect_atk_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		static const GInterfaceInfo atk_editable_text_info = {
-			(GInterfaceInitFunc) ect_atk_editable_text_iface_init,
-			(GInterfaceFinalizeFunc) NULL,
-			NULL
-		};
-
-		type = g_type_register_static (PARENT_TYPE, "GalA11yECellText", &info, 0);
-		g_type_add_interface_static (type, ATK_TYPE_TEXT, &atk_text_info);
-		g_type_add_interface_static (type, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info);
-		gal_a11y_e_cell_type_add_action_interface (type);
-	}
-
-	return type;
-}
-
-static void
-cell_text_destroyed (gpointer data)
-{
-	g_return_if_fail (GAL_A11Y_IS_E_CELL_TEXT (data));
-
-	g_object_unref (data);
-}
-
-AtkObject *
-gal_a11y_e_cell_text_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  gint         model_col,
-			  gint         view_col,
-			  gint         row)
-{
-	AtkObject *a11y;
-	GalA11yECell *gaec;
-	GalA11yECellText *gaet;
-	ECellText *ect;
-
-	a11y = g_object_new (gal_a11y_e_cell_text_get_type (), NULL);
-
-	gal_a11y_e_cell_construct (a11y,
-				   item,
-				   cell_view,
-				   parent,
-				   model_col,
-				   view_col,
-				   row);
-	gaet = GAL_A11Y_E_CELL_TEXT (a11y);
-
-	/* will be unrefed in cell_text_destroyed */
-	g_object_ref (a11y);
-
-	gaet->inserted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell),
-						"text_inserted", G_CALLBACK (ect_text_inserted_cb), a11y);
-	gaet->deleted_id = g_signal_connect (E_CELL_TEXT (((ECellView *)cell_view)->ecell),
-					     "text_deleted", G_CALLBACK (ect_text_deleted_cb), a11y);
-
-	g_object_weak_ref (G_OBJECT (((ECellView *)cell_view)->ecell),
-			   (GWeakNotify) cell_text_destroyed,
-			   a11y);
-
-	ect_action_init (gaet);
-
-	ect = E_CELL_TEXT (cell_view->ecell);
-	gaec = GAL_A11Y_E_CELL (a11y);
-	if (ect->editable && e_table_model_is_cell_editable (gaec->cell_view->e_table_model, gaec->model_col, gaec->row))
-		gal_a11y_e_cell_add_state (gaec, ATK_STATE_EDITABLE, FALSE);
-	else
-		gal_a11y_e_cell_remove_state (gaec, ATK_STATE_EDITABLE, FALSE);
-
-	return a11y;
-}
diff --git a/widgets/table/gal-a11y-e-cell-text.h b/widgets/table/gal-a11y-e-cell-text.h
deleted file mode 100644
index c9e0fa8ac4..0000000000
--- a/widgets/table/gal-a11y-e-cell-text.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>
- *
- *
- * Authors:
- *		Christopher James Lahey <clahey@ximian.com>
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
- *
- */
-
-#ifndef __GAL_A11Y_E_CELL_TEXT_H__
-#define __GAL_A11Y_E_CELL_TEXT_H__
-
-#include <glib-object.h>
-#include <table/e-table-item.h>
-#include <table/e-cell-text.h>
-#include <table/gal-a11y-e-cell.h>
-
-#define GAL_A11Y_TYPE_E_CELL_TEXT            (gal_a11y_e_cell_text_get_type ())
-#define GAL_A11Y_E_CELL_TEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellText))
-#define GAL_A11Y_E_CELL_TEXT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_CELL_TEXT, GalA11yECellTextClass))
-#define GAL_A11Y_IS_E_CELL_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_CELL_TEXT))
-#define GAL_A11Y_IS_E_CELL_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAL_A11Y_TYPE_E_CELL_TEXT))
-
-typedef struct _GalA11yECellText GalA11yECellText;
-typedef struct _GalA11yECellTextClass GalA11yECellTextClass;
-typedef struct _GalA11yECellTextPrivate GalA11yECellTextPrivate;
-
-/* This struct should actually be larger as this isn't what we derive from.
- * The GalA11yECellTextPrivate comes right after the parent class structure.
- **/
-struct _GalA11yECellText {
-	GalA11yECell object;
-	gint inserted_id;
-	gint deleted_id;
-};
-
-struct _GalA11yECellTextClass {
-	GalA11yECellClass parent_class;
-};
-
-/* Standard Glib function */
-GType      gal_a11y_e_cell_text_get_type   (void);
-AtkObject *gal_a11y_e_cell_text_new        (ETableItem *item,
-					    ECellView  *cell_view,
-					    AtkObject  *parent,
-					    gint         model_col,
-					    gint         view_col,
-					    gint         row);
-
-#endif /* __GAL_A11Y_E_CELL_TEXT_H__ */
-- 
cgit v1.2.3


From 41117c2b8c8fafe581608cd91f84803cacb08f5d Mon Sep 17 00:00:00 2001
From: Vibha Yadav <yvibha@novell.com>
Date: Mon, 15 Nov 2010 11:10:15 +0100
Subject: Bug #633774 - Headers are gone in grouped view

---
 widgets/table/e-table-group-container.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 39e7f0b812..12788ad6c4 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1094,7 +1094,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 
 				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM (child_node->text),
 							    GROUP_INDENT,
-							    running_height - BUTTON_PADDING);
+							    running_height - GROUP_INDENT - BUTTON_PADDING);
 
 				e_canvas_item_move_absolute (GNOME_CANVAS_ITEM (child),
 							    GROUP_INDENT,
-- 
cgit v1.2.3


From 64966f87895156b441738a617d66297f492d4cb2 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 23 Nov 2010 18:08:50 +0100
Subject: Reset IM context when entering ECellText editing

---
 widgets/table/e-cell-text.c | 60 ++++++++++++++++-----------------------------
 1 file changed, 21 insertions(+), 39 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 6ff43f1264..87febf7c09 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -872,47 +872,8 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		break;
 	case GDK_KEY_PRESS: /* Fall Through */
 		if (edit_display) {
-			if (edit->im_context &&
-				!edit->im_context_signals_registered) {
-
-				g_signal_connect (edit->im_context,
-						"preedit_changed",
-						G_CALLBACK (\
-						e_cell_text_preedit_changed_cb),
-						text_view);
-
-				g_signal_connect (edit->im_context,
-						"commit",
-						G_CALLBACK (\
-						e_cell_text_commit_cb),
-						text_view);
-
-				g_signal_connect (edit->im_context,
-						"retrieve_surrounding",
-						G_CALLBACK (\
-						e_cell_text_retrieve_surrounding_cb),
-						text_view);
-
-				g_signal_connect (edit->im_context,
-						"delete_surrounding",
-						G_CALLBACK (\
-						e_cell_text_delete_surrounding_cb),
-						text_view);
-
-				edit->im_context_signals_registered = TRUE;
-			}
-
 			edit->show_cursor = FALSE;
-
 		} else {
-			if (edit && edit->im_context) {
-				g_signal_handlers_disconnect_matched (
-						edit->im_context,
-						G_SIGNAL_MATCH_DATA, 0, 0,
-						NULL, NULL, edit);
-				edit->im_context_signals_registered = FALSE;
-			}
-
 			ect_stop_editing (text_view, TRUE);
 		}
 		return_val = TRUE;
@@ -1170,6 +1131,19 @@ ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 	e_cell_text_free_text (ect, temp);
 	edit->text = g_strdup (edit->old_text);
 
+	if (edit->im_context) {
+		gtk_im_context_reset (edit->im_context);
+		if (!edit->im_context_signals_registered) {
+			g_signal_connect (edit->im_context, "preedit_changed", G_CALLBACK (e_cell_text_preedit_changed_cb), text_view);
+			g_signal_connect (edit->im_context, "commit", G_CALLBACK (e_cell_text_commit_cb), text_view);
+			g_signal_connect (edit->im_context, "retrieve_surrounding", G_CALLBACK (e_cell_text_retrieve_surrounding_cb), text_view);
+			g_signal_connect (edit->im_context, "delete_surrounding", G_CALLBACK (e_cell_text_delete_surrounding_cb), text_view);
+
+			edit->im_context_signals_registered = TRUE;
+		}
+		gtk_im_context_focus_in (edit->im_context);
+	}
+	
 #if 0
 	if (edit->pointer_in) {
 		if (edit->default_cursor_shown) {
@@ -1193,6 +1167,14 @@ ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row,
 	CellEdit *edit = text_view->edit;
 
 	if (edit) {
+		if (edit->im_context) {
+			gtk_im_context_focus_out (edit->im_context);
+
+			if (edit->im_context_signals_registered) {
+				g_signal_handlers_disconnect_matched (edit->im_context, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, edit);
+				edit->im_context_signals_registered = FALSE;
+			}
+		}
 		ect_stop_editing (text_view, TRUE);
 	} else {
 		/*
-- 
cgit v1.2.3


From 74098399cc5fe7e07b32439952272101f86b8502 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Tue, 21 Dec 2010 15:00:15 +0100
Subject: Minor compiler warnings fix

---
 widgets/table/e-table-field-chooser-item.c | 2 +-
 widgets/table/e-table-header-item.c        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 02c86b8136..880731e5be 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -572,7 +572,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
 	d(g_print ("etfci - %s\n", etfci_drag_types[0].target));
 	list = gtk_target_list_new (etfci_drag_types, G_N_ELEMENTS (etfci_drag_types));
 	context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
-	g_free (etfci_drag_types[0].target);
+	g_free ((gpointer) etfci_drag_types[0].target);
 
 	button_height = e_table_header_compute_height (ecol, widget);
 	window = gtk_widget_get_window (widget);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 28d53ce971..7fda0066af 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -929,7 +929,7 @@ ethi_realize (GnomeCanvasItem *item)
 	gtk_drag_dest_set (
 		GTK_WIDGET (item->canvas), 0, ethi_drop_types,
 		G_N_ELEMENTS (ethi_drop_types), GDK_ACTION_MOVE);
-	g_free (ethi_drop_types[0].target);
+	g_free ((gpointer) ethi_drop_types[0].target);
 
 	/* Drop signals */
 	ethi->drag_motion_id = g_signal_connect (item->canvas, "drag_motion",
@@ -1235,7 +1235,7 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	list = gtk_target_list_new (
 		ethi_drag_types, G_N_ELEMENTS (ethi_drag_types));
 	context = gtk_drag_begin (widget, list, GDK_ACTION_MOVE, 1, event);
-	g_free (ethi_drag_types[0].target);
+	g_free ((gpointer) ethi_drag_types[0].target);
 
 	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
 	col_width = ecol->width;
-- 
cgit v1.2.3


From 7a6b7673351c8597a5cf976d59fdd7fd246a78d5 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 9 Jan 2011 09:29:11 -0500
Subject: ETree: Fix runtime warnings with GTK3.

ETable has a "vertical-spacing" style property, ETree does not.
ECellText expects it to be in both.
---
 widgets/table/e-cell-text.c | 15 ++++++++++++---
 widgets/table/e-table.c     | 19 ++++++++++---------
 widgets/table/e-tree.c      | 11 +++++++++++
 3 files changed, 33 insertions(+), 12 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 87febf7c09..4d86378904 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -681,12 +681,21 @@ show_pango_rectangle (CellEdit *edit, PangoRectangle rect)
 }
 
 static gint
-get_vertical_spacing (GtkWidget *widget)
+get_vertical_spacing (GtkWidget *canvas)
 {
-	GtkStyle *style = gtk_rc_get_style (widget);
+	GtkStyle *style;
+	GtkWidget *widget;
 	gint vspacing = 0;
 
-	gtk_style_get (style, E_TABLE_TYPE, "vertical-spacing", &vspacing, NULL);
+	g_return_val_if_fail (E_IS_CANVAS (canvas), 3);
+
+	/* The parent should be either an ETable or ETree. */
+	widget = gtk_widget_get_parent (canvas);
+	style = gtk_widget_get_style (widget);
+
+	gtk_style_get (
+		style, G_OBJECT_TYPE (widget),
+		"vertical-spacing", &vspacing, NULL);
 
 	return vspacing;
 }
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 4cbd6556af..4dc13bfb1a 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -3513,15 +3513,16 @@ e_table_class_init (ETableClass *class)
 							      E_TABLE_MODEL_TYPE,
 							      G_PARAM_READABLE));
 
-	gtk_widget_class_install_style_property (widget_class,
-					 g_param_spec_int ("vertical-spacing",
-							   "Vertical Row Spacing",
-							   "Vertical space between rows. It is added to top and to bottom of a row",
-							   0,
-							   G_MAXINT,
-							   3,
-							   G_PARAM_READABLE |
-							   G_PARAM_STATIC_STRINGS));
+	gtk_widget_class_install_style_property (
+		widget_class,
+		g_param_spec_int (
+			"vertical-spacing",
+			"Vertical Row Spacing",
+			"Vertical space between rows. "
+			"It is added to top and to bottom of a row",
+			0, G_MAXINT, 3,
+			G_PARAM_READABLE |
+			G_PARAM_STATIC_STRINGS));
 
 	gal_a11y_e_table_init ();
 }
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 5f0effaac8..8d718b0235 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -3584,6 +3584,17 @@ e_tree_class_init (ETreeClass *class)
 					     10,
 					     G_PARAM_READABLE));
 
+	gtk_widget_class_install_style_property (
+		widget_class,
+		g_param_spec_int (
+			"vertical-spacing",
+			"Vertical Row Spacing",
+			"Vertical space between rows. "
+			"It is added to top and to bottom of a row",
+			0, G_MAXINT, 3,
+			G_PARAM_READABLE |
+			G_PARAM_STATIC_STRINGS));
+
 	gal_a11y_e_tree_init ();
 }
 
-- 
cgit v1.2.3


From 0af3ff804c0d71c76fd63f0a2a152cac7de64863 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 13 Jan 2011 10:54:58 -0500
Subject: Fudge gtk_widget_get_preferred_size() for gtk2.

Easy enough to fake gtk_widget_get_preferred_size() in gtk2 using
gtk_widget_size_request().  Reduces diff noise with gtk3 branch.
---
 widgets/table/e-cell-combo.c     | 2 +-
 widgets/table/e-cell-date-edit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index d4ba4f31e3..6e1eb5ca80 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -447,7 +447,7 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	widget = gtk_scrolled_window_get_vscrollbar (popup);
 	gtk_widget_get_child_requisition (widget, &requisition);
 
-	gtk_widget_size_request (ecc->popup_tree_view, &list_requisition);
+	gtk_widget_get_preferred_size (ecc->popup_tree_view, &list_requisition, NULL);
 	min_height = MIN (list_requisition.height, requisition.height);
 	if (!gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view)), NULL))
 		list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT;
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 73a5d946b2..005f7a63e4 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -688,7 +688,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	   the vertical scrollbar in case we need to show that. */
 	screen_width = gdk_screen_width ();
 
-	gtk_widget_size_request (ecde->popup_window, &popup_requisition);
+	gtk_widget_get_preferred_size (ecde->popup_window, &popup_requisition, NULL);
 
 	/* Calculate the desired width. */
 	*width = popup_requisition.width;
-- 
cgit v1.2.3


From d47adb5922a262effdd14c1c50bb0a3660088798 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 13 Jan 2011 17:16:57 -0500
Subject: Fudge GtkScrollable for gtk2.

Yes, the GtkScrollable interface is implemented by more than just
GtkLayout, but it turns out GtkLayout is the only thing Evolution
uses the GtkScrollable API for on the gtk3 branch.
---
 widgets/table/e-cell-combo.c          |  4 +-
 widgets/table/e-cell-date-edit.c      |  6 +--
 widgets/table/e-table-field-chooser.c |  7 +++-
 widgets/table/e-table-header-item.c   | 18 ++++-----
 widgets/table/e-table.c               | 64 +++++++++++++++---------------
 widgets/table/e-tree.c                | 73 +++++++++++++++++------------------
 6 files changed, 87 insertions(+), 85 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 6e1eb5ca80..c06e5450e8 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -426,8 +426,8 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	/* The ETable positions don't include the grid lines, I think, so we add 1. */
 	*y += y1 + 1
 		- (gint)gtk_adjustment_get_value (
-			gtk_layout_get_vadjustment (
-			&((GnomeCanvas *)canvas)->layout))
+			gtk_scrollable_get_vadjustment (
+			GTK_SCROLLABLE (&((GnomeCanvas *)canvas)->layout)))
 		+ ((GnomeCanvas *)canvas)->zoom_yofs;
 
 	widget = gtk_scrolled_window_get_vscrollbar (popup);
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 005f7a63e4..31d63d97cf 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -648,7 +648,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
 	GtkRequisition popup_requisition;
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	GdkWindow *window;
 	gint avail_height, screen_width, column_width, row_height;
 	gdouble x1, y1, wx, wy;
@@ -677,8 +677,8 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	*x += x1;
 	/* The ETable positions don't include the grid lines, I think, so we
 	   add 1. */
-	layout = &GNOME_CANVAS (canvas)->layout;
-	adjustment = gtk_layout_get_vadjustment (layout);
+	scrollable = GTK_SCROLLABLE (&GNOME_CANVAS (canvas)->layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	value = (gint) gtk_adjustment_get_value (adjustment);
 	*y += y1 + 1 - value + ((GnomeCanvas *)canvas)->zoom_yofs;
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index f0e3ece84c..374507e1ee 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -34,6 +34,9 @@
 #include "e-table-field-chooser.h"
 #include "e-table-field-chooser-item.h"
 
+/* backward-compatibility cruft */
+#include "e-util/gtk-compat.h"
+
 static void e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_dispose (GObject *object);
@@ -86,8 +89,8 @@ ensure_nonzero_step_increments (ETableFieldChooser *etfc)
 {
 	GtkAdjustment *va, *ha;
 
-	va = gtk_layout_get_vadjustment (GTK_LAYOUT (etfc->canvas));
-	ha = gtk_layout_get_hadjustment (GTK_LAYOUT (etfc->canvas));
+	va = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (etfc->canvas));
+	ha = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (etfc->canvas));
 
 	/*
 	  it looks pretty complicated to get height of column header
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 7fda0066af..1c97826ef2 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -506,10 +506,10 @@ ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate)
 	window = gtk_widget_get_window (GTK_WIDGET (canvas));
 	gdk_window_get_origin (window, &rx, &ry);
 
-	adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (canvas));
+	adjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (canvas));
 	rx -= gtk_adjustment_get_value (adjustment);
 
-	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (canvas));
+	adjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (canvas));
 	ry -= gtk_adjustment_get_value (adjustment);
 
 	gtk_window_move (
@@ -625,8 +625,8 @@ scroll_timeout (gpointer data)
 {
 	ETableHeaderItem *ethi = data;
 	gint dx = 0;
-	GtkLayout *layout;
 	GtkAdjustment *adjustment;
+	GtkScrollable *scrollable;
 	gdouble hadjustment_value;
 	gdouble vadjustment_value;
 	gdouble page_size;
@@ -639,17 +639,17 @@ scroll_timeout (gpointer data)
 	if (ethi->scroll_direction & ET_SCROLL_LEFT)
 		dx -= 20;
 
-	layout = GTK_LAYOUT (GNOME_CANVAS_ITEM (ethi)->canvas);
+	scrollable = GTK_SCROLLABLE (GNOME_CANVAS_ITEM (ethi)->canvas);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	hadjustment_value = gtk_adjustment_get_value (adjustment);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	vadjustment_value = gtk_adjustment_get_value (adjustment);
 
 	value = hadjustment_value;
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	page_size = gtk_adjustment_get_page_size (adjustment);
 	lower = gtk_adjustment_get_lower (adjustment);
 	upper = gtk_adjustment_get_upper (adjustment);
@@ -759,10 +759,10 @@ ethi_drag_motion (GtkWidget *widget,
 	ethi->last_drop_context = context;
 	context_connect (ethi, context);
 
-	adjustment = gtk_layout_get_hadjustment (GTK_LAYOUT (widget));
+	adjustment = gtk_scrollable_get_hadjustment (GTK_SCROLLABLE (widget));
 	hadjustment_value = gtk_adjustment_get_value (adjustment);
 
-	adjustment = gtk_layout_get_vadjustment (GTK_LAYOUT (widget));
+	adjustment = gtk_scrollable_get_vadjustment (GTK_SCROLLABLE (widget));
 	vadjustment_value = gtk_adjustment_get_value (adjustment);
 
 	do_drag_motion (
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 4dc13bfb1a..952bf900b8 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -838,13 +838,13 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *
 	GdkEventKey *key = (GdkEventKey *) event;
 	gint y, row_local, col_local;
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	gdouble page_size;
 	gdouble upper;
 	gdouble value;
 
-	layout = GTK_LAYOUT (et->table_canvas);
-	adjustment = gtk_layout_get_vadjustment (layout);
+	scrollable = GTK_SCROLLABLE (et->table_canvas);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 
 	switch (key->keyval) {
 	case GDK_KEY_Page_Down:
@@ -1607,8 +1607,8 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 	gint row = 0;
 	gint col_count, i;
 	GValue *val;
-	GtkLayout *layout;
 	GtkAdjustment *adjustment;
+	GtkScrollable *scrollable;
 
 	val = g_new0 (GValue, 1);
 	g_value_init (val, G_TYPE_OBJECT);
@@ -1689,12 +1689,12 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 	e_table_setup_table (e_table, e_table->full_header, e_table->header, etm);
 	e_table_fill_table (e_table, etm);
 
-	layout = GTK_LAYOUT (e_table->table_canvas);
+	scrollable = GTK_SCROLLABLE (e_table->table_canvas);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	gtk_adjustment_set_step_increment (adjustment, 20);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	gtk_adjustment_set_step_increment (adjustment, 20);
 
 	if (!specification->no_headers) {
@@ -2331,15 +2331,15 @@ set_scroll_adjustments   (ETable *table,
 		gtk_adjustment_set_step_increment (hadjustment, 20);
 
 	if (table->table_canvas != NULL) {
-		gtk_layout_set_hadjustment (
-			GTK_LAYOUT (table->table_canvas), hadjustment);
-		gtk_layout_set_vadjustment (
-			GTK_LAYOUT (table->table_canvas), vadjustment);
+		gtk_scrollable_set_hadjustment (
+			GTK_SCROLLABLE (table->table_canvas), hadjustment);
+		gtk_scrollable_set_vadjustment (
+			GTK_SCROLLABLE (table->table_canvas), vadjustment);
 	}
 
 	if (table->header_canvas != NULL)
-		gtk_layout_set_hadjustment (
-			GTK_LAYOUT (table->header_canvas), hadjustment);
+		gtk_scrollable_set_hadjustment (
+			GTK_SCROLLABLE (table->header_canvas), hadjustment);
 }
 
 /**
@@ -2469,7 +2469,7 @@ e_table_get_cell_at (ETable *table,
 		     gint *row_return, gint *col_return)
 {
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 
 	g_return_if_fail (E_IS_TABLE (table));
 	g_return_if_fail (row_return != NULL);
@@ -2478,12 +2478,12 @@ e_table_get_cell_at (ETable *table,
 	/* FIXME it would be nice if it could handle a NULL row_return or
 	 * col_return gracefully.  */
 
-	layout = GTK_LAYOUT (table->table_canvas);
+	scrollable = GTK_SCROLLABLE (table->table_canvas);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	x += gtk_adjustment_get_value (adjustment);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	y += gtk_adjustment_get_value (adjustment);
 
 	e_table_group_compute_location (
@@ -2511,26 +2511,26 @@ e_table_get_cell_geometry (ETable *table,
 			   gint *x_return, gint *y_return,
 			   gint *width_return, gint *height_return)
 {
-	GtkAdjustment *adjustment;
 	GtkAllocation allocation;
-	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	GtkScrollable *scrollable;
 
 	g_return_if_fail (E_IS_TABLE (table));
 
-	layout = GTK_LAYOUT (table->table_canvas);
+	scrollable = GTK_SCROLLABLE (table->table_canvas);
 
 	e_table_group_get_cell_geometry (
 		table->group, &row, &col, x_return, y_return,
 		width_return, height_return);
 
 	if (x_return && table->table_canvas) {
-		adjustment = gtk_layout_get_hadjustment (layout);
+		adjustment = gtk_scrollable_get_hadjustment (scrollable);
 		(*x_return) -= gtk_adjustment_get_value (adjustment);
 	}
 
 	if (y_return) {
 		if (table->table_canvas) {
-			adjustment = gtk_layout_get_vadjustment (layout);
+			adjustment = gtk_scrollable_get_vadjustment (scrollable);
 			(*y_return) -= gtk_adjustment_get_value (adjustment);
 		}
 
@@ -2692,16 +2692,16 @@ e_table_drag_highlight (ETable *table,
 			gint     row,
 			gint     col)
 {
-	GtkAdjustment *adjustment;
 	GtkAllocation allocation;
-	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	GtkScrollable *scrollable;
 	GtkStyle *style;
 
 	g_return_if_fail (E_IS_TABLE (table));
 
-	layout = GTK_LAYOUT (table->table_canvas);
+	scrollable = GTK_SCROLLABLE (table->table_canvas);
 	style = gtk_widget_get_style (GTK_WIDGET (table));
-	gtk_widget_get_allocation (GTK_WIDGET (layout), &allocation);
+	gtk_widget_get_allocation (GTK_WIDGET (scrollable), &allocation);
 
 	if (row != -1) {
 		gint x, y, width, height;
@@ -2711,11 +2711,11 @@ e_table_drag_highlight (ETable *table,
 			width = allocation.width;
 		} else {
 			e_table_get_cell_geometry (table, row, col, &x, &y, &width, &height);
-			adjustment = gtk_layout_get_hadjustment (layout);
+			adjustment = gtk_scrollable_get_hadjustment (scrollable);
 			x += gtk_adjustment_get_value (adjustment);
 		}
 
-		adjustment = gtk_layout_get_vadjustment (layout);
+		adjustment = gtk_scrollable_get_vadjustment (scrollable);
 		y += gtk_adjustment_get_value (adjustment);
 
 		if (table->drop_highlight == NULL) {
@@ -3025,7 +3025,7 @@ scroll_timeout (gpointer data)
 	ETable *et = data;
 	gint dx = 0, dy = 0;
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	gdouble old_h_value;
 	gdouble new_h_value;
 	gdouble old_v_value;
@@ -3044,9 +3044,9 @@ scroll_timeout (gpointer data)
 	if (et->scroll_direction & ET_SCROLL_LEFT)
 		dx -= 20;
 
-	layout = GTK_LAYOUT (et->table_canvas);
+	scrollable = GTK_SCROLLABLE (et->table_canvas);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 
 	lower = gtk_adjustment_get_lower (adjustment);
 	upper = gtk_adjustment_get_upper (adjustment);
@@ -3057,7 +3057,7 @@ scroll_timeout (gpointer data)
 
 	gtk_adjustment_set_value (adjustment, new_h_value);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 
 	lower = gtk_adjustment_get_lower (adjustment);
 	upper = gtk_adjustment_get_upper (adjustment);
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 8d718b0235..f19a9a7cfc 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -759,7 +759,7 @@ scroll_to_cursor (ETree *e_tree)
 {
 	ETreePath path;
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	gint x, y, w, h;
 	gdouble page_size;
 	gdouble lower;
@@ -779,8 +779,8 @@ scroll_to_cursor (ETree *e_tree)
 				&row, &col, &x, &y, &w, &h);
 	}
 
-	layout = GTK_LAYOUT (e_tree->priv->table_canvas);
-	adjustment = gtk_layout_get_vadjustment (layout);
+	scrollable = GTK_SCROLLABLE (e_tree->priv->table_canvas);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 
 	page_size = gtk_adjustment_get_page_size (adjustment);
 	lower = gtk_adjustment_get_lower (adjustment);
@@ -928,13 +928,13 @@ item_key_press (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
 	ETreePath path;
 	gint y, row_local, col_local;
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	gdouble page_size;
 	gdouble upper;
 	gdouble value;
 
-	layout = GTK_LAYOUT (et->priv->table_canvas);
-	adjustment = gtk_layout_get_vadjustment (layout);
+	scrollable = GTK_SCROLLABLE (et->priv->table_canvas);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 
 	page_size = gtk_adjustment_get_page_size (adjustment);
 	upper = gtk_adjustment_get_upper (adjustment);
@@ -1514,7 +1514,7 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 		   ETableSpecification *specification, ETableState *state)
 {
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	gint row = 0;
 
 	if (ete)
@@ -1566,12 +1566,12 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 	}
 	e_tree_setup_table (e_tree);
 
-	layout = GTK_LAYOUT (e_tree->priv->table_canvas);
+	scrollable = GTK_SCROLLABLE (e_tree->priv->table_canvas);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	gtk_adjustment_set_step_increment (adjustment, 20);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	gtk_adjustment_set_step_increment (adjustment, 20);
 
 	if (!specification->no_headers) {
@@ -2036,17 +2036,16 @@ set_scroll_adjustments   (ETree *tree,
 		gtk_adjustment_set_step_increment (hadjustment, 20);
 
 	if (tree->priv) {
-		GtkLayout *layout;
+		GtkScrollable *scrollable;
 
-		layout = GTK_LAYOUT (tree->priv->table_canvas);
+		scrollable = GTK_SCROLLABLE (tree->priv->table_canvas);
+		gtk_scrollable_set_hadjustment (scrollable, hadjustment);
+		gtk_scrollable_set_vadjustment (scrollable, vadjustment);
 
-		gtk_layout_set_hadjustment (layout, hadjustment);
-		gtk_layout_set_vadjustment (layout, vadjustment);
-
-		if (tree->priv->header_canvas != NULL)
-			gtk_layout_set_hadjustment (
-				GTK_LAYOUT (tree->priv->header_canvas),
-				hadjustment);
+		if (tree->priv->header_canvas != NULL) {
+			scrollable = GTK_SCROLLABLE (tree->priv->header_canvas);
+			gtk_scrollable_set_hadjustment (scrollable, hadjustment);
+		}
 	}
 }
 
@@ -2485,16 +2484,16 @@ e_tree_drag_highlight (ETree *tree,
 		       gint     row,
 		       gint     col)
 {
-	GtkAdjustment *adjustment;
 	GtkAllocation allocation;
-	GtkLayout *layout;
+	GtkAdjustment *adjustment;
+	GtkScrollable *scrollable;
 	GtkStyle *style;
 
 	g_return_if_fail (E_IS_TREE (tree));
 
-	layout = GTK_LAYOUT (tree->priv->table_canvas);
+	scrollable = GTK_SCROLLABLE (tree->priv->table_canvas);
 	style = gtk_widget_get_style (GTK_WIDGET (tree));
-	gtk_widget_get_allocation (GTK_WIDGET (layout), &allocation);
+	gtk_widget_get_allocation (GTK_WIDGET (scrollable), &allocation);
 
 	if (row != -1) {
 		gint x, y, width, height;
@@ -2504,11 +2503,11 @@ e_tree_drag_highlight (ETree *tree,
 			width = allocation.width;
 		} else {
 			e_tree_get_cell_geometry (tree, row, col, &x, &y, &width, &height);
-			adjustment = gtk_layout_get_hadjustment (layout);
+			adjustment = gtk_scrollable_get_hadjustment (scrollable);
 			x += gtk_adjustment_get_value (adjustment);
 		}
 
-		adjustment = gtk_layout_get_vadjustment (layout);
+		adjustment = gtk_scrollable_get_vadjustment (scrollable);
 		y += gtk_adjustment_get_value (adjustment);
 
 		if (tree->priv->drop_highlight == NULL) {
@@ -2731,7 +2730,7 @@ e_tree_get_cell_at (ETree *tree,
 		     gint *row_return, gint *col_return)
 {
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 
 	g_return_if_fail (E_IS_TREE (tree));
 	g_return_if_fail (row_return != NULL);
@@ -2745,12 +2744,12 @@ e_tree_get_cell_at (ETree *tree,
 	if (col_return)
 		*col_return = -1;
 
-	layout = GTK_LAYOUT (tree->priv->table_canvas);
+	scrollable = GTK_SCROLLABLE (tree->priv->table_canvas);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 	x += gtk_adjustment_get_value (adjustment);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	y += gtk_adjustment_get_value (adjustment);
 
 	e_table_item_compute_location (
@@ -2779,7 +2778,7 @@ e_tree_get_cell_geometry (ETree *tree,
 			  gint *width_return, gint *height_return)
 {
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 
 	g_return_if_fail (E_IS_TREE (tree));
 	g_return_if_fail (row >= 0);
@@ -2793,15 +2792,15 @@ e_tree_get_cell_geometry (ETree *tree,
 		&row, &col, x_return, y_return,
 		width_return, height_return);
 
-	layout = GTK_LAYOUT (tree->priv->table_canvas);
+	scrollable = GTK_SCROLLABLE (tree->priv->table_canvas);
 
 	if (x_return) {
-		adjustment = gtk_layout_get_hadjustment (layout);
+		adjustment = gtk_scrollable_get_hadjustment (scrollable);
 		(*x_return) -= gtk_adjustment_get_value (adjustment);
 	}
 
 	if (y_return) {
-		adjustment = gtk_layout_get_vadjustment (layout);
+		adjustment = gtk_scrollable_get_vadjustment (scrollable);
 		(*y_return) -= gtk_adjustment_get_value (adjustment);
 	}
 }
@@ -2915,7 +2914,7 @@ scroll_timeout (gpointer data)
 	ETree *et = data;
 	gint dx = 0, dy = 0;
 	GtkAdjustment *adjustment;
-	GtkLayout *layout;
+	GtkScrollable *scrollable;
 	gdouble old_h_value;
 	gdouble new_h_value;
 	gdouble old_v_value;
@@ -2934,9 +2933,9 @@ scroll_timeout (gpointer data)
 	if (et->priv->scroll_direction & ET_SCROLL_LEFT)
 		dx -= 20;
 
-	layout = GTK_LAYOUT (et->priv->table_canvas);
+	scrollable = GTK_SCROLLABLE (et->priv->table_canvas);
 
-	adjustment = gtk_layout_get_hadjustment (layout);
+	adjustment = gtk_scrollable_get_hadjustment (scrollable);
 
 	page_size = gtk_adjustment_get_page_size (adjustment);
 	lower = gtk_adjustment_get_lower (adjustment);
@@ -2947,7 +2946,7 @@ scroll_timeout (gpointer data)
 
 	gtk_adjustment_set_value (adjustment, new_h_value);
 
-	adjustment = gtk_layout_get_vadjustment (layout);
+	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 
 	page_size = gtk_adjustment_get_page_size (adjustment);
 	lower = gtk_adjustment_get_lower (adjustment);
-- 
cgit v1.2.3


From a4d8c30310cfcd95a54153930336ff8196adde76 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 13 Jan 2011 09:58:21 -0500
Subject: Merge miscellaneous changes from gtk3 branch.

Mostly coding style and whitespace changes, to reduce diff noise.
---
 widgets/table/e-cell-checkbox.c      |  2 +-
 widgets/table/e-cell-hbox.c          | 22 +++++---
 widgets/table/e-cell-text.c          |  5 +-
 widgets/table/e-cell-tree.c          | 97 ++++++++++++++++++++----------------
 widgets/table/e-cell-vbox.c          | 33 ++++++++----
 widgets/table/e-table-header-utils.h |  6 +--
 6 files changed, 101 insertions(+), 64 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index 441f6723f3..20f56b443e 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -50,13 +50,13 @@ ecc_print (ECellView *ecell_view, GtkPrintContext *context,
 	cairo_save (cr);
 
 	if ( value == 1) {
-
 		cairo_set_line_width (cr, 2);
 		cairo_move_to (cr, 3, 11);
 		cairo_line_to (cr, 7, 14);
 		cairo_line_to (cr, 11, 5);
 		cairo_stroke (cr);
 	}
+
 	cairo_restore (cr);
 }
 
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 1e6c4a6efc..6f587db9d2 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -138,9 +138,16 @@ ecv_unrealize (ECellView *ecv)
  * ECell::draw method
  */
 static void
-ecv_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  gint model_col, gint view_col, gint row, ECellFlags flags,
-	  gint x1, gint y1, gint x2, gint y2)
+ecv_draw (ECellView *ecell_view,
+          GdkDrawable *drawable,
+          gint model_col,
+          gint view_col,
+          gint row,
+          ECellFlags flags,
+          gint x1,
+          gint y1,
+          gint x2,
+          gint y2)
 {
 	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
 
@@ -156,9 +163,12 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		if (width < hbox_view->def_size_cols[i])
 			width = hbox_view->def_size_cols[i];
 		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
-		e_cell_draw (hbox_view->subcell_views[i], drawable,
-			     hbox_view->model_cols[i], view_col, row, flags,
-			     x1 + subcell_offset , y1, x1 + subcell_offset + width, y2);
+
+		e_cell_draw (
+			hbox_view->subcell_views[i], drawable,
+			hbox_view->model_cols[i], view_col, row, flags,
+			x1 + subcell_offset , y1,
+			x1 + subcell_offset + width, y2);
 
 		subcell_offset += width; /* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row); */
 	}
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 4d86378904..1b0545cc37 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -736,8 +736,9 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 			gchar *color_spec;
 			GdkColor *cell_foreground;
 
-			color_spec = e_table_model_value_at (ecell_view->e_table_model,
-							     ect->color_column, row);
+			color_spec = e_table_model_value_at (
+				ecell_view->e_table_model,
+				ect->color_column, row);
 			cell_foreground = e_cell_text_get_color (text_view,
 								 color_spec);
 			if (cell_foreground)
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 5771cbc053..9129fba446 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -126,8 +126,8 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	tree_view->cell_view.ecell = ecell;
 	tree_view->cell_view.e_table_model = table_model;
 	tree_view->cell_view.e_table_item_view = e_table_item_view;
-        tree_view->cell_view.kill_view_cb = NULL;
-        tree_view->cell_view.kill_view_cb_data = NULL;
+	tree_view->cell_view.kill_view_cb = NULL;
+	tree_view->cell_view.kill_view_cb_data = NULL;
 
 	/* create our subcell view */
 	tree_view->subcell_view = e_cell_new_view (ect->subcell, table_model, e_table_item_view /* XXX */);
@@ -145,11 +145,11 @@ ect_kill_view (ECellView *ecv)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecv;
 
-        if (tree_view->cell_view.kill_view_cb)
-            (tree_view->cell_view.kill_view_cb)(ecv, tree_view->cell_view.kill_view_cb_data);
+	if (tree_view->cell_view.kill_view_cb)
+	    (tree_view->cell_view.kill_view_cb)(ecv, tree_view->cell_view.kill_view_cb_data);
 
-        if (tree_view->cell_view.kill_view_cb_data)
-            g_list_free (tree_view->cell_view.kill_view_cb_data);
+	if (tree_view->cell_view.kill_view_cb_data)
+	    g_list_free (tree_view->cell_view.kill_view_cb_data);
 
 	/* kill our subcell view */
 	e_cell_kill_view (tree_view->subcell_view);
@@ -188,7 +188,11 @@ ect_unrealize (ECellView *ecv)
 }
 
 static void
-draw_expander (ECellTreeView *ectv, GdkDrawable *drawable, GtkExpanderStyle expander_style, GtkStateType state, GdkRectangle *rect)
+draw_expander (ECellTreeView *ectv,
+               GdkDrawable *drawable,
+               GtkExpanderStyle expander_style,
+               GtkStateType state,
+               GdkRectangle *rect)
 {
 	GtkStyle *style;
 	GtkWidget *tree;
@@ -209,9 +213,16 @@ draw_expander (ECellTreeView *ectv, GdkDrawable *drawable, GtkExpanderStyle expa
  * ECell::draw method
  */
 static void
-ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  gint model_col, gint view_col, gint row, ECellFlags flags,
-	  gint x1, gint y1, gint x2, gint y2)
+ect_draw (ECellView *ecell_view,
+          GdkDrawable *drawable,
+          gint model_col,
+          gint view_col,
+          gint row,
+          ECellFlags flags,
+          gint x1,
+          gint y1,
+          gint x2,
+          gint y2)
 {
 	ECellTreeView *tree_view = (ECellTreeView *)ecell_view;
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
@@ -265,16 +276,16 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 			gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
 			GdkRectangle r;
 
-                        r = rect;
-                        r.width -= node_image_width + 2;
-                        draw_expander (tree_view, drawable, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
+			r = rect;
+			r.width -= node_image_width + 2;
+			draw_expander (tree_view, drawable, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
 		}
 
 		if (node_image) {
-                        gdk_cairo_set_source_pixbuf (cr, node_image,
-                                                     x1 + subcell_offset,
-                                                     y1 + (y2 - y1) / 2 - node_image_height / 2);
-                        cairo_paint (cr);
+			gdk_cairo_set_source_pixbuf (cr, node_image,
+						     x1 + subcell_offset,
+						     y1 + (y2 - y1) / 2 - node_image_height / 2);
+			cairo_paint (cr);
 
 			subcell_offset += node_image_width;
 		}
@@ -394,30 +405,30 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		if (event_in_expander (event, offset, 0)) {
 			if (e_tree_model_node_is_expandable (tree_model, node)) {
 				gboolean expanded = e_tree_table_adapter_node_is_expanded (etta, node);
-                                gint tmp_row = row;
-                                GdkRectangle area;
-                                animate_closure_t *closure = g_new0 (animate_closure_t, 1);
-                                gint hgt;
-
-                                e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
-                                                        &tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);
-                                area.width = offset - 2;
-                                hgt = e_cell_height (ecell_view, model_col, view_col, row);
-
-                                if (hgt != area.height) /* Composite cells */
-                                        area.height += hgt;
-
-                                draw_expander (
-                                        tree_view, window, expanded ?
-                                        GTK_EXPANDER_SEMI_EXPANDED :
-                                        GTK_EXPANDER_SEMI_COLLAPSED,
-                                        GTK_STATE_NORMAL, &area);
-                                closure->ectv = tree_view;
-                                closure->etta = etta;
-                                closure->node = node;
-                                closure->expanded = expanded;
-                                closure->area = area;
-                                tree_view->animate_timeout = g_timeout_add (50, animate_expander, closure);
+				gint tmp_row = row;
+				GdkRectangle area;
+				animate_closure_t *closure = g_new0 (animate_closure_t, 1);
+				gint hgt;
+
+				e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
+							&tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);
+				area.width = offset - 2;
+				hgt = e_cell_height (ecell_view, model_col, view_col, row);
+
+				if (hgt != area.height) /* Composite cells */
+					area.height += hgt;
+
+				draw_expander (
+					tree_view, window, expanded ?
+					GTK_EXPANDER_SEMI_EXPANDED :
+					GTK_EXPANDER_SEMI_COLLAPSED,
+					GTK_STATE_NORMAL, &area);
+				closure->ectv = tree_view;
+				closure->etta = etta;
+				closure->node = node;
+				closure->expanded = expanded;
+				closure->area = area;
+				tree_view->animate_timeout = g_timeout_add (50, animate_expander, closure);
 				return TRUE;
 			}
 		}
@@ -531,8 +542,8 @@ ect_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 		expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
 
 		/* This is unnecessary since this is already handled
-                   by the offset_of_node function.  If that changes,
-                   this will have to change too. */
+		 * by the offset_of_node function.  If that changes,
+		 * this will have to change too. */
 
 		if (expandable) {
 			GdkPixbuf *image;
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index f752e14834..b170604ade 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -131,9 +131,16 @@ ecv_unrealize (ECellView *ecv)
  * ECell::draw method
  */
 static void
-ecv_draw (ECellView *ecell_view, GdkDrawable *drawable,
-	  gint model_col, gint view_col, gint row, ECellFlags flags,
-	  gint x1, gint y1, gint x2, gint y2)
+ecv_draw (ECellView *ecell_view,
+          GdkDrawable *drawable,
+          gint model_col,
+          gint view_col,
+          gint row,
+          ECellFlags flags,
+          gint x1,
+          gint y1,
+          gint x2,
+          gint y2)
 {
 	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
 
@@ -143,12 +150,20 @@ ecv_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	for (i = 0; i < vbox_view->subcell_view_count; i++) {
 		/* Now cause our subcells to draw their contents,
 		   shifted by subcell_offset pixels */
-		gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row);
-		e_cell_draw (vbox_view->subcell_views[i], drawable,
-			     vbox_view->model_cols[i], view_col, row, flags,
-			     x1, y1 + subcell_offset, x2, y1 + subcell_offset + height);
-
-		subcell_offset += e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row);
+		gint height;
+
+		height = e_cell_height (
+			vbox_view->subcell_views[i],
+			vbox_view->model_cols[i], view_col, row);
+		e_cell_draw (
+			vbox_view->subcell_views[i], drawable,
+			vbox_view->model_cols[i], view_col, row, flags,
+			x1, y1 + subcell_offset, x2,
+			y1 + subcell_offset + height);
+
+		subcell_offset += e_cell_height (
+			vbox_view->subcell_views[i],
+			vbox_view->model_cols[i], view_col, row);
 	}
 }
 
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 9117262d52..16cc867f8c 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -31,9 +31,9 @@
 G_BEGIN_DECLS
 
 gdouble  e_table_header_compute_height (ETableCol *ecol,
-				       GtkWidget *widget);
-gdouble  e_table_header_width_extras    (GtkStyle       *style);
-void    e_table_header_draw_button     (GdkDrawable    *drawable,
+					GtkWidget *widget);
+gdouble  e_table_header_width_extras   (GtkStyle       *style);
+void     e_table_header_draw_button    (GdkDrawable    *drawable,
 					ETableCol      *ecol,
 					GtkStyle       *style,
 					GtkStateType    state,
-- 
cgit v1.2.3


From 992c8b7d58025cf4d04ed3665210f191c8048339 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 16 Jan 2011 13:24:31 -0500
Subject: libetable cleanups.

---
 widgets/table/e-cell-checkbox.c                    |   6 +-
 widgets/table/e-cell-checkbox.h                    |  38 +-
 widgets/table/e-cell-combo.c                       |  14 +-
 widgets/table/e-cell-combo.h                       |  47 +-
 widgets/table/e-cell-date-edit.c                   |   2 +-
 widgets/table/e-cell-date-edit.h                   |  29 +-
 widgets/table/e-cell-date.c                        |   4 +-
 widgets/table/e-cell-date.h                        |   2 +-
 widgets/table/e-cell-hbox.c                        |  14 +-
 widgets/table/e-cell-hbox.h                        |  68 +--
 widgets/table/e-cell-number.c                      |   4 +-
 widgets/table/e-cell-number.h                      |   2 +-
 widgets/table/e-cell-percent.h                     |   2 +-
 widgets/table/e-cell-pixbuf.c                      |  22 +-
 widgets/table/e-cell-pixbuf.h                      |  38 +-
 widgets/table/e-cell-popup.c                       |  16 +-
 widgets/table/e-cell-popup.h                       |  83 ++--
 widgets/table/e-cell-size.c                        |   4 +-
 widgets/table/e-cell-size.h                        |   2 +-
 widgets/table/e-cell-text.c                        |  16 +-
 widgets/table/e-cell-text.h                        |   2 +-
 widgets/table/e-cell-toggle.c                      |   2 +-
 widgets/table/e-cell-toggle.h                      |   2 +-
 widgets/table/e-cell-tree.c                        |  12 +-
 widgets/table/e-cell-tree.h                        |  50 ++-
 widgets/table/e-cell-vbox.c                        |  14 +-
 widgets/table/e-cell-vbox.h                        |  62 ++-
 widgets/table/e-cell.c                             |  40 +-
 widgets/table/e-cell.h                             | 340 ++++++++------
 widgets/table/e-table-click-to-add.c               |  14 +-
 widgets/table/e-table-click-to-add.h               |  50 ++-
 widgets/table/e-table-col.c                        |   4 +-
 widgets/table/e-table-col.h                        |   2 +-
 widgets/table/e-table-column-specification.c       |   8 +-
 widgets/table/e-table-column-specification.h       |  56 ++-
 widgets/table/e-table-config.c                     |  10 +-
 widgets/table/e-table-config.h                     |  67 +--
 widgets/table/e-table-extras.h                     |   3 +-
 widgets/table/e-table-field-chooser-dialog.c       |  13 +-
 widgets/table/e-table-field-chooser-dialog.h       |  46 +-
 widgets/table/e-table-field-chooser-item.c         |  10 +-
 widgets/table/e-table-field-chooser-item.h         |  37 +-
 widgets/table/e-table-field-chooser.c              |  11 +-
 widgets/table/e-table-field-chooser.h              |  47 +-
 widgets/table/e-table-group-container.c            |  12 +-
 widgets/table/e-table-group-container.h            |  80 ++--
 widgets/table/e-table-group-leaf.c                 |  12 +-
 widgets/table/e-table-group-leaf.h                 |  48 +-
 widgets/table/e-table-group.c                      |  48 +-
 widgets/table/e-table-group.h                      | 271 ++++++-----
 widgets/table/e-table-header-item.c                |  16 +-
 widgets/table/e-table-header-item.h                |  49 +-
 widgets/table/e-table-header-utils.h               |  32 +-
 widgets/table/e-table-header.c                     |  16 +-
 widgets/table/e-table-header.h                     | 135 +++---
 widgets/table/e-table-item.c                       |  30 +-
 widgets/table/e-table-item.h                       | 158 ++++---
 widgets/table/e-table-memory-callbacks.c           |  60 +--
 widgets/table/e-table-memory-callbacks.h           | 152 +++++--
 widgets/table/e-table-memory-store.c               |  61 +--
 widgets/table/e-table-memory-store.h               | 159 ++++---
 widgets/table/e-table-memory.c                     |  54 +--
 widgets/table/e-table-memory.h                     |  72 +--
 widgets/table/e-table-model.c                      |  58 +--
 widgets/table/e-table-model.h                      | 228 ++++++----
 widgets/table/e-table-one.c                        |  10 +-
 widgets/table/e-table-one.h                        |  45 +-
 widgets/table/e-table-search.c                     |  37 +-
 widgets/table/e-table-search.h                     |  63 +--
 widgets/table/e-table-selection-model.c            |  12 +-
 widgets/table/e-table-selection-model.h            |  42 +-
 widgets/table/e-table-sort-info.c                  |  12 +-
 widgets/table/e-table-sort-info.h                  | 127 +++---
 widgets/table/e-table-sorted-variable.c            |  10 +-
 widgets/table/e-table-sorted-variable.h            |  54 ++-
 widgets/table/e-table-sorted.c                     |  10 +-
 widgets/table/e-table-sorted.h                     |  53 ++-
 widgets/table/e-table-sorter.c                     |  10 +-
 widgets/table/e-table-sorter.h                     |  73 +--
 widgets/table/e-table-sorting-utils.h              |  96 ++--
 widgets/table/e-table-specification.c              |   4 +-
 widgets/table/e-table-specification.h              |  74 +--
 widgets/table/e-table-state.c                      |   6 +-
 widgets/table/e-table-state.h                      |  77 ++--
 widgets/table/e-table-subset-variable.c            |  14 +-
 widgets/table/e-table-subset-variable.h            | 104 +++--
 widgets/table/e-table-subset.c                     |  24 +-
 widgets/table/e-table-subset.h                     | 115 +++--
 widgets/table/e-table-utils.h                      |  23 +-
 widgets/table/e-table-without.c                    |  50 +--
 widgets/table/e-table-without.h                    | 102 +++--
 widgets/table/e-table.c                            |   6 +-
 widgets/table/e-table.h                            | 391 ++++++++--------
 widgets/table/e-tree-memory-callbacks.c            |   8 +-
 widgets/table/e-tree-memory-callbacks.h            | 162 +++++--
 widgets/table/e-tree-memory.c                      |  94 ++--
 widgets/table/e-tree-memory.h                      | 121 ++---
 widgets/table/e-tree-model.c                       | 118 ++---
 widgets/table/e-tree-model.h                       | 363 +++++++++------
 widgets/table/e-tree-selection-model.c             |  99 ++--
 widgets/table/e-tree-selection-model.h             |  80 ++--
 widgets/table/e-tree-sorted.c                      | 183 ++++----
 widgets/table/e-tree-sorted.h                      |  88 ++--
 widgets/table/e-tree-table-adapter.c               | 170 ++++---
 widgets/table/e-tree-table-adapter.h               | 152 ++++---
 widgets/table/e-tree.c                             | 287 +++++-------
 widgets/table/e-tree.h                             | 500 ++++++++++++---------
 widgets/table/gal-a11y-e-cell-popup.c              |   4 +-
 widgets/table/gal-a11y-e-cell-popup.h              |   1 -
 widgets/table/gal-a11y-e-cell-registry.c           |   4 +-
 widgets/table/gal-a11y-e-cell-registry.h           |   1 -
 widgets/table/gal-a11y-e-cell-toggle.c             |   6 +-
 widgets/table/gal-a11y-e-cell-tree.c               |   2 +-
 widgets/table/gal-a11y-e-cell-tree.h               |   1 -
 widgets/table/gal-a11y-e-cell-vbox.c               |   6 +-
 widgets/table/gal-a11y-e-cell.c                    |   6 +-
 widgets/table/gal-a11y-e-cell.h                    |   1 -
 .../table/gal-a11y-e-table-click-to-add-factory.c  |   4 +-
 .../table/gal-a11y-e-table-click-to-add-factory.h  |   1 -
 widgets/table/gal-a11y-e-table-click-to-add.c      |   6 +-
 widgets/table/gal-a11y-e-table-click-to-add.h      |   1 -
 widgets/table/gal-a11y-e-table-column-header.c     |  10 +-
 widgets/table/gal-a11y-e-table-column-header.h     |   1 -
 widgets/table/gal-a11y-e-table-factory.c           |   4 +-
 widgets/table/gal-a11y-e-table-factory.h           |   1 -
 widgets/table/gal-a11y-e-table-item-factory.c      |   4 +-
 widgets/table/gal-a11y-e-table-item-factory.h      |   1 -
 widgets/table/gal-a11y-e-table-item.c              |   8 +-
 widgets/table/gal-a11y-e-table-item.h              |   1 -
 widgets/table/gal-a11y-e-table.c                   |   6 +-
 widgets/table/gal-a11y-e-tree-factory.c            |   4 +-
 widgets/table/gal-a11y-e-tree-factory.h            |   1 -
 widgets/table/gal-a11y-e-tree.c                    |   6 +-
 133 files changed, 4096 insertions(+), 3130 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index 20f56b443e..de26a5df9f 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -61,9 +61,9 @@ ecc_print (ECellView *ecell_view, GtkPrintContext *context,
 }
 
 static void
-e_cell_checkbox_class_init (ECellCheckboxClass *klass)
+e_cell_checkbox_class_init (ECellCheckboxClass *class)
 {
-	ECellClass *ecc = E_CELL_CLASS (klass);
+	ECellClass *ecc = E_CELL_CLASS (class);
 
 	ecc->print = ecc_print;
 	checks[0] = gdk_pixbuf_new_from_xpm_data (check_empty_xpm);
@@ -93,5 +93,5 @@ e_cell_checkbox_init (ECellCheckbox *eccb)
 ECell *
 e_cell_checkbox_new (void)
 {
-	return g_object_new (E_CELL_CHECKBOX_TYPE, NULL);
+	return g_object_new (E_TYPE_CELL_CHECKBOX, NULL);
 }
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h
index fa05ecbb06..8306b2d29a 100644
--- a/widgets/table/e-cell-checkbox.h
+++ b/widgets/table/e-cell-checkbox.h
@@ -26,24 +26,40 @@
 
 #include <table/e-cell-toggle.h>
 
+/* Standard GObject macros */
+#define E_TYPE_CELL_CHECKBOX \
+	(e_cell_checkbox_get_type ())
+#define E_CELL_CHECKBOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_CHECKBOX, ECellCheckbox))
+#define E_CELL_CHECKBOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_CHECKBOX, ECellCheckboxClass))
+#define E_IS_CELL_CHECKBOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_CHECKBOX))
+#define E_IS_CELL_CHECKBOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_CHECKBOX))
+#define E_CELL_CHECKBOX_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_CHECKBOX, ECellCheckboxClass))
+
 G_BEGIN_DECLS
 
-#define E_CELL_CHECKBOX_TYPE        (e_cell_checkbox_get_type ())
-#define E_CELL_CHECKBOX(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_CHECKBOX_TYPE, ECellCheckbox))
-#define E_CELL_CHECKBOX_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_CHECKBOX_TYPE, ECellCheckboxClass))
-#define E_IS_CELL_CHECKBOX(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_CHECKBOX_TYPE))
-#define E_IS_CELL_CHECKBOX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_CHECKBOX_TYPE))
+typedef struct _ECellCheckbox ECellCheckbox;
+typedef struct _ECellCheckboxClass ECellCheckboxClass;
 
-typedef struct {
+struct _ECellCheckbox {
 	ECellToggle parent;
-} ECellCheckbox;
+};
 
-typedef struct {
+struct _ECellCheckboxClass {
 	ECellToggleClass parent_class;
-} ECellCheckboxClass;
+};
 
-GType      e_cell_checkbox_get_type (void);
-ECell     *e_cell_checkbox_new      (void);
+GType		e_cell_checkbox_get_type	(void) G_GNUC_CONST;
+ECell *		e_cell_checkbox_new		(void);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index c06e5450e8..168061e4e7 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -109,13 +109,13 @@ static gint e_cell_combo_key_press	(GtkWidget	*popup_window,
 static void e_cell_combo_update_cell	(ECellCombo	*ecc);
 static void e_cell_combo_restart_edit	(ECellCombo	*ecc);
 
-G_DEFINE_TYPE (ECellCombo, e_cell_combo, E_CELL_POPUP_TYPE)
+G_DEFINE_TYPE (ECellCombo, e_cell_combo, E_TYPE_CELL_POPUP)
 
 static void
-e_cell_combo_class_init			(ECellComboClass	*klass)
+e_cell_combo_class_init			(ECellComboClass	*class)
 {
-	ECellPopupClass *ecpc = E_CELL_POPUP_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	ECellPopupClass *ecpc = E_CELL_POPUP_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = e_cell_combo_dispose;
 
@@ -203,11 +203,9 @@ e_cell_combo_init			(ECellCombo	*ecc)
  * Returns: an ECellCombo object.
  */
 ECell *
-e_cell_combo_new			(void)
+e_cell_combo_new (void)
 {
-	ECellCombo *ecc = g_object_new (E_CELL_COMBO_TYPE, NULL);
-
-	return (ECell*) ecc;
+	return g_object_new (E_TYPE_CELL_COMBO, NULL);
 }
 
 /*
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
index 728addeed9..ec77dcd6f0 100644
--- a/widgets/table/e-cell-combo.h
+++ b/widgets/table/e-cell-combo.h
@@ -33,29 +33,50 @@
 
 #include <table/e-cell-popup.h>
 
-#define E_CELL_COMBO_TYPE        (e_cell_combo_get_type ())
-#define E_CELL_COMBO(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_COMBO_TYPE, ECellCombo))
-#define E_CELL_COMBO_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_COMBO_TYPE, ECellComboClass))
-#define E_IS_CELL_COMBO(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_COMBO_TYPE))
-#define E_IS_CELL_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE))
+/* Standard GObject macros */
+#define E_TYPE_CELL_COMBO \
+	(e_cell_combo_get_type ())
+#define E_CELL_COMBO(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_COMBO, ECellCombo))
+#define E_CELL_COMBO_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_COMBO, ECellComboClass))
+#define E_IS_CELL_COMBO(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_COMBO))
+#define E_IS_CELL_COMBO_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_COMBO))
+#define E_CELL_COMBO_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_COMBO, ECellComboClass))
 
-typedef struct {
+G_BEGIN_DECLS
+
+typedef struct _ECellCombo ECellCombo;
+typedef struct _ECellComboClass ECellComboClass;
+
+struct _ECellCombo {
 	ECellPopup parent;
 
 	GtkWidget *popup_window;
 	GtkWidget *popup_scrolled_window;
 	GtkWidget *popup_tree_view;
-} ECellCombo;
+};
 
-typedef struct {
+struct _ECellComboClass {
 	ECellPopupClass parent_class;
-} ECellComboClass;
+};
 
-GType      e_cell_combo_get_type		(void);
-ECell     *e_cell_combo_new			(void);
+GType		e_cell_combo_get_type		(void) G_GNUC_CONST;
+ECell *		e_cell_combo_new		(void);
 
 /* These must be UTF-8. */
-void       e_cell_combo_set_popdown_strings	(ECellCombo	*ecc,
-						 GList		*strings);
+void		e_cell_combo_set_popdown_strings
+						(ECellCombo *ecc,
+						 GList *strings);
+
+G_END_DECLS
 
 #endif /* _E_CELL_COMBO_H_ */
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 31d63d97cf..a71d3cc76c 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -114,7 +114,7 @@ enum {
 	PROP_UPPER_HOUR
 };
 
-G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE)
+G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_TYPE_CELL_POPUP)
 
 static void
 e_cell_date_edit_class_init (ECellDateEditClass *class)
diff --git a/widgets/table/e-cell-date-edit.h b/widgets/table/e-cell-date-edit.h
index 4de4dc1819..5224b0ddff 100644
--- a/widgets/table/e-cell-date-edit.h
+++ b/widgets/table/e-cell-date-edit.h
@@ -32,11 +32,26 @@
 #include <time.h>
 #include <table/e-cell-popup.h>
 
-#define E_CELL_DATE_EDIT_TYPE        (e_cell_date_edit_get_type ())
-#define E_CELL_DATE_EDIT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_DATE_EDIT_TYPE, ECellDateEdit))
-#define E_CELL_DATE_EDIT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), E_CELL_DATE_EDIT_TYPE, ECellDateEditClass))
-#define E_IS_CELL_DATE_EDIT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_DATE_EDIT_TYPE))
-#define E_IS_CELL_DATE_EDIT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TYPE))
+/* Standard GObject macros */
+#define E_TYPE_CELL_DATE_EDIT \
+	(e_cell_date_edit_get_type ())
+#define E_CELL_DATE_EDIT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_DATE_EDIT, ECellDateEdit))
+#define E_CELL_DATE_EDIT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_DATE_EDIT, ECellDateEditClass))
+#define E_IS_CELL_DATE_EDIT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_DATE_EDIT))
+#define E_IS_CELL_DATE_EDIT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_DATE_EDIT))
+#define E_CELL_DATE_EDIT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_DATE_EDIT, ECellDateEditClass))
+
+G_BEGIN_DECLS
 
 typedef struct _ECellDateEdit ECellDateEdit;
 typedef struct _ECellDateEditClass ECellDateEditClass;
@@ -81,7 +96,7 @@ struct _ECellDateEditClass {
 	ECellPopupClass parent_class;
 };
 
-GType		e_cell_date_edit_get_type	(void);
+GType		e_cell_date_edit_get_type	(void) G_GNUC_CONST;
 ECell *		e_cell_date_edit_new		(void);
 
 /* These freeze and thaw the rebuilding of the time list. They are useful when
@@ -99,4 +114,6 @@ void		e_cell_date_edit_set_get_time_callback
 						 gpointer data,
 						 GDestroyNotify destroy);
 
+G_END_DECLS
+
 #endif /* _E_CELL_DATE_EDIT_H_ */
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index c005b8371d..c4a4cf3103 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -61,9 +61,9 @@ ecd_free_text (ECellText *cell, gchar *text)
 }
 
 static void
-e_cell_date_class_init (ECellDateClass *klass)
+e_cell_date_class_init (ECellDateClass *class)
 {
-	ECellTextClass *ectc = E_CELL_TEXT_CLASS (klass);
+	ECellTextClass *ectc = E_CELL_TEXT_CLASS (class);
 
 	ectc->get_text  = ecd_get_text;
 	ectc->free_text = ecd_free_text;
diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h
index 5753d24642..c498095241 100644
--- a/widgets/table/e-cell-date.h
+++ b/widgets/table/e-cell-date.h
@@ -58,7 +58,7 @@ struct _ECellDateClass {
 	ECellTextClass parent_class;
 };
 
-GType		e_cell_date_get_type		(void);
+GType		e_cell_date_get_type		(void) G_GNUC_CONST;
 ECell *		e_cell_date_new			(const gchar *fontname,
 						 GtkJustification justify);
 void		e_cell_date_set_format_component
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 6f587db9d2..4053452705 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -39,7 +39,7 @@
 #include "e-cell-hbox.h"
 #include "e-table-item.h"
 
-G_DEFINE_TYPE (ECellHbox, e_cell_hbox, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellHbox, e_cell_hbox, E_TYPE_CELL)
 
 #define INDENT_AMOUNT 16
 #define MAX_CELL_SIZE 25
@@ -270,10 +270,10 @@ ecv_dispose (GObject *object)
 }
 
 static void
-e_cell_hbox_class_init (ECellHboxClass *klass)
+e_cell_hbox_class_init (ECellHboxClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ECellClass *ecc = E_CELL_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ECellClass *ecc = E_CELL_CLASS (class);
 
 	object_class->dispose = ecv_dispose;
 
@@ -287,7 +287,7 @@ e_cell_hbox_class_init (ECellHboxClass *klass)
 
 	ecc->max_width        = ecv_max_width;
 
-/*	gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_HBOX_TYPE, gal_a11y_e_cell_hbox_new); */
+/*	gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_HBOX, gal_a11y_e_cell_hbox_new); */
 }
 
 static void
@@ -309,9 +309,7 @@ e_cell_hbox_init (ECellHbox *ecv)
 ECell *
 e_cell_hbox_new (void)
 {
-	ECellHbox *ecv = g_object_new (E_CELL_HBOX_TYPE, NULL);
-
-	return (ECell *) ecv;
+	return g_object_new (E_TYPE_CELL_HBOX, NULL);
 }
 
 void
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index 42b1c60e61..41cc01e6a1 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -27,41 +27,59 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <table/e-cell.h>
 
+/* Standard GObject macros */
+#define E_TYPE_CELL_HBOX \
+	(e_cell_hbox_get_type ())
+#define E_CELL_HBOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_HBOX, ECellHbox))
+#define E_CELL_HBOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_HBOX, ECellHboxClass))
+#define E_IS_CELL_HBOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_HBOX))
+#define E_IS_CELL_HBOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_HBOX))
+#define E_CELL_HBOX_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_HBOX, ECellHboxClass))
+
 G_BEGIN_DECLS
 
-#define E_CELL_HBOX_TYPE        (e_cell_hbox_get_type ())
-#define E_CELL_HBOX(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_HBOX_TYPE, ECellHbox))
-#define E_CELL_HBOX_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_HBOX_TYPE, ECellHboxClass))
-#define E_IS_CELL_HBOX(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_HBOX_TYPE))
-#define E_IS_CELL_HBOX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_HBOX_TYPE))
+typedef struct _ECellHbox ECellHbox;
+typedef struct _ECellHboxView ECellHboxView;
+typedef struct _ECellHboxClass ECellHboxClass;
 
-typedef struct {
+struct _ECellHbox {
 	ECell parent;
 
-	gint     subcell_count;
+	gint subcell_count;
 	ECell **subcells;
-	gint    *model_cols;
-	gint    *def_size_cols;
-} ECellHbox;
+	gint *model_cols;
+	gint *def_size_cols;
+};
+
+struct _ECellHboxView {
+	ECellView cell_view;
 
-typedef struct {
-	ECellView     cell_view;
-	gint           subcell_view_count;
-	ECellView   **subcell_views;
-	gint          *model_cols;
-	gint    *def_size_cols;
-} ECellHboxView;
+	gint subcell_view_count;
+	ECellView **subcell_views;
+	gint *model_cols;
+	gint *def_size_cols;
+};
 
-typedef struct {
+struct _ECellHboxClass {
 	ECellClass parent_class;
-} ECellHboxClass;
+};
 
-GType    e_cell_hbox_get_type  (void);
-ECell   *e_cell_hbox_new       (void);
-void     e_cell_hbox_append    (ECellHbox *vbox,
-				ECell     *subcell,
-				gint model_col,
-				gint size);
+GType		e_cell_hbox_get_type		(void) G_GNUC_CONST;
+ECell *		e_cell_hbox_new			(void);
+void		e_cell_hbox_append		(ECellHbox *vbox,
+						 ECell *subcell,
+						 gint model_col,
+						 gint size);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 3fd5dcb123..72f25ce2f4 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -45,9 +45,9 @@ ecn_free_text (ECellText *cell, gchar *text)
 }
 
 static void
-e_cell_number_class_init (ECellNumberClass *klass)
+e_cell_number_class_init (ECellNumberClass *class)
 {
-	ECellTextClass *ectc = E_CELL_TEXT_CLASS (klass);
+	ECellTextClass *ectc = E_CELL_TEXT_CLASS (class);
 
 	ectc->get_text  = ecn_get_text;
 	ectc->free_text = ecn_free_text;
diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h
index 25e4d3aad6..539f27679e 100644
--- a/widgets/table/e-cell-number.h
+++ b/widgets/table/e-cell-number.h
@@ -58,7 +58,7 @@ struct _ECellNumberClass {
 	ECellTextClass parent_class;
 };
 
-GType		e_cell_number_get_type		(void);
+GType		e_cell_number_get_type		(void) G_GNUC_CONST;
 ECell *		e_cell_number_new		(const gchar *fontname,
 						 GtkJustification justify);
 
diff --git a/widgets/table/e-cell-percent.h b/widgets/table/e-cell-percent.h
index 691c8bc9fe..be4fdac9b7 100644
--- a/widgets/table/e-cell-percent.h
+++ b/widgets/table/e-cell-percent.h
@@ -63,7 +63,7 @@ struct _ECellPercentClass {
 	ECellTextClass parent_class;
 };
 
-GType		e_cell_percent_get_type		(void);
+GType		e_cell_percent_get_type		(void) G_GNUC_CONST;
 ECell *		e_cell_percent_new		(const gchar *fontname,
 						 GtkJustification justify);
 
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index f37d4b8757..b8662b9182 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -31,7 +31,7 @@
 #include <gtk/gtk.h>
 #include "e-cell-pixbuf.h"
 
-G_DEFINE_TYPE (ECellPixbuf, e_cell_pixbuf, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellPixbuf, e_cell_pixbuf, E_TYPE_CELL)
 
 typedef struct _ECellPixbufView ECellPixbufView;
 
@@ -56,19 +56,7 @@ enum {
 ECell *
 e_cell_pixbuf_new (void)
 {
-    ECellPixbuf *ecp;
-
-    ecp = g_object_new (E_CELL_PIXBUF_TYPE, NULL);
-    e_cell_pixbuf_construct (ecp);
-
-    return (ECell *) ecp;
-}
-
-void
-e_cell_pixbuf_construct (ECellPixbuf *ecp)
-{
-    /* noop */
-    return;
+	return g_object_new (E_TYPE_CELL_PIXBUF, NULL);
 }
 
 /*
@@ -334,10 +322,10 @@ e_cell_pixbuf_init (ECellPixbuf *ecp)
 }
 
 static void
-e_cell_pixbuf_class_init (ECellPixbufClass *klass)
+e_cell_pixbuf_class_init (ECellPixbufClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ECellClass *ecc = E_CELL_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ECellClass *ecc = E_CELL_CLASS (class);
 
 	object_class->dispose = pixbuf_dispose;
 	object_class->set_property = pixbuf_set_property;
diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h
index f6d3c5173d..f4848f7430 100644
--- a/widgets/table/e-cell-pixbuf.h
+++ b/widgets/table/e-cell-pixbuf.h
@@ -27,17 +27,32 @@
 
 #include <table/e-table.h>
 
-#define E_CELL_PIXBUF_TYPE		(e_cell_pixbuf_get_type ())
-#define E_CELL_PIXBUF(o)		(G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_PIXBUF_TYPE, ECellPixbuf))
-#define E_CELL_PIXBUF_CLASS(k)	(G_TYPE_CHECK_INSTANCE_CAST_CLASS ((k), E_CELL_PIXBUF_TYPE, ECellPixbufClass))
-#define E_IS_CELL_PIXBUF(o)		(G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_PIXBUF_TYPE))
-#define E_IS_CELL_PIXBUF_CLASS(k)	(G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_PIXBUF_TYPE))
+/* Standard GObject macros */
+#define E_TYPE_CELL_PIXBUF \
+	(e_cell_pixbuf_get_type ())
+#define E_CELL_PIXBUF(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_PIXBUF, ECellPixbuf))
+#define E_CELL_PIXBUF_CLASS(cls) \
+	(G_TYPE_CHECK_INSTANCE_CAST_CLASS \
+	((cls), E_TYPE_CELL_PIXBUF, ECellPixbufClass))
+#define E_IS_CELL_PIXBUF(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_PIXBUF))
+#define E_IS_CELL_PIXBUF_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_PIXBUF))
+#define E_CELL_PIXBUF_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_PIXBUF, ECellPixbufClass))
+
+G_BEGIN_DECLS
 
 typedef struct _ECellPixbuf ECellPixbuf;
 typedef struct _ECellPixbufClass ECellPixbufClass;
 
 struct _ECellPixbuf {
-    ECell parent;
+	ECell parent;
 
 	gint selected_column;
 	gint focused_column;
@@ -45,11 +60,12 @@ struct _ECellPixbuf {
 };
 
 struct _ECellPixbufClass {
-    ECellClass parent_class;
+	ECellClass parent_class;
 };
 
-GType   e_cell_pixbuf_get_type (void);
-ECell *e_cell_pixbuf_new (void);
-void e_cell_pixbuf_construct (ECellPixbuf *ecp);
+GType		e_cell_pixbuf_get_type		(void) G_GNUC_CONST;
+ECell *		e_cell_pixbuf_new		(void);
+
+G_END_DECLS
 
-#endif
+#endif /* _E_CELL_PIXBUF_H */
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index ad2009d0ac..5e89b6c37d 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -109,14 +109,14 @@ static gint e_cell_popup_do_popup	(ECellPopupView	*ecp_view,
 					 gint             row,
 					 gint             model_col);
 
-G_DEFINE_TYPE (ECellPopup, e_cell_popup, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellPopup, e_cell_popup, E_TYPE_CELL)
 
 static void
-e_cell_popup_class_init		(ECellPopupClass	*klass)
+e_cell_popup_class_init		(ECellPopupClass	*class)
 {
-	ECellClass *ecc = E_CELL_CLASS (klass);
+	ECellClass *ecc = E_CELL_CLASS (class);
 
-	G_OBJECT_CLASS (klass)->dispose = e_cell_popup_dispose;
+	G_OBJECT_CLASS (class)->dispose = e_cell_popup_dispose;
 
 	ecc->new_view     = ecp_new_view;
 	ecc->kill_view    = ecp_kill_view;
@@ -133,7 +133,7 @@ e_cell_popup_class_init		(ECellPopupClass	*klass)
 	ecc->get_bg_color = ecp_get_bg_color;
 
 	gal_a11y_e_cell_registry_add_cell_type (NULL,
-                                                E_CELL_POPUP_TYPE,
+                                                E_TYPE_CELL_POPUP,
                                                 gal_a11y_e_cell_popup_new);
 }
 
@@ -152,11 +152,9 @@ e_cell_popup_init		(ECellPopup	*ecp)
  * Returns: an ECellPopup object.
  */
 ECell *
-e_cell_popup_new		(void)
+e_cell_popup_new (void)
 {
-	ECellPopup *ecp = g_object_new (E_CELL_POPUP_TYPE, NULL);
-
-	return (ECell*) ecp;
+	return g_object_new (E_TYPE_CELL_POPUP, NULL);
 }
 
 static void
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index 99b9bd8fb6..6d04fb3c8d 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -35,60 +35,79 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <table/e-cell.h>
 
-#define E_CELL_POPUP_TYPE        (e_cell_popup_get_type ())
-#define E_CELL_POPUP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_POPUP_TYPE, ECellPopup))
-#define E_CELL_POPUP_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_POPUP_TYPE, ECellPopupClass))
-#define E_IS_CELL_POPUP(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_POPUP_TYPE))
-#define E_IS_CELL_POPUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_POPUP_TYPE))
-
+/* Standard GObject macros */
+#define E_TYPE_CELL_POPUP \
+	(e_cell_popup_get_type ())
+#define E_CELL_POPUP(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_POPUP, ECellPopup))
+#define E_CELL_POPUP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_POPUP, ECellPopupClass))
+#define E_IS_CELL_POPUP(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_POPUP))
+#define E_IS_CELL_POPUP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_POPUP))
+#define E_CELL_POPUP_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_POPUP, ECellPopupClass))
+
+G_BEGIN_DECLS
+
+typedef struct _ECellPopup ECellPopup;
 typedef struct _ECellPopupView ECellPopupView;
+typedef struct _ECellPopupClass ECellPopupClass;
 
-typedef struct {
+struct _ECellPopup {
 	ECell parent;
 
 	ECell *child;
 
 	/* This is TRUE if the popup window is shown for the cell being
 	   edited. While shown we display the arrow indented. */
-	gboolean	 popup_shown;
+	gboolean popup_shown;
 
 	/* This is TRUE if the popup arrow is shown for the cell being edited.
 	   This is needed to stop the first click on the cell from popping up
 	   the popup window. We only popup the window after we have drawn the
 	   arrow. */
-	gboolean	 popup_arrow_shown;
+	gboolean popup_arrow_shown;
 
 	/* The view in which the popup is shown. */
-	ECellPopupView	*popup_cell_view;
-
-	gint		 popup_view_col;
-	gint		 popup_row;
-	ETableModel	*popup_model;
-} ECellPopup;
+	ECellPopupView *popup_cell_view;
 
-typedef struct {
-	ECellClass parent_class;
-
-	/* Virtual function for subclasses to override. */
-	gint	   (*popup)        (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
-} ECellPopupClass;
+	gint popup_view_col;
+	gint popup_row;
+	ETableModel *popup_model;
+};
 
 struct _ECellPopupView {
-	ECellView	 cell_view;
+	ECellView cell_view;
 
-	ECellView	*child_view;
+	ECellView *child_view;
 };
 
-GType    e_cell_popup_get_type           (void);
-ECell   *e_cell_popup_new                (void);
+struct _ECellPopupClass {
+	ECellClass parent_class;
+
+	/* Virtual function for subclasses to override. */
+	gint		(*popup)		(ECellPopup *ecp,
+						 GdkEvent *event,
+						 gint row,
+						 gint view_col);
+};
 
-/* Get and set the child ECell. */
-ECell   *e_cell_popup_get_child          (ECellPopup *ecp);
-void     e_cell_popup_set_child          (ECellPopup *ecp,
-					  ECell      *child);
+GType		e_cell_popup_get_type		(void) G_GNUC_CONST;
+ECell *		e_cell_popup_new		(void);
+ECell *		e_cell_popup_get_child		(ECellPopup *ecp);
+void		e_cell_popup_set_child		(ECellPopup *ecp,
+						 ECell *child);
+void		e_cell_popup_set_shown		(ECellPopup *ecp,
+						 gboolean shown);
+void		e_cell_popup_queue_cell_redraw	(ECellPopup *ecp);
 
-void     e_cell_popup_set_shown          (ECellPopup *ecp,
-					  gboolean    shown);
-void     e_cell_popup_queue_cell_redraw  (ECellPopup *ecp);
+G_END_DECLS
 
 #endif /* _E_CELL_POPUP_H_ */
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index 90964c8f11..d624cf6cfa 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -57,9 +57,9 @@ ecd_free_text (ECellText *cell, gchar *text)
 }
 
 static void
-e_cell_size_class_init (ECellSizeClass *klass)
+e_cell_size_class_init (ECellSizeClass *class)
 {
-	ECellTextClass *ectc = E_CELL_TEXT_CLASS (klass);
+	ECellTextClass *ectc = E_CELL_TEXT_CLASS (class);
 
 	ectc->get_text  = ecd_get_text;
 	ectc->free_text = ecd_free_text;
diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h
index de4b56b673..8b52343b8a 100644
--- a/widgets/table/e-cell-size.h
+++ b/widgets/table/e-cell-size.h
@@ -59,7 +59,7 @@ struct _ECellSizeClass {
 	ECellTextClass parent_class;
 };
 
-GType		e_cell_size_get_type		(void);
+GType		e_cell_size_get_type		(void) G_GNUC_CONST;
 ECell *		e_cell_size_new			(const gchar *fontname,
 						 GtkJustification justify);
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 1b0545cc37..a4160419ae 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -105,7 +105,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 
 static GdkAtom clipboard_atom = GDK_NONE;
 
-G_DEFINE_TYPE (ECellText, e_cell_text, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellText, e_cell_text, E_TYPE_CELL)
 
 #define UTF8_ATOM  gdk_atom_intern ("UTF8_STRING", FALSE)
 
@@ -1153,7 +1153,7 @@ ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 		}
 		gtk_im_context_focus_in (edit->im_context);
 	}
-	
+
 #if 0
 	if (edit->pointer_in) {
 		if (edit->default_cursor_shown) {
@@ -1527,10 +1527,10 @@ static gchar *ellipsis_default = NULL;
 static gboolean use_ellipsis_default = TRUE;
 
 static void
-e_cell_text_class_init (ECellTextClass *klass)
+e_cell_text_class_init (ECellTextClass *class)
 {
-	ECellClass *ecc = E_CELL_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	ECellClass *ecc = E_CELL_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	const gchar *ellipsis_env;
 
 	object_class->finalize = ect_finalize;
@@ -1553,9 +1553,9 @@ e_cell_text_class_init (ECellTextClass *klass)
 	ecc->max_width_by_row = ect_max_width_by_row;
 	ecc->get_bg_color = ect_get_bg_color;
 
-	klass->get_text = ect_real_get_text;
-	klass->free_text = ect_real_free_text;
-	klass->set_value = ect_real_set_value;
+	class->get_text = ect_real_get_text;
+	class->free_text = ect_real_free_text;
+	class->set_value = ect_real_set_value;
 
 	object_class->get_property = ect_get_property;
 	object_class->set_property = ect_set_property;
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index 758e6d77af..ee3e1f5202 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -127,7 +127,7 @@ struct _ECellTextClass {
 						 gint model_col);
 };
 
-GType		e_cell_text_get_type		(void);
+GType		e_cell_text_get_type		(void) G_GNUC_CONST;
 ECell *		e_cell_text_new			(const gchar *fontname,
 						 GtkJustification justify);
 ECell *		e_cell_text_construct		(ECellText *cell,
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index c59cffa081..8ceca7c966 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -54,7 +54,7 @@ struct _ECellTogglePrivate {
 	gint height;
 };
 
-G_DEFINE_TYPE (ECellToggle, e_cell_toggle, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellToggle, e_cell_toggle, E_TYPE_CELL)
 
 typedef struct {
 	ECellView cell_view;
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
index be693b2e28..3bc223c229 100644
--- a/widgets/table/e-cell-toggle.h
+++ b/widgets/table/e-cell-toggle.h
@@ -64,7 +64,7 @@ struct _ECellToggleClass {
 	ECellClass parent_class;
 };
 
-GType		e_cell_toggle_get_type		(void);
+GType		e_cell_toggle_get_type		(void) G_GNUC_CONST;
 ECell *		e_cell_toggle_new		(const gchar **icon_names,
 						 guint n_icon_names);
 void		e_cell_toggle_construct		(ECellToggle *cell_toggle,
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 9129fba446..3793652524 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -48,7 +48,7 @@
 #include "e-tree-model.h"
 #include "e-tree-table-adapter.h"
 
-G_DEFINE_TYPE (ECellTree, e_cell_tree, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellTree, e_cell_tree, E_TYPE_CELL)
 
 typedef struct {
 	ECellView    cell_view;
@@ -701,10 +701,10 @@ ect_dispose (GObject *object)
 }
 
 static void
-e_cell_tree_class_init (ECellTreeClass *klass)
+e_cell_tree_class_init (ECellTreeClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ECellClass *ecc = E_CELL_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ECellClass *ecc = E_CELL_CLASS (class);
 
 	object_class->dispose = ect_dispose;
 
@@ -722,7 +722,7 @@ e_cell_tree_class_init (ECellTreeClass *klass)
 	ecc->max_width        = ect_max_width;
 	ecc->get_bg_color     = ect_get_bg_color;
 
-        gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TREE_TYPE, gal_a11y_e_cell_tree_new);
+        gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new);
 }
 
 static void
@@ -771,7 +771,7 @@ ECell *
 e_cell_tree_new (gboolean draw_lines,
 		 ECell *subcell)
 {
-	ECellTree *ect = g_object_new (E_CELL_TREE_TYPE, NULL);
+	ECellTree *ect = g_object_new (E_TYPE_CELL_TREE, NULL);
 
 	e_cell_tree_construct (ect, draw_lines, subcell);
 
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
index 98e874cb1f..cf43c47a1c 100644
--- a/widgets/table/e-cell-tree.h
+++ b/widgets/table/e-cell-tree.h
@@ -34,34 +34,50 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <table/e-cell.h>
 
+/* Standard GObject macros */
+#define E_TYPE_CELL_TREE \
+	(e_cell_tree_get_type ())
+#define E_CELL_TREE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_TREE, ECellTree))
+#define E_CELL_TREE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_TREE, ECellTreeClass))
+#define E_IS_CELL_TREE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_TREE))
+#define E_IS_CELL_TREE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_TREE))
+#define E_CELL_TREE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_TREE, ECellTreeClass))
+
 G_BEGIN_DECLS
 
-#define E_CELL_TREE_TYPE        (e_cell_tree_get_type ())
-#define E_CELL_TREE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_TREE_TYPE, ECellTree))
-#define E_CELL_TREE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_TREE_TYPE, ECellTreeClass))
-#define E_IS_CELL_TREE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_TREE_TYPE))
-#define E_IS_CELL_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_TREE_TYPE))
+typedef struct _ECellTree ECellTree;
+typedef struct _ECellTreeClass ECellTreeClass;
 
-typedef struct {
+struct _ECellTree {
 	ECell parent;
 
 	gboolean draw_lines;
 
 	ECell *subcell;
-} ECellTree;
+};
 
-typedef struct {
+struct _ECellTreeClass {
 	ECellClass parent_class;
-} ECellTreeClass;
-
-GType      e_cell_tree_get_type (void);
-ECell     *e_cell_tree_new      (gboolean draw_lines,
-				 ECell *subcell);
-void       e_cell_tree_construct (ECellTree *ect,
-				  gboolean draw_lines,
-				  ECell *subcell);
+};
 
-ECellView *e_cell_tree_view_get_subcell_view (ECellView *ect);
+GType		e_cell_tree_get_type		(void) G_GNUC_CONST;
+ECell *		e_cell_tree_new			(gboolean draw_lines,
+						 ECell *subcell);
+void		e_cell_tree_construct		(ECellTree *ect,
+						 gboolean draw_lines,
+						 ECell *subcell);
+ECellView *	e_cell_tree_view_get_subcell_view
+						(ECellView *ect);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index b170604ade..f57cd0e113 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -36,7 +36,7 @@
 #include "e-cell-vbox.h"
 #include "e-table-item.h"
 
-G_DEFINE_TYPE (ECellVbox, e_cell_vbox, E_CELL_TYPE)
+G_DEFINE_TYPE (ECellVbox, e_cell_vbox, E_TYPE_CELL)
 
 #define INDENT_AMOUNT 16
 
@@ -267,10 +267,10 @@ ecv_finalize (GObject *object)
 }
 
 static void
-e_cell_vbox_class_init (ECellVboxClass *klass)
+e_cell_vbox_class_init (ECellVboxClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ECellClass *ecc = E_CELL_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ECellClass *ecc = E_CELL_CLASS (class);
 
 	object_class->dispose = ecv_dispose;
 	object_class->finalize = ecv_finalize;
@@ -284,7 +284,7 @@ e_cell_vbox_class_init (ECellVboxClass *klass)
 	ecc->height           = ecv_height;
 	ecc->max_width        = ecv_max_width;
 
-	gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_VBOX_TYPE, gal_a11y_e_cell_vbox_new);
+	gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_VBOX, gal_a11y_e_cell_vbox_new);
 }
 
 static void
@@ -306,9 +306,7 @@ e_cell_vbox_init (ECellVbox *ecv)
 ECell *
 e_cell_vbox_new (void)
 {
-	ECellVbox *ecv = g_object_new (E_CELL_VBOX_TYPE, NULL);
-
-	return (ECell *) ecv;
+	return g_object_new (E_TYPE_CELL_VBOX, NULL);
 }
 
 void
diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h
index 52550a952f..2ab522c4ae 100644
--- a/widgets/table/e-cell-vbox.h
+++ b/widgets/table/e-cell-vbox.h
@@ -32,38 +32,56 @@
 #include <libgnomecanvas/libgnomecanvas.h>
 #include <table/e-cell.h>
 
+/* Standard GObject macros */
+#define E_TYPE_CELL_VBOX \
+	(e_cell_vbox_get_type ())
+#define E_CELL_VBOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL_VBOX, ECellVbox))
+#define E_CELL_VBOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL_VBOX, ECellVboxClass))
+#define E_IS_CELL_VBOX(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL_VBOX))
+#define E_IS_CELL_VBOX_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL_VBOX))
+#define E_CELL_VBOX_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL_VBOX, ECellVboxClass))
+
 G_BEGIN_DECLS
 
-#define E_CELL_VBOX_TYPE        (e_cell_vbox_get_type ())
-#define E_CELL_VBOX(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_VBOX_TYPE, ECellVbox))
-#define E_CELL_VBOX_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_VBOX_TYPE, ECellVboxClass))
-#define E_IS_CELL_VBOX(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_VBOX_TYPE))
-#define E_IS_CELL_VBOX_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_VBOX_TYPE))
+typedef struct _ECellVbox ECellVbox;
+typedef struct _ECellVboxView ECellVboxView;
+typedef struct _ECellVboxClass ECellVboxClass;
 
-typedef struct {
+struct _ECellVbox {
 	ECell parent;
 
-	gint     subcell_count;
+	gint subcell_count;
 	ECell **subcells;
-	gint    *model_cols;
-} ECellVbox;
+	gint *model_cols;
+};
+
+struct _ECellVboxView  {
+	ECellView cell_view;
 
-typedef struct {
-	ECellView     cell_view;
-	gint           subcell_view_count;
-	ECellView   **subcell_views;
-	gint          *model_cols;
-} ECellVboxView;
+	gint subcell_view_count;
+	ECellView **subcell_views;
+	gint *model_cols;
+};
 
-typedef struct {
+struct _ECellVboxClass {
 	ECellClass parent_class;
-} ECellVboxClass;
+};
 
-GType    e_cell_vbox_get_type  (void);
-ECell   *e_cell_vbox_new       (void);
-void     e_cell_vbox_append    (ECellVbox *vbox,
-				ECell     *subcell,
-				gint model_col);
+GType		e_cell_vbox_get_type		(void) G_GNUC_CONST;
+ECell *		e_cell_vbox_new			(void);
+void		e_cell_vbox_append		(ECellVbox *vbox,
+						 ECell *subcell,
+						 gint model_col);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index c45ed680d4..f54b644045 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -127,26 +127,26 @@ ec_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, g
 }
 
 static void
-e_cell_class_init (ECellClass *klass)
-{
-	klass->realize = ec_realize;
-	klass->unrealize = ec_unrealize;
-	klass->new_view = ec_new_view;
-	klass->kill_view = ec_kill_view;
-	klass->draw = ec_draw;
-	klass->event = ec_event;
-	klass->focus = ec_focus;
-	klass->unfocus = ec_unfocus;
-	klass->height = ec_height;
-	klass->enter_edit = ec_enter_edit;
-	klass->leave_edit = ec_leave_edit;
-	klass->save_state = ec_save_state;
-	klass->load_state = ec_load_state;
-	klass->free_state = ec_free_state;
-	klass->print = NULL;
-	klass->print_height = NULL;
-	klass->max_width = NULL;
-	klass->max_width_by_row = NULL;
+e_cell_class_init (ECellClass *class)
+{
+	class->realize = ec_realize;
+	class->unrealize = ec_unrealize;
+	class->new_view = ec_new_view;
+	class->kill_view = ec_kill_view;
+	class->draw = ec_draw;
+	class->event = ec_event;
+	class->focus = ec_focus;
+	class->unfocus = ec_unfocus;
+	class->height = ec_height;
+	class->enter_edit = ec_enter_edit;
+	class->leave_edit = ec_leave_edit;
+	class->save_state = ec_save_state;
+	class->load_state = ec_load_state;
+	class->free_state = ec_free_state;
+	class->print = NULL;
+	class->print_height = NULL;
+	class->max_width = NULL;
+	class->max_width_by_row = NULL;
 }
 
 static void
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index f38e47bfc4..111736f41c 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -27,14 +27,33 @@
 #include <gtk/gtk.h>
 #include <table/e-table-model.h>
 
+/* Standard GObject macros */
+#define E_TYPE_CELL \
+	(e_cell_get_type ())
+#define E_CELL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_CELL, ECell))
+#define E_CELL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_CELL, ECellClass))
+#define E_CELL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL, ECellClass))
+#define E_IS_CELL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_CELL))
+#define E_IS_CELL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_CELL))
+#define E_CELL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_CELL, ECellClass))
+
 G_BEGIN_DECLS
 
-#define E_CELL_TYPE         (e_cell_get_type ())
-#define E_CELL(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), E_CELL_TYPE, ECell))
-#define E_CELL_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), E_CELL_TYPE, ECellClass))
-#define E_CELL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_CELL_TYPE, ECellClass))
-#define E_IS_CELL(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_TYPE))
-#define E_IS_CELL_CLASS(k)  (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_TYPE))
+typedef struct _ECell ECell;
+typedef struct _ECellClass ECellClass;
+typedef struct _ECellView ECellView;
 
 typedef gboolean (*ETableSearchFunc) (gconstpointer haystack,
 				      const gchar *needle);
@@ -65,11 +84,7 @@ typedef enum {
 	E_CELL_UNGRAB         = 1 << 1
 } ECellActions;
 
-typedef struct {
-	GObject parent;
-} ECell;
-
-typedef struct _ECellView {
+struct _ECellView {
 	ECell *ecell;
 	ETableModel *e_table_model;
 	void        *e_table_item_view;
@@ -79,137 +94,200 @@ typedef struct _ECellView {
 
 	void  (*kill_view_cb) (struct _ECellView*, gpointer );
 	GList *kill_view_cb_data;
-} ECellView;
+};
 
 #define E_CELL_IS_FOCUSED(ecell_view) (ecell_view->focus_x1 != -1)
 
-typedef struct {
+struct _ECell {
+	GObject parent;
+};
+
+struct _ECellClass {
 	GObjectClass parent_class;
 
-	ECellView *(*new_view)         (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view);
-	void       (*kill_view)        (ECellView *ecell_view);
-
-	void       (*realize)          (ECellView *ecell_view);
-	void       (*unrealize)        (ECellView *ecell_view);
-
-	void	   (*draw)             (ECellView *ecell_view, GdkDrawable *drawable,
-					gint model_col, gint view_col, gint row,
-					ECellFlags flags, gint x1, gint y1, gint x2, gint y2);
-	gint	   (*event)            (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions);
-	void	   (*focus)            (ECellView *ecell_view, gint model_col, gint view_col,
-					gint row, gint x1, gint y1, gint x2, gint y2);
-	void	   (*unfocus)          (ECellView *ecell_view);
-	gint        (*height)           (ECellView *ecell_view, gint model_col, gint view_col, gint row);
-
-	void      *(*enter_edit)       (ECellView *ecell_view, gint model_col, gint view_col, gint row);
-	void       (*leave_edit)       (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context);
-	void      *(*save_state)       (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context);
-	void       (*load_state)       (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state);
-	void       (*free_state)       (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state);
-	void       (*print)            (ECellView *ecell_view, GtkPrintContext *context,
-					gint model_col, gint view_col, gint row,
-					gdouble width, gdouble height);
-	gdouble    (*print_height)     (ECellView *ecell_view,GtkPrintContext *context,
-					gint model_col, gint view_col, gint row, gdouble width);
-	gint        (*max_width)        (ECellView *ecell_view, gint model_col, gint view_col);
-	gint        (*max_width_by_row) (ECellView *ecell_view, gint model_col, gint view_col, gint row);
-	gchar     *(*get_bg_color)     (ECellView *ecell_view, gint row);
-
-	void       (*style_set)        (ECellView *ecell_view, GtkStyle *previous_style);
-} ECellClass;
-
-GType      e_cell_get_type                      (void);
+	ECellView *	(*new_view)		(ECell *ecell,
+						 ETableModel *table_model,
+						 gpointer e_table_item_view);
+	void		(*kill_view)		(ECellView *ecell_view);
+
+	void		(*realize)		(ECellView *ecell_view);
+	void		(*unrealize)		(ECellView *ecell_view);
+
+	void		(*draw)			(ECellView *ecell_view,
+						 GdkDrawable *drawable,
+						 gint model_col,
+						 gint view_col, gint row,
+						 ECellFlags flags,
+						 gint x1,
+						 gint y1,
+						 gint x2,
+						 gint y2);
+	gint		(*event)		(ECellView *ecell_view,
+						 GdkEvent *event,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 ECellFlags flags,
+						 ECellActions *actions);
+	void		(*focus)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gint x1,
+						 gint y1,
+						 gint x2,
+						 gint y2);
+	void		(*unfocus)		(ECellView *ecell_view);
+	gint		(*height)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row);
+
+	gpointer	(*enter_edit)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row);
+	void		(*leave_edit)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer context);
+	gpointer	(*save_state)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer context);
+	void		(*load_state)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer context,
+						 gpointer save_state);
+	void		(*free_state)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer save_state);
+	void		(*print)		(ECellView *ecell_view,
+						 GtkPrintContext *context,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gdouble width,
+						 gdouble height);
+	gdouble		(*print_height)		(ECellView *ecell_view,
+						 GtkPrintContext *context,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gdouble width);
+	gint		(*max_width)		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col);
+	gint		(*max_width_by_row)	(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row);
+	gchar *		(*get_bg_color)		(ECellView *ecell_view,
+						 gint row);
+
+	void		(*style_set)		(ECellView *ecell_view,
+						 GtkStyle *previous_style);
+};
+
+GType		e_cell_get_type			(void) G_GNUC_CONST;
 
 /* View creation methods. */
-ECellView *e_cell_new_view                      (ECell             *ecell,
-						 ETableModel       *table_model,
-						 void              *e_table_item_view);
-void       e_cell_kill_view                     (ECellView         *ecell_view);
+ECellView *	e_cell_new_view			(ECell *ecell,
+						 ETableModel *table_model,
+						 gpointer e_table_item_view);
+void		e_cell_kill_view		(ECellView *ecell_view);
 
 /* Cell View methods. */
-gint       e_cell_event                         (ECellView         *ecell_view,
-						 GdkEvent          *event,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 ECellFlags         flags,
-						 ECellActions      *actions);
-void       e_cell_realize                       (ECellView         *ecell_view);
-void       e_cell_unrealize                     (ECellView         *ecell_view);
-void       e_cell_draw                          (ECellView         *ecell_view,
-						 GdkDrawable       *drawable,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 ECellFlags         flags,
-						 gint                x1,
-						 gint                y1,
-						 gint                x2,
-						 gint                y2);
-void       e_cell_print                         (ECellView         *ecell_view,
+gint		e_cell_event			(ECellView *ecell_view,
+						 GdkEvent *event,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 ECellFlags flags,
+						 ECellActions *actions);
+void		e_cell_realize			(ECellView *ecell_view);
+void		e_cell_unrealize		(ECellView *ecell_view);
+void		e_cell_draw			(ECellView *ecell_view,
+						 GdkDrawable *drawable,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 ECellFlags flags,
+						 gint x1,
+						 gint y1,
+						 gint x2,
+						 gint y2);
+void		e_cell_print			(ECellView *ecell_view,
 						 GtkPrintContext *context,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 gdouble             width,
-						 gdouble             height);
-gdouble    e_cell_print_height                  (ECellView         *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gdouble width,
+						 gdouble height);
+gdouble		e_cell_print_height		(ECellView *ecell_view,
 						 GtkPrintContext *context,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 gdouble            width);
-gint        e_cell_max_width                     (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col);
-gint        e_cell_max_width_by_row              (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row);
-gboolean   e_cell_max_width_by_row_implemented  (ECellView         *ecell_view);
-gchar     *e_cell_get_bg_color                  (ECellView         *ecell_view,
-						 gint                row);
-void       e_cell_style_set                     (ECellView         *ecell_view,
-						 GtkStyle          *previous_style);
-
-void       e_cell_focus                         (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 gint                x1,
-						 gint                y1,
-						 gint                x2,
-						 gint                y2);
-void       e_cell_unfocus                       (ECellView         *ecell_view);
-gint        e_cell_height                        (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row);
-void      *e_cell_enter_edit                    (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row);
-void       e_cell_leave_edit                    (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 void              *edit_context);
-void      *e_cell_save_state                    (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 void              *edit_context);
-void       e_cell_load_state                    (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 void              *edit_context,
-						 void              *state);
-void       e_cell_free_state                    (ECellView         *ecell_view,
-						 gint                model_col,
-						 gint                view_col,
-						 gint                row,
-						 void              *state);
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gdouble width);
+gint		e_cell_max_width		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col);
+gint		e_cell_max_width_by_row		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row);
+gboolean	e_cell_max_width_by_row_implemented
+						(ECellView *ecell_view);
+gchar *		e_cell_get_bg_color		(ECellView *ecell_view,
+						 gint row);
+void		e_cell_style_set		(ECellView *ecell_view,
+						 GtkStyle *previous_style);
+
+void		e_cell_focus			(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gint x1,
+						 gint y1,
+						 gint x2,
+						 gint y2);
+void		e_cell_unfocus			(ECellView *ecell_view);
+gint		e_cell_height			(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row);
+gpointer	e_cell_enter_edit		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row);
+void		e_cell_leave_edit		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer edit_context);
+gpointer	e_cell_save_state		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer edit_context);
+void		e_cell_load_state		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer edit_context,
+						 gpointer state);
+void		e_cell_free_state		(ECellView *ecell_view,
+						 gint model_col,
+						 gint view_col,
+						 gint row,
+						 gpointer state);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index b3294ff293..d983c1b935 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -492,13 +492,13 @@ etcta_reflow (GnomeCanvasItem *item, gint flags)
 }
 
 static void
-etcta_class_init (ETableClickToAddClass *klass)
+etcta_class_init (ETableClickToAddClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-	klass->cursor_change = NULL;
-	klass->style_set     = etcta_style_set;
+	class->cursor_change = NULL;
+	class->style_set     = etcta_style_set;
 
 	object_class->dispose      = etcta_dispose;
 	object_class->set_property = etcta_set_property;
@@ -512,14 +512,14 @@ etcta_class_init (ETableClickToAddClass *klass)
 					 g_param_spec_object ("header",
 							      "Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MODEL,
 					 g_param_spec_object ("model",
 							      "Model",
 							      NULL,
-							      E_TABLE_MODEL_TYPE,
+							      E_TYPE_TABLE_MODEL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_MESSAGE,
diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
index 782cc6285a..49f8df334c 100644
--- a/widgets/table/e-table-click-to-add.h
+++ b/widgets/table/e-table-click-to-add.h
@@ -30,15 +30,31 @@
 #include <table/e-table-item.h>
 #include <table/e-table-selection-model.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_CLICK_TO_ADD \
+	(e_table_click_to_add_get_type ())
+#define E_TABLE_CLICK_TO_ADD(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_CLICK_TO_ADD, ETableClickToAdd))
+#define E_TABLE_CLICK_TO_ADD_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_CLICK_TO_ADD, ETableClickToAddClass))
+#define E_IS_TABLE_CLICK_TO_ADD(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_CLICK_TO_ADD))
+#define E_IS_TABLE_CLICK_TO_ADD_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_CLICK_TO_ADD))
+#define E_TABLE_CLICK_TO_ADD_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_CLICK_TO_ADD, ETableClickToAddClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_CLICK_TO_ADD_TYPE        (e_table_click_to_add_get_type ())
-#define E_TABLE_CLICK_TO_ADD(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAdd))
-#define E_TABLE_CLICK_TO_ADD_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_CLICK_TO_ADD_TYPE, ETableClickToAddClass))
-#define E_IS_TABLE_CLICK_TO_ADD(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_CLICK_TO_ADD_TYPE))
-#define E_IS_TABLE_CLICK_TO_ADD_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_CLICK_TO_ADD_TYPE))
+typedef struct _ETableClickToAdd ETableClickToAdd;
+typedef struct _ETableClickToAddClass ETableClickToAddClass;
 
-typedef struct {
+struct _ETableClickToAdd {
 	GnomeCanvasGroup  parent;
 
 	ETableModel      *one;    /* The ETableOne. */
@@ -56,21 +72,21 @@ typedef struct {
 	gdouble           height;
 
 	ETableSelectionModel *selection;
-} ETableClickToAdd;
+};
 
-typedef struct {
+struct _ETableClickToAddClass {
 	GnomeCanvasGroupClass parent_class;
 
-	/*
-	 * signals
-	 */
-	void (*cursor_change) (ETableClickToAdd *etcta, gint row, gint col);
-	void (*style_set) (ETableClickToAdd *etcta, GtkStyle *previous_style);
-} ETableClickToAddClass;
-
-GType      e_table_click_to_add_get_type (void);
+	/* Signals */
+	void		(*cursor_change)	(ETableClickToAdd *etcta,
+						 gint row,
+						 gint col);
+	void		(*style_set)		(ETableClickToAdd *etcta,
+						 GtkStyle *previous_style);
+};
 
-void       e_table_click_to_add_commit (ETableClickToAdd *etcta);
+GType		e_table_click_to_add_get_type	(void) G_GNUC_CONST;
+void		e_table_click_to_add_commit	(ETableClickToAdd *etcta);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index e4881ff755..1238d5c017 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -114,9 +114,9 @@ etc_get_property (GObject *object,
 }
 
 static void
-e_table_col_class_init (ETableColClass *klass)
+e_table_col_class_init (ETableColClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = etc_dispose;
 	object_class->set_property = etc_set_property;
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
index cbe3dc3a80..b82886a5ca 100644
--- a/widgets/table/e-table-col.h
+++ b/widgets/table/e-table-col.h
@@ -92,7 +92,7 @@ struct _ETableColClass {
 	GObjectClass parent_class;
 };
 
-GType		e_table_col_get_type		(void);
+GType		e_table_col_get_type		(void) G_GNUC_CONST;
 ETableCol *	e_table_col_new			(gint col_idx,
 						 const gchar *text,
 						 const gchar *icon_name,
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index e4e642db4f..9f7ea53ebe 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -66,9 +66,9 @@ etcs_finalize (GObject *object)
 }
 
 static void
-etcs_class_init (ETableColumnSpecificationClass *klass)
+etcs_class_init (ETableColumnSpecificationClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->finalize = etcs_finalize;
 }
@@ -95,9 +95,7 @@ etcs_init (ETableColumnSpecification *specification)
 ETableColumnSpecification *
 e_table_column_specification_new (void)
 {
-	ETableColumnSpecification *etcs = g_object_new (E_TABLE_COLUMN_SPECIFICATION_TYPE, NULL);
-
-	return (ETableColumnSpecification *) etcs;
+	return g_object_new (E_TYPE_TABLE_COLUMN_SPECIFICATION, NULL);
 }
 
 void
diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h
index 048decdf54..e20d7de6b5 100644
--- a/widgets/table/e-table-column-specification.h
+++ b/widgets/table/e-table-column-specification.h
@@ -23,21 +23,36 @@
 #ifndef _E_TABLE_COLUMN_SPECIFICATION_H_
 #define _E_TABLE_COLUMN_SPECIFICATION_H_
 
-#include <glib.h>
 #include <glib-object.h>
 #include <libxml/tree.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_COLUMN_SPECIFICATION \
+	(e_table_column_specification_get_type ())
+#define E_TABLE_COLUMN_SPECIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_COLUMN_SPECIFICATION, ETableColumnSpecification))
+#define E_TABLE_COLUMN_SPECIFICATION_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_COLUMN_SPECIFICATION, ETableColumnSpecificationClass))
+#define E_IS_TABLE_COLUMN_SPECIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_COLUMN_SPECIFICATION))
+#define E_IS_TABLE_COLUMN_SPECIFICATION_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_COLUMN_SPECIFICATION))
+#define E_TABLE_COLUMN_SPECIFICATION_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_COLUMN_SPECIFICATION, ETableColumnSpecificationClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_COLUMN_SPECIFICATION_TYPE        (e_table_column_specification_get_type ())
-#define E_TABLE_COLUMN_SPECIFICATION(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecification))
-#define E_TABLE_COLUMN_SPECIFICATION_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecificationClass))
-#define E_IS_TABLE_COLUMN_SPECIFICATION(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_COLUMN_SPECIFICATION_TYPE))
-#define E_IS_TABLE_COLUMN_SPECIFICATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_COLUMN_SPECIFICATION_TYPE))
-#define E_TABLE_COLUMN_SPECIFICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_COLUMN_SPECIFICATION_TYPE, ETableColumnSpecificationClass))
+typedef struct _ETableColumnSpecification ETableColumnSpecification;
+typedef struct _ETableColumnSpecificationClass ETableColumnSpecificationClass;
+
+struct _ETableColumnSpecification {
+	GObject parent;
 
-typedef struct {
-	GObject base;
 	gint model_col;
 	gint compare_col;
 	gchar *title;
@@ -53,20 +68,21 @@ typedef struct {
 	gchar *search;
 	gchar *sortable;
 	gint priority;
-} ETableColumnSpecification;
+};
 
-typedef struct {
+struct _ETableColumnSpecificationClass {
 	GObjectClass parent_class;
-} ETableColumnSpecificationClass;
-
-GType                      e_table_column_specification_get_type        (void);
-
-ETableColumnSpecification *e_table_column_specification_new             (void);
+};
 
-void                       e_table_column_specification_load_from_node  (ETableColumnSpecification *state,
-									 const xmlNode             *node);
-xmlNode                   *e_table_column_specification_save_to_node    (ETableColumnSpecification *state,
-									 xmlNode                   *parent);
+GType		e_table_column_specification_get_type	(void) G_GNUC_CONST;
+ETableColumnSpecification *
+		e_table_column_specification_new	(void);
+void		e_table_column_specification_load_from_node
+					(ETableColumnSpecification *state,
+					 const xmlNode *node);
+xmlNode *	e_table_column_specification_save_to_node
+					(ETableColumnSpecification *state,
+					 xmlNode *parent);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index cce43dc3c8..62db1d32b1 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -127,11 +127,11 @@ config_get_property (GObject *object,
 }
 
 static void
-e_table_config_class_init (ETableConfigClass *klass)
+e_table_config_class_init (ETableConfigClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-	klass->changed        = NULL;
+	class->changed        = NULL;
 
 	object_class->finalize = config_finalize;
 	object_class->get_property = config_get_property;
@@ -149,7 +149,7 @@ e_table_config_class_init (ETableConfigClass *klass)
 					 g_param_spec_object ("state",
 							      "State",
 							      NULL,
-							      E_TABLE_STATE_TYPE,
+							      E_TYPE_TABLE_STATE,
 							      G_PARAM_READABLE));
 }
 
@@ -1383,7 +1383,7 @@ e_table_config_new (const gchar          *header,
 		    ETableState         *state,
 		    GtkWindow           *parent_window)
 {
-	ETableConfig *config = g_object_new (E_TABLE_CONFIG_TYPE, NULL);
+	ETableConfig *config = g_object_new (E_TYPE_TABLE_CONFIG, NULL);
 	GtkDialog *dialog;
 	GtkWidget *widget;
 
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 4f690c97cc..083160772f 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -31,16 +31,33 @@
 #include <table/e-table.h>
 #include <gtk/gtk.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_CONFIG \
+	(e_table_config_get_type ())
+#define E_TABLE_CONFIG(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_CONFIG, ETableConfig))
+#define E_TABLE_CONFIG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_CONFIG, ETableConfigClass))
+#define E_IS_TABLE_CONFIG(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_CONFIG))
+#define E_IS_TABLE_CONFIG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_CONFIG))
+#define E_TABLE_CONFIG_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_CONFIG, ETableConfigClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_CONFIG_TYPE        (e_table_config_get_type ())
-#define E_TABLE_CONFIG(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_CONFIG_TYPE, ETableConfig))
-#define E_TABLE_CONFIG_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_CONFIG_TYPE, ETableConfigClass))
-#define E_IS_TABLE_CONFIG(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_CONFIG_TYPE))
-#define E_IS_TABLE_CONFIG_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_CONFIG_TYPE))
-#define E_TABLE_CONFIG_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_CONFIG_TYPE, ETableConfigClass))
+typedef struct _ETableConfigSortWidgets ETableConfigSortWidgets;
+
+typedef struct _ETableConfig ETableConfig;
+typedef struct _ETableConfigClass ETableConfigClass;
 
-typedef struct {
+struct _ETableConfigSortWidgets {
 	GtkWidget    *combo;
 	GtkWidget    *frames;
 	GtkWidget    *radio_ascending;
@@ -48,9 +65,9 @@ typedef struct {
 	GtkWidget    *view_check; /* Only for group dialog */
 	guint         changed_id, toggled_id;
 	gpointer e_table_config;
-} ETableConfigSortWidgets;
+};
 
-typedef struct {
+struct _ETableConfig {
 	GObject parent;
 
 	gchar *header;
@@ -86,26 +103,26 @@ typedef struct {
 	 * List of valid column names
 	 */
 	GSList *column_names;
-} ETableConfig;
+};
 
-typedef struct {
+struct _ETableConfigClass {
 	GObjectClass parent_class;
 
 	/* Signals */
-	void        (*changed)        (ETableConfig *config);
-} ETableConfigClass;
-
-GType         e_table_config_get_type  (void);
-ETableConfig *e_table_config_new       (const gchar          *header,
-					ETableSpecification *spec,
-					ETableState         *state,
-					GtkWindow           *parent_window);
-ETableConfig *e_table_config_construct (ETableConfig        *etco,
-					const gchar          *header,
-					ETableSpecification *spec,
-					ETableState         *state,
-					GtkWindow           *parent_window);
-void          e_table_config_raise     (ETableConfig        *config);
+	void		(*changed)		(ETableConfig *config);
+};
+
+GType		e_table_config_get_type		(void) G_GNUC_CONST;
+ETableConfig *	e_table_config_new		(const gchar *header,
+						 ETableSpecification *spec,
+						 ETableState *state,
+						 GtkWindow *parent_window);
+ETableConfig *e_table_config_construct		(ETableConfig *etco,
+						 const gchar *header,
+						 ETableSpecification *spec,
+						 ETableState *state,
+						 GtkWindow *parent_window);
+void		e_table_config_raise		(ETableConfig *config);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h
index 55af6a14d0..6b1ed4200f 100644
--- a/widgets/table/e-table-extras.h
+++ b/widgets/table/e-table-extras.h
@@ -27,6 +27,7 @@
 #include <table/e-cell.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
+/* Standard GObject macros */
 #define E_TYPE_TABLE_EXTRAS \
 	(e_table_extras_get_type ())
 #define E_TABLE_EXTRAS(obj) \
@@ -60,7 +61,7 @@ struct _ETableExtrasClass {
 	GObjectClass parent_class;
 };
 
-GType		e_table_extras_get_type		(void);
+GType		e_table_extras_get_type		(void) G_GNUC_CONST;
 ETableExtras *	e_table_extras_new		(void);
 void		e_table_extras_add_cell		(ETableExtras *extras,
 						 const gchar *id,
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index a4e96ec99c..9c24a64496 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -46,13 +46,13 @@ enum {
 G_DEFINE_TYPE (ETableFieldChooserDialog, e_table_field_chooser_dialog, GTK_TYPE_DIALOG)
 
 static void
-e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
+e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *class)
 {
 	GObjectClass *object_class;
 	GtkDialogClass *dialog_class;
 
-	object_class = (GObjectClass*) klass;
-	dialog_class = GTK_DIALOG_CLASS (klass);
+	object_class = (GObjectClass*) class;
+	dialog_class = GTK_DIALOG_CLASS (class);
 
 	object_class->dispose      = e_table_field_chooser_dialog_dispose;
 	object_class->set_property = e_table_field_chooser_dialog_set_property;
@@ -71,14 +71,14 @@ e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *klass)
 					 g_param_spec_object ("full_header",
 							      "Full Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 }
 
@@ -120,8 +120,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
 GtkWidget*
 e_table_field_chooser_dialog_new (void)
 {
-	GtkWidget *widget = g_object_new (E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, NULL);
-	return widget;
+	return g_object_new (E_TYPE_TABLE_FIELD_CHOOSER_DIALOG, NULL);
 }
 
 static void
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 01129ffa09..bd378bc89d 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -27,27 +27,30 @@
 #include <table/e-table-field-chooser.h>
 #include <table/e-table-header.h>
 
-G_BEGIN_DECLS
-
-/* ETableFieldChooserDialog - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
+#define E_TYPE_TABLE_FIELD_CHOOSER_DIALOG \
+	(e_table_field_chooser_dialog_get_type ())
+#define E_TABLE_FIELD_CHOOSER_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER_DIALOG, ETableFieldChooserDialog))
+#define E_TABLE_FIELD_CHOOSER_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_FIELD_CHOOSER_DIALOG, ETableFieldChooserDialogClass))
+#define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER_DIALOG))
+#define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_FIELD_CHOOSER_DIALOG))
+#define E_TABLE_FIELD_CHOOSER_DIALOG_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER_DIALOG, ETableFieldChooserDialogClass))
 
-#define E_TABLE_FIELD_CHOOSER_DIALOG_TYPE			(e_table_field_chooser_dialog_get_type ())
-#define E_TABLE_FIELD_CHOOSER_DIALOG(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, ETableFieldChooserDialog))
-#define E_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE, ETableFieldChooserDialogClass))
-#define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
+G_BEGIN_DECLS
 
-typedef struct _ETableFieldChooserDialog       ETableFieldChooserDialog;
-typedef struct _ETableFieldChooserDialogClass  ETableFieldChooserDialogClass;
+typedef struct _ETableFieldChooserDialog ETableFieldChooserDialog;
+typedef struct _ETableFieldChooserDialogClass ETableFieldChooserDialogClass;
 
-struct _ETableFieldChooserDialog
-{
+struct _ETableFieldChooserDialog {
 	GtkDialog parent;
 
 	/* item specific fields */
@@ -57,13 +60,12 @@ struct _ETableFieldChooserDialog
 	ETableHeader       *header;
 };
 
-struct _ETableFieldChooserDialogClass
-{
+struct _ETableFieldChooserDialogClass {
 	GtkDialogClass parent_class;
 };
 
-GtkWidget *e_table_field_chooser_dialog_new (void);
-GType      e_table_field_chooser_dialog_get_type (void);
+GType		e_table_field_chooser_dialog_get_type	(void) G_GNUC_CONST;
+GtkWidget *	e_table_field_chooser_dialog_new	(void);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 880731e5be..7a87db4302 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -639,10 +639,10 @@ etfci_event (GnomeCanvasItem *item, GdkEvent *e)
 }
 
 static void
-etfci_class_init (ETableFieldChooserItemClass *klass)
+etfci_class_init (ETableFieldChooserItemClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = etfci_dispose;
 	object_class->set_property = etfci_set_property;
@@ -666,14 +666,14 @@ etfci_class_init (ETableFieldChooserItemClass *klass)
 					 g_param_spec_object ("full_header",
 							      "Full Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_WIDTH,
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
index 5e38ba7037..066dd52ffb 100644
--- a/widgets/table/e-table-field-chooser-item.h
+++ b/widgets/table/e-table-field-chooser-item.h
@@ -28,16 +28,33 @@
 #include <libxml/tree.h>
 #include <table/e-table-header.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_FIELD_CHOOSER_ITEM \
+	(e_table_field_chooser_item_get_type ())
+#define E_TABLE_FIELD_CHOOSER_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER_ITEM, ETableFieldChooserItem))
+#define E_TABLE_FIELD_CHOOSER_ITEM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_FIELD_CHOOSER_ITEM, ETableFieldChooserItemClass))
+#define E_IS_TABLE_FIELD_CHOOSER_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER_ITEM))
+#define E_IS_TABLE_FIELD_CHOOSER_ITEM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_FIELD_CHOOSER_ITEM))
+#define E_TABLE_FIELD_CHOOSER_ITEM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER_ITEM, ETableFieldChooserItemClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_FIELD_CHOOSER_ITEM_TYPE        (e_table_field_chooser_item_get_type ())
-#define E_TABLE_FIELD_CHOOSER_ITEM(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItem))
-#define E_TABLE_FIELD_CHOOSER_ITEM_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE, ETableFieldChooserItemClass))
-#define E_IS_TABLE_FIELD_CHOOSER_ITEM(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_FIELD_CHOOSER_ITEM_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_FIELD_CHOOSER_ITEM_TYPE))
+typedef struct _ETableFieldChooserItem ETableFieldChooserItem;
+typedef struct _ETableFieldChooserItemClass ETableFieldChooserItemClass;
 
-typedef struct {
+struct _ETableFieldChooserItem {
 	GnomeCanvasItem  parent;
+
 	ETableHeader    *full_header;
 	ETableHeader    *header;
 	ETableHeader    *combined_header;
@@ -62,13 +79,13 @@ typedef struct {
 	gint              drag_col;
 	guint            drag_data_get_id;
         guint            drag_end_id;
-} ETableFieldChooserItem;
+};
 
-typedef struct {
+struct _ETableFieldChooserItemClass {
 	GnomeCanvasItemClass parent_class;
-} ETableFieldChooserItemClass;
+};
 
-GType      e_table_field_chooser_item_get_type (void);
+GType		e_table_field_chooser_item_get_type	(void) G_GNUC_CONST;
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 374507e1ee..557785df0c 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -52,11 +52,11 @@ enum {
 G_DEFINE_TYPE (ETableFieldChooser, e_table_field_chooser, GTK_TYPE_VBOX)
 
 static void
-e_table_field_chooser_class_init (ETableFieldChooserClass *klass)
+e_table_field_chooser_class_init (ETableFieldChooserClass *class)
 {
 	GObjectClass *object_class;
 
-	object_class = (GObjectClass*) klass;
+	object_class = (GObjectClass*) class;
 
 	object_class->set_property = e_table_field_chooser_set_property;
 	object_class->get_property = e_table_field_chooser_get_property;
@@ -73,14 +73,14 @@ e_table_field_chooser_class_init (ETableFieldChooserClass *klass)
 					 g_param_spec_object ("full_header",
 							      "Full Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 }
 
@@ -242,8 +242,7 @@ e_table_field_chooser_dispose (GObject *object)
 GtkWidget*
 e_table_field_chooser_new (void)
 {
-	GtkWidget *widget = GTK_WIDGET (g_object_new (E_TABLE_FIELD_CHOOSER_TYPE, NULL));
-	return widget;
+	return g_object_new (E_TYPE_TABLE_FIELD_CHOOSER, NULL);
 }
 
 static void
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index 01cbc39c64..743bf9eabe 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -28,27 +28,31 @@
 #include <table/e-table-header.h>
 #include <libgnomecanvas/libgnomecanvas.h>
 
-G_BEGIN_DECLS
-
-/* ETableFieldChooser - A dialog displaying information about a contact.
- *
- * The following arguments are available:
- *
- * name		type		read/write	description
- * --------------------------------------------------------------------------------
- */
+/* Standard GObject macros */
+#define E_TYPE_TABLE_FIELD_CHOOSER \
+	(e_table_field_chooser_get_type ())
+#define E_TABLE_FIELD_CHOOSER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER, ETableFieldChooser))
+#define E_TABLE_FIELD_CHOOSER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_FIELD_CHOOSER, ETableFieldChooserClass))
+#define E_IS_TABLE_FIELD_CHOOSER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER))
+#define E_IS_TABLE_FIELD_CHOOSER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_FIELD_CHOOSER))
+#define E_TABLE_FIELD_CHOOSER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_FIELD_CHOOSER, ETableFieldChooserClass))
 
-#define E_TABLE_FIELD_CHOOSER_TYPE			(e_table_field_chooser_get_type ())
-#define E_TABLE_FIELD_CHOOSER(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TABLE_FIELD_CHOOSER_TYPE, ETableFieldChooser))
-#define E_TABLE_FIELD_CHOOSER_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TABLE_FIELD_CHOOSER_TYPE, ETableFieldChooserClass))
-#define E_IS_TABLE_FIELD_CHOOSER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
-#define E_IS_TABLE_FIELD_CHOOSER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
+G_BEGIN_DECLS
 
-typedef struct _ETableFieldChooser       ETableFieldChooser;
-typedef struct _ETableFieldChooserClass  ETableFieldChooserClass;
+typedef struct _ETableFieldChooser ETableFieldChooser;
+typedef struct _ETableFieldChooserClass ETableFieldChooserClass;
 
-struct _ETableFieldChooser
-{
+struct _ETableFieldChooser {
 	GtkVBox parent;
 
 	/* item specific fields */
@@ -63,13 +67,12 @@ struct _ETableFieldChooser
 	ETableHeader *header;
 };
 
-struct _ETableFieldChooserClass
-{
+struct _ETableFieldChooserClass {
 	GtkVBoxClass parent_class;
 };
 
-GtkWidget *e_table_field_chooser_new (void);
-GType      e_table_field_chooser_get_type (void);
+GType		e_table_field_chooser_get_type	(void) G_GNUC_CONST;
+GtkWidget *	e_table_field_chooser_new	(void);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 12788ad6c4..6e8bbf4e61 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -46,7 +46,7 @@
 
 /* workaround for avoiding API breakage */
 #define etgc_get_type e_table_group_container_get_type
-G_DEFINE_TYPE (ETableGroupContainer, etgc, E_TABLE_GROUP_TYPE)
+G_DEFINE_TYPE (ETableGroupContainer, etgc, E_TYPE_TABLE_GROUP)
 
 /* The arguments we take */
 enum {
@@ -195,7 +195,7 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header
 
 	g_return_val_if_fail (parent != NULL, NULL);
 
-	etgc = g_object_new (E_TABLE_GROUP_CONTAINER_TYPE, NULL);
+	etgc = g_object_new (E_TYPE_TABLE_GROUP_CONTAINER, NULL);
 
 	e_table_group_container_construct (parent, etgc, full_header, header,
 					   model, sort_info, n);
@@ -916,11 +916,11 @@ etgc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 }
 
 static void
-etgc_class_init (ETableGroupContainerClass *klass)
+etgc_class_init (ETableGroupContainerClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS (class);
 
 	object_class->dispose = etgc_dispose;
 	object_class->set_property = etgc_set_property;
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index b0d819be2b..5ea0910ef0 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -30,15 +30,33 @@
 #include <table/e-table-group.h>
 #include <table/e-table-item.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_GROUP_CONTAINER \
+	(e_table_group_container_get_type ())
+#define E_TABLE_GROUP_CONTAINER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_GROUP_CONTAINER, ETableGroupContainer))
+#define E_TABLE_GROUP_CONTAINER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_GROUP_CONTAINER, ETableGroupContainerClass))
+#define E_IS_TABLE_GROUP_CONTAINER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_GROUP_CONTAINER))
+#define E_IS_TABLE_GROUP_CONTAINER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_GROUP_CONTAINER))
+#define E_TABLE_GROUP_CONTAINER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_GROUP_CONTAINER, ETableGroupContainerClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_GROUP_CONTAINER_TYPE        (e_table_group_container_get_type ())
-#define E_TABLE_GROUP_CONTAINER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainer))
-#define E_TABLE_GROUP_CONTAINER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_GROUP_CONTAINER_TYPE, ETableGroupContainerClass))
-#define E_IS_TABLE_GROUP_CONTAINER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_GROUP_CONTAINER_TYPE))
-#define E_IS_TABLE_GROUP_CONTAINER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_CONTAINER_TYPE))
+typedef struct _ETableGroupContainer ETableGroupContainer;
+typedef struct _ETableGroupContainerClass ETableGroupContainerClass;
+
+typedef struct _ETableGroupContainerChildNode ETableGroupContainerChildNode;
 
-typedef struct {
+struct _ETableGroupContainer {
 	ETableGroup group;
 
 	/*
@@ -78,29 +96,37 @@ typedef struct {
 	 * State: the ETableGroup is open or closed
 	 */
 	guint open:1;
-} ETableGroupContainer;
+};
 
-typedef struct {
+struct _ETableGroupContainerClass {
 	ETableGroupClass parent_class;
-} ETableGroupContainerClass;
-
-typedef struct {
-        ETableGroup *child;
-        gpointer key;
-        gchar *string;
-        GnomeCanvasItem *text;
-        GnomeCanvasItem *rect;
-        gint count;
-} ETableGroupContainerChildNode;
-
-ETableGroup *e_table_group_container_new       (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader     *header,
-						ETableModel *model, ETableSortInfo *sort_info, gint n);
-void         e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
-						ETableHeader *full_header,
-						ETableHeader     *header,
-						ETableModel *model, ETableSortInfo *sort_info, gint n);
-
-GType        e_table_group_container_get_type  (void);
+};
+
+struct _ETableGroupContainerChildNode {
+	ETableGroup *child;
+	gpointer key;
+	gchar *string;
+	GnomeCanvasItem *text;
+	GnomeCanvasItem *rect;
+	gint count;
+};
+
+GType		e_table_group_container_get_type
+						(void) G_GNUC_CONST;
+ETableGroup *	e_table_group_container_new	(GnomeCanvasGroup *parent,
+						 ETableHeader *full_header,
+						 ETableHeader *header,
+						 ETableModel *model,
+						 ETableSortInfo *sort_info,
+						 gint n);
+void		e_table_group_container_construct
+						(GnomeCanvasGroup *parent,
+						 ETableGroupContainer *etgc,
+						 ETableHeader *full_header,
+						 ETableHeader *header,
+						 ETableModel *model,
+						 ETableSortInfo *sort_info,
+						 gint n);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index a874e44601..2f287c2abf 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -37,7 +37,7 @@
 
 /* workaround for avoiding APi breakage */
 #define etgl_get_type e_table_group_leaf_get_type
-G_DEFINE_TYPE (ETableGroupLeaf, etgl, E_TABLE_GROUP_TYPE)
+G_DEFINE_TYPE (ETableGroupLeaf, etgl, E_TYPE_TABLE_GROUP)
 
 /* The arguments we take */
 enum {
@@ -158,7 +158,7 @@ e_table_group_leaf_new (GnomeCanvasGroup *parent,
 
 	g_return_val_if_fail (parent != NULL, NULL);
 
-	etgl = g_object_new (E_TABLE_GROUP_LEAF_TYPE, NULL);
+	etgl = g_object_new (E_TYPE_TABLE_GROUP_LEAF, NULL);
 
 	e_table_group_leaf_construct (parent, etgl, full_header,
 				      header, model, sort_info);
@@ -584,11 +584,11 @@ etgl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 }
 
 static void
-etgl_class_init (ETableGroupLeafClass *klass)
+etgl_class_init (ETableGroupLeafClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	ETableGroupClass *e_group_class = E_TABLE_GROUP_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = etgl_dispose;
 	object_class->set_property = etgl_set_property;
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 55efc2d655..beed62e7d1 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -29,15 +29,31 @@
 #include <table/e-table-subset.h>
 #include <table/e-table-item.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_GROUP_LEAF \
+	(e_table_group_leaf_get_type ())
+#define E_TABLE_GROUP_LEAF(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_GROUP_LEAF, ETableGroupLeaf))
+#define E_TABLE_GROUP_LEAF_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_GROUP_LEAF, ETableGroupLeafClass))
+#define E_IS_TABLE_GROUP_LEAF(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_GROUP_LEAF))
+#define E_IS_TABLE_GROUP_LEAF_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_GROUP_LEAF))
+#define E_TABLE_GROUP_LEAF_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_GROUP_LEAF, ETableGroupLeafClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_GROUP_LEAF_TYPE        (e_table_group_leaf_get_type ())
-#define E_TABLE_GROUP_LEAF(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeaf))
-#define E_TABLE_GROUP_LEAF_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_GROUP_LEAF_TYPE, ETableGroupLeafClass))
-#define E_IS_TABLE_GROUP_LEAF(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_GROUP_LEAF_TYPE))
-#define E_IS_TABLE_GROUP_LEAF_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_LEAF_TYPE))
+typedef struct _ETableGroupLeaf ETableGroupLeaf;
+typedef struct _ETableGroupLeafClass ETableGroupLeafClass;
 
-typedef struct {
+struct _ETableGroupLeaf {
 	ETableGroup group;
 
 	/*
@@ -70,18 +86,18 @@ typedef struct {
 	gint etgl_start_drag_id;
 
 	ESelectionModel *selection_model;
-} ETableGroupLeaf;
+};
 
-typedef struct {
+struct _ETableGroupLeafClass {
 	ETableGroupClass parent_class;
-} ETableGroupLeafClass;
-
-ETableGroup *e_table_group_leaf_new       (GnomeCanvasGroup *parent,
-					   ETableHeader *full_header,
-					   ETableHeader     *header,
-					   ETableModel *model,
-					   ETableSortInfo *sort_info);
-GType        e_table_group_leaf_get_type  (void);
+};
+
+GType		e_table_group_leaf_get_type	(void) G_GNUC_CONST;
+ETableGroup *	e_table_group_leaf_new		(GnomeCanvasGroup *parent,
+						 ETableHeader *full_header,
+						 ETableHeader *header,
+						 ETableModel *model,
+						 ETableSortInfo *sort_info);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index c69b23d4d5..2b6f3e971a 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -642,36 +642,36 @@ etg_get_focus (ETableGroup      *etg)
 }
 
 static void
-etg_class_init (ETableGroupClass *klass)
+etg_class_init (ETableGroupClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = etg_dispose;
 
 	item_class->event = etg_event;
 
-	klass->cursor_change = NULL;
-	klass->cursor_activated = NULL;
-	klass->double_click = NULL;
-	klass->right_click = NULL;
-	klass->click = NULL;
-	klass->key_press = NULL;
-	klass->start_drag = NULL;
-
-	klass->add = NULL;
-	klass->add_array = NULL;
-	klass->add_all = NULL;
-	klass->remove = NULL;
-	klass->row_count  = NULL;
-	klass->increment  = NULL;
-	klass->decrement  = NULL;
-	klass->set_focus  = NULL;
-	klass->get_focus = etg_get_focus;
-	klass->get_printable = NULL;
-	klass->compute_location = NULL;
-	klass->get_mouse_over = NULL;
-	klass->get_cell_geometry = NULL;
+	class->cursor_change = NULL;
+	class->cursor_activated = NULL;
+	class->double_click = NULL;
+	class->right_click = NULL;
+	class->click = NULL;
+	class->key_press = NULL;
+	class->start_drag = NULL;
+
+	class->add = NULL;
+	class->add_array = NULL;
+	class->add_all = NULL;
+	class->remove = NULL;
+	class->row_count  = NULL;
+	class->increment  = NULL;
+	class->decrement  = NULL;
+	class->set_focus  = NULL;
+	class->get_focus = etg_get_focus;
+	class->get_printable = NULL;
+	class->compute_location = NULL;
+	class->get_mouse_over = NULL;
+	class->get_cell_geometry = NULL;
 
 	etg_signals[CURSOR_CHANGE] =
 		g_signal_new ("cursor_change",
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index 157c70756a..5731dfdeaf 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -7,7 +7,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -32,15 +32,31 @@
 #include <e-util/e-util.h>
 #include <misc/e-printable.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_GROUP \
+	(e_table_group_get_type ())
+#define E_TABLE_GROUP(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_GROUP, ETableGroup))
+#define E_TABLE_GROUP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_GROUP, ETableGroupClass))
+#define E_IS_TABLE_GROUP(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_GROUP))
+#define E_IS_TABLE_GROUP_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_GROUP))
+#define E_TABLE_GROUP_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_GROUP, ETableGroupClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_GROUP_TYPE        (e_table_group_get_type ())
-#define E_TABLE_GROUP(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_GROUP_TYPE, ETableGroup))
-#define E_TABLE_GROUP_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_GROUP_TYPE, ETableGroupClass))
-#define E_IS_TABLE_GROUP(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_GROUP_TYPE))
-#define E_IS_TABLE_GROUP_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_GROUP_TYPE))
+typedef struct _ETableGroup ETableGroup;
+typedef struct _ETableGroupClass ETableGroupClass;
 
-typedef struct {
+struct _ETableGroup {
 	GnomeCanvasGroup group;
 
 	/*
@@ -63,119 +79,158 @@ typedef struct {
 	guint has_focus : 1;
 
 	guint frozen : 1;
-} ETableGroup;
+};
 
-typedef struct {
+struct _ETableGroupClass {
 	GnomeCanvasGroupClass parent_class;
 
 	/* Signals */
-	void        (*cursor_change)         (ETableGroup *etg, gint row);
-	void        (*cursor_activated)      (ETableGroup *etg, gint row);
-	void        (*double_click)          (ETableGroup *etg, gint row, gint col, GdkEvent *event);
-	gboolean    (*right_click)           (ETableGroup *etg, gint row, gint col, GdkEvent *event);
-	gboolean    (*click)                 (ETableGroup *etg, gint row, gint col, GdkEvent *event);
-	gboolean    (*key_press)             (ETableGroup *etg, gint row, gint col, GdkEvent *event);
-	gint        (*start_drag)            (ETableGroup *etg, gint row, gint col, GdkEvent *event);
+	void		(*cursor_change)	(ETableGroup *etg,
+						 gint row);
+	void		(*cursor_activated)	(ETableGroup *etg,
+						 gint row);
+	void		(*double_click)		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*right_click)		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*click)		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*key_press)		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gint		(*start_drag)		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
 
 	/* Virtual functions. */
-	void        (*add)                   (ETableGroup *etg, gint row);
-	void        (*add_array)             (ETableGroup *etg, const gint *array, gint count);
-	void        (*add_all)               (ETableGroup *etg);
-	gboolean    (*remove)                (ETableGroup *etg, gint row);
-	gint        (*row_count)             (ETableGroup *etg);
-	void        (*increment)             (ETableGroup *etg, gint position, gint amount);
-	void        (*decrement)             (ETableGroup *etg, gint position, gint amount);
-	void        (*set_focus)             (ETableGroup *etg, EFocus direction, gint view_col);
-	gboolean    (*get_focus)             (ETableGroup *etg);
-	gint        (*get_focus_column)      (ETableGroup *etg);
-	EPrintable *(*get_printable)         (ETableGroup *etg);
-	void        (*compute_location)      (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col);
-	void        (*get_mouse_over)        (ETableGroup *etg, gint *row, gint *col);
-	void        (*get_cell_geometry)     (ETableGroup *etg, gint *row, gint *col, gint *x, gint *y, gint *width, gint *height);
-
-} ETableGroupClass;
+	void		(*add)			(ETableGroup *etg,
+						 gint row);
+	void		(*add_array)		(ETableGroup *etg,
+						 const gint *array,
+						 gint count);
+	void		(*add_all)		(ETableGroup *etg);
+	gboolean	(*remove)		(ETableGroup *etg,
+						 gint row);
+	gint		(*row_count)		(ETableGroup *etg);
+	void		(*increment)		(ETableGroup *etg,
+						 gint position,
+						 gint amount);
+	void		(*decrement)		(ETableGroup *etg,
+						 gint position,
+						 gint amount);
+	void		(*set_focus)		(ETableGroup *etg,
+						 EFocus direction,
+						 gint view_col);
+	gboolean	(*get_focus)		(ETableGroup *etg);
+	gint		(*get_focus_column)	(ETableGroup *etg);
+	EPrintable *	(*get_printable)	(ETableGroup *etg);
+	void		(*compute_location)	(ETableGroup *etg,
+						 gint *x,
+						 gint *y,
+						 gint *row,
+						 gint *col);
+	void		(*get_mouse_over)	(ETableGroup *etg,
+						 gint *row,
+						 gint *col);
+	void		(*get_cell_geometry)	(ETableGroup *etg,
+						 gint *row,
+						 gint *col,
+						 gint *x,
+						 gint *y,
+						 gint *width,
+						 gint *height);
+};
+
+GType		e_table_group_get_type		(void) G_GNUC_CONST;
+ETableGroup *	e_table_group_new		(GnomeCanvasGroup *parent,
+						 ETableHeader *full_header,
+						 ETableHeader *header,
+						 ETableModel *model,
+						 ETableSortInfo *sort_info,
+						 gint n);
+void		e_table_group_construct		(GnomeCanvasGroup *parent,
+						 ETableGroup *etg,
+						 ETableHeader *full_header,
+						 ETableHeader *header,
+						 ETableModel *model);
 
 /* Virtual functions */
-void          e_table_group_add               (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_add_array         (ETableGroup       *etg,
-					       const gint         *array,
-					       gint                count);
-void          e_table_group_add_all           (ETableGroup       *etg);
-gboolean      e_table_group_remove            (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_increment         (ETableGroup       *etg,
-					       gint               position,
-					       gint               amount);
-void          e_table_group_decrement         (ETableGroup       *etg,
-					       gint               position,
-					       gint               amount);
-gint          e_table_group_row_count         (ETableGroup       *etg);
-void          e_table_group_set_focus         (ETableGroup       *etg,
-					       EFocus             direction,
-					       gint               view_col);
-gboolean      e_table_group_get_focus         (ETableGroup       *etg);
-gint          e_table_group_get_focus_column  (ETableGroup       *etg);
-ETableHeader *e_table_group_get_header        (ETableGroup       *etg);
-EPrintable   *e_table_group_get_printable     (ETableGroup       *etg);
-void          e_table_group_compute_location  (ETableGroup       *etg,
-					       gint               *x,
-					       gint               *y,
-					       gint               *row,
-					       gint               *col);
-void          e_table_group_get_mouse_over (ETableGroup       *etg,
-					       gint               *row,
-					       gint               *col);
-void          e_table_group_get_cell_geometry (ETableGroup       *etg,
-					       gint               *row,
-					       gint               *col,
-					       gint               *x,
-					       gint               *y,
-					       gint               *width,
-					       gint               *height);
-ETableGroup  *e_table_group_new               (GnomeCanvasGroup  *parent,
-					       ETableHeader      *full_header,
-					       ETableHeader      *header,
-					       ETableModel       *model,
-					       ETableSortInfo    *sort_info,
-					       gint                n);
-void          e_table_group_construct         (GnomeCanvasGroup  *parent,
-					       ETableGroup       *etg,
-					       ETableHeader      *full_header,
-					       ETableHeader      *header,
-					       ETableModel       *model);
+void		e_table_group_add		(ETableGroup *etg,
+						 gint row);
+void		e_table_group_add_array		(ETableGroup *etg,
+						 const gint *array,
+						 gint count);
+void		e_table_group_add_all		(ETableGroup *etg);
+gboolean	e_table_group_remove		(ETableGroup *etg,
+						 gint row);
+void		e_table_group_increment		(ETableGroup *etg,
+						 gint position,
+						 gint amount);
+void		e_table_group_decrement		(ETableGroup *etg,
+						 gint position,
+						 gint amount);
+gint		e_table_group_row_count		(ETableGroup *etg);
+void		e_table_group_set_focus		(ETableGroup *etg,
+						 EFocus direction,
+						 gint view_col);
+gboolean	e_table_group_get_focus		(ETableGroup *etg);
+gint		e_table_group_get_focus_column	(ETableGroup *etg);
+ETableHeader *	e_table_group_get_header	(ETableGroup *etg);
+EPrintable *	e_table_group_get_printable	(ETableGroup *etg);
+void		e_table_group_compute_location	(ETableGroup *etg,
+						 gint *x,
+						 gint *y,
+						 gint *row,
+						 gint *col);
+void		e_table_group_get_mouse_over	(ETableGroup *etg,
+						 gint *row,
+						 gint *col);
+void		e_table_group_get_cell_geometry	(ETableGroup *etg,
+						 gint *row,
+						 gint *col,
+						 gint *x,
+						 gint *y,
+						 gint *width,
+						 gint *height);
 
 /* For emitting the signals */
-void          e_table_group_cursor_change     (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_cursor_activated  (ETableGroup       *etg,
-					       gint               row);
-void          e_table_group_double_click      (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gboolean      e_table_group_right_click       (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gboolean      e_table_group_click             (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gboolean      e_table_group_key_press         (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-gint          e_table_group_start_drag        (ETableGroup       *etg,
-					       gint               row,
-					       gint               col,
-					       GdkEvent          *event);
-GType         e_table_group_get_type          (void);
+void		e_table_group_cursor_change	(ETableGroup *etg,
+						 gint row);
+void		e_table_group_cursor_activated	(ETableGroup *etg,
+						 gint row);
+void		e_table_group_double_click	(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+gboolean	e_table_group_right_click	(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+gboolean	e_table_group_click		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+gboolean	e_table_group_key_press		(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+gint		e_table_group_start_drag	(ETableGroup *etg,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
 
 typedef void (*ETableGroupLeafFn) (gpointer e_table_item, gpointer closure);
-void          e_table_group_apply_to_leafs    (ETableGroup       *etg,
-					       ETableGroupLeafFn  fn,
-					       void              *closure);
+void		e_table_group_apply_to_leafs	(ETableGroup *etg,
+						 ETableGroupLeafFn fn,
+						 gpointer closure);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 1c97826ef2..2e7b4704ec 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1961,10 +1961,10 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 }
 
 static void
-ethi_class_init (ETableHeaderItemClass *klass)
+ethi_class_init (ETableHeaderItemClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = ethi_dispose;
 	object_class->set_property = ethi_set_property;
@@ -1995,35 +1995,35 @@ ethi_class_init (ETableHeaderItemClass *klass)
 					 g_param_spec_object ("full_header",
 							      "Full Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_HEADER,
 					 g_param_spec_object ("ETableHeader",
 							      "Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_SORT_INFO,
 					 g_param_spec_object ("sort_info",
 							      "Sort Info",
 							      NULL,
-							      E_TABLE_SORT_INFO_TYPE,
+							      E_TYPE_TABLE_SORT_INFO,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE,
 					 g_param_spec_object ("table",
 							      "Table",
 							      NULL,
-							      E_TABLE_TYPE,
+							      E_TYPE_TABLE,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TREE,
 					 g_param_spec_object ("tree",
 							      "Tree",
 							      NULL,
-							      E_TREE_TYPE,
+							      E_TYPE_TREE,
 							      G_PARAM_WRITABLE));
 
 	ethi_signals[BUTTON_PRESSED] =
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 49755dcff0..4ab483a4ce 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -31,15 +31,31 @@
 #include <table/e-table-header.h>
 #include <table/e-table-sort-info.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_HEADER_ITEM \
+	(e_table_header_item_get_type ())
+#define E_TABLE_HEADER_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_HEADER_ITEM, ETableHeaderItem))
+#define E_TABLE_HEADER_ITEM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_HEADER_ITEM, ETableHeaderItemClass))
+#define E_IS_TABLE_HEADER_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_HEADER_ITEM))
+#define E_IS_TABLE_HEADER_ITEM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_HEADER_ITEM))
+#define E_TABLE_HEADER_ITEM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_HEADER_ITEM, ETableHeaderItemClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_HEADER_ITEM_TYPE        (e_table_header_item_get_type ())
-#define E_TABLE_HEADER_ITEM(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItem))
-#define E_TABLE_HEADER_ITEM_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_HEADER_ITEM_TYPE, ETableHeaderItemClass))
-#define E_IS_TABLE_HEADER_ITEM(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_HEADER_ITEM_TYPE))
-#define E_IS_TABLE_HEADER_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_ITEM_TYPE))
+typedef struct _ETableHeaderItem ETableHeaderItem;
+typedef struct _ETableHeaderItemClass ETableHeaderItemClass;
 
-typedef struct {
+struct _ETableHeaderItem {
 	GnomeCanvasItem  parent;
 	ETableHeader    *eth;
 
@@ -103,22 +119,19 @@ typedef struct {
 
 	/* For keyboard navigation*/
 	gint selected_col;
+};
 
-} ETableHeaderItem;
-
-typedef struct {
+struct _ETableHeaderItemClass {
 	GnomeCanvasItemClass parent_class;
 
-	/*
-	 * signals
-	 */
-	void (*button_pressed) (ETableHeaderItem *ethi, GdkEventButton *button);
-} ETableHeaderItemClass;
-
-void
-ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col);
+	/* Signals */
+	void		(*button_pressed)	(ETableHeaderItem *ethi,
+						 GdkEventButton *button);
+};
 
-GType      e_table_header_item_get_type (void);
+GType		e_table_header_item_get_type	(void) G_GNUC_CONST;
+void		ethi_change_sort_state		(ETableHeaderItem *ethi,
+						 ETableCol *col);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 16cc867f8c..3ae11a4eca 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -30,22 +30,22 @@
 
 G_BEGIN_DECLS
 
-gdouble  e_table_header_compute_height (ETableCol *ecol,
-					GtkWidget *widget);
-gdouble  e_table_header_width_extras   (GtkStyle       *style);
-void     e_table_header_draw_button    (GdkDrawable    *drawable,
-					ETableCol      *ecol,
-					GtkStyle       *style,
-					GtkStateType    state,
-					GtkWidget      *widget,
-					gint             x,
-					gint             y,
-					gint             width,
-					gint             height,
-					gint             button_width,
-					gint             button_height,
-					ETableColArrow  arrow);
+gdouble		e_table_header_compute_height	(ETableCol *ecol,
+						 GtkWidget *widget);
+gdouble		e_table_header_width_extras	(GtkStyle       *style);
+void		e_table_header_draw_button	(GdkDrawable    *drawable,
+						 ETableCol*ecol,
+						 GtkStyle *style,
+						 GtkStateType state,
+						 GtkWidget *widget,
+						 gint x,
+						 gint y,
+						 gint width,
+						 gint height,
+						 gint button_width,
+						 gint button_height,
+						 ETableColArrow arrow);
 
 G_END_DECLS
 
-#endif
+#endif /* E_TABLE_HEADER_UTILS_H */
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 1a3efafa85..df772a3c80 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -249,9 +249,9 @@ eth_get_property (GObject *object, guint prop_id, GValue *val, GParamSpec *pspec
 }
 
 static void
-e_table_header_class_init (ETableHeaderClass *klass)
+e_table_header_class_init (ETableHeaderClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->finalize = eth_finalize;
 	object_class->set_property = eth_set_property;
@@ -274,7 +274,7 @@ e_table_header_class_init (ETableHeaderClass *klass)
 	g_object_class_install_property (
 		object_class, PROP_SORT_INFO,
 		g_param_spec_object ("sort_info", "Sort Info", "Sort Info",
-				     E_TABLE_SORT_INFO_TYPE,
+				     E_TYPE_TABLE_SORT_INFO,
 				     G_PARAM_READWRITE));
 
 	eth_signals[STRUCTURE_CHANGE] =
@@ -310,10 +310,10 @@ e_table_header_class_init (ETableHeaderClass *klass)
 			      e_marshal_INT__INT,
 			      G_TYPE_INT, 1, G_TYPE_INT);
 
-	klass->structure_change = NULL;
-	klass->dimension_change = NULL;
-	klass->expansion_change = NULL;
-	klass->request_width = NULL;
+	class->structure_change = NULL;
+	class->dimension_change = NULL;
+	class->expansion_change = NULL;
+	class->request_width = NULL;
 }
 
 static void
@@ -342,7 +342,7 @@ ETableHeader *
 e_table_header_new (void)
 {
 
-	return (ETableHeader *) g_object_new (E_TABLE_HEADER_TYPE, NULL);
+	return g_object_new (E_TYPE_TABLE_HEADER, NULL);
 }
 
 static void
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index d724c2710f..1ac3016c8f 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -25,29 +25,41 @@
 #ifndef _E_TABLE_COLUMN_H_
 #define _E_TABLE_COLUMN_H_
 
-#include <glib-object.h>
 #include <gdk/gdk.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-col.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_HEADER \
+	(e_table_header_get_type ())
+#define E_TABLE_HEADER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_HEADER, ETableHeader))
+#define E_TABLE_HEADER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_HEADER, ETableHeaderClass))
+#define E_IS_TABLE_HEADER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_HEADER))
+#define E_IS_TABLE_HEADER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_HEADER))
+#define E_TABLE_HEADER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_HEADER, ETableHeaderClass))
+
 G_BEGIN_DECLS
 
 typedef struct _ETableHeader ETableHeader;
-
-#define E_TABLE_HEADER_TYPE        (e_table_header_get_type ())
-#define E_TABLE_HEADER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_HEADER_TYPE, ETableHeader))
-#define E_TABLE_HEADER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_HEADER_TYPE, ETableHeaderClass))
-#define E_IS_TABLE_HEADER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_HEADER_TYPE))
-#define E_IS_TABLE_HEADER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_TYPE))
-#define E_TABLE_HEADER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_HEADER_TYPE, ETableHeaderClass))
+typedef struct _ETableHeaderClass ETableHeaderClass;
 
 typedef gboolean (*ETableColCheckFunc) (ETableCol *col, gpointer user_data);
 
 /*
- * A Columnar header.
+ * A Column header.
  */
 struct _ETableHeader {
-	GObject base;
+	GObject parent;
 
 	gint col_count;
 	gint width;
@@ -63,56 +75,63 @@ struct _ETableHeader {
 	gint idle;
 };
 
-typedef struct {
+struct _ETableHeaderClass {
 	GObjectClass parent_class;
 
-	void (*structure_change) (ETableHeader *eth);
-	void (*dimension_change) (ETableHeader *eth, gint width);
-	void (*expansion_change) (ETableHeader *eth);
-	gint (*request_width) (ETableHeader *eth, gint col);
-} ETableHeaderClass;
-
-GType         e_table_header_get_type                     (void);
-ETableHeader *e_table_header_new                          (void);
-
-void          e_table_header_add_column                   (ETableHeader       *eth,
-							   ETableCol          *tc,
-							   gint                 pos);
-ETableCol    *e_table_header_get_column                   (ETableHeader       *eth,
-							   gint                 column);
-ETableCol    *e_table_header_get_column_by_col_idx        (ETableHeader       *eth,
-							   gint                 col_idx);
-gint           e_table_header_count                        (ETableHeader       *eth);
-gint           e_table_header_index                        (ETableHeader       *eth,
-							   gint                 col);
-gint           e_table_header_get_index_at                 (ETableHeader       *eth,
-							   gint                 x_offset);
-ETableCol   **e_table_header_get_columns            (ETableHeader *eth);
-gint           e_table_header_get_selected                 (ETableHeader       *eth);
-
-gint           e_table_header_total_width                  (ETableHeader       *eth);
-gint           e_table_header_min_width                    (ETableHeader       *eth);
-void          e_table_header_move                         (ETableHeader       *eth,
-							   gint                 source_index,
-							   gint                 target_index);
-void          e_table_header_remove                       (ETableHeader       *eth,
-							   gint                 idx);
-void          e_table_header_set_size                     (ETableHeader       *eth,
-							   gint                 idx,
-							   gint                 size);
-void          e_table_header_set_selection                (ETableHeader       *eth,
-							   gboolean            allow_selection);
-gint           e_table_header_col_diff                     (ETableHeader       *eth,
-							   gint                 start_col,
-							   gint                 end_col);
-
-void          e_table_header_calc_widths                  (ETableHeader       *eth);
-GList        *e_table_header_get_selected_indexes         (ETableHeader       *eth);
-void          e_table_header_update_horizontal            (ETableHeader       *eth);
-gint           e_table_header_prioritized_column           (ETableHeader       *eth);
-ETableCol    *e_table_header_prioritized_column_selected  (ETableHeader       *eth,
-							   ETableColCheckFunc  check_func,
-							   gpointer            user_data);
+	void		(*structure_change)	(ETableHeader *eth);
+	void		(*dimension_change)	(ETableHeader *eth,
+						 gint width);
+	void		(*expansion_change)	(ETableHeader *eth);
+	gint		(*request_width)	(ETableHeader *eth,
+						 gint col);
+};
+
+GType		e_table_header_get_type		(void) G_GNUC_CONST;
+ETableHeader *	e_table_header_new		(void);
+
+void		e_table_header_add_column	(ETableHeader *eth,
+						 ETableCol *tc,
+						 gint pos);
+ETableCol *	e_table_header_get_column	(ETableHeader *eth,
+						 gint column);
+ETableCol *	e_table_header_get_column_by_col_idx
+						(ETableHeader *eth,
+						 gint col_idx);
+gint		e_table_header_count		(ETableHeader *eth);
+gint		e_table_header_index		(ETableHeader *eth,
+						 gint col);
+gint		e_table_header_get_index_at	(ETableHeader *eth,
+						 gint x_offset);
+ETableCol **	e_table_header_get_columns	(ETableHeader *eth);
+gint		e_table_header_get_selected	(ETableHeader *eth);
+
+gint		e_table_header_total_width	(ETableHeader *eth);
+gint		e_table_header_min_width	(ETableHeader *eth);
+void		e_table_header_move		(ETableHeader *eth,
+						 gint source_index,
+						 gint target_index);
+void		e_table_header_remove		(ETableHeader *eth,
+						 gint idx);
+void		e_table_header_set_size		(ETableHeader *eth,
+						 gint idx,
+						 gint size);
+void		e_table_header_set_selection	(ETableHeader *eth,
+						 gboolean allow_selection);
+gint		e_table_header_col_diff		(ETableHeader *eth,
+						 gint start_col,
+						 gint end_col);
+
+void		e_table_header_calc_widths	(ETableHeader *eth);
+GList *		e_table_header_get_selected_indexes
+						(ETableHeader *eth);
+void		e_table_header_update_horizontal
+						(ETableHeader *eth);
+gint		e_table_header_prioritized_column
+						(ETableHeader *eth);
+ETableCol *	e_table_header_prioritized_column_selected
+						(ETableHeader *eth,
+						 ETableColCheckFunc check_func,
+						 gpointer user_data);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 7c45bbe656..b6421bb439 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -2792,10 +2792,10 @@ eti_style_set (ETableItem *eti, GtkStyle *previous_style)
 }
 
 static void
-eti_class_init (ETableItemClass *klass)
+eti_class_init (ETableItemClass *class)
 {
-	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GnomeCanvasItemClass *item_class = GNOME_CANVAS_ITEM_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose       = eti_dispose;
 	object_class->set_property  = eti_set_property;
@@ -2808,29 +2808,29 @@ eti_class_init (ETableItemClass *klass)
 	item_class->point           = eti_point;
 	item_class->event           = eti_event;
 
-	klass->cursor_change    = NULL;
-	klass->cursor_activated = NULL;
-	klass->double_click     = NULL;
-	klass->right_click      = NULL;
-	klass->click            = NULL;
-	klass->key_press        = NULL;
-	klass->start_drag       = NULL;
-	klass->style_set        = eti_style_set;
-	klass->selection_model_removed = NULL;
-	klass->selection_model_added = NULL;
+	class->cursor_change    = NULL;
+	class->cursor_activated = NULL;
+	class->double_click     = NULL;
+	class->right_click      = NULL;
+	class->click            = NULL;
+	class->key_press        = NULL;
+	class->start_drag       = NULL;
+	class->style_set        = eti_style_set;
+	class->selection_model_removed = NULL;
+	class->selection_model_added = NULL;
 
 	g_object_class_install_property (object_class, PROP_TABLE_HEADER,
 					 g_param_spec_object ("ETableHeader",
 							      "Table header",
 							      "Table header",
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_TABLE_MODEL,
 					 g_param_spec_object ("ETableModel",
 							      "Table model",
 							      "Table model",
-							      E_TABLE_MODEL_TYPE,
+							      E_TYPE_TABLE_MODEL,
 							      G_PARAM_WRITABLE));
 
 	g_object_class_install_property (object_class, PROP_SELECTION_MODEL,
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 6322bcd395..d2fd2c56d6 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -32,15 +32,31 @@
 #include <misc/e-selection-model.h>
 #include <misc/e-printable.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_ITEM \
+	(e_table_item_get_type ())
+#define E_TABLE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_ITEM, ETableItem))
+#define E_TABLE_ITEM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_ITEM, ETableItemClass))
+#define E_IS_TABLE_ITEM(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_ITEM))
+#define E_IS_TABLE_ITEM_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_ITEM))
+#define E_TABLE_ITEM_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_ITEM, ETableItemClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_ITEM_TYPE        (e_table_item_get_type ())
-#define E_TABLE_ITEM(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_ITEM_TYPE, ETableItem))
-#define E_TABLE_ITEM_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_ITEM_TYPE, ETableItemClass))
-#define E_IS_TABLE_ITEM(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_ITEM_TYPE))
-#define E_IS_TABLE_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_ITEM_TYPE))
+typedef struct _ETableItem ETableItem;
+typedef struct _ETableItemClass ETableItemClass;
 
-typedef struct {
+struct _ETableItem {
 	GnomeCanvasItem  parent;
 	ETableModel     *table_model;
 	ETableHeader    *header;
@@ -151,67 +167,89 @@ typedef struct {
 
 	gint grabbed_col, grabbed_row;
 	gint grabbed_count;
+};
 
-} ETableItem;
-
-typedef struct {
+struct _ETableItemClass {
 	GnomeCanvasItemClass parent_class;
 
-	void        (*cursor_change)    (ETableItem *eti, gint row);
-	void        (*cursor_activated) (ETableItem *eti, gint row);
-	void        (*double_click)     (ETableItem *eti, gint row, gint col, GdkEvent *event);
-	gboolean    (*right_click)      (ETableItem *eti, gint row, gint col, GdkEvent *event);
-	gboolean    (*click)            (ETableItem *eti, gint row, gint col, GdkEvent *event);
-	gboolean    (*key_press)        (ETableItem *eti, gint row, gint col, GdkEvent *event);
-	gboolean    (*start_drag)       (ETableItem *eti, gint row, gint col, GdkEvent *event);
-	void        (*style_set)        (ETableItem *eti, GtkStyle *previous_style);
-	void        (*selection_model_removed)    (ETableItem *eti, ESelectionModel *selection);
-	void        (*selection_model_added)    (ETableItem *eti, ESelectionModel *selection);
-} ETableItemClass;
-GType       e_table_item_get_type            (void);
+	void		(*cursor_change)	(ETableItem *eti,
+						 gint row);
+	void		(*cursor_activated)	(ETableItem *eti,
+						 gint row);
+	void		(*double_click)		(ETableItem *eti,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*right_click)		(ETableItem *eti,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*click)		(ETableItem *eti,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*key_press)		(ETableItem *eti,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*start_drag)		(ETableItem *eti,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	void		(*style_set)		(ETableItem *eti,
+						 GtkStyle *previous_style);
+	void		(*selection_model_removed)
+						(ETableItem *eti,
+						 ESelectionModel *selection);
+	void		(*selection_model_added)
+						(ETableItem *eti,
+						 ESelectionModel *selection);
+};
+
+GType		e_table_item_get_type		(void) G_GNUC_CONST;
 
 /*
  * Focus
  */
-void        e_table_item_set_cursor          (ETableItem        *eti,
-					      gint                col,
-					      gint                row);
-
-gint        e_table_item_get_focused_column  (ETableItem        *eti);
-
-void        e_table_item_leave_edit          (ETableItem        *eti);
-void        e_table_item_enter_edit          (ETableItem        *eti,
-					      gint                col,
-					      gint                row);
-
-void        e_table_item_redraw_range        (ETableItem        *eti,
-					      gint                start_col,
-					      gint                start_row,
-					      gint                end_col,
-					      gint                end_row);
-
-EPrintable *e_table_item_get_printable       (ETableItem        *eti);
-void        e_table_item_compute_location    (ETableItem        *eti,
-					      gint               *x,
-					      gint               *y,
-					      gint               *row,
-					      gint               *col);
-void        e_table_item_compute_mouse_over  (ETableItem        *eti,
-					      gint                x,
-					      gint                y,
-					      gint               *row,
-					      gint               *col);
-void        e_table_item_get_cell_geometry   (ETableItem        *eti,
-					      gint               *row,
-					      gint               *col,
-					      gint               *x,
-					      gint               *y,
-					      gint               *width,
-					      gint               *height);
-
-gint	    e_table_item_row_diff	     (ETableItem	*eti,
-					      gint		 start_row,
-					      gint		 end_row);
+void		e_table_item_set_cursor		(ETableItem *eti,
+						 gint col,
+						 gint row);
+
+gint		e_table_item_get_focused_column	(ETableItem *eti);
+
+void		e_table_item_leave_edit		(ETableItem *eti);
+void		e_table_item_enter_edit		(ETableItem *eti,
+						 gint col,
+						 gint row);
+
+void		e_table_item_redraw_range	(ETableItem *eti,
+						 gint start_col,
+						 gint start_row,
+						 gint end_col,
+						 gint end_row);
+
+EPrintable *	e_table_item_get_printable	(ETableItem *eti);
+void		e_table_item_compute_location	(ETableItem *eti,
+						 gint *x,
+						 gint *y,
+						 gint *row,
+						 gint *col);
+void		e_table_item_compute_mouse_over	(ETableItem *eti,
+						 gint x,
+						 gint y,
+						 gint *row,
+						 gint *col);
+void		e_table_item_get_cell_geometry	(ETableItem *eti,
+						 gint *row,
+						 gint *col,
+						 gint *x,
+						 gint *y,
+						 gint *width,
+						 gint *height);
+
+gint		e_table_item_row_diff		(ETableItem *eti,
+						 gint start_row,
+						 gint end_row);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index 8bdfc585df..5101e9ec73 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -27,12 +27,12 @@
 
 #include "e-table-memory-callbacks.h"
 
-G_DEFINE_TYPE (ETableMemoryCalbacks, e_table_memory_callbacks, E_TABLE_MEMORY_TYPE)
+G_DEFINE_TYPE (ETableMemoryCallbacks, e_table_memory_callbacks, E_TYPE_TABLE_MEMORY)
 
 static gint
 etmc_column_count (ETableModel *etm)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->col_count)
 		return etmc->col_count (etm, etmc->data);
@@ -43,7 +43,7 @@ etmc_column_count (ETableModel *etm)
 static gpointer
 etmc_value_at (ETableModel *etm, gint col, gint row)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->value_at)
 		return etmc->value_at (etm, col, row, etmc->data);
@@ -54,7 +54,7 @@ etmc_value_at (ETableModel *etm, gint col, gint row)
 static void
 etmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->set_value_at)
 		etmc->set_value_at (etm, col, row, val, etmc->data);
@@ -63,7 +63,7 @@ etmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 static gboolean
 etmc_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->is_cell_editable)
 		return etmc->is_cell_editable (etm, col, row, etmc->data);
@@ -75,7 +75,7 @@ etmc_is_cell_editable (ETableModel *etm, gint col, gint row)
 static gpointer
 etmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->duplicate_value)
 		return etmc->duplicate_value (etm, col, value, etmc->data);
@@ -86,7 +86,7 @@ etmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 static void
 etmc_free_value (ETableModel *etm, gint col, gpointer value)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->free_value)
 		etmc->free_value (etm, col, value, etmc->data);
@@ -95,7 +95,7 @@ etmc_free_value (ETableModel *etm, gint col, gpointer value)
 static gpointer
 etmc_initialize_value (ETableModel *etm, gint col)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->initialize_value)
 		return etmc->initialize_value (etm, col, etmc->data);
@@ -106,7 +106,7 @@ etmc_initialize_value (ETableModel *etm, gint col)
 static gboolean
 etmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->value_is_empty)
 		return etmc->value_is_empty (etm, col, value, etmc->data);
@@ -117,7 +117,7 @@ etmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 static gchar *
 etmc_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->value_to_string)
 		return etmc->value_to_string (etm, col, value, etmc->data);
@@ -128,16 +128,16 @@ etmc_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 static void
 etmc_append_row (ETableModel *etm, ETableModel *source, gint row)
 {
-	ETableMemoryCalbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
+	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
 	if (etmc->append_row)
 		etmc->append_row (etm, source, row, etmc->data);
 }
 
 static void
-e_table_memory_callbacks_class_init (ETableMemoryCalbacksClass *klass)
+e_table_memory_callbacks_class_init (ETableMemoryCallbacksClass *class)
 {
-	ETableModelClass *model_class = E_TABLE_MODEL_CLASS (klass);
+	ETableModelClass *model_class = E_TABLE_MODEL_CLASS (class);
 
 	model_class->column_count     = etmc_column_count;
 	model_class->value_at         = etmc_value_at;
@@ -153,7 +153,7 @@ e_table_memory_callbacks_class_init (ETableMemoryCalbacksClass *klass)
 }
 
 static void
-e_table_memory_callbacks_init (ETableMemoryCalbacks *etmc)
+e_table_memory_callbacks_init (ETableMemoryCallbacks *etmc)
 {
 	/* nothing to do */
 }
@@ -171,35 +171,35 @@ e_table_memory_callbacks_init (ETableMemoryCalbacks *etmc)
  * @value_to_string:
  * @data: closure pointer.
  *
- * This initializes a new ETableMemoryCalbacksModel object.
- * ETableMemoryCalbacksModel is an implementaiton of the abstract class
- * ETableModel.  The ETableMemoryCalbacksModel is designed to allow people
+ * This initializes a new ETableMemoryCallbacksModel object.
+ * ETableMemoryCallbacksModel is an implementaiton of the abstract class
+ * ETableModel.  The ETableMemoryCallbacksModel is designed to allow people
  * to easily create ETableModels without having to create a new GType
  * derived from ETableModel every time they need one.
  *
- * Instead, ETableMemoryCalbacksModel uses a setup based in callback
+ * Instead, ETableMemoryCallbacksModel uses a setup based in callback
  * functions, every callback function signature mimics the signature of
  * each ETableModel method and passes the extra @data pointer to each one
  * of the method to provide them with any context they might want to use.
  *
- * Returns: An ETableMemoryCalbacksModel object (which is also an ETableModel
+ * Returns: An ETableMemoryCallbacksModel object (which is also an ETableModel
  * object).
  */
 ETableModel *
-e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col_count,
-			      ETableMemoryCalbacksValueAtFn value_at,
-			      ETableMemoryCalbacksSetValueAtFn set_value_at,
-			      ETableMemoryCalbacksIsCellEditableFn is_cell_editable,
-			      ETableMemoryCalbacksDuplicateValueFn duplicate_value,
-			      ETableMemoryCalbacksFreeValueFn free_value,
-			      ETableMemoryCalbacksInitializeValueFn initialize_value,
-			      ETableMemoryCalbacksValueIsEmptyFn value_is_empty,
-			      ETableMemoryCalbacksValueToStringFn value_to_string,
+e_table_memory_callbacks_new (ETableMemoryCallbacksColumnCountFn col_count,
+			      ETableMemoryCallbacksValueAtFn value_at,
+			      ETableMemoryCallbacksSetValueAtFn set_value_at,
+			      ETableMemoryCallbacksIsCellEditableFn is_cell_editable,
+			      ETableMemoryCallbacksDuplicateValueFn duplicate_value,
+			      ETableMemoryCallbacksFreeValueFn free_value,
+			      ETableMemoryCallbacksInitializeValueFn initialize_value,
+			      ETableMemoryCallbacksValueIsEmptyFn value_is_empty,
+			      ETableMemoryCallbacksValueToStringFn value_to_string,
 			      gpointer data)
 {
-	ETableMemoryCalbacks *et;
+	ETableMemoryCallbacks *et;
 
-	et                   = g_object_new (E_TABLE_MEMORY_CALLBACKS_TYPE, NULL);
+	et = g_object_new (E_TYPE_TABLE_MEMORY_CALLBACKS, NULL);
 
 	et->col_count        = col_count;
 	et->value_at         = value_at;
diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h
index 97e2e53421..8feb6e9884 100644
--- a/widgets/table/e-table-memory-callbacks.h
+++ b/widgets/table/e-table-memory-callbacks.h
@@ -25,64 +25,118 @@
 
 #include <table/e-table-memory.h>
 
-G_BEGIN_DECLS
-
-#define E_TABLE_MEMORY_CALLBACKS_TYPE        (e_table_memory_callbacks_get_type ())
-#define E_TABLE_MEMORY_CALLBACKS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_MEMORY_CALLBACKS_TYPE, ETableMemoryCalbacks))
-#define E_TABLE_MEMORY_CALLBACKS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_MEMORY_CALLBACKS_TYPE, ETableMemoryCalbacksClass))
-#define E_IS_TABLE_MEMORY_CALLBACKS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_MEMORY_CALLBACKS_TYPE))
-#define E_IS_TABLE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_CALLBACKS_TYPE))
-#define E_TABLE_MEMORY_CALLBACKS_GET_CLASS(k) (G_TYPE_INSTANCE_GET_CLASS((k), E_TABLE_MEMORY_CALLBACKS_TYPE, ETableMemoryCalbacksClass))
-
-typedef gint         (*ETableMemoryCalbacksColumnCountFn)     (ETableModel *etm, gpointer data);
-typedef void        (*ETableMemoryCalbacksAppendRowFn)       (ETableModel *etm, ETableModel *model, gint row, gpointer data);
+/* Standard GObject macros */
+#define E_TYPE_TABLE_MEMORY_CALLBACKS \
+	(e_table_memory_callbacks_get_type ())
+#define E_TABLE_MEMORY_CALLBACKS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_MEMORY_CALLBACKS, ETableMemoryCallbacks))
+#define E_TABLE_MEMORY_CALLBACKS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_MEMORY_CALLBACKS, ETableMemoryCallbacksClass))
+#define E_IS_TABLE_MEMORY_CALLBACKS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_MEMORY_CALLBACKS))
+#define E_IS_TABLE_MEMORY_CALLBACKS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_MEMORY_CALLBACKS))
+#define E_TABLE_MEMORY_CALLBACKS_GET_CLASS(cls) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((cls), E_TYPE_TABLE_MEMORY_CALLBACKS, ETableMemoryCallbacksClass))
 
-typedef	void       *(*ETableMemoryCalbacksValueAtFn)         (ETableModel *etm, gint col, gint row, gpointer data);
-typedef	void        (*ETableMemoryCalbacksSetValueAtFn)      (ETableModel *etm, gint col, gint row, gconstpointer val, gpointer data);
-typedef	gboolean    (*ETableMemoryCalbacksIsCellEditableFn)  (ETableModel *etm, gint col, gint row, gpointer data);
-
-typedef	void       *(*ETableMemoryCalbacksDuplicateValueFn)  (ETableModel *etm, gint col, gconstpointer val, gpointer data);
-typedef	void        (*ETableMemoryCalbacksFreeValueFn)       (ETableModel *etm, gint col, gpointer val, gpointer data);
-typedef void       *(*ETableMemoryCalbacksInitializeValueFn) (ETableModel *etm, gint col, gpointer data);
-typedef gboolean    (*ETableMemoryCalbacksValueIsEmptyFn)    (ETableModel *etm, gint col, gconstpointer val, gpointer data);
-typedef gchar       *(*ETableMemoryCalbacksValueToStringFn)   (ETableModel *etm, gint col, gconstpointer val, gpointer data);
+G_BEGIN_DECLS
 
-typedef struct {
+typedef struct _ETableMemoryCallbacks ETableMemoryCallbacks;
+typedef struct _ETableMemoryCallbacksClass ETableMemoryCallbacksClass;
+
+typedef gint		(*ETableMemoryCallbacksColumnCountFn)
+							(ETableModel *etm,
+							 gpointer data);
+typedef void		(*ETableMemoryCallbacksAppendRowFn)
+							(ETableModel *etm,
+							 ETableModel *model,
+							 gint row,
+							 gpointer data);
+
+typedef gpointer	(*ETableMemoryCallbacksValueAtFn)
+							(ETableModel *etm,
+							 gint col,
+							 gint row,
+							 gpointer data);
+typedef void		(*ETableMemoryCallbacksSetValueAtFn)
+							(ETableModel *etm,
+							 gint col,
+							 gint row,
+							 gconstpointer val,
+							 gpointer data);
+typedef gboolean	(*ETableMemoryCallbacksIsCellEditableFn)
+							(ETableModel *etm,
+							 gint col,
+							 gint row,
+							 gpointer data);
+
+typedef gpointer	(*ETableMemoryCallbacksDuplicateValueFn)
+							(ETableModel *etm,
+							 gint col,
+							 gconstpointer val,
+							 gpointer data);
+typedef void		(*ETableMemoryCallbacksFreeValueFn)
+							(ETableModel *etm,
+							 gint col,
+							 gpointer val,
+							 gpointer data);
+typedef gpointer	(*ETableMemoryCallbacksInitializeValueFn)
+							(ETableModel *etm,
+							 gint col,
+							 gpointer data);
+typedef gboolean	(*ETableMemoryCallbacksValueIsEmptyFn)
+							(ETableModel *etm,
+							 gint col,
+							 gconstpointer val,
+							 gpointer data);
+typedef gchar *		(*ETableMemoryCallbacksValueToStringFn)
+							(ETableModel *etm,
+							 gint col,
+							 gconstpointer val,
+							 gpointer data);
+
+struct _ETableMemoryCallbacks {
 	ETableMemory parent;
 
-	ETableMemoryCalbacksColumnCountFn     col_count;
-	ETableMemoryCalbacksAppendRowFn       append_row;
+	ETableMemoryCallbacksColumnCountFn     col_count;
+	ETableMemoryCallbacksAppendRowFn       append_row;
 
-	ETableMemoryCalbacksValueAtFn         value_at;
-	ETableMemoryCalbacksSetValueAtFn      set_value_at;
-	ETableMemoryCalbacksIsCellEditableFn  is_cell_editable;
+	ETableMemoryCallbacksValueAtFn         value_at;
+	ETableMemoryCallbacksSetValueAtFn      set_value_at;
+	ETableMemoryCallbacksIsCellEditableFn  is_cell_editable;
 
-	ETableMemoryCalbacksDuplicateValueFn  duplicate_value;
-	ETableMemoryCalbacksFreeValueFn       free_value;
-	ETableMemoryCalbacksInitializeValueFn initialize_value;
-	ETableMemoryCalbacksValueIsEmptyFn    value_is_empty;
-	ETableMemoryCalbacksValueToStringFn   value_to_string;
+	ETableMemoryCallbacksDuplicateValueFn  duplicate_value;
+	ETableMemoryCallbacksFreeValueFn       free_value;
+	ETableMemoryCallbacksInitializeValueFn initialize_value;
+	ETableMemoryCallbacksValueIsEmptyFn    value_is_empty;
+	ETableMemoryCallbacksValueToStringFn   value_to_string;
 	gpointer data;
-} ETableMemoryCalbacks;
+};
 
-typedef struct {
+struct _ETableMemoryCallbacksClass {
 	ETableMemoryClass parent_class;
-} ETableMemoryCalbacksClass;
-
-GType e_table_memory_callbacks_get_type (void);
-
-ETableModel *e_table_memory_callbacks_new (ETableMemoryCalbacksColumnCountFn col_count,
-
-				 ETableMemoryCalbacksValueAtFn value_at,
-				 ETableMemoryCalbacksSetValueAtFn set_value_at,
-				 ETableMemoryCalbacksIsCellEditableFn is_cell_editable,
-
-				 ETableMemoryCalbacksDuplicateValueFn duplicate_value,
-				 ETableMemoryCalbacksFreeValueFn free_value,
-				 ETableMemoryCalbacksInitializeValueFn initialize_value,
-				 ETableMemoryCalbacksValueIsEmptyFn value_is_empty,
-				 ETableMemoryCalbacksValueToStringFn value_to_string,
-				 gpointer data);
+};
+
+GType		e_table_memory_callbacks_get_type
+			(void) G_GNUC_CONST;
+ETableModel *	e_table_memory_callbacks_new
+			(ETableMemoryCallbacksColumnCountFn col_count,
+
+			 ETableMemoryCallbacksValueAtFn value_at,
+			 ETableMemoryCallbacksSetValueAtFn set_value_at,
+			 ETableMemoryCallbacksIsCellEditableFn is_cell_editable,
+
+			 ETableMemoryCallbacksDuplicateValueFn duplicate_value,
+			 ETableMemoryCallbacksFreeValueFn free_value,
+			 ETableMemoryCallbacksInitializeValueFn initialize_value,
+			 ETableMemoryCallbacksValueIsEmptyFn value_is_empty,
+			 ETableMemoryCallbacksValueToStringFn value_to_string,
+			 gpointer data);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 05aad76d35..5a0263b308 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -28,6 +28,10 @@
 
 #include "e-table-memory-store.h"
 
+#define E_TABLE_MEMORY_STORE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate))
+
 #define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) * (etms)->priv->col_count + (col)))
 
 struct _ETableMemoryStorePrivate {
@@ -36,7 +40,7 @@ struct _ETableMemoryStorePrivate {
 	gpointer *store;
 };
 
-G_DEFINE_TYPE (ETableMemoryStore, e_table_memory_store, E_TABLE_MEMORY_TYPE)
+G_DEFINE_TYPE (ETableMemoryStore, e_table_memory_store, E_TYPE_TABLE_MEMORY)
 
 static gpointer
 duplicate_value (ETableMemoryStore *etms, gint col, gconstpointer val)
@@ -222,50 +226,49 @@ etms_append_row (ETableModel *etm, ETableModel *source, gint row)
 }
 
 static void
-etms_finalize (GObject *obj)
+etms_finalize (GObject *object)
 {
-	ETableMemoryStore *etms = (ETableMemoryStore *) obj;
+	ETableMemoryStorePrivate *priv;
 
-	if (etms->priv) {
-		e_table_memory_store_clear (etms);
+	priv = E_TABLE_MEMORY_STORE_GET_PRIVATE (object);
 
-		g_free (etms->priv->columns);
-		g_free (etms->priv->store);
-		g_free (etms->priv);
-	}
+	e_table_memory_store_clear (E_TABLE_MEMORY_STORE (object));
+
+	g_free (priv->columns);
+	g_free (priv->store);
 
-	if (G_OBJECT_CLASS (e_table_memory_store_parent_class)->finalize)
-		G_OBJECT_CLASS (e_table_memory_store_parent_class)->finalize (obj);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_table_memory_store_parent_class)->finalize (object);
 }
 
 static void
 e_table_memory_store_init (ETableMemoryStore *etms)
 {
-	etms->priv            = g_new (ETableMemoryStorePrivate, 1);
-
-	etms->priv->col_count = 0;
-	etms->priv->columns   = NULL;
-	etms->priv->store     = NULL;
+	etms->priv = E_TABLE_MEMORY_STORE_GET_PRIVATE (etms);
 }
 
 static void
-e_table_memory_store_class_init (ETableMemoryStoreClass *klass)
+e_table_memory_store_class_init (ETableMemoryStoreClass *class)
 {
-	ETableModelClass *model_class = E_TABLE_MODEL_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class;
+	ETableModelClass *model_class;
+
+	g_type_class_add_private (class, sizeof (ETableMemoryStorePrivate));
 
-	object_class->finalize	      = etms_finalize;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->finalize = etms_finalize;
 
-	model_class->column_count     = etms_column_count;
-	model_class->value_at         = etms_value_at;
-	model_class->set_value_at     = etms_set_value_at;
+	model_class = E_TABLE_MODEL_CLASS (class);
+	model_class->column_count = etms_column_count;
+	model_class->value_at = etms_value_at;
+	model_class->set_value_at = etms_set_value_at;
 	model_class->is_cell_editable = etms_is_cell_editable;
-	model_class->duplicate_value  = etms_duplicate_value;
-	model_class->free_value       = etms_free_value;
+	model_class->duplicate_value = etms_duplicate_value;
+	model_class->free_value = etms_free_value;
 	model_class->initialize_value = etms_initialize_value;
-	model_class->value_is_empty   = etms_value_is_empty;
-	model_class->value_to_string  = etms_value_to_string;
-	model_class->append_row       = etms_append_row;
+	model_class->value_is_empty = etms_value_is_empty;
+	model_class->value_to_string = etms_value_to_string;
+	model_class->append_row = etms_append_row;
 }
 
 /**
@@ -297,7 +300,7 @@ e_table_memory_store_class_init (ETableMemoryStoreClass *klass)
 ETableModel *
 e_table_memory_store_new (ETableMemoryStoreColumnInfo *columns)
 {
-	ETableMemoryStore *et = g_object_new (E_TABLE_MEMORY_STORE_TYPE, NULL);
+	ETableMemoryStore *et = g_object_new (E_TYPE_TABLE_MEMORY_STORE, NULL);
 
 	if (e_table_memory_store_construct (et, columns)) {
 		return (ETableModel *) et;
diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h
index 96da50f71c..9d3d638e18 100644
--- a/widgets/table/e-table-memory-store.h
+++ b/widgets/table/e-table-memory-store.h
@@ -27,14 +27,26 @@
 #include <table/e-table-memory.h>
 #include <table/e-table-memory-callbacks.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TABLE_MEMORY_STORE \
+	(e_table_memory_store_get_type ())
+#define E_TABLE_MEMORY_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStore))
+#define E_TABLE_MEMORY_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStoreClass))
+#define E_IS_TABLE_MEMORY_STORE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_MEMORY_STORE))
+#define E_IS_TABLE_MEMORY_STORE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_MEMORY_STORE))
+#define E_TABLE_MEMORY_STORE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStoreClass))
 
-#define E_TABLE_MEMORY_STORE_TYPE        (e_table_memory_store_get_type ())
-#define E_TABLE_MEMORY_STORE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_MEMORY_STORE_TYPE, ETableMemoryStore))
-#define E_TABLE_MEMORY_STORE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_MEMORY_STORE_TYPE, ETableMemoryStoreClass))
-#define E_IS_TABLE_MEMORY_STORE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_MEMORY_STORE_TYPE))
-#define E_IS_TABLE_MEMORY_STORE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_STORE_TYPE))
-#define E_TABLE_MEMORY_STORE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TABLE_MEMORY_STORE_TYPE, ETableMemoryStoreClass))
+G_BEGIN_DECLS
 
 typedef enum {
 	E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR,
@@ -46,11 +58,11 @@ typedef enum {
 } ETableMemoryStoreColumnType;
 
 typedef struct {
-	ETableMemoryCalbacksDuplicateValueFn  duplicate_value;
-	ETableMemoryCalbacksFreeValueFn       free_value;
-	ETableMemoryCalbacksInitializeValueFn initialize_value;
-	ETableMemoryCalbacksValueIsEmptyFn    value_is_empty;
-	ETableMemoryCalbacksValueToStringFn   value_to_string;
+	ETableMemoryCallbacksDuplicateValueFn  duplicate_value;
+	ETableMemoryCallbacksFreeValueFn       free_value;
+	ETableMemoryCallbacksInitializeValueFn initialize_value;
+	ETableMemoryCallbacksValueIsEmptyFn    value_is_empty;
+	ETableMemoryCallbacksValueToStringFn   value_to_string;
 } ETableMemoryStoreCustomColumn;
 
 typedef struct {
@@ -59,79 +71,80 @@ typedef struct {
 	guint                         editable : 1;
 } ETableMemoryStoreColumnInfo;
 
-#define E_TABLE_MEMORY_STORE_TERMINATOR { E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR, { NULL }, FALSE }
-#define E_TABLE_MEMORY_STORE_INTEGER { E_TABLE_MEMORY_STORE_COLUMN_TYPE_INTEGER, { NULL }, FALSE }
-#define E_TABLE_MEMORY_STORE_STRING { E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING, { NULL }, FALSE }
-#define E_TABLE_MEMORY_STORE_PIXBUF { E_TABLE_MEMORY_STORE_COLUMN_TYPE_PIXBUF, { NULL }, FALSE }
-#define E_TABLE_MEMORY_STORE_EDITABLE_STRING { E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING, { NULL }, TRUE }
-#define E_TABLE_MEMORY_STORE_CUSTOM(editable, duplicate, free, initialize, empty, string) \
-        { E_TABLE_MEMORY_STORE_COLUMN_TYPE_CUSTOM, \
-             { (duplicate), (free), (initialize), (empty), (string) }, editable }
-#define E_TABLE_MEMORY_STORE_OBJECT(editable, initialize, empty, string) \
-        { E_TABLE_MEMORY_STORE_COLUMN_TYPE_CUSTOM, \
-             { NULL, NULL, (initialize), (empty), (string) }, editable }
+#define E_TABLE_MEMORY_STORE_TERMINATOR \
+	{ E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR, { NULL }, FALSE }
+#define E_TABLE_MEMORY_STORE_INTEGER \
+	{ E_TABLE_MEMORY_STORE_COLUMN_TYPE_INTEGER, { NULL }, FALSE }
+#define E_TABLE_MEMORY_STORE_STRING \
+	{ E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING, { NULL }, FALSE }
 
+typedef struct _ETableMemoryStore ETableMemoryStore;
+typedef struct _ETableMemoryStoreClass ETableMemoryStoreClass;
 typedef struct _ETableMemoryStorePrivate ETableMemoryStorePrivate;
 
-typedef struct {
+struct _ETableMemoryStore {
 	ETableMemory parent;
-
 	ETableMemoryStorePrivate *priv;
-} ETableMemoryStore;
+};
 
-typedef struct {
+struct _ETableMemoryStoreClass {
 	ETableMemoryClass parent_class;
-} ETableMemoryStoreClass;
-
-GType        e_table_memory_store_get_type            (void);
+};
 
-/* Object Creation */
-ETableModel *e_table_memory_store_new                 (ETableMemoryStoreColumnInfo  *columns);
-ETableModel *e_table_memory_store_construct           (ETableMemoryStore            *store,
-						       ETableMemoryStoreColumnInfo  *columns);
+GType		e_table_memory_store_get_type	(void) G_GNUC_CONST;
+ETableModel *	e_table_memory_store_new	(ETableMemoryStoreColumnInfo *columns);
+ETableModel *	e_table_memory_store_construct	(ETableMemoryStore *store,
+						 ETableMemoryStoreColumnInfo *columns);
 
 /* Adopt a value instead of copying it. */
-void         e_table_memory_store_adopt_value_at      (ETableMemoryStore            *etms,
-						       gint                           col,
-						       gint                           row,
-						       void                         *value);
+void		e_table_memory_store_adopt_value_at
+						(ETableMemoryStore *etms,
+						 gint col,
+						 gint row,
+						 gpointer value);
 
 /* The size of these arrays is the number of columns. */
-void         e_table_memory_store_insert_array        (ETableMemoryStore            *etms,
-						       gint                           row,
-						       void                        **store,
-						       gpointer                      data);
-void         e_table_memory_store_insert              (ETableMemoryStore            *etms,
-						       gint                           row,
-						       gpointer                      data,
-						       ...);
-void         e_table_memory_store_insert_adopt        (ETableMemoryStore            *etms,
-						       gint                           row,
-						       gpointer                      data,
-						       ...);
-void         e_table_memory_store_insert_adopt_array  (ETableMemoryStore            *etms,
-						       gint                           row,
-						       void                        **store,
-						       gpointer                      data);
-void         e_table_memory_store_change_array        (ETableMemoryStore            *etms,
-						       gint                           row,
-						       void                        **store,
-						       gpointer                      data);
-void         e_table_memory_store_change              (ETableMemoryStore            *etms,
-						       gint                           row,
-						       gpointer                      data,
-						       ...);
-void         e_table_memory_store_change_adopt        (ETableMemoryStore            *etms,
-						       gint                           row,
-						       gpointer                      data,
-						       ...);
-void         e_table_memory_store_change_adopt_array  (ETableMemoryStore            *etms,
-						       gint                           row,
-						       void                        **store,
-						       gpointer                      data);
-void         e_table_memory_store_remove              (ETableMemoryStore            *etms,
-						       gint                           row);
-void         e_table_memory_store_clear               (ETableMemoryStore            *etms);
+void		e_table_memory_store_insert_array
+						(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer *store,
+						 gpointer data);
+void		e_table_memory_store_insert	(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer data,
+						 ...);
+void		e_table_memory_store_insert_adopt
+						(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer data,
+						 ...);
+void		e_table_memory_store_insert_adopt_array
+						(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer *store,
+						 gpointer data);
+void		e_table_memory_store_change_array
+						(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer *store,
+						 gpointer data);
+void		e_table_memory_store_change	(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer data,
+						 ...);
+void		e_table_memory_store_change_adopt
+						(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer data,
+						 ...);
+void		e_table_memory_store_change_adopt_array
+						(ETableMemoryStore *etms,
+						 gint row,
+						 gpointer *store,
+						 gpointer data);
+void		e_table_memory_store_remove	(ETableMemoryStore *etms,
+						 gint row);
+void		e_table_memory_store_clear	(ETableMemoryStore *etms);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index ca338ab1ca..0c0237531b 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -37,30 +37,28 @@
 
 #include "e-table-memory.h"
 
-G_DEFINE_TYPE (ETableMemory, e_table_memory, E_TABLE_MODEL_TYPE)
+#define E_TABLE_MEMORY_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TABLE_MEMORY, ETableMemoryPrivate))
 
-struct ETableMemoryPriv {
+G_DEFINE_TYPE (ETableMemory, e_table_memory, E_TYPE_TABLE_MODEL)
+
+struct _ETableMemoryPrivate {
 	gpointer *data;
 	gint num_rows;
 	gint frozen;
 };
 
-
-/* virtual methods */
-
 static void
 etmm_finalize (GObject *object)
 {
-	ETableMemory *etmm = E_TABLE_MEMORY (object);
-	ETableMemoryPriv *priv = etmm->priv;
+	ETableMemoryPrivate *priv;
 
-	/* XXX lots of stuff to free here */
-	if (priv) {
-		g_free (priv->data);
-		g_free (priv);
-	}
-	etmm->priv = NULL;
+	priv = E_TABLE_MEMORY_GET_PRIVATE (object);
+
+	g_free (priv->data);
 
+	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (e_table_memory_parent_class)->finalize (object);
 }
 
@@ -72,29 +70,25 @@ etmm_row_count (ETableModel *etm)
 	return etmm->priv->num_rows;
 }
 
-
 static void
-e_table_memory_class_init (ETableMemoryClass *klass)
+e_table_memory_class_init (ETableMemoryClass *class)
 {
-	ETableModelClass *table_class = E_TABLE_MODEL_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class;
+	ETableModelClass *table_model_class;
+
+	g_type_class_add_private (class, sizeof (ETableMemoryPrivate));
 
-	object_class->finalize     = etmm_finalize;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->finalize = etmm_finalize;
 
-	table_class->row_count     = etmm_row_count;
+	table_model_class = E_TABLE_MODEL_CLASS (class);
+	table_model_class->row_count = etmm_row_count;
 }
 
 static void
 e_table_memory_init (ETableMemory *etmm)
 {
-	ETableMemoryPriv *priv;
-
-	priv = g_new0 (ETableMemoryPriv, 1);
-	etmm->priv = priv;
-
-	priv->data = NULL;
-	priv->num_rows = 0;
-	priv->frozen = 0;
+	etmm->priv = E_TABLE_MEMORY_GET_PRIVATE (etmm);
 }
 
 /**
@@ -107,7 +101,7 @@ e_table_memory_init (ETableMemory *etmm)
 ETableMemory *
 e_table_memory_new (void)
 {
-	return g_object_new (E_TABLE_MEMORY_TYPE, NULL);
+	return g_object_new (E_TYPE_TABLE_MEMORY, NULL);
 }
 
 /**
@@ -245,7 +239,7 @@ e_table_memory_clear (ETableMemory *etmm)
 void
 e_table_memory_freeze (ETableMemory *etmm)
 {
-	ETableMemoryPriv *priv = etmm->priv;
+	ETableMemoryPrivate *priv = etmm->priv;
 
 	if (priv->frozen == 0)
 		e_table_model_pre_change (E_TABLE_MODEL (etmm));
@@ -265,7 +259,7 @@ e_table_memory_freeze (ETableMemory *etmm)
 void
 e_table_memory_thaw (ETableMemory *etmm)
 {
-	ETableMemoryPriv *priv = etmm->priv;
+	ETableMemoryPrivate *priv = etmm->priv;
 
 	if (priv->frozen > 0)
 		priv->frozen--;
diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
index 8de51b7c5e..853f378c9e 100644
--- a/widgets/table/e-table-memory.h
+++ b/widgets/table/e-table-memory.h
@@ -26,48 +26,60 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <table/e-table-model.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TABLE_MEMORY \
+	(e_table_memory_get_type ())
+#define E_TABLE_MEMORY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_MEMORY, ETableMemory))
+#define E_TABLE_MEMORY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_MEMORY, ETableMemoryClass))
+#define E_IS_TABLE_MEMORY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_MEMORY))
+#define E_IS_TABLE_MEMORY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_MEMORY))
+#define E_TABLE_MEMORY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_MEMORY, ETableMemoryClass))
 
-#define E_TABLE_MEMORY_TYPE        (e_table_memory_get_type ())
-#define E_TABLE_MEMORY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_MEMORY_TYPE, ETableMemory))
-#define E_TABLE_MEMORY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_MEMORY_TYPE, ETableMemoryClass))
-#define E_IS_TABLE_MEMORY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_MEMORY_TYPE))
-#define E_IS_TABLE_MEMORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_MEMORY_TYPE))
-#define E_TABLE_MEMORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_MEMORY_TYPE, ETableMemoryClass))
+G_BEGIN_DECLS
 
-typedef struct ETableMemory ETableMemory;
-typedef struct ETableMemoryPriv ETableMemoryPriv;
-typedef struct ETableMemoryClass ETableMemoryClass;
+typedef struct _ETableMemory ETableMemory;
+typedef struct _ETableMemoryClass ETableMemoryClass;
+typedef struct _ETableMemoryPrivate ETableMemoryPrivate;
 
-struct ETableMemory {
-	ETableModel base;
-	ETableMemoryPriv *priv;
+struct _ETableMemory {
+	ETableModel parent;
+	ETableMemoryPrivate *priv;
 };
 
-struct ETableMemoryClass {
+struct _ETableMemoryClass {
 	ETableModelClass parent_class;
 };
 
-GType         e_table_memory_get_type     (void);
-void          e_table_memory_construct    (ETableMemory *etable);
-ETableMemory *e_table_memory_new          (void);
+GType		e_table_memory_get_type		(void) G_GNUC_CONST;
+ETableMemory *	e_table_memory_new		(void);
+void		e_table_memory_construct	(ETableMemory *etable);
 
 /* row operations */
-void          e_table_memory_insert  (ETableMemory *etable,
-				      gint           row,
-				      gpointer      data);
-gpointer      e_table_memory_remove  (ETableMemory *etable,
-				      gint           row);
-void          e_table_memory_clear   (ETableMemory *etable);
+void		e_table_memory_insert		(ETableMemory *etable,
+						 gint row,
+						 gpointer data);
+gpointer	e_table_memory_remove		(ETableMemory *etable,
+						 gint row);
+void		e_table_memory_clear		(ETableMemory *etable);
 
 /* Freeze and thaw */
-void          e_table_memory_freeze       (ETableMemory *etable);
-void          e_table_memory_thaw         (ETableMemory *etable);
-gpointer      e_table_memory_get_data     (ETableMemory *etm,
-					   gint           row);
-void          e_table_memory_set_data     (ETableMemory *etm,
-					   gint           row,
-					   gpointer      data);
+void		e_table_memory_freeze		(ETableMemory *etable);
+void		e_table_memory_thaw		(ETableMemory *etable);
+gpointer	e_table_memory_get_data		(ETableMemory *etm,
+						 gint row);
+void		e_table_memory_set_data		(ETableMemory *etm,
+						 gint row,
+						 gpointer data);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index dbe01a345c..308cdb0c58 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -271,9 +271,9 @@ e_table_model_finalize (GObject *object)
 }
 
 static void
-e_table_model_class_init (ETableModelClass *klass)
+e_table_model_class_init (ETableModelClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->finalize = e_table_model_finalize;
 
@@ -340,31 +340,31 @@ e_table_model_class_init (ETableModelClass *klass)
 			      e_marshal_VOID__INT_INT,
 			      G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
 
-	klass->column_count        = NULL;
-	klass->row_count           = NULL;
-	klass->append_row          = NULL;
+	class->column_count        = NULL;
+	class->row_count           = NULL;
+	class->append_row          = NULL;
 
-	klass->value_at            = NULL;
-	klass->set_value_at        = NULL;
-	klass->is_cell_editable    = NULL;
+	class->value_at            = NULL;
+	class->set_value_at        = NULL;
+	class->is_cell_editable    = NULL;
 
-	klass->has_save_id         = NULL;
-	klass->get_save_id         = NULL;
+	class->has_save_id         = NULL;
+	class->get_save_id         = NULL;
 
-	klass->has_change_pending  = NULL;
+	class->has_change_pending  = NULL;
 
-	klass->duplicate_value     = NULL;
-	klass->free_value          = NULL;
-	klass->initialize_value    = NULL;
-	klass->value_is_empty      = NULL;
-	klass->value_to_string     = NULL;
+	class->duplicate_value     = NULL;
+	class->free_value          = NULL;
+	class->initialize_value    = NULL;
+	class->value_is_empty      = NULL;
+	class->value_to_string     = NULL;
 
-	klass->model_no_change     = NULL;
-	klass->model_changed       = NULL;
-	klass->model_row_changed   = NULL;
-	klass->model_cell_changed  = NULL;
-	klass->model_rows_inserted = NULL;
-	klass->model_rows_deleted  = NULL;
+	class->model_no_change     = NULL;
+	class->model_changed       = NULL;
+	class->model_row_changed   = NULL;
+	class->model_cell_changed  = NULL;
+	class->model_rows_inserted = NULL;
+	class->model_rows_deleted  = NULL;
 }
 
 static void
@@ -393,7 +393,7 @@ e_table_model_pre_change (ETableModel *e_table_model)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type)));
+	d(g_print("Emitting pre_change on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type)));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_PRE_CHANGE], 0);
@@ -423,7 +423,7 @@ e_table_model_no_change (ETableModel *e_table_model)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type)));
+	d(g_print("Emitting model_no_change on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type)));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_NO_CHANGE], 0);
@@ -453,7 +453,7 @@ e_table_model_changed (ETableModel *e_table_model)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type)));
+	d(g_print("Emitting model_changed on model 0x%p, a %s.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type)));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_CHANGED], 0);
@@ -480,7 +480,7 @@ e_table_model_row_changed (ETableModel *e_table_model, gint row)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row));
+	d(g_print("Emitting row_changed on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type), row));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_ROW_CHANGED], 0, row);
@@ -508,7 +508,7 @@ e_table_model_cell_changed (ETableModel *e_table_model, gint col, gint row)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row, col));
+	d(g_print("Emitting cell_changed on model 0x%p, a %s, row %d, col %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type), row, col));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_CELL_CHANGED], 0, col, row);
@@ -536,7 +536,7 @@ e_table_model_rows_inserted (ETableModel *e_table_model, gint row, gint count)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row));
+	d(g_print("Emitting row_inserted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type), row));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_ROWS_INSERTED], 0, row, count);
@@ -579,7 +579,7 @@ e_table_model_rows_deleted (ETableModel *e_table_model, gint row, gint count)
 		return;
 
 	d (print_tabs ());
-	d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->klass->type), row));
+	d(g_print("Emitting row_deleted on model 0x%p, a %s, row %d.\n", e_table_model, g_type_name (G_OBJECT(e_table_model)->class->type), row));
 	d (depth++);
 	g_signal_emit (G_OBJECT (e_table_model),
 		       e_table_model_signals[MODEL_ROWS_DELETED], 0, row, count);
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
index e319b1ff42..2ff4eacebd 100644
--- a/widgets/table/e-table-model.h
+++ b/widgets/table/e-table-model.h
@@ -26,48 +26,82 @@
 
 #include <glib-object.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_MODEL \
+	(e_table_model_get_type ())
+#define E_TABLE_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_MODEL, ETableModel))
+#define E_TABLE_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_MODEL, ETableModelClass))
+#define E_IS_TABLE_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_MODEL))
+#define E_IS_TABLE_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_MODEL))
+#define E_TABLE_MODEL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_MODEL, ETableModelClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_MODEL_TYPE        (e_table_model_get_type ())
-#define E_TABLE_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_MODEL_TYPE, ETableModel))
-#define E_TABLE_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_MODEL_TYPE, ETableModelClass))
-#define E_IS_TABLE_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_MODEL_TYPE))
-#define E_IS_TABLE_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_MODEL_TYPE))
-#define E_TABLE_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_MODEL_TYPE, ETableModelClass))
+typedef struct _ETableModel ETableModel;
+typedef struct _ETableModelClass ETableModelClass;
 
-typedef struct {
-	GObject   base;
-} ETableModel;
+struct _ETableModel {
+	GObject parent;
+};
 
-typedef struct {
+struct _ETableModelClass {
 	GObjectClass parent_class;
 
 	/*
 	 * Virtual methods
 	 */
-	gint         (*column_count)       (ETableModel *etm);
-	gint         (*row_count)          (ETableModel *etm);
-	void        (*append_row)         (ETableModel *etm, ETableModel *source, gint row);
-
-	void       *(*value_at)           (ETableModel *etm, gint col, gint row);
-	void        (*set_value_at)       (ETableModel *etm, gint col, gint row, gconstpointer value);
-	gboolean    (*is_cell_editable)   (ETableModel *etm, gint col, gint row);
-
-	gboolean    (*has_save_id)        (ETableModel *etm);
-	gchar      *(*get_save_id)        (ETableModel *etm, gint row);
-
-	gboolean    (*has_change_pending) (ETableModel *etm);
+	gint		(*column_count)		(ETableModel *etm);
+	gint		(*row_count)		(ETableModel *etm);
+	void		(*append_row)		(ETableModel *etm,
+						 ETableModel *source,
+						 gint row);
+
+	gpointer	(*value_at)		(ETableModel *etm,
+						 gint col,
+						 gint row);
+	void		(*set_value_at)		(ETableModel *etm,
+						 gint col,
+						 gint row,
+						 gconstpointer value);
+	gboolean	(*is_cell_editable)	(ETableModel *etm,
+						 gint col,
+						 gint row);
+
+	gboolean	(*has_save_id)		(ETableModel *etm);
+	gchar *		(*get_save_id)		(ETableModel *etm,
+						 gint row);
+
+	gboolean	(*has_change_pending)	(ETableModel *etm);
 
 	/* Allocate a copy of the given value. */
-	void       *(*duplicate_value)    (ETableModel *etm, gint col, gconstpointer value);
+	gpointer	(*duplicate_value)	(ETableModel *etm,
+						 gint col,
+						 gconstpointer value);
 	/* Free an allocated value. */
-	void        (*free_value)         (ETableModel *etm, gint col, gpointer value);
+	void		(*free_value)		(ETableModel *etm,
+						 gint col,
+						 gpointer value);
 	/* Return an allocated empty value. */
-	void	   *(*initialize_value)   (ETableModel *etm, gint col);
+	gpointer	(*initialize_value)	(ETableModel *etm,
+						 gint col);
 	/* Return TRUE if value is equivalent to an empty cell. */
-	gboolean    (*value_is_empty)     (ETableModel *etm, gint col, gconstpointer value);
+	gboolean	(*value_is_empty)	(ETableModel *etm,
+						 gint col,
+						 gconstpointer value);
 	/* Return an allocated string. */
-	gchar       *(*value_to_string)    (ETableModel *etm, gint col, gconstpointer value);
+	gchar *		(*value_to_string)	(ETableModel *etm,
+						 gint col,
+						 gconstpointer value);
 
 	/*
 	 * Signals
@@ -82,89 +116,97 @@ typedef struct {
 	 * A row inserted: row_inserted
 	 * A row deleted: row_deleted
 	 */
-	void        (*model_pre_change)    (ETableModel *etm);
-
-	void        (*model_no_change)     (ETableModel *etm);
-	void        (*model_changed)       (ETableModel *etm);
-	void        (*model_row_changed)   (ETableModel *etm, gint row);
-	void        (*model_cell_changed)  (ETableModel *etm, gint col, gint row);
-	void        (*model_rows_inserted) (ETableModel *etm, gint row, gint count);
-	void        (*model_rows_deleted)  (ETableModel *etm, gint row, gint count);
-} ETableModelClass;
-
-GType       e_table_model_get_type            (void);
+	void		(*model_pre_change)	(ETableModel *etm);
+
+	void		(*model_no_change)	(ETableModel *etm);
+	void		(*model_changed)	(ETableModel *etm);
+	void		(*model_row_changed)	(ETableModel *etm,
+						 gint row);
+	void		(*model_cell_changed)	(ETableModel *etm,
+						 gint col,
+						 gint row);
+	void		(*model_rows_inserted)	(ETableModel *etm,
+						 gint row,
+						 gint count);
+	void		(*model_rows_deleted)	(ETableModel *etm,
+						 gint row,
+						 gint count);
+};
+
+GType		e_table_model_get_type		(void) G_GNUC_CONST;
 
 /**/
-gint         e_table_model_column_count        (ETableModel *e_table_model);
-const gchar *e_table_model_column_name         (ETableModel *e_table_model,
-					       gint          col);
-gint         e_table_model_row_count           (ETableModel *e_table_model);
-void        e_table_model_append_row          (ETableModel *e_table_model,
-					       ETableModel *source,
-					       gint          row);
+gint		e_table_model_column_count	(ETableModel *e_table_model);
+const gchar *	e_table_model_column_name	(ETableModel *e_table_model,
+						 gint col);
+gint		e_table_model_row_count		(ETableModel *e_table_model);
+void		e_table_model_append_row	(ETableModel *e_table_model,
+						 ETableModel *source,
+						 gint row);
 
 /**/
-void       *e_table_model_value_at            (ETableModel *e_table_model,
-					       gint          col,
-					       gint          row);
-void        e_table_model_set_value_at        (ETableModel *e_table_model,
-					       gint          col,
-					       gint          row,
-					       const void  *value);
-gboolean    e_table_model_is_cell_editable    (ETableModel *e_table_model,
-					       gint          col,
-					       gint          row);
+gpointer	e_table_model_value_at		(ETableModel *e_table_model,
+						 gint col,
+						 gint row);
+void		e_table_model_set_value_at	(ETableModel *e_table_model,
+						 gint col,
+						 gint row,
+						 gconstpointer value);
+gboolean	e_table_model_is_cell_editable	(ETableModel *e_table_model,
+						gint col,
+						 gint row);
 
 /**/
-gboolean    e_table_model_has_save_id         (ETableModel *etm);
-gchar       *e_table_model_get_save_id         (ETableModel *etm,
-					       gint          row);
+gboolean	e_table_model_has_save_id	(ETableModel *etm);
+gchar *		e_table_model_get_save_id	(ETableModel *etm,
+						 gint row);
 
 /**/
-gboolean    e_table_model_has_change_pending  (ETableModel *etm);
+gboolean	e_table_model_has_change_pending
+						(ETableModel *etm);
 
 /**/
-void       *e_table_model_duplicate_value     (ETableModel *e_table_model,
-					       gint          col,
-					       const void  *value);
-void        e_table_model_free_value          (ETableModel *e_table_model,
-					       gint          col,
-					       void        *value);
-void       *e_table_model_initialize_value    (ETableModel *e_table_model,
-					       gint          col);
-gboolean    e_table_model_value_is_empty      (ETableModel *e_table_model,
-					       gint          col,
-					       const void  *value);
-gchar       *e_table_model_value_to_string     (ETableModel *e_table_model,
-					       gint          col,
-					       const void  *value);
+gpointer	e_table_model_duplicate_value	(ETableModel *e_table_model,
+						 gint col,
+						 gconstpointer value);
+void		e_table_model_free_value	(ETableModel *e_table_model,
+						 gint col,
+						 gpointer value);
+gpointer	e_table_model_initialize_value	(ETableModel *e_table_model,
+						 gint col);
+gboolean	e_table_model_value_is_empty	(ETableModel *e_table_model,
+						 gint col,
+						 gconstpointer value);
+gchar *		e_table_model_value_to_string	(ETableModel *e_table_model,
+						 gint col,
+						 gconstpointer value);
 
 /*
  * Routines for emitting signals on the e_table
  */
-void        e_table_model_pre_change          (ETableModel *e_table_model);
-void        e_table_model_no_change           (ETableModel *e_table_model);
-void        e_table_model_changed             (ETableModel *e_table_model);
-void        e_table_model_row_changed         (ETableModel *e_table_model,
-					       gint          row);
-void        e_table_model_cell_changed        (ETableModel *e_table_model,
-					       gint          col,
-					       gint          row);
-void        e_table_model_rows_inserted       (ETableModel *e_table_model,
-gint          row,
-gint          count);
-void        e_table_model_rows_deleted        (ETableModel *e_table_model,
-gint          row,
-gint          count);
+void		e_table_model_pre_change	(ETableModel *e_table_model);
+void		e_table_model_no_change		(ETableModel *e_table_model);
+void		e_table_model_changed		(ETableModel *e_table_model);
+void		e_table_model_row_changed	(ETableModel *e_table_model,
+						 gint row);
+void		e_table_model_cell_changed	(ETableModel *e_table_model,
+						 gint col,
+						 gint row);
+void		e_table_model_rows_inserted	(ETableModel *e_table_model,
+						 gint row,
+						 gint count);
+void		e_table_model_rows_deleted	(ETableModel *e_table_model,
+						 gint row,
+						 gint count);
 
 /**/
-void        e_table_model_row_inserted        (ETableModel *e_table_model,
-gint          row);
-void        e_table_model_row_deleted         (ETableModel *e_table_model,
-gint          row);
+void		e_table_model_row_inserted	(ETableModel *e_table_model,
+						 gint row);
+void		e_table_model_row_deleted	(ETableModel *e_table_model,
+						 gint row);
 
-void        e_table_model_freeze              (ETableModel *e_table_model);
-void        e_table_model_thaw                (ETableModel *e_table_model);
+void		e_table_model_freeze		(ETableModel *e_table_model);
+void		e_table_model_thaw		(ETableModel *e_table_model);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index b58b0b8631..ed8a481104 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -27,7 +27,7 @@
 
 #include "e-table-one.h"
 
-G_DEFINE_TYPE (ETableOne, e_table_one, E_TABLE_MODEL_TYPE)
+G_DEFINE_TYPE (ETableOne, e_table_one, E_TYPE_TABLE_MODEL)
 
 static gint
 one_column_count (ETableModel *etm)
@@ -167,10 +167,10 @@ one_dispose (GObject *object)
 }
 
 static void
-e_table_one_class_init (ETableOneClass *klass)
+e_table_one_class_init (ETableOneClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ETableModelClass *model_class = E_TABLE_MODEL_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ETableModelClass *model_class = E_TABLE_MODEL_CLASS (class);
 
 	model_class->column_count = one_column_count;
 	model_class->row_count = one_row_count;
@@ -201,7 +201,7 @@ e_table_one_new (ETableModel *source)
 	gint col_count;
 	gint i;
 
-	eto = g_object_new (E_TABLE_ONE_TYPE, NULL);
+	eto = g_object_new (E_TYPE_TABLE_ONE, NULL);
 	eto->source = source;
 
 	col_count = e_table_model_column_count (source);
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h
index 2984aeaa76..a0d5c7bf88 100644
--- a/widgets/table/e-table-one.h
+++ b/widgets/table/e-table-one.h
@@ -25,30 +25,45 @@
 
 #include <table/e-table-model.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_ONE \
+	(e_table_one_get_type ())
+#define E_TABLE_ONE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_ONE, ETableOne))
+#define E_TABLE_ONE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_ONE, ETableOneClass))
+#define E_IS_TABLE_ONE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_ONE))
+#define E_IS_TABLE_ONE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_ONE))
+#define E_TABLE_ONE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_ONE, ETableOneClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_ONE_TYPE        (e_table_one_get_type ())
-#define E_TABLE_ONE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_ONE_TYPE, ETableOne))
-#define E_TABLE_ONE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_ONE_TYPE, ETableOneClass))
-#define E_IS_TABLE_ONE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_ONE_TYPE))
-#define E_IS_TABLE_ONE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_ONE_TYPE))
-#define E_TABLE_ONE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TABLE_ONE_TYPE, ETableOneClass))
+typedef struct _ETableOne ETableOne;
+typedef struct _ETableOneClass ETableOneClass;
 
-typedef struct {
-	ETableModel   parent;
+struct _ETableOne {
+	ETableModel parent;
 
 	ETableModel  *source;
-	void        **data;
-} ETableOne;
+	gpointer *data;
+};
 
-typedef struct {
+struct _ETableOneClass {
 	ETableModelClass parent_class;
-} ETableOneClass;
+};
 
-GType e_table_one_get_type (void);
+GType		e_table_one_get_type		(void) G_GNUC_CONST;
 
-ETableModel *e_table_one_new (ETableModel *source);
-void         e_table_one_commit (ETableOne *one);
+ETableModel *	e_table_one_new			(ETableModel *source);
+void		e_table_one_commit		(ETableOne *one);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 1f2f5b1a0b..10ed919571 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -30,6 +30,10 @@
 
 #define d(x)
 
+#define E_TABLE_SEARCH_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TABLE_SEARCH, ETableSearchPrivate))
+
 d (static gint depth = 0)
 
 struct _ETableSearchPrivate {
@@ -106,21 +110,26 @@ add_timeout (ETableSearch *ets)
 static void
 e_table_search_finalize (GObject *object)
 {
-	ETableSearch *ets = (ETableSearch *) object;
+	ETableSearchPrivate *priv;
 
-	drop_timeout (ets);
-	g_free (ets->priv->search_string);
-	g_free (ets->priv);
+	priv = E_TABLE_SEARCH_GET_PRIVATE (object);
+
+	drop_timeout (E_TABLE_SEARCH (object));
+
+	g_free (priv->search_string);
 
-	if (G_OBJECT_CLASS (e_table_search_parent_class)->finalize)
-		(*G_OBJECT_CLASS (e_table_search_parent_class)->finalize)(object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_table_search_parent_class)->finalize (object);
 }
 
 static void
-e_table_search_class_init (ETableSearchClass *klass)
+e_table_search_class_init (ETableSearchClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class;
 
+	g_type_class_add_private (class, sizeof (ETableSearchPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
 	object_class->finalize = e_table_search_finalize;
 
 	e_table_search_signals[SEARCH_SEARCH] =
@@ -141,26 +150,22 @@ e_table_search_class_init (ETableSearchClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	klass->search = NULL;
-	klass->accept = NULL;
+	class->search = NULL;
+	class->accept = NULL;
 }
 
 static void
 e_table_search_init (ETableSearch *ets)
 {
-	ets->priv = g_new (ETableSearchPrivate, 1);
+	ets->priv = E_TABLE_SEARCH_GET_PRIVATE (ets);
 
-	ets->priv->timeout_id = 0;
 	ets->priv->search_string = g_strdup ("");
-	ets->priv->last_character = 0;
 }
 
 ETableSearch *
 e_table_search_new (void)
 {
-	ETableSearch *ets = g_object_new (E_TABLE_SEARCH_TYPE, NULL);
-
-	return ets;
+	return g_object_new (E_TYPE_TABLE_SEARCH, NULL);
 }
 
 /**
diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h
index 798d81bd2d..ecd56a5d72 100644
--- a/widgets/table/e-table-search.h
+++ b/widgets/table/e-table-search.h
@@ -26,45 +26,56 @@
 
 #include <glib-object.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SEARCH \
+	(e_table_search_get_type ())
+#define E_TABLE_SEARCH(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SEARCH, ETableSearch))
+#define E_TABLE_SEARCH_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SEARCH, ETableSearchClass))
+#define E_IS_TABLE_SEARCH(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SEARCH))
+#define E_IS_TABLE_SEARCH_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SEARCH))
+#define E_TABLE_SEARCH_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SEARCH, ETableSearchClass))
 
-#define E_TABLE_SEARCH_TYPE        (e_table_search_get_type ())
-#define E_TABLE_SEARCH(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SEARCH_TYPE, ETableSearch))
-#define E_TABLE_SEARCH_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SEARCH_TYPE, ETableSearchClass))
-#define E_IS_TABLE_SEARCH(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SEARCH_TYPE))
-#define E_IS_TABLE_SEARCH_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SEARCH_TYPE))
-#define E_TABLE_SEARCH_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SEARCH_TYPE, ETableSearchClass))
+G_BEGIN_DECLS
 
+typedef struct _ETableSearch ETableSearch;
+typedef struct _ETableSearchClass ETableSearchClass;
 typedef struct _ETableSearchPrivate ETableSearchPrivate;
 
 typedef enum {
 	E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST = 1 << 0
 } ETableSearchFlags;
 
-typedef struct {
-	GObject   base;
-
+struct _ETableSearch {
+	GObject parent;
 	ETableSearchPrivate *priv;
-} ETableSearch;
+};
 
-typedef struct {
+struct _ETableSearchClass {
 	GObjectClass parent_class;
 
-	/*
-	 * Signals
-	 */
-	gboolean (*search)    (ETableSearch *ets, gchar *string /* utf8 */, ETableSearchFlags flags);
-	void     (*accept)    (ETableSearch *ets);
-} ETableSearchClass;
-
-GType       e_table_search_get_type         (void);
-ETableSearch *e_table_search_new              (void);
+	/* Signals */
+	gboolean	(*search)		(ETableSearch *ets,
+						 gchar *string /* utf8 */,
+						 ETableSearchFlags flags);
+	void		(*accept)		(ETableSearch *ets);
+};
 
-/**/
-void          e_table_search_input_character  (ETableSearch *e_table_search,
-					       gunichar      character);
-gboolean      e_table_search_backspace        (ETableSearch *e_table_search);
-void          e_table_search_cancel           (ETableSearch *e_table_search);
+GType		e_table_search_get_type		(void) G_GNUC_CONST;
+ETableSearch *	e_table_search_new		(void);
+void		e_table_search_input_character	(ETableSearch *e_table_search,
+						 gunichar character);
+gboolean	e_table_search_backspace	(ETableSearch *e_table_search);
+void		e_table_search_cancel		(ETableSearch *e_table_search);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index b459dd1da1..7c11d1bd4a 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -283,13 +283,13 @@ e_table_selection_model_init (ETableSelectionModel *selection)
 }
 
 static void
-e_table_selection_model_class_init (ETableSelectionModelClass *klass)
+e_table_selection_model_class_init (ETableSelectionModelClass *class)
 {
 	GObjectClass *object_class;
 	ESelectionModelArrayClass *esma_class;
 
-	object_class             = G_OBJECT_CLASS (klass);
-	esma_class               = E_SELECTION_MODEL_ARRAY_CLASS (klass);
+	object_class             = G_OBJECT_CLASS (class);
+	esma_class               = E_SELECTION_MODEL_ARRAY_CLASS (class);
 
 	object_class->dispose      = etsm_dispose;
 	object_class->get_property = etsm_get_property;
@@ -301,14 +301,14 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass)
 					 g_param_spec_object ("model",
 							      "Model",
 							      NULL,
-							      E_TABLE_MODEL_TYPE,
+							      E_TYPE_TABLE_MODEL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_HEADER,
 					 g_param_spec_object ("header",
 							      "Header",
 							      NULL,
-							      E_TABLE_HEADER_TYPE,
+							      E_TYPE_TABLE_HEADER,
 							      G_PARAM_READWRITE));
 }
 
@@ -322,7 +322,7 @@ e_table_selection_model_class_init (ETableSelectionModelClass *klass)
 ETableSelectionModel *
 e_table_selection_model_new (void)
 {
-	return g_object_new (E_TABLE_SELECTION_MODEL_TYPE, NULL);
+	return g_object_new (E_TYPE_TABLE_SELECTION_MODEL, NULL);
 }
 
 static gint
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index ab504ac711..f144980f03 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -24,21 +24,36 @@
 #ifndef _E_TABLE_SELECTION_MODEL_H_
 #define _E_TABLE_SELECTION_MODEL_H_
 
-#include <glib-object.h>
 #include <misc/e-selection-model-array.h>
 #include <table/e-table-model.h>
 #include <table/e-table-header.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SELECTION_MODEL \
+	(e_table_selection_model_get_type ())
+#define E_TABLE_SELECTION_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SELECTION_MODEL, ETableSelectionModel))
+#define E_TABLE_SELECTION_MODEL_CLASS(cls) \
+	(G_TYPE-CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SELECTION_MODEL, ETableSelectionModelClass))
+#define E_IS_TABLE_SELECTION_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SELECTION_MODEL))
+#define E_IS_TABLE_SELECTION_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SELECTION_MODEL))
+#define E_TABLE_SELECTION_MODEL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SELECTION_MODEL, ETableSelectionModelClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_SELECTION_MODEL_TYPE        (e_table_selection_model_get_type ())
-#define E_TABLE_SELECTION_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModel))
-#define E_TABLE_SELECTION_MODEL_CLASS(k)    (G_TYPE-CHECK_CLASS_CAST((k), E_TABLE_SELECTION_MODEL_TYPE, ETableSelectionModelClass))
-#define E_IS_TABLE_SELECTION_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SELECTION_MODEL_TYPE))
-#define E_IS_TABLE_SELECTION_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SELECTION_MODEL_TYPE))
+typedef struct _ETableSelectionModel ETableSelectionModel;
+typedef struct _ETableSelectionModelClass ETableSelectionModelClass;
 
-typedef struct {
-	ESelectionModelArray base;
+struct _ETableSelectionModel {
+	ESelectionModelArray parent;
 
 	ETableModel  *model;
 	ETableHeader *eth;
@@ -57,14 +72,15 @@ typedef struct {
 
 	GHashTable *hash;
 	gchar *cursor_id;
-} ETableSelectionModel;
+};
 
-typedef struct {
+struct _ETableSelectionModelClass {
 	ESelectionModelArrayClass parent_class;
-} ETableSelectionModelClass;
+};
 
-GType                 e_table_selection_model_get_type            (void);
-ETableSelectionModel *e_table_selection_model_new                 (void);
+GType		e_table_selection_model_get_type	(void) G_GNUC_CONST;
+ETableSelectionModel *
+		e_table_selection_model_new		(void);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index f7a6d89ad5..b238e6b444 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -71,11 +71,11 @@ e_table_sort_info_init (ETableSortInfo *info)
 }
 
 static void
-e_table_sort_info_class_init (ETableSortInfoClass *klass)
+e_table_sort_info_class_init (ETableSortInfoClass *class)
 {
-	GObjectClass * object_class = G_OBJECT_CLASS (klass);
+	GObjectClass * object_class = G_OBJECT_CLASS (class);
 
-	e_table_sort_info_parent_class = g_type_class_peek_parent (klass);
+	e_table_sort_info_parent_class = g_type_class_peek_parent (class);
 
 	object_class->finalize = etsi_finalize;
 
@@ -97,8 +97,8 @@ e_table_sort_info_class_init (ETableSortInfoClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	klass->sort_info_changed = NULL;
-	klass->group_info_changed = NULL;
+	class->sort_info_changed = NULL;
+	class->group_info_changed = NULL;
 }
 
 static void
@@ -340,7 +340,7 @@ e_table_sort_info_sorting_set_nth   (ETableSortInfo *info, gint n, ETableSortCol
 ETableSortInfo *
 e_table_sort_info_new (void)
 {
-	return g_object_new (E_TABLE_SORT_INFO_TYPE, NULL);
+	return g_object_new (E_TYPE_TABLE_SORT_INFO, NULL);
 }
 
 /**
diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h
index d9ffec9be2..a577481150 100644
--- a/widgets/table/e-table-sort-info.h
+++ b/widgets/table/e-table-sort-info.h
@@ -6,7 +6,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -26,24 +26,38 @@
 #include <glib-object.h>
 #include <libxml/tree.h>
 
-G_BEGIN_DECLS
+#define E_TYPE_TABLE_SORT_INFO \
+	(e_table_sort_info_get_type ())
+#define E_TABLE_SORT_INFO(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SORT_INFO, ETableSortInfo))
+#define E_TABLE_SORT_INFO_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SORT_INFO, ETableSortInfoClass))
+#define E_IS_TABLE_SORT_INFO(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SORT_INFO))
+#define E_IS_TABLE_SORT_INFO_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SORT_INFO))
+#define E_TABLE_SORT_INFO_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SORT_INFO, ETableSortInfoClass))
 
-#define E_TABLE_SORT_INFO_TYPE        (e_table_sort_info_get_type ())
-#define E_TABLE_SORT_INFO(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfo))
-#define E_TABLE_SORT_INFO_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass))
-#define E_IS_TABLE_SORT_INFO(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SORT_INFO_TYPE))
-#define E_IS_TABLE_SORT_INFO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SORT_INFO_TYPE))
-#define E_TABLE_SORT_INFO_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SORT_INFO_TYPE, ETableSortInfoClass))
+G_BEGIN_DECLS
 
 typedef struct _ETableSortColumn ETableSortColumn;
 
+typedef struct _ETableSortInfo ETableSortInfo;
+typedef struct _ETableSortInfoClass ETableSortInfoClass;
+
 struct _ETableSortColumn {
 	guint column : 31;
 	guint ascending : 1;
 };
 
-typedef struct {
-	GObject   base;
+struct _ETableSortInfo {
+	GObject parent;
 
 	gint group_count;
 	ETableSortColumn *groupings;
@@ -55,51 +69,60 @@ typedef struct {
 	guint group_info_changed : 1;
 
 	guint can_group : 1;
-} ETableSortInfo;
+};
 
-typedef struct {
+struct _ETableSortInfoClass {
 	GObjectClass parent_class;
 
-	/*
-	 * Signals
-	 */
-	void        (*sort_info_changed)      (ETableSortInfo *info);
-	void        (*group_info_changed)     (ETableSortInfo *info);
-} ETableSortInfoClass;
-
-GType             e_table_sort_info_get_type            (void);
-
-void              e_table_sort_info_freeze              (ETableSortInfo   *info);
-void              e_table_sort_info_thaw                (ETableSortInfo   *info);
-
-guint             e_table_sort_info_grouping_get_count  (ETableSortInfo   *info);
-void              e_table_sort_info_grouping_truncate   (ETableSortInfo   *info,
-							 gint               length);
-ETableSortColumn  e_table_sort_info_grouping_get_nth    (ETableSortInfo   *info,
-							 gint               n);
-void              e_table_sort_info_grouping_set_nth    (ETableSortInfo   *info,
-							 gint               n,
-							 ETableSortColumn  column);
-
-guint             e_table_sort_info_sorting_get_count   (ETableSortInfo   *info);
-void              e_table_sort_info_sorting_truncate    (ETableSortInfo   *info,
-							 gint               length);
-ETableSortColumn  e_table_sort_info_sorting_get_nth     (ETableSortInfo   *info,
-							 gint               n);
-void              e_table_sort_info_sorting_set_nth     (ETableSortInfo   *info,
-							 gint               n,
-							 ETableSortColumn  column);
-
-ETableSortInfo   *e_table_sort_info_new                 (void);
-void              e_table_sort_info_load_from_node      (ETableSortInfo   *info,
-							 xmlNode          *node,
-							 gdouble           state_version);
-xmlNode          *e_table_sort_info_save_to_node        (ETableSortInfo   *info,
-							 xmlNode          *parent);
-ETableSortInfo   *e_table_sort_info_duplicate           (ETableSortInfo   *info);
-void              e_table_sort_info_set_can_group       (ETableSortInfo   *info,
-							 gboolean          can_group);
-gboolean          e_table_sort_info_get_can_group       (ETableSortInfo   *info);
+	/* Signals */
+	void		(*sort_info_changed)	(ETableSortInfo *info);
+	void		(*group_info_changed)	(ETableSortInfo *info);
+};
+
+GType		e_table_sort_info_get_type	(void) G_GNUC_CONST;
+
+void		e_table_sort_info_freeze	(ETableSortInfo *info);
+void		e_table_sort_info_thaw		(ETableSortInfo *info);
+
+guint		e_table_sort_info_grouping_get_count
+						(ETableSortInfo *info);
+void		e_table_sort_info_grouping_truncate
+						(ETableSortInfo *info,
+						 gint length);
+ETableSortColumn
+		e_table_sort_info_grouping_get_nth
+						(ETableSortInfo *info,
+						 gint n);
+void		e_table_sort_info_grouping_set_nth
+						(ETableSortInfo *info,
+						 gint n,
+						 ETableSortColumn column);
+
+guint		e_table_sort_info_sorting_get_count
+						(ETableSortInfo *info);
+void		e_table_sort_info_sorting_truncate
+						(ETableSortInfo *info,
+						 gint length);
+ETableSortColumn
+		e_table_sort_info_sorting_get_nth
+						(ETableSortInfo *info,
+						 gint n);
+void		e_table_sort_info_sorting_set_nth
+						(ETableSortInfo *info,
+						 gint n,
+						 ETableSortColumn column);
+
+ETableSortInfo *e_table_sort_info_new		(void);
+void		e_table_sort_info_load_from_node
+						(ETableSortInfo *info,
+						 xmlNode *node,
+						 gdouble state_version);
+xmlNode *	e_table_sort_info_save_to_node	(ETableSortInfo *info,
+						 xmlNode *parent);
+ETableSortInfo *e_table_sort_info_duplicate	(ETableSortInfo *info);
+void		e_table_sort_info_set_can_group	(ETableSortInfo *info,
+						 gboolean can_group);
+gboolean	e_table_sort_info_get_can_group (ETableSortInfo *info);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index b9185994c1..f2970209bf 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -39,7 +39,7 @@
 
 /* workaround for avoiding API breakage */
 #define etsv_get_type e_table_sorted_variable_get_type
-G_DEFINE_TYPE (ETableSortedVariable, etsv, E_TABLE_SUBSET_VARIABLE_TYPE)
+G_DEFINE_TYPE (ETableSortedVariable, etsv, E_TYPE_TABLE_SUBSET_VARIABLE)
 
 static void etsv_sort_info_changed        (ETableSortInfo *info, ETableSortedVariable *etsv);
 static void etsv_sort                     (ETableSortedVariable *etsv);
@@ -77,10 +77,10 @@ etsv_dispose (GObject *object)
 }
 
 static void
-etsv_class_init (ETableSortedVariableClass *klass)
+etsv_class_init (ETableSortedVariableClass *class)
 {
-	ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	ETableSubsetVariableClass *etssv_class = E_TABLE_SUBSET_VARIABLE_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = etsv_dispose;
 
@@ -187,7 +187,7 @@ etsv_add_all   (ETableSubsetVariable *etssv)
 ETableModel *
 e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
 {
-	ETableSortedVariable *etsv = g_object_new (E_TABLE_SORTED_VARIABLE_TYPE, NULL);
+	ETableSortedVariable *etsv = g_object_new (E_TYPE_TABLE_SORTED_VARIABLE, NULL);
 	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
 
 	if (e_table_subset_variable_construct (etssv, source) == NULL) {
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
index c778af3c1f..917338ae4d 100644
--- a/widgets/table/e-table-sorted-variable.h
+++ b/widgets/table/e-table-sorted-variable.h
@@ -24,41 +24,57 @@
 #ifndef _E_TABLE_SORTED_VARIABLE_H_
 #define _E_TABLE_SORTED_VARIABLE_H_
 
-#include <glib-object.h>
 #include <table/e-table-model.h>
 #include <table/e-table-subset-variable.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-header.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SORTED_VARIABLE \
+	(e_table_sorted_variable_get_type ())
+#define E_TABLE_SORTED_VARIABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SORTED_VARIABLE, ETableSortedVariable))
+#define E_TABLE_SORTED_VARIABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SORTED_VARIABLE, ETableSortedVariableClass))
+#define E_IS_TABLE_SORTED_VARIABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SORTED_VARIABLE))
+#define E_IS_TABLE_SORTED_VARIABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SORTED_VARIABLE))
+#define E_TABLE_SORTED_VARIABLE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SORTED_VARIABLE, ETableSortedVariableClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_SORTED_VARIABLE_TYPE        (e_table_sorted_variable_get_type ())
-#define E_TABLE_SORTED_VARIABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariable))
-#define E_TABLE_SORTED_VARIABLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
-#define E_IS_TABLE_SORTED_VARIABLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SORTED_VARIABLE_TYPE))
-#define E_IS_TABLE_SORTED_VARIABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_VARIABLE_TYPE))
-#define E_TABLE_SORTED_VARIABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SORTED_VARIABLE_TYPE, ETableSortedVariableClass))
+typedef struct _ETableSortedVariable ETableSortedVariable;
+typedef struct _ETableSortedVariableClass ETableSortedVariableClass;
 
-typedef struct {
-	ETableSubsetVariable base;
+struct _ETableSortedVariable {
+	ETableSubsetVariable parent;
 
 	ETableSortInfo *sort_info;
 
 	ETableHeader *full_header;
 
-	gint              sort_info_changed_id;
-	gint              sort_idle_id;
-	gint		 insert_idle_id;
-	gint		 insert_count;
-
-} ETableSortedVariable;
+	gint sort_info_changed_id;
+	gint sort_idle_id;
+	gint insert_idle_id;
+	gint insert_count;
+};
 
-typedef struct {
+struct _ETableSortedVariableClass {
 	ETableSubsetVariableClass parent_class;
-} ETableSortedVariableClass;
+};
 
-GType        e_table_sorted_variable_get_type (void);
-ETableModel *e_table_sorted_variable_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
+GType		e_table_sorted_variable_get_type
+						(void) G_GNUC_CONST;
+ETableModel *	e_table_sorted_variable_new	(ETableModel *etm,
+						 ETableHeader *header,
+						 ETableSortInfo *sort_info);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index c1ff7740d5..73dbac102e 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -36,7 +36,7 @@
 
 /* workaround for avoding API breakage */
 #define ets_get_type e_table_sorted_get_type
-G_DEFINE_TYPE (ETableSorted, ets, E_TABLE_SUBSET_TYPE)
+G_DEFINE_TYPE (ETableSorted, ets, E_TYPE_TABLE_SUBSET)
 
 /* maximum insertions between an idle event that we will do without scheduling an idle sort */
 #define ETS_INSERT_MAX (4)
@@ -77,10 +77,10 @@ ets_dispose (GObject *object)
 }
 
 static void
-ets_class_init (ETableSortedClass *klass)
+ets_class_init (ETableSortedClass *class)
 {
-	ETableSubsetClass *etss_class = E_TABLE_SUBSET_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	ETableSubsetClass *etss_class = E_TABLE_SUBSET_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	etss_class->proxy_model_changed = ets_proxy_model_changed;
 	etss_class->proxy_model_row_changed = ets_proxy_model_row_changed;
@@ -125,7 +125,7 @@ ets_insert_idle (ETableSorted *ets)
 ETableModel *
 e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
 {
-	ETableSorted *ets = g_object_new (E_TABLE_SORTED_TYPE, NULL);
+	ETableSorted *ets = g_object_new (E_TYPE_TABLE_SORTED, NULL);
 	ETableSubset *etss = E_TABLE_SUBSET (ets);
 
 	if (E_TABLE_SUBSET_CLASS (ets_parent_class)->proxy_model_pre_change)
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
index a9e815ef3a..feff6e2ad5 100644
--- a/widgets/table/e-table-sorted.h
+++ b/widgets/table/e-table-sorted.h
@@ -24,41 +24,56 @@
 #ifndef _E_TABLE_SORTED_H_
 #define _E_TABLE_SORTED_H_
 
-#include <glib-object.h>
 #include <table/e-table-model.h>
 #include <table/e-table-subset.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-header.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SORTED \
+	(e_table_sorted_get_type ())
+#define E_TABLE_SORTED(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SORTED, ETableSorted))
+#define E_TABLE_SORTED_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SORTED, ETableSortedClass))
+#define E_IS_TABLE_SORTED(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SORTED))
+#define E_IS_TABLE_SORTED_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SORTED))
+#define E_TABLE_SORTED_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SORTED, ETableSortedClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_SORTED_TYPE        (e_table_sorted_get_type ())
-#define E_TABLE_SORTED(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SORTED_TYPE, ETableSorted))
-#define E_TABLE_SORTED_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SORTED_TYPE, ETableSortedClass))
-#define E_IS_TABLE_SORTED(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SORTED_TYPE))
-#define E_IS_TABLE_SORTED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SORTED_TYPE))
-#define E_TABLE_SORTED_GET_CLASS(o)   (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TABLE_SORTED_TYPE, ETableSortedClass))
+typedef struct _ETableSorted ETableSorted;
+typedef struct _ETableSortedClass ETableSortedClass;
 
-typedef struct {
-	ETableSubset base;
+struct _ETableSorted {
+	ETableSubset parent;
 
 	ETableSortInfo *sort_info;
 
 	ETableHeader *full_header;
 
-	gint              sort_info_changed_id;
-	gint              sort_idle_id;
-	gint		 insert_idle_id;
-	gint		 insert_count;
-
-} ETableSorted;
+	gint sort_info_changed_id;
+	gint sort_idle_id;
+	gint insert_idle_id;
+	gint insert_count;
+};
 
-typedef struct {
+struct _ETableSortedClass {
 	ETableSubsetClass parent_class;
-} ETableSortedClass;
+};
 
-GType        e_table_sorted_get_type (void);
-ETableModel *e_table_sorted_new      (ETableModel *etm, ETableHeader *header, ETableSortInfo *sort_info);
+GType		e_table_sorted_get_type		(void) G_GNUC_CONST;
+ETableModel *	e_table_sorted_new		(ETableModel *etm,
+						 ETableHeader *header,
+						 ETableSortInfo *sort_info);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 2a52fbb8d5..491fe7fc6f 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -153,10 +153,10 @@ ets_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 }
 
 static void
-ets_class_init (ETableSorterClass *klass)
+ets_class_init (ETableSorterClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	ESorterClass *sorter_class = E_SORTER_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	ESorterClass *sorter_class = E_SORTER_CLASS (class);
 
 	object_class->dispose                   = ets_dispose;
 	object_class->set_property              = ets_set_property;
@@ -172,7 +172,7 @@ ets_class_init (ETableSorterClass *klass)
 					 g_param_spec_object ("sort_info",
 							      "Sort Info",
 							      NULL,
-							      E_TABLE_SORT_INFO_TYPE,
+							      E_TYPE_TABLE_SORT_INFO,
 							      G_PARAM_READWRITE));
 }
 
@@ -197,7 +197,7 @@ ets_init (ETableSorter *ets)
 ETableSorter *
 e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
 {
-	ETableSorter *ets = g_object_new (E_TABLE_SORTER_TYPE, NULL);
+	ETableSorter *ets = g_object_new (E_TYPE_TABLE_SORTER, NULL);
 
 	ets->sort_info = sort_info;
 	g_object_ref (ets->sort_info);
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
index 067da103f9..0f36f441f6 100644
--- a/widgets/table/e-table-sorter.h
+++ b/widgets/table/e-table-sorter.h
@@ -23,51 +23,68 @@
 #ifndef _E_TABLE_SORTER_H_
 #define _E_TABLE_SORTER_H_
 
-#include <glib-object.h>
 #include <e-util/e-sorter.h>
 #include <table/e-table-model.h>
 #include <table/e-table-subset-variable.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-header.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SORTER \
+	(e_table_sorter_get_type ())
+#define E_TABLE_SORTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SORTER, ETableSorter))
+#define E_TABLE_SORTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SORTER, ETableSorterClass))
+#define E_IS_TABLE_SORTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SORTER))
+#define E_IS_TABLE_SORTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SORTER))
+#define E_TABLE_SORTER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SORTER, ETableSorterClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_SORTER_TYPE        (e_table_sorter_get_type ())
-#define E_TABLE_SORTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SORTER_TYPE, ETableSorter))
-#define E_TABLE_SORTER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SORTER_TYPE, ETableSorterClass))
-#define E_IS_TABLE_SORTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SORTER_TYPE))
-#define E_IS_TABLE_SORTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SORTER_TYPE))
+typedef struct _ETableSorter ETableSorter;
+typedef struct _ETableSorterClass ETableSorterClass;
 
-typedef struct {
-	ESorter base;
+struct _ETableSorter {
+	ESorter parent;
 
-	ETableModel    *source;
-	ETableHeader   *full_header;
+	ETableModel *source;
+	ETableHeader *full_header;
 	ETableSortInfo *sort_info;
 
-	/* If needs_sorting is 0, then model_to_sorted and sorted_to_model are no-ops. */
-	gint             needs_sorting;
+	/* If needs_sorting is 0, then model_to_sorted
+	 * and sorted_to_model are no-ops. */
+	gint needs_sorting;
 
-	gint            *sorted;
-	gint            *backsorted;
+	gint *sorted;
+	gint *backsorted;
 
-	gint             table_model_changed_id;
-	gint             table_model_row_changed_id;
-	gint             table_model_cell_changed_id;
-	gint             table_model_rows_inserted_id;
-	gint             table_model_rows_deleted_id;
-	gint             sort_info_changed_id;
-	gint             group_info_changed_id;
-} ETableSorter;
+	gint table_model_changed_id;
+	gint table_model_row_changed_id;
+	gint table_model_cell_changed_id;
+	gint table_model_rows_inserted_id;
+	gint table_model_rows_deleted_id;
+	gint sort_info_changed_id;
+	gint group_info_changed_id;
+};
 
-typedef struct {
+struct _ETableSorterClass {
 	ESorterClass parent_class;
-} ETableSorterClass;
+};
+
+GType		e_table_sorter_get_type		(void) G_GNUC_CONST;
+ETableSorter *	e_table_sorter_new		(ETableModel *etm,
+						 ETableHeader *full_header,
+						 ETableSortInfo *sort_info);
 
-GType         e_table_sorter_get_type                   (void);
-ETableSorter *e_table_sorter_new                        (ETableModel     *etm,
-							 ETableHeader    *full_header,
-							 ETableSortInfo  *sort_info);
 G_END_DECLS
 
 #endif /* _E_TABLE_SORTER_H_ */
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
index 3c60df1838..5a0a3cd3d7 100644
--- a/widgets/table/e-table-sorting-utils.h
+++ b/widgets/table/e-table-sorting-utils.h
@@ -6,7 +6,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -29,50 +29,62 @@ G_BEGIN_DECLS
 #include <table/e-tree-model.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-header.h>
-gboolean  e_table_sorting_utils_affects_sort         (ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      gint             col);
 
-void      e_table_sorting_utils_sort                 (ETableModel    *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      gint            *map_table,
-						      gint             rows);
-gint       e_table_sorting_utils_insert               (ETableModel    *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      gint            *map_table,
-						      gint             rows,
-						      gint             row);
-gint       e_table_sorting_utils_check_position       (ETableModel    *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      gint            *map_table,
-						      gint             rows,
-						      gint             view_row);
+gboolean	e_table_sorting_utils_affects_sort
+						(ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 gint col);
 
-void      e_table_sorting_utils_tree_sort            (ETreeModel     *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      ETreePath      *map_table,
-						      gint             count);
-gint       e_table_sorting_utils_tree_check_position  (ETreeModel     *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      ETreePath      *map_table,
-						      gint             count,
-						      gint             old_index);
-gint       e_table_sorting_utils_tree_insert          (ETreeModel     *source,
-						      ETableSortInfo *sort_info,
-						      ETableHeader   *full_header,
-						      ETreePath      *map_table,
-						      gint             count,
-						      ETreePath       path);
+void		e_table_sorting_utils_sort	(ETableModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 gint *map_table,
+						 gint rows);
+gint		e_table_sorting_utils_insert	(ETableModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 gint *map_table,
+						 gint rows,
+						 gint row);
+gint		e_table_sorting_utils_check_position
+						(ETableModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 gint *map_table,
+						 gint rows,
+						 gint view_row);
 
-gpointer     e_table_sorting_utils_create_cmp_cache (void);
-void         e_table_sorting_utils_free_cmp_cache (gpointer cmp_cache);
-void         e_table_sorting_utils_add_to_cmp_cache (gpointer cmp_cache, const gchar *key, gchar *value);
-const gchar *e_table_sorting_utils_lookup_cmp_cache (gpointer cmp_cache, const gchar *key);
+void		e_table_sorting_utils_tree_sort	(ETreeModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 ETreePath *map_table,
+						 gint count);
+gint		e_table_sorting_utils_tree_check_position
+						(ETreeModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 ETreePath *map_table,
+						 gint count,
+						 gint old_index);
+gint		e_table_sorting_utils_tree_insert
+						(ETreeModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *full_header,
+						 ETreePath *map_table,
+						 gint count,
+						 ETreePath path);
+
+gpointer	e_table_sorting_utils_create_cmp_cache
+						(void);
+void		e_table_sorting_utils_free_cmp_cache
+						(gpointer cmp_cache);
+void		e_table_sorting_utils_add_to_cmp_cache
+						(gpointer cmp_cache,
+						 const gchar *key,
+						 gchar *value);
+const gchar *	e_table_sorting_utils_lookup_cmp_cache
+						(gpointer cmp_cache,
+						 const gchar *key);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 2325aea633..99213ad501 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -69,9 +69,9 @@ etsp_finalize (GObject *object)
 }
 
 static void
-etsp_class_init (ETableSpecificationClass *klass)
+etsp_class_init (ETableSpecificationClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->finalize = etsp_finalize;
 }
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
index e6f6707ae5..021c0524c5 100644
--- a/widgets/table/e-table-specification.h
+++ b/widgets/table/e-table-specification.h
@@ -24,24 +24,38 @@
 #ifndef _E_TABLE_SPECIFICATION_H_
 #define _E_TABLE_SPECIFICATION_H_
 
-#include <glib-object.h>
 #include <libxml/tree.h>
 #include <misc/e-selection-model.h>
 #include <table/e-table-state.h>
 #include <table/e-table-column-specification.h>
 #include <table/e-table-defines.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SPECIFICATION \
+	(e_table_specification_get_type ())
+#define E_TABLE_SPECIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SPECIFICATION, ETableSpecification))
+#define E_TABLE_SPECIFICATION_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SPECIFICATION, ETableSpecificationClass))
+#define E_IS_TABLE_SPECIFICATION(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SPECIFICATION))
+#define E_IS_TABLE_SPECIFICATION_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SPECIFICATION))
+#define E_TABLE_SPECIFICATION_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SPECIFICATION, ETableSpecificationClass))
+
 G_BEGIN_DECLS
 
-#define E_TYPE_TABLE_SPECIFICATION        (e_table_specification_get_type ())
-#define E_TABLE_SPECIFICATION(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TYPE_TABLE_SPECIFICATION, ETableSpecification))
-#define E_TABLE_SPECIFICATION_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TYPE_TABLE_SPECIFICATION, ETableSpecificationClass))
-#define E_IS_TABLE_SPECIFICATION(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TYPE_TABLE_SPECIFICATION))
-#define E_IS_TABLE_SPECIFICATION_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TYPE_TABLE_SPECIFICATION))
-#define E_TABLE_SPECIFICATION_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TYPE_TABLE_SPECIFICATION, ETableSpecificationClass))
+typedef struct _ETableSpecification ETableSpecification;
+typedef struct _ETableSpecificationClass ETableSpecificationClass;
 
-typedef struct {
-	GObject base;
+struct _ETableSpecification {
+	GObject parent;
 
 	ETableColumnSpecification **columns;
 	ETableState *state;
@@ -61,28 +75,36 @@ typedef struct {
 
 	gchar *click_to_add_message;
 	gchar *domain;
-} ETableSpecification;
+};
 
-typedef struct {
+struct _ETableSpecificationClass {
 	GObjectClass parent_class;
-} ETableSpecificationClass;
+};
 
-GType                e_table_specification_get_type          (void);
-ETableSpecification *e_table_specification_new               (void);
+GType		e_table_specification_get_type	(void) G_GNUC_CONST;
+ETableSpecification *
+		e_table_specification_new	(void);
 
-gboolean             e_table_specification_load_from_file    (ETableSpecification *specification,
-							      const gchar          *filename);
-gboolean             e_table_specification_load_from_string  (ETableSpecification *specification,
-							      const gchar          *xml);
-void                 e_table_specification_load_from_node    (ETableSpecification *specification,
-							      const xmlNode       *node);
+gboolean	e_table_specification_load_from_file
+						(ETableSpecification *specification,
+						 const gchar *filename);
+gboolean	e_table_specification_load_from_string
+						(ETableSpecification *specification,
+						 const gchar *xml);
+void		e_table_specification_load_from_node
+						(ETableSpecification *specification,
+						 const xmlNode *node);
 
-gint                  e_table_specification_save_to_file      (ETableSpecification *specification,
-							      const gchar          *filename);
-gchar                *e_table_specification_save_to_string    (ETableSpecification *specification);
-xmlNode             *e_table_specification_save_to_node      (ETableSpecification *specification,
-							      xmlDoc              *doc);
-ETableSpecification *e_table_specification_duplicate         (ETableSpecification *spec);
+gint		e_table_specification_save_to_file
+						(ETableSpecification *specification,
+						 const gchar *filename);
+gchar *		e_table_specification_save_to_string
+						(ETableSpecification *specification);
+xmlNode *	e_table_specification_save_to_node
+						(ETableSpecification *specification,
+						 xmlDoc              *doc);
+ETableSpecification *
+		e_table_specification_duplicate	(ETableSpecification *specification);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 9844849818..536bf3c5c8 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -71,9 +71,9 @@ etst_finalize (GObject *object)
 }
 
 static void
-e_table_state_class_init (ETableStateClass *klass)
+e_table_state_class_init (ETableStateClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose = etst_dispose;
 	object_class->finalize = etst_finalize;
@@ -90,7 +90,7 @@ e_table_state_init (ETableState *state)
 ETableState *
 e_table_state_new (void)
 {
-	return (ETableState *) g_object_new (E_TABLE_STATE_TYPE, NULL);
+	return g_object_new (E_TYPE_TABLE_STATE, NULL);
 }
 
 ETableState *
diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h
index 082bb17ad7..23fc5b2fb2 100644
--- a/widgets/table/e-table-state.h
+++ b/widgets/table/e-table-state.h
@@ -23,50 +23,61 @@
 #ifndef _E_TABLE_STATE_H_
 #define _E_TABLE_STATE_H_
 
-#include <glib-object.h>
 #include <libxml/tree.h>
 #include <table/e-table-sort-info.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_STATE \
+	(e_table_state_get_type ())
+#define E_TABLE_STATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_STATE, ETableState))
+#define E_TABLE_STATE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_STATE, ETableStateClass))
+#define E_IS_TABLE_STATE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_STATE))
+#define E_IS_TABLE_STATE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_STATE))
+#define E_TABLE_STATE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_STATE, ETableStateClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_STATE_TYPE        (e_table_state_get_type ())
-#define E_TABLE_STATE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_STATE_TYPE, ETableState))
-#define E_TABLE_STATE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_STATE_TYPE, ETableStateClass))
-#define E_IS_TABLE_STATE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_STATE_TYPE))
-#define E_IS_TABLE_STATE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_STATE_TYPE))
-#define E_TABLE_STATE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_STATE_TYPE, ETableStateClass))
+typedef struct _ETableState ETableState;
+typedef struct _ETableStateClass ETableStateClass;
 
-typedef struct {
-	GObject base;
+struct _ETableState {
+	GObject parent;
 
 	ETableSortInfo *sort_info;
-	gint             col_count;
-	gint            *columns;
-	gdouble         *expansions;
-} ETableState;
+	gint col_count;
+	gint *columns;
+	gdouble *expansions;
+};
 
-typedef struct {
+struct _ETableStateClass {
 	GObjectClass parent_class;
-} ETableStateClass;
-
-GType        e_table_state_get_type          (void);
-ETableState *e_table_state_new               (void);
-
-ETableState *e_table_state_vanilla	     (gint col_count);
-
-gboolean     e_table_state_load_from_file    (ETableState   *state,
-					      const gchar    *filename);
-void         e_table_state_load_from_string  (ETableState   *state,
-					      const gchar    *xml);
-void         e_table_state_load_from_node    (ETableState   *state,
-					      const xmlNode *node);
+};
 
-void         e_table_state_save_to_file      (ETableState   *state,
-					      const gchar    *filename);
-gchar        *e_table_state_save_to_string    (ETableState   *state);
-xmlNode     *e_table_state_save_to_node      (ETableState   *state,
-					      xmlNode       *parent);
-ETableState *e_table_state_duplicate         (ETableState   *state);
+GType		e_table_state_get_type		(void) G_GNUC_CONST;
+ETableState *	e_table_state_new		(void);
+ETableState *	e_table_state_vanilla		(gint col_count);
+gboolean	e_table_state_load_from_file	(ETableState *state,
+						 const gchar *filename);
+void		e_table_state_load_from_string	(ETableState *state,
+						 const gchar *xml);
+void		e_table_state_load_from_node	(ETableState *state,
+						 const xmlNode *node);
+void		e_table_state_save_to_file	(ETableState *state,
+						 const gchar *filename);
+gchar *		e_table_state_save_to_string	(ETableState *state);
+xmlNode *	e_table_state_save_to_node	(ETableState *state,
+						 xmlNode *parent);
+ETableState *	e_table_state_duplicate		(ETableState *state);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 07aaa18e10..0f9a58db31 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -33,7 +33,7 @@
 
 /* workaround for avoiding API breakage */
 #define etssv_get_type e_table_subset_variable_get_type
-G_DEFINE_TYPE (ETableSubsetVariable, etssv, E_TABLE_SUBSET_TYPE)
+G_DEFINE_TYPE (ETableSubsetVariable, etssv, E_TYPE_TABLE_SUBSET)
 
 #define INCREMENT_AMOUNT 10
 
@@ -120,12 +120,12 @@ etssv_remove    (ETableSubsetVariable *etssv,
 }
 
 static void
-etssv_class_init (ETableSubsetVariableClass *klass)
+etssv_class_init (ETableSubsetVariableClass *class)
 {
-	klass->add     = etssv_add;
-	klass->add_array = etssv_add_array;
-	klass->add_all = etssv_add_all;
-	klass->remove  = etssv_remove;
+	class->add     = etssv_add;
+	class->add_array = etssv_add_array;
+	class->add_all = etssv_add_all;
+	class->remove  = etssv_remove;
 }
 
 static void
@@ -148,7 +148,7 @@ e_table_subset_variable_construct (ETableSubsetVariable *etssv,
 ETableModel *
 e_table_subset_variable_new (ETableModel *source)
 {
-	ETableSubsetVariable *etssv = g_object_new (E_TABLE_SUBSET_VARIABLE_TYPE, NULL);
+	ETableSubsetVariable *etssv = g_object_new (E_TYPE_TABLE_SUBSET_VARIABLE, NULL);
 
 	if (e_table_subset_variable_construct (etssv, source) == NULL) {
 		g_object_unref (etssv);
diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h
index 4654fb5d67..da8186a1df 100644
--- a/widgets/table/e-table-subset-variable.h
+++ b/widgets/table/e-table-subset-variable.h
@@ -23,58 +23,78 @@
 #ifndef _E_TABLE_SUBSET_VARIABLE_H_
 #define _E_TABLE_SUBSET_VARIABLE_H_
 
-#include <glib-object.h>
 #include <table/e-table-subset.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SUBSET_VARIABLE \
+	(e_table_subset_variable_get_type ())
+#define E_TABLE_SUBSET_VARIABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SUBSET_VARIABLE, ETableSubsetVariable))
+#define E_TABLE_SUBSET_VARIABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SUBSET_VARIABLE, ETableSubsetVariableClass))
+#define E_IS_TABLE_SUBSET_VARIABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SUBSET_VARIABLE))
+#define E_IS_TABLE_SUBSET_VARIABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SUBSET_VARIABLE))
+#define E_TABLE_SUBSET_VARIABLE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SUBSET_VARIABLE, ETableSubsetVariableClass))
 
-#define E_TABLE_SUBSET_VARIABLE_TYPE        (e_table_subset_variable_get_type ())
-#define E_TABLE_SUBSET_VARIABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariable))
-#define E_TABLE_SUBSET_VARIABLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariableClass))
-#define E_IS_TABLE_SUBSET_VARIABLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SUBSET_VARIABLE_TYPE))
-#define E_IS_TABLE_SUBSET_VARIABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SUBSET_VARIABLE_TYPE))
-#define E_TABLE_SUBSET_VARIABLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TABLE_SUBSET_VARIABLE_TYPE, ETableSubsetVariableClass))
+G_BEGIN_DECLS
 
-typedef struct {
-	ETableSubset base;
+typedef struct _ETableSubsetVariable ETableSubsetVariable;
+typedef struct _ETableSubsetVariableClass ETableSubsetVariableClass;
 
+struct _ETableSubsetVariable {
+	ETableSubset parent;
 	gint n_vals_allocated;
-} ETableSubsetVariable;
+};
 
-typedef struct {
+struct _ETableSubsetVariableClass {
 	ETableSubsetClass parent_class;
 
-	void     (*add)       (ETableSubsetVariable *ets,
-			       gint                  row);
-	void     (*add_array) (ETableSubsetVariable *ets,
-			       const gint           *array,
-			       gint                  count);
-	void     (*add_all)   (ETableSubsetVariable *ets);
-	gboolean (*remove)    (ETableSubsetVariable *ets,
-			       gint                  row);
-} ETableSubsetVariableClass;
+	void		(*add)			(ETableSubsetVariable *ets,
+						 gint row);
+	void		(*add_array)		(ETableSubsetVariable *ets,
+						 const gint *array,
+						 gint count);
+	void		(*add_all)		(ETableSubsetVariable *ets);
+	gboolean	(*remove)		(ETableSubsetVariable *ets,
+						 gint row);
+};
+
+GType		e_table_subset_variable_get_type
+						(void) G_GNUC_CONST;
+ETableModel *	e_table_subset_variable_new	(ETableModel *etm);
+ETableModel *	e_table_subset_variable_construct
+						(ETableSubsetVariable *etssv,
+						 ETableModel *source);
+void		e_table_subset_variable_add	(ETableSubsetVariable *ets,
+						 gint row);
+void		e_table_subset_variable_add_array
+						(ETableSubsetVariable *ets,
+						 const gint *array,
+						 gint count);
+void		e_table_subset_variable_add_all	(ETableSubsetVariable *ets);
+gboolean	e_table_subset_variable_remove	(ETableSubsetVariable *ets,
+						 gint row);
+void		e_table_subset_variable_clear	(ETableSubsetVariable *ets);
+void		e_table_subset_variable_increment
+						(ETableSubsetVariable *ets,
+						 gint position,
+						 gint amount);
+void		e_table_subset_variable_decrement
+						(ETableSubsetVariable *ets,
+						 gint position,
+						 gint amount);
+void		e_table_subset_variable_set_allocation
+						(ETableSubsetVariable *ets,
+						 gint total);
 
-GType        e_table_subset_variable_get_type        (void);
-ETableModel *e_table_subset_variable_new             (ETableModel          *etm);
-ETableModel *e_table_subset_variable_construct       (ETableSubsetVariable *etssv,
-						      ETableModel          *source);
-void         e_table_subset_variable_add             (ETableSubsetVariable *ets,
-						      gint                  row);
-void         e_table_subset_variable_add_array       (ETableSubsetVariable *ets,
-						      const gint           *array,
-						      gint                  count);
-void         e_table_subset_variable_add_all         (ETableSubsetVariable *ets);
-gboolean     e_table_subset_variable_remove          (ETableSubsetVariable *ets,
-						      gint                  row);
-void         e_table_subset_variable_clear           (ETableSubsetVariable *ets);
-void         e_table_subset_variable_increment       (ETableSubsetVariable *ets,
-						      gint                  position,
-						      gint                  amount);
-void         e_table_subset_variable_decrement       (ETableSubsetVariable *ets,
-						      gint                  position,
-						      gint                  amount);
-void         e_table_subset_variable_set_allocation  (ETableSubsetVariable *ets,
-						      gint                  total);
 G_END_DECLS
 
 #endif /* _E_TABLE_SUBSET_VARIABLE_H_ */
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index e9f048da06..7473099bf9 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -42,7 +42,7 @@ static void etss_proxy_model_rows_deleted_real (ETableSubset *etss, ETableModel
 
 /* workaround for avoding API breakage */
 #define etss_get_type e_table_subset_get_type
-G_DEFINE_TYPE (ETableSubset, etss, E_TABLE_MODEL_TYPE)
+G_DEFINE_TYPE (ETableSubset, etss, E_TYPE_TABLE_MODEL)
 
 #define ETSS_CLASS(object) (E_TABLE_SUBSET_GET_CLASS(object))
 
@@ -248,10 +248,10 @@ etss_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etss_class_init (ETableSubsetClass *klass)
+etss_class_init (ETableSubsetClass *class)
 {
-	ETableModelClass *table_class    = E_TABLE_MODEL_CLASS (klass);
-	GObjectClass *object_class       = G_OBJECT_CLASS (klass);
+	ETableModelClass *table_class    = E_TABLE_MODEL_CLASS (class);
+	GObjectClass *object_class       = G_OBJECT_CLASS (class);
 
 	object_class->dispose            = etss_dispose;
 	object_class->finalize           = etss_finalize;
@@ -273,13 +273,13 @@ etss_class_init (ETableSubsetClass *klass)
 	table_class->value_is_empty      = etss_value_is_empty;
 	table_class->value_to_string     = etss_value_to_string;
 
-	klass->proxy_model_pre_change    = etss_proxy_model_pre_change_real;
-	klass->proxy_model_no_change     = etss_proxy_model_no_change_real;
-	klass->proxy_model_changed       = etss_proxy_model_changed_real;
-	klass->proxy_model_row_changed   = etss_proxy_model_row_changed_real;
-	klass->proxy_model_cell_changed  = etss_proxy_model_cell_changed_real;
-	klass->proxy_model_rows_inserted = etss_proxy_model_rows_inserted_real;
-	klass->proxy_model_rows_deleted  = etss_proxy_model_rows_deleted_real;
+	class->proxy_model_pre_change    = etss_proxy_model_pre_change_real;
+	class->proxy_model_no_change     = etss_proxy_model_no_change_real;
+	class->proxy_model_changed       = etss_proxy_model_changed_real;
+	class->proxy_model_row_changed   = etss_proxy_model_row_changed_real;
+	class->proxy_model_cell_changed  = etss_proxy_model_cell_changed_real;
+	class->proxy_model_rows_inserted = etss_proxy_model_rows_inserted_real;
+	class->proxy_model_rows_deleted  = etss_proxy_model_rows_deleted_real;
 }
 
 static void
@@ -429,7 +429,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals)
 ETableModel *
 e_table_subset_new (ETableModel *source, const gint nvals)
 {
-	ETableSubset *etss = g_object_new (E_TABLE_SUBSET_TYPE, NULL);
+	ETableSubset *etss = g_object_new (E_TYPE_TABLE_SUBSET, NULL);
 
 	if (e_table_subset_construct (etss, source, nvals) == NULL) {
 		g_object_unref (etss);
diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h
index dd345732e2..9729bdd6b0 100644
--- a/widgets/table/e-table-subset.h
+++ b/widgets/table/e-table-subset.h
@@ -25,63 +25,90 @@
 #ifndef _E_TABLE_SUBSET_H_
 #define _E_TABLE_SUBSET_H_
 
-#include <glib-object.h>
 #include <table/e-table-model.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE_SUBSET \
+	(e_table_subset_get_type ())
+#define E_TABLE_SUBSET(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_SUBSET, ETableSubset))
+#define E_TABLE_SUBSET_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_SUBSET, ETableSubsetClass))
+#define E_IS_TABLE_SUBSET(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_SUBSET))
+#define E_IS_TABLE_SUBSET_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_SUBSET))
+#define E_TABLE_SUBSET_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_SUBSET, ETableSubsetClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_SUBSET_TYPE        (e_table_subset_get_type ())
-#define E_TABLE_SUBSET(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_SUBSET_TYPE, ETableSubset))
-#define E_TABLE_SUBSET_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_SUBSET_TYPE, ETableSubsetClass))
-#define E_IS_TABLE_SUBSET(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_SUBSET_TYPE))
-#define E_IS_TABLE_SUBSET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_SUBSET_TYPE))
-#define E_TABLE_SUBSET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), E_TABLE_SUBSET_TYPE, ETableSubsetClass))
+typedef struct _ETableSubset ETableSubset;
+typedef struct _ETableSubsetClass ETableSubsetClass;
 
-typedef struct {
-	ETableModel base;
+struct _ETableSubset {
+	ETableModel parent;
 
-	ETableModel  *source;
-	gint  n_map;
+	ETableModel *source;
+	gint n_map;
 	gint *map_table;
 
 	gint last_access;
 
-	gint              table_model_pre_change_id;
-	gint              table_model_no_change_id;
-	gint              table_model_changed_id;
-	gint              table_model_row_changed_id;
-	gint              table_model_cell_changed_id;
-	gint              table_model_rows_inserted_id;
-	gint              table_model_rows_deleted_id;
-} ETableSubset;
+	gint table_model_pre_change_id;
+	gint table_model_no_change_id;
+	gint table_model_changed_id;
+	gint table_model_row_changed_id;
+	gint table_model_cell_changed_id;
+	gint table_model_rows_inserted_id;
+	gint table_model_rows_deleted_id;
+};
 
-typedef struct {
+struct _ETableSubsetClass {
 	ETableModelClass parent_class;
 
-	void (*proxy_model_pre_change)   (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_no_change)   (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_changed)      (ETableSubset *etss, ETableModel *etm);
-	void (*proxy_model_row_changed)  (ETableSubset *etss, ETableModel *etm, gint row);
-	void (*proxy_model_cell_changed) (ETableSubset *etss, ETableModel *etm, gint col, gint row);
-	void (*proxy_model_rows_inserted) (ETableSubset *etss, ETableModel *etm, gint row, gint count);
-	void (*proxy_model_rows_deleted)  (ETableSubset *etss, ETableModel *etm, gint row, gint count);
-} ETableSubsetClass;
-
-GType        e_table_subset_get_type           (void);
-ETableModel *e_table_subset_new                (ETableModel  *etm,
-						gint           n_vals);
-ETableModel *e_table_subset_construct          (ETableSubset *ets,
-						ETableModel  *source,
-						gint           nvals);
-
-gint          e_table_subset_model_to_view_row  (ETableSubset *ets,
-						gint           model_row);
-gint          e_table_subset_view_to_model_row  (ETableSubset *ets,
-						gint           view_row);
-
-ETableModel *e_table_subset_get_toplevel       (ETableSubset *table_model);
-
-void         e_table_subset_print_debugging    (ETableSubset *table_model);
+	void		(*proxy_model_pre_change)	(ETableSubset *etss,
+							 ETableModel *etm);
+	void		(*proxy_model_no_change)	(ETableSubset *etss,
+							 ETableModel *etm);
+	void		(*proxy_model_changed)		(ETableSubset *etss,
+							 ETableModel *etm);
+	void		(*proxy_model_row_changed)	(ETableSubset *etss,
+							 ETableModel *etm,
+							 gint row);
+	void		(*proxy_model_cell_changed)	(ETableSubset *etss,
+							 ETableModel *etm,
+							 gint col,
+							 gint row);
+	void		(*proxy_model_rows_inserted)	(ETableSubset *etss,
+							 ETableModel *etm,
+							 gint row,
+							 gint count);
+	void		(*proxy_model_rows_deleted)	(ETableSubset *etss,
+							 ETableModel *etm,
+							 gint row,
+							 gint count);
+};
+
+GType		e_table_subset_get_type		(void) G_GNUC_CONST;
+ETableModel *	e_table_subset_new		(ETableModel  *etm,
+						 gint n_vals);
+ETableModel *	e_table_subset_construct	(ETableSubset *ets,
+						 ETableModel *source,
+						 gint nvals);
+gint		e_table_subset_model_to_view_row
+						(ETableSubset *ets,
+						 gint model_row);
+gint		e_table_subset_view_to_model_row
+						(ETableSubset *ets,
+						 gint view_row);
+ETableModel *	e_table_subset_get_toplevel	(ETableSubset *table_model);
+void		e_table_subset_print_debugging	(ETableSubset *table_model);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h
index 2c725f4bf9..a53e7e4060 100644
--- a/widgets/table/e-table-utils.h
+++ b/widgets/table/e-table-utils.h
@@ -31,17 +31,18 @@
 
 G_BEGIN_DECLS
 
-ETableHeader *e_table_state_to_header                    (GtkWidget           *widget,
-							  ETableHeader        *full_header,
-							  ETableState         *state);
-
-ETableHeader *e_table_spec_to_full_header                (ETableSpecification *spec,
-							  ETableExtras        *ete);
-
-ETableCol    *e_table_util_calculate_current_search_col  (ETableHeader        *header,
-							  ETableHeader        *full_header,
-							  ETableSortInfo      *sort_info,
-							  gboolean             always_search);
+ETableHeader *	e_table_state_to_header		(GtkWidget *widget,
+						 ETableHeader *full_header,
+						 ETableState *state);
+
+ETableHeader *	e_table_spec_to_full_header	(ETableSpecification *spec,
+						 ETableExtras *ete);
+
+ETableCol *	e_table_util_calculate_current_search_col
+						(ETableHeader *header,
+						 ETableHeader *full_header,
+						 ETableSortInfo *sort_info,
+						 gboolean always_search);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 5dacfb61cc..881c21bf16 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -30,9 +30,13 @@
 
 #include "e-table-without.h"
 
+#define E_TABLE_WITHOUT_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate))
+
 /* workaround for avoiding API breakage */
 #define etw_get_type e_table_without_get_type
-G_DEFINE_TYPE (ETableWithout, etw, E_TABLE_SUBSET_TYPE)
+G_DEFINE_TYPE (ETableWithout, etw, E_TYPE_TABLE_SUBSET)
 
 #define INCREMENT_AMOUNT 10
 
@@ -135,20 +139,18 @@ delete_hash_element (gpointer key,
 static void
 etw_dispose (GObject *object)
 {
-	ETableWithout *etw = E_TABLE_WITHOUT (object);
+	ETableWithoutPrivate *priv;
 
-	if (etw->priv) {
-		if (etw->priv->hash) {
-			g_hash_table_foreach (etw->priv->hash, delete_hash_element, etw);
-			g_hash_table_destroy (etw->priv->hash);
-			etw->priv->hash = NULL;
-		}
-		g_free (etw->priv);
-		etw->priv = NULL;
+	priv = E_TABLE_WITHOUT_GET_PRIVATE (object);
+
+	if (priv->hash != NULL) {
+		g_hash_table_foreach (priv->hash, delete_hash_element, object);
+		g_hash_table_destroy (priv->hash);
+		priv->hash = NULL;
 	}
 
-	if (G_OBJECT_CLASS (etw_parent_class)->dispose)
-		(* G_OBJECT_CLASS (etw_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etw_parent_class)->dispose (object);
 }
 
 static void
@@ -231,28 +233,26 @@ etw_proxy_model_changed (ETableSubset *etss, ETableModel *etm)
 }
 
 static void
-etw_class_init (ETableWithoutClass *klass)
+etw_class_init (ETableWithoutClass *class)
 {
-	ETableSubsetClass *etss_class         = E_TABLE_SUBSET_CLASS (klass);
-	GObjectClass *object_class            = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class;
+	ETableSubsetClass *etss_class;
+
+	g_type_class_add_private (class, sizeof (ETableWithoutPrivate));
 
-	object_class->dispose                 = etw_dispose;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = etw_dispose;
 
+	etss_class = E_TABLE_SUBSET_CLASS (class);
 	etss_class->proxy_model_rows_inserted = etw_proxy_model_rows_inserted;
 	etss_class->proxy_model_rows_deleted  = etw_proxy_model_rows_deleted;
-	etss_class->proxy_model_changed       = etw_proxy_model_changed;
+	etss_class->proxy_model_changed = etw_proxy_model_changed;
 }
 
 static void
 etw_init (ETableWithout *etw)
 {
-	etw->priv                           = g_new (ETableWithoutPrivate, 1);
-	etw->priv->hash_func                = NULL;
-	etw->priv->compare_func             = NULL;
-	etw->priv->get_key_func             = NULL;
-	etw->priv->duplicate_key_func       = NULL;
-	etw->priv->free_gotten_key_func     = NULL;
-	etw->priv->free_duplicated_key_func = NULL;
+	etw->priv = E_TABLE_WITHOUT_GET_PRIVATE (etw);
 }
 
 ETableModel *
@@ -293,7 +293,7 @@ e_table_without_new        (ETableModel                   *source,
 			    ETableWithoutFreeKeyFunc       free_duplicated_key_func,
 			    void                          *closure)
 {
-	ETableWithout *etw = g_object_new (E_TABLE_WITHOUT_TYPE, NULL);
+	ETableWithout *etw = g_object_new (E_TYPE_TABLE_WITHOUT, NULL);
 
 	if (e_table_without_construct (etw,
 				       source,
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index ce4745cff9..03e1db6702 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -24,62 +24,76 @@
 #ifndef _E_TABLE_WITHOUT_H_
 #define _E_TABLE_WITHOUT_H_
 
-#include <glib-object.h>
 #include <table/e-table-subset.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TABLE_WITHOUT \
+	(e_table_without_get_type ())
+#define E_TABLE_WITHOUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE_WITHOUT, ETableWithout))
+#define E_TABLE_WITHOUT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE_WITHOUT, ETableWithoutClass))
+#define E_IS_TABLE_WITHOUT(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE_WITHOUT))
+#define E_IS_TABLE_WITHOUT_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE_WITHOUT))
+#define E_TABLE_WITHOUT_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE_WITHOUT, ETableWithoutClass))
 
-#define E_TABLE_WITHOUT_TYPE        (e_table_without_get_type ())
-#define E_TABLE_WITHOUT(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_WITHOUT_TYPE, ETableWithout))
-#define E_TABLE_WITHOUT_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_WITHOUT_TYPE, ETableWithoutClass))
-#define E_IS_TABLE_WITHOUT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_WITHOUT_TYPE))
-#define E_IS_TABLE_WITHOUT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_WITHOUT_TYPE))
+G_BEGIN_DECLS
 
+typedef struct _ETableWithout ETableWithout;
+typedef struct _ETableWithoutClass ETableWithoutClass;
 typedef struct _ETableWithoutPrivate ETableWithoutPrivate;
-typedef gpointer (*ETableWithoutGetKeyFunc)       (ETableModel *source,
-						gint          row,
-						void        *closure);
-typedef gpointer (*ETableWithoutDuplicateKeyFunc) (const void  *key,
-						void        *closure);
-typedef void  (*ETableWithoutFreeKeyFunc)      (void        *key,
-						void        *closure);
 
-typedef struct {
-	ETableSubset base;
+typedef gpointer	(*ETableWithoutGetKeyFunc)	(ETableModel *source,
+							 gint row,
+							 gpointer closure);
+typedef gpointer	(*ETableWithoutDuplicateKeyFunc)(gconstpointer key,
+							 gpointer closure);
+typedef void		(*ETableWithoutFreeKeyFunc)	(gpointer key,
+							 gpointer closure);
 
+struct _ETableWithout {
+	ETableSubset parent;
 	ETableWithoutPrivate *priv;
-} ETableWithout;
+};
 
-typedef struct {
+struct _ETableWithoutClass {
 	ETableSubsetClass parent_class;
+};
 
-} ETableWithoutClass;
+GType		e_table_without_get_type	(void) G_GNUC_CONST;
+ETableModel *	e_table_without_new		(ETableModel *source,
+						 GHashFunc hash_func,
+						 GCompareFunc compare_func,
+						 ETableWithoutGetKeyFunc get_key_func,
+						 ETableWithoutDuplicateKeyFunc duplicate_key_func,
+						 ETableWithoutFreeKeyFunc free_gotten_key_func,
+						 ETableWithoutFreeKeyFunc free_duplicated_key_func,
+						 gpointer closure);
+ETableModel *	e_table_without_construct	(ETableWithout *etw,
+						 ETableModel *source,
+						 GHashFunc hash_func,
+						 GCompareFunc compare_func,
+						 ETableWithoutGetKeyFunc get_key_func,
+						 ETableWithoutDuplicateKeyFunc duplicate_key_func,
+						 ETableWithoutFreeKeyFunc free_gotten_key_func,
+						 ETableWithoutFreeKeyFunc free_duplicated_key_func,
+						 gpointer closure);
+void		e_table_without_hide		(ETableWithout *etw,
+						 gpointer key);
+void		e_table_without_hide_adopt	(ETableWithout *etw,
+						 gpointer key);
+void		e_table_without_show		(ETableWithout *etw,
+						 gpointer key);
+void		e_table_without_show_all	(ETableWithout *etw);
 
-GType        e_table_without_get_type   (void);
-ETableModel *e_table_without_new        (ETableModel                   *source,
-					 GHashFunc                      hash_func,
-					 GCompareFunc                   compare_func,
-					 ETableWithoutGetKeyFunc        get_key_func,
-					 ETableWithoutDuplicateKeyFunc  duplicate_key_func,
-					 ETableWithoutFreeKeyFunc       free_gotten_key_func,
-					 ETableWithoutFreeKeyFunc       free_duplicated_key_func,
-					 void                          *closure);
-ETableModel *e_table_without_construct  (ETableWithout                 *etw,
-					 ETableModel                   *source,
-					 GHashFunc                      hash_func,
-					 GCompareFunc                   compare_func,
-					 ETableWithoutGetKeyFunc        get_key_func,
-					 ETableWithoutDuplicateKeyFunc  duplicate_key_func,
-					 ETableWithoutFreeKeyFunc       free_gotten_key_func,
-					 ETableWithoutFreeKeyFunc       free_duplicated_key_func,
-					 void                          *closure);
-void         e_table_without_hide       (ETableWithout                 *etw,
-					 void                          *key);
-void         e_table_without_hide_adopt (ETableWithout                 *etw,
-					 void                          *key);
-void         e_table_without_show       (ETableWithout                 *etw,
-					 void                          *key);
-void         e_table_without_show_all   (ETableWithout                 *etw);
 G_END_DECLS
 
 #endif /* _E_TABLE_WITHOUT_H_ */
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 952bf900b8..aad7c9f729 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1869,7 +1869,7 @@ e_table_new (ETableModel *etm,
 	g_return_val_if_fail (ete == NULL || E_IS_TABLE_EXTRAS (ete), NULL);
 	g_return_val_if_fail (spec != NULL, NULL);
 
-	e_table = g_object_new (E_TABLE_TYPE, NULL);
+	e_table = g_object_new (E_TYPE_TABLE, NULL);
 
 	e_table = e_table_construct (e_table, etm, ete, spec, state);
 
@@ -1909,7 +1909,7 @@ e_table_new_from_spec_file (ETableModel *etm,
 	g_return_val_if_fail (ete == NULL || E_IS_TABLE_EXTRAS (ete), NULL);
 	g_return_val_if_fail (spec_fn != NULL, NULL);
 
-	e_table = g_object_new (E_TABLE_TYPE, NULL);
+	e_table = g_object_new (E_TYPE_TABLE, NULL);
 
 	e_table = e_table_construct_from_spec_file (e_table, etm, ete, spec_fn, state_fn);
 
@@ -3510,7 +3510,7 @@ e_table_class_init (ETableClass *class)
 					 g_param_spec_object ("model",
 							      "Model",
 							      NULL,
-							      E_TABLE_MODEL_TYPE,
+							      E_TYPE_TABLE_MODEL,
 							      G_PARAM_READABLE));
 
 	gtk_widget_class_install_style_property (
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 1da89f9e2f..b95444d118 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -6,7 +6,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -40,13 +40,29 @@
 #include <table/e-table-sorter.h>
 #include <table/e-table-search.h>
 
+/* Standard GObject macros */
+#define E_TYPE_TABLE \
+	(e_table_get_type ())
+#define E_TABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TABLE, ETable))
+#define E_TABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TABLE, ETableClass))
+#define E_IS_TABLE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TABLE))
+#define E_IS_TABLE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TABLE))
+#define E_TABLE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TABLE, ETableClass))
+
 G_BEGIN_DECLS
 
-#define E_TABLE_TYPE        (e_table_get_type ())
-#define E_TABLE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TABLE_TYPE, ETable))
-#define E_TABLE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TABLE_TYPE, ETableClass))
-#define E_IS_TABLE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TABLE_TYPE))
-#define E_IS_TABLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TABLE_TYPE))
+typedef struct _ETable ETable;
+typedef struct _ETableClass ETableClass;
 
 typedef struct _ETableDragSourceSite ETableDragSourceSite;
 
@@ -56,7 +72,7 @@ typedef enum {
 	E_TABLE_CURSOR_LOC_TABLE = 1 << 1
 } ETableCursorLoc;
 
-typedef struct {
+struct _ETable {
 	GtkTable parent;
 
 	ETableModel *model;
@@ -64,21 +80,21 @@ typedef struct {
 	ETableHeader *full_header, *header;
 
 	GnomeCanvasItem *canvas_vbox;
-	ETableGroup  *group;
+	ETableGroup *group;
 
 	ETableSortInfo *sort_info;
-	ETableSorter   *sorter;
+	ETableSorter *sorter;
 
 	ETableSelectionModel *selection;
 	ETableCursorLoc cursor_loc;
 	ETableSpecification *spec;
 
-	ETableSearch     *search;
+	ETableSearch *search;
 
-	ETableCol        *current_search_col;
+	ETableCol *current_search_col;
 
-	guint	  search_search_id;
-	guint	  search_accept_id;
+	guint	 search_search_id;
+	guint	 search_accept_id;
 
 	gint table_model_change_id;
 	gint table_row_change_id;
@@ -154,201 +170,226 @@ typedef struct {
 	gint header_width;
 
 	gchar *domain;
-} ETable;
+};
 
-typedef struct {
+struct _ETableClass {
 	GtkTableClass parent_class;
 
-	void        (*cursor_change)      (ETable *et, gint row);
-	void        (*cursor_activated)   (ETable *et, gint row);
-	void        (*selection_change)   (ETable *et);
-	void        (*double_click)       (ETable *et, gint row, gint col, GdkEvent *event);
-	gboolean    (*right_click)        (ETable *et, gint row, gint col, GdkEvent *event);
-	gboolean    (*click)              (ETable *et, gint row, gint col, GdkEvent *event);
-	gboolean    (*key_press)          (ETable *et, gint row, gint col, GdkEvent *event);
-	gboolean    (*start_drag)         (ETable *et, gint row, gint col, GdkEvent *event);
-	void        (*state_change)       (ETable *et);
-	gboolean    (*white_space_event)  (ETable *et, GdkEvent *event);
-
-	void  (*set_scroll_adjustments)   (ETable	 *table,
-					   GtkAdjustment *hadjustment,
-					   GtkAdjustment *vadjustment);
+	void		(*cursor_change)	(ETable *et,
+						 gint row);
+	void		(*cursor_activated)	(ETable *et,
+						 gint row);
+	void		(*selection_change)	(ETable *et);
+	void		(*double_click)		(ETable *et,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*right_click)		(ETable *et,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*click)		(ETable *et,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*key_press)		(ETable *et,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*start_drag)		(ETable *et,
+						 gint row,
+						 gint col,
+						 GdkEvent *event);
+	void		(*state_change)		(ETable *et);
+	gboolean	(*white_space_event)	(ETable *et,
+						 GdkEvent *event);
+
+	void		(*set_scroll_adjustments)
+						(ETable *table,
+						 GtkAdjustment *hadjustment,
+						 GtkAdjustment *vadjustment);
 
 	/* Source side drag signals */
-	void (* table_drag_begin)		   (ETable	       *table,
-						    gint                 row,
-						    gint                 col,
-						    GdkDragContext     *context);
-	void (* table_drag_end)		   (ETable	       *table,
-					    gint                 row,
-					    gint                 col,
-					    GdkDragContext     *context);
-	void (* table_drag_data_get)             (ETable             *table,
-						  gint                 row,
-						  gint                 col,
-						  GdkDragContext     *context,
-						  GtkSelectionData   *selection_data,
-						  guint               info,
-						  guint               time);
-	void (* table_drag_data_delete)          (ETable	       *table,
-						  gint                 row,
-						  gint                 col,
-						  GdkDragContext     *context);
+	void		(*table_drag_begin)	 (ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context);
+	void		(*table_drag_end)	(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context);
+	void		(*table_drag_data_get)	(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 GtkSelectionData *selection_data,
+						 guint info,
+						 guint time);
+	void		(*table_drag_data_delete)
+						(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context);
 
 	/* Target side drag signals */
-	void (* table_drag_leave)		   (ETable	       *table,
-						    gint                 row,
-						    gint                 col,
-						    GdkDragContext     *context,
-						    guint               time);
-	gboolean (* table_drag_motion)           (ETable	       *table,
-						  gint                 row,
-						  gint                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  guint               time);
-	gboolean (* table_drag_drop)             (ETable	       *table,
-						  gint                 row,
-						  gint                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  guint               time);
-	void (* table_drag_data_received)        (ETable             *table,
-						  gint                 row,
-						  gint                 col,
-						  GdkDragContext     *context,
-						  gint                x,
-						  gint                y,
-						  GtkSelectionData   *selection_data,
-						  guint               info,
-						  guint               time);
-} ETableClass;
-GType            e_table_get_type                  (void);
-ETable          *e_table_construct                 (ETable               *e_table,
-						    ETableModel          *etm,
-						    ETableExtras         *ete,
-						    const gchar           *spec,
-						    const gchar           *state);
-GtkWidget       *e_table_new                       (ETableModel          *etm,
-						    ETableExtras         *ete,
-						    const gchar           *spec,
-						    const gchar           *state);
+	void		(*table_drag_leave)	(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 guint time);
+	gboolean	(*table_drag_motion)	(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 gint x,
+						 gint y,
+						 guint time);
+	gboolean	(*table_drag_drop)	(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 gint x,
+						 gint y,
+						 guint time);
+	void		(*table_drag_data_received)
+						(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 gint x,
+						 gint y,
+						 GtkSelectionData *selection_data,
+						 guint info,
+						 guint time);
+};
+
+GType		e_table_get_type		(void) G_GNUC_CONST;
+ETable *	e_table_construct		(ETable *e_table,
+						 ETableModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec,
+						 const gchar *state);
+GtkWidget *	e_table_new			(ETableModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec,
+						 const gchar *state);
 
 /* Create an ETable using files. */
-ETable          *e_table_construct_from_spec_file  (ETable               *e_table,
-						    ETableModel          *etm,
-						    ETableExtras         *ete,
-						    const gchar           *spec_fn,
-						    const gchar           *state_fn);
-GtkWidget       *e_table_new_from_spec_file        (ETableModel          *etm,
-						    ETableExtras         *ete,
-						    const gchar           *spec_fn,
-						    const gchar           *state_fn);
+ETable *	e_table_construct_from_spec_file
+						(ETable *e_table,
+						 ETableModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec_fn,
+						 const gchar *state_fn);
+GtkWidget *	e_table_new_from_spec_file	(ETableModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec_fn,
+						 const gchar *state_fn);
 
 /* To save the state */
-gchar           *e_table_get_state                 (ETable               *e_table);
-void             e_table_save_state                (ETable               *e_table,
-						    const gchar          *filename);
-ETableState     *e_table_get_state_object          (ETable               *e_table);
+gchar *		e_table_get_state		(ETable *e_table);
+void		e_table_save_state		(ETable *e_table,
+						 const gchar *filename);
+ETableState *e_table_get_state_object		(ETable *e_table);
 
 /* note that it is more efficient to provide the state at creation time */
-void             e_table_set_state                 (ETable               *e_table,
-						    const gchar          *state);
-void             e_table_set_state_object          (ETable               *e_table,
-						    ETableState          *state);
-void             e_table_load_state                (ETable               *e_table,
-						    const gchar          *filename);
-void             e_table_set_cursor_row            (ETable               *e_table,
-						    gint                   row);
-
-/* -1 means we don't have the cursor.  This is in model rows. */
-gint              e_table_get_cursor_row            (ETable               *e_table);
-void             e_table_selected_row_foreach      (ETable               *e_table,
-						    EForeachFunc          callback,
-						    gpointer              closure);
-gint             e_table_selected_count            (ETable               *e_table);
-EPrintable      *e_table_get_printable             (ETable               *e_table);
-gint             e_table_get_next_row              (ETable               *e_table,
-						    gint                  model_row);
-gint             e_table_get_prev_row              (ETable               *e_table,
-						    gint                  model_row);
-gint             e_table_model_to_view_row         (ETable               *e_table,
-						    gint                  model_row);
-gint             e_table_view_to_model_row         (ETable               *e_table,
-						    gint                  view_row);
-void             e_table_get_cell_at               (ETable               *table,
-						    gint                   x,
-						    gint                   y,
-						    gint                  *row_return,
-						    gint                  *col_return);
-void e_table_get_mouse_over_cell (ETable *table, gint *row, gint *col);
-void             e_table_get_cell_geometry         (ETable               *table,
-						    gint                   row,
-						    gint                   col,
-						    gint                  *x_return,
-						    gint                  *y_return,
-						    gint                  *width_return,
-						    gint                  *height_return);
+void		e_table_set_state		(ETable *e_table,
+						 const gchar *state);
+void		e_table_set_state_object	(ETable *e_table,
+						 ETableState *state);
+void		e_table_load_state		(ETable *e_table,
+						 const gchar *filename);
+void		e_table_set_cursor_row		(ETable *e_table,
+						 gint row);
+
+/* -1 means we don't have the cursor. This is in model rows. */
+gint		e_table_get_cursor_row		(ETable *e_table);
+void		e_table_selected_row_foreach	(ETable *e_table,
+						 EForeachFunc callback,
+						 gpointer closure);
+gint		e_table_selected_count		(ETable *e_table);
+EPrintable *	e_table_get_printable		(ETable *e_table);
+gint		e_table_get_next_row		(ETable *e_table,
+						 gint model_row);
+gint		e_table_get_prev_row		(ETable *e_table,
+						 gint model_row);
+gint		e_table_model_to_view_row	(ETable *e_table,
+						 gint model_row);
+gint		e_table_view_to_model_row	(ETable *e_table,
+						 gint view_row);
+void		e_table_get_cell_at		(ETable *table,
+						 gint x,
+						 gint y,
+						 gint *row_return,
+						 gint *col_return);
+void		e_table_get_mouse_over_cell	(ETable *table,
+						 gint *row,
+						 gint *col);
+void		e_table_get_cell_geometry	(ETable *table,
+						 gint row,
+						 gint col,
+						 gint *x_return,
+						 gint *y_return,
+						 gint *width_return,
+						 gint *height_return);
 
 /* Useful accessor functions. */
-ESelectionModel *e_table_get_selection_model       (ETable               *table);
+ESelectionModel *e_table_get_selection_model	(ETable *table);
 
 /* Drag & drop stuff. */
 /* Target */
-void             e_table_drag_get_data             (ETable               *table,
-						    gint                   row,
-						    gint                   col,
-						    GdkDragContext       *context,
-						    GdkAtom               target,
-						    guint32               time);
-void             e_table_drag_highlight            (ETable               *table,
-						    gint                   row,
-						    gint                   col); /* col == -1 to highlight entire row. */
-void             e_table_drag_unhighlight          (ETable               *table);
-void             e_table_drag_dest_set             (ETable               *table,
-						    GtkDestDefaults       flags,
-						    const GtkTargetEntry *targets,
-						    gint                  n_targets,
-						    GdkDragAction         actions);
-void             e_table_drag_dest_set_proxy       (ETable               *table,
-						    GdkWindow            *proxy_window,
-						    GdkDragProtocol       protocol,
-						    gboolean              use_coordinates);
+void		e_table_drag_get_data		(ETable *table,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 GdkAtom target,
+						 guint32 time);
+void		e_table_drag_highlight	(ETable *table,
+						 gint row,
+						 gint col); /* col == -1 to highlight entire row. */
+void		e_table_drag_unhighlight	(ETable *table);
+void		e_table_drag_dest_set		(ETable *table,
+						 GtkDestDefaults flags,
+						 const GtkTargetEntry *targets,
+						 gint n_targets,
+						 GdkDragAction actions);
+void		e_table_drag_dest_set_proxy	(ETable *table,
+						 GdkWindow *proxy_window,
+						 GdkDragProtocol protocol,
+						 gboolean use_coordinates);
 
 /* There probably should be functions for setting the targets
  * as a GtkTargetList
  */
-void             e_table_drag_dest_unset           (GtkWidget            *widget);
+void		e_table_drag_dest_unset		(GtkWidget *widget);
 
 /* Source side */
-void             e_table_drag_source_set           (ETable               *table,
-						    GdkModifierType       start_button_mask,
-						    const GtkTargetEntry *targets,
-						    gint                  n_targets,
-						    GdkDragAction         actions);
-void             e_table_drag_source_unset         (ETable               *table);
+void		e_table_drag_source_set		(ETable *table,
+						 GdkModifierType start_button_mask,
+						 const GtkTargetEntry *targets,
+						 gint n_targets,
+						 GdkDragAction actions);
+void		e_table_drag_source_unset	(ETable *table);
 
 /* There probably should be functions for setting the targets
  * as a GtkTargetList
  */
-GdkDragContext  *e_table_drag_begin                (ETable               *table,
-						    gint                   row,
-						    gint                   col,
-						    GtkTargetList        *targets,
-						    GdkDragAction         actions,
-						    gint                  button,
-						    GdkEvent             *event);
+GdkDragContext *e_table_drag_begin		(ETable *table,
+						 gint row,
+						 gint col,
+						 GtkTargetList *targets,
+						 GdkDragAction actions,
+						 gint button,
+						 GdkEvent *event);
 
 /* selection stuff */
-void             e_table_select_all                (ETable               *table);
-void             e_table_invert_selection          (ETable               *table);
+void		e_table_select_all		(ETable *table);
+void		e_table_invert_selection	(ETable *table);
 
 /* This function is only needed in single_selection_mode. */
-void             e_table_right_click_up            (ETable               *table);
+void		e_table_right_click_up		(ETable *table);
 
-void             e_table_commit_click_to_add       (ETable               *table);
+void		e_table_commit_click_to_add	(ETable *table);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index daf3bc7c13..1edaa3e09d 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -29,7 +29,7 @@
 
 #include "e-tree-memory-callbacks.h"
 
-G_DEFINE_TYPE (ETreeMemoryCallbacks, e_tree_memory_callbacks, E_TREE_MEMORY_TYPE)
+G_DEFINE_TYPE (ETreeMemoryCallbacks, e_tree_memory_callbacks, E_TYPE_TREE_MEMORY)
 
 static GdkPixbuf *
 etmc_icon_at (ETreeModel *etm, ETreePath node)
@@ -184,9 +184,9 @@ etmc_value_to_string (ETreeModel *etm, gint col, gconstpointer value)
 }
 
 static void
-e_tree_memory_callbacks_class_init (ETreeMemoryCallbacksClass *klass)
+e_tree_memory_callbacks_class_init (ETreeMemoryCallbacksClass *class)
 {
-	ETreeModelClass *model_class        = E_TREE_MODEL_CLASS (klass);
+	ETreeModelClass *model_class        = E_TREE_MODEL_CLASS (class);
 
 	model_class->icon_at            = etmc_icon_at;
 
@@ -263,7 +263,7 @@ e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
 {
 	ETreeMemoryCallbacks *etmc;
 
-	etmc = g_object_new (E_TREE_MEMORY_CALLBACKS_TYPE, NULL);
+	etmc = g_object_new (E_TYPE_TREE_MEMORY_CALLBACKS, NULL);
 
 	etmc->icon_at            = icon_at;
 
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
index e37ef30d6c..f2e202bec3 100644
--- a/widgets/table/e-tree-memory-callbacks.h
+++ b/widgets/table/e-tree-memory-callbacks.h
@@ -25,35 +25,98 @@
 
 #include <table/e-tree-memory.h>
 
-G_BEGIN_DECLS
-
-#define E_TREE_MEMORY_CALLBACKS_TYPE        (e_tree_memory_callbacks_get_type ())
-#define E_TREE_MEMORY_CALLBACKS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MEMORY_CALLBACKS_TYPE, ETreeMemoryCallbacks))
-#define E_TREE_MEMORY_CALLBACKS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_MEMORY_CALLBACKS_TYPE, ETreeMemoryCallbacksClass))
-#define E_IS_TREE_MEMORY_CALLBACKS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_MEMORY_CALLBACKS_TYPE))
-#define E_IS_TREE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_CALLBACKS_TYPE))
-
-typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn)             (ETreeModel *etree, ETreePath path, gpointer model_data);
-
-typedef gint       (*ETreeMemoryCallbacksColumnCountFn)        (ETreeModel *etree, gpointer model_data);
-
-typedef gboolean   (*ETreeMemoryCallbacksHasSaveIdFn)          (ETreeModel *etree, gpointer model_data);
-typedef gchar     *(*ETreeMemoryCallbacksGetSaveIdFn)          (ETreeModel *etree, ETreePath path, gpointer model_data);
+/* Standard GObject macros */
+#define E_TYPE_TREE_MEMORY_CALLBACKS \
+	(e_tree_memory_callbacks_get_type ())
+#define E_TREE_MEMORY_CALLBACKS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_MEMORY_CALLBACKS, ETreeMemoryCallbacks))
+#define E_TREE_MEMORY_CALLBACKS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_MEMORY_CALLBACKS, ETreeMemoryCallbacksClass))
+#define E_IS_TREE_MEMORY_CALLBACKS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_MEMORY_CALLBACKS))
+#define E_IS_TREE_MEMORY_CALLBACKS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_MEMORY_CALLBACKS))
+#define E_TREE_MEMORY_CALLBACKS_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_MEMORY_CALLBACKS, ETreeMemoryCallbacksClass))
 
-typedef gboolean   (*ETreeMemoryCallbacksHasGetNodeByIdFn)     (ETreeModel *etree, gpointer model_data);
-typedef ETreePath  (*ETreeMemoryCallbacksGetNodeByIdFn)        (ETreeModel *etree, const gchar *save_id, gpointer model_data);
-
-typedef gpointer       (*ETreeMemoryCallbacksValueAtFn)            (ETreeModel *etree, ETreePath path, gint col, gpointer model_data);
-typedef void       (*ETreeMemoryCallbacksSetValueAtFn)         (ETreeModel *etree, ETreePath path, gint col, gconstpointer val, gpointer model_data);
-typedef gboolean   (*ETreeMemoryCallbacksIsEditableFn)         (ETreeModel *etree, ETreePath path, gint col, gpointer model_data);
-
-typedef	void      *(*ETreeMemoryCallbacksDuplicateValueFn)     (ETreeModel *etm, gint col, gconstpointer val, gpointer data);
-typedef	void       (*ETreeMemoryCallbacksFreeValueFn)          (ETreeModel *etm, gint col, gpointer val, gpointer data);
-typedef void      *(*ETreeMemoryCallbacksInitializeValueFn)    (ETreeModel *etm, gint col, gpointer data);
-typedef gboolean   (*ETreeMemoryCallbacksValueIsEmptyFn)       (ETreeModel *etm, gint col, gconstpointer val, gpointer data);
-typedef gchar      *(*ETreeMemoryCallbacksValueToStringFn)      (ETreeModel *etm, gint col, gconstpointer val, gpointer data);
+G_BEGIN_DECLS
 
-typedef struct {
+typedef struct _ETreeMemoryCallbacks ETreeMemoryCallbacks;
+typedef struct _ETreeMemoryCallbacksClass ETreeMemoryCallbacksClass;
+
+typedef GdkPixbuf *	(*ETreeMemoryCallbacksIconAtFn)
+						(ETreeModel *etree,
+						 ETreePath path,
+						 gpointer model_data);
+
+typedef gint		(*ETreeMemoryCallbacksColumnCountFn)
+						(ETreeModel *etree,
+						 gpointer model_data);
+
+typedef gboolean	(*ETreeMemoryCallbacksHasSaveIdFn)
+						(ETreeModel *etree,
+						 gpointer model_data);
+typedef gchar *		(*ETreeMemoryCallbacksGetSaveIdFn)
+						(ETreeModel *etree,
+						 ETreePath path,
+						 gpointer model_data);
+
+typedef gboolean	(*ETreeMemoryCallbacksHasGetNodeByIdFn)
+						(ETreeModel *etree,
+						 gpointer model_data);
+typedef ETreePath	(*ETreeMemoryCallbacksGetNodeByIdFn)
+						(ETreeModel *etree,
+						 const gchar *save_id,
+						 gpointer model_data);
+
+typedef gpointer	(*ETreeMemoryCallbacksValueAtFn)
+						(ETreeModel *etree,
+						 ETreePath path,
+						 gint col,
+						 gpointer model_data);
+typedef void		(*ETreeMemoryCallbacksSetValueAtFn)
+						(ETreeModel *etree,
+						 ETreePath path,
+						 gint col,
+						 gconstpointer val,
+						 gpointer model_data);
+typedef gboolean	(*ETreeMemoryCallbacksIsEditableFn)
+						(ETreeModel *etree,
+						 ETreePath path,
+						 gint col,
+						 gpointer model_data);
+
+typedef gpointer	(*ETreeMemoryCallbacksDuplicateValueFn)
+						(ETreeModel *etm,
+						 gint col,
+						 gconstpointer val,
+						 gpointer data);
+typedef void		(*ETreeMemoryCallbacksFreeValueFn)
+						(ETreeModel *etm,
+						 gint col,
+						 gpointer val,
+						 gpointer data);
+typedef gpointer	(*ETreeMemoryCallbacksInitializeValueFn)
+						(ETreeModel *etm,
+						 gint col,
+						 gpointer data);
+typedef gboolean	(*ETreeMemoryCallbacksValueIsEmptyFn)
+						(ETreeModel *etm,
+						 gint col,
+						 gconstpointer val,
+						 gpointer data);
+typedef gchar *		(*ETreeMemoryCallbacksValueToStringFn)
+						(ETreeModel *etm,
+						 gint col,
+						 gconstpointer val,
+						 gpointer data);
+
+struct _ETreeMemoryCallbacks {
 	ETreeMemory parent;
 
 	ETreeMemoryCallbacksIconAtFn icon_at;
@@ -66,7 +129,7 @@ typedef struct {
 	ETreeMemoryCallbacksHasGetNodeByIdFn  has_get_node_by_id;
 	ETreeMemoryCallbacksGetNodeByIdFn     get_node_by_id;
 
-	ETreeMemoryCallbacksValueAtFn	      sort_value_at;
+	ETreeMemoryCallbacksValueAtFn         sort_value_at;
 	ETreeMemoryCallbacksValueAtFn         value_at;
 	ETreeMemoryCallbacksSetValueAtFn      set_value_at;
 	ETreeMemoryCallbacksIsEditableFn      is_editable;
@@ -78,36 +141,37 @@ typedef struct {
 	ETreeMemoryCallbacksValueToStringFn   value_to_string;
 
 	gpointer model_data;
-} ETreeMemoryCallbacks;
+};
 
-typedef struct {
+struct _ETreeMemoryCallbacksClass {
 	ETreeMemoryClass parent_class;
-} ETreeMemoryCallbacksClass;
-
-GType   e_tree_memory_callbacks_get_type (void);
+};
 
-ETreeModel *e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
+GType		e_tree_memory_callbacks_get_type
+				(void) G_GNUC_CONST;
+ETreeModel *	e_tree_memory_callbacks_new
+				(ETreeMemoryCallbacksIconAtFn icon_at,
 
-					  ETreeMemoryCallbacksColumnCountFn        column_count,
+				 ETreeMemoryCallbacksColumnCountFn column_count,
 
-					  ETreeMemoryCallbacksHasSaveIdFn          has_save_id,
-					  ETreeMemoryCallbacksGetSaveIdFn          get_save_id,
+				 ETreeMemoryCallbacksHasSaveIdFn has_save_id,
+				 ETreeMemoryCallbacksGetSaveIdFn get_save_id,
 
-					  ETreeMemoryCallbacksHasGetNodeByIdFn     has_get_node_by_id,
-					  ETreeMemoryCallbacksGetNodeByIdFn        get_node_by_id,
+				 ETreeMemoryCallbacksHasGetNodeByIdFn has_get_node_by_id,
+				 ETreeMemoryCallbacksGetNodeByIdFn get_node_by_id,
 
-					  ETreeMemoryCallbacksValueAtFn		   sort_value_at,
-					  ETreeMemoryCallbacksValueAtFn            value_at,
-					  ETreeMemoryCallbacksSetValueAtFn         set_value_at,
-					  ETreeMemoryCallbacksIsEditableFn         is_editable,
+				 ETreeMemoryCallbacksValueAtFn sort_value_at,
+				 ETreeMemoryCallbacksValueAtFn value_at,
+				 ETreeMemoryCallbacksSetValueAtFn set_value_at,
+				 ETreeMemoryCallbacksIsEditableFn is_editable,
 
-					  ETreeMemoryCallbacksDuplicateValueFn     duplicate_value,
-					  ETreeMemoryCallbacksFreeValueFn          free_value,
-					  ETreeMemoryCallbacksInitializeValueFn    initialize_value,
-					  ETreeMemoryCallbacksValueIsEmptyFn       value_is_empty,
-					  ETreeMemoryCallbacksValueToStringFn      value_to_string,
+				 ETreeMemoryCallbacksDuplicateValueFn duplicate_value,
+				 ETreeMemoryCallbacksFreeValueFn free_value,
+				 ETreeMemoryCallbacksInitializeValueFn initialize_value,
+				 ETreeMemoryCallbacksValueIsEmptyFn value_is_empty,
+				 ETreeMemoryCallbacksValueToStringFn value_to_string,
 
-					  gpointer                                 model_data);
+				 gpointer model_data);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 71dc0cbae0..bb26fa773f 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -37,7 +37,11 @@
 
 #include "e-tree-memory.h"
 
-G_DEFINE_TYPE (ETreeMemory, e_tree_memory, E_TREE_MODEL_TYPE)
+#define E_TREE_MEMORY_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TREE_MEMORY, ETreeMemoryPrivate))
+
+G_DEFINE_TYPE (ETreeMemory, e_tree_memory, E_TYPE_TREE_MODEL)
 
 enum {
 	FILL_IN_CHILDREN,
@@ -63,7 +67,7 @@ struct ETreeMemoryPath {
 	gint             num_children;
 };
 
-struct ETreeMemoryPriv {
+struct _ETreeMemoryPrivate {
 	ETreeMemoryPath *root;
 
 	/* whether nodes are created expanded
@@ -180,7 +184,7 @@ e_tree_path_unlink (ETreeMemoryPath *path)
 void
 e_tree_memory_freeze (ETreeMemory *etmm)
 {
-	ETreeMemoryPriv *priv = etmm->priv;
+	ETreeMemoryPrivate *priv = etmm->priv;
 
 	if (priv->frozen == 0)
 		e_tree_model_pre_change (E_TREE_MODEL (etmm));
@@ -200,7 +204,7 @@ e_tree_memory_freeze (ETreeMemory *etmm)
 void
 e_tree_memory_thaw (ETreeMemory *etmm)
 {
-	ETreeMemoryPriv *priv = etmm->priv;
+	ETreeMemoryPrivate *priv = etmm->priv;
 
 	if (priv->frozen > 0)
 		priv->frozen--;
@@ -215,18 +219,13 @@ e_tree_memory_thaw (ETreeMemory *etmm)
 static void
 etmm_dispose (GObject *object)
 {
-	ETreeMemory *etmm = E_TREE_MEMORY (object);
-	ETreeMemoryPriv *priv = etmm->priv;
-
-	if (priv) {
-	/* XXX lots of stuff to free here */
+	ETreeMemoryPrivate *priv;
 
-		if (priv->root)
-			e_tree_memory_node_remove (etmm, priv->root);
+	priv = E_TREE_MEMORY_GET_PRIVATE (object);
 
-		g_free (priv);
-	}
-	etmm->priv = NULL;
+	if (priv->root)
+		e_tree_memory_node_remove (
+			E_TREE_MEMORY (object), priv->root);
 
 	G_OBJECT_CLASS (e_tree_memory_parent_class)->dispose (object);
 }
@@ -234,7 +233,7 @@ etmm_dispose (GObject *object)
 static ETreePath
 etmm_get_root (ETreeModel *etm)
 {
-	ETreeMemoryPriv *priv = E_TREE_MEMORY (etm)->priv;
+	ETreeMemoryPrivate *priv = E_TREE_MEMORY (etm)->priv;
 	return priv->root;
 }
 
@@ -326,7 +325,7 @@ static gboolean
 etmm_get_expanded_default (ETreeModel *etm)
 {
 	ETreeMemory *etmm = E_TREE_MEMORY (etm);
-	ETreeMemoryPriv *priv = etmm->priv;
+	ETreeMemoryPrivate *priv = etmm->priv;
 
 	return priv->expanded_default;
 }
@@ -353,10 +352,33 @@ etmm_node_request_collapse (ETreeModel *etm, ETreePath node)
 
 
 static void
-e_tree_memory_class_init (ETreeMemoryClass *klass)
+e_tree_memory_class_init (ETreeMemoryClass *class)
 {
-	ETreeModelClass *tree_class = (ETreeModelClass *) klass;
-	GObjectClass  *object_class = (GObjectClass *) klass;
+	GObjectClass *object_class;
+	ETreeModelClass *tree_model_class;
+
+	g_type_class_add_private (class, sizeof (ETreeMemoryPrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = etmm_dispose;
+
+	tree_model_class = E_TREE_MODEL_CLASS (class);
+	tree_model_class->get_root = etmm_get_root;
+	tree_model_class->get_prev = etmm_get_prev;
+	tree_model_class->get_next = etmm_get_next;
+	tree_model_class->get_first_child = etmm_get_first_child;
+	tree_model_class->get_last_child = etmm_get_last_child;
+	tree_model_class->get_parent = etmm_get_parent;
+
+	tree_model_class->is_root = etmm_is_root;
+	tree_model_class->is_expandable = etmm_is_expandable;
+	tree_model_class->get_children = etmm_get_children;
+	tree_model_class->depth = etmm_depth;
+	tree_model_class->get_expanded_default = etmm_get_expanded_default;
+
+	tree_model_class->node_request_collapse = etmm_node_request_collapse;
+
+	class->fill_in_children = NULL;
 
 	signals[FILL_IN_CHILDREN] =
 		g_signal_new ("fill_in_children",
@@ -366,40 +388,12 @@ e_tree_memory_class_init (ETreeMemoryClass *klass)
 			      (GSignalAccumulator) NULL, NULL,
 			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
-
-	object_class->dispose             = etmm_dispose;
-
-	tree_class->get_root              = etmm_get_root;
-	tree_class->get_prev              = etmm_get_prev;
-	tree_class->get_next              = etmm_get_next;
-	tree_class->get_first_child       = etmm_get_first_child;
-	tree_class->get_last_child        = etmm_get_last_child;
-	tree_class->get_parent            = etmm_get_parent;
-
-	tree_class->is_root               = etmm_is_root;
-	tree_class->is_expandable         = etmm_is_expandable;
-	tree_class->get_children          = etmm_get_children;
-	tree_class->depth                 = etmm_depth;
-	tree_class->get_expanded_default  = etmm_get_expanded_default;
-
-	tree_class->node_request_collapse = etmm_node_request_collapse;
-
-	klass->fill_in_children           = NULL;
 }
 
 static void
 e_tree_memory_init (ETreeMemory *etmm)
 {
-	ETreeMemoryPriv *priv;
-
-	priv = g_new0 (ETreeMemoryPriv, 1);
-	etmm->priv = priv;
-
-	priv->root = NULL;
-	priv->frozen = 0;
-	priv->expanded_default = 0;
-	priv->destroy_func = NULL;
-	priv->destroy_user_data = NULL;
+	etmm->priv = E_TREE_MEMORY_GET_PRIVATE (etmm);
 }
 
 /**
@@ -423,7 +417,7 @@ e_tree_memory_construct (ETreeMemory *etmm)
 ETreeMemory *
 e_tree_memory_new (void)
 {
-	return (ETreeMemory *) g_object_new (E_TREE_MEMORY_TYPE, NULL);
+	return g_object_new (E_TYPE_TREE_MEMORY, NULL);
 }
 
 /**
@@ -495,7 +489,7 @@ e_tree_memory_node_insert (ETreeMemory *tree_model,
 			   gint position,
 			   gpointer node_data)
 {
-	ETreeMemoryPriv *priv;
+	ETreeMemoryPrivate *priv;
 	ETreeMemoryPath *new_path;
 	ETreeMemoryPath *parent_path = parent_node;
 
diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h
index 824f0b1399..cff4811256 100644
--- a/widgets/table/e-tree-memory.h
+++ b/widgets/table/e-tree-memory.h
@@ -28,71 +28,90 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <table/e-tree-model.h>
 
-G_BEGIN_DECLS
+/* Standard GObject macros */
+#define E_TYPE_TREE_MEMORY \
+	(e_tree_memory_get_type ())
+#define E_TREE_MEMORY(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_MEMORY, ETreeMemory))
+#define E_TREE_MEMORY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_MEMORY, ETreeMemoryClass))
+#define E_IS_TREE_MEMORY(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_MEMORY))
+#define E_IS_TREE_MEMORY_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_MEMORY))
+#define E_TREE_MEMORY_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_MEMORY, ETreeMemoryClass))
 
-#define E_TREE_MEMORY_TYPE        (e_tree_memory_get_type ())
-#define E_TREE_MEMORY(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MEMORY_TYPE, ETreeMemory))
-#define E_TREE_MEMORY_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_MEMORY_TYPE, ETreeMemoryClass))
-#define E_IS_TREE_MEMORY(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_MEMORY_TYPE))
-#define E_IS_TREE_MEMORY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_TYPE))
-#define E_TREE_MEMORY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_MEMORY_TYPE, ETreeMemoryClass))
+G_BEGIN_DECLS
 
-typedef struct ETreeMemory ETreeMemory;
-typedef struct ETreeMemoryPriv ETreeMemoryPriv;
-typedef struct ETreeMemoryClass ETreeMemoryClass;
+typedef struct _ETreeMemory ETreeMemory;
+typedef struct _ETreeMemoryClass ETreeMemoryClass;
+typedef struct _ETreeMemoryPrivate ETreeMemoryPrivate;
 
-typedef gint (*ETreeMemorySortCallback) (ETreeMemory *etmm, ETreePath path1, ETreePath path2, gpointer closure);
+typedef gint	(*ETreeMemorySortCallback)	(ETreeMemory *etmm,
+						 ETreePath path1,
+						 ETreePath path2,
+						 gpointer closure);
 
-struct ETreeMemory {
-	ETreeModel base;
-	ETreeMemoryPriv *priv;
+struct _ETreeMemory {
+	ETreeModel parent;
+	ETreeMemoryPrivate *priv;
 };
 
-struct ETreeMemoryClass {
+struct _ETreeMemoryClass {
 	ETreeModelClass parent_class;
 
-	/* signals */
-	void (*fill_in_children) (ETreeMemory *model, ETreePath node);
+	/* Signals */
+	void		(*fill_in_children)	(ETreeMemory *model,
+						 ETreePath node);
 };
 
-GType        e_tree_memory_get_type               (void);
-void         e_tree_memory_construct              (ETreeMemory             *etree);
-ETreeMemory *e_tree_memory_new                    (void);
+GType		e_tree_memory_get_type		(void) G_GNUC_CONST;
+void		e_tree_memory_construct		(ETreeMemory *etree);
+ETreeMemory *	e_tree_memory_new		(void);
 
 /* node operations */
-ETreePath    e_tree_memory_node_insert            (ETreeMemory             *etree,
-						   ETreePath                parent,
-						   gint                      position,
-						   gpointer                 node_data);
-ETreePath    e_tree_memory_node_insert_id         (ETreeMemory             *etree,
-						   ETreePath                parent,
-						   gint                      position,
-						   gpointer                 node_data,
-						   gchar                    *id);
-ETreePath    e_tree_memory_node_insert_before     (ETreeMemory             *etree,
-						   ETreePath                parent,
-						   ETreePath                sibling,
-						   gpointer                 node_data);
-gpointer     e_tree_memory_node_remove            (ETreeMemory             *etree,
-						   ETreePath                path);
+ETreePath	e_tree_memory_node_insert	(ETreeMemory *etree,
+						 ETreePath parent,
+						 gint position,
+						 gpointer node_data);
+ETreePath	e_tree_memory_node_insert_id	(ETreeMemory *etree,
+						 ETreePath parent,
+						 gint position,
+						 gpointer node_data,
+						 gchar *id);
+ETreePath	e_tree_memory_node_insert_before
+						(ETreeMemory *etree,
+						 ETreePath parent,
+						 ETreePath sibling,
+						 gpointer node_data);
+gpointer	e_tree_memory_node_remove	(ETreeMemory *etree,
+						 ETreePath path);
 
 /* Freeze and thaw */
-void         e_tree_memory_freeze                 (ETreeMemory             *etree);
-void         e_tree_memory_thaw                   (ETreeMemory             *etree);
-void         e_tree_memory_set_expanded_default   (ETreeMemory             *etree,
-						   gboolean                 expanded);
-gpointer     e_tree_memory_node_get_data          (ETreeMemory             *etm,
-						   ETreePath                node);
-void         e_tree_memory_node_set_data          (ETreeMemory             *etm,
-						   ETreePath                node,
-						   gpointer                 node_data);
-void         e_tree_memory_sort_node              (ETreeMemory             *etm,
-						   ETreePath                node,
-						   ETreeMemorySortCallback  callback,
-						   gpointer                 user_data);
-void         e_tree_memory_set_node_destroy_func  (ETreeMemory             *etmm,
-						   GFunc                    destroy_func,
-						   gpointer                 user_data);
+void		e_tree_memory_freeze		(ETreeMemory *etree);
+void		e_tree_memory_thaw		(ETreeMemory *etree);
+void		e_tree_memory_set_expanded_default
+						(ETreeMemory *etree,
+						 gboolean expanded);
+gpointer	e_tree_memory_node_get_data	(ETreeMemory *etm,
+						 ETreePath node);
+void		e_tree_memory_node_set_data	(ETreeMemory *etm,
+						 ETreePath node,
+						 gpointer node_data);
+void		e_tree_memory_sort_node		(ETreeMemory *etm,
+						 ETreePath node,
+						 ETreeMemorySortCallback callback,
+						 gpointer user_data);
+void		e_tree_memory_set_node_destroy_func
+						(ETreeMemory *etmm,
+						 GFunc destroy_func,
+						 gpointer user_data);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 2c90c6ae72..79197aade0 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -61,9 +61,9 @@ static guint e_tree_model_signals[LAST_SIGNAL] = {0, };
 
 
 static void
-e_tree_model_class_init (ETreeModelClass *klass)
+e_tree_model_class_init (ETreeModelClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	e_tree_model_signals[PRE_CHANGE] =
 		g_signal_new ("pre_change",
@@ -155,52 +155,52 @@ e_tree_model_class_init (ETreeModelClass *klass)
 			      g_cclosure_marshal_VOID__POINTER,
 			      G_TYPE_NONE, 1, G_TYPE_POINTER);
 
-	klass->get_root              = NULL;
-
-	klass->get_parent            = NULL;
-	klass->get_first_child       = NULL;
-	klass->get_last_child        = NULL;
-	klass->get_next              = NULL;
-	klass->get_prev              = NULL;
-
-	klass->is_root               = NULL;
-	klass->is_expandable         = NULL;
-	klass->get_children          = NULL;
-	klass->depth                 = NULL;
-
-	klass->icon_at               = NULL;
-
-	klass->get_expanded_default  = NULL;
-	klass->column_count          = NULL;
-
-	klass->has_save_id           = NULL;
-	klass->get_save_id           = NULL;
-	klass->has_get_node_by_id    = NULL;
-	klass->get_node_by_id        = NULL;
-
-	klass->has_change_pending    = NULL;
-
-	klass->sort_value_at	  = NULL;
-	klass->value_at              = NULL;
-	klass->set_value_at          = NULL;
-	klass->is_editable           = NULL;
-
-	klass->duplicate_value       = NULL;
-	klass->free_value            = NULL;
-	klass->initialize_value      = NULL;
-	klass->value_is_empty        = NULL;
-	klass->value_to_string       = NULL;
-
-	klass->pre_change            = NULL;
-	klass->no_change             = NULL;
-	klass->rebuilt		     = NULL;
-	klass->node_changed          = NULL;
-	klass->node_data_changed     = NULL;
-	klass->node_col_changed      = NULL;
-	klass->node_inserted         = NULL;
-	klass->node_removed          = NULL;
-	klass->node_deleted          = NULL;
-	klass->node_request_collapse = NULL;
+	class->get_root              = NULL;
+
+	class->get_parent            = NULL;
+	class->get_first_child       = NULL;
+	class->get_last_child        = NULL;
+	class->get_next              = NULL;
+	class->get_prev              = NULL;
+
+	class->is_root               = NULL;
+	class->is_expandable         = NULL;
+	class->get_children          = NULL;
+	class->depth                 = NULL;
+
+	class->icon_at               = NULL;
+
+	class->get_expanded_default  = NULL;
+	class->column_count          = NULL;
+
+	class->has_save_id           = NULL;
+	class->get_save_id           = NULL;
+	class->has_get_node_by_id    = NULL;
+	class->get_node_by_id        = NULL;
+
+	class->has_change_pending    = NULL;
+
+	class->sort_value_at	  = NULL;
+	class->value_at              = NULL;
+	class->set_value_at          = NULL;
+	class->is_editable           = NULL;
+
+	class->duplicate_value       = NULL;
+	class->free_value            = NULL;
+	class->initialize_value      = NULL;
+	class->value_is_empty        = NULL;
+	class->value_to_string       = NULL;
+
+	class->pre_change            = NULL;
+	class->no_change             = NULL;
+	class->rebuilt		     = NULL;
+	class->node_changed          = NULL;
+	class->node_data_changed     = NULL;
+	class->node_col_changed      = NULL;
+	class->node_inserted         = NULL;
+	class->node_removed          = NULL;
+	class->node_deleted          = NULL;
+	class->node_request_collapse = NULL;
 }
 
 static void
@@ -226,7 +226,7 @@ e_tree_model_pre_change  (ETreeModel *tree_model)
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting pre_change on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[PRE_CHANGE], 0);
 }
@@ -246,7 +246,7 @@ e_tree_model_no_change  (ETreeModel *tree_model)
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting no_change on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NO_CHANGE], 0);
 }
@@ -266,7 +266,7 @@ e_tree_model_rebuilt  (ETreeModel *tree_model)
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting rebuilt on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting rebuilt on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[REBUILT], 0);
 }
@@ -285,7 +285,7 @@ e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath node)
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_CHANGED], 0, node);
 }
@@ -305,7 +305,7 @@ e_tree_model_node_data_changed  (ETreeModel *tree_model, ETreePath node)
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_data_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_DATA_CHANGED], 0, node);
 }
@@ -325,7 +325,7 @@ e_tree_model_node_col_changed  (ETreeModel *tree_model, ETreePath node, gint col
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_col_changed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_COL_CHANGED], 0, node, col);
 }
@@ -346,7 +346,7 @@ e_tree_model_node_inserted (ETreeModel *tree_model,
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_inserted on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_INSERTED], 0,
 		       parent_node, inserted_node);
@@ -366,7 +366,7 @@ e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath parent_node, ETree
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_removed on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REMOVED], 0,
 		       parent_node, removed_node, old_position);
@@ -385,7 +385,7 @@ e_tree_model_node_deleted  (ETreeModel *tree_model, ETreePath deleted_node)
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_deleted on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_DELETED], 0, deleted_node);
 }
@@ -403,7 +403,7 @@ e_tree_model_node_request_collapse  (ETreeModel *tree_model, ETreePath collapsed
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
 
-	d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->klass->type)));
+	d(g_print("Emitting node_request_collapse on model 0x%p, a %s.\n", tree_model, g_type_name (G_OBJECT(tree_model)->class->type)));
 
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REQUEST_COLLAPSE], 0, collapsed_node);
 }
@@ -420,7 +420,7 @@ e_tree_model_node_request_collapse  (ETreeModel *tree_model, ETreePath collapsed
 ETreeModel *
 e_tree_model_new (void)
 {
-	return (ETreeModel *) g_object_new (E_TREE_MODEL_TYPE, NULL);
+	return g_object_new (E_TYPE_TREE_MODEL, NULL);
 }
 
 /**
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index c6600ddf83..01c4bf4180 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -26,72 +26,120 @@
 #define _E_TREE_MODEL_H_
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <glib-object.h>
+
+/* Standard GObject macros */
+#define E_TYPE_TREE_MODEL \
+	(e_tree_model_get_type ())
+#define E_TREE_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_MODEL, ETreeModel))
+#define E_TREE_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_MODEL, ETreeModelClass))
+#define E_IS_TREE_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_MODEL))
+#define E_IS_TREE_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_MODEL))
+#define E_TREE_MODEL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_MODEL, ETreeModelClass))
 
 G_BEGIN_DECLS
 
-#define E_TREE_MODEL_TYPE        (e_tree_model_get_type ())
-#define E_TREE_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel))
-#define E_TREE_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass))
-#define E_IS_TREE_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_MODEL_TYPE))
-#define E_IS_TREE_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MODEL_TYPE))
-#define E_TREE_MODEL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_MODEL_TYPE, ETreeModelClass))
-
-typedef gpointer  ETreePath;
-typedef struct ETreeModel ETreeModel;
-typedef struct ETreeModelClass ETreeModelClass;
-typedef gint (*ETreePathCompareFunc)(ETreeModel *model, ETreePath path1, ETreePath path2);
-typedef gboolean (*ETreePathFunc)(ETreeModel *model, ETreePath path, gpointer data);
-
-struct ETreeModel {
-	GObject base;
+typedef gpointer ETreePath;
+
+typedef struct _ETreeModel ETreeModel;
+typedef struct _ETreeModelClass ETreeModelClass;
+
+typedef gint		(*ETreePathCompareFunc)	(ETreeModel *model,
+						 ETreePath path1,
+						 ETreePath path2);
+typedef gboolean	(*ETreePathFunc)	(ETreeModel *model,
+						 ETreePath path,
+						 gpointer data);
+
+struct _ETreeModel {
+	GObject parent;
 };
 
-struct ETreeModelClass {
+struct _ETreeModelClass {
 	GObjectClass parent_class;
 
 	/*
 	 * Virtual methods
 	 */
-	ETreePath  (*get_root)              (ETreeModel *etm);
+	ETreePath	(*get_root)		(ETreeModel *etm);
 
-	ETreePath  (*get_parent)            (ETreeModel *etm, ETreePath node);
-	ETreePath  (*get_first_child)       (ETreeModel *etm, ETreePath node);
-	ETreePath  (*get_last_child)        (ETreeModel *etm, ETreePath node);
-	ETreePath  (*get_next)              (ETreeModel *etm, ETreePath node);
-	ETreePath  (*get_prev)              (ETreeModel *etm, ETreePath node);
+	ETreePath	(*get_parent)		(ETreeModel *etm,
+						 ETreePath node);
+	ETreePath	(*get_first_child)	(ETreeModel *etm,
+						 ETreePath node);
+	ETreePath	(*get_last_child)	(ETreeModel *etm,
+						 ETreePath node);
+	ETreePath	(*get_next)		(ETreeModel *etm,
+						 ETreePath node);
+	ETreePath	(*get_prev)		(ETreeModel *etm,
+						 ETreePath node);
 
-	gboolean   (*is_root)               (ETreeModel *etm, ETreePath node);
-	gboolean   (*is_expandable)         (ETreeModel *etm, ETreePath node);
-	guint      (*get_children)          (ETreeModel *etm, ETreePath node, ETreePath **paths);
-	guint      (*depth)                 (ETreeModel *etm, ETreePath node);
+	gboolean	(*is_root)		(ETreeModel *etm,
+						 ETreePath node);
+	gboolean	(*is_expandable)	(ETreeModel *etm,
+						 ETreePath node);
+	guint		(*get_children)		(ETreeModel *etm,
+						 ETreePath node,
+						 ETreePath **paths);
+	guint		(*depth)		(ETreeModel *etm,
+						 ETreePath node);
 
-	GdkPixbuf *(*icon_at)               (ETreeModel *etm, ETreePath node);
+	GdkPixbuf *	(*icon_at)		(ETreeModel *etm,
+						 ETreePath node);
 
-	gboolean   (*get_expanded_default)  (ETreeModel *etm);
-	gint       (*column_count)          (ETreeModel *etm);
+	gboolean	(*get_expanded_default)	(ETreeModel *etm);
+	gint		(*column_count)		(ETreeModel *etm);
 
-	gboolean   (*has_save_id)           (ETreeModel *etm);
-	gchar     *(*get_save_id)           (ETreeModel *etm, ETreePath node);
+	gboolean	(*has_save_id)		(ETreeModel *etm);
+	gchar *		(*get_save_id)		(ETreeModel *etm,
+						 ETreePath node);
 
-	gboolean   (*has_get_node_by_id)    (ETreeModel *etm);
-	ETreePath  (*get_node_by_id)        (ETreeModel *etm, const gchar *save_id);
+	gboolean	(*has_get_node_by_id)	(ETreeModel *etm);
+	ETreePath	(*get_node_by_id)	(ETreeModel *etm,
+						 const gchar *save_id);
 
-	gboolean   (*has_change_pending)    (ETreeModel *etm);
+	gboolean	(*has_change_pending)	(ETreeModel *etm);
 
 	/*
 	 * ETable analogs
 	 */
-	void      *(*sort_value_at)              (ETreeModel *etm, ETreePath node, gint col);
-	void      *(*value_at)              (ETreeModel *etm, ETreePath node, gint col);
-	void       (*set_value_at)          (ETreeModel *etm, ETreePath node, gint col, gconstpointer val);
-	gboolean   (*is_editable)           (ETreeModel *etm, ETreePath node, gint col);
+	gpointer	(*sort_value_at)	(ETreeModel *etm,
+						 ETreePath node,
+						 gint col);
+	gpointer	(*value_at)		(ETreeModel *etm,
+						 ETreePath node,
+						 gint col);
+	void		(*set_value_at)		(ETreeModel *etm,
+						 ETreePath node,
+						 gint col,
+						 gconstpointer val);
+	gboolean	(*is_editable)		(ETreeModel *etm,
+						 ETreePath node,
+						 gint col);
 
-	void      *(*duplicate_value)       (ETreeModel *etm, gint col, gconstpointer value);
-	void       (*free_value)            (ETreeModel *etm, gint col, gpointer value);
-	void	  *(*initialize_value)      (ETreeModel *etm, gint col);
-	gboolean   (*value_is_empty)        (ETreeModel *etm, gint col, gconstpointer value);
-	gchar      *(*value_to_string)       (ETreeModel *etm, gint col, gconstpointer value);
+	gpointer	(*duplicate_value)	(ETreeModel *etm,
+						 gint col,
+						 gconstpointer value);
+	void		(*free_value)		(ETreeModel *etm,
+						 gint col,
+						 gpointer value);
+	gpointer	(*initialize_value)	(ETreeModel *etm,
+						 gint col);
+	gboolean	(*value_is_empty)	(ETreeModel *etm,
+						 gint col,
+						 gconstpointer value);
+	gchar *		(*value_to_string)	(ETreeModel *etm,
+						 gint col,
+						 gconstpointer value);
 
 	/*
 	 * Signals
@@ -102,127 +150,144 @@ struct ETreeModelClass {
 	 * node_deleted, the ETreePath is no longer valid.
 	 */
 
-	void       (*pre_change)            (ETreeModel *etm);
-	void       (*no_change)             (ETreeModel *etm);
-	void       (*node_changed)          (ETreeModel *etm, ETreePath node);
-	void       (*node_data_changed)     (ETreeModel *etm, ETreePath node);
-	void       (*node_col_changed)      (ETreeModel *etm, ETreePath node,   gint col);
-	void       (*node_inserted)         (ETreeModel *etm, ETreePath parent, ETreePath inserted_node);
-	void       (*node_removed)          (ETreeModel *etm, ETreePath parent, ETreePath removed_node, gint old_position);
-	void       (*node_deleted)          (ETreeModel *etm, ETreePath deleted_node);
-	void       (*rebuilt)          (ETreeModel *etm);
+	void		(*pre_change)		(ETreeModel *etm);
+	void		(*no_change)		(ETreeModel *etm);
+	void		(*node_changed)		(ETreeModel *etm,
+						 ETreePath node);
+	void		(*node_data_changed)	(ETreeModel *etm,
+						 ETreePath node);
+	void		(*node_col_changed)	(ETreeModel *etm,
+						 ETreePath node,
+						 gint col);
+	void		(*node_inserted)	(ETreeModel *etm,
+						 ETreePath parent,
+						 ETreePath inserted_node);
+	void		(*node_removed)		(ETreeModel *etm,
+						 ETreePath parent,
+						 ETreePath removed_node,
+						 gint old_position);
+	void		(*node_deleted)		(ETreeModel *etm,
+						 ETreePath deleted_node);
+	void		(*rebuilt)		(ETreeModel *etm);
 
 	/* This signal requests that any viewers of the tree that
 	 * collapse and expand nodes collapse this node.
 	 */
-	void       (*node_request_collapse) (ETreeModel *etm, ETreePath node);
+	void		(*node_request_collapse)
+						(ETreeModel *etm,
+						 ETreePath node);
 };
 
-GType       e_tree_model_get_type                (void);
-ETreeModel *e_tree_model_new                     (void);
+GType		e_tree_model_get_type		(void) G_GNUC_CONST;
+ETreeModel *	e_tree_model_new		(void);
 
 /* tree traversal operations */
-ETreePath   e_tree_model_get_root                (ETreeModel     *etree);
-ETreePath   e_tree_model_node_get_parent         (ETreeModel     *etree,
-						  ETreePath       path);
-ETreePath   e_tree_model_node_get_first_child    (ETreeModel     *etree,
-						  ETreePath       path);
-ETreePath   e_tree_model_node_get_last_child     (ETreeModel     *etree,
-						  ETreePath       path);
-ETreePath   e_tree_model_node_get_next           (ETreeModel     *etree,
-						  ETreePath       path);
-ETreePath   e_tree_model_node_get_prev           (ETreeModel     *etree,
-						  ETreePath       path);
+ETreePath	e_tree_model_get_root		(ETreeModel *etree);
+ETreePath	e_tree_model_node_get_parent	(ETreeModel *etree,
+						 ETreePath path);
+ETreePath	e_tree_model_node_get_first_child
+						(ETreeModel *etree,
+						 ETreePath path);
+ETreePath	e_tree_model_node_get_last_child
+						(ETreeModel *etree,
+						 ETreePath path);
+ETreePath	e_tree_model_node_get_next	(ETreeModel *etree,
+						 ETreePath path);
+ETreePath	e_tree_model_node_get_prev	(ETreeModel *etree,
+						 ETreePath path);
 
 /* node accessors */
-gboolean    e_tree_model_node_is_root            (ETreeModel     *etree,
-						  ETreePath       path);
-gboolean    e_tree_model_node_is_expandable      (ETreeModel     *etree,
-						  ETreePath       path);
-guint       e_tree_model_node_get_children       (ETreeModel     *etree,
-						  ETreePath       path,
-						  ETreePath     **paths);
-guint       e_tree_model_node_depth              (ETreeModel     *etree,
-						  ETreePath       path);
-GdkPixbuf  *e_tree_model_icon_at                 (ETreeModel     *etree,
-						  ETreePath       path);
-gboolean    e_tree_model_get_expanded_default    (ETreeModel     *model);
-gint        e_tree_model_column_count            (ETreeModel     *model);
-gboolean    e_tree_model_has_save_id             (ETreeModel     *model);
-gchar      *e_tree_model_get_save_id             (ETreeModel     *model,
-						  ETreePath       node);
-gboolean    e_tree_model_has_get_node_by_id      (ETreeModel     *model);
-ETreePath   e_tree_model_get_node_by_id          (ETreeModel     *model,
-						  const gchar     *save_id);
-gboolean    e_tree_model_has_change_pending      (ETreeModel     *model);
-void       *e_tree_model_sort_value_at                (ETreeModel     *etree,
-						  ETreePath       node,
-						  gint             col);
-void       *e_tree_model_value_at                (ETreeModel     *etree,
-						  ETreePath       node,
-						  gint             col);
-void        e_tree_model_set_value_at            (ETreeModel     *etree,
-						  ETreePath       node,
-						  gint             col,
-						  const void     *val);
-gboolean    e_tree_model_node_is_editable        (ETreeModel     *etree,
-						  ETreePath       node,
-						  gint             col);
-void       *e_tree_model_duplicate_value         (ETreeModel     *etree,
-						  gint             col,
-						  const void     *value);
-void        e_tree_model_free_value              (ETreeModel     *etree,
-						  gint             col,
-						  void           *value);
-void       *e_tree_model_initialize_value        (ETreeModel     *etree,
-						  gint             col);
-gboolean    e_tree_model_value_is_empty          (ETreeModel     *etree,
-						  gint             col,
-						  const void     *value);
-gchar       *e_tree_model_value_to_string         (ETreeModel     *etree,
-						  gint             col,
-						  const void     *value);
+gboolean	e_tree_model_node_is_root	(ETreeModel *etree,
+						 ETreePath path);
+gboolean	e_tree_model_node_is_expandable	(ETreeModel *etree,
+						 ETreePath path);
+guint		e_tree_model_node_get_children	(ETreeModel *etree,
+						 ETreePath path,
+						 ETreePath **paths);
+guint		e_tree_model_node_depth		(ETreeModel *etree,
+						 ETreePath path);
+GdkPixbuf *	e_tree_model_icon_at		(ETreeModel *etree,
+						 ETreePath path);
+gboolean	e_tree_model_get_expanded_default
+						(ETreeModel *model);
+gint		e_tree_model_column_count	(ETreeModel *model);
+gboolean	e_tree_model_has_save_id	(ETreeModel *model);
+gchar *		e_tree_model_get_save_id	(ETreeModel *model,
+						 ETreePath node);
+gboolean	e_tree_model_has_get_node_by_id	(ETreeModel *model);
+ETreePath	e_tree_model_get_node_by_id	(ETreeModel *model,
+						 const gchar *save_id);
+gboolean	e_tree_model_has_change_pending	(ETreeModel *model);
+void		*e_tree_model_sort_value_at	(ETreeModel *etree,
+						 ETreePath node,
+						 gint col);
+void		*e_tree_model_value_at		(ETreeModel *etree,
+						 ETreePath node,
+						 gint col);
+void		e_tree_model_set_value_at	(ETreeModel *etree,
+						 ETreePath node,
+						 gint col,
+						 const void *val);
+gboolean	e_tree_model_node_is_editable	(ETreeModel *etree,
+						 ETreePath node,
+						 gint col);
+void		*e_tree_model_duplicate_value	(ETreeModel *etree,
+						 gint col,
+						 const void *value);
+void		e_tree_model_free_value		(ETreeModel *etree,
+						 gint col,
+						 void *value);
+void		*e_tree_model_initialize_value	(ETreeModel *etree,
+						 gint col);
+gboolean	e_tree_model_value_is_empty	(ETreeModel *etree,
+						 gint col,
+						 const void *value);
+gchar *		e_tree_model_value_to_string	(ETreeModel *etree,
+						 gint col,
+						 const void *value);
 
 /* depth first traversal of path's descendents, calling func on each one */
-void        e_tree_model_node_traverse           (ETreeModel     *model,
-						  ETreePath       path,
-						  ETreePathFunc   func,
-						  gpointer        data);
-void        e_tree_model_node_traverse_preorder  (ETreeModel     *model,
-						  ETreePath       path,
-						  ETreePathFunc   func,
-						  gpointer        data);
-ETreePath   e_tree_model_node_find               (ETreeModel     *model,
-						  ETreePath       path,
-						  ETreePath       end_path,
-						  gboolean        forward_direction,
-						  ETreePathFunc   func,
-						  gpointer        data);
+void		e_tree_model_node_traverse	(ETreeModel *model,
+						 ETreePath path,
+						 ETreePathFunc func,
+						 gpointer data);
+void		e_tree_model_node_traverse_preorder
+						(ETreeModel *model,
+						 ETreePath path,
+						 ETreePathFunc func,
+						 gpointer data);
+ETreePath	e_tree_model_node_find		(ETreeModel *model,
+						 ETreePath path,
+						 ETreePath end_path,
+						 gboolean forward_direction,
+						 ETreePathFunc func,
+						 gpointer data);
 
 /*
 ** Routines for emitting signals on the ETreeModel
 */
-void        e_tree_model_pre_change              (ETreeModel     *tree_model);
-void        e_tree_model_no_change               (ETreeModel     *tree_model);
-void        e_tree_model_rebuilt                 (ETreeModel     *tree_model);
-void        e_tree_model_node_changed            (ETreeModel     *tree_model,
-						  ETreePath       node);
-void        e_tree_model_node_data_changed       (ETreeModel     *tree_model,
-						  ETreePath       node);
-void        e_tree_model_node_col_changed        (ETreeModel     *tree_model,
-						  ETreePath       node,
-						  gint             col);
-void        e_tree_model_node_inserted           (ETreeModel     *tree_model,
-						  ETreePath       parent_node,
-						  ETreePath       inserted_node);
-void        e_tree_model_node_removed            (ETreeModel     *tree_model,
-						  ETreePath       parent_node,
-						  ETreePath       removed_node,
-						  gint             old_position);
-void        e_tree_model_node_deleted            (ETreeModel     *tree_model,
-						  ETreePath       deleted_node);
-void        e_tree_model_node_request_collapse   (ETreeModel     *tree_model,
-						  ETreePath       deleted_node);
+void		e_tree_model_pre_change		(ETreeModel *tree_model);
+void		e_tree_model_no_change		(ETreeModel *tree_model);
+void		e_tree_model_rebuilt		(ETreeModel *tree_model);
+void		e_tree_model_node_changed	(ETreeModel *tree_model,
+						 ETreePath node);
+void		e_tree_model_node_data_changed	(ETreeModel *tree_model,
+						 ETreePath node);
+void		e_tree_model_node_col_changed	(ETreeModel *tree_model,
+						 ETreePath node,
+						 gint col);
+void		e_tree_model_node_inserted	(ETreeModel *tree_model,
+						 ETreePath parent_node,
+						 ETreePath inserted_node);
+void		e_tree_model_node_removed	(ETreeModel *tree_model,
+						 ETreePath parent_node,
+						 ETreePath removed_node,
+						 gint old_position);
+void		e_tree_model_node_deleted	(ETreeModel *tree_model,
+						 ETreePath deleted_node);
+void		e_tree_model_node_request_collapse
+						(ETreeModel *tree_model,
+						 ETreePath deleted_node);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index e734114f00..cc8a1fcd6a 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -29,6 +29,10 @@
 
 #include "e-tree-selection-model.h"
 
+#define E_TREE_SELECTION_MODEL_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate))
+
 G_DEFINE_TYPE (
 	ETreeSelectionModel, e_tree_selection_model, E_TYPE_SELECTION_MODEL)
 
@@ -40,7 +44,7 @@ enum {
 	PROP_ETTA
 };
 
-struct ETreeSelectionModelPriv {
+struct _ETreeSelectionModelPrivate {
 	ETreeTableAdapter *etta;
 	ETreeModel *model;
 
@@ -206,7 +210,7 @@ etsm_node_deleted (ETreeModel *etm, ETreePath child, ETreeSelectionModel *etsm)
 static void
 add_model (ETreeSelectionModel *etsm, ETreeModel *model)
 {
-	ETreeSelectionModelPriv *priv = etsm->priv;
+	ETreeSelectionModelPrivate *priv = etsm->priv;
 
 	priv->model = model;
 
@@ -235,7 +239,7 @@ add_model (ETreeSelectionModel *etsm, ETreeModel *model)
 static void
 drop_model (ETreeSelectionModel *etsm)
 {
-	ETreeSelectionModelPriv *priv = etsm->priv;
+	ETreeSelectionModelPrivate *priv = etsm->priv;
 
 	if (!priv->model)
 		return;
@@ -277,24 +281,22 @@ etsm_dispose (GObject *object)
 
 	drop_model (etsm);
 
-	if (G_OBJECT_CLASS (e_tree_selection_model_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_tree_selection_model_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_tree_selection_model_parent_class)->dispose (object);
 }
 
 static void
 etsm_finalize (GObject *object)
 {
-	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (object);
+	ETreeSelectionModelPrivate *priv;
 
-	if (etsm->priv) {
-		clear_selection (etsm);
-		g_hash_table_destroy (etsm->priv->paths);
-		g_free (etsm->priv);
-		etsm->priv = NULL;
-	}
+	priv = E_TREE_SELECTION_MODEL_GET_PRIVATE (object);
 
-	if (G_OBJECT_CLASS (e_tree_selection_model_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_tree_selection_model_parent_class)->finalize) (object);
+	clear_selection (E_TREE_SELECTION_MODEL (object));
+	g_hash_table_destroy (priv->paths);
+
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_tree_selection_model_parent_class)->finalize (object);
 }
 
 static void
@@ -743,61 +745,44 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm)
 static void
 e_tree_selection_model_init (ETreeSelectionModel *etsm)
 {
-	ETreeSelectionModelPriv *priv;
-	priv                                  = g_new (ETreeSelectionModelPriv, 1);
-	etsm->priv                            = priv;
-
-	priv->etta                            = NULL;
-	priv->model                           = NULL;
+	etsm->priv = E_TREE_SELECTION_MODEL_GET_PRIVATE (etsm);
 
-	priv->paths                           = g_hash_table_new (NULL, NULL);
-
-	priv->cursor_path                     = NULL;
-	priv->start_path                      = NULL;
-	priv->cursor_col                      = -1;
-	priv->cursor_save_id		      = NULL;
-
-	priv->tree_model_pre_change_id        = 0;
-	priv->tree_model_no_change_id         = 0;
-	priv->tree_model_node_changed_id      = 0;
-	priv->tree_model_node_data_changed_id = 0;
-	priv->tree_model_node_col_changed_id  = 0;
-	priv->tree_model_node_inserted_id     = 0;
-	priv->tree_model_node_removed_id      = 0;
-	priv->tree_model_node_deleted_id      = 0;
+	etsm->priv->paths = g_hash_table_new (NULL, NULL);
+	etsm->priv->cursor_col = -1;
 }
 
 static void
-e_tree_selection_model_class_init (ETreeSelectionModelClass *klass)
+e_tree_selection_model_class_init (ETreeSelectionModelClass *class)
 {
 	GObjectClass *object_class;
 	ESelectionModelClass *esm_class;
 
-	object_class = G_OBJECT_CLASS (klass);
-	esm_class = E_SELECTION_MODEL_CLASS (klass);
+	g_type_class_add_private (class, sizeof (ETreeSelectionModelPrivate));
 
+	object_class = G_OBJECT_CLASS (class);
 	object_class->dispose = etsm_dispose;
 	object_class->finalize = etsm_finalize;
 	object_class->get_property = etsm_get_property;
 	object_class->set_property = etsm_set_property;
 
-	esm_class->is_row_selected    = etsm_is_row_selected;
-	esm_class->foreach            = etsm_foreach;
-	esm_class->clear              = etsm_clear;
-	esm_class->selected_count     = etsm_selected_count;
-	esm_class->select_all         = etsm_select_all;
-	esm_class->invert_selection   = etsm_invert_selection;
-	esm_class->row_count          = etsm_row_count;
-
-	esm_class->change_one_row     = etsm_change_one_row;
-	esm_class->change_cursor      = etsm_change_cursor;
-	esm_class->cursor_row         = etsm_cursor_row;
-	esm_class->cursor_col         = etsm_cursor_col;
-
-	esm_class->select_single_row  = etsm_select_single_row;
-	esm_class->toggle_single_row  = etsm_toggle_single_row;
+	esm_class = E_SELECTION_MODEL_CLASS (class);
+	esm_class->is_row_selected = etsm_is_row_selected;
+	esm_class->foreach = etsm_foreach;
+	esm_class->clear = etsm_clear;
+	esm_class->selected_count = etsm_selected_count;
+	esm_class->select_all = etsm_select_all;
+	esm_class->invert_selection = etsm_invert_selection;
+	esm_class->row_count = etsm_row_count;
+
+	esm_class->change_one_row = etsm_change_one_row;
+	esm_class->change_cursor = etsm_change_cursor;
+	esm_class->cursor_row = etsm_cursor_row;
+	esm_class->cursor_col = etsm_cursor_col;
+
+	esm_class->select_single_row = etsm_select_single_row;
+	esm_class->toggle_single_row = etsm_toggle_single_row;
 	esm_class->move_selection_end = etsm_move_selection_end;
-	esm_class->set_selection_end  = etsm_set_selection_end;
+	esm_class->set_selection_end = etsm_set_selection_end;
 
 	g_object_class_install_property (object_class, PROP_CURSOR_ROW,
 					 g_param_spec_int ("cursor_row",
@@ -817,14 +802,14 @@ e_tree_selection_model_class_init (ETreeSelectionModelClass *klass)
 					 g_param_spec_object ("model",
 							      "Model",
 							      NULL,
-							      E_TREE_MODEL_TYPE,
+							      E_TYPE_TREE_MODEL,
 							      G_PARAM_READWRITE));
 
 	g_object_class_install_property (object_class, PROP_ETTA,
 					 g_param_spec_object ("etta",
 							      "ETTA",
 							      NULL,
-							      E_TREE_TABLE_ADAPTER_TYPE,
+							      E_TYPE_TREE_TABLE_ADAPTER,
 							      G_PARAM_READWRITE));
 
 }
@@ -832,6 +817,6 @@ e_tree_selection_model_class_init (ETreeSelectionModelClass *klass)
 ESelectionModel *
 e_tree_selection_model_new (void)
 {
-	return g_object_new (E_TREE_SELECTION_MODEL_TYPE, NULL);
+	return g_object_new (E_TYPE_TREE_SELECTION_MODEL, NULL);
 }
 
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index e66abf3454..1541fcb95a 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -23,48 +23,68 @@
 #ifndef _E_TREE_SELECTION_MODEL_H_
 #define _E_TREE_SELECTION_MODEL_H_
 
-#include <glib-object.h>
 #include <e-util/e-sorter.h>
 #include <misc/e-selection-model.h>
 #include <table/e-tree-model.h>
 
-G_BEGIN_DECLS
-
-typedef void (*ETreeForeachFunc) (ETreePath path,
-				  gpointer closure);
+/* Standard GObject macros */
+#define E_TYPE_TREE_SELECTION_MODEL \
+	(e_tree_selection_model_get_type ())
+#define E_TREE_SELECTION_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModel))
+#define E_TREE_SELECTION_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelClass))
+#define E_IS_TREE_SELECTION_MODEL(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_SELECTION_MODEL))
+#define E_IS_TREE_SELECTION_MODEL_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_SELECTION_MODEL))
+#define E_TREE_SELECTION_MODEL_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelClass))
 
-typedef struct ETreeSelectionModelPriv ETreeSelectionModelPriv;
+G_BEGIN_DECLS
 
-#define E_TREE_SELECTION_MODEL_TYPE        (e_tree_selection_model_get_type ())
-#define E_TREE_SELECTION_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_SELECTION_MODEL_TYPE, ETreeSelectionModel))
-#define E_TREE_SELECTION_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_SELECTION_MODEL_TYPE, ETreeSelectionModelClass))
-#define E_IS_TREE_SELECTION_MODEL(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_SELECTION_MODEL_TYPE))
-#define E_IS_TREE_SELECTION_MODEL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_SELECTION_MODEL_TYPE))
+typedef void	(*ETreeForeachFunc)		(ETreePath path,
+						 gpointer closure);
 
-typedef struct {
-	ESelectionModel base;
+typedef struct _ETreeSelectionModel ETreeSelectionModel;
+typedef struct _ETreeSelectionModelClass ETreeSelectionModelClass;
+typedef struct _ETreeSelectionModelPrivate ETreeSelectionModelPrivate;
 
-	ETreeSelectionModelPriv *priv;
-} ETreeSelectionModel;
+struct _ETreeSelectionModel {
+	ESelectionModel parent;
+	ETreeSelectionModelPrivate *priv;
+};
 
-typedef struct {
+struct _ETreeSelectionModelClass {
 	ESelectionModelClass parent_class;
-} ETreeSelectionModelClass;
+};
 
-GType            e_tree_selection_model_get_type            (void);
-ESelectionModel *e_tree_selection_model_new                 (void);
-void             e_tree_selection_model_foreach             (ETreeSelectionModel *etsm,
-							     ETreeForeachFunc     callback,
-							     gpointer             closure);
-void             e_tree_selection_model_select_single_path  (ETreeSelectionModel *etsm,
-							     ETreePath            path);
-void		 e_tree_selection_model_select_paths        (ETreeSelectionModel *etsm, GPtrArray *paths);
+GType		e_tree_selection_model_get_type	(void) G_GNUC_CONST;
+ESelectionModel *
+		e_tree_selection_model_new	(void);
+void		e_tree_selection_model_foreach	(ETreeSelectionModel *etsm,
+						 ETreeForeachFunc callback,
+						 gpointer closure);
+void		e_tree_selection_model_select_single_path
+						(ETreeSelectionModel *etsm,
+						 ETreePath path);
+void		e_tree_selection_model_select_paths
+						(ETreeSelectionModel *etsm,
+						 GPtrArray *paths);
 
-void             e_tree_selection_model_add_to_selection    (ETreeSelectionModel *etsm,
-							     ETreePath            path);
-void             e_tree_selection_model_change_cursor       (ETreeSelectionModel *etsm,
-							     ETreePath            path);
-ETreePath        e_tree_selection_model_get_cursor          (ETreeSelectionModel *etsm);
+void		e_tree_selection_model_add_to_selection
+						(ETreeSelectionModel *etsm,
+						 ETreePath path);
+void		e_tree_selection_model_change_cursor
+						(ETreeSelectionModel *etsm,
+						 ETreePath path);
+ETreePath	e_tree_selection_model_get_cursor
+						(ETreeSelectionModel *etsm);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index e62ed66ffe..40b10c0dec 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -48,7 +48,11 @@
 
 #define d(x)
 
-G_DEFINE_TYPE (ETreeSorted, e_tree_sorted, E_TREE_MODEL_TYPE)
+#define E_TREE_SORTED_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TREE_SORTED, ETreeSortedPrivate))
+
+G_DEFINE_TYPE (ETreeSorted, e_tree_sorted, E_TYPE_TREE_MODEL)
 
 enum {
 	NODE_RESORTED,
@@ -75,7 +79,7 @@ struct ETreeSortedPath {
 	guint             needs_regen_to_sort : 1;
 };
 
-struct ETreeSortedPriv {
+struct _ETreeSortedPrivate {
 	ETreeModel      *source;
 	ETreeSortedPath *root;
 
@@ -582,34 +586,29 @@ schedule_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_regen,
 static void
 ets_dispose (GObject *object)
 {
-	ETreeSorted *ets = E_TREE_SORTED (object);
-	ETreeSortedPriv *priv = ets->priv;
+	ETreeSortedPrivate *priv;
 
-	/* FIXME lots of stuff to free here */
-	if (!priv) {
-		G_OBJECT_CLASS (e_tree_sorted_parent_class)->dispose (object);
-		return;
-	}
+	priv = E_TREE_SORTED_GET_PRIVATE (object);
 
 	if (priv->source) {
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_pre_change_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_no_change_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_changed_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_data_changed_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_col_changed_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_inserted_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_removed_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_deleted_id);
-		g_signal_handler_disconnect (G_OBJECT (priv->source),
-					     priv->tree_model_node_request_collapse_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_pre_change_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_no_change_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_changed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_data_changed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_col_changed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_inserted_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_removed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_deleted_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->tree_model_node_request_collapse_id);
 
 		g_object_unref (priv->source);
 		priv->source = NULL;
@@ -626,43 +625,48 @@ ets_dispose (GObject *object)
 	}
 
 	if (priv->sort_info) {
-		g_signal_handler_disconnect (G_OBJECT (priv->sort_info),
-					     priv->sort_info_changed_id);
+		g_signal_handler_disconnect (
+			priv->sort_info, priv->sort_info_changed_id);
 		priv->sort_info_changed_id = 0;
 
 		g_object_unref (priv->sort_info);
 		priv->sort_info = NULL;
 	}
 
-	ets_stop_sort_idle (ets);
-	if (ets->priv->insert_idle_id) {
-		g_source_remove (ets->priv->insert_idle_id);
-		ets->priv->insert_idle_id = 0;
+	ets_stop_sort_idle (E_TREE_SORTED (object));
+
+	if (priv->insert_idle_id) {
+		g_source_remove (priv->insert_idle_id);
+		priv->insert_idle_id = 0;
 	}
 
-	if (priv->full_header)
+	if (priv->full_header) {
 		g_object_unref (priv->full_header);
+		priv->full_header = NULL;
+	}
 
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_tree_sorted_parent_class)->dispose (object);
 }
 
 static void
 ets_finalize (GObject *object)
 {
-	ETreeSorted *ets = (ETreeSorted *) object;
+	ETreeSortedPrivate *priv;
 
-	if (ets->priv->root)
-		free_path (ets->priv->root);
+	priv = E_TREE_SORTED_GET_PRIVATE (object);
 
-	g_free (ets->priv);
-	ets->priv = NULL;
+	if (priv->root)
+		free_path (priv->root);
 
+	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (e_tree_sorted_parent_class)->finalize (object);
 }
 
 static ETreePath
 ets_get_root (ETreeModel *etm)
 {
-	ETreeSortedPriv *priv = E_TREE_SORTED (etm)->priv;
+	ETreeSortedPrivate *priv = E_TREE_SORTED (etm)->priv;
 	if (priv->root == NULL) {
 		ETreeSorted *ets = E_TREE_SORTED (etm);
 		ETreePath corresponding = e_tree_model_get_root (ets->priv->source);
@@ -1143,50 +1147,52 @@ ets_sort_info_changed (ETableSortInfo *sort_info, ETreeSorted *ets)
 /* Initialization and creation */
 
 static void
-e_tree_sorted_class_init (ETreeSortedClass *klass)
+e_tree_sorted_class_init (ETreeSortedClass *class)
 {
-	ETreeModelClass *tree_class      = E_TREE_MODEL_CLASS (klass);
-	GObjectClass *object_class       = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class;
+	ETreeModelClass *tree_model_class;
 
-	klass->node_resorted             = NULL;
+	g_type_class_add_private (class, sizeof (ETreeSortedPrivate));
 
-	object_class->dispose            = ets_dispose;
-	object_class->finalize           = ets_finalize;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = ets_dispose;
+	object_class->finalize = ets_finalize;
 
-	tree_class->get_root             = ets_get_root;
-	tree_class->get_parent           = ets_get_parent;
-	tree_class->get_first_child      = ets_get_first_child;
-	tree_class->get_last_child       = ets_get_last_child;
-	tree_class->get_prev             = ets_get_prev;
-	tree_class->get_next             = ets_get_next;
+	tree_model_class = E_TREE_MODEL_CLASS (class);
+	tree_model_class->get_root = ets_get_root;
+	tree_model_class->get_parent = ets_get_parent;
+	tree_model_class->get_first_child = ets_get_first_child;
+	tree_model_class->get_last_child = ets_get_last_child;
+	tree_model_class->get_prev = ets_get_prev;
+	tree_model_class->get_next = ets_get_next;
 
-	tree_class->is_root              = ets_is_root;
-	tree_class->is_expandable        = ets_is_expandable;
-	tree_class->get_children         = ets_get_children;
-	tree_class->depth                = ets_depth;
+	tree_model_class->is_root = ets_is_root;
+	tree_model_class->is_expandable = ets_is_expandable;
+	tree_model_class->get_children = ets_get_children;
+	tree_model_class->depth = ets_depth;
 
-	tree_class->icon_at              = ets_icon_at;
+	tree_model_class->icon_at = ets_icon_at;
 
-	tree_class->get_expanded_default = ets_get_expanded_default;
-	tree_class->column_count         = ets_column_count;
+	tree_model_class->get_expanded_default = ets_get_expanded_default;
+	tree_model_class->column_count = ets_column_count;
 
-	tree_class->has_save_id          = ets_has_save_id;
-	tree_class->get_save_id          = ets_get_save_id;
+	tree_model_class->has_save_id = ets_has_save_id;
+	tree_model_class->get_save_id = ets_get_save_id;
 
-	tree_class->has_get_node_by_id   = ets_has_get_node_by_id;
-	tree_class->get_node_by_id       = ets_get_node_by_id;
+	tree_model_class->has_get_node_by_id = ets_has_get_node_by_id;
+	tree_model_class->get_node_by_id = ets_get_node_by_id;
 
-	tree_class->has_change_pending   = ets_has_change_pending;
+	tree_model_class->has_change_pending = ets_has_change_pending;
 
-	tree_class->value_at             = ets_value_at;
-	tree_class->set_value_at         = ets_set_value_at;
-	tree_class->is_editable          = ets_is_editable;
+	tree_model_class->value_at = ets_value_at;
+	tree_model_class->set_value_at = ets_set_value_at;
+	tree_model_class->is_editable = ets_is_editable;
 
-	tree_class->duplicate_value      = ets_duplicate_value;
-	tree_class->free_value           = ets_free_value;
-	tree_class->initialize_value     = ets_initialize_value;
-	tree_class->value_is_empty       = ets_value_is_empty;
-	tree_class->value_to_string      = ets_value_to_string;
+	tree_model_class->duplicate_value = ets_duplicate_value;
+	tree_model_class->free_value = ets_free_value;
+	tree_model_class->initialize_value = ets_initialize_value;
+	tree_model_class->value_is_empty = ets_value_is_empty;
+	tree_model_class->value_to_string = ets_value_to_string;
 
 	signals[NODE_RESORTED] =
 		g_signal_new ("node_resorted",
@@ -1201,36 +1207,7 @@ e_tree_sorted_class_init (ETreeSortedClass *klass)
 static void
 e_tree_sorted_init (ETreeSorted *ets)
 {
-	ETreeSortedPriv *priv;
-
-	priv                                      = g_new0 (ETreeSortedPriv, 1);
-	ets->priv                                 = priv;
-
-	priv->root                                = NULL;
-	priv->source                              = NULL;
-
-	priv->sort_info                           = NULL;
-	priv->full_header                         = NULL;
-
-	priv->last_access                         = NULL;
-
-	priv->tree_model_pre_change_id            = 0;
-	priv->tree_model_no_change_id             = 0;
-	priv->tree_model_node_changed_id          = 0;
-	priv->tree_model_node_data_changed_id     = 0;
-	priv->tree_model_node_col_changed_id      = 0;
-	priv->tree_model_node_inserted_id         = 0;
-	priv->tree_model_node_removed_id          = 0;
-	priv->tree_model_node_deleted_id          = 0;
-	priv->tree_model_node_request_collapse_id = 0;
-
-	priv->sort_info_changed_id                = 0;
-	priv->sort_idle_id                        = 0;
-	priv->insert_idle_id                      = 0;
-	priv->insert_count                        = 0;
-
-	priv->in_resort_idle                      = 0;
-	priv->nested_resort_idle                  = 0;
+	ets->priv = E_TREE_SORTED_GET_PRIVATE (ets);
 }
 
 /**
@@ -1283,7 +1260,7 @@ e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *ful
 ETreeSorted *
 e_tree_sorted_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
 {
-	ETreeSorted *ets = g_object_new (E_TREE_SORTED_TYPE, NULL);
+	ETreeSorted *ets = g_object_new (E_TYPE_TREE_SORTED, NULL);
 
 	e_tree_sorted_construct (ets, source, full_header, sort_info);
 
diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h
index 74d9a70a32..456ee15d14 100644
--- a/widgets/table/e-tree-sorted.h
+++ b/widgets/table/e-tree-sorted.h
@@ -29,56 +29,70 @@
 #include <table/e-table-sort-info.h>
 #include <table/e-table-header.h>
 
-G_BEGIN_DECLS
-
-#define E_TREE_SORTED_TYPE        (e_tree_sorted_get_type ())
-#define E_TREE_SORTED(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_SORTED_TYPE, ETreeSorted))
-#define E_TREE_SORTED_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_SORTED_TYPE, ETreeSortedClass))
-#define E_IS_TREE_SORTED(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_SORTED_TYPE))
-#define E_IS_TREE_SORTED_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_SORTED_TYPE))
-#define E_TREE_SORTED_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_SORTED_TYPE, ETreeSortedClass))
+/* Standard GObject macros */
+#define E_TYPE_TREE_SORTED \
+	(e_tree_sorted_get_type ())
+#define E_TREE_SORTED(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_SORTED, ETreeSorted))
+#define E_TREE_SORTED_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_SORTED, ETreeSortedClass))
+#define E_IS_TREE_SORTED(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_SORTED))
+#define E_IS_TREE_SORTED_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_SORTED))
+#define E_TREE_SORTED_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_SORTED, ETreeSortedClass))
 
-typedef struct ETreeSorted ETreeSorted;
-typedef struct ETreeSortedPriv ETreeSortedPriv;
-typedef struct ETreeSortedClass ETreeSortedClass;
+G_BEGIN_DECLS
 
-struct ETreeSorted {
-	ETreeModel base;
+typedef struct _ETreeSorted ETreeSorted;
+typedef struct _ETreeSortedClass ETreeSortedClass;
+typedef struct _ETreeSortedPrivate ETreeSortedPrivate;
 
-	ETreeSortedPriv *priv;
+struct _ETreeSorted {
+	ETreeModel parent;
+	ETreeSortedPrivate *priv;
 };
 
-struct ETreeSortedClass {
+struct _ETreeSortedClass {
 	ETreeModelClass parent_class;
 
 	/* Signals */
-	void       (*node_resorted)         (ETreeSorted *etm, ETreePath node);
+	void		(*node_resorted)	(ETreeSorted *etm,
+						 ETreePath node);
 };
 
-GType        e_tree_sorted_get_type            (void);
-void         e_tree_sorted_construct           (ETreeSorted    *etree,
-						ETreeModel     *source,
-						ETableHeader   *full_header,
-						ETableSortInfo *sort_info);
-ETreeSorted *e_tree_sorted_new                 (ETreeModel     *source,
-						ETableHeader   *full_header,
-						ETableSortInfo *sort_info);
+GType		e_tree_sorted_get_type		(void) G_GNUC_CONST;
+void		e_tree_sorted_construct		(ETreeSorted *etree,
+						 ETreeModel *source,
+						 ETableHeader *full_header,
+						 ETableSortInfo *sort_info);
+ETreeSorted *	e_tree_sorted_new		(ETreeModel *source,
+						 ETableHeader *full_header,
+						 ETableSortInfo *sort_info);
 
-ETreePath    e_tree_sorted_view_to_model_path  (ETreeSorted    *ets,
-						ETreePath       view_path);
-ETreePath    e_tree_sorted_model_to_view_path  (ETreeSorted    *ets,
-						ETreePath       model_path);
-gint          e_tree_sorted_orig_position       (ETreeSorted    *ets,
-						ETreePath       path);
-gint          e_tree_sorted_node_num_children   (ETreeSorted    *ets,
-						ETreePath       path);
+ETreePath	e_tree_sorted_view_to_model_path
+						(ETreeSorted *ets,
+						 ETreePath view_path);
+ETreePath	e_tree_sorted_model_to_view_path
+						(ETreeSorted *ets,
+						 ETreePath model_path);
+gint		e_tree_sorted_orig_position	(ETreeSorted *ets,
+						 ETreePath path);
+gint		e_tree_sorted_node_num_children	(ETreeSorted *ets,
+						 ETreePath path);
 
-void         e_tree_sorted_node_resorted       (ETreeSorted    *tree_model,
-						ETreePath       node);
+void		e_tree_sorted_node_resorted	(ETreeSorted *tree_model,
+						 ETreePath node);
 
-ETableSortInfo* e_tree_sorted_get_sort_info       (ETreeSorted    *tree_model);
-void            e_tree_sorted_set_sort_info       (ETreeSorted    *tree_model,
-						   ETableSortInfo *sort_info);
+ETableSortInfo *e_tree_sorted_get_sort_info	(ETreeSorted *tree_model);
+void		e_tree_sorted_set_sort_info	(ETreeSorted *tree_model,
+						 ETableSortInfo *sort_info);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 63bd640a3c..d529a6e045 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -38,9 +38,13 @@
 #include "e-table-sorting-utils.h"
 #include "e-tree-table-adapter.h"
 
+#define E_TREE_TABLE_ADAPTER_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate))
+
 /* workaround for avoiding API breakage */
 #define etta_get_type e_tree_table_adapter_get_type
-G_DEFINE_TYPE (ETreeTableAdapter, etta, E_TABLE_MODEL_TYPE)
+G_DEFINE_TYPE (ETreeTableAdapter, etta, E_TYPE_TABLE_MODEL)
 #define d(x)
 
 #define INCREMENT_AMOUNT 100
@@ -62,7 +66,7 @@ typedef struct {
 	guint expandable_set : 1;
 } node_t;
 
-struct ETreeTableAdapterPriv {
+struct _ETreeTableAdapterPrivate {
 	ETreeModel     *source;
 	ETableSortInfo *sort_info;
 	ETableHeader   *header;
@@ -508,68 +512,72 @@ update_node (ETreeTableAdapter *etta, ETreePath path)
 static void
 etta_finalize (GObject *object)
 {
-	ETreeTableAdapter *etta = E_TREE_TABLE_ADAPTER (object);
+	ETreeTableAdapterPrivate *priv;
 
-	if (etta->priv->resort_idle_id) {
-		g_source_remove (etta->priv->resort_idle_id);
-		etta->priv->resort_idle_id = 0;
-	}
+	priv = E_TREE_TABLE_ADAPTER_GET_PRIVATE (object);
 
-	if (etta->priv->root) {
-		kill_gnode (etta->priv->root, etta);
-		etta->priv->root = NULL;
+	if (priv->resort_idle_id) {
+		g_source_remove (priv->resort_idle_id);
+		priv->resort_idle_id = 0;
 	}
 
-	g_hash_table_destroy (etta->priv->nodes);
+	if (priv->root) {
+		kill_gnode (priv->root, E_TREE_TABLE_ADAPTER (object));
+		priv->root = NULL;
+	}
 
-	g_free (etta->priv->map_table);
+	g_hash_table_destroy (priv->nodes);
 
-	g_free (etta->priv);
+	g_free (priv->map_table);
 
+	/* Chain up to parent's finalize() method. */
 	G_OBJECT_CLASS (etta_parent_class)->finalize (object);
 }
 
 static void
 etta_dispose (GObject *object)
 {
-	ETreeTableAdapter *etta = E_TREE_TABLE_ADAPTER (object);
+	ETreeTableAdapterPrivate *priv;
 
-	if (etta->priv->sort_info) {
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->sort_info),
-				       etta->priv->sort_info_changed_id);
-		g_object_unref (etta->priv->sort_info);
-		etta->priv->sort_info = NULL;
+	priv = E_TREE_TABLE_ADAPTER_GET_PRIVATE (object);
+
+	if (priv->sort_info) {
+		g_signal_handler_disconnect (
+			priv->sort_info, priv->sort_info_changed_id);
+		g_object_unref (priv->sort_info);
+		priv->sort_info = NULL;
 	}
 
-	if (etta->priv->header) {
-		g_object_unref (etta->priv->header);
-		etta->priv->header = NULL;
+	if (priv->header) {
+		g_object_unref (priv->header);
+		priv->header = NULL;
 	}
 
-	if (etta->priv->source) {
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->pre_change_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->no_change_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->rebuilt_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->node_changed_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->node_data_changed_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->node_col_changed_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->node_inserted_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->node_removed_id);
-		g_signal_handler_disconnect (G_OBJECT (etta->priv->source),
-				       etta->priv->node_request_collapse_id);
-
-		g_object_unref (etta->priv->source);
-		etta->priv->source = NULL;
+	if (priv->source) {
+		g_signal_handler_disconnect (
+			priv->source, priv->pre_change_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->no_change_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->rebuilt_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->node_changed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->node_data_changed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->node_col_changed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->node_inserted_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->node_removed_id);
+		g_signal_handler_disconnect (
+			priv->source, priv->node_request_collapse_id);
+
+		g_object_unref (priv->source);
+		priv->source = NULL;
 	}
 
+	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (etta_parent_class)->dispose (object);
 }
 
@@ -694,33 +702,37 @@ etta_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etta_class_init (ETreeTableAdapterClass *klass)
+etta_class_init (ETreeTableAdapterClass *class)
 {
-	ETableModelClass *table_class   = (ETableModelClass *) klass;
-	GObjectClass *object_class      = (GObjectClass *) klass;
+	GObjectClass *object_class;
+	ETableModelClass *table_model_class;
 
-	object_class->dispose           = etta_dispose;
-	object_class->finalize          = etta_finalize;
+	g_type_class_add_private (class, sizeof (ETreeTableAdapterPrivate));
 
-	table_class->column_count       = etta_column_count;
-	table_class->row_count          = etta_row_count;
-	table_class->append_row         = etta_append_row;
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = etta_dispose;
+	object_class->finalize = etta_finalize;
 
-	table_class->value_at           = etta_value_at;
-	table_class->set_value_at       = etta_set_value_at;
-	table_class->is_cell_editable   = etta_is_cell_editable;
+	table_model_class = E_TABLE_MODEL_CLASS (class);
+	table_model_class->column_count = etta_column_count;
+	table_model_class->row_count = etta_row_count;
+	table_model_class->append_row = etta_append_row;
 
-	table_class->has_save_id        = etta_has_save_id;
-	table_class->get_save_id        = etta_get_save_id;
+	table_model_class->value_at = etta_value_at;
+	table_model_class->set_value_at = etta_set_value_at;
+	table_model_class->is_cell_editable = etta_is_cell_editable;
 
-	table_class->has_change_pending = etta_has_change_pending;
-	table_class->duplicate_value    = etta_duplicate_value;
-	table_class->free_value         = etta_free_value;
-	table_class->initialize_value   = etta_initialize_value;
-	table_class->value_is_empty     = etta_value_is_empty;
-	table_class->value_to_string    = etta_value_to_string;
+	table_model_class->has_save_id = etta_has_save_id;
+	table_model_class->get_save_id = etta_get_save_id;
 
-	klass->sorting_changed = NULL;
+	table_model_class->has_change_pending = etta_has_change_pending;
+	table_model_class->duplicate_value = etta_duplicate_value;
+	table_model_class->free_value = etta_free_value;
+	table_model_class->initialize_value = etta_initialize_value;
+	table_model_class->value_is_empty = etta_value_is_empty;
+	table_model_class->value_to_string = etta_value_to_string;
+
+	class->sorting_changed = NULL;
 
 	signals[SORTING_CHANGED] =
 		g_signal_new ("sorting_changed",
@@ -735,32 +747,10 @@ etta_class_init (ETreeTableAdapterClass *klass)
 static void
 etta_init (ETreeTableAdapter *etta)
 {
-	etta->priv                           = g_new (ETreeTableAdapterPriv, 1);
-
-	etta->priv->source                   = NULL;
-	etta->priv->sort_info                = NULL;
+	etta->priv = E_TREE_TABLE_ADAPTER_GET_PRIVATE (etta);
 
-	etta->priv->n_map                    = 0;
-	etta->priv->n_vals_allocated         = 0;
-	etta->priv->map_table                = NULL;
-	etta->priv->nodes                    = NULL;
-	etta->priv->root                     = NULL;
-
-	etta->priv->root_visible             = TRUE;
-	etta->priv->remap_needed             = TRUE;
-
-	etta->priv->pre_change_id            = 0;
-	etta->priv->no_change_id             = 0;
-	etta->priv->rebuilt_id		     = 0;
-	etta->priv->node_changed_id          = 0;
-	etta->priv->node_data_changed_id     = 0;
-	etta->priv->node_col_changed_id      = 0;
-	etta->priv->node_inserted_id         = 0;
-	etta->priv->node_removed_id          = 0;
-	etta->priv->node_request_collapse_id = 0;
-
-	etta->priv->resort_idle_id           = 0;
-	etta->priv->force_expanded_state     = 0;
+	etta->priv->root_visible = TRUE;
+	etta->priv->remap_needed = TRUE;
 }
 
 static void
@@ -931,7 +921,7 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETa
 ETableModel *
 e_tree_table_adapter_new (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *header)
 {
-	ETreeTableAdapter *etta = g_object_new (E_TREE_TABLE_ADAPTER_TYPE, NULL);
+	ETreeTableAdapter *etta = g_object_new (E_TYPE_TREE_TABLE_ADAPTER, NULL);
 
 	e_tree_table_adapter_construct (etta, source, sort_info, header);
 
diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h
index b5fc2c0422..ea7b86b21d 100644
--- a/widgets/table/e-tree-table-adapter.h
+++ b/widgets/table/e-tree-table-adapter.h
@@ -24,81 +24,109 @@
 #ifndef _E_TREE_TABLE_ADAPTER_H_
 #define _E_TREE_TABLE_ADAPTER_H_
 
-#include <glib-object.h>
 #include <table/e-table-model.h>
 #include <table/e-tree-model.h>
 #include <table/e-table-sort-info.h>
 #include <table/e-table-header.h>
 #include <libxml/tree.h>
 
-G_BEGIN_DECLS
-
-#define E_TREE_TABLE_ADAPTER_TYPE        (e_tree_table_adapter_get_type ())
-#define E_TREE_TABLE_ADAPTER(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_TABLE_ADAPTER_TYPE, ETreeTableAdapter))
-#define E_TREE_TABLE_ADAPTER_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_TABLE_ADAPTER_TYPE, ETreeTableAdapterClass))
-#define E_IS_TREE_TABLE_ADAPTER(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_TABLE_ADAPTER_TYPE))
-#define E_IS_TREE_TABLE_ADAPTER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_TABLE_ADAPTER_TYPE))
-#define E_TREE_TABLE_ADAPTER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_TREE_TABLE_ADAPTER_TYPE, ETreeTableAdapterClass))
+/* Standard GObject macros */
+#define E_TYPE_TREE_TABLE_ADAPTER \
+	(e_tree_table_adapter_get_type ())
+#define E_TREE_TABLE_ADAPTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapter))
+#define E_TREE_TABLE_ADAPTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterClass))
+#define E_IS_TREE_TABLE_ADAPTER(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE_TABLE_ADAPTER))
+#define E_IS_TREE_TABLE_ADAPTER_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE_TABLE_ADAPTER))
+#define E_TREE_TABLE_ADAPTER_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterClass))
 
-typedef struct ETreeTableAdapterPriv ETreeTableAdapterPriv;
+G_BEGIN_DECLS
 
-typedef struct {
-	ETableModel  base;
+typedef struct _ETreeTableAdapter ETreeTableAdapter;
+typedef struct _ETreeTableAdapterClass ETreeTableAdapterClass;
+typedef struct _ETreeTableAdapterPrivate ETreeTableAdapterPrivate;
 
-	ETreeTableAdapterPriv *priv;
-} ETreeTableAdapter;
+struct _ETreeTableAdapter {
+	ETableModel parent;
+	ETreeTableAdapterPrivate *priv;
+};
 
-typedef struct {
+struct _ETreeTableAdapterClass {
 	ETableModelClass parent_class;
 
 	/* Signals */
-	gboolean (*sorting_changed) (ETreeTableAdapter *etta);
-} ETreeTableAdapterClass;
-
-GType        e_tree_table_adapter_get_type                   (void);
-ETableModel *e_tree_table_adapter_new                        (ETreeModel        *source,
-							      ETableSortInfo    *sort_info,
-							      ETableHeader	*header);
-ETableModel *e_tree_table_adapter_construct                  (ETreeTableAdapter *ets,
-							      ETreeModel        *source,
-							      ETableSortInfo    *sort_info,
-							      ETableHeader	*header);
-
-ETreePath    e_tree_table_adapter_node_get_next              (ETreeTableAdapter *etta,
-							      ETreePath          path);
-gboolean     e_tree_table_adapter_node_is_expanded           (ETreeTableAdapter *etta,
-							      ETreePath          path);
-void         e_tree_table_adapter_node_set_expanded          (ETreeTableAdapter *etta,
-							      ETreePath          path,
-							      gboolean           expanded);
-void         e_tree_table_adapter_node_set_expanded_recurse  (ETreeTableAdapter *etta,
-							      ETreePath          path,
-							      gboolean           expanded);
-void         e_tree_table_adapter_force_expanded_state       (ETreeTableAdapter *etta,
-							      gint state);
-void         e_tree_table_adapter_root_node_set_visible      (ETreeTableAdapter *etta,
-							      gboolean           visible);
-ETreePath    e_tree_table_adapter_node_at_row                (ETreeTableAdapter *etta,
-							      gint                row);
-gint          e_tree_table_adapter_row_of_node                (ETreeTableAdapter *etta,
-							      ETreePath          path);
-gboolean     e_tree_table_adapter_root_node_is_visible       (ETreeTableAdapter *etta);
-
-void         e_tree_table_adapter_show_node                  (ETreeTableAdapter *etta,
-							      ETreePath          path);
-
-void         e_tree_table_adapter_save_expanded_state        (ETreeTableAdapter *etta,
-							      const gchar        *filename);
-void         e_tree_table_adapter_load_expanded_state        (ETreeTableAdapter *etta,
-							      const gchar        *filename);
-
-xmlDoc      *e_tree_table_adapter_save_expanded_state_xml    (ETreeTableAdapter *etta);
-void         e_tree_table_adapter_load_expanded_state_xml    (ETreeTableAdapter *etta, xmlDoc *doc);
-
-void         e_tree_table_adapter_set_sort_info              (ETreeTableAdapter *etta,
-							      ETableSortInfo    *sort_info);
-ETableSortInfo *e_tree_table_adapter_get_sort_info	     (ETreeTableAdapter *etta);
-ETableHeader *e_tree_table_adapter_get_header		     (ETreeTableAdapter *etta);
+	gboolean	(*sorting_changed)	(ETreeTableAdapter *etta);
+};
+
+GType		e_tree_table_adapter_get_type	(void) G_GNUC_CONST;
+ETableModel *	e_tree_table_adapter_new	(ETreeModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader *header);
+ETableModel *	e_tree_table_adapter_construct	(ETreeTableAdapter *ets,
+						 ETreeModel *source,
+						 ETableSortInfo *sort_info,
+						 ETableHeader	*header);
+
+ETreePath	e_tree_table_adapter_node_get_next
+						(ETreeTableAdapter *etta,
+						 ETreePath path);
+gboolean	e_tree_table_adapter_node_is_expanded
+						(ETreeTableAdapter *etta,
+						 ETreePath path);
+void		e_tree_table_adapter_node_set_expanded
+						(ETreeTableAdapter *etta,
+						 ETreePath path,
+						 gboolean expanded);
+void		e_tree_table_adapter_node_set_expanded_recurse
+						(ETreeTableAdapter *etta,
+						 ETreePath path,
+						 gboolean expanded);
+void		e_tree_table_adapter_force_expanded_state
+						(ETreeTableAdapter *etta,
+						 gint state);
+void		e_tree_table_adapter_root_node_set_visible
+						(ETreeTableAdapter *etta,
+						 gboolean visible);
+ETreePath	e_tree_table_adapter_node_at_row
+						(ETreeTableAdapter *etta,
+						 gint row);
+gint		e_tree_table_adapter_row_of_node
+						(ETreeTableAdapter *etta,
+						 ETreePath path);
+gboolean	e_tree_table_adapter_root_node_is_visible
+						(ETreeTableAdapter *etta);
+
+void		e_tree_table_adapter_show_node	(ETreeTableAdapter *etta,
+						 ETreePath path);
+
+void		e_tree_table_adapter_save_expanded_state
+						(ETreeTableAdapter *etta,
+						 const gchar *filename);
+void		e_tree_table_adapter_load_expanded_state
+						(ETreeTableAdapter *etta,
+						 const gchar *filename);
+
+xmlDoc *	e_tree_table_adapter_save_expanded_state_xml
+						(ETreeTableAdapter *etta);
+void		e_tree_table_adapter_load_expanded_state_xml
+						(ETreeTableAdapter *etta,
+						 xmlDoc *doc);
+
+void		e_tree_table_adapter_set_sort_info
+						(ETreeTableAdapter *etta,
+						 ETableSortInfo *sort_info);
+ETableSortInfo *e_tree_table_adapter_get_sort_info
+						 (ETreeTableAdapter *etta);
+ETableHeader *	e_tree_table_adapter_get_header	 (ETreeTableAdapter *etta);
 
 G_END_DECLS
 
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index f19a9a7cfc..bcad41a797 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -59,6 +59,10 @@
 
 #define d(x)
 
+#define E_TREE_GET_PRIVATE(obj) \
+	(G_TYPE_INSTANCE_GET_PRIVATE \
+	((obj), E_TYPE_TREE, ETreePrivate))
+
 enum {
 	CURSOR_CHANGE,
 	CURSOR_ACTIVATED,
@@ -107,7 +111,7 @@ enum {
 	ET_SCROLL_RIGHT = 1 << 3
 };
 
-struct ETreePriv {
+struct _ETreePrivate {
 	ETreeModel *model;
 	ETreeTableAdapter *etta;
 
@@ -379,70 +383,94 @@ connect_header (ETree *e_tree, ETableState *state)
 static void
 et_dispose (GObject *object)
 {
-	ETree *et = E_TREE (object);
+	ETreePrivate *priv;
 
-	if (et->priv) {
+	priv = E_TREE_GET_PRIVATE (object);
 
-		if (et->priv->search) {
-			if (et->priv->search_search_id)
-				g_signal_handler_disconnect (et->priv->search,
-							     et->priv->search_search_id);
-			if (et->priv->search_accept_id)
-				g_signal_handler_disconnect (et->priv->search,
-							     et->priv->search_accept_id);
-			g_object_unref (et->priv->search);
-		}
+	if (priv->search != NULL) {
+		g_signal_handler_disconnect (
+			priv->search, priv->search_search_id);
+		g_signal_handler_disconnect (
+			priv->search, priv->search_accept_id);
+		g_object_unref (priv->search);
+		priv->search = NULL;
+	}
 
-		if (et->priv->reflow_idle_id)
-			g_source_remove (et->priv->reflow_idle_id);
-		et->priv->reflow_idle_id = 0;
+	if (priv->reflow_idle_id > 0) {
+		g_source_remove (priv->reflow_idle_id);
+		priv->reflow_idle_id = 0;
+	}
 
-		scroll_off (et);
-		hover_off (et);
-		g_list_foreach (
-			et->priv->expanded_list,
-			(GFunc) g_free, NULL);
-		g_list_free (et->priv->expanded_list);
-
-		et_disconnect_from_etta (et);
-
-		g_object_unref (et->priv->etta);
-		g_object_unref (et->priv->model);
-		g_object_unref (et->priv->full_header);
-		disconnect_header (et);
-		g_object_unref (et->priv->selection);
-		if (et->priv->spec)
-			g_object_unref (et->priv->spec);
-		et->priv->spec = NULL;
-
-		if (et->priv->sorter)
-			g_object_unref (et->priv->sorter);
-		et->priv->sorter = NULL;
-
-		if (et->priv->header_canvas)
-			gtk_widget_destroy (GTK_WIDGET (et->priv->header_canvas));
-		et->priv->header_canvas = NULL;
-
-		if (et->priv->site)
-			e_tree_drag_source_unset (et);
-
-		if (et->priv->last_drop_context)
-			g_object_weak_unref (G_OBJECT (et->priv->last_drop_context), context_destroyed, et);
-		et->priv->last_drop_context = NULL;
+	scroll_off (E_TREE (object));
+	hover_off (E_TREE (object));
+	g_list_foreach (
+		priv->expanded_list,
+		(GFunc) g_free, NULL);
+	g_list_free (priv->expanded_list);
+	priv->expanded_list = NULL;
+
+	et_disconnect_from_etta (E_TREE (object));
 
-		if (et->priv->info_text)
-			g_object_run_dispose (G_OBJECT (et->priv->info_text));
-		et->priv->info_text = NULL;
-		et->priv->info_text_resize_id = 0;
+	if (priv->etta != NULL) {
+		g_object_unref (priv->etta);
+		priv->etta = NULL;
+	}
+
+	if (priv->model != NULL) {
+		g_object_unref (priv->model);
+		priv->model = NULL;
+	}
+
+	if (priv->full_header != NULL) {
+		g_object_unref (priv->full_header);
+		priv->full_header = NULL;
+	}
+
+	disconnect_header (E_TREE (object));
+
+	if (priv->selection != NULL) {
+		g_object_unref (priv->selection);
+		priv->selection = NULL;
+	}
+
+	if (priv->spec != NULL) {
+		g_object_unref (priv->spec);
+		priv->spec = NULL;
+	}
+
+	if (priv->sorter != NULL) {
+		g_object_unref (priv->sorter);
+		priv->sorter = NULL;
+	}
+
+	if (priv->header_canvas != NULL) {
+		gtk_widget_destroy (GTK_WIDGET (priv->header_canvas));
+		priv->header_canvas = NULL;
+	}
 
-		gtk_widget_destroy (GTK_WIDGET (et->priv->table_canvas));
+	if (priv->site)
+		e_tree_drag_source_unset (E_TREE (object));
 
-		g_free (et->priv);
-		et->priv = NULL;
+	if (priv->last_drop_context != NULL) {
+		g_object_weak_unref (
+			G_OBJECT (priv->last_drop_context),
+			context_destroyed, object);
+		priv->last_drop_context = NULL;
 	}
 
-	if (G_OBJECT_CLASS (e_tree_parent_class)->dispose)
-		G_OBJECT_CLASS (e_tree_parent_class)->dispose (object);
+	if (priv->info_text != NULL) {
+		g_object_run_dispose (G_OBJECT (priv->info_text));
+		priv->info_text = NULL;
+	}
+	priv->info_text_resize_id = 0;
+
+	if (priv->table_canvas != NULL) {
+		gtk_widget_destroy (GTK_WIDGET (priv->table_canvas));
+		priv->table_canvas = NULL;
+	}
+
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_tree_parent_class)->dispose (object);
 }
 
 static void
@@ -555,65 +583,20 @@ e_tree_init (ETree *e_tree)
 
 	gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE);
 
-	e_tree->priv                         = g_new (ETreePriv, 1);
-
-	e_tree->priv->model                  = NULL;
-	e_tree->priv->etta                   = NULL;
-
-	e_tree->priv->full_header            = NULL;
-	e_tree->priv->header                 = NULL;
-
-	e_tree->priv->structure_change_id    = 0;
-	e_tree->priv->expansion_change_id    = 0;
-	e_tree->priv->sort_info_change_id    = 0;
-	e_tree->priv->group_info_change_id   = 0;
-
-	e_tree->priv->sort_info              = NULL;
-	e_tree->priv->sorter                 = NULL;
-	e_tree->priv->reflow_idle_id         = 0;
-	e_tree->priv->scroll_idle_id         = 0;
-	e_tree->priv->hover_idle_id          = 0;
-
-	e_tree->priv->show_cursor_after_reflow = FALSE;
-
-	e_tree->priv->table_model_change_id  = 0;
-	e_tree->priv->table_row_change_id    = 0;
-	e_tree->priv->table_cell_change_id   = 0;
-	e_tree->priv->table_rows_delete_id   = 0;
+	e_tree->priv = E_TREE_GET_PRIVATE (e_tree);
 
 	e_tree->priv->alternating_row_colors = 1;
-	e_tree->priv->horizontal_draw_grid   = 1;
-	e_tree->priv->vertical_draw_grid     = 1;
-	e_tree->priv->draw_focus             = 1;
-	e_tree->priv->cursor_mode            = E_CURSOR_SIMPLE;
-	e_tree->priv->length_threshold       = 200;
-	e_tree->priv->uniform_row_height     = FALSE;
-
-	e_tree->priv->row_selection_active   = FALSE;
-	e_tree->priv->horizontal_scrolling   = FALSE;
-	e_tree->priv->scroll_direction       = 0;
+	e_tree->priv->horizontal_draw_grid = 1;
+	e_tree->priv->vertical_draw_grid = 1;
+	e_tree->priv->draw_focus = 1;
+	e_tree->priv->cursor_mode = E_CURSOR_SIMPLE;
+	e_tree->priv->length_threshold = 200;
 
-	e_tree->priv->drop_row               = -1;
-	e_tree->priv->drop_path              = NULL;
-	e_tree->priv->drop_col               = -1;
-	e_tree->priv->drop_highlight         = NULL;
+	e_tree->priv->drop_row = -1;
+	e_tree->priv->drop_col = -1;
 
-	e_tree->priv->last_drop_x            = 0;
-	e_tree->priv->last_drop_y            = 0;
-	e_tree->priv->last_drop_time         = 0;
-	e_tree->priv->last_drop_context      = NULL;
-
-	e_tree->priv->hover_x                = 0;
-	e_tree->priv->hover_y                = 0;
-
-	e_tree->priv->drag_row               = -1;
-	e_tree->priv->drag_path              = NULL;
-	e_tree->priv->drag_col               = -1;
-
-	e_tree->priv->expanded_list          = NULL;
-
-	e_tree->priv->site                   = NULL;
-	e_tree->priv->do_drag                = FALSE;
+	e_tree->priv->drag_row = -1;
+	e_tree->priv->drag_col = -1;
 
 #ifdef E_TREE_USE_TREE_SELECTION
 	e_tree->priv->selection =
@@ -622,32 +605,17 @@ e_tree_init (ETree *e_tree)
 	e_tree->priv->selection =
 		E_SELECTION_MODEL (e_table_selection_model_new ());
 #endif
-	e_tree->priv->spec                   = NULL;
-
-	e_tree->priv->info_text              = NULL;
-	e_tree->priv->info_text_resize_id    = 0;
-
-	e_tree->priv->header_canvas          = NULL;
-	e_tree->priv->table_canvas           = NULL;
 
-	e_tree->priv->header_item            = NULL;
-	e_tree->priv->root                   = NULL;
+	e_tree->priv->search = e_table_search_new ();
 
-	e_tree->priv->white_item             = NULL;
-	e_tree->priv->item                   = NULL;
-
-	e_tree->priv->search                 = e_table_search_new ();
-
-	e_tree->priv->search_search_id       =
+	e_tree->priv->search_search_id =
 		g_signal_connect (G_OBJECT (e_tree->priv->search), "search",
-				  G_CALLBACK (et_search_search), e_tree);
-	e_tree->priv->search_accept_id       =
+				 G_CALLBACK (et_search_search), e_tree);
+	e_tree->priv->search_accept_id =
 		g_signal_connect (G_OBJECT (e_tree->priv->search), "accept",
-				  G_CALLBACK (et_search_accept), e_tree);
+				 G_CALLBACK (et_search_accept), e_tree);
 
-	e_tree->priv->current_search_col     = NULL;
-	e_tree->priv->search_col_set         = FALSE;
-	e_tree->priv->always_search          = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE;
+	e_tree->priv->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE;
 }
 
 /* Grab_focus handler for the ETree */
@@ -1747,7 +1715,7 @@ e_tree_new (ETreeModel *etm, ETableExtras *ete, const gchar *spec, const gchar *
 	g_return_val_if_fail (ete == NULL || E_IS_TABLE_EXTRAS (ete), NULL);
 	g_return_val_if_fail (spec != NULL, NULL);
 
-	e_tree = g_object_new (E_TREE_TYPE, NULL);
+	e_tree = g_object_new (E_TYPE_TREE, NULL);
 
 	if (!e_tree_construct (e_tree, etm, ete, spec, state)) {
 		g_object_unref (e_tree);
@@ -1790,7 +1758,7 @@ e_tree_new_from_spec_file (ETreeModel *etm,
 	g_return_val_if_fail (ete == NULL || E_IS_TABLE_EXTRAS (ete), NULL);
 	g_return_val_if_fail (spec_fn != NULL, NULL);
 
-	e_tree = g_object_new (E_TREE_TYPE, NULL);
+	e_tree = g_object_new (E_TYPE_TREE, NULL);
 
 	if (!e_tree_construct_from_spec_file (e_tree, etm, ete, spec_fn, state_fn)) {
 		g_object_unref (e_tree);
@@ -2035,7 +2003,8 @@ set_scroll_adjustments   (ETree *tree,
 	if (hadjustment != NULL)
 		gtk_adjustment_set_step_increment (hadjustment, 20);
 
-	if (tree->priv) {
+	/* XXX This can be called after our dispose() method has run. */
+	if (tree->priv->table_canvas != NULL) {
 		GtkScrollable *scrollable;
 
 		scrollable = GTK_SCROLLABLE (tree->priv->table_canvas);
@@ -3275,38 +3244,20 @@ e_tree_class_init (ETreeClass *class)
 	GObjectClass *object_class;
 	GtkWidgetClass *widget_class;
 
-	object_class                   = (GObjectClass *) class;
-	widget_class                   = (GtkWidgetClass *) class;
-
-	object_class->dispose          = et_dispose;
-	object_class->set_property     = et_set_property;
-	object_class->get_property     = et_get_property;
-
-	widget_class->grab_focus       = et_grab_focus;
-	widget_class->unrealize        = et_unrealize;
-	widget_class->style_set        = et_canvas_style_set;
-	widget_class->focus            = et_focus;
-
-	class->cursor_change           = NULL;
-	class->cursor_activated        = NULL;
-	class->selection_change        = NULL;
-	class->double_click            = NULL;
-	class->right_click             = NULL;
-	class->click                   = NULL;
-	class->key_press               = NULL;
-	class->start_drag              = et_real_start_drag;
-	class->state_change            = NULL;
-	class->white_space_event       = NULL;
-
-	class->tree_drag_begin         = NULL;
-	class->tree_drag_end           = NULL;
-	class->tree_drag_data_get      = NULL;
-	class->tree_drag_data_delete   = NULL;
-
-	class->tree_drag_leave         = NULL;
-	class->tree_drag_motion        = NULL;
-	class->tree_drag_drop          = NULL;
-	class->tree_drag_data_received = NULL;
+	g_type_class_add_private (class, sizeof (ETreePrivate));
+
+	object_class = G_OBJECT_CLASS (class);
+	object_class->dispose = et_dispose;
+	object_class->set_property = et_set_property;
+	object_class->get_property = et_get_property;
+
+	widget_class = GTK_WIDGET_CLASS (class);
+	widget_class->grab_focus = et_grab_focus;
+	widget_class->unrealize = et_unrealize;
+	widget_class->style_set = et_canvas_style_set;
+	widget_class->focus = et_focus;
+
+	class->start_drag = et_real_start_drag;
 
 	et_signals[CURSOR_CHANGE] =
 		g_signal_new ("cursor_change",
@@ -3557,7 +3508,7 @@ e_tree_class_init (ETreeClass *class)
 					 g_param_spec_object ("ETreeTableAdapter",
 							      "ETree table adapter",
 							      "ETree table adapter",
-							      E_TREE_TABLE_ADAPTER_TYPE,
+							      E_TYPE_TREE_TABLE_ADAPTER,
 							      G_PARAM_READABLE));
 
 	g_object_class_install_property (object_class, PROP_UNIFORM_ROW_HEIGHT,
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 345aa34336..533ab588f5 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -41,279 +41,331 @@
 #include <table/e-tree-selection-model.h>
 #endif
 
+/* Standard GObject macros */
+#define E_TYPE_TREE \
+	(e_tree_get_type ())
+#define E_TREE(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), E_TYPE_TREE, ETree))
+#define E_TREE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), E_TYPE_TREE, ETreeClass))
+#define E_IS_TREE(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), E_TYPE_TREE))
+#define E_IS_TREE_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), E_TYPE_TREE))
+#define E_TREE_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), E_TYPE_TREE))
+
 G_BEGIN_DECLS
 
-#define E_TREE_TYPE        (e_tree_get_type ())
-#define E_TREE(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_TYPE, ETree))
-#define E_TREE_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_TYPE, ETreeClass))
-#define E_IS_TREE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_TYPE))
-#define E_IS_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_TYPE))
 typedef struct _ETreeDragSourceSite ETreeDragSourceSite;
-typedef struct ETreePriv ETreePriv;
 
-typedef struct {
-	GtkTable parent;
+typedef struct _ETree ETree;
+typedef struct _ETreeClass ETreeClass;
+typedef struct _ETreePrivate ETreePrivate;
 
-	ETreePriv *priv;
-} ETree;
+struct _ETree {
+	GtkTable parent;
+	ETreePrivate *priv;
+};
 
-typedef struct {
+struct _ETreeClass {
 	GtkTableClass parent_class;
 
-	void        (*cursor_change)      (ETree *et, gint row, ETreePath path);
-	void        (*cursor_activated)   (ETree *et, gint row, ETreePath path);
-	void        (*selection_change)   (ETree *et);
-	void        (*double_click)       (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event);
-	gboolean    (*right_click)        (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event);
-	gboolean    (*click)              (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event);
-	gboolean    (*key_press)          (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event);
-	gboolean    (*start_drag)         (ETree *et, gint row, ETreePath path, gint col, GdkEvent *event);
-	void        (*state_change)       (ETree *et);
-	gboolean    (*white_space_event)  (ETree *et, GdkEvent *event);
-
-	void  (*set_scroll_adjustments)   (ETree	 *tree,
-					   GtkAdjustment *hadjustment,
-					   GtkAdjustment *vadjustment);
+	void		(*cursor_change)	(ETree *et,
+						 gint row,
+						 ETreePath path);
+	void		(*cursor_activated)	(ETree *et,
+						 gint row,
+						 ETreePath path);
+	void		(*selection_change)	(ETree *et);
+	void		(*double_click)		(ETree *et,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*right_click)		(ETree *et,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*click)		(ETree *et,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*key_press)		(ETree *et,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkEvent *event);
+	gboolean	(*start_drag)		(ETree *et,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkEvent *event);
+	void		(*state_change)		(ETree *et);
+	gboolean	(*white_space_event)	(ETree *et,
+						 GdkEvent *event);
+
+	void		(*set_scroll_adjustments)
+						(ETree	 *tree,
+						 GtkAdjustment *hadjustment,
+						 GtkAdjustment *vadjustment);
 
 	/* Source side drag signals */
-	void (* tree_drag_begin)		   (ETree	       *tree,
-						    gint                 row,
-						    ETreePath           path,
-						    gint                 col,
-						    GdkDragContext     *context);
-	void (* tree_drag_end)		   (ETree	       *tree,
-					    gint                 row,
-					    ETreePath           path,
-					    gint                 col,
-					    GdkDragContext     *context);
-	void (* tree_drag_data_get)             (ETree             *tree,
-						 gint                 row,
-						 ETreePath           path,
-						 gint                 col,
-						 GdkDragContext     *context,
-						 GtkSelectionData   *selection_data,
-						 guint               info,
-						 guint               time);
-	void (* tree_drag_data_delete)          (ETree	       *tree,
-						 gint                 row,
-						 ETreePath           path,
-						 gint                 col,
-						 GdkDragContext     *context);
+	void		(*tree_drag_begin)	(ETree	 *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context);
+	void		(*tree_drag_end)	(ETree	 *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context);
+	void		(*tree_drag_data_get)	(ETree *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context,
+						 GtkSelectionData *selection_data,
+						 guint info,
+						 guint time);
+	void		(*tree_drag_data_delete)
+						(ETree	 *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context);
 
 	/* Target side drag signals */
-	void (* tree_drag_leave)		   (ETree	       *tree,
-						    gint                 row,
-						    ETreePath           path,
-						    gint                 col,
-						    GdkDragContext     *context,
-						    guint               time);
-	gboolean (* tree_drag_motion)           (ETree	       *tree,
-						 gint                 row,
-						 ETreePath           path,
-						 gint                 col,
-						 GdkDragContext     *context,
-						 gint                x,
-						 gint                y,
-						 guint               time);
-	gboolean (* tree_drag_drop)             (ETree	       *tree,
-						 gint                 row,
-						 ETreePath           path,
-						 gint                 col,
-						 GdkDragContext     *context,
-						 gint                x,
-						 gint                y,
-						 guint               time);
-	void (* tree_drag_data_received)        (ETree             *tree,
-						 gint                 row,
-						 ETreePath           path,
-						 gint                 col,
-						 GdkDragContext     *context,
-						 gint                x,
-						 gint                y,
-						 GtkSelectionData   *selection_data,
-						 guint               info,
-						 guint               time);
-} ETreeClass;
-
-GType           e_tree_get_type                   (void);
-gboolean	e_tree_construct                  (ETree                *e_tree,
-						   ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const gchar           *spec,
-						   const gchar           *state);
-GtkWidget      *e_tree_new                        (ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const gchar           *spec,
-						   const gchar           *state);
+	void		(*tree_drag_leave)	(ETree	 *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context,
+						 guint time);
+	gboolean	(*tree_drag_motion)	(ETree	 *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context,
+						 gint x,
+						 gint y,
+						 guint time);
+	gboolean	(*tree_drag_drop)	(ETree	 *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context,
+						 gint x,
+						 gint y,
+						 guint time);
+	void		(*tree_drag_data_received)
+						(ETree *tree,
+						 gint row,
+						 ETreePath path,
+						 gint col,
+						 GdkDragContext *context,
+						 gint x,
+						 gint y,
+						 GtkSelectionData *selection_data,
+						 guint info,
+						 guint time);
+};
+
+GType		e_tree_get_type			(void) G_GNUC_CONST;
+gboolean	e_tree_construct		(ETree *e_tree,
+						 ETreeModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec,
+						 const gchar *state);
+GtkWidget *	e_tree_new			(ETreeModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec,
+						 const gchar *state);
 
 /* Create an ETree using files. */
-gboolean	e_tree_construct_from_spec_file   (ETree                *e_tree,
-						   ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const gchar           *spec_fn,
-						   const gchar           *state_fn);
-GtkWidget      *e_tree_new_from_spec_file         (ETreeModel           *etm,
-						   ETableExtras         *ete,
-						   const gchar           *spec_fn,
-						   const gchar           *state_fn);
+gboolean	e_tree_construct_from_spec_file	(ETree *e_tree,
+						 ETreeModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec_fn,
+						 const gchar *state_fn);
+GtkWidget *	e_tree_new_from_spec_file	(ETreeModel *etm,
+						 ETableExtras *ete,
+						 const gchar *spec_fn,
+						 const gchar *state_fn);
 
 /* To save the state */
-gchar          *e_tree_get_state                  (ETree                *e_tree);
-void            e_tree_save_state                 (ETree                *e_tree,
-						   const gchar          *filename);
-ETableState    *e_tree_get_state_object           (ETree                *e_tree);
-ETableSpecification    *e_tree_get_spec           (ETree                *e_tree);
+gchar *		e_tree_get_state		(ETree *e_tree);
+void		e_tree_save_state		(ETree *e_tree,
+						 const gchar *filename);
+ETableState *	e_tree_get_state_object		(ETree *e_tree);
+ETableSpecification *
+		e_tree_get_spec			(ETree *e_tree);
 
 /* note that it is more efficient to provide the state at creation time */
-void            e_tree_set_search_column          (ETree *e_tree,
-						   gint  col);
-void            e_tree_set_state                  (ETree                *e_tree,
-						   const gchar          *state);
-void            e_tree_set_state_object           (ETree                *e_tree,
-						   ETableState          *state);
-void            e_tree_load_state                 (ETree                *e_tree,
-						   const gchar          *filename);
-void		e_tree_show_cursor_after_reflow   (ETree *e_tree);
-
-void            e_tree_set_cursor                 (ETree                *e_tree,
-						   ETreePath             path);
+void		e_tree_set_search_column	(ETree *e_tree,
+						 gint col);
+void		e_tree_set_state		(ETree *e_tree,
+						 const gchar *state);
+void		e_tree_set_state_object		(ETree *e_tree,
+						 ETableState *state);
+void		e_tree_load_state		(ETree *e_tree,
+						 const gchar *filename);
+void		e_tree_show_cursor_after_reflow	(ETree *e_tree);
+
+void		e_tree_set_cursor		(ETree *e_tree,
+						 ETreePath path);
 
 /* NULL means we don't have the cursor. */
-ETreePath       e_tree_get_cursor                 (ETree                *e_tree);
-void            e_tree_selected_row_foreach       (ETree                *e_tree,
-						   EForeachFunc          callback,
-						   gpointer              closure);
+ETreePath	e_tree_get_cursor		(ETree *e_tree);
+void		e_tree_selected_row_foreach	(ETree *e_tree,
+						 EForeachFunc callback,
+						 gpointer closure);
 #ifdef E_TREE_USE_TREE_SELECTION
-void            e_tree_selected_path_foreach      (ETree                *e_tree,
-						   ETreeForeachFunc      callback,
-						   gpointer              closure);
-void            e_tree_path_foreach               (ETree                *e_tree,
-						   ETreeForeachFunc      callback,
-						   gpointer              closure);
+void		e_tree_selected_path_foreach	(ETree *e_tree,
+						 ETreeForeachFunc callback,
+						 gpointer closure);
+void		e_tree_path_foreach		(ETree *e_tree,
+						 ETreeForeachFunc callback,
+						 gpointer closure);
 #endif
-gint            e_tree_selected_count             (ETree                *e_tree);
-EPrintable     *e_tree_get_printable              (ETree                *e_tree);
-gint            e_tree_get_next_row               (ETree                *e_tree,
-						   gint                  model_row);
-gint            e_tree_get_prev_row               (ETree                *e_tree,
-						   gint                  model_row);
-gint            e_tree_model_to_view_row          (ETree                *e_tree,
-						   gint                  model_row);
-gint            e_tree_view_to_model_row          (ETree                *e_tree,
-						   gint                  view_row);
-void            e_tree_get_cell_at                (ETree                *tree,
-						   gint                   x,
-						   gint                   y,
-						   gint                  *row_return,
-						   gint                  *col_return);
-void            e_tree_get_cell_geometry          (ETree                *tree,
-						   gint                   row,
-						   gint                   col,
-						   gint                  *x_return,
-						   gint                  *y_return,
-						   gint                  *width_return,
-						   gint                  *height_return);
+gint		e_tree_selected_count		(ETree *e_tree);
+EPrintable *e_tree_get_printable		(ETree *e_tree);
+gint		e_tree_get_next_row		(ETree *e_tree,
+						 gint model_row);
+gint		e_tree_get_prev_row		(ETree *e_tree,
+						 gint model_row);
+gint		e_tree_model_to_view_row	(ETree *e_tree,
+						 gint model_row);
+gint		e_tree_view_to_model_row	(ETree *e_tree,
+						 gint view_row);
+void		e_tree_get_cell_at		(ETree *tree,
+						 gint x,
+						 gint y,
+						 gint *row_return,
+						 gint *col_return);
+void		e_tree_get_cell_geometry	(ETree *tree,
+						 gint row,
+						 gint col,
+						 gint *x_return,
+						 gint *y_return,
+						 gint *width_return,
+						 gint *height_return);
 
 /* Useful accessors */
-ETreeModel *    e_tree_get_model                  (ETree *et);
-ESelectionModel *e_tree_get_selection_model       (ETree *et);
-ETreeTableAdapter *e_tree_get_table_adapter       (ETree *et);
+ETreeModel *	e_tree_get_model		(ETree *et);
+ESelectionModel *
+		e_tree_get_selection_model	(ETree *et);
+ETreeTableAdapter *
+		e_tree_get_table_adapter	(ETree *et);
 
 /* Drag & drop stuff. */
 /* Target */
-void            e_tree_drag_get_data              (ETree                *tree,
-						   gint                   row,
-						   gint                   col,
-						   GdkDragContext       *context,
-						   GdkAtom               target,
-						   guint32               time);
-void            e_tree_drag_highlight             (ETree                *tree,
-						   gint                   row,
-						   gint                   col); /* col == -1 to highlight entire row. */
-void            e_tree_drag_unhighlight           (ETree                *tree);
-void            e_tree_drag_dest_set              (ETree                *tree,
-						   GtkDestDefaults       flags,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_tree_drag_dest_set_proxy        (ETree                *tree,
-						   GdkWindow            *proxy_window,
-						   GdkDragProtocol       protocol,
-						   gboolean              use_coordinates);
+void		e_tree_drag_get_data		(ETree *tree,
+						 gint row,
+						 gint col,
+						 GdkDragContext *context,
+						 GdkAtom target,
+						 guint32 time);
+void		e_tree_drag_highlight		(ETree *tree,
+						 gint row,
+						 gint col); /* col == -1 to highlight entire row. */
+void		e_tree_drag_unhighlight		(ETree *tree);
+void		e_tree_drag_dest_set		(ETree *tree,
+						 GtkDestDefaults flags,
+						 const GtkTargetEntry *targets,
+						 gint n_targets,
+						 GdkDragAction actions);
+void		e_tree_drag_dest_set_proxy	(ETree *tree,
+						 GdkWindow *proxy_window,
+						 GdkDragProtocol protocol,
+						 gboolean use_coordinates);
 
 /* There probably should be functions for setting the targets
  * as a GtkTargetList
  */
-void            e_tree_drag_dest_unset            (GtkWidget            *widget);
+void		e_tree_drag_dest_unset		(GtkWidget *widget);
 
 /* Source side */
-void            e_tree_drag_source_set            (ETree                *tree,
-						   GdkModifierType       start_button_mask,
-						   const GtkTargetEntry *targets,
-						   gint                  n_targets,
-						   GdkDragAction         actions);
-void            e_tree_drag_source_unset          (ETree                *tree);
+void		e_tree_drag_source_set		(ETree *tree,
+						 GdkModifierType start_button_mask,
+						 const GtkTargetEntry *targets,
+						 gint n_targets,
+						 GdkDragAction actions);
+void		e_tree_drag_source_unset	(ETree *tree);
 
 /* There probably should be functions for setting the targets
  * as a GtkTargetList
  */
-GdkDragContext *e_tree_drag_begin                 (ETree                *tree,
-						   gint                   row,
-						   gint                   col,
-						   GtkTargetList        *targets,
-						   GdkDragAction         actions,
-						   gint                  button,
-                                                   GdkEvent             *event);
+GdkDragContext *e_tree_drag_begin		(ETree *tree,
+						 gint row,
+						 gint col,
+						 GtkTargetList *targets,
+						 GdkDragAction actions,
+						 gint button,
+						 GdkEvent *event);
 
 /* Adapter functions */
-gboolean        e_tree_node_is_expanded           (ETree                *et,
-						   ETreePath             path);
-void            e_tree_node_set_expanded          (ETree                *et,
-						   ETreePath             path,
-						   gboolean              expanded);
-void            e_tree_node_set_expanded_recurse  (ETree                *et,
-						   ETreePath             path,
-						   gboolean              expanded);
-void            e_tree_root_node_set_visible      (ETree                *et,
-						   gboolean              visible);
-ETreePath       e_tree_node_at_row                (ETree                *et,
-						   gint                   row);
-gint             e_tree_row_of_node                (ETree                *et,
-						   ETreePath             path);
-gboolean        e_tree_root_node_is_visible       (ETree                *et);
-void            e_tree_show_node                  (ETree                *et,
-						   ETreePath             path);
-void            e_tree_save_expanded_state        (ETree                *et,
-						   gchar                 *filename);
-void            e_tree_load_expanded_state        (ETree                *et,
-						   gchar                 *filename);
-
-xmlDoc         *e_tree_save_expanded_state_xml    (ETree                *et);
-void            e_tree_load_expanded_state_xml    (ETree                *et, xmlDoc *doc);
-
-gint             e_tree_row_count                  (ETree                *et);
-GtkWidget      *e_tree_get_tooltip                (ETree                *et);
-void            e_tree_force_expanded_state       (ETree *et, gint state);
+gboolean	e_tree_node_is_expanded		(ETree *et,
+						 ETreePath path);
+void		e_tree_node_set_expanded	(ETree *et,
+						 ETreePath path,
+						 gboolean expanded);
+void		e_tree_node_set_expanded_recurse
+						(ETree *et,
+						 ETreePath path,
+						 gboolean expanded);
+void		e_tree_root_node_set_visible	(ETree *et,
+						 gboolean visible);
+ETreePath	e_tree_node_at_row		(ETree *et,
+						 gint row);
+gint		e_tree_row_of_node		(ETree *et,
+						 ETreePath path);
+gboolean	e_tree_root_node_is_visible	(ETree *et);
+void		e_tree_show_node		(ETree *et,
+						 ETreePath path);
+void		e_tree_save_expanded_state	(ETree *et,
+						 gchar *filename);
+void		e_tree_load_expanded_state	(ETree *et,
+						 gchar *filename);
+
+xmlDoc *	e_tree_save_expanded_state_xml	(ETree *et);
+void		e_tree_load_expanded_state_xml	(ETree *et,
+						 xmlDoc *doc);
+
+gint		e_tree_row_count		(ETree *et);
+GtkWidget *	e_tree_get_tooltip		(ETree *et);
+void		e_tree_force_expanded_state	(ETree *et,
+						 gint state);
 
 typedef enum {
 	E_TREE_FIND_NEXT_BACKWARD = 0,
-	E_TREE_FIND_NEXT_FORWARD  = 1 << 0,
-	E_TREE_FIND_NEXT_WRAP     = 1 << 1
+	E_TREE_FIND_NEXT_FORWARD = 1 << 0,
+	E_TREE_FIND_NEXT_WRAP = 1 << 1
 } ETreeFindNextParams;
 
-gboolean        e_tree_find_next                  (ETree                *et,
-						   ETreeFindNextParams   params,
-						   ETreePathFunc         func,
-						   gpointer              data);
+gboolean	e_tree_find_next		(ETree *et,
+						 ETreeFindNextParams params,
+						 ETreePathFunc func,
+						 gpointer data);
 
 /* This function is only needed in single_selection_mode. */
-void            e_tree_right_click_up             (ETree                *et);
+void		e_tree_right_click_up		(ETree *et);
 
-ETableItem *	e_tree_get_item (ETree * et);
+ETableItem *	e_tree_get_item			(ETree *et);
 
-GnomeCanvasItem * e_tree_get_header_item (ETree * et);
+GnomeCanvasItem *
+		e_tree_get_header_item		(ETree *et);
 
-void e_tree_set_info_message (ETree *tree, const gchar *info_message);
+void		e_tree_set_info_message		(ETree *tree,
+						 const gchar *info_message);
 
 G_END_DECLS
 
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index 92ee3a8322..a282f862e3 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -38,7 +38,7 @@
 static AtkObjectClass *parent_class = NULL;
 #define PARENT_TYPE (gal_a11y_e_cell_get_type ())
 
-static void gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *klass);
+static void gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *class);
 static void popup_cell_action (GalA11yECell *cell);
 
 /**
@@ -77,7 +77,7 @@ gal_a11y_e_cell_popup_get_type (void)
 }
 
 static void
-gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *klass)
+gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *class)
 {
 	parent_class = g_type_class_ref (PARENT_TYPE);
 }
diff --git a/widgets/table/gal-a11y-e-cell-popup.h b/widgets/table/gal-a11y-e-cell-popup.h
index b96aa9392c..fdf20802a1 100644
--- a/widgets/table/gal-a11y-e-cell-popup.h
+++ b/widgets/table/gal-a11y-e-cell-popup.h
@@ -24,7 +24,6 @@
 #ifndef __GAL_A11Y_E_CELL_POPUP_H__
 #define __GAL_A11Y_E_CELL_POPUP_H__
 
-#include <glib-object.h>
 #include <table/e-table-item.h>
 #include <table/gal-a11y-e-cell.h>
 #include <atk/atkgobjectaccessible.h>
diff --git a/widgets/table/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index c1c3b441e7..863813348d 100644
--- a/widgets/table/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
@@ -47,9 +47,9 @@ gal_a11y_e_cell_registry_finalize (GObject *obj)
 }
 
 static void
-gal_a11y_e_cell_registry_class_init (GalA11yECellRegistryClass *klass)
+gal_a11y_e_cell_registry_class_init (GalA11yECellRegistryClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
diff --git a/widgets/table/gal-a11y-e-cell-registry.h b/widgets/table/gal-a11y-e-cell-registry.h
index 189da02b02..de8b21b701 100644
--- a/widgets/table/gal-a11y-e-cell-registry.h
+++ b/widgets/table/gal-a11y-e-cell-registry.h
@@ -23,7 +23,6 @@
 #ifndef __GAL_A11Y_E_CELL_REGISTRY_H__
 #define __GAL_A11Y_E_CELL_REGISTRY_H__
 
-#include <glib-object.h>
 #include <atk/atkobject.h>
 #include <table/e-table-item.h>
 #include <table/e-cell.h>
diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index fcea3ec2a1..660a0ebd9a 100644
--- a/widgets/table/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
@@ -30,7 +30,7 @@
 #define PARENT_TYPE  (gal_a11y_e_cell_get_type ())
 static GObjectClass *parent_class;
 
-static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass);
+static void gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *class);
 
 static void
 gal_a11y_e_cell_toggle_dispose (GObject *object)
@@ -78,9 +78,9 @@ gal_a11y_e_cell_toggle_get_type (void)
 }
 
 static void
-gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass)
+gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	object_class->dispose      = gal_a11y_e_cell_toggle_dispose;
 	parent_class               = g_type_class_ref (PARENT_TYPE);
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 776fc692c6..1a95c46a90 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -144,7 +144,7 @@ ectr_do_action_collapse (AtkAction *action)
 }
 
 static void
-ectr_class_init (GalA11yECellTreeClass *klass)
+ectr_class_init (GalA11yECellTreeClass *class)
 {
 	a11y_parent_class        = g_type_class_ref (A11Y_PARENT_TYPE);
 }
diff --git a/widgets/table/gal-a11y-e-cell-tree.h b/widgets/table/gal-a11y-e-cell-tree.h
index fedd9e5fbd..18ccf9c7bc 100644
--- a/widgets/table/gal-a11y-e-cell-tree.h
+++ b/widgets/table/gal-a11y-e-cell-tree.h
@@ -23,7 +23,6 @@
 #ifndef __GAL_A11Y_E_CELL_TREE_H__
 #define __GAL_A11Y_E_CELL_TREE_H__
 
-#include <glib-object.h>
 #include <table/e-table-item.h>
 #include <table/e-cell-tree.h>
 #include "gal-a11y-e-cell.h"
diff --git a/widgets/table/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index df3e00bff4..1fa24f821a 100644
--- a/widgets/table/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
@@ -147,10 +147,10 @@ ecv_ref_accessible_at_point (AtkComponent *component,
 }
 
 static void
-ecv_class_init (GalA11yECellVboxClass *klass)
+ecv_class_init (GalA11yECellVboxClass *class)
 {
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	AtkObjectClass *a11y_class = ATK_OBJECT_CLASS (klass);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
+	AtkObjectClass *a11y_class = ATK_OBJECT_CLASS (class);
 	parent_class		   = g_type_class_ref (PARENT_TYPE);
 
 	object_class->dispose	   = ecv_dispose;
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index b2962ba96c..65a1fe9759 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -228,10 +228,10 @@ gal_a11y_e_cell_atk_component_iface_init (AtkComponentIface *iface)
 }
 
 static void
-gal_a11y_e_cell_class_init (GalA11yECellClass *klass)
+gal_a11y_e_cell_class_init (GalA11yECellClass *class)
 {
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class                          = g_type_class_ref (PARENT_TYPE);
 
diff --git a/widgets/table/gal-a11y-e-cell.h b/widgets/table/gal-a11y-e-cell.h
index aa02aff79c..48c7d2bec8 100644
--- a/widgets/table/gal-a11y-e-cell.h
+++ b/widgets/table/gal-a11y-e-cell.h
@@ -23,7 +23,6 @@
 #ifndef __GAL_A11Y_E_CELL_H__
 #define __GAL_A11Y_E_CELL_H__
 
-#include <glib-object.h>
 #include <table/e-table-item.h>
 #include <table/e-cell.h>
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index 1208241179..e13e6599b4 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
@@ -56,9 +56,9 @@ gal_a11y_e_table_click_to_add_factory_create_accessible (GObject *obj)
 }
 
 static void
-gal_a11y_e_table_click_to_add_factory_class_init (GalA11yETableClickToAddFactoryClass *klass)
+gal_a11y_e_table_click_to_add_factory_class_init (GalA11yETableClickToAddFactoryClass *class)
 {
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
+	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.h b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
index 5321ccd241..c8f9782a7e 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
@@ -23,7 +23,6 @@
 #ifndef __GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY_H__
 #define __GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY_H__
 
-#include <glib-object.h>
 #include <atk/atkobjectfactory.h>
 
 #define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY            (gal_a11y_e_table_item_factory_get_type ())
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 32bee99f07..05f145f6ed 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -181,9 +181,9 @@ etcta_ref_state_set (AtkObject *accessible)
 }
 
 static void
-etcta_class_init (GalA11yETableClickToAddClass *klass)
+etcta_class_init (GalA11yETableClickToAddClass *class)
 {
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
@@ -335,7 +335,7 @@ gal_a11y_e_table_click_to_add_init (void)
 {
 	if (atk_get_root ())
 		atk_registry_set_factory_type (atk_get_default_registry (),
-					E_TABLE_CLICK_TO_ADD_TYPE,
+					E_TYPE_TABLE_CLICK_TO_ADD,
 					gal_a11y_e_table_click_to_add_factory_get_type ());
 
 }
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.h b/widgets/table/gal-a11y-e-table-click-to-add.h
index 0d1507f79d..8d95a00baa 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add.h
@@ -22,7 +22,6 @@
 #ifndef __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__
 #define __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__
 
-#include <glib-object.h>
 #include <table/e-table-item.h>
 #include <atk/atkgobjectaccessible.h>
 
diff --git a/widgets/table/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index c2f3abe91a..6eec994eb2 100644
--- a/widgets/table/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
@@ -86,17 +86,17 @@ gal_a11y_e_table_column_header_dispose (GObject *object)
 }
 
 static void
-etch_class_init (GalA11yETableColumnHeaderClass *klass)
+etch_class_init (GalA11yETableColumnHeaderClass *class)
 {
-	AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
 	object_class->dispose = gal_a11y_e_table_column_header_dispose;
 
-	class->ref_state_set = gal_a11y_e_table_column_header_ref_state_set;
-	class->initialize = gal_a11y_e_table_column_header_real_initialize;
+	atk_object_class->ref_state_set = gal_a11y_e_table_column_header_ref_state_set;
+	atk_object_class->initialize = gal_a11y_e_table_column_header_real_initialize;
 }
 
 inline static GObject *
diff --git a/widgets/table/gal-a11y-e-table-column-header.h b/widgets/table/gal-a11y-e-table-column-header.h
index ec9a74b868..20d41004f2 100644
--- a/widgets/table/gal-a11y-e-table-column-header.h
+++ b/widgets/table/gal-a11y-e-table-column-header.h
@@ -24,7 +24,6 @@
 #ifndef __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__
 #define __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__
 
-#include <glib-object.h>
 #include <atk/atkgobjectaccessible.h>
 
 #define GAL_A11Y_TYPE_E_TABLE_COLUMN_HEADER            (gal_a11y_e_table_column_header_get_type ())
diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index 5e99c13bb9..face3ad06b 100644
--- a/widgets/table/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
@@ -48,9 +48,9 @@ gal_a11y_e_table_factory_create_accessible (GObject *obj)
 }
 
 static void
-gal_a11y_e_table_factory_class_init (GalA11yETableFactoryClass *klass)
+gal_a11y_e_table_factory_class_init (GalA11yETableFactoryClass *class)
 {
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
+	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
diff --git a/widgets/table/gal-a11y-e-table-factory.h b/widgets/table/gal-a11y-e-table-factory.h
index 6caf3d8beb..6f66e6b82a 100644
--- a/widgets/table/gal-a11y-e-table-factory.h
+++ b/widgets/table/gal-a11y-e-table-factory.h
@@ -24,7 +24,6 @@
 #ifndef __GAL_A11Y_E_TABLE_FACTORY_H__
 #define __GAL_A11Y_E_TABLE_FACTORY_H__
 
-#include <glib-object.h>
 #include <atk/atkobjectfactory.h>
 
 #define GAL_A11Y_TYPE_E_TABLE_FACTORY            (gal_a11y_e_table_factory_get_type ())
diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index 0b58e29add..c987b0068a 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
@@ -55,9 +55,9 @@ gal_a11y_e_table_item_factory_create_accessible (GObject *obj)
 }
 
 static void
-gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *klass)
+gal_a11y_e_table_item_factory_class_init (GalA11yETableItemFactoryClass *class)
 {
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
+	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
diff --git a/widgets/table/gal-a11y-e-table-item-factory.h b/widgets/table/gal-a11y-e-table-item-factory.h
index a08cfeb84b..c2995eaaf0 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.h
+++ b/widgets/table/gal-a11y-e-table-item-factory.h
@@ -23,7 +23,6 @@
 #ifndef __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
 #define __GAL_A11Y_E_TABLE_ITEM_FACTORY_H__
 
-#include <glib-object.h>
 #include <atk/atkobjectfactory.h>
 
 #define GAL_A11Y_TYPE_E_TABLE_ITEM_FACTORY            (gal_a11y_e_table_item_factory_get_type ())
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 3938bd02ec..218265ecdd 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -917,10 +917,10 @@ eti_real_initialize (AtkObject *obj,
 }
 
 static void
-eti_class_init (GalA11yETableItemClass *klass)
+eti_class_init (GalA11yETableItemClass *class)
 {
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class);
+	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
 	quark_accessible_object =
 		g_quark_from_static_string ("gtk-accessible-object");
@@ -1341,7 +1341,7 @@ gal_a11y_e_table_item_init (void)
 {
 	if (atk_get_root ())
 		atk_registry_set_factory_type (atk_get_default_registry (),
-					E_TABLE_ITEM_TYPE,
+					E_TYPE_TABLE_ITEM,
 					gal_a11y_e_table_item_factory_get_type ());
 }
 
diff --git a/widgets/table/gal-a11y-e-table-item.h b/widgets/table/gal-a11y-e-table-item.h
index 90861a14ec..b77c5c3e93 100644
--- a/widgets/table/gal-a11y-e-table-item.h
+++ b/widgets/table/gal-a11y-e-table-item.h
@@ -24,7 +24,6 @@
 #ifndef __GAL_A11Y_E_TABLE_ITEM_H__
 #define __GAL_A11Y_E_TABLE_ITEM_H__
 
-#include <glib-object.h>
 #include <table/e-table-item.h>
 #include <atk/atkgobjectaccessible.h>
 
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index 1bf522767b..7139b41fe3 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -200,9 +200,9 @@ et_get_layer (AtkComponent *component)
 }
 
 static void
-et_class_init (GalA11yETableClass *klass)
+et_class_init (GalA11yETableClass *class)
 {
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class);
 
 	parent_class                              = g_type_class_ref (PARENT_TYPE);
 
@@ -305,7 +305,7 @@ gal_a11y_e_table_init (void)
 {
 	if (atk_get_root ())
 		atk_registry_set_factory_type (atk_get_default_registry (),
-						E_TABLE_TYPE,
+						E_TYPE_TABLE,
 						gal_a11y_e_table_factory_get_type ());
 
 }
diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index e3cf441974..cf864ca283 100644
--- a/widgets/table/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
@@ -47,9 +47,9 @@ gal_a11y_e_tree_factory_create_accessible (GObject *obj)
 }
 
 static void
-gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *klass)
+gal_a11y_e_tree_factory_class_init (GalA11yETreeFactoryClass *class)
 {
-	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (klass);
+	AtkObjectFactoryClass *factory_class = ATK_OBJECT_FACTORY_CLASS (class);
 
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
diff --git a/widgets/table/gal-a11y-e-tree-factory.h b/widgets/table/gal-a11y-e-tree-factory.h
index 640261acf2..a2e44445a0 100644
--- a/widgets/table/gal-a11y-e-tree-factory.h
+++ b/widgets/table/gal-a11y-e-tree-factory.h
@@ -23,7 +23,6 @@
 #ifndef __GAL_A11Y_E_TREE_FACTORY_H__
 #define __GAL_A11Y_E_TREE_FACTORY_H__
 
-#include <glib-object.h>
 #include <atk/atkobjectfactory.h>
 
 #define GAL_A11Y_TYPE_E_TREE_FACTORY            (gal_a11y_e_table_factory_get_type ())
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index 87dc8f1618..193d3eb9d7 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -98,9 +98,9 @@ et_get_layer (AtkComponent *component)
 }
 
 static void
-et_class_init (GalA11yETreeClass *klass)
+et_class_init (GalA11yETreeClass *class)
 {
-	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (klass);
+	AtkObjectClass *atk_object_class = ATK_OBJECT_CLASS (class);
 
 	parent_class                              = g_type_class_ref (PARENT_TYPE);
 
@@ -190,7 +190,7 @@ gal_a11y_e_tree_init (void)
 {
 	if (atk_get_root ())
 		atk_registry_set_factory_type (atk_get_default_registry (),
-					E_TREE_TYPE,
+					E_TYPE_TREE,
 					gal_a11y_e_tree_factory_get_type ());
 
 }
-- 
cgit v1.2.3


From 753c60fc67a0a56a5f119c14ffa54ea9af95c208 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 9 Nov 2010 08:48:33 -0500
Subject: Drop backward-compatibility cruft.

---
 widgets/table/e-cell-combo.c            | 3 ---
 widgets/table/e-cell-date-edit.c        | 3 ---
 widgets/table/e-cell-popup.c            | 3 ---
 widgets/table/e-cell-text.c             | 7 ++-----
 widgets/table/e-cell-toggle.c           | 3 ---
 widgets/table/e-table-click-to-add.c    | 3 ---
 widgets/table/e-table-field-chooser.c   | 3 ---
 widgets/table/e-table-group-container.c | 3 ---
 widgets/table/e-table-header-item.c     | 3 ---
 widgets/table/e-table-item.c            | 3 ---
 widgets/table/e-table.c                 | 3 ---
 widgets/table/e-tree.c                  | 3 ---
 widgets/table/gal-a11y-e-cell-popup.c   | 3 ---
 widgets/table/gal-a11y-e-table.c        | 3 ---
 widgets/table/gal-a11y-e-tree.c         | 3 ---
 15 files changed, 2 insertions(+), 47 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 168061e4e7..a54f6c9c98 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -68,9 +68,6 @@
 #include "e-cell-combo.h"
 #include "e-cell-text.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 
 /* The height to make the popup list if there aren't any items in it. */
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index a71d3cc76c..770ac77f0a 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -48,9 +48,6 @@
 /* This depends on ECalendar which is why I didn't put it in gal. */
 #include <misc/e-calendar.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_cell_date_edit_get_property	(GObject	*object,
 						 guint		 property_id,
 						 GValue		*value,
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 5e89b6c37d..dfc9526885 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -41,9 +41,6 @@
 #include "e-table-item.h"
 #include <gtk/gtk.h>
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_CELL_POPUP_ARROW_WIDTH	16
 #define E_CELL_POPUP_ARROW_XPAD		3
 #define E_CELL_POPUP_ARROW_YPAD		3
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index a4160419ae..83338fc1e7 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -56,9 +56,6 @@
 #include "e-cell-text.h"
 #include "e-table-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define d(x)
 #define DO_SELECTION 1
 #define VIEW_TO_CELL(view) E_CELL_TEXT (((ECellView *)view)->ecell)
@@ -770,7 +767,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 
 	if (edit && edit->view_col == view_col && edit->row == row) {
 		if (edit->selection_start != edit->selection_end) {
-			GdkRegion *clip_region;
+			cairo_region_t *clip_region;
                         gint indices[2];
                         GtkStateType state;
 
@@ -784,7 +781,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
                                                                         indices, 1);
                         gdk_cairo_region (cr, clip_region);
                         cairo_clip (cr);
-			gdk_region_destroy (clip_region);
+			cairo_region_destroy (clip_region);
 
                         gdk_cairo_set_source_color (cr, &style->base[state]);
                         cairo_paint (cr);
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 8ceca7c966..d988f801ae 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -38,9 +38,6 @@
 #include "e-cell-toggle.h"
 #include "e-table-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define E_CELL_TOGGLE_GET_PRIVATE(obj) \
 	(G_TYPE_INSTANCE_GET_PRIVATE \
 	((obj), E_TYPE_CELL_TOGGLE, ECellTogglePrivate))
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index d983c1b935..d7a1e7f237 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -39,9 +39,6 @@
 #include "e-table-header.h"
 #include "e-table-one.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	CURSOR_CHANGE,
 	STYLE_SET,
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 557785df0c..e038271b86 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -34,9 +34,6 @@
 #include "e-table-field-chooser.h"
 #include "e-table-field-chooser-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static void e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_dispose (GObject *object);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 6e8bbf4e61..f9c12b2a9a 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -39,9 +39,6 @@
 #include "e-table-item.h"
 #include "e-table-sorting-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define TITLE_HEIGHT         16
 
 /* workaround for avoiding API breakage */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2e7b4704ec..284565165d 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -50,9 +50,6 @@
 #include "arrow-up.xpm"
 #include "arrow-down.xpm"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 enum {
 	BUTTON_PRESSED,
 	LAST_SIGNAL
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index b6421bb439..57d5c80963 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -48,9 +48,6 @@
 #include "e-table-item.h"
 #include "e-table-subset.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 /* workaround for avoiding API breakage */
 #define eti_get_type e_table_item_get_type
 G_DEFINE_TYPE (ETableItem, eti, GNOME_TYPE_CANVAS_ITEM)
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index aad7c9f729..d21137ef04 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -52,9 +52,6 @@
 #include "e-table-subset.h"
 #include "e-table-utils.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define COLUMN_HEADER_HEIGHT 16
 
 #define d(x)
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index bcad41a797..39bfd40d6c 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -52,9 +52,6 @@
 #include "e-tree.h"
 #include "e-tree-table-adapter.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define COLUMN_HEADER_HEIGHT 16
 
 #define d(x)
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index a282f862e3..89894ab99d 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -32,9 +32,6 @@
 #include "gal-a11y-e-cell-popup.h"
 #include "gal-a11y-e-cell-registry.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 static AtkObjectClass *parent_class = NULL;
 #define PARENT_TYPE (gal_a11y_e_cell_get_type ())
 
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index 7139b41fe3..c6ba4e7d2b 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -33,9 +33,6 @@
 #include "gal-a11y-e-table-factory.h"
 #include "gal-a11y-e-table-item.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETableClass))
 static AtkObjectClass *parent_class;
 static GType parent_type;
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index 193d3eb9d7..d474f96af5 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -30,9 +30,6 @@
 #include "gal-a11y-e-tree.h"
 #include "gal-a11y-e-tree-factory.h"
 
-/* backward-compatibility cruft */
-#include "e-util/gtk-compat.h"
-
 #define CS_CLASS(a11y) (G_TYPE_INSTANCE_GET_CLASS ((a11y), C_TYPE_STREAM, GalA11yETreeClass))
 static AtkObjectClass *parent_class;
 static GType parent_type;
-- 
cgit v1.2.3


From dc300e6bc814acbfe2fb18f2a2219afdd4fc1a59 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 13 Jan 2011 23:02:52 -0500
Subject: gdk_cursor_unref() -> g_object_unref()

---
 widgets/table/e-cell-text.c         | 2 +-
 widgets/table/e-table-header-item.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 83338fc1e7..2e260d7135 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -386,7 +386,7 @@ ect_unrealize (ECellView *ecv)
 		ect_cancel_edit (text_view);
 	}
 
-	gdk_cursor_unref (text_view->i_cursor);
+	g_object_unref (text_view->i_cursor);
 
 	if (ect->colors) {
 		colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 284565165d..eda9e26063 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -108,7 +108,7 @@ ethi_dispose (GObject *object) {
 	scroll_off (ethi);
 
 	if (ethi->resize_cursor) {
-		gdk_cursor_unref (ethi->resize_cursor);
+		g_object_unref (ethi->resize_cursor);
 		ethi->resize_cursor = NULL;
 	}
 
-- 
cgit v1.2.3


From ee8232d7ee82e39d0dee27c39622b927ab86da0e Mon Sep 17 00:00:00 2001
From: Vibha Yadav <yvibha@novell.com>
Date: Thu, 2 Dec 2010 16:56:25 +0530
Subject: Avoid using deprecated GTK_SELECTION_EXTENDED

Using GTK_SELECTION_MULTIPLE.
As Deprecated, GTK_SELECTION_EXTENDED behaves identical to
GTK_SELECTION_MULTIPLE.
---
 widgets/table/e-table-specification.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 99213ad501..dfa7da9e36 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -209,7 +209,7 @@ e_table_specification_load_from_node (ETableSpecification *specification,
 	} else if (temp && !g_ascii_strcasecmp (temp, "browse")) {
 		specification->selection_mode = GTK_SELECTION_BROWSE;
 	} else if (temp && !g_ascii_strcasecmp (temp, "extended")) {
-		specification->selection_mode = GTK_SELECTION_EXTENDED;
+		specification->selection_mode = GTK_SELECTION_MULTIPLE;
 	}
 	g_free (temp);
 
@@ -377,7 +377,7 @@ e_table_specification_save_to_node (ETableSpecification *specification,
 		s = "browse";
 		break;
 	default:
-	case GTK_SELECTION_EXTENDED:
+	case GTK_SELECTION_MULTIPLE:
 		s = "extended";
 	}
 	xmlSetProp (node, (const guchar *)"selection-mode", (guchar *)s);
-- 
cgit v1.2.3


From b7c2f49973b93c2e80bed6f10c534af17b757c04 Mon Sep 17 00:00:00 2001
From: Rodrigo Moya <rodrigo@gnome-db.org>
Date: Fri, 10 Dec 2010 13:15:27 +0100
Subject: Adapt size_request vfuncs to latest gtk+-3.0 API.

---
 widgets/table/e-table.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index d21137ef04..6a4d276e1b 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -226,13 +226,20 @@ current_search_col (ETable *et)
 }
 
 static void
-et_size_request (GtkWidget *widget, GtkRequisition *request)
+et_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural)
 {
 	ETable *et = E_TABLE (widget);
-	if (GTK_WIDGET_CLASS (e_table_parent_class)->size_request)
-		GTK_WIDGET_CLASS (e_table_parent_class)->size_request (widget, request);
-	if (et->horizontal_resize)
-		request->width = MAX (request->width, et->header_width);
+	GTK_WIDGET_CLASS (e_table_parent_class)->get_preferred_width (widget, minimum, natural);
+	if (et->horizontal_resize) {
+                *minimum = MAX (*minimum, et->header_width);
+                *natural = MAX (*natural, et->header_width);
+        }
+}
+
+static void
+et_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural)
+{
+        GTK_WIDGET_CLASS (e_table_parent_class)->get_preferred_height (widget, minimum, natural);
 }
 
 static void
@@ -3239,7 +3246,8 @@ e_table_class_init (ETableClass *class)
 
 	widget_class->grab_focus        = et_grab_focus;
 	widget_class->unrealize         = et_unrealize;
-	widget_class->size_request      = et_size_request;
+        widget_class->get_preferred_width = et_get_preferred_width;
+        widget_class->get_preferred_height = et_get_preferred_height;
 
 	widget_class->focus             = et_focus;
 
-- 
cgit v1.2.3


From 24eb59628f542dbcd6eb5ed84946499c65c37629 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 15 Jan 2011 10:32:14 -0500
Subject: Adapt ETable to latest gtk+-3.0 API.

---
 widgets/table/e-table.c | 102 +++++++++++++++++++++++++++---------------------
 widgets/table/e-table.h |   5 ---
 2 files changed, 58 insertions(+), 49 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 6a4d276e1b..69e4241a7a 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -100,7 +100,11 @@ enum {
 	PROP_MODEL,
 	PROP_UNIFORM_ROW_HEIGHT,
 	PROP_ALWAYS_SEARCH,
-	PROP_USE_CLICK_TO_ADD
+	PROP_USE_CLICK_TO_ADD,
+	PROP_HADJUSTMENT,
+	PROP_VADJUSTMENT,
+	PROP_HSCROLL_POLICY,
+	PROP_VSCROLL_POLICY
 };
 
 enum {
@@ -163,7 +167,8 @@ static gint et_focus (GtkWidget *container, GtkDirectionType direction);
 static void scroll_off (ETable *et);
 static void scroll_on (ETable *et, guint scroll_direction);
 
-G_DEFINE_TYPE (ETable, e_table, GTK_TYPE_TABLE)
+G_DEFINE_TYPE_WITH_CODE (ETable, e_table, GTK_TYPE_TABLE,
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
 
 static void
 et_disconnect_model (ETable *et)
@@ -2248,6 +2253,30 @@ et_get_property (GObject *object,
 	case PROP_USE_CLICK_TO_ADD:
 		g_value_set_boolean (value, etable->use_click_to_add);
 		break;
+	case PROP_HADJUSTMENT:
+		if (etable->table_canvas)
+			g_object_get_property (G_OBJECT (etable->table_canvas), "hadjustment", value);
+		else
+			g_value_set_object (value, NULL);
+		break;
+	case PROP_VADJUSTMENT:
+		if (etable->table_canvas)
+			g_object_get_property (G_OBJECT (etable->table_canvas), "vadjustment", value);
+		else
+			g_value_set_object (value, NULL);
+		break;
+	case PROP_HSCROLL_POLICY:
+		if (etable->table_canvas)
+			g_object_get_property (G_OBJECT (etable->table_canvas), "hscroll-policy", value);
+		else
+			g_value_set_enum (value, 0);
+		break;
+	case PROP_VSCROLL_POLICY:
+		if (etable->table_canvas)
+			g_object_get_property (G_OBJECT (etable->table_canvas), "vscroll-policy", value);
+		else
+			g_value_set_enum (value, 0);
+		break;
 	default:
 		break;
 	}
@@ -2320,32 +2349,25 @@ et_set_property (GObject *object,
 			etable->click_to_add = NULL;
 		}
 		break;
+	case PROP_HADJUSTMENT:
+		if (etable->table_canvas)
+			g_object_set_property (G_OBJECT (etable->table_canvas), "hadjustment", value);
+		break;
+	case PROP_VADJUSTMENT:
+		if (etable->table_canvas)
+			g_object_set_property (G_OBJECT (etable->table_canvas), "vadjustment", value);
+		break;
+	case PROP_HSCROLL_POLICY:
+		if (etable->table_canvas)
+			g_object_set_property (G_OBJECT (etable->table_canvas), "hscroll-policy", value);
+		break;
+	case PROP_VSCROLL_POLICY:
+		if (etable->table_canvas)
+			g_object_set_property (G_OBJECT (etable->table_canvas), "vscroll-policy", value);
+		break;
 	}
 }
 
-static void
-set_scroll_adjustments   (ETable *table,
-			  GtkAdjustment *hadjustment,
-			  GtkAdjustment *vadjustment)
-{
-	if (vadjustment != NULL)
-		gtk_adjustment_set_step_increment (vadjustment, 20);
-
-	if (hadjustment != NULL)
-		gtk_adjustment_set_step_increment (hadjustment, 20);
-
-	if (table->table_canvas != NULL) {
-		gtk_scrollable_set_hadjustment (
-			GTK_SCROLLABLE (table->table_canvas), hadjustment);
-		gtk_scrollable_set_vadjustment (
-			GTK_SCROLLABLE (table->table_canvas), vadjustment);
-	}
-
-	if (table->header_canvas != NULL)
-		gtk_scrollable_set_hadjustment (
-			GTK_SCROLLABLE (table->header_canvas), hadjustment);
-}
-
 /**
  * e_table_get_next_row:
  * @e_table: The #ETable to query
@@ -2589,9 +2611,7 @@ struct _ETableDragSourceSite
 	GdkModifierType    start_button_mask;
 	GtkTargetList     *target_list;        /* Targets for drag data */
 	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;		 /* Colormap for drag icon */
-	GdkPixmap         *pixmap;             /* Icon for drag data */
-	GdkBitmap         *mask;
+	GdkPixbuf         *pixbuf;             /* Icon for drag data */
 
 	/* Stored button press information to detect drag beginning */
 	gint               state;
@@ -2828,11 +2848,10 @@ et_real_start_drag (ETable *table, gint row, gint col, GdkEvent *event)
 			info = g_dataset_get_data (context, "gtk-info");
 
 			if (info && !info->icon_window) {
-				if (site->pixmap)
-					gtk_drag_set_icon_pixmap (context,
-								  site->colormap,
-								  site->pixmap,
-								  site->mask, -2, -2);
+				if (site->pixbuf)
+					gtk_drag_set_icon_pixbuf (context,
+								  site->pixbuf,
+								  -2, -2);
 				else
 					gtk_drag_set_icon_default (context);
 			}
@@ -3472,17 +3491,6 @@ e_table_class_init (ETableClass *class)
 			      G_TYPE_UINT,
 			      G_TYPE_UINT);
 
-	class->set_scroll_adjustments = set_scroll_adjustments;
-
-	widget_class->set_scroll_adjustments_signal =
-		g_signal_new ("set_scroll_adjustments",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ETableClass, set_scroll_adjustments),
-			      NULL, NULL,
-			      e_marshal_NONE__OBJECT_OBJECT,
-			      G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
 							   "Length Threshold",
@@ -3529,5 +3537,11 @@ e_table_class_init (ETableClass *class)
 			G_PARAM_READABLE |
 			G_PARAM_STATIC_STRINGS));
 
+	/* Scrollable interface */
+	g_object_class_override_property (object_class, PROP_HADJUSTMENT,    "hadjustment");
+	g_object_class_override_property (object_class, PROP_VADJUSTMENT,    "vadjustment");
+	g_object_class_override_property (object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+	g_object_class_override_property (object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
+
 	gal_a11y_e_table_init ();
 }
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index b95444d118..99daf6d1e5 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -204,11 +204,6 @@ struct _ETableClass {
 	gboolean	(*white_space_event)	(ETable *et,
 						 GdkEvent *event);
 
-	void		(*set_scroll_adjustments)
-						(ETable *table,
-						 GtkAdjustment *hadjustment,
-						 GtkAdjustment *vadjustment);
-
 	/* Source side drag signals */
 	void		(*table_drag_begin)	 (ETable *table,
 						 gint row,
-- 
cgit v1.2.3


From b44f49abe70bf94e3bc268eff0a4569353d09a9a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 15 Jan 2011 10:28:22 -0500
Subject: Adapt ETableItem to latest gtk+-3.0 API.

---
 widgets/table/e-table-item.c | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 57d5c80963..d5c9c2da14 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -268,8 +268,6 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 	if (color_spec != NULL) {
 		if (gdk_color_parse (color_spec, &bg)) {
 			background = gdk_color_copy (&bg);
-			gdk_colormap_alloc_color (gtk_widget_get_colormap (canvas), background,
-						  FALSE, TRUE);
 			allocated = TRUE;
 		}
 	}
@@ -283,8 +281,6 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 				allocated = TRUE;
 			}
 			e_hsv_tweak (background, 0.0f, 0.0f, -0.07f);
-			gdk_colormap_alloc_color (gtk_widget_get_colormap (canvas), background,
-						  FALSE, TRUE);
 		}
 	}
 	if (allocatedp)
@@ -1731,7 +1727,7 @@ eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style,
 }
 
 static void
-eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height)
+eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint height)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
 	const gint rows = eti->rows;
@@ -1747,10 +1743,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 	GtkWidget *canvas = GTK_WIDGET (item->canvas);
         GtkStyle *style = gtk_widget_get_style (canvas);
 	gint height_extra = eti->horizontal_draw_grid ? 1 : 0;
-	cairo_t *cr;
-
-	cr = gdk_cairo_create (drawable);
-
+	
 	/*
 	 * Find out our real position after grouping
 	 */
@@ -1789,7 +1782,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 	 * Nothing to paint
 	 */
 	if (first_col == -1)
-		goto exit;
+		return;
 
 	/*
 	 * Compute row span.
@@ -1798,7 +1791,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 		first_row = (y          - floor (eti_base_y) - height_extra) / (ETI_ROW_HEIGHT (eti, -1) + height_extra);
 		last_row  = (y + height - floor (eti_base_y)               ) / (ETI_ROW_HEIGHT (eti, -1) + height_extra) + 1;
 		if (first_row > last_row)
-			goto exit;
+			return;
 		y_offset = floor (eti_base_y) - y + height_extra + first_row * (ETI_ROW_HEIGHT (eti, -1) + height_extra);
 		if (first_row < 0)
 			first_row = 0;
@@ -1829,11 +1822,11 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 		last_row = row;
 
 		if (first_row == -1)
-			goto exit;
+			return;
 	}
 
 	if (first_row == -1)
-		goto exit;
+		return;
 
 	/*
 	 * Draw cells
@@ -1955,7 +1948,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 				break;
 			}
 
-			e_cell_draw (ecell_view, drawable, ecol->col_idx, col, row, flags,
+			e_cell_draw (ecell_view, cr, ecol->col_idx, col, row, flags,
 				     xd, yd, xd + ecol->width, yd + height);
 
 			if (!f_found && !selected) {
@@ -2025,9 +2018,6 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
                 gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
                 cairo_stroke (cr);
 	}
-
-exit:
-	cairo_destroy (cr);
 }
 
 static GnomeCanvasItem *
@@ -3441,6 +3431,7 @@ e_table_item_print_page  (EPrintable *ep,
 				      row_height + 2 );
 
 			cairo_restore (cr);
+
 			xd += widths[col];
 		}
 
-- 
cgit v1.2.3


From 0edd064412cdd2b5f0d264fe2553f6a1e86c3c0a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 15 Jan 2011 10:12:24 -0500
Subject: Adapt ETableFieldChooserItem to latest gtk+-3.0 API.

---
 widgets/table/e-table-field-chooser-item.c | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 7a87db4302..411c1b58f4 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -466,7 +466,7 @@ etfci_unrealize (GnomeCanvasItem *item)
 
 static void
 etfci_draw (GnomeCanvasItem *item,
-            GdkDrawable *drawable,
+            cairo_t *cr,
             gint x,
             gint y,
             gint width,
@@ -505,13 +505,17 @@ etfci_draw (GnomeCanvasItem *item,
 		if (y2 < y)
 			continue;
 
-		e_table_header_draw_button (drawable, ecol,
+		cairo_save (cr);
+
+		e_table_header_draw_button (cr, ecol,
 					    style, state,
 					    GTK_WIDGET (canvas),
 					    -x, y1 - y,
 					    width, height,
 					    etfci->width, y2 - y1,
 					    E_TABLE_COL_ARROW_NONE);
+
+		cairo_restore (cr);
 	}
 }
 
@@ -544,9 +548,11 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
 	GtkStyle *style;
 	GtkStateType state;
 	ETableCol *ecol;
-	GdkPixmap *pixmap;
+	cairo_surface_t *cs;
+	cairo_t *cr;
 	gint drag_col;
 	gint button_height;
+	GdkPixbuf *pixbuf;
 
 	GtkTargetEntry  etfci_drag_types[] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
@@ -576,26 +582,29 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
 
 	button_height = e_table_header_compute_height (ecol, widget);
 	window = gtk_widget_get_window (widget);
-	pixmap = gdk_pixmap_new (window, etfci->width, button_height, -1);
+	cs = gdk_window_create_similar_surface (window, CAIRO_CONTENT_COLOR, etfci->width, button_height);
 
 	style = gtk_widget_get_style (widget);
 	state = gtk_widget_get_state (widget);
 
+	cr = cairo_create (cs);
 	e_table_header_draw_button (
-		pixmap, ecol, style,
+		cr, ecol, style,
 		state, widget, 0, 0,
 		etfci->width, button_height,
 		etfci->width, button_height,
 		E_TABLE_COL_ARROW_NONE);
 
-	gtk_drag_set_icon_pixmap (
+	pixbuf = gdk_pixbuf_get_from_window (window, 0, 0, etfci->width, button_height);
+	gtk_drag_set_icon_pixbuf (
 		context,
-		gdk_drawable_get_colormap (GDK_DRAWABLE (window)),
-		pixmap, NULL,
+		pixbuf,
 		etfci->width / 2,
 		button_height / 2);
+	g_object_unref (pixbuf);
 
-	g_object_unref (pixmap);
+	cairo_surface_destroy (cs);
+	cairo_destroy (cr);
 	etfci->maybe_drag = FALSE;
 }
 
-- 
cgit v1.2.3


From b4e2a4b0dc885549f5869102dfe9bf714097ee98 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 15 Jan 2011 10:12:53 -0500
Subject: Adapt ETableHeaderItem to latest gtk+-3.0 API.

---
 widgets/table/e-table-header-item.c  | 36 ++++++++++++++++++------------------
 widgets/table/e-table-header-utils.c | 25 ++++++++++++-------------
 widgets/table/e-table-header-utils.h |  4 ++--
 3 files changed, 32 insertions(+), 33 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index eda9e26063..b7388fdfaa 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -454,24 +454,18 @@ static GtkWidget *
 make_shaped_window_from_xpm (const gchar **xpm)
 {
 	GdkPixbuf *pixbuf;
-	GdkPixmap *pixmap;
-	GdkBitmap *bitmap;
 	GtkWidget *win, *pix;
 
 	pixbuf = gdk_pixbuf_new_from_xpm_data (xpm);
-	gdk_pixbuf_render_pixmap_and_mask (pixbuf, &pixmap, &bitmap, 128);
-	g_object_unref (pixbuf);
 
 	win = gtk_window_new (GTK_WINDOW_POPUP);
 	gtk_window_set_type_hint (GTK_WINDOW (win), GDK_WINDOW_TYPE_HINT_NOTIFICATION);
 
-	pix = gtk_image_new_from_pixmap (pixmap, bitmap);
+	pix = gtk_image_new_from_pixbuf (pixbuf);
 	gtk_widget_realize (win);
 	gtk_container_add (GTK_CONTAINER (win), pix);
-	gtk_widget_shape_combine_mask (win, bitmap, 0, 0);
 
-	g_object_unref (pixmap);
-	g_object_unref (bitmap);
+	g_object_unref (pixbuf);
 
 	return win;
 }
@@ -972,7 +966,7 @@ ethi_unrealize (GnomeCanvasItem *item)
 
 static void
 ethi_draw (GnomeCanvasItem *item,
-           GdkDrawable *drawable,
+           cairo_t *cr,
            gint x,
            gint y,
            gint width,
@@ -1036,7 +1030,7 @@ ethi_draw (GnomeCanvasItem *item,
 		state = gtk_widget_get_state (GTK_WIDGET (canvas));
 
 		e_table_header_draw_button (
-			drawable, ecol,
+			cr, ecol,
 			style, state, GTK_WIDGET (canvas),
 			x1 - x, -y, width, height,
 			x2 - x1, ethi->height,
@@ -1176,7 +1170,10 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	GdkDragContext *context;
 	ETableCol *ecol;
 	gint col_width;
-	GdkPixmap *pixmap;
+	cairo_surface_t *s;
+	GdkPixbuf *pixbuf;
+	cairo_t *cr;
+
 	gint group_indent = 0;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
 	GtkStateType state;
@@ -1236,26 +1233,29 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 
 	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
 	col_width = ecol->width;
-	pixmap = gdk_pixmap_new (window, col_width, ethi->height, -1);
+	s = cairo_image_surface_create (CAIRO_FORMAT_A1, col_width, ethi->height);
+	cr = cairo_create (s);
+	pixbuf = gdk_pixbuf_get_from_surface(s, 
+			0, 0, 
+			col_width, ethi->height);
 
 	state = gtk_widget_get_state (widget);
 
 	e_table_header_draw_button (
-		pixmap, ecol,
+		cr, ecol,
 		style, state,
 		widget, 0, 0,
 		col_width, ethi->height,
 		col_width, ethi->height,
 		(ETableColArrow) g_hash_table_lookup (
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
-	gtk_drag_set_icon_pixmap (
+	gtk_drag_set_icon_pixbuf (
 		context,
-		gdk_drawable_get_colormap (GDK_DRAWABLE (window)),
-		pixmap,
-		NULL,
+		pixbuf,
 		col_width / 2,
 		ethi->height / 2);
-	g_object_unref (pixmap);
+	g_object_unref (pixbuf);
+	cairo_surface_destroy (s);
 
 	ethi->maybe_drag = FALSE;
 	g_hash_table_destroy (arrows);
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 56fa44a3c6..da60ce03d9 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -237,7 +237,7 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
  * Draws a button suitable for a table header.
  **/
 void
-e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
+e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 			    GtkStyle *style, GtkStateType state,
 			    GtkWidget *widget,
 			    gint x, gint y, gint width, gint height,
@@ -249,10 +249,9 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 	gint inner_width, inner_height;
 	gint arrow_width = 0, arrow_height = 0;
 	PangoLayout *layout;
-        cairo_t *cr;
 	static gpointer g_label = NULL;
 
-	g_return_if_fail (drawable != NULL);
+	g_return_if_fail (cr != NULL);
 	g_return_if_fail (ecol != NULL);
 	g_return_if_fail (E_IS_TABLE_COL (ecol));
 	g_return_if_fail (style != NULL);
@@ -272,8 +271,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		gtk_widget_realize (g_label);
 	}
 
-        cr = gdk_cairo_create (drawable);
-
+	cairo_save (cr);
         gdk_cairo_set_source_color (cr, &gtk_widget_get_style (GTK_WIDGET (g_label))->fg[state]);
 
 	xthick = style->xthickness;
@@ -281,8 +279,8 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 
 	/* Button bevel */
 
-	gtk_paint_box (style, drawable, state, GTK_SHADOW_OUT,
-		       NULL, widget, "button",
+	gtk_paint_box (style, cr, state, GTK_SHADOW_OUT,
+		       widget, "button",
 		       x, y, button_width, button_height);
 
 	/* Inside area */
@@ -291,7 +289,7 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 	inner_height = button_height - 2 * (ythick + HEADER_PADDING);
 
 	if (inner_width < 1 || inner_height < 1) {
-		cairo_destroy (cr);
+		cairo_restore (cr);
 		return; /* nothing fits */
 	}
 
@@ -313,11 +311,12 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 			inner_width -= arrow_width + HEADER_PADDING;
 		break;
 	default:
+		cairo_restore (cr);
 		g_return_if_reached ();
 	}
 
 	if (inner_width < 1) {
-		cairo_destroy (cr);
+		cairo_restore (cr);
 		return; /* nothing else fits */
 	}
 
@@ -397,8 +396,8 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 		if (ecol->icon_name == NULL)
 			inner_width += arrow_width + HEADER_PADDING;
 
-		gtk_paint_arrow (style, drawable, state,
-				 GTK_SHADOW_NONE, NULL, widget, "header",
+		gtk_paint_arrow (style, cr, state,
+				 GTK_SHADOW_NONE, widget, "header",
 				 (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
 				 (ecol->icon_name == NULL),
 				 inner_x + inner_width - arrow_width,
@@ -408,10 +407,10 @@ e_table_header_draw_button (GdkDrawable *drawable, ETableCol *ecol,
 	}
 
 	default:
+		cairo_restore (cr);
 		g_return_if_reached ();
 	}
 
 	g_object_unref (layout);
-
-        cairo_destroy (cr);
+	cairo_restore (cr);
 }
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 3ae11a4eca..cfa568bcdd 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -32,8 +32,8 @@ G_BEGIN_DECLS
 
 gdouble		e_table_header_compute_height	(ETableCol *ecol,
 						 GtkWidget *widget);
-gdouble		e_table_header_width_extras	(GtkStyle       *style);
-void		e_table_header_draw_button	(GdkDrawable    *drawable,
+gdouble		e_table_header_width_extras	(GtkStyle *style);
+void		e_table_header_draw_button	(cairo_t *cr,
 						 ETableCol*ecol,
 						 GtkStyle *style,
 						 GtkStateType state,
-- 
cgit v1.2.3


From 310069df2f60e2b2d290d972d231f9021de0e37e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 9 Nov 2010 11:58:33 -0500
Subject: Adapt ECell classes to latest gtk+-3.0 API.

---
 widgets/table/e-cell-hbox.c   |  4 +--
 widgets/table/e-cell-pixbuf.c |  5 +--
 widgets/table/e-cell-popup.c  | 20 ++++++-----
 widgets/table/e-cell-text.c   | 82 ++++---------------------------------------
 widgets/table/e-cell-text.h   |  3 --
 widgets/table/e-cell-toggle.c |  6 +---
 widgets/table/e-cell-tree.c   | 46 +++++++++++++++++-------
 widgets/table/e-cell-vbox.c   |  4 +--
 widgets/table/e-cell.c        | 16 +++++----
 widgets/table/e-cell.h        |  4 +--
 10 files changed, 69 insertions(+), 121 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 4053452705..48547e037b 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -139,7 +139,7 @@ ecv_unrealize (ECellView *ecv)
  */
 static void
 ecv_draw (ECellView *ecell_view,
-          GdkDrawable *drawable,
+          cairo_t *cr,
           gint model_col,
           gint view_col,
           gint row,
@@ -165,7 +165,7 @@ ecv_draw (ECellView *ecell_view,
 		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
 
 		e_cell_draw (
-			hbox_view->subcell_views[i], drawable,
+			hbox_view->subcell_views[i], cr,
 			hbox_view->model_cols[i], view_col, row, flags,
 			x1 + subcell_offset , y1,
 			x1 + subcell_offset + width, y2);
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index b8662b9182..e25cb2dc63 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -97,14 +97,13 @@ pixbuf_kill_view (ECellView *ecell_view)
 }
 
 static void
-pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable,
+pixbuf_draw (ECellView *ecell_view, cairo_t *cr,
              gint model_col, gint view_col, gint row, ECellFlags flags,
              gint x1, gint y1, gint x2, gint y2)
 {
     GdkPixbuf *cell_pixbuf;
     gint real_x, real_y;
     gint pix_w, pix_h;
-    cairo_t *cr;
 
     cell_pixbuf = e_table_model_value_at (ecell_view->e_table_model,
 							  1, row);
@@ -135,12 +134,10 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable,
         real_y = y1;
     }
 
-    cr = gdk_cairo_create (drawable);
     cairo_save (cr);
     gdk_cairo_set_source_pixbuf (cr, cell_pixbuf, real_x, real_y);
     cairo_paint_with_alpha (cr, 1);
     cairo_restore (cr);
-    cairo_destroy (cr);
 }
 
 static gint
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index dfc9526885..abfe61e206 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -54,7 +54,7 @@ static void	ecp_kill_view		(ECellView	*ecv);
 static void	ecp_realize		(ECellView	*ecv);
 static void	ecp_unrealize		(ECellView	*ecv);
 static void	ecp_draw		(ECellView	*ecv,
-					 GdkDrawable	*drawable,
+					 cairo_t	*cr,
 					 gint		 model_col,
 					 gint		 view_col,
 					 gint		 row,
@@ -245,7 +245,7 @@ ecp_unrealize (ECellView *ecv)
  * ECell::draw method
  */
 static void
-ecp_draw (ECellView *ecv, GdkDrawable *drawable,
+ecp_draw (ECellView *ecv, cairo_t *cr,
 	  gint model_col, gint view_col, gint row, ECellFlags flags,
 	  gint x1, gint y1, gint x2, gint y2)
 {
@@ -256,6 +256,8 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
 	GdkRectangle rect;
 	gboolean show_popup_arrow;
 
+	cairo_save (cr);
+
 	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ecv->e_table_item_view)->canvas);
 
 	/* Display the popup arrow if we are the cursor cell, or the popup
@@ -274,7 +276,7 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
 	if (show_popup_arrow) {
 		GtkStyle *style;
 
-		e_cell_draw (ecp_view->child_view, drawable, model_col,
+		e_cell_draw (ecp_view->child_view, cr, model_col,
 			     view_col, row, flags,
 			     x1, y1, x2 - E_CELL_POPUP_ARROW_WIDTH, y2);
 
@@ -290,22 +292,24 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
 
 		style = gtk_widget_get_style (canvas);
 
-		gtk_paint_box (style, drawable,
+		gtk_paint_box (style, cr,
 			       GTK_STATE_NORMAL, shadow,
-			       &rect, canvas, "ecellpopup",
+			       canvas, "ecellpopup",
 			       rect.x, rect.y, rect.width, rect.height);
-		gtk_paint_arrow (style, drawable,
+		gtk_paint_arrow (style, cr,
 				 GTK_STATE_NORMAL, GTK_SHADOW_NONE,
-				 &rect, canvas, NULL,
+				 canvas, NULL,
 				 GTK_ARROW_DOWN, TRUE,
 				 rect.x + E_CELL_POPUP_ARROW_XPAD,
 				 rect.y + E_CELL_POPUP_ARROW_YPAD,
 				 rect.width - E_CELL_POPUP_ARROW_XPAD * 2,
 				 rect.height - E_CELL_POPUP_ARROW_YPAD * 2);
 	} else {
-		e_cell_draw (ecp_view->child_view, drawable, model_col,
+		e_cell_draw (ecp_view->child_view, cr, model_col,
 			     view_col, row, flags, x1, y1, x2, y2);
 	}
+
+	cairo_restore (cr);
 }
 
 /*
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 2e260d7135..245f894067 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -197,8 +197,6 @@ static void _get_tep (CellEdit *edit);
 static gint get_position_from_xy (CellEdit *edit, gint x, gint y);
 static gboolean _blink_scroll_timeout (gpointer data);
 
-static void ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap);
-static GdkColor* e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec);
 static void e_cell_text_preedit_changed_cb (GtkIMContext *context, ECellTextView *text_view);
 static void e_cell_text_commit_cb (GtkIMContext *context, const gchar  *str, ECellTextView *text_view);
 static gboolean e_cell_text_retrieve_surrounding_cb (GtkIMContext *context, ECellTextView *text_view);
@@ -379,8 +377,6 @@ static void
 ect_unrealize (ECellView *ecv)
 {
 	ECellTextView *text_view = (ECellTextView *) ecv;
-	ECellText *ect = (ECellText*) ecv->ecell;
-	GdkColormap *colormap;
 
 	if (text_view->edit) {
 		ect_cancel_edit (text_view);
@@ -388,34 +384,11 @@ ect_unrealize (ECellView *ecv)
 
 	g_object_unref (text_view->i_cursor);
 
-	if (ect->colors) {
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (text_view->canvas));
-		g_hash_table_foreach (ect->colors, (GHFunc) ect_free_color,
-				      colormap);
-		g_hash_table_destroy (ect->colors);
-		ect->colors = NULL;
-	}
-
 	if (E_CELL_CLASS (e_cell_text_parent_class)->unrealize)
 		(* E_CELL_CLASS (e_cell_text_parent_class)->unrealize) (ecv);
 
 }
 
-static void
-ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap)
-{
-	g_free (color_spec);
-
-	/* This frees the color. Note we don't free it if it is the special
-	   value. */
-	if (color != (GdkColor*) 1) {
-		gdk_colormap_free_colors (colormap, color, 1);
-
-		/* This frees the memory for the GdkColor. */
-		gdk_color_free (color);
-	}
-}
-
 static PangoAttrList*
 build_attr_list (ECellTextView *text_view, gint row, gint text_length)
 {
@@ -701,7 +674,7 @@ get_vertical_spacing (GtkWidget *canvas)
  * ECell::draw method
  */
 static void
-ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
+ect_draw (ECellView *ecell_view, cairo_t *cr,
 	  gint model_col, gint view_col, gint row, ECellFlags flags,
 	  gint x1, gint y1, gint x2, gint y2)
 {
@@ -713,14 +686,12 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	GtkWidget *canvas = GTK_WIDGET (text_view->canvas);
 	GtkStyle *style;
 	gint x_origin, y_origin, vspacing;
-        cairo_t *cr;
 
+	cairo_save (cr);
 	style = gtk_widget_get_style (canvas);
 
 	selected = flags & E_CELL_SELECTED;
 
-        cr = gdk_cairo_create (drawable);
-
 	if (selected) {
 		if (gtk_widget_has_focus (canvas))
 			gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_SELECTED]);
@@ -731,15 +702,13 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 
 		if (ect->color_column != -1) {
 			gchar *color_spec;
-			GdkColor *cell_foreground;
+			GdkColor color;
 
 			color_spec = e_table_model_value_at (
 				ecell_view->e_table_model,
 				ect->color_column, row);
-			cell_foreground = e_cell_text_get_color (text_view,
-								 color_spec);
-			if (cell_foreground)
-				gdk_cairo_set_source_color (cr, cell_foreground);
+			if (color_spec && gdk_color_parse (color_spec, &color))
+				gdk_cairo_set_source_color (cr, &color);
 		}
 	}
 
@@ -805,7 +774,7 @@ ect_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	}
 
 	g_object_unref (layout);
-        cairo_destroy (cr);
+	cairo_restore (cr);
 }
 
 /*
@@ -2474,45 +2443,6 @@ _get_tep (CellEdit *edit)
 	}
 }
 
-static GdkColor*
-e_cell_text_get_color (ECellTextView *cell_view, gchar *color_spec)
-{
-	ECellText *ect = E_CELL_TEXT (((ECellView*) cell_view)->ecell);
-	GdkColormap *colormap;
-	GdkColor *color, tmp_color;
-
-	/* If the color spec is NULL we use the default color. */
-	if (color_spec == NULL)
-		return NULL;
-
-	/* Create the hash table if we haven't already. */
-	if (!ect->colors)
-		ect->colors = g_hash_table_new (g_str_hash, g_str_equal);
-
-	/* See if we've already allocated the color. Note that we use a
-	   special value of (GdkColor*) 1 in the hash to indicate that we've
-	   already tried and failed to allocate the color, so we don't keep
-	   trying to allocate it. */
-	color = g_hash_table_lookup (ect->colors, color_spec);
-	if (color == (GdkColor*) 1)
-		return NULL;
-	if (color)
-		return color;
-
-	/* Try to parse the color. */
-	if (gdk_color_parse (color_spec, &tmp_color)) {
-		colormap = gtk_widget_get_colormap (GTK_WIDGET (cell_view->canvas));
-
-		/* Try to allocate the color. */
-		if (gdk_colormap_alloc_color (colormap, &tmp_color, FALSE, TRUE))
-			color = gdk_color_copy (&tmp_color);
-	}
-
-	g_hash_table_insert (ect->colors, g_strdup (color_spec),
-			     color ? color : (GdkColor*) 1);
-	return color;
-}
-
 /**
  * e_cell_text_set_selection:
  * @cell_view: the given cell view
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index ee3e1f5202..7645a0064b 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -91,9 +91,6 @@ struct _ECellText {
 	   See the XParseColor man page for the formats available. */
 	gint color_column;
 	gint bg_color_column;
-
-	/* This stores the colors we have allocated. */
-	GHashTable *colors;
 };
 
 struct _ECellTextClass {
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index d988f801ae..ae7fcc703b 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -170,7 +170,7 @@ cell_toggle_kill_view (ECellView *ecell_view)
 
 static void
 cell_toggle_draw (ECellView *ecell_view,
-                  GdkDrawable *drawable,
+                  cairo_t *cr,
                   gint model_col,
                   gint view_col,
                   gint row,
@@ -183,7 +183,6 @@ cell_toggle_draw (ECellView *ecell_view,
 	ECellTogglePrivate *priv;
 	GdkPixbuf *image;
 	gint x, y;
-	cairo_t *cr;
 
 	const gint value = GPOINTER_TO_INT (
 		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
@@ -208,13 +207,10 @@ cell_toggle_draw (ECellView *ecell_view,
 	else
 		y = y1 + ((y2 - y1) - gdk_pixbuf_get_height (image)) / 2;
 
-	cr = gdk_cairo_create (drawable);
 	cairo_save (cr);
 	gdk_cairo_set_source_pixbuf (cr, image, x, y);
 	cairo_paint_with_alpha (cr, 1);
 	cairo_restore (cr);
-	cairo_destroy (cr);
-
 }
 
 static void
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 3793652524..1a4b00bb4c 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -189,7 +189,7 @@ ect_unrealize (ECellView *ecv)
 
 static void
 draw_expander (ECellTreeView *ectv,
-               GdkDrawable *drawable,
+               cairo_t *cr,
                GtkExpanderStyle expander_style,
                GtkStateType state,
                GdkRectangle *rect)
@@ -204,7 +204,7 @@ draw_expander (ECellTreeView *ectv,
 	gtk_widget_style_get (tree, "expander_size", &exp_size, NULL);
 
 	gtk_paint_expander (
-		style, drawable, state, rect, tree, "treeview",
+		style, cr, state, tree, "treeview",
 		rect->x + rect->width - exp_size / 2,
 		rect->y + rect->height / 2, expander_style);
 }
@@ -214,7 +214,7 @@ draw_expander (ECellTreeView *ectv,
  */
 static void
 ect_draw (ECellView *ecell_view,
-          GdkDrawable *drawable,
+          cairo_t *cr,
           gint model_col,
           gint view_col,
           gint row,
@@ -232,15 +232,14 @@ ect_draw (ECellView *ecell_view,
 	GtkWidget *canvas = GTK_WIDGET (tree_view->canvas);
 	GtkStyle *style;
 	gboolean selected;
-        cairo_t *cr;
 	gint offset, subcell_offset;
 
-        cr = gdk_cairo_create (drawable);
-
 	style = gtk_widget_get_style (canvas);
 
 	selected = flags & E_CELL_SELECTED;
 
+	cairo_save (cr);
+
 	/* only draw the tree effects if we're the active sort */
 	if (/* XXX */ TRUE) {
 		GdkPixbuf *node_image;
@@ -278,7 +277,7 @@ ect_draw (ECellView *ecell_view,
 
 			r = rect;
 			r.width -= node_image_width + 2;
-			draw_expander (tree_view, drawable, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
+			draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
 		}
 
 		if (node_image) {
@@ -293,11 +292,11 @@ ect_draw (ECellView *ecell_view,
 
 	/* Now cause our subcell to draw its contents, shifted by
 	   subcell_offset pixels */
-	e_cell_draw (tree_view->subcell_view, drawable,
+	e_cell_draw (tree_view->subcell_view, cr,
 		     model_col, view_col, row, flags,
 		     x1 + subcell_offset, y1, x2, y2);
 
-        cairo_destroy (cr);
+	cairo_restore (cr);
 }
 
 static void
@@ -360,6 +359,7 @@ animate_expander (gpointer data)
 	GtkLayout *layout;
 	GdkWindow *window;
 	animate_closure_t *closure = (animate_closure_t *) data;
+	cairo_t *cr;
 
 	if (closure->finish) {
 		e_tree_table_adapter_node_set_expanded (closure->etta, closure->node, !closure->expanded);
@@ -371,13 +371,17 @@ animate_expander (gpointer data)
 	layout = GTK_LAYOUT (closure->ectv->canvas);
 	window = gtk_layout_get_bin_window (layout);
 
+	cr = gdk_cairo_create (window);
+
 	draw_expander (
-		closure->ectv, window, closure->expanded ?
+		closure->ectv, cr, closure->expanded ?
 		GTK_EXPANDER_SEMI_COLLAPSED :
 		GTK_EXPANDER_SEMI_EXPANDED,
 		GTK_STATE_NORMAL, &closure->area);
 	closure->finish = TRUE;
 
+	cairo_destroy (cr);
+
 	return TRUE;
 }
 
@@ -408,6 +412,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 				gint tmp_row = row;
 				GdkRectangle area;
 				animate_closure_t *closure = g_new0 (animate_closure_t, 1);
+				cairo_t *cr;
 				gint hgt;
 
 				e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
@@ -418,11 +423,14 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 				if (hgt != area.height) /* Composite cells */
 					area.height += hgt;
 
+				cr = gdk_cairo_create (window);
 				draw_expander (
-					tree_view, window, expanded ?
+					tree_view, cr, expanded ?
 					GTK_EXPANDER_SEMI_EXPANDED :
 					GTK_EXPANDER_SEMI_COLLAPSED,
 					GTK_STATE_NORMAL, &area);
+				cairo_destroy (cr);
+
 				closure->ectv = tree_view;
 				closure->etta = etta;
 				closure->node = node;
@@ -445,14 +453,20 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 
 			if (tree_view->prelit ^ in_expander) {
 				gint tmp_row = row;
+				cairo_t *cr;
+
 				e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
 								&tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);
 				area.width = offset - 2;
+
+				cr = gdk_cairo_create (window);
 				draw_expander (
-					tree_view, window,
+					tree_view, cr,
 					e_tree_table_adapter_node_is_expanded (etta, node) ?
 					GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
 					in_expander ? GTK_STATE_PRELIGHT : GTK_STATE_NORMAL, &area);
+				cairo_destroy (cr);
+
 				tree_view->prelit = in_expander;
 				return TRUE;
 			}
@@ -465,14 +479,20 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		if (tree_view->prelit) {
 			gint tmp_row = row;
 			GdkRectangle area;
+			cairo_t *cr;
+
 			e_table_item_get_cell_geometry (tree_view->cell_view.e_table_item_view,
 							&tmp_row, &view_col, &area.x, &area.y, NULL, &area.height);
 			area.width = offset - 2;
+
+			cr = gdk_cairo_create (window);
 			draw_expander (
-				tree_view, window,
+				tree_view, cr,
 				e_tree_table_adapter_node_is_expanded (etta, node) ?
 				GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED,
 				GTK_STATE_NORMAL, &area);
+			cairo_destroy (cr);
+
 			tree_view->prelit = FALSE;
 		}
 		return TRUE;
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index f57cd0e113..1e5875b2b1 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -132,7 +132,7 @@ ecv_unrealize (ECellView *ecv)
  */
 static void
 ecv_draw (ECellView *ecell_view,
-          GdkDrawable *drawable,
+          cairo_t *cr,
           gint model_col,
           gint view_col,
           gint row,
@@ -156,7 +156,7 @@ ecv_draw (ECellView *ecell_view,
 			vbox_view->subcell_views[i],
 			vbox_view->model_cols[i], view_col, row);
 		e_cell_draw (
-			vbox_view->subcell_views[i], drawable,
+			vbox_view->subcell_views[i], cr,
 			vbox_view->model_cols[i], view_col, row, flags,
 			x1, y1 + subcell_offset, x2,
 			y1 + subcell_offset + height);
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index f54b644045..19c5e37848 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -54,7 +54,7 @@ ec_unrealize (ECellView *e_cell)
 }
 
 static void
-ec_draw (ECellView *ecell_view, GdkDrawable *drawable,
+ec_draw (ECellView *ecell_view, cairo_t *cr,
 	 gint model_col, gint view_col, gint row, ECellFlags flags,
 	 gint x1, gint y1, gint x2, gint y2)
 {
@@ -240,7 +240,7 @@ e_cell_unrealize (ECellView *ecell_view)
 /**
  * e_cell_draw:
  * @ecell_view: the ECellView to redraw
- * @drawable: draw desination
+ * @cr: a Cairo context
  * @model_col: the column in the model being drawn.
  * @view_col: the column in the view being drawn (what the model maps to).
  * @row: the row being drawn
@@ -250,14 +250,14 @@ e_cell_unrealize (ECellView *ecell_view)
  * @x2: boudary for the rendering
  * @y2: boudary for the rendering
  *
- * This instructs the ECellView to render itself into the drawable.  The
- * region to be drawn in given by (x1,y1)-(x2,y2).
+ * This instructs the ECellView to render itself into the Cairo context.
+ * The region to be drawn in given by (x1,y1)-(x2,y2).
  *
  * The most important flags are %E_CELL_SELECTED and %E_CELL_FOCUSED, other
  * flags include alignments and justifications.
  */
 void
-e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable,
+e_cell_draw (ECellView *ecell_view, cairo_t *cr,
 	     gint model_col, gint view_col, gint row, ECellFlags flags,
 	     gint x1, gint y1, gint x2, gint y2)
 {
@@ -265,7 +265,11 @@ e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	g_return_if_fail (row >= 0);
 	g_return_if_fail (row < e_table_model_row_count (ecell_view->e_table_model));
 
-	ECVIEW_EC_CLASS (ecell_view)->draw (ecell_view, drawable, model_col, view_col, row, flags, x1, y1, x2, y2);
+	cairo_save (cr);
+
+	ECVIEW_EC_CLASS (ecell_view)->draw (ecell_view, cr, model_col, view_col, row, flags, x1, y1, x2, y2);
+
+	cairo_restore (cr);
 }
 
 /**
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 111736f41c..3a41db0afe 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -114,7 +114,7 @@ struct _ECellClass {
 	void		(*unrealize)		(ECellView *ecell_view);
 
 	void		(*draw)			(ECellView *ecell_view,
-						 GdkDrawable *drawable,
+						 cairo_t *cr,
 						 gint model_col,
 						 gint view_col, gint row,
 						 ECellFlags flags,
@@ -214,7 +214,7 @@ gint		e_cell_event			(ECellView *ecell_view,
 void		e_cell_realize			(ECellView *ecell_view);
 void		e_cell_unrealize		(ECellView *ecell_view);
 void		e_cell_draw			(ECellView *ecell_view,
-						 GdkDrawable *drawable,
+						 cairo_t *cr,
 						 gint model_col,
 						 gint view_col,
 						 gint row,
-- 
cgit v1.2.3


From a103158cee1af3f5f979d855cb9cbc0331a35237 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 15 Jan 2011 10:31:59 -0500
Subject: Adapt ETree to latest gtk+-3.0 API.

---
 widgets/table/e-tree.c | 105 +++++++++++++++++++++++++++----------------------
 widgets/table/e-tree.h |   5 ---
 2 files changed, 58 insertions(+), 52 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 39bfd40d6c..4471514d68 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -98,7 +98,11 @@ enum {
 	PROP_DRAW_FOCUS,
 	PROP_ETTA,
 	PROP_UNIFORM_ROW_HEIGHT,
-	PROP_ALWAYS_SEARCH
+	PROP_ALWAYS_SEARCH,
+	PROP_HADJUSTMENT,
+	PROP_VADJUSTMENT,
+	PROP_HSCROLL_POLICY,
+	PROP_VSCROLL_POLICY
 };
 
 enum {
@@ -248,7 +252,8 @@ static void hover_off (ETree *et);
 static void hover_on (ETree *et, gint x, gint y);
 static void context_destroyed (gpointer data, GObject *ctx);
 
-G_DEFINE_TYPE (ETree, e_tree, GTK_TYPE_TABLE)
+G_DEFINE_TYPE_WITH_CODE (ETree, e_tree, GTK_TYPE_TABLE,
+			 G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL))
 
 static void
 et_disconnect_from_etta (ETree *et)
@@ -1915,6 +1920,30 @@ et_get_property (GObject *object,
 	case PROP_ALWAYS_SEARCH:
 		g_value_set_boolean (value, etree->priv->always_search);
 		break;
+	case PROP_HADJUSTMENT:
+		if (etree->priv->table_canvas)
+			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "hadjustment", value);
+		else
+			g_value_set_object (value, NULL);
+		break;
+	case PROP_VADJUSTMENT:
+		if (etree->priv->table_canvas)
+			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "vadjustment", value);
+		else
+			g_value_set_object (value, NULL);
+		break;
+	case PROP_HSCROLL_POLICY:
+		if (etree->priv->table_canvas)
+			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "hscroll-policy", value);
+		else
+			g_value_set_enum (value, 0);
+		break;
+	case PROP_VSCROLL_POLICY:
+		if (etree->priv->table_canvas)
+			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "vscroll-policy", value);
+		else
+			g_value_set_enum (value, 0);
+		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 		break;
@@ -1986,32 +2015,23 @@ et_set_property (GObject *object,
 		etree->priv->always_search = g_value_get_boolean (value);
 		clear_current_search_col (etree);
 		break;
-	}
-}
-
-static void
-set_scroll_adjustments   (ETree *tree,
-			  GtkAdjustment *hadjustment,
-			  GtkAdjustment *vadjustment)
-{
-	if (vadjustment != NULL)
-		gtk_adjustment_set_step_increment (vadjustment, 20);
-
-	if (hadjustment != NULL)
-		gtk_adjustment_set_step_increment (hadjustment, 20);
 
-	/* XXX This can be called after our dispose() method has run. */
-	if (tree->priv->table_canvas != NULL) {
-		GtkScrollable *scrollable;
-
-		scrollable = GTK_SCROLLABLE (tree->priv->table_canvas);
-		gtk_scrollable_set_hadjustment (scrollable, hadjustment);
-		gtk_scrollable_set_vadjustment (scrollable, vadjustment);
-
-		if (tree->priv->header_canvas != NULL) {
-			scrollable = GTK_SCROLLABLE (tree->priv->header_canvas);
-			gtk_scrollable_set_hadjustment (scrollable, hadjustment);
-		}
+	case PROP_HADJUSTMENT:
+		if (etree->priv->table_canvas)
+			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "hadjustment", value);
+		break;
+	case PROP_VADJUSTMENT:
+		if (etree->priv->table_canvas)
+			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "vadjustment", value);
+		break;
+	case PROP_HSCROLL_POLICY:
+		if (etree->priv->table_canvas)
+			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "hscroll-policy", value);
+		break;
+	case PROP_VSCROLL_POLICY:
+		if (etree->priv->table_canvas)
+			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "vscroll-policy", value);
+		break;
 	}
 }
 
@@ -2353,9 +2373,7 @@ struct _ETreeDragSourceSite
 	GdkModifierType    start_button_mask;
 	GtkTargetList     *target_list;        /* Targets for drag data */
 	GdkDragAction      actions;            /* Possible actions */
-	GdkColormap       *colormap;		 /* Colormap for drag icon */
-	GdkPixmap         *pixmap;             /* Icon for drag data */
-	GdkBitmap         *mask;
+	GdkPixbuf         *pixbuf;             /* Icon for drag data */
 
 	/* Stored button press information to detect drag beginning */
 	gint               state;
@@ -2576,11 +2594,10 @@ et_real_start_drag (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *e
 			info = g_dataset_get_data (context, "gtk-info");
 
 			if (info && !info->icon_window) {
-				if (site->pixmap)
-					gtk_drag_set_icon_pixmap (context,
-								  site->colormap,
-								  site->pixmap,
-								  site->mask, -2, -2);
+				if (site->pixbuf)
+					gtk_drag_set_icon_pixbuf (context,
+								  site->pixbuf,
+								  -2, -2);
 				else
 					gtk_drag_set_icon_default (context);
 			}
@@ -3464,18 +3481,6 @@ e_tree_class_init (ETreeClass *class)
 			      G_TYPE_UINT,
 			      G_TYPE_UINT);
 
-	class->set_scroll_adjustments = set_scroll_adjustments;
-
-	widget_class->set_scroll_adjustments_signal =
-		g_signal_new ("set_scroll_adjustments",
-			      G_OBJECT_CLASS_TYPE (object_class),
-			      G_SIGNAL_RUN_LAST,
-			      G_STRUCT_OFFSET (ETreeClass, set_scroll_adjustments),
-			      NULL, NULL,
-			      e_marshal_NONE__OBJECT_OBJECT,
-			      G_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT,
-			      GTK_TYPE_ADJUSTMENT);
-
 	g_object_class_install_property (object_class, PROP_LENGTH_THRESHOLD,
 					 g_param_spec_int ("length_threshold",
 							   "Length Threshold",
@@ -3542,6 +3547,12 @@ e_tree_class_init (ETreeClass *class)
 			G_PARAM_READABLE |
 			G_PARAM_STATIC_STRINGS));
 
+	/* Scrollable interface */
+	g_object_class_override_property (object_class, PROP_HADJUSTMENT,    "hadjustment");
+	g_object_class_override_property (object_class, PROP_VADJUSTMENT,    "vadjustment");
+	g_object_class_override_property (object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+	g_object_class_override_property (object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
+
 	gal_a11y_e_tree_init ();
 }
 
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 533ab588f5..6504caf474 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -112,11 +112,6 @@ struct _ETreeClass {
 	gboolean	(*white_space_event)	(ETree *et,
 						 GdkEvent *event);
 
-	void		(*set_scroll_adjustments)
-						(ETree	 *tree,
-						 GtkAdjustment *hadjustment,
-						 GtkAdjustment *vadjustment);
-
 	/* Source side drag signals */
 	void		(*tree_drag_begin)	(ETree	 *tree,
 						 gint row,
-- 
cgit v1.2.3


From 21ab8044dab93b6367463593628ec42befda4f67 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 29 Jan 2011 10:50:53 -0500
Subject: Coding style and whitespace cleanup.

---
 widgets/table/e-table-click-to-add.h       |  3 +-
 widgets/table/e-table-field-chooser-item.c |  3 +-
 widgets/table/e-table-header-item.c        |  5 ++-
 widgets/table/e-table-header-item.h        | 51 ++++++++++++++++--------------
 widgets/table/e-table-header-utils.c       | 23 ++++++++------
 widgets/table/e-table-item.c               |  2 +-
 widgets/table/e-table.c                    | 26 +++++++++------
 widgets/table/e-tree-model.h               | 10 +++---
 widgets/table/e-tree.c                     | 44 +++++++++++++++++++-------
 9 files changed, 102 insertions(+), 65 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
index 49f8df334c..b92672d387 100644
--- a/widgets/table/e-table-click-to-add.h
+++ b/widgets/table/e-table-click-to-add.h
@@ -64,7 +64,8 @@ struct _ETableClickToAdd {
 
 	gchar             *message;
 
-	GnomeCanvasItem  *row;    /* If row is NULL, we're sitting with no data and a "Click here" message. */
+	GnomeCanvasItem  *row;    /* If row is NULL, we're sitting with
+				   * no data and a "Click here" message. */
 	GnomeCanvasItem  *text;   /* If text is NULL, row shouldn't be. */
 	GnomeCanvasItem  *rect;   /* What the heck.  Why not. */
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 411c1b58f4..91a77c83c5 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -582,7 +582,8 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
 
 	button_height = e_table_header_compute_height (ecol, widget);
 	window = gtk_widget_get_window (widget);
-	cs = gdk_window_create_similar_surface (window, CAIRO_CONTENT_COLOR, etfci->width, button_height);
+	cs = gdk_window_create_similar_surface (
+		window, CAIRO_CONTENT_COLOR, etfci->width, button_height);
 
 	style = gtk_widget_get_style (widget);
 	state = gtk_widget_get_state (widget);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index b7388fdfaa..0c56b59ea2 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1235,9 +1235,8 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	col_width = ecol->width;
 	s = cairo_image_surface_create (CAIRO_FORMAT_A1, col_width, ethi->height);
 	cr = cairo_create (s);
-	pixbuf = gdk_pixbuf_get_from_surface(s, 
-			0, 0, 
-			col_width, ethi->height);
+	pixbuf = gdk_pixbuf_get_from_surface (
+		s, 0, 0, col_width, ethi->height);
 
 	state = gtk_widget_get_state (widget);
 
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 4ab483a4ce..96f167b4e8 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -56,25 +56,25 @@ typedef struct _ETableHeaderItem ETableHeaderItem;
 typedef struct _ETableHeaderItemClass ETableHeaderItemClass;
 
 struct _ETableHeaderItem {
-	GnomeCanvasItem  parent;
-	ETableHeader    *eth;
+	GnomeCanvasItem parent;
+	ETableHeader *eth;
 
-	GdkCursor       *change_cursor;
-	GdkCursor       *resize_cursor;
+	GdkCursor *change_cursor;
+	GdkCursor *resize_cursor;
 
-	gshort            height, width;
+	gshort height, width;
 	PangoFontDescription *font_desc;
 
 	/*
-	 * Used during resizing;  Could be shorts
+	 * Used during resizing; Could be shorts
 	 */
-	gint              resize_col;
-	gint              resize_start_pos;
-	gint              resize_min_width;
+	gint resize_col;
+	gint resize_start_pos;
+	gint resize_min_width;
 
-	gpointer	  resize_guide;
+	gpointer  resize_guide;
 
-	gint              group_indent_width;
+	gint group_indent_width;
 
 	/*
 	 * Ids
@@ -84,20 +84,25 @@ struct _ETableHeaderItem {
 	/*
 	 * For dragging columns
 	 */
-	guint            maybe_drag:1;
-	guint            dnd_ready:1;
-	gint              click_x, click_y;
-	gint              drag_col, drop_col, drag_mark;
-        guint            drag_motion_id, drag_end_id, drag_leave_id, drag_drop_id, drag_data_received_id, drag_data_get_id;
-	guint            sort_info_changed_id, group_info_changed_id;
+	guint maybe_drag:1;
+	guint dnd_ready:1;
+	gint click_x, click_y;
+	gint drag_col, drop_col, drag_mark;
+	guint drag_motion_id;
+	guint drag_end_id;
+	guint drag_leave_id;
+	guint drag_drop_id;
+	guint drag_data_received_id;
+	guint drag_data_get_id;
+	guint sort_info_changed_id, group_info_changed_id;
 	GnomeCanvasItem *remove_item;
 
-	gchar           *dnd_code;
+	gchar *dnd_code;
 
 	/*
 	 * For column sorting info
 	 */
-	ETableSortInfo  *sort_info;
+	ETableSortInfo *sort_info;
 
 	guint scroll_direction : 4;
 	gint last_drop_x;
@@ -107,10 +112,10 @@ struct _ETableHeaderItem {
 	gint scroll_idle_id;
 
 	/* For adding fields. */
-	ETableHeader    *full_header;
-	ETable          *table;
-	ETree           *tree;
-	void            *config;
+	ETableHeader *full_header;
+	ETable *table;
+	ETree *tree;
+	gpointer config;
 
 	union {
 		GtkWidget *widget;
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index da60ce03d9..55e90159c6 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -272,7 +272,8 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 	}
 
 	cairo_save (cr);
-        gdk_cairo_set_source_color (cr, &gtk_widget_get_style (GTK_WIDGET (g_label))->fg[state]);
+	gdk_cairo_set_source_color (
+		cr, &gtk_widget_get_style (GTK_WIDGET (g_label))->fg[state]);
 
 	xthick = style->xthickness;
 	ythick = style->ythickness;
@@ -321,7 +322,7 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 	}
 
 	layout = build_header_layout (widget, ecol->text);
-        pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+	pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
 	/* Pixbuf or label */
 	if (ecol->icon_name != NULL) {
@@ -351,10 +352,12 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 
 			ypos = inner_y;
 
-                        pango_layout_set_width (layout, (inner_width - (xpos - inner_x)) * PANGO_SCALE);
+			pango_layout_set_width (
+				layout, (inner_width - (xpos - inner_x)) *
+				PANGO_SCALE);
 
-                        cairo_move_to (cr, xpos + pwidth + 1, ypos);
-                        pango_cairo_show_layout (cr, layout);
+			cairo_move_to (cr, xpos + pwidth + 1, ypos);
+			pango_cairo_show_layout (cr, layout);
 		}
 
 		/* FIXME: For some reason, under clutter gdk_draw_rgb_image_dithalign crashes
@@ -377,14 +380,14 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 			g_object_unref (pixmap);
 		}
 #endif
-                gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf,
+		gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf,
 					     xpos, inner_y + (inner_height - clip_height) / 2);
-                cairo_paint (cr);
+		cairo_paint (cr);
 	} else {
-                pango_layout_set_width (layout, inner_width * PANGO_SCALE);
+		pango_layout_set_width (layout, inner_width * PANGO_SCALE);
 
-                cairo_move_to (cr, inner_x, inner_y);
-                pango_cairo_show_layout (cr, layout);
+		cairo_move_to (cr, inner_x, inner_y);
+		pango_cairo_show_layout (cr, layout);
 	}
 
 	switch (arrow) {
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index d5c9c2da14..75a8f44d5d 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1743,7 +1743,7 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 	GtkWidget *canvas = GTK_WIDGET (item->canvas);
         GtkStyle *style = gtk_widget_get_style (canvas);
 	gint height_extra = eti->horizontal_draw_grid ? 1 : 0;
-	
+
 	/*
 	 * Find out our real position after grouping
 	 */
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 69e4241a7a..5028a48a6b 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -234,17 +234,21 @@ static void
 et_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural)
 {
 	ETable *et = E_TABLE (widget);
-	GTK_WIDGET_CLASS (e_table_parent_class)->get_preferred_width (widget, minimum, natural);
+
+	GTK_WIDGET_CLASS (e_table_parent_class)->
+		get_preferred_width (widget, minimum, natural);
+
 	if (et->horizontal_resize) {
-                *minimum = MAX (*minimum, et->header_width);
-                *natural = MAX (*natural, et->header_width);
-        }
+		*minimum = MAX (*minimum, et->header_width);
+		*natural = MAX (*natural, et->header_width);
+	}
 }
 
 static void
 et_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural)
 {
-        GTK_WIDGET_CLASS (e_table_parent_class)->get_preferred_height (widget, minimum, natural);
+	GTK_WIDGET_CLASS (e_table_parent_class)->
+		get_preferred_height (widget, minimum, natural);
 }
 
 static void
@@ -3538,10 +3542,14 @@ e_table_class_init (ETableClass *class)
 			G_PARAM_STATIC_STRINGS));
 
 	/* Scrollable interface */
-	g_object_class_override_property (object_class, PROP_HADJUSTMENT,    "hadjustment");
-	g_object_class_override_property (object_class, PROP_VADJUSTMENT,    "vadjustment");
-	g_object_class_override_property (object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
-	g_object_class_override_property (object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
+	g_object_class_override_property (
+		object_class, PROP_HADJUSTMENT, "hadjustment");
+	g_object_class_override_property (
+		object_class, PROP_VADJUSTMENT, "vadjustment");
+	g_object_class_override_property (
+		object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+	g_object_class_override_property (
+		object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
 
 	gal_a11y_e_table_init ();
 }
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index 01c4bf4180..f857e52a49 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -227,24 +227,24 @@ void		*e_tree_model_value_at		(ETreeModel *etree,
 void		e_tree_model_set_value_at	(ETreeModel *etree,
 						 ETreePath node,
 						 gint col,
-						 const void *val);
+						 gconstpointer val);
 gboolean	e_tree_model_node_is_editable	(ETreeModel *etree,
 						 ETreePath node,
 						 gint col);
 void		*e_tree_model_duplicate_value	(ETreeModel *etree,
 						 gint col,
-						 const void *value);
+						 gconstpointer value);
 void		e_tree_model_free_value		(ETreeModel *etree,
 						 gint col,
-						 void *value);
+						 gpointer value);
 void		*e_tree_model_initialize_value	(ETreeModel *etree,
 						 gint col);
 gboolean	e_tree_model_value_is_empty	(ETreeModel *etree,
 						 gint col,
-						 const void *value);
+						 gconstpointer value);
 gchar *		e_tree_model_value_to_string	(ETreeModel *etree,
 						 gint col,
-						 const void *value);
+						 gconstpointer value);
 
 /* depth first traversal of path's descendents, calling func on each one */
 void		e_tree_model_node_traverse	(ETreeModel *model,
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 4471514d68..b77bda8ef7 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1922,25 +1922,33 @@ et_get_property (GObject *object,
 		break;
 	case PROP_HADJUSTMENT:
 		if (etree->priv->table_canvas)
-			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "hadjustment", value);
+			g_object_get_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"hadjustment", value);
 		else
 			g_value_set_object (value, NULL);
 		break;
 	case PROP_VADJUSTMENT:
 		if (etree->priv->table_canvas)
-			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "vadjustment", value);
+			g_object_get_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"vadjustment", value);
 		else
 			g_value_set_object (value, NULL);
 		break;
 	case PROP_HSCROLL_POLICY:
 		if (etree->priv->table_canvas)
-			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "hscroll-policy", value);
+			g_object_get_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"hscroll-policy", value);
 		else
 			g_value_set_enum (value, 0);
 		break;
 	case PROP_VSCROLL_POLICY:
 		if (etree->priv->table_canvas)
-			g_object_get_property (G_OBJECT (etree->priv->table_canvas), "vscroll-policy", value);
+			g_object_get_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"vscroll-policy", value);
 		else
 			g_value_set_enum (value, 0);
 		break;
@@ -2018,19 +2026,27 @@ et_set_property (GObject *object,
 
 	case PROP_HADJUSTMENT:
 		if (etree->priv->table_canvas)
-			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "hadjustment", value);
+			g_object_set_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"hadjustment", value);
 		break;
 	case PROP_VADJUSTMENT:
 		if (etree->priv->table_canvas)
-			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "vadjustment", value);
+			g_object_set_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"vadjustment", value);
 		break;
 	case PROP_HSCROLL_POLICY:
 		if (etree->priv->table_canvas)
-			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "hscroll-policy", value);
+			g_object_set_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"hscroll-policy", value);
 		break;
 	case PROP_VSCROLL_POLICY:
 		if (etree->priv->table_canvas)
-			g_object_set_property (G_OBJECT (etree->priv->table_canvas), "vscroll-policy", value);
+			g_object_set_property (
+				G_OBJECT (etree->priv->table_canvas),
+				"vscroll-policy", value);
 		break;
 	}
 }
@@ -3548,10 +3564,14 @@ e_tree_class_init (ETreeClass *class)
 			G_PARAM_STATIC_STRINGS));
 
 	/* Scrollable interface */
-	g_object_class_override_property (object_class, PROP_HADJUSTMENT,    "hadjustment");
-	g_object_class_override_property (object_class, PROP_VADJUSTMENT,    "vadjustment");
-	g_object_class_override_property (object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
-	g_object_class_override_property (object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
+	g_object_class_override_property (
+		object_class, PROP_HADJUSTMENT, "hadjustment");
+	g_object_class_override_property (
+		object_class, PROP_VADJUSTMENT, "vadjustment");
+	g_object_class_override_property (
+		object_class, PROP_HSCROLL_POLICY, "hscroll-policy");
+	g_object_class_override_property (
+		object_class, PROP_VSCROLL_POLICY, "vscroll-policy");
 
 	gal_a11y_e_tree_init ();
 }
-- 
cgit v1.2.3


From 0109aa3a92b484ebb85c6481e5a8e39819b1f011 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 30 Jan 2011 11:32:55 -0500
Subject: More whitespace cleanup.

---
 widgets/table/e-cell-date-edit.c                   |  16 +--
 widgets/table/e-cell-hbox.c                        |  12 +--
 widgets/table/e-cell-pixbuf.c                      |  52 +++++-----
 widgets/table/e-cell-popup.c                       |   8 +-
 widgets/table/e-cell-text.c                        |  36 +++----
 widgets/table/e-cell-tree.c                        |   2 +-
 widgets/table/e-cell-vbox.c                        |  10 +-
 widgets/table/e-table-field-chooser-item.c         |   2 +-
 widgets/table/e-table-group-container.c            |   2 +-
 widgets/table/e-table-header-item.c                |   4 +-
 widgets/table/e-table-item.c                       |  54 +++++-----
 widgets/table/e-table.c                            |   8 +-
 widgets/table/e-tree-selection-model.c             |   2 +-
 widgets/table/e-tree-table-adapter.c               |   8 +-
 widgets/table/gal-a11y-e-cell-toggle.c             |  46 ++++-----
 widgets/table/gal-a11y-e-cell-tree.c               |  60 +++++------
 widgets/table/gal-a11y-e-cell.c                    |   2 +-
 .../table/gal-a11y-e-table-click-to-add-factory.c  |   2 +-
 widgets/table/gal-a11y-e-table-click-to-add.c      |  14 +--
 widgets/table/gal-a11y-e-table-factory.c           |   2 +-
 widgets/table/gal-a11y-e-table-item-factory.c      |   2 +-
 widgets/table/gal-a11y-e-table-item.c              | 110 ++++++++++-----------
 widgets/table/gal-a11y-e-tree-factory.c            |   2 +-
 23 files changed, 228 insertions(+), 228 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 770ac77f0a..fc81d59cfd 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -234,11 +234,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_add (GTK_CONTAINER (frame), vbox);
-        gtk_widget_show (vbox);
+	gtk_widget_show (vbox);
 
 	hbox = gtk_hbox_new (FALSE, 4);
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-        gtk_widget_show (hbox);
+	gtk_widget_show (hbox);
 
 	ecde->calendar = e_calendar_new ();
 	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (ecde->calendar)->calitem),
@@ -249,7 +249,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 
 	vbox2 = gtk_vbox_new (FALSE, 2);
 	gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
-        gtk_widget_show (vbox2);
+	gtk_widget_show (vbox2);
 
 	ecde->time_entry = gtk_entry_new ();
 	gtk_widget_set_size_request (ecde->time_entry, 50, -1);
@@ -295,11 +295,11 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	gtk_container_set_border_width (GTK_CONTAINER (bbox), 4);
 	gtk_box_set_spacing (GTK_BOX (bbox), 2);
 	gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
-        gtk_widget_show (bbox);
+	gtk_widget_show (bbox);
 
 	now_button = gtk_button_new_with_label (_("Now"));
 	gtk_container_add (GTK_CONTAINER (bbox), now_button);
-        gtk_widget_show (now_button);
+	gtk_widget_show (now_button);
 	g_signal_connect((now_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_now_clicked),
 			    ecde);
@@ -307,7 +307,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 
 	today_button = gtk_button_new_with_label (_("Today"));
 	gtk_container_add (GTK_CONTAINER (bbox), today_button);
-        gtk_widget_show (today_button);
+	gtk_widget_show (today_button);
 	g_signal_connect((today_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_today_clicked),
 			    ecde);
@@ -316,7 +316,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	/* Translators: "None" as a label of a button to unset date in a date table cell */
 	none_button = gtk_button_new_with_label (C_("table-date", "None"));
 	gtk_container_add (GTK_CONTAINER (bbox), none_button);
-        gtk_widget_show (none_button);
+	gtk_widget_show (none_button);
 	g_signal_connect((none_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_none_clicked),
 			    ecde);
@@ -324,7 +324,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 
 	ok_button = gtk_button_new_with_label (_("OK"));
 	gtk_container_add (GTK_CONTAINER (bbox), ok_button);
-        gtk_widget_show (ok_button);
+	gtk_widget_show (ok_button);
 	g_signal_connect((ok_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_ok_clicked),
 			    ecde);
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 48547e037b..6710f60bd5 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -57,8 +57,8 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	hbox_view->cell_view.ecell = ecell;
 	hbox_view->cell_view.e_table_model = table_model;
 	hbox_view->cell_view.e_table_item_view = e_table_item_view;
-        hbox_view->cell_view.kill_view_cb = NULL;
-        hbox_view->cell_view.kill_view_cb_data = NULL;
+	hbox_view->cell_view.kill_view_cb = NULL;
+	hbox_view->cell_view.kill_view_cb_data = NULL;
 
 	/* create our subcell view */
 	hbox_view->subcell_view_count = ecv->subcell_count;
@@ -84,11 +84,11 @@ ecv_kill_view (ECellView *ecv)
 	ECellHboxView *hbox_view = (ECellHboxView *) ecv;
 	gint i;
 
-        if (hbox_view->cell_view.kill_view_cb)
-            (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data);
+	if (hbox_view->cell_view.kill_view_cb)
+	    (hbox_view->cell_view.kill_view_cb)(ecv, hbox_view->cell_view.kill_view_cb_data);
 
-        if (hbox_view->cell_view.kill_view_cb_data)
-            g_list_free (hbox_view->cell_view.kill_view_cb_data);
+	if (hbox_view->cell_view.kill_view_cb_data)
+	    g_list_free (hbox_view->cell_view.kill_view_cb_data);
 
 	/* kill our subcell view */
 	for (i = 0; i < hbox_view->subcell_view_count; i++)
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index e25cb2dc63..9687e7d392 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -87,11 +87,11 @@ pixbuf_kill_view (ECellView *ecell_view)
     ECellPixbufView *pixbuf_view = (ECellPixbufView *) ecell_view;
 
     if (pixbuf_view->cell_view.kill_view_cb)
-        pixbuf_view->cell_view.kill_view_cb (
-            ecell_view, pixbuf_view->cell_view.kill_view_cb_data);
+	pixbuf_view->cell_view.kill_view_cb (
+	    ecell_view, pixbuf_view->cell_view.kill_view_cb_data);
 
     if (pixbuf_view->cell_view.kill_view_cb_data)
-        g_list_free (pixbuf_view->cell_view.kill_view_cb_data);
+	g_list_free (pixbuf_view->cell_view.kill_view_cb_data);
 
     g_free (pixbuf_view);
 }
@@ -111,7 +111,7 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr,
     /* we can't make sure we really got a pixbuf since, well, it's a Gdk thing */
 
     if (x2 - x1 == 0)
-        return;
+	return;
 
     if (!cell_pixbuf)
 	return;
@@ -121,17 +121,17 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr,
 
     /* We center the pixbuf within our allocated space */
     if (x2 - x1 > pix_w) {
-        gint diff = (x2 - x1) - pix_w;
-        real_x = x1 + diff/2;
+	gint diff = (x2 - x1) - pix_w;
+	real_x = x1 + diff/2;
     } else {
-        real_x = x1;
+	real_x = x1;
     }
 
     if (y2 - y1 > pix_h) {
-        gint diff = (y2 - y1) - pix_h;
-        real_y = y1 + diff/2;
+	gint diff = (y2 - y1) - pix_h;
+	real_y = y1 + diff/2;
     } else {
-        real_y = y1;
+	real_y = y1;
     }
 
     cairo_save (cr);
@@ -156,7 +156,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
     GdkPixbuf *pixbuf;
     if (row == -1) {
       if (e_table_model_row_count (ecell_view->e_table_model) > 0) {
-        row = 0;
+	row = 0;
       } else {
 	return 6;
       }
@@ -164,7 +164,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 
     pixbuf = (GdkPixbuf *) e_table_model_value_at (ecell_view->e_table_model, 1, row);
     if (!pixbuf)
-        return 0;
+	return 0;
 
     /* We give ourselves 3 pixels of padding on either side */
     return gdk_pixbuf_get_height (pixbuf) + 6;
@@ -225,21 +225,21 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col)
     gint max_width = -1;
 
     if (model_col == 0) {
-        num_rows = e_table_model_row_count (ecell_view->e_table_model);
-
-        for (i = 0; i <= num_rows; i++) {
-            GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at
-                (ecell_view->e_table_model,
-                 1,
-                 i);
-           if (!pixbuf)
-               continue;
-            pw = gdk_pixbuf_get_width (pixbuf);
-            if (max_width < pw)
-                max_width = pw;
-        }
+	num_rows = e_table_model_row_count (ecell_view->e_table_model);
+
+	for (i = 0; i <= num_rows; i++) {
+	    GdkPixbuf *pixbuf = (GdkPixbuf *) e_table_model_value_at
+		(ecell_view->e_table_model,
+		 1,
+		 i);
+	   if (!pixbuf)
+	       continue;
+	    pw = gdk_pixbuf_get_width (pixbuf);
+	    if (max_width < pw)
+		max_width = pw;
+	}
     } else {
-        return -1;
+	return -1;
     }
 
     return max_width;
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index abfe61e206..334e6be77a 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -130,8 +130,8 @@ e_cell_popup_class_init		(ECellPopupClass	*class)
 	ecc->get_bg_color = ecp_get_bg_color;
 
 	gal_a11y_e_cell_registry_add_cell_type (NULL,
-                                                E_TYPE_CELL_POPUP,
-                                                gal_a11y_e_cell_popup_new);
+						E_TYPE_CELL_POPUP,
+						gal_a11y_e_cell_popup_new);
 }
 
 static void
@@ -183,8 +183,8 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	ecp_view->cell_view.ecell = ecell;
 	ecp_view->cell_view.e_table_model = table_model;
 	ecp_view->cell_view.e_table_item_view = e_table_item_view;
-        ecp_view->cell_view.kill_view_cb = NULL;
-        ecp_view->cell_view.kill_view_cb_data = NULL;
+	ecp_view->cell_view.kill_view_cb = NULL;
+	ecp_view->cell_view.kill_view_cb_data = NULL;
 
 	ecp_view->child_view = e_cell_new_view (ecp->child, table_model,
 						e_table_item_view);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 245f894067..d79c826b5c 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -326,7 +326,7 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	text_view->cell_view.e_table_model = table_model;
 	text_view->cell_view.e_table_item_view = e_table_item_view;
 	text_view->cell_view.kill_view_cb = NULL;
-        text_view->cell_view.kill_view_cb_data = NULL;
+	text_view->cell_view.kill_view_cb_data = NULL;
 
 	text_view->canvas = canvas;
 
@@ -345,7 +345,7 @@ ect_kill_view (ECellView *ecv)
 	ECellTextView *text_view = (ECellTextView *) ecv;
 
 	if (text_view->cell_view.kill_view_cb)
-            (text_view->cell_view.kill_view_cb)(ecv, text_view->cell_view.kill_view_cb_data);
+	    (text_view->cell_view.kill_view_cb)(ecv, text_view->cell_view.kill_view_cb_data);
 
 	if (text_view->cell_view.kill_view_cb_data)
 	    g_list_free (text_view->cell_view.kill_view_cb_data);
@@ -722,8 +722,8 @@ ect_draw (ECellView *ecell_view, cairo_t *cr,
 	x_origin = x1 + ect->x + text_view->xofs - (edit ? edit->xofs_edit : 0);
 	y_origin = y1 + ect->y + text_view->yofs - (edit ? edit->yofs_edit : 0);
 
-        cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1);
-        cairo_clip (cr);
+	cairo_rectangle (cr, x1, y1, x2 - x1, y2 - y1);
+	cairo_clip (cr);
 
 	layout = generate_layout (text_view, model_col, view_col, row, x2 - x1);
 
@@ -731,33 +731,33 @@ ect_draw (ECellView *ecell_view, cairo_t *cr,
 		layout = layout_with_preedit  (text_view, row, edit->text ? edit->text : "?",  x2 - x1);
 	}
 
-        cairo_move_to (cr, x_origin, y_origin);
+	cairo_move_to (cr, x_origin, y_origin);
 	pango_cairo_show_layout (cr, layout);
 
 	if (edit && edit->view_col == view_col && edit->row == row) {
 		if (edit->selection_start != edit->selection_end) {
 			cairo_region_t *clip_region;
-                        gint indices[2];
-                        GtkStateType state;
+			gint indices[2];
+			GtkStateType state;
 
-                        state = edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
+			state = edit->has_selection ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE;
 
 			indices[0] = MIN (edit->selection_start, edit->selection_end);
 			indices[1] = MAX (edit->selection_start, edit->selection_end);
 
-                        clip_region = gdk_pango_layout_get_clip_region (layout,
-                                                                        x_origin, y_origin,
-                                                                        indices, 1);
-                        gdk_cairo_region (cr, clip_region);
-                        cairo_clip (cr);
+			clip_region = gdk_pango_layout_get_clip_region (layout,
+									x_origin, y_origin,
+									indices, 1);
+			gdk_cairo_region (cr, clip_region);
+			cairo_clip (cr);
 			cairo_region_destroy (clip_region);
 
-                        gdk_cairo_set_source_color (cr, &style->base[state]);
-                        cairo_paint (cr);
+			gdk_cairo_set_source_color (cr, &style->base[state]);
+			cairo_paint (cr);
 
-                        gdk_cairo_set_source_color (cr, &style->text[state]);
-                        cairo_move_to (cr, x_origin, y_origin);
-                        pango_cairo_show_layout (cr, layout);
+			gdk_cairo_set_source_color (cr, &style->text[state]);
+			cairo_move_to (cr, x_origin, y_origin);
+			pango_cairo_show_layout (cr, layout);
 		} else {
 			if (edit->show_cursor) {
 				PangoRectangle strong_pos, weak_pos;
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 1a4b00bb4c..e75c973d57 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -742,7 +742,7 @@ e_cell_tree_class_init (ECellTreeClass *class)
 	ecc->max_width        = ect_max_width;
 	ecc->get_bg_color     = ect_get_bg_color;
 
-        gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new);
+	gal_a11y_e_cell_registry_add_cell_type (NULL, E_TYPE_CELL_TREE, gal_a11y_e_cell_tree_new);
 }
 
 static void
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 1e5875b2b1..5d0c5989a5 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -53,8 +53,8 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	vbox_view->cell_view.ecell = ecell;
 	vbox_view->cell_view.e_table_model = table_model;
 	vbox_view->cell_view.e_table_item_view = e_table_item_view;
-        vbox_view->cell_view.kill_view_cb = NULL;
-        vbox_view->cell_view.kill_view_cb_data = NULL;
+	vbox_view->cell_view.kill_view_cb = NULL;
+	vbox_view->cell_view.kill_view_cb_data = NULL;
 
 	/* create our subcell view */
 	vbox_view->subcell_view_count = ecv->subcell_count;
@@ -78,11 +78,11 @@ ecv_kill_view (ECellView *ecv)
 	ECellVboxView *vbox_view = (ECellVboxView *) ecv;
 	gint i;
 
-        if (vbox_view->cell_view.kill_view_cb)
+	if (vbox_view->cell_view.kill_view_cb)
 		(vbox_view->cell_view.kill_view_cb)(ecv, vbox_view->cell_view.kill_view_cb_data);
 
-        if (vbox_view->cell_view.kill_view_cb_data)
-            g_list_free (vbox_view->cell_view.kill_view_cb_data);
+	if (vbox_view->cell_view.kill_view_cb_data)
+	    g_list_free (vbox_view->cell_view.kill_view_cb_data);
 
 	/* kill our subcell view */
 	for (i = 0; i < vbox_view->subcell_view_count; i++)
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 91a77c83c5..dafd0b79fe 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -190,7 +190,7 @@ etfci_update (GnomeCanvasItem *item,
 	x2 = etfci->width;
 	y2 = etfci->height;
 
-        gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2);
+	gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2);
 
 	if (item->x1 != x1 ||
 	    item->y1 != y1 ||
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index f9c12b2a9a..7f4352a6d5 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1032,7 +1032,7 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (item);
 	gboolean frozen;
 
-        g_object_get (etgc,
+	g_object_get (etgc,
 		      "frozen", &frozen,
 		      NULL);
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 0c56b59ea2..e6371b01b6 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -176,7 +176,7 @@ ethi_update (GnomeCanvasItem *item,
              gint flags)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-        double x1, y1, x2, y2;
+	double x1, y1, x2, y2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)
 		GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update (
@@ -197,7 +197,7 @@ ethi_update (GnomeCanvasItem *item,
 	x2 = ethi->width;
 	y2 = ethi->height;
 
-        gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2);
+	gnome_canvas_matrix_transform_rect (i2c, &x1, &y1, &x2, &y2);
 
 	if (item->x1 != x1 ||
 	    item->y1 != y1 ||
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 75a8f44d5d..f51c741127 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -439,7 +439,7 @@ eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdoubl
 	*y2 = eti->height;
 
 	gnome_canvas_item_i2c_matrix (GNOME_CANVAS_ITEM (eti), &i2c);
-        gnome_canvas_matrix_transform_rect (&i2c, x1, y1, x2, y2);
+	gnome_canvas_matrix_transform_rect (&i2c, x1, y1, x2, y2);
 }
 
 static void
@@ -477,7 +477,7 @@ static void
 eti_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
-        double x1, x2, y1, y2;
+	double x1, x2, y1, y2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)
 		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)(item, i2c, flags);
@@ -1324,7 +1324,7 @@ eti_add_selection_model (ETableItem *eti, ESelectionModel *selection)
 		G_CALLBACK (eti_cursor_activated), eti);
 
 	eti_selection_change (selection, eti);
-        g_signal_emit_by_name (G_OBJECT (eti),
+	g_signal_emit_by_name (G_OBJECT (eti),
                                "selection_model_added", eti->selection);
 }
 
@@ -1640,7 +1640,7 @@ eti_realize (GnomeCanvasItem *item)
 	GtkStyle *style;
 
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
-                (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
+		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
 
 	eti->rows = e_table_model_row_count (eti->table_model);
 
@@ -1707,23 +1707,23 @@ eti_unrealize (GnomeCanvasItem *item)
 	eti->height = 0;
 
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)
-                (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item);
+		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item);
 }
 
 static void
 eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style,
                     gint x1, gint y1, gint x2, gint y2)
 {
-        cairo_save (cr);
+	cairo_save (cr);
 
-        cairo_set_line_width (cr, 1.0);
-        gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
+	cairo_set_line_width (cr, 1.0);
+	gdk_cairo_set_source_color (cr, &style->dark[GTK_STATE_NORMAL]);
 
-        cairo_move_to (cr, x1 + 0.5, y1 + 0.5);
-        cairo_line_to (cr, x2 + 0.5, y2 + 0.5);
-        cairo_stroke (cr);
+	cairo_move_to (cr, x1 + 0.5, y1 + 0.5);
+	cairo_line_to (cr, x2 + 0.5, y2 + 0.5);
+	cairo_stroke (cr);
 
-        cairo_restore (cr);
+	cairo_restore (cr);
 }
 
 static void
@@ -1741,7 +1741,7 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 	cairo_matrix_t i2c;
 	gdouble eti_base_x, eti_base_y, lower_right_y, lower_right_x;
 	GtkWidget *canvas = GTK_WIDGET (item->canvas);
-        GtkStyle *style = gtk_widget_get_style (canvas);
+	GtkStyle *style = gtk_widget_get_style (canvas);
 	gint height_extra = eti->horizontal_draw_grid ? 1 : 0;
 
 	/*
@@ -1750,11 +1750,11 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 	gnome_canvas_item_i2c_matrix (item, &i2c);
 	eti_base_x = 0;
 	eti_base_y = 0;
-        cairo_matrix_transform_point (&i2c, &eti_base_x, &eti_base_y);
+	cairo_matrix_transform_point (&i2c, &eti_base_x, &eti_base_y);
 
 	lower_right_x = eti->width;
 	lower_right_y = eti->height;
-        cairo_matrix_transform_point (&i2c, &lower_right_x, &lower_right_y);
+	cairo_matrix_transform_point (&i2c, &lower_right_x, &lower_right_y);
 
 	/*
 	 * First column to draw, last column to draw
@@ -2005,18 +2005,18 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 	 * Draw focus
 	 */
 	if (eti->draw_focus && f_found) {
-                static const double dash[] = { 1.0, 1.0 };
-                cairo_set_line_width (cr, 1.0);
-                cairo_rectangle (cr,
-                                 f_x1 + 0.5, f_x2 + 0.5,
-                                 f_x2 - f_x1 - 1, f_y2 - f_y1);
+		static const double dash[] = { 1.0, 1.0 };
+		cairo_set_line_width (cr, 1.0);
+		cairo_rectangle (cr,
+				 f_x1 + 0.5, f_x2 + 0.5,
+				 f_x2 - f_x1 - 1, f_y2 - f_y1);
 
-                gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
-                cairo_stroke_preserve (cr);
+		gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+		cairo_stroke_preserve (cr);
 
-                cairo_set_dash (cr, dash, G_N_ELEMENTS (dash), 0.0);
-                gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
-                cairo_stroke (cr);
+		cairo_set_dash (cr, dash, G_N_ELEMENTS (dash), 0.0);
+		gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
+		cairo_stroke (cr);
 	}
 }
 
@@ -3239,7 +3239,7 @@ e_table_item_compute_location (ETableItem        *eti,
 			       gint               *col)
 {
 	/* Save the grabbed row but make sure that we don't get flawed
-           results because the cursor is grabbed. */
+	   results because the cursor is grabbed. */
 	gint grabbed_row = eti->grabbed_row;
 	eti->grabbed_row = -1;
 
@@ -3264,7 +3264,7 @@ e_table_item_compute_mouse_over (ETableItem        *eti,
 {
 	gdouble realx, realy;
 	/* Save the grabbed row but make sure that we don't get flawed
-           results because the cursor is grabbed. */
+	   results because the cursor is grabbed. */
 	gint grabbed_row = eti->grabbed_row;
 	eti->grabbed_row = -1;
 
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 5028a48a6b..c7e955efba 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1381,9 +1381,9 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 		g_signal_connect (
 			G_OBJECT (e_table->click_to_add), "event",
 			G_CALLBACK (click_to_add_event), e_table);
-                g_signal_connect (
+		g_signal_connect (
                         G_OBJECT (e_table->click_to_add), "cursor_change",
-                        G_CALLBACK (click_to_add_cursor_change), e_table);
+			G_CALLBACK (click_to_add_cursor_change), e_table);
 	}
 }
 
@@ -3269,8 +3269,8 @@ e_table_class_init (ETableClass *class)
 
 	widget_class->grab_focus        = et_grab_focus;
 	widget_class->unrealize         = et_unrealize;
-        widget_class->get_preferred_width = et_get_preferred_width;
-        widget_class->get_preferred_height = et_get_preferred_height;
+	widget_class->get_preferred_width = et_get_preferred_width;
+	widget_class->get_preferred_height = et_get_preferred_height;
 
 	widget_class->focus             = et_focus;
 
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index cc8a1fcd6a..cd438a77e2 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -501,7 +501,7 @@ static void
 etsm_invert_selection (ESelectionModel *selection)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
-        gint count = etsm_row_count (selection);
+	gint count = etsm_row_count (selection);
 	gint i;
 
 	for (i = 0; i < count; i++) {
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index d529a6e045..4ca80d97a0 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -116,10 +116,10 @@ lookup_gnode (ETreeTableAdapter *etta, ETreePath path)
 static void
 resize_map (ETreeTableAdapter *etta, gint size)
 {
-        if (size > etta->priv->n_vals_allocated) {
-                etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size);
-                etta->priv->map_table = g_renew (node_t *, etta->priv->map_table, etta->priv->n_vals_allocated);
-        }
+	if (size > etta->priv->n_vals_allocated) {
+		etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size);
+		etta->priv->map_table = g_renew (node_t *, etta->priv->map_table, etta->priv->n_vals_allocated);
+	}
 
 	etta->priv->n_map = size;
 }
diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index 660a0ebd9a..c57d7083e6 100644
--- a/widgets/table/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
@@ -57,16 +57,16 @@ gal_a11y_e_cell_toggle_get_type (void)
     {
       static const GTypeInfo tinfo =
       {
-        sizeof (GalA11yECellToggleClass),
-        (GBaseInitFunc) NULL, /* base init */
-        (GBaseFinalizeFunc) NULL, /* base finalize */
-        (GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */
-        (GClassFinalizeFunc) NULL, /* class finalize */
-        NULL, /* class data */
-        sizeof (GalA11yECellToggle), /* instance size */
-        0, /* nb preallocs */
-        NULL, /* instance init */
-        NULL /* value table */
+	sizeof (GalA11yECellToggleClass),
+	(GBaseInitFunc) NULL, /* base init */
+	(GBaseFinalizeFunc) NULL, /* base finalize */
+	(GClassInitFunc) gal_a11y_e_cell_toggle_class_init, /* class init */
+	(GClassFinalizeFunc) NULL, /* class finalize */
+	NULL, /* class data */
+	sizeof (GalA11yECellToggle), /* instance size */
+	0, /* nb preallocs */
+	NULL, /* instance init */
+	NULL /* value table */
       };
 
       type = g_type_register_static (GAL_A11Y_TYPE_E_CELL,
@@ -108,10 +108,10 @@ toggle_cell_action (GalA11yECell *cell)
 
 	event.type = GDK_BUTTON_PRESS;
 	event.window = gtk_layout_get_bin_window (layout);
-        event.button = 1;
-        event.send_event = TRUE;
-        event.time = GDK_CURRENT_TIME;
-        event.axes = NULL;
+	event.button = 1;
+	event.send_event = TRUE;
+	event.time = GDK_CURRENT_TIME;
+	event.axes = NULL;
 
 	g_signal_emit_by_name (cell->item, "event", &event, &finished);
 }
@@ -130,7 +130,7 @@ model_change_cb (ETableModel *etm,
 			e_table_model_value_at (cell->cell_view->e_table_model,
 						cell->model_col, cell->row));
 		/* Cheat gnopernicus, or it will ignore the state change signal  */
-                atk_focus_tracker_notify (ATK_OBJECT (cell));
+		atk_focus_tracker_notify (ATK_OBJECT (cell));
 
 		if (value)
 			gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, TRUE);
@@ -160,13 +160,13 @@ gal_a11y_e_cell_toggle_new (ETableItem *item,
 	toggle_cell = GAL_A11Y_E_CELL_TOGGLE (a11y);
 	a11y->role  = ATK_ROLE_TABLE_CELL;
 
-        gal_a11y_e_cell_construct (a11y,
-                                   item,
-                                   cell_view,
-                                   parent,
-                                   model_col,
-                                   view_col,
-                                   row);
+	gal_a11y_e_cell_construct (a11y,
+				   item,
+				   cell_view,
+				   parent,
+				   model_col,
+				   view_col,
+				   row);
 
 	gal_a11y_e_cell_add_action (cell,
 				    "toggle",
@@ -182,7 +182,7 @@ gal_a11y_e_cell_toggle_new (ETableItem *item,
 
 	value = GPOINTER_TO_INT (
 			e_table_model_value_at (cell->cell_view->e_table_model,
-                                                cell->model_col, cell->row));
+						cell->model_col, cell->row));
 	if (value)
 		gal_a11y_e_cell_add_state (cell, ATK_STATE_CHECKED, FALSE);
 	else
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 1a95c46a90..ee06f6e025 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -69,28 +69,28 @@ static void
 kill_view_cb (ECellView *subcell_view,
              gpointer psubcell_a11ies)
 {
-        GList *node;
+	GList *node;
 	GList *subcell_a11ies = (GList *) psubcell_a11ies;
-        GalA11yECell *subcell;
+	GalA11yECell *subcell;
 
-        for (node = subcell_a11ies; node != NULL; node = g_list_next (node))
-        {
-            subcell = GAL_A11Y_E_CELL (node->data);
-            if (subcell && subcell->cell_view == subcell_view)
-            {
+	for (node = subcell_a11ies; node != NULL; node = g_list_next (node))
+	{
+	    subcell = GAL_A11Y_E_CELL (node->data);
+	    if (subcell && subcell->cell_view == subcell_view)
+	    {
                 d(fprintf(stderr, "subcell_view %p deleted before the a11y object %p\n", subcell_view, subcell));
-                subcell->cell_view = NULL;
-            }
-        }
+		subcell->cell_view = NULL;
+	    }
+	}
 }
 
 static void
 ectr_subcell_weak_ref (GalA11yECellTree *a11y,
 		       GalA11yECell     *subcell_a11y)
 {
-        ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL;
-        if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data)
-            subcell_view->kill_view_cb_data = g_list_remove (subcell_view->kill_view_cb_data, subcell_a11y);
+	ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL;
+	if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data)
+	    subcell_view->kill_view_cb_data = g_list_remove (subcell_view->kill_view_cb_data, subcell_a11y);
 
 	g_signal_handler_disconnect (GAL_A11Y_E_CELL (a11y)->item->table_model,
 				     a11y->model_row_changed_id);
@@ -102,11 +102,11 @@ ectr_do_action_expand (AtkAction *action)
 {
 	GalA11yECell *a11y;
 	ETableModel *table_model;
-        ETreePath node;
+	ETreePath node;
 	ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
+	ETreeTableAdapter *tree_table_adapter;
 
-        a11y = GAL_A11Y_E_CELL (action);
+	a11y = GAL_A11Y_E_CELL (action);
 	table_model = a11y->item->table_model;
 	node = e_table_model_value_at (table_model, -1, a11y->row);
 	tree_model = e_table_model_value_at (table_model, -2, a11y->row);
@@ -125,15 +125,15 @@ ectr_do_action_collapse (AtkAction *action)
 {
 	GalA11yECell *a11y;
 	ETableModel *table_model;
-        ETreePath node;
+	ETreePath node;
 	ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
+	ETreeTableAdapter *tree_table_adapter;
 
-        a11y = GAL_A11Y_E_CELL (action);
+	a11y = GAL_A11Y_E_CELL (action);
 	table_model = a11y->item->table_model;
-        node = e_table_model_value_at (table_model, -1, a11y->row);
+	node = e_table_model_value_at (table_model, -1, a11y->row);
 	tree_model = e_table_model_value_at (table_model, -2, a11y->row);
-        tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row);
+	tree_table_adapter = e_table_model_value_at (table_model, -3, a11y->row);
 
 	if (e_tree_model_node_is_expandable (tree_model, node)) {
 		e_tree_table_adapter_node_set_expanded (tree_table_adapter,
@@ -191,9 +191,9 @@ gal_a11y_e_cell_tree_new (ETableItem *item,
 	AtkObject *subcell_a11y;
 	GalA11yECellTree *a11y;
 
-        ETreePath node;
-        ETreeModel *tree_model;
-        ETreeTableAdapter *tree_table_adapter;
+	ETreePath node;
+	ETreeModel *tree_model;
+	ETreeTableAdapter *tree_table_adapter;
 
 	ECellView *subcell_view;
 	subcell_view = e_cell_tree_view_get_subcell_view (cell_view);
@@ -249,12 +249,12 @@ gal_a11y_e_cell_tree_new (ETableItem *item,
 				  G_CALLBACK (ectr_model_row_changed_cb),
 				  subcell_a11y);
 
-        if (subcell_a11y && subcell_view)
-        {
-            subcell_view->kill_view_cb = kill_view_cb;
-            if (!g_list_find (subcell_view->kill_view_cb_data, subcell_a11y))
-                subcell_view->kill_view_cb_data = g_list_append (subcell_view->kill_view_cb_data, subcell_a11y);
-        }
+	if (subcell_a11y && subcell_view)
+	{
+	    subcell_view->kill_view_cb = kill_view_cb;
+	    if (!g_list_find (subcell_view->kill_view_cb_data, subcell_a11y))
+		subcell_view->kill_view_cb_data = g_list_append (subcell_view->kill_view_cb_data, subcell_a11y);
+	}
 
 	g_object_weak_ref (G_OBJECT (subcell_a11y), (GWeakNotify) ectr_subcell_weak_ref, a11y);
 
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index 65a1fe9759..17f9b8f166 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -105,7 +105,7 @@ static G_CONST_RETURN gchar *
 gal_a11y_e_cell_get_name (AtkObject * a11y)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (a11y);
-        ETableCol *ecol;
+	ETableCol *ecol;
 
 	if (a11y->name != NULL && strcmp (a11y->name, ""))
 		return a11y->name;
diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index e13e6599b4..9c9390a9c2 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
@@ -40,7 +40,7 @@ static AtkObjectFactoryClass *parent_class;
 static GType
 gal_a11y_e_table_click_to_add_factory_get_accessible_type (void)
 {
-        return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD;
+	return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD;
 }
 
 static AtkObject*
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 05f145f6ed..1b7ce531e2 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -188,9 +188,9 @@ etcta_class_init (GalA11yETableClickToAddClass *class)
 	parent_class = g_type_class_ref (PARENT_TYPE);
 
 	atk_object_class->get_name = etcta_get_name;
-        atk_object_class->get_n_children = etcta_get_n_children;
-        atk_object_class->ref_child = etcta_ref_child;
-        atk_object_class->ref_state_set = etcta_ref_state_set;
+	atk_object_class->get_n_children = etcta_get_n_children;
+	atk_object_class->ref_child = etcta_ref_child;
+	atk_object_class->ref_state_set = etcta_ref_state_set;
 }
 
 static void
@@ -234,14 +234,14 @@ gal_a11y_e_table_click_to_add_get_type (void)
 			NULL
 		};
 
-                factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
+		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
 
 		parent_type = atk_object_factory_get_accessible_type (factory);
-                type = gal_a11y_type_register_static_with_private (PARENT_TYPE,
+		type = gal_a11y_type_register_static_with_private (PARENT_TYPE,
 				"GalA11yETableClickToAdd", &info, 0,
 				sizeof (GalA11yETableClickToAddPrivate), &priv_offset);
 
-                g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info);
+		g_type_add_interface_static (type, ATK_TYPE_ACTION, &atk_action_info);
 
 	}
 
@@ -251,7 +251,7 @@ gal_a11y_e_table_click_to_add_get_type (void)
 static gboolean
 etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data)
 {
-        ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
+	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
 	GalA11yETableClickToAdd *a11y;
 	GalA11yETableClickToAddPrivate *priv;
 
diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index face3ad06b..5d9c4bbdb8 100644
--- a/widgets/table/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
@@ -34,7 +34,7 @@ static AtkObjectFactoryClass *parent_class;
 static GType
 gal_a11y_e_table_factory_get_accessible_type (void)
 {
-        return GAL_A11Y_TYPE_E_TABLE;
+	return GAL_A11Y_TYPE_E_TABLE;
 }
 
 static AtkObject*
diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index c987b0068a..fb1b3a9966 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
@@ -40,7 +40,7 @@ static AtkObjectFactoryClass *parent_class;
 static GType
 gal_a11y_e_table_item_factory_get_accessible_type (void)
 {
-        return GAL_A11Y_TYPE_E_TABLE_ITEM;
+	return GAL_A11Y_TYPE_E_TABLE_ITEM;
 }
 
 static AtkObject*
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 218265ecdd..eb0c9be127 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -87,9 +87,9 @@ eti_ref_state_set (AtkObject *accessible)
 {
 	GalA11yETableItemPrivate *priv = GET_PRIVATE (accessible);
 
-        g_object_ref (priv->state_set);
+	g_object_ref (priv->state_set);
 
-        return priv->state_set;
+	return priv->state_set;
 }
 
 inline static gint
@@ -329,10 +329,10 @@ cell_destroyed (gpointer data)
 
 	g_return_if_fail (cell->item && G_IS_OBJECT (cell->item));
 
-        if (cell->item) {
-                g_object_unref (cell->item);
-                cell->item = NULL;
-        }
+	if (cell->item) {
+		g_object_unref (cell->item);
+		cell->item = NULL;
+	}
 
 }
 
@@ -693,7 +693,7 @@ eti_rows_inserted (ETableModel * model, gint row, gint count,
 	g_return_if_fail (table_item);
 	item_a11y = GAL_A11Y_E_TABLE_ITEM (table_item);
 
-        n_cols = atk_table_get_n_columns (ATK_TABLE (table_item));
+	n_cols = atk_table_get_n_columns (ATK_TABLE (table_item));
 	n_rows = atk_table_get_n_rows (ATK_TABLE (table_item));
 
 	old_nrows = GET_PRIVATE (item_a11y)->rows;
@@ -706,13 +706,13 @@ eti_rows_inserted (ETableModel * model, gint row, gint count,
 	g_signal_emit_by_name (table_item, "row-inserted", row,
 			       count, NULL);
 
-        for (i = row; i < (row + count); i++) {
-                for (j = 0; j < n_cols; j++) {
+	for (i = row; i < (row + count); i++) {
+		for (j = 0; j < n_cols; j++) {
 			g_signal_emit_by_name (table_item,
 					       "children_changed::add",
-                                               ( ((i + 1)*n_cols) + j), NULL, NULL);
+					       ( ((i + 1)*n_cols) + j), NULL, NULL);
 		}
-        }
+	}
 
 	g_signal_emit_by_name (table_item, "visible-data-changed");
 }
@@ -727,7 +727,7 @@ eti_rows_deleted (ETableModel * model, gint row, gint count,
 		ATK_GOBJECT_ACCESSIBLE (table_item)));
 
 	n_rows = atk_table_get_n_rows (ATK_TABLE (table_item));
-        n_cols = atk_table_get_n_columns (ATK_TABLE (table_item));
+	n_cols = atk_table_get_n_columns (ATK_TABLE (table_item));
 
 	old_nrows = GET_PRIVATE (table_item)->rows;
 
@@ -738,13 +738,13 @@ eti_rows_deleted (ETableModel * model, gint row, gint count,
 	g_signal_emit_by_name (table_item, "row-deleted", row,
 			       count, NULL);
 
-        for (i = row; i < (row + count); i++) {
-                for (j = 0; j < n_cols; j++) {
+	for (i = row; i < (row + count); i++) {
+		for (j = 0; j < n_cols; j++) {
 			g_signal_emit_by_name (table_item,
 					       "children_changed::remove",
-                                               ( ((i + 1)*n_cols) + j), NULL, NULL);
+					       ( ((i + 1)*n_cols) + j), NULL, NULL);
 		}
-        }
+	}
 	g_signal_emit_by_name (table_item, "visible-data-changed");
 	eti_a11y_reset_focus_object ((GalA11yETableItem *)table_item, item, TRUE);
 }
@@ -781,67 +781,67 @@ static void
 eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 {
 
-        gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE;
-        GalA11yETableItem * a11y_item;
-        ETableCol ** cols, **prev_cols;
-        GalA11yETableItemPrivate *priv;
-        gint *state = NULL, *prev_state = NULL, *reorder = NULL;
-        gint i,j,n_rows,n_cols, prev_n_cols;
+	gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE;
+	GalA11yETableItem * a11y_item;
+	ETableCol ** cols, **prev_cols;
+	GalA11yETableItemPrivate *priv;
+	gint *state = NULL, *prev_state = NULL, *reorder = NULL;
+	gint i,j,n_rows,n_cols, prev_n_cols;
 
-        a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y);
-        priv = GET_PRIVATE (a11y_item);
+	a11y_item = GAL_A11Y_E_TABLE_ITEM (a11y);
+	priv = GET_PRIVATE (a11y_item);
 
 	/* Assume rows do not changed. */
-        n_rows = priv->rows;
+	n_rows = priv->rows;
 
-        prev_n_cols = priv->cols;
-        prev_cols = priv->columns;
+	prev_n_cols = priv->cols;
+	prev_cols = priv->columns;
 
-        cols = e_table_header_get_columns (eth);
+	cols = e_table_header_get_columns (eth);
 	n_cols = eth->col_count;
 
-        g_return_if_fail (cols && prev_cols && n_cols > 0);
+	g_return_if_fail (cols && prev_cols && n_cols > 0);
 
         /* Init to ETI_HEADER_UNCHANGED. */
-        state = g_malloc0 (sizeof (gint) * n_cols);
-        prev_state = g_malloc0 (sizeof (gint) * prev_n_cols);
-        reorder = g_malloc0 (sizeof (gint) * n_cols);
+	state = g_malloc0 (sizeof (gint) * n_cols);
+	prev_state = g_malloc0 (sizeof (gint) * prev_n_cols);
+	reorder = g_malloc0 (sizeof (gint) * n_cols);
 
         /* Compare with previously saved column headers. */
-        for (i = 0; i < n_cols && cols[i]; i++) {
-                for (j = 0; j < prev_n_cols && prev_cols[j]; j++) {
-                        if (prev_cols[j] == cols[i] && i != j) {
+	for (i = 0; i < n_cols && cols[i]; i++) {
+		for (j = 0; j < prev_n_cols && prev_cols[j]; j++) {
+			if (prev_cols[j] == cols[i] && i != j) {
 
-                                reorder_found = TRUE;
-                                state[i] = ETI_HEADER_REORDERED;
+				reorder_found = TRUE;
+				state[i] = ETI_HEADER_REORDERED;
 				reorder[i] = j;
 
-                                break;
-                        } else if (prev_cols[j] == cols[i]) {
+				break;
+			} else if (prev_cols[j] == cols[i]) {
                                 /* OK, this column is not changed. */
-                                break;
-                        }
-                }
+				break;
+			}
+		}
 
                 /* cols[i] is new added column. */
-                if (j == prev_n_cols) {
+		if (j == prev_n_cols) {
 			added_found = TRUE;
-                        state[i] = ETI_HEADER_NEW_ADDED;
-                }
-        }
+			state[i] = ETI_HEADER_NEW_ADDED;
+		}
+	}
 
         /* Now try to find if there are removed columns. */
-        for (i = 0; i < prev_n_cols && prev_cols[i]; i++) {
-                for (j = 0; j < n_cols && cols[j]; j++)
-                        if (prev_cols[j] == cols[i])
+	for (i = 0; i < prev_n_cols && prev_cols[i]; i++) {
+		for (j = 0; j < n_cols && cols[j]; j++)
+			if (prev_cols[j] == cols[i])
 				break;
 
                 /* Removed columns found. */
-                if (j == n_cols) {
+		if (j == n_cols) {
 			removed_found = TRUE;
 			prev_state[j] = ETI_HEADER_REMOVED;
-                }
-        }
+		}
+	}
 
 	/* If nothing interesting just return. */
 	if (!reorder_found && !added_found && !removed_found)
@@ -1064,9 +1064,9 @@ gal_a11y_e_table_item_new (ETableItem *item)
 	GET_PRIVATE (a11y)->cols = item->cols;
 	GET_PRIVATE (a11y)->rows = item->rows;
 
-        GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header);
-        if ( GET_PRIVATE (a11y)->columns == NULL)
-                return NULL;
+	GET_PRIVATE (a11y)->columns = e_table_header_get_columns (item->header);
+	if ( GET_PRIVATE (a11y)->columns == NULL)
+		return NULL;
 
 	if (item) {
 		g_signal_connect (G_OBJECT(item), "selection_model_removed",
diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index cf864ca283..8d1951580d 100644
--- a/widgets/table/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
@@ -33,7 +33,7 @@ static AtkObjectFactoryClass *parent_class;
 static GType
 gal_a11y_e_tree_factory_get_accessible_type (void)
 {
-        return GAL_A11Y_TYPE_E_TREE;
+	return GAL_A11Y_TYPE_E_TREE;
 }
 
 static AtkObject*
-- 
cgit v1.2.3


From 2c31a5bc23cf5a092c0621bf34554ffb2b6ae2ec Mon Sep 17 00:00:00 2001
From: Kjartan Maraas <kmaraas@gnome.org>
Date: Tue, 8 Feb 2011 11:57:50 -0500
Subject: Bug 641756 - Fix warnings from GCC 4.6

GCC learned how to find dead assignments.
---
 widgets/table/e-cell-text.c          |  3 ---
 widgets/table/e-cell-tree.c          | 10 ----------
 widgets/table/e-table-header-item.c  |  4 ----
 widgets/table/e-table-header-utils.c | 24 +-----------------------
 widgets/table/e-table-item.c         | 10 ----------
 5 files changed, 1 insertion(+), 50 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index d79c826b5c..310b36c655 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -360,9 +360,6 @@ static void
 ect_realize (ECellView *ecell_view)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
-	GdkWindow *window;
-
-	window = gtk_widget_get_window (GTK_WIDGET (text_view->canvas));
 
 	text_view->i_cursor = gdk_cursor_new (GDK_XTERM);
 
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index e75c973d57..6a277fcce3 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -229,24 +229,14 @@ ect_draw (ECellView *ecell_view,
 	ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter (ecell_view->e_table_model, row);
 	ETreePath node;
 	GdkRectangle rect;
-	GtkWidget *canvas = GTK_WIDGET (tree_view->canvas);
-	GtkStyle *style;
-	gboolean selected;
 	gint offset, subcell_offset;
 
-	style = gtk_widget_get_style (canvas);
-
-	selected = flags & E_CELL_SELECTED;
-
 	cairo_save (cr);
 
 	/* only draw the tree effects if we're the active sort */
 	if (/* XXX */ TRUE) {
 		GdkPixbuf *node_image;
 		gint node_image_width = 0, node_image_height = 0;
-		ETree *tree;
-
-		tree = E_TREE (gtk_widget_get_parent (canvas));
 
 		tree_view->prelit = FALSE;
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index e6371b01b6..2ae10b87f3 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -978,10 +978,8 @@ ethi_draw (GnomeCanvasItem *item,
 	gint x1, x2;
 	gint col;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-	GtkStateType state;
 	GtkStyle *style;
 
-	state = gtk_widget_get_state (GTK_WIDGET (canvas));
 	style = gtk_widget_get_style (GTK_WIDGET (canvas));
 
 	if (ethi->sort_info) {
@@ -1178,14 +1176,12 @@ ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
 	GtkStateType state;
 	GtkStyle *style;
-	GdkWindow *window;
 
 	GtkTargetEntry  ethi_drag_types[] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
 
 	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	window = gtk_widget_get_window (widget);
 	state = gtk_widget_get_state (widget);
 	style = gtk_widget_get_style (widget);
 
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 55e90159c6..2fe6a56089 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -327,16 +327,14 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 	/* Pixbuf or label */
 	if (ecol->icon_name != NULL) {
 		gint pwidth, pheight;
-		gint clip_width, clip_height;
+		gint clip_height;
 		gint xpos;
-		/* GdkPixmap *pixmap; */
 
 		g_return_if_fail (ecol->pixbuf != NULL);
 
 		pwidth = gdk_pixbuf_get_width (ecol->pixbuf);
 		pheight = gdk_pixbuf_get_height (ecol->pixbuf);
 
-		clip_width = MIN (pwidth, inner_width);
 		clip_height = MIN (pheight, inner_height);
 
 		xpos = inner_x;
@@ -360,26 +358,6 @@ e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
 			pango_cairo_show_layout (cr, layout);
 		}
 
-		/* FIXME: For some reason, under clutter gdk_draw_rgb_image_dithalign crashes
-		 * Debug that later */
-#if 0
-		pixmap = make_composite_pixmap (drawable, gc,
-						ecol->pixbuf, &style->bg[state],
-						clip_width, clip_height,
-						xpos,
-						inner_y + (inner_height - clip_height) / 2);
-
-		gdk_gc_set_clip_rectangle (gc, NULL);
-
-		if (pixmap) {
-			gdk_draw_drawable (drawable, gc, pixmap,
-					 0, 0,
-					 xpos,
-					 inner_y + (inner_height - clip_height) / 2,
-					 clip_width, clip_height);
-			g_object_unref (pixmap);
-		}
-#endif
 		gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf,
 					     xpos, inner_y + (inner_height - clip_height) / 2);
 		cairo_paint (cr);
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index f51c741127..98ce069e81 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1635,22 +1635,12 @@ static void
 eti_realize (GnomeCanvasItem *item)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
-	GdkWindow *window;
-	GtkWidget *widget;
-	GtkStyle *style;
 
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
 		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
 
 	eti->rows = e_table_model_row_count (eti->table_model);
 
-	/*
-	 * Gdk Resource allocation
-	 */
-	widget = GTK_WIDGET (item->canvas);
-	style = gtk_widget_get_style (widget);
-	window = gtk_widget_get_window (widget);
-
 	g_signal_connect (GTK_LAYOUT(item->canvas), "scroll_event", G_CALLBACK (eti_tree_unfreeze), eti);
 
 	if (eti->cell_views == NULL)
-- 
cgit v1.2.3


From cdb1098cc61e4b123bfcecb0a1bcd15b293e8aba Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 11 Feb 2011 10:31:38 +0100
Subject: Fix a build break due to #error pragma

---
 widgets/table/e-cell-tree.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 6a277fcce3..467523d6d7 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -669,10 +669,21 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 
 		/* now draw our icon if we're expandable */
 		if (expandable) {
-#if GTK_CHECK_VERSION (3, 0, 0)
-			gboolean expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
-#error Paint an expander here
-#endif
+			gboolean expanded;
+			GdkRectangle r;
+			gint exp_size = 0;
+
+			gtk_widget_style_get (GTK_WIDGET (gtk_widget_get_parent (GTK_WIDGET (tree_view->canvas))), "expander_size", &exp_size, NULL);
+
+			node = e_cell_tree_get_node (ecell_view->e_table_model, row);
+			expanded = e_tree_table_adapter_node_is_expanded (tree_table_adapter, node);
+
+			r.x = 0;
+			r.y = 0;
+			r.width = MIN (width, exp_size);
+			r.height = height;
+
+			draw_expander (tree_view, cr, expanded ? GTK_EXPANDER_EXPANDED : GTK_EXPANDER_COLLAPSED, GTK_STATE_NORMAL, &r);
 		}
 
 		cairo_stroke (cr);
-- 
cgit v1.2.3


From 7a1677520d439aee68c5ab0268a951d0b411e3a0 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 12 Feb 2011 11:37:05 -0500
Subject: Remove NULL checks for GObject methods.

As of GLib 2.28 all GObject virtual methods, including constructed(),
are safe to chain up to unconditionally.  Remove unnecessary checks.
---
 widgets/table/e-cell-pixbuf.c              | 8 --------
 widgets/table/e-table-click-to-add.c       | 4 ++--
 widgets/table/e-table-col.c                | 4 ++--
 widgets/table/e-table-field-chooser-item.c | 4 ++--
 widgets/table/e-table-field-chooser.c      | 4 ++--
 widgets/table/e-table-group-leaf.c         | 4 ++--
 widgets/table/e-table-group.c              | 4 ++--
 widgets/table/e-table-header-item.c        | 4 ++--
 widgets/table/e-table-header.c             | 4 ++--
 widgets/table/e-table-item.c               | 4 ++--
 widgets/table/e-table-model.c              | 9 ---------
 widgets/table/e-table-selection-model.c    | 4 ++--
 12 files changed, 20 insertions(+), 37 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 9687e7d392..3bf671b48a 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -245,13 +245,6 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col)
     return max_width;
 }
 
-static void
-pixbuf_dispose (GObject *object)
-{
-	if (G_OBJECT_CLASS (e_cell_pixbuf_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_cell_pixbuf_parent_class)->dispose) (object);
-}
-
 static void
 pixbuf_set_property (GObject *object,
 		     guint prop_id,
@@ -324,7 +317,6 @@ e_cell_pixbuf_class_init (ECellPixbufClass *class)
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 	ECellClass *ecc = E_CELL_CLASS (class);
 
-	object_class->dispose = pixbuf_dispose;
 	object_class->set_property = pixbuf_set_property;
 	object_class->get_property = pixbuf_get_property;
 
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index d7a1e7f237..773aefc674 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -183,8 +183,8 @@ etcta_dispose (GObject *object)
 		g_object_unref (etcta->selection);
 	etcta->selection = NULL;
 
-	if (G_OBJECT_CLASS (etcta_parent_class)->dispose)
-		(*G_OBJECT_CLASS (etcta_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etcta_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 1238d5c017..2eb688e54f 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -74,8 +74,8 @@ etc_dispose (GObject *object)
 	g_free (etc->icon_name);
 	etc->icon_name = NULL;
 
-	if (G_OBJECT_CLASS (e_table_col_parent_class)->dispose)
-		G_OBJECT_CLASS (e_table_col_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_table_col_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index dafd0b79fe..51ab6c1139 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -82,8 +82,8 @@ etfci_dispose (GObject *object)
 		pango_font_description_free (etfci->font_desc);
 	etfci->font_desc = NULL;
 
-	if (G_OBJECT_CLASS (etfci_parent_class)->dispose)
-		(*G_OBJECT_CLASS (etfci_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etfci_parent_class)->dispose (object);
 }
 
 static gint
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index e038271b86..20ecb6edec 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -232,8 +232,8 @@ e_table_field_chooser_dispose (GObject *object)
 		g_object_unref (etfc->header);
 	etfc->header = NULL;
 
-	if (G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose)
-		(* G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose (object);
 }
 
 GtkWidget*
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 2f287c2abf..7ec55301a0 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -106,8 +106,8 @@ etgl_dispose (GObject *object)
 		etgl->selection_model = NULL;
 	}
 
-	if (G_OBJECT_CLASS (etgl_parent_class)->dispose)
-		G_OBJECT_CLASS (etgl_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etgl_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 2b6f3e971a..8f67a02ba6 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -73,8 +73,8 @@ etg_dispose (GObject *object)
 		etg->model = NULL;
 	}
 
-	if (G_OBJECT_CLASS (etg_parent_class)->dispose)
-		G_OBJECT_CLASS (etg_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (etg_parent_class)->dispose (object);
 }
 
 /**
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2ae10b87f3..1c7f4a2c54 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -137,8 +137,8 @@ ethi_dispose (GObject *object) {
 		g_object_unref (ethi->config);
 	ethi->config = NULL;
 
-	if (G_OBJECT_CLASS (ethi_parent_class)->dispose)
-		(*G_OBJECT_CLASS (ethi_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (ethi_parent_class)->dispose (object);
 }
 
 static gint
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index df772a3c80..f648a8d765 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -181,8 +181,8 @@ eth_finalize (GObject *object)
 	eth->col_count = 0;
 	eth->columns = NULL;
 
-	if (G_OBJECT_CLASS (e_table_header_parent_class)->finalize)
-		G_OBJECT_CLASS (e_table_header_parent_class)->finalize (object);
+	/* Chain up to parent's finalize() method. */
+	G_OBJECT_CLASS (e_table_header_parent_class)->finalize (object);
 }
 
 static void
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 98ce069e81..51e3c9fecd 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1426,8 +1426,8 @@ eti_dispose (GObject *object)
 		g_free (eti->height_cache);
 	eti->height_cache = NULL;
 
-	if (G_OBJECT_CLASS (eti_parent_class)->dispose)
-		(*G_OBJECT_CLASS (eti_parent_class)->dispose) (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (eti_parent_class)->dispose (object);
 }
 
 static void
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 308cdb0c58..3bf5ec5c8f 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -263,20 +263,11 @@ e_table_model_value_to_string (ETableModel *e_table_model, gint col, gconstpoint
 		return g_strdup("");
 }
 
-static void
-e_table_model_finalize (GObject *object)
-{
-	if (G_OBJECT_CLASS (e_table_model_parent_class)->finalize)
-		(* G_OBJECT_CLASS (e_table_model_parent_class)->finalize)(object);
-}
-
 static void
 e_table_model_class_init (ETableModelClass *class)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
 
-	object_class->finalize = e_table_model_finalize;
-
 	e_table_model_signals[MODEL_NO_CHANGE] =
 		g_signal_new ("model_no_change",
 			      G_TYPE_FROM_CLASS (object_class),
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 7c11d1bd4a..18c0f5ea03 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -237,8 +237,8 @@ etsm_dispose (GObject *object)
 	drop_model (etsm);
 	free_hash (etsm);
 
-	if (G_OBJECT_CLASS (e_table_selection_model_parent_class)->dispose)
-		G_OBJECT_CLASS (e_table_selection_model_parent_class)->dispose (object);
+	/* Chain up to parent's dispose() method. */
+	G_OBJECT_CLASS (e_table_selection_model_parent_class)->dispose (object);
 }
 
 static void
-- 
cgit v1.2.3


From 4b9ac3879d25d14cbaaab9237626257c3561f7ff Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 14 Feb 2011 19:15:36 +0100
Subject: Fix few memory leaks

---
 widgets/table/e-cell-hbox.c    |  6 ++++++
 widgets/table/e-table-extras.c | 14 +++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 6710f60bd5..e8f6a0925d 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -266,6 +266,12 @@ ecv_dispose (GObject *object)
 	ecv->subcells = NULL;
 	ecv->subcell_count = 0;
 
+	g_free (ecv->model_cols);
+	ecv->model_cols = NULL;
+
+	g_free (ecv->def_size_cols);
+	ecv->def_size_cols = NULL;
+
 	G_OBJECT_CLASS (e_cell_hbox_parent_class)->dispose (object);
 }
 
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index e42700d6c4..f6dc1118da 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -232,7 +232,7 @@ safe_unref (gpointer object)
 static void
 ete_init (ETableExtras *extras)
 {
-	ECell *cell;
+	ECell *cell, *sub_cell;
 
 	extras->priv = E_TABLE_EXTRAS_GET_PRIVATE (extras);
 
@@ -276,25 +276,33 @@ ete_init (ETableExtras *extras)
 
 	cell = e_cell_checkbox_new ();
 	e_table_extras_add_cell (extras, "checkbox", cell);
+	g_object_unref (cell);
 
 	cell = e_cell_date_new (NULL, GTK_JUSTIFY_LEFT);
 	e_table_extras_add_cell (extras, "date", cell);
+	g_object_unref (cell);
 
 	cell = e_cell_number_new (NULL, GTK_JUSTIFY_RIGHT);
 	e_table_extras_add_cell (extras, "number", cell);
+	g_object_unref (cell);
 
 	cell = e_cell_pixbuf_new ();
 	e_table_extras_add_cell (extras, "pixbuf", cell);
+	g_object_unref (cell);
 
 	cell = e_cell_size_new (NULL, GTK_JUSTIFY_RIGHT);
 	e_table_extras_add_cell (extras, "size", cell);
+	g_object_unref (cell);
 
 	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
 	e_table_extras_add_cell (extras, "string", cell);
+	g_object_unref (cell);
 
-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
-	cell = e_cell_tree_new (TRUE, cell);
+	sub_cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);
+	cell = e_cell_tree_new (TRUE, sub_cell);
 	e_table_extras_add_cell (extras, "tree-string", cell);
+	g_object_unref (sub_cell);
+	g_object_unref (cell);
 }
 
 ETableExtras *
-- 
cgit v1.2.3


From fcb29478f605deb787c62fc7567c5c7f897585bb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Fri, 18 Feb 2011 19:35:59 -0500
Subject: Coding style and whitespace cleanup.

---
 widgets/table/e-table-header-item.c | 2 +-
 widgets/table/e-table-item.c        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 1c7f4a2c54..897bae1948 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -176,7 +176,7 @@ ethi_update (GnomeCanvasItem *item,
              gint flags)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
-	double x1, y1, x2, y2;
+	gdouble x1, y1, x2, y2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)
 		GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update (
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 51e3c9fecd..2276bb58c8 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -477,7 +477,7 @@ static void
 eti_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
-	double x1, x2, y1, y2;
+	gdouble x1, x2, y1, y2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)
 		(*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->update)(item, i2c, flags);
-- 
cgit v1.2.3


From 1a4be6c521d674c4a60e54203521e2721b81b921 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 24 Feb 2011 14:06:09 -0500
Subject: Use G_SIGNAL_TYPE_STATIC_SCOPE for all GdkEvent signal params.

I thought this might be the cause of bug #643089.
Turns out it wasn't, but it's a good thing to do anyway.
---
 widgets/table/e-table-group.c       | 30 +++++++++++++++++++----------
 widgets/table/e-table-header-item.c |  3 ++-
 widgets/table/e-table-item.c        | 30 +++++++++++++++++++----------
 widgets/table/e-table.c             | 33 +++++++++++++++++++++-----------
 widgets/table/e-tree.c              | 38 ++++++++++++++++++++++++++-----------
 5 files changed, 91 insertions(+), 43 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 8f67a02ba6..0efc08dd71 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -698,8 +698,10 @@ etg_class_init (ETableGroupClass *class)
 			      G_STRUCT_OFFSET (ETableGroupClass, double_click),
 			      NULL, NULL,
 			      e_marshal_NONE__INT_INT_BOXED,
-			      G_TYPE_NONE, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_NONE, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	etg_signals[RIGHT_CLICK] =
 		g_signal_new ("right_click",
@@ -708,8 +710,10 @@ etg_class_init (ETableGroupClass *class)
 			      G_STRUCT_OFFSET (ETableGroupClass, right_click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	etg_signals[CLICK] =
 		g_signal_new ("click",
@@ -718,8 +722,10 @@ etg_class_init (ETableGroupClass *class)
 			      G_STRUCT_OFFSET (ETableGroupClass, click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	etg_signals[KEY_PRESS] =
 		g_signal_new ("key_press",
@@ -728,8 +734,10 @@ etg_class_init (ETableGroupClass *class)
 			      G_STRUCT_OFFSET (ETableGroupClass, key_press),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	etg_signals[START_DRAG] =
 		g_signal_new ("start_drag",
@@ -738,8 +746,10 @@ etg_class_init (ETableGroupClass *class)
 			      G_STRUCT_OFFSET (ETableGroupClass, start_drag),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 }
 
 static void
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 897bae1948..2bbd5c83d2 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -2025,7 +2025,8 @@ ethi_class_init (ETableHeaderItemClass *class)
 			      G_STRUCT_OFFSET (ETableHeaderItemClass, button_pressed),
 			      NULL, NULL,
 			      g_cclosure_marshal_VOID__BOXED,
-			      G_TYPE_NONE, 1, GDK_TYPE_EVENT);
+			      G_TYPE_NONE, 1,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 }
 
 static void
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 2276bb58c8..746e4c41b4 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -2918,8 +2918,10 @@ eti_class_init (ETableItemClass *class)
 			      G_STRUCT_OFFSET (ETableItemClass, double_click),
 			      NULL, NULL,
 			      e_marshal_NONE__INT_INT_BOXED,
-			      G_TYPE_NONE, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_NONE, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	eti_signals[START_DRAG] =
 		g_signal_new ("start_drag",
@@ -2928,8 +2930,10 @@ eti_class_init (ETableItemClass *class)
 			      G_STRUCT_OFFSET (ETableItemClass, start_drag),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	eti_signals[RIGHT_CLICK] =
 		g_signal_new ("right_click",
@@ -2938,8 +2942,10 @@ eti_class_init (ETableItemClass *class)
 			      G_STRUCT_OFFSET (ETableItemClass, right_click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	eti_signals[CLICK] =
 		g_signal_new ("click",
@@ -2948,8 +2954,10 @@ eti_class_init (ETableItemClass *class)
 			      G_STRUCT_OFFSET (ETableItemClass, click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	eti_signals[KEY_PRESS] =
 		g_signal_new ("key_press",
@@ -2958,8 +2966,10 @@ eti_class_init (ETableItemClass *class)
 			      G_STRUCT_OFFSET (ETableItemClass, key_press),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	eti_signals[STYLE_SET] =
 		g_signal_new ("style_set",
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index c7e955efba..70b973c5b3 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -3329,8 +3329,10 @@ e_table_class_init (ETableClass *class)
 			      G_STRUCT_OFFSET (ETableClass, double_click),
 			      NULL, NULL,
 			      e_marshal_NONE__INT_INT_BOXED,
-			      G_TYPE_NONE, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_NONE, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[RIGHT_CLICK] =
 		g_signal_new ("right_click",
@@ -3339,8 +3341,10 @@ e_table_class_init (ETableClass *class)
 			      G_STRUCT_OFFSET (ETableClass, right_click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[CLICK] =
 		g_signal_new ("click",
@@ -3349,8 +3353,10 @@ e_table_class_init (ETableClass *class)
 			      G_STRUCT_OFFSET (ETableClass, click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[KEY_PRESS] =
 		g_signal_new ("key_press",
@@ -3359,8 +3365,10 @@ e_table_class_init (ETableClass *class)
 			      G_STRUCT_OFFSET (ETableClass, key_press),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[START_DRAG] =
 		g_signal_new ("start_drag",
@@ -3369,8 +3377,10 @@ e_table_class_init (ETableClass *class)
 			      G_STRUCT_OFFSET (ETableClass, start_drag),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_INT_BOXED,
-			      G_TYPE_BOOLEAN, 3, G_TYPE_INT,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 3,
+			      G_TYPE_INT,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[STATE_CHANGE] =
 		g_signal_new ("state_change",
@@ -3388,7 +3398,8 @@ e_table_class_init (ETableClass *class)
 			      G_STRUCT_OFFSET (ETableClass, white_space_event),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__BOXED,
-			      G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 1,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[TABLE_DRAG_BEGIN] =
 		g_signal_new ("table_drag_begin",
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index b77bda8ef7..fd5340dcad 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -3323,8 +3323,11 @@ e_tree_class_init (ETreeClass *class)
 			      G_STRUCT_OFFSET (ETreeClass, double_click),
 			      NULL, NULL,
 			      e_marshal_NONE__INT_POINTER_INT_BOXED,
-			      G_TYPE_NONE, 4, G_TYPE_INT,
-			      G_TYPE_POINTER, G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_NONE, 4,
+			      G_TYPE_INT,
+			      G_TYPE_POINTER,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[RIGHT_CLICK] =
 		g_signal_new ("right_click",
@@ -3333,8 +3336,11 @@ e_tree_class_init (ETreeClass *class)
 			      G_STRUCT_OFFSET (ETreeClass, right_click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_POINTER_INT_BOXED,
-			      G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_POINTER,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 4,
+			      G_TYPE_INT,
+			      G_TYPE_POINTER,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[CLICK] =
 		g_signal_new ("click",
@@ -3343,8 +3349,11 @@ e_tree_class_init (ETreeClass *class)
 			      G_STRUCT_OFFSET (ETreeClass, click),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_POINTER_INT_BOXED,
-			      G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_POINTER,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 4,
+			      G_TYPE_INT,
+			      G_TYPE_POINTER,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[KEY_PRESS] =
 		g_signal_new ("key_press",
@@ -3353,8 +3362,11 @@ e_tree_class_init (ETreeClass *class)
 			      G_STRUCT_OFFSET (ETreeClass, key_press),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__INT_POINTER_INT_BOXED,
-			      G_TYPE_BOOLEAN, 4, G_TYPE_INT, G_TYPE_POINTER,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 4,
+			      G_TYPE_INT,
+			      G_TYPE_POINTER,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[START_DRAG] =
 		g_signal_new ("start_drag",
@@ -3363,8 +3375,11 @@ e_tree_class_init (ETreeClass *class)
 			      G_STRUCT_OFFSET (ETreeClass, start_drag),
 			      NULL, NULL,
 			      e_marshal_NONE__INT_POINTER_INT_BOXED,
-			      G_TYPE_NONE, 4, G_TYPE_INT, G_TYPE_POINTER,
-			      G_TYPE_INT, GDK_TYPE_EVENT);
+			      G_TYPE_NONE, 4,
+			      G_TYPE_INT,
+			      G_TYPE_POINTER,
+			      G_TYPE_INT,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[STATE_CHANGE] =
 		g_signal_new ("state_change",
@@ -3382,7 +3397,8 @@ e_tree_class_init (ETreeClass *class)
 			      G_STRUCT_OFFSET (ETreeClass, white_space_event),
 			      g_signal_accumulator_true_handled, NULL,
 			      e_marshal_BOOLEAN__POINTER,
-			      G_TYPE_BOOLEAN, 1, GDK_TYPE_EVENT);
+			      G_TYPE_BOOLEAN, 1,
+			      GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE);
 
 	et_signals[TREE_DRAG_BEGIN] =
 		g_signal_new ("tree_drag_begin",
-- 
cgit v1.2.3


From 1301cf02efdacd20fb5ce3e2554ae15b8f146e8a Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 25 Feb 2011 16:20:41 +0100
Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly

---
 widgets/table/e-cell-toggle.c          | 22 +++++++++-------------
 widgets/table/e-table-extras.c         |  8 ++------
 widgets/table/e-table-memory-store.c   |  8 ++------
 widgets/table/e-table-memory.c         |  8 ++------
 widgets/table/e-table-search.c         |  8 ++------
 widgets/table/e-table-without.c        |  8 ++------
 widgets/table/e-tree-memory.c          |  8 ++------
 widgets/table/e-tree-selection-model.c |  8 ++------
 widgets/table/e-tree-sorted.c          | 10 +++-------
 widgets/table/e-tree-table-adapter.c   | 10 +++-------
 widgets/table/e-tree.c                 |  8 ++------
 11 files changed, 31 insertions(+), 75 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index ae7fcc703b..3d514c40e4 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -38,10 +38,6 @@
 #include "e-cell-toggle.h"
 #include "e-table-item.h"
 
-#define E_CELL_TOGGLE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_CELL_TOGGLE, ECellTogglePrivate))
-
 struct _ECellTogglePrivate {
 	gchar **icon_names;
 	guint n_icon_names;
@@ -100,7 +96,7 @@ cell_toggle_dispose (GObject *object)
 {
 	ECellTogglePrivate *priv;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (object);
+	priv = E_CELL_TOGGLE (object)->priv;
 
 	if (priv->empty != NULL) {
 		g_object_unref (priv->empty);
@@ -120,7 +116,7 @@ cell_toggle_finalize (GObject *object)
 	ECellTogglePrivate *priv;
 	guint ii;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (object);
+	priv = E_CELL_TOGGLE (object)->priv;
 
 	/* The array is not NULL-terminated,
 	 * so g_strfreev() will not work. */
@@ -187,7 +183,7 @@ cell_toggle_draw (ECellView *ecell_view,
 	const gint value = GPOINTER_TO_INT (
 		 e_table_model_value_at (ecell_view->e_table_model, model_col, row));
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (ecell_view->ecell);
+	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
 	if (value < 0 || value >= priv->pixbufs->len) {
 		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
@@ -222,7 +218,7 @@ etog_set_value (ECellToggleView *toggle_view,
 {
 	ECellTogglePrivate *priv;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (toggle_view->cell_view.ecell);
+	priv = E_CELL_TOGGLE (toggle_view->cell_view.ecell)->priv;
 
 	if (value >= priv->pixbufs->len)
 		value = 0;
@@ -270,7 +266,7 @@ cell_toggle_height (ECellView *ecell_view,
 {
 	ECellTogglePrivate *priv;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (ecell_view->ecell);
+	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
 	return priv->height;
 }
@@ -292,7 +288,7 @@ cell_toggle_print (ECellView *ecell_view,
 
 	cairo_t *cr;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (ecell_view->ecell);
+	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
 	if (value >= priv->pixbufs->len) {
 		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
@@ -328,7 +324,7 @@ cell_toggle_print_height (ECellView *ecell_view,
 {
 	ECellTogglePrivate *priv;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (ecell_view->ecell);
+	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
 	return priv->height;
 }
@@ -343,7 +339,7 @@ cell_toggle_max_width (ECellView *ecell_view,
 	gint number_of_rows;
 	gint row;
 
-	priv = E_CELL_TOGGLE_GET_PRIVATE (ecell_view->ecell);
+	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
 	number_of_rows = e_table_model_row_count (ecell_view->e_table_model);
 	for (row = 0; row < number_of_rows; row++) {
@@ -390,7 +386,7 @@ e_cell_toggle_class_init (ECellToggleClass *class)
 static void
 e_cell_toggle_init (ECellToggle *cell_toggle)
 {
-	cell_toggle->priv = E_CELL_TOGGLE_GET_PRIVATE (cell_toggle);
+	cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate);
 
 	cell_toggle->priv->empty =
 		gdk_pixbuf_new_from_xpm_data (empty_xpm);
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index f6dc1118da..c2fc291c3a 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -41,10 +41,6 @@
 #include "e-table-extras.h"
 #include "e-table-sorting-utils.h"
 
-#define E_TABLE_EXTRAS_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate))
-
 struct _ETableExtrasPrivate {
 	GHashTable *cells;
 	GHashTable *compares;
@@ -61,7 +57,7 @@ ete_finalize (GObject *object)
 {
 	ETableExtrasPrivate *priv;
 
-	priv = E_TABLE_EXTRAS_GET_PRIVATE (object);
+	priv = E_TABLE_EXTRAS (object)->priv;
 
 	if (priv->cells) {
 		g_hash_table_destroy (priv->cells);
@@ -234,7 +230,7 @@ ete_init (ETableExtras *extras)
 {
 	ECell *cell, *sub_cell;
 
-	extras->priv = E_TABLE_EXTRAS_GET_PRIVATE (extras);
+	extras->priv = G_TYPE_INSTANCE_GET_PRIVATE (extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate);
 
 	extras->priv->cells = g_hash_table_new_full (
 		g_str_hash, g_str_equal,
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 5a0263b308..37816c8a18 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -28,10 +28,6 @@
 
 #include "e-table-memory-store.h"
 
-#define E_TABLE_MEMORY_STORE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate))
-
 #define STORE_LOCATOR(etms, col, row) (*((etms)->priv->store + (row) * (etms)->priv->col_count + (col)))
 
 struct _ETableMemoryStorePrivate {
@@ -230,7 +226,7 @@ etms_finalize (GObject *object)
 {
 	ETableMemoryStorePrivate *priv;
 
-	priv = E_TABLE_MEMORY_STORE_GET_PRIVATE (object);
+	priv = E_TABLE_MEMORY_STORE (object)->priv;
 
 	e_table_memory_store_clear (E_TABLE_MEMORY_STORE (object));
 
@@ -244,7 +240,7 @@ etms_finalize (GObject *object)
 static void
 e_table_memory_store_init (ETableMemoryStore *etms)
 {
-	etms->priv = E_TABLE_MEMORY_STORE_GET_PRIVATE (etms);
+	etms->priv = G_TYPE_INSTANCE_GET_PRIVATE (etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate);
 }
 
 static void
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 0c0237531b..d55aa04b51 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -37,10 +37,6 @@
 
 #include "e-table-memory.h"
 
-#define E_TABLE_MEMORY_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TABLE_MEMORY, ETableMemoryPrivate))
-
 G_DEFINE_TYPE (ETableMemory, e_table_memory, E_TYPE_TABLE_MODEL)
 
 struct _ETableMemoryPrivate {
@@ -54,7 +50,7 @@ etmm_finalize (GObject *object)
 {
 	ETableMemoryPrivate *priv;
 
-	priv = E_TABLE_MEMORY_GET_PRIVATE (object);
+	priv = E_TABLE_MEMORY (object)->priv;
 
 	g_free (priv->data);
 
@@ -88,7 +84,7 @@ e_table_memory_class_init (ETableMemoryClass *class)
 static void
 e_table_memory_init (ETableMemory *etmm)
 {
-	etmm->priv = E_TABLE_MEMORY_GET_PRIVATE (etmm);
+	etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate);
 }
 
 /**
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 10ed919571..23e8cdf002 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -30,10 +30,6 @@
 
 #define d(x)
 
-#define E_TABLE_SEARCH_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TABLE_SEARCH, ETableSearchPrivate))
-
 d (static gint depth = 0)
 
 struct _ETableSearchPrivate {
@@ -112,7 +108,7 @@ e_table_search_finalize (GObject *object)
 {
 	ETableSearchPrivate *priv;
 
-	priv = E_TABLE_SEARCH_GET_PRIVATE (object);
+	priv = E_TABLE_SEARCH (object)->priv;
 
 	drop_timeout (E_TABLE_SEARCH (object));
 
@@ -157,7 +153,7 @@ e_table_search_class_init (ETableSearchClass *class)
 static void
 e_table_search_init (ETableSearch *ets)
 {
-	ets->priv = E_TABLE_SEARCH_GET_PRIVATE (ets);
+	ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate);
 
 	ets->priv->search_string = g_strdup ("");
 }
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 881c21bf16..54e733fdad 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -30,10 +30,6 @@
 
 #include "e-table-without.h"
 
-#define E_TABLE_WITHOUT_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate))
-
 /* workaround for avoiding API breakage */
 #define etw_get_type e_table_without_get_type
 G_DEFINE_TYPE (ETableWithout, etw, E_TYPE_TABLE_SUBSET)
@@ -141,7 +137,7 @@ etw_dispose (GObject *object)
 {
 	ETableWithoutPrivate *priv;
 
-	priv = E_TABLE_WITHOUT_GET_PRIVATE (object);
+	priv = E_TABLE_WITHOUT (object)->priv;
 
 	if (priv->hash != NULL) {
 		g_hash_table_foreach (priv->hash, delete_hash_element, object);
@@ -252,7 +248,7 @@ etw_class_init (ETableWithoutClass *class)
 static void
 etw_init (ETableWithout *etw)
 {
-	etw->priv = E_TABLE_WITHOUT_GET_PRIVATE (etw);
+	etw->priv = G_TYPE_INSTANCE_GET_PRIVATE (etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate);
 }
 
 ETableModel *
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index bb26fa773f..5c7b8f46d2 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -37,10 +37,6 @@
 
 #include "e-tree-memory.h"
 
-#define E_TREE_MEMORY_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TREE_MEMORY, ETreeMemoryPrivate))
-
 G_DEFINE_TYPE (ETreeMemory, e_tree_memory, E_TYPE_TREE_MODEL)
 
 enum {
@@ -221,7 +217,7 @@ etmm_dispose (GObject *object)
 {
 	ETreeMemoryPrivate *priv;
 
-	priv = E_TREE_MEMORY_GET_PRIVATE (object);
+	priv = E_TREE_MEMORY (object)->priv;
 
 	if (priv->root)
 		e_tree_memory_node_remove (
@@ -393,7 +389,7 @@ e_tree_memory_class_init (ETreeMemoryClass *class)
 static void
 e_tree_memory_init (ETreeMemory *etmm)
 {
-	etmm->priv = E_TREE_MEMORY_GET_PRIVATE (etmm);
+	etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate);
 }
 
 /**
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index cd438a77e2..18ec388530 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -29,10 +29,6 @@
 
 #include "e-tree-selection-model.h"
 
-#define E_TREE_SELECTION_MODEL_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate))
-
 G_DEFINE_TYPE (
 	ETreeSelectionModel, e_tree_selection_model, E_TYPE_SELECTION_MODEL)
 
@@ -290,7 +286,7 @@ etsm_finalize (GObject *object)
 {
 	ETreeSelectionModelPrivate *priv;
 
-	priv = E_TREE_SELECTION_MODEL_GET_PRIVATE (object);
+	priv = E_TREE_SELECTION_MODEL (object)->priv;
 
 	clear_selection (E_TREE_SELECTION_MODEL (object));
 	g_hash_table_destroy (priv->paths);
@@ -745,7 +741,7 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm)
 static void
 e_tree_selection_model_init (ETreeSelectionModel *etsm)
 {
-	etsm->priv = E_TREE_SELECTION_MODEL_GET_PRIVATE (etsm);
+	etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate);
 
 	etsm->priv->paths = g_hash_table_new (NULL, NULL);
 	etsm->priv->cursor_col = -1;
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 40b10c0dec..5b5bc80f24 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -48,10 +48,6 @@
 
 #define d(x)
 
-#define E_TREE_SORTED_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TREE_SORTED, ETreeSortedPrivate))
-
 G_DEFINE_TYPE (ETreeSorted, e_tree_sorted, E_TYPE_TREE_MODEL)
 
 enum {
@@ -588,7 +584,7 @@ ets_dispose (GObject *object)
 {
 	ETreeSortedPrivate *priv;
 
-	priv = E_TREE_SORTED_GET_PRIVATE (object);
+	priv = E_TREE_SORTED (object)->priv;
 
 	if (priv->source) {
 		g_signal_handler_disconnect (
@@ -654,7 +650,7 @@ ets_finalize (GObject *object)
 {
 	ETreeSortedPrivate *priv;
 
-	priv = E_TREE_SORTED_GET_PRIVATE (object);
+	priv = E_TREE_SORTED (object)->priv;
 
 	if (priv->root)
 		free_path (priv->root);
@@ -1207,7 +1203,7 @@ e_tree_sorted_class_init (ETreeSortedClass *class)
 static void
 e_tree_sorted_init (ETreeSorted *ets)
 {
-	ets->priv = E_TREE_SORTED_GET_PRIVATE (ets);
+	ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate);
 }
 
 /**
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 4ca80d97a0..bbeed6ee38 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -38,10 +38,6 @@
 #include "e-table-sorting-utils.h"
 #include "e-tree-table-adapter.h"
 
-#define E_TREE_TABLE_ADAPTER_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate))
-
 /* workaround for avoiding API breakage */
 #define etta_get_type e_tree_table_adapter_get_type
 G_DEFINE_TYPE (ETreeTableAdapter, etta, E_TYPE_TABLE_MODEL)
@@ -514,7 +510,7 @@ etta_finalize (GObject *object)
 {
 	ETreeTableAdapterPrivate *priv;
 
-	priv = E_TREE_TABLE_ADAPTER_GET_PRIVATE (object);
+	priv = E_TREE_TABLE_ADAPTER (object)->priv;
 
 	if (priv->resort_idle_id) {
 		g_source_remove (priv->resort_idle_id);
@@ -539,7 +535,7 @@ etta_dispose (GObject *object)
 {
 	ETreeTableAdapterPrivate *priv;
 
-	priv = E_TREE_TABLE_ADAPTER_GET_PRIVATE (object);
+	priv = E_TREE_TABLE_ADAPTER (object)->priv;
 
 	if (priv->sort_info) {
 		g_signal_handler_disconnect (
@@ -747,7 +743,7 @@ etta_class_init (ETreeTableAdapterClass *class)
 static void
 etta_init (ETreeTableAdapter *etta)
 {
-	etta->priv = E_TREE_TABLE_ADAPTER_GET_PRIVATE (etta);
+	etta->priv = G_TYPE_INSTANCE_GET_PRIVATE (etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate);
 
 	etta->priv->root_visible = TRUE;
 	etta->priv->remap_needed = TRUE;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index fd5340dcad..dfbc3ccdce 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -56,10 +56,6 @@
 
 #define d(x)
 
-#define E_TREE_GET_PRIVATE(obj) \
-	(G_TYPE_INSTANCE_GET_PRIVATE \
-	((obj), E_TYPE_TREE, ETreePrivate))
-
 enum {
 	CURSOR_CHANGE,
 	CURSOR_ACTIVATED,
@@ -387,7 +383,7 @@ et_dispose (GObject *object)
 {
 	ETreePrivate *priv;
 
-	priv = E_TREE_GET_PRIVATE (object);
+	priv = E_TREE (object)->priv;
 
 	if (priv->search != NULL) {
 		g_signal_handler_disconnect (
@@ -585,7 +581,7 @@ e_tree_init (ETree *e_tree)
 
 	gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE);
 
-	e_tree->priv = E_TREE_GET_PRIVATE (e_tree);
+	e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (e_tree, E_TYPE_TREE, ETreePrivate);
 
 	e_tree->priv->alternating_row_colors = 1;
 	e_tree->priv->horizontal_draw_grid = 1;
-- 
cgit v1.2.3


From b22ac14482bbf215e5ad457104580c624706feda Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 1 Mar 2011 13:04:09 -0500
Subject: Fix Gtk-Doc comment notation.

Seeing lots of what I assume to be doxygen syntax in comment blocks.
---
 widgets/table/e-table-sorting-utils.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 2fa679644a..1fa91214c2 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -376,11 +376,13 @@ e_table_sorting_utils_tree_insert (ETreeModel *source, ETableSortInfo *sort_info
 /**
  * e_table_sorting_utils_create_cmp_cache:
  *
- * Creates a new compare cache, which is storing pairs of string keys and string values.
- * This can be accessed by @ref e_table_sorting_utils_lookup_cmp_cache and
- * @ref e_table_sorting_utils_add_to_cmp_cache.
+ * Creates a new compare cache, which is storing pairs of string keys and
+ * string values.  This can be accessed by
+ * e_table_sorting_utils_lookup_cmp_cache() and
+ * e_table_sorting_utils_add_to_cmp_cache().
  *
- * Returned pointer should be freed with @ref e_table_sorting_utils_free_cmp_cache.
+ * Returned pointer should be freed with
+ * e_table_sorting_utils_free_cmp_cache().
  **/
 gpointer
 e_table_sorting_utils_create_cmp_cache (void)
@@ -392,8 +394,8 @@ e_table_sorting_utils_create_cmp_cache (void)
  * e_table_sorting_utils_free_cmp_cache:
  * @cmp_cache: a compare cache; cannot be %NULL
  *
- * Frees a compare cache previously created
- * with @ref e_table_sorting_utils_create_cmp_cache.
+ * Frees a compare cache previously created with
+ * e_table_sorting_utils_create_cmp_cache().
  **/
 void
 e_table_sorting_utils_free_cmp_cache (gpointer cmp_cache)
-- 
cgit v1.2.3


From c6fd77460f5baf88528f5da2ffb99e86a2885ff0 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 5 Mar 2011 12:33:49 -0500
Subject: Coding style and whitespace cleanup.

---
 widgets/table/e-cell-toggle.c          | 3 ++-
 widgets/table/e-table-extras.c         | 3 ++-
 widgets/table/e-table-memory-store.c   | 3 ++-
 widgets/table/e-table-memory.c         | 3 ++-
 widgets/table/e-table-search.c         | 3 ++-
 widgets/table/e-table-without.c        | 3 ++-
 widgets/table/e-tree-memory.c          | 3 ++-
 widgets/table/e-tree-selection-model.c | 3 ++-
 widgets/table/e-tree-sorted.c          | 3 ++-
 widgets/table/e-tree-table-adapter.c   | 3 ++-
 widgets/table/e-tree.c                 | 3 ++-
 11 files changed, 22 insertions(+), 11 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 3d514c40e4..3d4f453820 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -386,7 +386,8 @@ e_cell_toggle_class_init (ECellToggleClass *class)
 static void
 e_cell_toggle_init (ECellToggle *cell_toggle)
 {
-	cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate);
+	cell_toggle->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		cell_toggle, E_TYPE_CELL_TOGGLE, ECellTogglePrivate);
 
 	cell_toggle->priv->empty =
 		gdk_pixbuf_new_from_xpm_data (empty_xpm);
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index c2fc291c3a..db18a8cf9e 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -230,7 +230,8 @@ ete_init (ETableExtras *extras)
 {
 	ECell *cell, *sub_cell;
 
-	extras->priv = G_TYPE_INSTANCE_GET_PRIVATE (extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate);
+	extras->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		extras, E_TYPE_TABLE_EXTRAS, ETableExtrasPrivate);
 
 	extras->priv->cells = g_hash_table_new_full (
 		g_str_hash, g_str_equal,
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 37816c8a18..4cfd97e41c 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -240,7 +240,8 @@ etms_finalize (GObject *object)
 static void
 e_table_memory_store_init (ETableMemoryStore *etms)
 {
-	etms->priv = G_TYPE_INSTANCE_GET_PRIVATE (etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate);
+	etms->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		etms, E_TYPE_TABLE_MEMORY_STORE, ETableMemoryStorePrivate);
 }
 
 static void
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index d55aa04b51..166cfdb1e1 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -84,7 +84,8 @@ e_table_memory_class_init (ETableMemoryClass *class)
 static void
 e_table_memory_init (ETableMemory *etmm)
 {
-	etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate);
+	etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		etmm, E_TYPE_TABLE_MEMORY, ETableMemoryPrivate);
 }
 
 /**
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 23e8cdf002..538dcc4f1a 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -153,7 +153,8 @@ e_table_search_class_init (ETableSearchClass *class)
 static void
 e_table_search_init (ETableSearch *ets)
 {
-	ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate);
+	ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ets, E_TYPE_TABLE_SEARCH, ETableSearchPrivate);
 
 	ets->priv->search_string = g_strdup ("");
 }
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 54e733fdad..8a180efab1 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -248,7 +248,8 @@ etw_class_init (ETableWithoutClass *class)
 static void
 etw_init (ETableWithout *etw)
 {
-	etw->priv = G_TYPE_INSTANCE_GET_PRIVATE (etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate);
+	etw->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		etw, E_TYPE_TABLE_WITHOUT, ETableWithoutPrivate);
 }
 
 ETableModel *
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 5c7b8f46d2..c32b7311bd 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -389,7 +389,8 @@ e_tree_memory_class_init (ETreeMemoryClass *class)
 static void
 e_tree_memory_init (ETreeMemory *etmm)
 {
-	etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate);
+	etmm->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		etmm, E_TYPE_TREE_MEMORY, ETreeMemoryPrivate);
 }
 
 /**
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 18ec388530..8644187b91 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -741,7 +741,8 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm)
 static void
 e_tree_selection_model_init (ETreeSelectionModel *etsm)
 {
-	etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE (etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate);
+	etsm->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		etsm, E_TYPE_TREE_SELECTION_MODEL, ETreeSelectionModelPrivate);
 
 	etsm->priv->paths = g_hash_table_new (NULL, NULL);
 	etsm->priv->cursor_col = -1;
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 5b5bc80f24..9abb6772b2 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -1203,7 +1203,8 @@ e_tree_sorted_class_init (ETreeSortedClass *class)
 static void
 e_tree_sorted_init (ETreeSorted *ets)
 {
-	ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate);
+	ets->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		ets, E_TYPE_TREE_SORTED, ETreeSortedPrivate);
 }
 
 /**
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index bbeed6ee38..fe8f90f536 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -743,7 +743,8 @@ etta_class_init (ETreeTableAdapterClass *class)
 static void
 etta_init (ETreeTableAdapter *etta)
 {
-	etta->priv = G_TYPE_INSTANCE_GET_PRIVATE (etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate);
+	etta->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		etta, E_TYPE_TREE_TABLE_ADAPTER, ETreeTableAdapterPrivate);
 
 	etta->priv->root_visible = TRUE;
 	etta->priv->remap_needed = TRUE;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index dfbc3ccdce..040881c857 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -581,7 +581,8 @@ e_tree_init (ETree *e_tree)
 
 	gtk_table_set_homogeneous (GTK_TABLE (e_tree), FALSE);
 
-	e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (e_tree, E_TYPE_TREE, ETreePrivate);
+	e_tree->priv = G_TYPE_INSTANCE_GET_PRIVATE (
+		e_tree, E_TYPE_TREE, ETreePrivate);
 
 	e_tree->priv->alternating_row_colors = 1;
 	e_tree->priv->horizontal_draw_grid = 1;
-- 
cgit v1.2.3


From 27908060c3b2c319f582f02079406859668eb005 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 13 Apr 2011 12:20:48 -0400
Subject: Work around another a11y crash.

Some kind of object lifetime issue in GalA11yETableItem.  Just work
around it for now.  Killing this class would pretty much mean killing
a11y support for ETables entirely and I'm not that pissed off... yet.
---
 widgets/table/gal-a11y-e-table-item.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index eb0c9be127..f35eeb1a69 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -71,8 +71,16 @@ static AtkObject* eti_ref_at (AtkTable *table, gint row, gint column);
 static void
 item_finalized (gpointer user_data, GObject *gone_item)
 {
-	GalA11yETableItem *a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
-	GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
+	GalA11yETableItem *a11y;
+	GalA11yETableItemPrivate *priv;
+
+	/* XXX GalA11yETableItem may already be finalized.
+	 *     Just work around it for now. */
+	if (!GAL_A11Y_IS_E_TABLE_ITEM (user_data))
+		return;
+
+	a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
+	priv = GET_PRIVATE (a11y);
 
 	atk_state_set_add_state (priv->state_set, ATK_STATE_DEFUNCT);
 	atk_object_notify_state_change (ATK_OBJECT (a11y), ATK_STATE_DEFUNCT, TRUE);
-- 
cgit v1.2.3


From 4cfb84c573f21ca7519e24cff1c5742b715355c4 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 7 May 2011 12:22:36 -0400
Subject: Whitespace and coding style cleanups.

---
 widgets/table/e-cell-date.c                |  4 +++-
 widgets/table/e-table-config.c             |  7 +++++--
 widgets/table/e-table-field-chooser-item.c |  3 ++-
 widgets/table/e-table-header-item.c        | 10 +++++++---
 widgets/table/e-table-header-utils.c       |  4 +++-
 widgets/table/e-table-header.c             |  7 +++++--
 widgets/table/e-table-search.c             |  6 ++++--
 widgets/table/e-table.c                    |  6 ++++--
 widgets/table/e-tree.c                     | 10 +++++++---
 widgets/table/gal-a11y-e-table-item.c      |  6 ++++--
 10 files changed, 44 insertions(+), 19 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index c4a4cf3103..9040f80ccd 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -51,7 +51,9 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 		fmt_component = "Default";
 	else
 		fmt_part = "table";
-	return e_datetime_format_format (fmt_component, fmt_part, DTFormatKindDateTime, date);
+
+	return e_datetime_format_format (
+		fmt_component, fmt_part, DTFormatKindDateTime, date);
 }
 
 static void
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 62db1d32b1..490072cf80 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -621,8 +621,11 @@ create_store (ETableConfig *config)
 		if (config->source_spec->columns[i]->disabled)
 			continue;
 
-		text = g_strdup (dgettext (config->domain, config->source_spec->columns[i]->title));
-		e_table_memory_store_insert_adopt (E_TABLE_MEMORY_STORE (store), -1, NULL, text, i);
+		text = g_strdup (dgettext (
+			config->domain,
+			config->source_spec->columns[i]->title));
+		e_table_memory_store_insert_adopt (
+			E_TABLE_MEMORY_STORE (store), -1, NULL, text, i);
 	}
 
 	return store;
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 51ab6c1139..6afde43911 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -135,7 +135,8 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci)
 		ETableCol *ecol = e_table_header_get_column (etfci->full_header, i);
 		if (ecol->disabled)
 			continue;
-		if (!(GPOINTER_TO_INT (g_hash_table_lookup (hash, GINT_TO_POINTER (ecol->col_idx)))))
+		if (!(GPOINTER_TO_INT (g_hash_table_lookup (
+				hash, GINT_TO_POINTER (ecol->col_idx)))))
 			e_table_header_add_column (etfci->combined_header, ecol, -1);
 	}
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 2bbd5c83d2..346ffed2d3 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -873,7 +873,8 @@ ethi_drag_drop (GtkWidget *canvas,
 		ethi->drop_col = col;
 
 		if (col != -1) {
-			gchar *target = g_strdup_printf ("%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code);
+			gchar *target = g_strdup_printf (
+				"%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code);
 			d(g_print ("ethi -  %s\n", target));
 			gtk_drag_get_data (canvas, context, gdk_atom_intern (target, FALSE), time);
 			g_free (target);
@@ -986,7 +987,9 @@ ethi_draw (GnomeCanvasItem *item,
 		gint length = e_table_sort_info_grouping_get_count (ethi->sort_info);
 		gint i;
 		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_grouping_get_nth (ethi->sort_info, i);
+			ETableSortColumn column =
+				e_table_sort_info_grouping_get_nth (
+				ethi->sort_info, i);
 			g_hash_table_insert (arrows,
 					     GINT_TO_POINTER ((gint) column.column),
 					     GINT_TO_POINTER (column.ascending ?
@@ -1925,7 +1928,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 
 			ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
 			ethi_change_sort_state (ethi, ecol);
-		} else if ((e->key.keyval == GDK_KEY_Right) || (e->key.keyval == GDK_KEY_KP_Right)) {
+		} else if ((e->key.keyval == GDK_KEY_Right) ||
+				(e->key.keyval == GDK_KEY_KP_Right)) {
 			ETableCol *ecol;
 
 			if ((ethi->selected_col < 0) || (ethi->selected_col >= ethi->eth->col_count - 1))
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 2fe6a56089..8911867652 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -124,7 +124,9 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
 	pheight = gdk_pixbuf_get_height (pixbuf);
 	g_return_val_if_fail (width <= pwidth && height <= pheight, NULL);
 
-	color = ((bg->red & 0xff00) << 8) | (bg->green & 0xff00) | ((bg->blue & 0xff00) >> 8);
+	color = ((bg->red & 0xff00) << 8) |
+		(bg->green & 0xff00) |
+		((bg->blue & 0xff00) >> 8);
 
 	if (width >= pwidth && height >= pheight) {
 		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index f648a8d765..ef1b573346 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -121,7 +121,9 @@ enqueue (ETableHeader *eth, gint column, gint width)
 		eth->change_queue = eth->change_tail;
 
 	if (!eth->idle) {
-		eth->idle = g_idle_add_full (G_PRIORITY_LOW, (GSourceFunc) dequeue_idle, eth, NULL);
+		eth->idle = g_idle_add_full (
+			G_PRIORITY_LOW, (GSourceFunc)
+			dequeue_idle, eth, NULL);
 	}
 }
 
@@ -714,7 +716,8 @@ eth_set_size (ETableHeader *eth, gint idx, gint size)
 	usable_width = eth->width - left_width - 1;
 
 	if (eth->sort_info)
-		usable_width -= e_table_sort_info_grouping_get_count (eth->sort_info) * GROUP_INDENT;
+		usable_width -= e_table_sort_info_grouping_get_count (
+			eth->sort_info) * GROUP_INDENT;
 
 	/* Calculate minimum_width of stuff on the right as well as
 	 * total usable expansion on the right.
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 538dcc4f1a..cf7edf3592 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -183,8 +183,10 @@ e_table_search_input_character (ETableSearch *ets, gunichar character)
 	character_utf8[g_unichar_to_utf8 (character, character_utf8)] = 0;
 
 	temp_string = g_strdup_printf ("%s%s", ets->priv->search_string, character_utf8);
-	if (e_table_search_search (ets, temp_string,
-				   ets->priv->last_character != 0 ? E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST : 0)) {
+	if (e_table_search_search (
+			ets, temp_string,
+			ets->priv->last_character != 0 ?
+			E_TABLE_SEARCH_FLAGS_CHECK_CURSOR_FIRST : 0)) {
 		g_free (ets->priv->search_string);
 		ets->priv->search_string = temp_string;
 		add_timeout (ets);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 70b973c5b3..38ede4dd80 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1962,7 +1962,8 @@ et_build_grouping_spec (ETable *e_table)
 	node = grouping;
 
 	for (i = 0; i < group_count; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth (e_table->sort_info, i);
+		ETableSortColumn column =
+			e_table_sort_info_grouping_get_nth (e_table->sort_info, i);
 		xmlNode *new_node = xmlNewChild(node, NULL, "group", NULL);
 
 		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
@@ -1971,7 +1972,8 @@ et_build_grouping_spec (ETable *e_table)
 	}
 
 	for (i = 0; i < sort_count; i++) {
-		ETableSortColumn column = e_table_sort_info_sorting_get_nth (e_table->sort_info, i);
+		ETableSortColumn column =
+			e_table_sort_info_sorting_get_nth (e_table->sort_info, i);
 		xmlNode *new_node = xmlNewChild(node, NULL, "leaf", NULL);
 
 		e_xml_set_integer_prop_by_name (new_node, "column", column.column);
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 040881c857..d9b6ce4035 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -2967,7 +2967,8 @@ scroll_timeout (gpointer data)
 static void
 scroll_on (ETree *et, guint scroll_direction)
 {
-	if (et->priv->scroll_idle_id == 0 || scroll_direction != et->priv->scroll_direction) {
+	if (et->priv->scroll_idle_id == 0 ||
+			scroll_direction != et->priv->scroll_direction) {
 		if (et->priv->scroll_idle_id != 0)
 			g_source_remove (et->priv->scroll_idle_id);
 		et->priv->scroll_direction = scroll_direction;
@@ -3041,7 +3042,8 @@ collapse_drag (ETree *et, ETreePath drop)
 {
 	GList *list;
 
-	/* We only want to leave open parents of the node dropped in.  Not the node itself. */
+	/* We only want to leave open parents of the node dropped in.
+	 * Not the node itself. */
 	if (drop) {
 		drop = e_tree_model_node_get_parent (et->priv->model, drop);
 	}
@@ -3097,7 +3099,9 @@ context_connect (ETree *et, GdkDragContext *context)
 		return;
 
 	if (et->priv->last_drop_context)
-		g_object_weak_unref (G_OBJECT (et->priv->last_drop_context), context_destroyed, et);
+		g_object_weak_unref (
+			G_OBJECT (et->priv->last_drop_context),
+			context_destroyed, et);
 	else
 		g_object_ref (et);
 
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index f35eeb1a69..92716e68bc 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -188,7 +188,8 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y,
 
 	old_cell = (AtkObject *)g_object_get_data (G_OBJECT (a11y), "gail-focus-object");
 	if (old_cell && GAL_A11Y_IS_E_CELL (old_cell))
-		gal_a11y_e_cell_remove_state (GAL_A11Y_E_CELL (old_cell), ATK_STATE_FOCUSED, FALSE);
+		gal_a11y_e_cell_remove_state (
+			GAL_A11Y_E_CELL (old_cell), ATK_STATE_FOCUSED, FALSE);
 	if (old_cell)
 		g_object_unref (old_cell);
 
@@ -196,7 +197,8 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y,
 
 	if (cell != NULL) {
 		g_object_set_data (G_OBJECT (a11y), "gail-focus-object", cell);
-		gal_a11y_e_cell_add_state (GAL_A11Y_E_CELL (cell), ATK_STATE_FOCUSED, FALSE);
+		gal_a11y_e_cell_add_state (
+			GAL_A11Y_E_CELL (cell), ATK_STATE_FOCUSED, FALSE);
 	} else
 		g_object_set_data (G_OBJECT (a11y), "gail-focus-object", NULL);
 
-- 
cgit v1.2.3


From 8a186c3588d3598857c36e2122fa68d01eba30fd Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 8 May 2011 13:24:42 -0400
Subject: Coding style cleanups.

---
 widgets/table/e-cell-combo.c               |  6 ++--
 widgets/table/e-cell-hbox.c                | 10 +++----
 widgets/table/e-cell-pixbuf.c              |  4 +--
 widgets/table/e-cell-text.c                | 46 +++++++++++++++---------------
 widgets/table/e-cell-toggle.c              |  4 +--
 widgets/table/e-cell-tree.c                |  6 ++--
 widgets/table/e-cell-vbox.c                | 10 +++----
 widgets/table/e-table-config.c             |  8 +++---
 widgets/table/e-table-field-chooser-item.c |  2 +-
 widgets/table/e-table-group-container.c    | 42 +++++++++++++--------------
 widgets/table/e-table-header-item.c        |  6 ++--
 widgets/table/e-table-header.c             |  2 +-
 widgets/table/e-table-item.c               |  6 ++--
 widgets/table/e-table-memory-callbacks.c   |  2 +-
 widgets/table/e-table-one.c                |  2 +-
 widgets/table/e-table-sorter.c             |  4 +--
 widgets/table/e-table-sorting-utils.c      |  8 +++---
 widgets/table/e-table-specification.c      |  2 +-
 widgets/table/e-table-state.c              |  2 +-
 widgets/table/e-table-subset-variable.c    |  2 +-
 widgets/table/e-table-subset.c             | 26 ++++++++---------
 widgets/table/e-table.c                    | 10 +++----
 widgets/table/e-tree-memory-callbacks.c    |  4 +--
 widgets/table/e-tree-memory.c              |  4 +--
 widgets/table/e-tree-selection-model.c     |  6 ++--
 widgets/table/e-tree-table-adapter.c       | 42 +++++++++++++--------------
 widgets/table/e-tree.c                     |  6 ++--
 widgets/table/gal-a11y-e-cell-tree.c       |  4 +--
 widgets/table/gal-a11y-e-cell-vbox.c       |  2 +-
 widgets/table/gal-a11y-e-cell.c            |  2 +-
 widgets/table/gal-a11y-e-table-item.c      |  2 +-
 widgets/table/gal-a11y-e-table.c           |  6 ++--
 32 files changed, 144 insertions(+), 144 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index a54f6c9c98..48a762a8d9 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -420,10 +420,10 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	*x += x1;
 	/* The ETable positions don't include the grid lines, I think, so we add 1. */
 	*y += y1 + 1
-		- (gint)gtk_adjustment_get_value (
+		- (gint) gtk_adjustment_get_value (
 			gtk_scrollable_get_vadjustment (
-			GTK_SCROLLABLE (&((GnomeCanvas *)canvas)->layout)))
-		+ ((GnomeCanvas *)canvas)->zoom_yofs;
+			GTK_SCROLLABLE (&((GnomeCanvas *) canvas)->layout)))
+		+ ((GnomeCanvas *) canvas)->zoom_yofs;
 
 	widget = gtk_scrolled_window_get_vscrollbar (popup);
 	gtk_widget_get_child_requisition (widget, &requisition);
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index e8f6a0925d..e268b23dea 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -72,7 +72,7 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 		hbox_view->def_size_cols[i] = ecv->def_size_cols[i];
 	}
 
-	return (ECellView *)hbox_view;
+	return (ECellView *) hbox_view;
 }
 
 /*
@@ -149,7 +149,7 @@ ecv_draw (ECellView *ecell_view,
           gint x2,
           gint y2)
 {
-	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
+	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 
 	gint subcell_offset = 0;
 	gint i;
@@ -180,7 +180,7 @@ ecv_draw (ECellView *ecell_view,
 static gint
 ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
 {
-	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
+	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 	gint y = 0;
 	gint i;
 	gint subcell_offset = 0;
@@ -217,7 +217,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 static gint
 ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
-	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
+	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 	gint height = 0, max_height = 0;
 	gint i;
 
@@ -234,7 +234,7 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 static gint
 ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 {
-	ECellHboxView *hbox_view = (ECellHboxView *)ecell_view;
+	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 	gint width = 0;
 	gint i;
 
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 3bf671b48a..45f1fb3727 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -188,8 +188,8 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context,
 
 	scale = gdk_pixbuf_get_height (pixbuf);
 	cairo_save (cr);
-	cairo_translate (cr, 0, (gdouble)(height - scale) / (gdouble)2);
-	gdk_cairo_set_source_pixbuf (cr, pixbuf, (gdouble)scale, (gdouble)scale);
+	cairo_translate (cr, 0, (gdouble)(height - scale) / (gdouble) 2);
+	gdk_cairo_set_source_pixbuf (cr, pixbuf, (gdouble) scale, (gdouble) scale);
 	cairo_paint (cr);
 	cairo_restore (cr);
 }
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 310b36c655..1683e896f0 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -333,7 +333,7 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	text_view->xofs = 0.0;
 	text_view->yofs = 0.0;
 
-	return (ECellView *)text_view;
+	return (ECellView *) text_view;
 }
 
 /*
@@ -502,7 +502,7 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 	PangoContext *context;
 	cairo_font_options_t *font_options;
 
-	layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas), text);
+	layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *) ecell_view->e_table_item_view)->canvas), text);
 
 	attrs = (PangoAttrList *) build_attr_list (text_view, row, text ? strlen (text) : 0);
 
@@ -528,12 +528,12 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 
 		fixed_desc = pango_font_description_from_string (ect->font_name);
 		if (fixed_desc) {
-			fixed_family = (gchar *)pango_font_description_get_family (fixed_desc);
+			fixed_family = (gchar *) pango_font_description_get_family (fixed_desc);
 			fixed_size = pango_font_description_get_size (fixed_desc);
 			fixed_points = !pango_font_description_get_size_is_absolute (fixed_desc);
 		}
 
-		desc = pango_font_description_copy (gtk_widget_get_style (GTK_WIDGET (((GnomeCanvasItem *)ecell_view->e_table_item_view)->canvas))->font_desc);
+		desc = pango_font_description_copy (gtk_widget_get_style (GTK_WIDGET (((GnomeCanvasItem *) ecell_view->e_table_item_view)->canvas))->font_desc);
 		pango_font_description_set_family (desc, fixed_family);
 		if (fixed_points)
 			pango_font_description_set_size (desc, fixed_size);
@@ -856,7 +856,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		if (edit_display && edit->im_context &&
 				gtk_im_context_filter_keypress (\
 					edit->im_context,
-					(GdkEventKey*)event)) {
+					(GdkEventKey*) event)) {
 
 			edit->need_im_reset = TRUE;
 			if (preedit_len && flags & E_CELL_PREEDIT)
@@ -1067,7 +1067,7 @@ ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 	edit->view_col = view_col;
 	edit->row = row;
 	edit->cell_width = e_table_header_get_column (
-		((ETableItem *)ecell_view->e_table_item_view)->header,
+		((ETableItem *) ecell_view->e_table_item_view)->header,
 		view_col)->width - 8;
 
 	edit->layout = generate_layout (text_view, model_col, view_col, row, edit->cell_width);
@@ -1229,7 +1229,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	PangoContext *pango_context;
 	PangoFontMetrics *font_metrics;
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
-	ECellTextView *ectView = (ECellTextView *)ecell_view;
+	ECellTextView *ectView = (ECellTextView *) ecell_view;
 	GtkWidget *canvas = GTK_WIDGET (ectView->canvas);
 	GtkStyle *style;
 	PangoDirection dir;
@@ -1260,7 +1260,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 		pango_context_get_language (pango_context));
 	ty =  (gdouble)(text_height -
 		pango_font_metrics_get_ascent (font_metrics) -
-		pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble)PANGO_SCALE;
+		pango_font_metrics_get_descent (font_metrics)) / 2.0 /(gdouble) PANGO_SCALE;
 
 	strikeout = ect->strikeout_column >= 0 && row >= 0 &&
 		e_table_model_value_at (ecell_view->e_table_model, ect->strikeout_column, row);
@@ -1270,7 +1270,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	dir = pango_find_base_dir (string, strlen (string));
 
 	if (underline) {
-		ly = ty + (gdouble)pango_font_metrics_get_underline_position (font_metrics)/(gdouble)PANGO_SCALE;
+		ly = ty + (gdouble) pango_font_metrics_get_underline_position (font_metrics)/(gdouble) PANGO_SCALE;
 		cairo_new_path (cr);
 		if (dir == PANGO_DIRECTION_RTL) {
 			cairo_move_to (cr, width - 2, ly + text_height + 6);
@@ -1280,12 +1280,12 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 			cairo_move_to (cr, 2, ly + text_height + 6);
 			cairo_line_to (cr, MIN (2 + text_width, width - 2), ly + text_height + 6);
 		}
-		cairo_set_line_width (cr, (gdouble)pango_font_metrics_get_underline_thickness (font_metrics)/(gdouble)PANGO_SCALE);
+		cairo_set_line_width (cr, (gdouble) pango_font_metrics_get_underline_thickness (font_metrics)/(gdouble) PANGO_SCALE);
 		cairo_stroke (cr);
 	}
 
 	if (strikeout) {
-		ly = ty + (gdouble)pango_font_metrics_get_strikethrough_position (font_metrics)/(gdouble)PANGO_SCALE;
+		ly = ty + (gdouble) pango_font_metrics_get_strikethrough_position (font_metrics)/(gdouble) PANGO_SCALE;
 		cairo_new_path (cr);
 		if (dir == PANGO_DIRECTION_RTL) {
 			cairo_move_to (cr, width - 2, ly + text_height + 6);
@@ -1295,7 +1295,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 			cairo_move_to (cr, 2, ly + text_height + 6);
 			cairo_line_to (cr, MIN (2 + text_width, width - 2), ly + text_height + 6);
 		}
-			cairo_set_line_width (cr,(gdouble)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(gdouble)PANGO_SCALE);
+			cairo_set_line_width (cr,(gdouble) pango_font_metrics_get_strikethrough_thickness (font_metrics)/(gdouble) PANGO_SCALE);
 
 			cairo_stroke (cr);
 	}
@@ -1609,7 +1609,7 @@ e_cell_text_get_cursor_locations (ECellTextView *tv,
 {
 	GdkRectangle area;
 	CellEdit *edit=tv->edit;
-	ECellView *cell_view = (ECellView *)tv;
+	ECellView *cell_view = (ECellView *) tv;
 	ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view);
 	GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent;
 	PangoRectangle pango_strong_pos;
@@ -1691,7 +1691,7 @@ e_cell_text_commit_cb (GtkIMContext *context,
 	if (g_utf8_validate (str, strlen (str), NULL)) {
 		command.action = E_TEP_INSERT;
 		command.position = E_TEP_SELECTION;
-		command.string = (gchar *)str;
+		command.string = (gchar *) str;
 		command.value = strlen (str);
 		e_cell_text_view_command (edit->tep, &command, edit);
 	}
@@ -1876,7 +1876,7 @@ get_position_from_xy (CellEdit *edit, gint x, gint y)
 
 	PangoLayout *layout = generate_layout (edit->text_view, edit->model_col, edit->view_col, edit->row, edit->cell_width);
 	ECellTextView *text_view = edit->text_view;
-	ECellText *ect = (ECellText *) ((ECellView *)text_view)->ecell;
+	ECellText *ect = (ECellText *) ((ECellView *) text_view)->ecell;
 
 	x -= (ect->x + text_view->xofs - edit->xofs_edit);
 	y -= (ect->y + text_view->yofs - edit->yofs_edit);
@@ -1894,7 +1894,7 @@ static gboolean
 _blink_scroll_timeout (gpointer data)
 {
 	ECellTextView *text_view = (ECellTextView *) data;
-	ECellText *ect = E_CELL_TEXT (((ECellView *)text_view)->ecell);
+	ECellText *ect = E_CELL_TEXT (((ECellView *) text_view)->ecell);
 	CellEdit *edit = text_view->edit;
 
 	gulong current_time;
@@ -2410,7 +2410,7 @@ paste_received (GtkClipboard *clipboard,
 		ETextEventProcessorCommand command;
 		command.action = E_TEP_INSERT;
 		command.position = E_TEP_SELECTION;
-		command.string = (gchar *)text;
+		command.string = (gchar *) text;
 		command.value = strlen (text);
 		command.time = GDK_CURRENT_TIME;
 		e_cell_text_view_command (edit->tep, &command, edit);
@@ -2471,7 +2471,7 @@ e_cell_text_set_selection (ECellView *cell_view,
 
 	g_return_val_if_fail (cell_view != NULL, FALSE);
 
-	ectv = (ECellTextView *)cell_view;
+	ectv = (ECellTextView *) cell_view;
 	edit = ectv->edit;
 	if (!edit)
 		return FALSE;
@@ -2520,7 +2520,7 @@ e_cell_text_get_selection (ECellView *cell_view,
 
 	g_return_val_if_fail (cell_view != NULL, FALSE);
 
-	ectv = (ECellTextView *)cell_view;
+	ectv = (ECellTextView *) cell_view;
 	edit = ectv->edit;
 	if (!edit)
 		return FALSE;
@@ -2556,7 +2556,7 @@ e_cell_text_copy_clipboard (ECellView *cell_view,
 
 	g_return_if_fail (cell_view != NULL);
 
-	ectv = (ECellTextView *)cell_view;
+	ectv = (ECellTextView *) cell_view;
 	edit = ectv->edit;
 	if (!edit)
 		return;
@@ -2590,7 +2590,7 @@ e_cell_text_paste_clipboard (ECellView *cell_view,
 
 	g_return_if_fail (cell_view != NULL);
 
-	ectv = (ECellTextView *)cell_view;
+	ectv = (ECellTextView *) cell_view;
 	edit = ectv->edit;
 	if (!edit)
 		return;
@@ -2624,7 +2624,7 @@ e_cell_text_delete_selection (ECellView *cell_view,
 
 	g_return_if_fail (cell_view != NULL);
 
-	ectv = (ECellTextView *)cell_view;
+	ectv = (ECellTextView *) cell_view;
 	edit = ectv->edit;
 	if (!edit)
 		return;
@@ -2661,7 +2661,7 @@ e_cell_text_get_text_by_view (ECellView *cell_view,
 
 	g_return_val_if_fail (cell_view != NULL, NULL);
 
-	ectv = (ECellTextView *)cell_view;
+	ectv = (ECellTextView *) cell_view;
 	edit = ectv->edit;
 
 	if (edit && ectv->edit->row == row && ectv->edit->model_col == col) { /* being editted now */
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 3d4f453820..b1edb1424e 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -302,8 +302,8 @@ cell_toggle_print (ECellView *ecell_view,
 		cairo_save (cr);
 		cairo_translate (cr, 0 , 0);
 		image = gdk_pixbuf_add_alpha (image, TRUE, 255, 255, 255);
-		image_width = (gdouble)gdk_pixbuf_get_width (image);
-		image_height = (gdouble)gdk_pixbuf_get_height (image);
+		image_width = (gdouble) gdk_pixbuf_get_width (image);
+		image_height = (gdouble) gdk_pixbuf_get_height (image);
 		cairo_rectangle (cr, image_width / 7, image_height / 3,
 				image_width - image_width / 4,
 				image_width - image_height / 7);
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 467523d6d7..b06b3d492b 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -65,7 +65,7 @@ typedef struct {
 ECellView *
 e_cell_tree_view_get_subcell_view (ECellView *ect)
 {
-	return ((ECellTreeView *)ect)->subcell_view;
+	return ((ECellTreeView *) ect)->subcell_view;
 }
 
 static ETreePath
@@ -134,7 +134,7 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 
 	tree_view->canvas = canvas;
 
-	return (ECellView *)tree_view;
+	return (ECellView *) tree_view;
 }
 
 /*
@@ -224,7 +224,7 @@ ect_draw (ECellView *ecell_view,
           gint x2,
           gint y2)
 {
-	ECellTreeView *tree_view = (ECellTreeView *)ecell_view;
+	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (ecell_view->e_table_model, row);
 	ETreeTableAdapter *tree_table_adapter = e_cell_tree_get_tree_table_adapter (ecell_view->e_table_model, row);
 	ETreePath node;
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 5d0c5989a5..1d36d4e5ce 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -66,7 +66,7 @@ ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 		vbox_view->model_cols[i] = ecv->model_cols[i];
 	}
 
-	return (ECellView *)vbox_view;
+	return (ECellView *) vbox_view;
 }
 
 /*
@@ -142,7 +142,7 @@ ecv_draw (ECellView *ecell_view,
           gint x2,
           gint y2)
 {
-	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
+	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 
 	gint subcell_offset = 0;
 	gint i;
@@ -173,7 +173,7 @@ ecv_draw (ECellView *ecell_view,
 static gint
 ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
 {
-	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
+	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 	gint y = 0;
 	gint i;
 	gint subcell_offset = 0;
@@ -208,7 +208,7 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 static gint
 ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 {
-	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
+	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 	gint height = 0;
 	gint i;
 
@@ -224,7 +224,7 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 static gint
 ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 {
-	ECellVboxView *vbox_view = (ECellVboxView *)ecell_view;
+	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 	gint max_width = 0;
 	gint i;
 
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 490072cf80..00ad664e61 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -441,8 +441,8 @@ setup_fields (ETableConfig *config)
 {
 	gint i;
 
-	e_table_model_freeze ((ETableModel *)config->available_model);
-	e_table_model_freeze ((ETableModel *)config->shown_model);
+	e_table_model_freeze ((ETableModel *) config->available_model);
+	e_table_model_freeze ((ETableModel *) config->shown_model);
 	e_table_without_show_all (config->available_model);
 	e_table_subset_variable_clear (config->shown_model);
 
@@ -457,8 +457,8 @@ setup_fields (ETableConfig *config)
 			e_table_without_hide (config->available_model, GINT_TO_POINTER (idx));
 		}
 	}
-	e_table_model_thaw ((ETableModel *)config->available_model);
-	e_table_model_thaw ((ETableModel *)config->shown_model);
+	e_table_model_thaw ((ETableModel *) config->available_model);
+	e_table_model_thaw ((ETableModel *) config->shown_model);
 }
 
 static void
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 6afde43911..14a080362a 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -413,7 +413,7 @@ etfci_drag_data_get (GtkWidget          *widget,
 		gtk_selection_data_set (selection_data,
 				       GDK_SELECTION_TYPE_STRING,
 				       sizeof (string[0]),
-				       (guchar *)string,
+				       (guchar *) string,
 				       strlen (string));
 		g_free (string);
 	}
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 7f4352a6d5..564d48494c 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -253,7 +253,7 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event)
 				ETableGroupContainerChildNode *child_node;
 				ETableGroup                   *child;
 
-				child_node = (ETableGroupContainerChildNode *)list->data;
+				child_node = (ETableGroupContainerChildNode *) list->data;
 				child      = child_node->child;
 
 				if (e_table_group_get_focus (child)) {
@@ -269,7 +269,7 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event)
 						list = list->next;
 
 					if (list) {
-						child_node = (ETableGroupContainerChildNode *)list->data;
+						child_node = (ETableGroupContainerChildNode *) list->data;
 						child = child_node->child;
 						if (use_col)
 							e_table_group_set_focus (child, direction, start_col);
@@ -289,7 +289,7 @@ etgc_event (GnomeCanvasItem *item, GdkEvent *event)
 				ETableGroupContainerChildNode *child_node;
 				ETableGroup                   *child;
 
-				child_node = (ETableGroupContainerChildNode *)list->data;
+				child_node = (ETableGroupContainerChildNode *) list->data;
 				child = child_node->child;
 
 				if (start_col == -1)
@@ -620,7 +620,7 @@ etgc_row_count (ETableGroup *etg)
 	GList *list;
 	gint count = 0;
 	for (list = etgc->children; list; list = g_list_next (list)) {
-		ETableGroup *group = ((ETableGroupContainerChildNode *)list->data)->child;
+		ETableGroup *group = ((ETableGroupContainerChildNode *) list->data)->child;
 		gint this_count = e_table_group_row_count (group);
 		count += this_count;
 	}
@@ -634,7 +634,7 @@ etgc_increment (ETableGroup *etg, gint position, gint amount)
 	GList *list;
 
 	for (list = etgc->children; list; list = g_list_next (list))
-		e_table_group_increment (((ETableGroupContainerChildNode *)list->data)->child,
+		e_table_group_increment (((ETableGroupContainerChildNode *) list->data)->child,
 					 position, amount);
 }
 
@@ -645,7 +645,7 @@ etgc_decrement (ETableGroup *etg, gint position, gint amount)
 	GList *list;
 
 	for (list = etgc->children; list; list = g_list_next (list))
-		e_table_group_decrement (((ETableGroupContainerChildNode *)list->data)->child,
+		e_table_group_decrement (((ETableGroupContainerChildNode *) list->data)->child,
 					 position, amount);
 }
 
@@ -655,10 +655,10 @@ etgc_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	if (etgc->children) {
 		if (direction == E_FOCUS_END)
-			e_table_group_set_focus (((ETableGroupContainerChildNode *)g_list_last (etgc->children)->data)->child,
+			e_table_group_set_focus (((ETableGroupContainerChildNode *) g_list_last (etgc->children)->data)->child,
 						 direction, view_col);
 		else
-			e_table_group_set_focus (((ETableGroupContainerChildNode *)etgc->children->data)->child,
+			e_table_group_set_focus (((ETableGroupContainerChildNode *) etgc->children->data)->child,
 						 direction, view_col);
 	}
 }
@@ -670,7 +670,7 @@ etgc_get_focus_column (ETableGroup *etg)
 	if (etgc->children) {
 		GList *list;
 		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			ETableGroup *child = child_node->child;
 			if (e_table_group_get_focus (child)) {
 				return e_table_group_get_focus_column (child);
@@ -696,7 +696,7 @@ etgc_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col)
 	if (*x >= 0 && *y >= 0 && etgc->children) {
 		GList *list;
 		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			ETableGroup *child = child_node->child;
 
 			e_table_group_compute_location (child, x, y, row, col);
@@ -721,7 +721,7 @@ etgc_get_mouse_over (ETableGroup *etg, gint *row, gint *col)
 		GList *list;
 
 		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			ETableGroup *child = child_node->child;
 
 			e_table_group_get_mouse_over (child, row, col);
@@ -749,7 +749,7 @@ etgc_get_cell_geometry (ETableGroup *etg, gint *row, gint *col, gint *x, gint *y
 	if (etgc->children) {
 		GList *list;
 		for (list = etgc->children; list; list = list->next) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			ETableGroup *child = child_node->child;
 			gint thisy;
 
@@ -791,7 +791,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 		etgc->minimum_width = g_value_get_double (value);
 
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "minimum_width", etgc->minimum_width - GROUP_INDENT,
 				      NULL);
@@ -800,7 +800,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_LENGTH_THRESHOLD:
 		etgc->length_threshold = g_value_get_int (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "length_threshold", etgc->length_threshold,
 				      NULL);
@@ -809,7 +809,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_UNIFORM_ROW_HEIGHT:
 		etgc->uniform_row_height = g_value_get_boolean (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "uniform_row_height", etgc->uniform_row_height,
 				      NULL);
@@ -823,7 +823,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 		if (etgc->selection_model)
 			g_object_ref (etgc->selection_model);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "selection_model", etgc->selection_model,
 				      NULL);
@@ -833,7 +833,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_TABLE_ALTERNATING_ROW_COLORS:
 		etgc->alternating_row_colors = g_value_get_boolean (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "alternating_row_colors", etgc->alternating_row_colors,
 				      NULL);
@@ -843,7 +843,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_TABLE_HORIZONTAL_DRAW_GRID:
 		etgc->horizontal_draw_grid = g_value_get_boolean (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "horizontal_draw_grid", etgc->horizontal_draw_grid,
 				      NULL);
@@ -853,7 +853,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_TABLE_VERTICAL_DRAW_GRID:
 		etgc->vertical_draw_grid = g_value_get_boolean (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "vertical_draw_grid", etgc->vertical_draw_grid,
 				      NULL);
@@ -863,7 +863,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_TABLE_DRAW_FOCUS:
 		etgc->draw_focus = g_value_get_boolean (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "drawfocus", etgc->draw_focus,
 				      NULL);
@@ -873,7 +873,7 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 	case PROP_CURSOR_MODE:
 		etgc->cursor_mode = g_value_get_int (value);
 		for (list = etgc->children; list; list = g_list_next (list)) {
-			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *)list->data;
+			ETableGroupContainerChildNode *child_node = (ETableGroupContainerChildNode *) list->data;
 			g_object_set (child_node->child,
 				      "cursor_mode", etgc->cursor_mode,
 				      NULL);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 346ffed2d3..5d38b686a0 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -802,7 +802,7 @@ ethi_drag_data_received (GtkWidget *canvas,
 
 	if (data != NULL) {
 		count = e_table_header_count (ethi->eth);
-		column = atoi ((gchar *)data);
+		column = atoi ((gchar *) data);
 		drop_col = ethi->drop_col;
 		ethi->drop_col = -1;
 
@@ -846,7 +846,7 @@ ethi_drag_data_get (GtkWidget *canvas,
 		gtk_selection_data_set (selection_data,
 				       GDK_SELECTION_TYPE_STRING,
 				       sizeof (string[0]),
-				       (guchar *)string,
+				       (guchar *) string,
 				       strlen (string));
 		g_free (string);
 	}
@@ -1867,7 +1867,7 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			gint width = 0;
 			g_signal_emit_by_name (ethi->eth,
 					       "request_width",
-					       (gint)ethi->resize_col, &width);
+					       (gint) ethi->resize_col, &width);
 			/* Add 10 to stop it from "..."ing */
 			e_table_header_set_size (ethi->eth, ethi->resize_col, width + 10);
 
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index ef1b573346..cc5b147747 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -779,7 +779,7 @@ eth_set_size (ETableHeader *eth, gint idx, gint size)
 	/* Set the new expansion so that it will generate the desired size. */
 	eth->columns[idx]->expansion =
 		expansion * (((gdouble)(size - (eth->columns[idx]->min_width +
-		eth->width_extras))) / ((gdouble)total_extra));
+		eth->width_extras))) / ((gdouble) total_extra));
 	/* The expansion left for the columns on the right. */
 	expansion -= eth->columns[idx]->expansion;
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 746e4c41b4..6da76cf77f 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -2180,7 +2180,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			}
 
 			ecell_view = eti->cell_views[col];
-			button = *(GdkEventButton *)e;
+			button = *(GdkEventButton *) e;
 			button.x = x1;
 			button.y = y1;
 
@@ -2529,7 +2529,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 				gint view_col = model_to_view_col (eti, cursor_col);
 
 				if ((view_col >= 0) && (view_col < eti->cols))
-					if (eti_e_cell_event (eti, eti->cell_views[view_col], e, ((GdkEventKey *)e)->time, cursor_col, view_col, model_to_view_row (eti, cursor_row),  E_CELL_CURSOR))
+					if (eti_e_cell_event (eti, eti->cell_views[view_col], e, ((GdkEventKey *) e)->time, cursor_col, view_col, model_to_view_row (eti, cursor_row),  E_CELL_CURSOR))
 						return TRUE;
 			} else
 			return_val = e_selection_model_key_press (E_SELECTION_MODEL (eti->selection), (GdkEventKey *) e);
@@ -3273,7 +3273,7 @@ e_table_item_compute_mouse_over (ETableItem        *eti,
 
 	gnome_canvas_item_w2i (GNOME_CANVAS_ITEM (eti), &realx, &realy);
 
-	if (!find_cell (eti, (gint)realx, (gint)realy, col, row, NULL, NULL)) {
+	if (!find_cell (eti, (gint) realx, (gint) realy, col, row, NULL, NULL)) {
 		*row = -1;
 		*col = -1;
 	}
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index 5101e9ec73..a68e9a2822 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -80,7 +80,7 @@ etmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 	if (etmc->duplicate_value)
 		return etmc->duplicate_value (etm, col, value, etmc->data);
 	else
-		return (gpointer)value;
+		return (gpointer) value;
 }
 
 static void
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index ed8a481104..69880b9113 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -88,7 +88,7 @@ one_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 	if (one->source)
 		return e_table_model_duplicate_value (one->source, col, value);
 	else
-		return (gpointer)value;
+		return (gpointer) value;
 }
 
 static void
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 491fe7fc6f..4727103f22 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -276,8 +276,8 @@ static gint
 qsort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
 	struct qsort_data *qd = (struct qsort_data *) user_data;
-	gint row1 = *(gint *)data1;
-	gint row2 = *(gint *)data2;
+	gint row1 = *(gint *) data1;
+	gint row2 = *(gint *) data2;
 	gint j;
 	gint sort_count = e_table_sort_info_sorting_get_count (qd->ets->sort_info) + e_table_sort_info_grouping_get_count (qd->ets->sort_info);
 	gint comp_val = 0;
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 1fa91214c2..5254a5e698 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -84,8 +84,8 @@ typedef struct {
 static gint
 e_sort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
-	gint row1 = *(gint *)data1;
-	gint row2 = *(gint *)data2;
+	gint row1 = *(gint *) data1;
+	gint row2 = *(gint *) data2;
 	ETableSortClosure *closure = user_data;
 	gint j;
 	gint sort_count = closure->cols;
@@ -257,8 +257,8 @@ etsu_tree_compare (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *
 static gint
 e_sort_tree_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
-	ETreePath *path1 = *(ETreePath *)data1;
-	ETreePath *path2 = *(ETreePath *)data2;
+	ETreePath *path1 = *(ETreePath *) data1;
+	ETreePath *path2 = *(ETreePath *) data2;
 	ETreeSortClosure *closure = user_data;
 
 	return etsu_tree_compare (closure->tree, closure->sort_info, closure->full_header, path1, path2, closure->cmp_cache);
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index dfa7da9e36..3324748e61 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -330,7 +330,7 @@ e_table_specification_save_to_string (ETableSpecification *specification)
 	xmlDocSetRootElement (doc, e_table_specification_save_to_node (specification, doc));
 	xmlDocDumpMemory (doc, &string, &length);
 
-	ret_val = g_strdup ((gchar *)string);
+	ret_val = g_strdup ((gchar *) string);
 	xmlFree (string);
 	return ret_val;
 }
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 536bf3c5c8..2f58715504 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -243,7 +243,7 @@ e_table_state_save_to_string    (ETableState *state)
 	xmlDocDumpMemory (doc, &string, &length);
 	xmlFreeDoc (doc);
 
-	ret_val = g_strdup ((gchar *)string);
+	ret_val = g_strdup ((gchar *) string);
 	xmlFree (string);
 	return ret_val;
 }
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 0f9a58db31..be9e3e29ec 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -213,7 +213,7 @@ e_table_subset_variable_clear (ETableSubsetVariable *etssv)
 	e_table_model_pre_change (etm);
 	etss->n_map = 0;
 	g_free (etss->map_table);
-	etss->map_table = (gint *)g_new (unsigned int, 1);
+	etss->map_table = (gint *) g_new (unsigned int, 1);
 	etssv->n_vals_allocated = 1;
 
 	e_table_model_changed (etm);
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 7473099bf9..77ea5fe9b5 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -134,7 +134,7 @@ etss_finalize (GObject *object)
 static gint
 etss_column_count (ETableModel *etm)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	return e_table_model_column_count (etss->source);
 }
@@ -142,7 +142,7 @@ etss_column_count (ETableModel *etm)
 static gint
 etss_row_count (ETableModel *etm)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	return etss->n_map;
 }
@@ -150,7 +150,7 @@ etss_row_count (ETableModel *etm)
 static gpointer
 etss_value_at (ETableModel *etm, gint col, gint row)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	g_return_val_if_fail (VALID_ROW (etss, row), NULL);
 
@@ -162,7 +162,7 @@ etss_value_at (ETableModel *etm, gint col, gint row)
 static void
 etss_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	g_return_if_fail (VALID_ROW (etss, row));
 
@@ -174,7 +174,7 @@ etss_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 static gboolean
 etss_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	g_return_val_if_fail (VALID_ROW (etss, row), FALSE);
 
@@ -190,7 +190,7 @@ etss_has_save_id (ETableModel *etm)
 static gchar *
 etss_get_save_id (ETableModel *etm, gint row)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	g_return_val_if_fail (VALID_ROW (etss, row), NULL);
 
@@ -203,14 +203,14 @@ etss_get_save_id (ETableModel *etm, gint row)
 static void
 etss_append_row (ETableModel *etm, ETableModel *source, gint row)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 	e_table_model_append_row (etss->source, source, row);
 }
 
 static gpointer
 etss_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	return e_table_model_duplicate_value (etss->source, col, value);
 }
@@ -218,7 +218,7 @@ etss_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 static void
 etss_free_value (ETableModel *etm, gint col, gpointer value)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	e_table_model_free_value (etss->source, col, value);
 }
@@ -226,7 +226,7 @@ etss_free_value (ETableModel *etm, gint col, gpointer value)
 static gpointer
 etss_initialize_value (ETableModel *etm, gint col)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	return e_table_model_initialize_value (etss->source, col);
 }
@@ -234,7 +234,7 @@ etss_initialize_value (ETableModel *etm, gint col)
 static gboolean
 etss_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	return e_table_model_value_is_empty (etss->source, col, value);
 }
@@ -242,7 +242,7 @@ etss_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 static gchar *
 etss_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETableSubset *etss = (ETableSubset *)etm;
+	ETableSubset *etss = (ETableSubset *) etm;
 
 	return e_table_model_value_to_string (etss->source, col, value);
 }
@@ -399,7 +399,7 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals)
 			return NULL;
 	} else
 		buffer = NULL;
-	etss->map_table = (gint *)buffer;
+	etss->map_table = (gint *) buffer;
 	etss->n_map = nvals;
 	etss->source = source;
 	g_object_ref (source);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 38ede4dd80..c1d0a2ad94 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -733,8 +733,8 @@ table_canvas_reflow_idle (ETable *e_table)
 	g_object_get (
 		e_table->canvas_vbox,
 		"height", &height, "width", &width, NULL);
-	height = MAX ((gint)height, allocation.height);
-	width = MAX ((gint)width, allocation.width);
+	height = MAX ((gint) height, allocation.height);
+	width = MAX ((gint) width, allocation.width);
 	/* I have no idea why this needs to be -1, but it works. */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (e_table->table_canvas),
 					NULL, NULL, &oldwidth, &oldheight);
@@ -763,7 +763,7 @@ table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 	g_object_get (e_table->canvas_vbox,
 		      "height", &height,
 		      NULL);
-	height = MAX ((gint)height, alloc->height);
+	height = MAX ((gint) height, alloc->height);
 
 	g_object_set (e_table->canvas_vbox,
 		      "width", width,
@@ -1214,7 +1214,7 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d
 	} else if (!canvas->focused_item && etable->group) {
 		focus_first_etable_item (etable->group);
 	} else if (canvas->focused_item) {
-		ESelectionModel *selection = (ESelectionModel *)etable->selection;
+		ESelectionModel *selection = (ESelectionModel *) etable->selection;
 
 		/* check whether click_to_add already got the focus */
 		if (etable->click_to_add) {
@@ -2030,7 +2030,7 @@ e_table_set_specification (ETable *e_table, const gchar *spec)
 	g_return_val_if_fail (spec != NULL, -1);
 
 	/* doesn't work yet, sigh */
-	xmlSpec = xmlParseMemory ((gchar *)spec, strlen (spec));
+	xmlSpec = xmlParseMemory ((gchar *) spec, strlen (spec));
 	ret = et_real_set_specification (e_table, xmlSpec);
 	xmlFreeDoc (xmlSpec);
 
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 1edaa3e09d..9c46cf7fda 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -138,7 +138,7 @@ etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
 	if (etmc->duplicate_value)
 		return etmc->duplicate_value (etm, col, value, etmc->model_data);
 	else
-		return (gpointer)value;
+		return (gpointer) value;
 }
 
 static void
@@ -288,6 +288,6 @@ e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
 
 	etmc->model_data         = model_data;
 
-	return (ETreeModel*)etmc;
+	return (ETreeModel*) etmc;
 }
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index c32b7311bd..61200cda4c 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -641,8 +641,8 @@ typedef struct {
 static gint
 sort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
 {
-	ETreePath path1 = *(ETreePath *)data1;
-	ETreePath path2 = *(ETreePath *)data2;
+	ETreePath path1 = *(ETreePath *) data1;
+	ETreePath path2 = *(ETreePath *) data2;
 	MemoryAndClosure *mac = user_data;
 	return (*mac->callback) (mac->memory, path1, path2, mac->closure);
 }
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 8644187b91..f486f7eec7 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -601,9 +601,9 @@ etsm_select_single_row (ESelectionModel *selection, gint row)
 			gint *p = rows;
 
 			while (p<rowp)
-				e_selection_model_selection_row_changed ((ESelectionModel *)etsm, *p++);
+				e_selection_model_selection_row_changed ((ESelectionModel *) etsm, *p++);
 		}
-		e_selection_model_selection_row_changed ((ESelectionModel *)etsm, row);
+		e_selection_model_selection_row_changed ((ESelectionModel *) etsm, row);
 	}
 }
 
@@ -622,7 +622,7 @@ etsm_toggle_single_row (ESelectionModel *selection, gint row)
 
 	etsm->priv->start_path = NULL;
 
-	e_selection_model_selection_row_changed ((ESelectionModel *)etsm, row);
+	e_selection_model_selection_row_changed ((ESelectionModel *) etsm, row);
 }
 
 static void
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index fe8f90f536..e162030e0f 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -161,13 +161,13 @@ get_node (ETreeTableAdapter *etta, ETreePath path)
 	if (!gnode)
 		return NULL;
 
-	return (node_t *)gnode->data;
+	return (node_t *) gnode->data;
 }
 
 static void
 resort_node (ETreeTableAdapter *etta, GNode *gnode, gboolean recurse)
 {
-	node_t *node = (node_t *)gnode->data;
+	node_t *node = (node_t *) gnode->data;
 	ETreePath *paths, path;
 	GNode *prev, *curr;
 	gint i, count;
@@ -242,7 +242,7 @@ get_path (ETreeTableAdapter *etta, gint row)
 static void
 kill_gnode (GNode *node, ETreeTableAdapter *etta)
 {
-	g_hash_table_remove (etta->priv->nodes, ((node_t *)node->data)->path);
+	g_hash_table_remove (etta->priv->nodes, ((node_t *) node->data)->path);
 
 	while (node->children) {
 		GNode *next = node->children->next;
@@ -269,7 +269,7 @@ update_child_counts (GNode *gnode, gint delta)
 static gint
 delete_children (ETreeTableAdapter *etta, GNode *gnode)
 {
-	node_t *node = (node_t *)gnode->data;
+	node_t *node = (node_t *) gnode->data;
 	gint to_remove = node ? node->num_visible_children : 0;
 
 	if (to_remove == 0)
@@ -348,7 +348,7 @@ insert_children (ETreeTableAdapter *etta, GNode *gnode)
 	gint count = 0;
 	gint pos = 0;
 
-	path = ((node_t *)gnode->data)->path;
+	path = ((node_t *) gnode->data)->path;
 	for (tmp = e_tree_model_node_get_first_child (etta->priv->source, path);
 	     tmp;
 	     tmp = e_tree_model_node_get_next (etta->priv->source, tmp), pos++) {
@@ -580,7 +580,7 @@ etta_dispose (GObject *object)
 static gint
 etta_column_count (ETableModel *etm)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_column_count (etta->priv->source);
 }
@@ -588,7 +588,7 @@ etta_column_count (ETableModel *etm)
 static gboolean
 etta_has_save_id (ETableModel *etm)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_has_save_id (etta->priv->source);
 }
@@ -596,7 +596,7 @@ etta_has_save_id (ETableModel *etm)
 static gchar *
 etta_get_save_id (ETableModel *etm, gint row)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_get_save_id (etta->priv->source, get_path (etta, row));
 }
@@ -604,7 +604,7 @@ etta_get_save_id (ETableModel *etm, gint row)
 static gboolean
 etta_has_change_pending (ETableModel *etm)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_has_change_pending (etta->priv->source);
 }
@@ -612,7 +612,7 @@ etta_has_change_pending (ETableModel *etm)
 static gint
 etta_row_count (ETableModel *etm)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return etta->priv->n_map;
 }
@@ -620,7 +620,7 @@ etta_row_count (ETableModel *etm)
 static gpointer
 etta_value_at (ETableModel *etm, gint col, gint row)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	switch (col) {
 	case -1:
@@ -639,7 +639,7 @@ etta_value_at (ETableModel *etm, gint col, gint row)
 static void
 etta_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	e_tree_model_set_value_at (etta->priv->source, get_path (etta, row), col, val);
 }
@@ -647,7 +647,7 @@ etta_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 static gboolean
 etta_is_cell_editable (ETableModel *etm, gint col, gint row)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_node_is_editable (etta->priv->source, get_path (etta, row), col);
 }
@@ -660,7 +660,7 @@ etta_append_row (ETableModel *etm, ETableModel *source, gint row)
 static gpointer
 etta_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_duplicate_value (etta->priv->source, col, value);
 }
@@ -668,7 +668,7 @@ etta_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 static void
 etta_free_value (ETableModel *etm, gint col, gpointer value)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	e_tree_model_free_value (etta->priv->source, col, value);
 }
@@ -676,7 +676,7 @@ etta_free_value (ETableModel *etm, gint col, gpointer value)
 static gpointer
 etta_initialize_value (ETableModel *etm, gint col)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_initialize_value (etta->priv->source, col);
 }
@@ -684,7 +684,7 @@ etta_initialize_value (ETableModel *etm, gint col)
 static gboolean
 etta_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_value_is_empty (etta->priv->source, col, value);
 }
@@ -692,7 +692,7 @@ etta_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 static gchar *
 etta_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 {
-	ETreeTableAdapter *etta = (ETreeTableAdapter *)etm;
+	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
 	return e_tree_model_value_to_string (etta->priv->source, col, value);
 }
@@ -935,7 +935,7 @@ static void
 save_expanded_state_func (gpointer keyp, gpointer value, gpointer data)
 {
 	ETreePath path = keyp;
-	node_t *node = ((GNode *)value)->data;
+	node_t *node = ((GNode *) value)->data;
 	TreeAndRoot *tar = data;
 	xmlNode *xmlnode;
 
@@ -1136,7 +1136,7 @@ e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta, gboolean vi
 		if (root)
 			e_tree_table_adapter_node_set_expanded (etta, root, TRUE);
 	}
-	size = (visible ? 1 : 0) + (etta->priv->root ? ((node_t *)etta->priv->root->data)->num_visible_children : 0);
+	size = (visible ? 1 : 0) + (etta->priv->root ? ((node_t *) etta->priv->root->data)->num_visible_children : 0);
 	resize_map (etta, size);
 	if (etta->priv->root)
 		fill_map (etta, 0, etta->priv->root);
@@ -1303,7 +1303,7 @@ e_tree_table_adapter_node_get_next (ETreeTableAdapter *etta, ETreePath path)
 	GNode *node = lookup_gnode (etta, path);
 
 	if (node && node->next)
-		return ((node_t *)node->next->data)->path;
+		return ((node_t *) node->next->data)->path;
 
 	return NULL;
 }
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index d9b6ce4035..470fc074e4 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -775,8 +775,8 @@ tree_canvas_reflow_idle (ETree *e_tree)
 		e_tree->priv->item,
 		"height", &height, "width", &width, NULL);
 
-	height = MAX ((gint)height, allocation.height);
-	width = MAX ((gint)width, allocation.width);
+	height = MAX ((gint) height, allocation.height);
+	width = MAX ((gint) width, allocation.width);
 
 	/* I have no idea why this needs to be -1, but it works. */
 	gnome_canvas_get_scroll_region (
@@ -815,7 +815,7 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 	g_object_get (e_tree->priv->item,
 		      "height", &height,
 		      NULL);
-	height = MAX ((gint)height, alloc->height);
+	height = MAX ((gint) height, alloc->height);
 
 	g_object_set (e_tree->priv->item,
 		      "width", width,
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index ee06f6e025..808a611934 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -211,14 +211,14 @@ gal_a11y_e_cell_tree_new (ETableItem *item,
 					    /* Translators: description of an "expand" action */
 					    _("expands the row in the ETree containing this cell"),
 					    NULL,
-					    (ACTION_FUNC)ectr_do_action_expand);
+					    (ACTION_FUNC) ectr_do_action_expand);
 
 		gal_a11y_e_cell_add_action (GAL_A11Y_E_CELL (subcell_a11y),
 					    "collapse",
 					    /* Translators: description of a "collapse" action */
 					    _("collapses the row in the ETree containing this cell"),
 					    NULL,
-					    (ACTION_FUNC)ectr_do_action_collapse);
+					    (ACTION_FUNC) ectr_do_action_collapse);
 
 		/* init AtkStates for the cell's a11y object */
 		node = e_table_model_value_at (item->table_model, -1, row);
diff --git a/widgets/table/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index 1fa24f821a..637a53e7e3 100644
--- a/widgets/table/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
@@ -138,7 +138,7 @@ ecv_ref_accessible_at_point (AtkComponent *component,
 			ecvv->subcell_views[i], ecvv->model_cols[i],
 			gaec->view_col, gaec->row);
 		if ( 0 <= y && y <= subcell_height) {
-			return ecv_ref_child ((AtkObject *)component, i);
+			return ecv_ref_child ((AtkObject *) component, i);
 		} else
 			y -= subcell_height;
 	}
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index 17f9b8f166..1cac917edd 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -282,7 +282,7 @@ static void
 _gal_a11y_e_cell_destroy_action_info (gpointer action_info,
 				      gpointer user_data)
 {
-	ActionInfo *info = (ActionInfo *)action_info;
+	ActionInfo *info = (ActionInfo *) action_info;
 
 	g_return_if_fail (info != NULL);
 	g_free (info->name);
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 92716e68bc..ffa4bd51c2 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -756,7 +756,7 @@ eti_rows_deleted (ETableModel * model, gint row, gint count,
 		}
 	}
 	g_signal_emit_by_name (table_item, "visible-data-changed");
-	eti_a11y_reset_focus_object ((GalA11yETableItem *)table_item, item, TRUE);
+	eti_a11y_reset_focus_object ((GalA11yETableItem *) table_item, item, TRUE);
 }
 
 static void
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index c6ba4e7d2b..d04bda280e 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -91,7 +91,7 @@ init_child_item (GalA11yETable *a11y)
 
 	table = E_TABLE (gtk_accessible_get_widget (GTK_ACCESSIBLE (a11y)));
 	if (table && gtk_widget_get_mapped (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER (table->group)) {
-		ETableGroupContainer *etgc =  (ETableGroupContainer *)table->group;
+		ETableGroupContainer *etgc =  (ETableGroupContainer *) table->group;
 		GList *list;
 
 		for (list = etgc->children; list; list = g_list_next (list)) {
@@ -133,7 +133,7 @@ et_get_n_children (AtkObject *accessible)
 		if (E_IS_TABLE_GROUP_LEAF (et->group))
 			n = 1;
 		else if (E_IS_TABLE_GROUP_CONTAINER (et->group)) {
-			ETableGroupContainer *etgc = (ETableGroupContainer *)et->group;
+			ETableGroupContainer *etgc = (ETableGroupContainer *) et->group;
 			n = g_list_length (etgc->children);
 		}
 	}
@@ -291,7 +291,7 @@ gal_a11y_e_table_new (GObject *widget)
 		g_object_ref (a11y);
 		g_object_ref (widget);
 
-		g_idle_add ((GSourceFunc)init_child_item, a11y);
+		g_idle_add ((GSourceFunc) init_child_item, a11y);
 	}
 
 	return ATK_OBJECT (a11y);
-- 
cgit v1.2.3


From d88a9e736052357389f77a1e8e25221a1517ca72 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Mon, 16 May 2011 13:08:04 -0400
Subject: Bug 649990 - Remove get_font_options() from e-util.c.

Not only is get_font_options() no longer needed, it's actually doing the
wrong thing by reading settings through GConfClient instead of GSettings.

But it turns out, thanks to the tighter Cairo integration in GTK3, the
widgets that call get_font_options() can be made to work correctly by
simply removing this hack.  Love it when that happens.
---
 widgets/table/e-cell-text.c | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 1683e896f0..e3d095cc34 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -499,8 +499,6 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
 	PangoAttrList *attrs;
 	PangoLayout *layout;
-	PangoContext *context;
-	cairo_font_options_t *font_options;
 
 	layout = gtk_widget_create_pango_layout (GTK_WIDGET (((GnomeCanvasItem *) ecell_view->e_table_item_view)->canvas), text);
 
@@ -512,13 +510,6 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 	if (text_view->edit || width <= 0)
 		return layout;
 
-	context = pango_layout_get_context (layout);
-
-	font_options = get_font_options ();
-	pango_cairo_context_set_font_options (context, font_options);
-	cairo_font_options_destroy (font_options);
-	pango_layout_context_changed (layout);
-
 	if (ect->font_name)
 	{
 		PangoFontDescription *desc = NULL, *fixed_desc = NULL;
-- 
cgit v1.2.3


From cb97c2dc8fd97b381af048f206333d5e557892ae Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 21 May 2011 10:02:58 -0400
Subject: Coding style and whitespace cleanup.

---
 widgets/table/e-cell-combo.c                  | 172 ++++++++++++++------------
 widgets/table/e-cell-date-edit.c              |  59 +++++----
 widgets/table/e-cell-toggle.c                 |  13 +-
 widgets/table/e-table-config.c                |  25 +++-
 widgets/table/e-table-extras.c                |   3 +-
 widgets/table/e-table-header-item.c           |  88 ++++++++-----
 widgets/table/e-table-header.c                |   3 +-
 widgets/table/e-table-subset-variable.c       |  17 ++-
 widgets/table/e-table.c                       | 143 ++++++++++++---------
 widgets/table/e-tree-memory.c                 |   9 +-
 widgets/table/gal-a11y-e-table-click-to-add.c |  44 ++++---
 widgets/table/gal-a11y-e-table-item.c         |   5 +-
 12 files changed, 347 insertions(+), 234 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 48a762a8d9..b366c9382c 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -73,38 +73,36 @@
 /* The height to make the popup list if there aren't any items in it. */
 #define	E_CELL_COMBO_LIST_EMPTY_HEIGHT	15
 
-static void e_cell_combo_dispose	(GObject	*object);
-
-static gint e_cell_combo_do_popup	(ECellPopup	*ecp,
-					 GdkEvent	*event,
-					 gint             row,
-					 gint             view_col);
-static void e_cell_combo_select_matching_item	(ECellCombo	*ecc);
-static void e_cell_combo_show_popup	(ECellCombo	*ecc,
-					 gint             row,
-					 gint             view_col);
-static void e_cell_combo_get_popup_pos	(ECellCombo	*ecc,
-					 gint             row,
-					 gint             view_col,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width);
-
-static void e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc);
-
-static gint e_cell_combo_button_press	(GtkWidget	*popup_window,
-					 GdkEvent	*event,
-					 ECellCombo	*ecc);
-static gint e_cell_combo_button_release	(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellCombo	*ecc);
-static gint e_cell_combo_key_press	(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellCombo	*ecc);
-
-static void e_cell_combo_update_cell	(ECellCombo	*ecc);
-static void e_cell_combo_restart_edit	(ECellCombo	*ecc);
+static void	e_cell_combo_dispose		(GObject *object);
+static gint	e_cell_combo_do_popup		(ECellPopup *ecp,
+						 GdkEvent *event,
+						 gint row,
+						 gint view_col);
+static void	e_cell_combo_select_matching_item
+						(ECellCombo *ecc);
+static void	e_cell_combo_show_popup		(ECellCombo *ecc,
+						 gint row,
+						 gint view_col);
+static void	e_cell_combo_get_popup_pos	(ECellCombo *ecc,
+						 gint row,
+						 gint view_col,
+						 gint *x,
+						 gint *y,
+						 gint *height,
+						 gint *width);
+static void	e_cell_combo_selection_changed	(GtkTreeSelection *selection,
+						 ECellCombo *ecc);
+static gint	e_cell_combo_button_press	(GtkWidget *popup_window,
+						 GdkEvent *event,
+						 ECellCombo *ecc);
+static gint	e_cell_combo_button_release	(GtkWidget *popup_window,
+						 GdkEventButton *event,
+						 ECellCombo *ecc);
+static gint	e_cell_combo_key_press		(GtkWidget *popup_window,
+						 GdkEventKey *event,
+						 ECellCombo *ecc);
+static void	e_cell_combo_update_cell	(ECellCombo *ecc);
+static void	e_cell_combo_restart_edit	(ECellCombo *ecc);
 
 G_DEFINE_TYPE (ECellCombo, e_cell_combo, E_TYPE_CELL_POPUP)
 
@@ -132,7 +130,8 @@ e_cell_combo_init			(ECellCombo	*ecc)
 	   ever be one popup in use at a time. */
 	ecc->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
 
-	gtk_window_set_type_hint (GTK_WINDOW (ecc->popup_window), GDK_WINDOW_TYPE_HINT_COMBO);
+	gtk_window_set_type_hint (
+		GTK_WINDOW (ecc->popup_window), GDK_WINDOW_TYPE_HINT_COMBO);
 	gtk_window_set_resizable (GTK_WINDOW (ecc->popup_window), TRUE);
 
 	frame = gtk_frame_new (NULL);
@@ -143,53 +142,60 @@ e_cell_combo_init			(ECellCombo	*ecc)
 	ecc->popup_scrolled_window = gtk_scrolled_window_new (NULL, NULL);
 	scrolled_window = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window);
 
-	gtk_scrolled_window_set_policy (scrolled_window,
-					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
-	gtk_widget_set_can_focus (gtk_scrolled_window_get_hscrollbar (scrolled_window), FALSE);
-	gtk_widget_set_can_focus (gtk_scrolled_window_get_vscrollbar (scrolled_window), FALSE);
+	gtk_scrolled_window_set_policy (
+		scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+	gtk_widget_set_can_focus (
+		gtk_scrolled_window_get_hscrollbar (scrolled_window), FALSE);
+	gtk_widget_set_can_focus (
+		gtk_scrolled_window_get_vscrollbar (scrolled_window), FALSE);
 	gtk_container_add (GTK_CONTAINER (frame), ecc->popup_scrolled_window);
 	gtk_widget_show (ecc->popup_scrolled_window);
 
 	store = gtk_list_store_new (1, G_TYPE_STRING);
-	ecc->popup_tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
+	ecc->popup_tree_view =
+		gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
 	g_object_unref (store);
 
 	gtk_tree_view_append_column (
 		GTK_TREE_VIEW (ecc->popup_tree_view),
-		gtk_tree_view_column_new_with_attributes ("Text", gtk_cell_renderer_text_new (), "text", 0, NULL));
+		gtk_tree_view_column_new_with_attributes (
+			"Text", gtk_cell_renderer_text_new (),
+			"text", 0, NULL));
 
-	gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ecc->popup_tree_view), FALSE);
+	gtk_tree_view_set_headers_visible (
+		GTK_TREE_VIEW (ecc->popup_tree_view), FALSE);
 
-	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ecc->popup_tree_view));
+	selection = gtk_tree_view_get_selection (
+		GTK_TREE_VIEW (ecc->popup_tree_view));
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window), ecc->popup_tree_view);
-	gtk_container_set_focus_vadjustment (GTK_CONTAINER (ecc->popup_tree_view),
-					     gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
-	gtk_container_set_focus_hadjustment (GTK_CONTAINER (ecc->popup_tree_view),
-					     gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
+	gtk_scrolled_window_add_with_viewport (
+		GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window),
+		ecc->popup_tree_view);
+	gtk_container_set_focus_vadjustment (
+		GTK_CONTAINER (ecc->popup_tree_view),
+		gtk_scrolled_window_get_vadjustment (
+		GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
+	gtk_container_set_focus_hadjustment (
+		GTK_CONTAINER (ecc->popup_tree_view),
+		gtk_scrolled_window_get_hadjustment (
+		GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window)));
 	gtk_widget_show (ecc->popup_tree_view);
 
 	a11y = gtk_widget_get_accessible (ecc->popup_tree_view);
 	atk_object_set_name (a11y, _("popup list"));
 
-	g_signal_connect (selection,
-			  "changed",
-			  G_CALLBACK (e_cell_combo_selection_changed),
-			  ecc);
-	g_signal_connect (ecc->popup_window,
-			  "button_press_event",
-			  G_CALLBACK (e_cell_combo_button_press),
-			  ecc);
-	/* We use connect_after here so the list updates the selection before
-	   we hide the popup and update the cell. */
-	g_signal_connect (ecc->popup_window,
-			  "button_release_event",
-			  G_CALLBACK (e_cell_combo_button_release),
-			  ecc);
-	g_signal_connect (ecc->popup_window,
-			  "key_press_event",
-			  G_CALLBACK (e_cell_combo_key_press), ecc);
+	g_signal_connect (
+		selection, "changed",
+		G_CALLBACK (e_cell_combo_selection_changed), ecc);
+	g_signal_connect (
+		ecc->popup_window, "button_press_event",
+		G_CALLBACK (e_cell_combo_button_press), ecc);
+	g_signal_connect (
+		ecc->popup_window, "button_release_event",
+		G_CALLBACK (e_cell_combo_button_release), ecc);
+	g_signal_connect (
+		ecc->popup_window, "key_press_event",
+		G_CALLBACK (e_cell_combo_key_press), ecc);
 }
 
 /**
@@ -209,7 +215,7 @@ e_cell_combo_new (void)
  * GObject::dispose method
  */
 static void
-e_cell_combo_dispose			(GObject *object)
+e_cell_combo_dispose (GObject *object)
 {
 	ECellCombo *ecc = E_CELL_COMBO (object);
 
@@ -221,8 +227,8 @@ e_cell_combo_dispose			(GObject *object)
 }
 
 void
-e_cell_combo_set_popdown_strings	(ECellCombo	*ecc,
-					 GList		*strings)
+e_cell_combo_set_popdown_strings (ECellCombo *ecc,
+                                  GList *strings)
 {
 	GList *elem;
 	GtkListStore *store;
@@ -230,7 +236,9 @@ e_cell_combo_set_popdown_strings	(ECellCombo	*ecc,
 	g_return_if_fail (E_IS_CELL_COMBO (ecc));
 	g_return_if_fail (strings != NULL);
 
-	store = GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view)));
+	store = GTK_LIST_STORE (
+		gtk_tree_view_get_model (
+		GTK_TREE_VIEW (ecc->popup_tree_view)));
 	gtk_list_store_clear (store);
 
 	for (elem = strings; elem; elem = elem->next) {
@@ -243,10 +251,10 @@ e_cell_combo_set_popdown_strings	(ECellCombo	*ecc,
 }
 
 static gint
-e_cell_combo_do_popup			(ECellPopup	*ecp,
-					 GdkEvent	*event,
-					 gint             row,
-					 gint             view_col)
+e_cell_combo_do_popup (ECellPopup *ecp,
+                       GdkEvent *event,
+                       gint row,
+                       gint view_col)
 {
 	ECellCombo *ecc = E_CELL_COMBO (ecp);
 	guint32 time;
@@ -311,9 +319,12 @@ e_cell_combo_select_matching_item	(ECellCombo	*ecc)
 		gtk_tree_model_get (model, &iter, 0, &str, -1);
 
 		if (str && g_str_equal (str, cell_text)) {
-			GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
+			GtkTreePath *path;
 
-			gtk_tree_view_set_cursor (GTK_TREE_VIEW (ecc->popup_tree_view), path, NULL, FALSE);
+			path = gtk_tree_model_get_path (model, &iter);
+			gtk_tree_view_set_cursor (
+				GTK_TREE_VIEW (ecc->popup_tree_view),
+				path, NULL, FALSE);
 			gtk_tree_path_free (path);
 
 			found = TRUE;
@@ -444,7 +455,9 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 
 	gtk_widget_get_preferred_size (ecc->popup_tree_view, &list_requisition, NULL);
 	min_height = MIN (list_requisition.height, requisition.height);
-	if (!gtk_tree_model_iter_n_children (gtk_tree_view_get_model (GTK_TREE_VIEW (ecc->popup_tree_view)), NULL))
+	if (!gtk_tree_model_iter_n_children (
+			gtk_tree_view_get_model (
+			GTK_TREE_VIEW (ecc->popup_tree_view)), NULL))
 		list_requisition.height += E_CELL_COMBO_LIST_EMPTY_HEIGHT;
 
 	popwin_child = gtk_bin_get_child (popwin);
@@ -530,7 +543,8 @@ e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc)
 	GtkTreeIter iter;
 	GtkTreeModel *model;
 
-	if (!gtk_widget_get_realized (ecc->popup_window) || !gtk_tree_selection_get_selected (selection, &model, &iter))
+	if (!gtk_widget_get_realized (ecc->popup_window) ||
+	    !gtk_tree_selection_get_selected (selection, &model, &iter))
 		return;
 
 	e_cell_combo_update_cell (ecc);
@@ -633,7 +647,8 @@ e_cell_combo_key_press			(GtkWidget	*popup_window,
 	    && event->keyval != GDK_KEY_3270_Enter)
 		return FALSE;
 
-	if (event->keyval == GDK_KEY_Escape && (!ecc->popup_window||!gtk_widget_get_visible (ecc->popup_window)))
+	if (event->keyval == GDK_KEY_Escape &&
+	   (!ecc->popup_window || !gtk_widget_get_visible (ecc->popup_window)))
 		return FALSE;
 
 	gtk_grab_remove (ecc->popup_window);
@@ -660,7 +675,8 @@ e_cell_combo_update_cell		(ECellCombo	*ecc)
 	ECellText *ecell_text = E_CELL_TEXT (ecp->child);
 	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
 	ETableCol *ecol;
-	GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (ecc->popup_tree_view));
+	GtkTreeSelection *selection = gtk_tree_view_get_selection (
+		GTK_TREE_VIEW (ecc->popup_tree_view));
 	GtkTreeModel *model;
 	GtkTreeIter iter;
 	gchar *text = NULL, *old_text;
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index fc81d59cfd..750b4dea0b 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -843,7 +843,7 @@ e_cell_date_edit_on_ok_clicked		(GtkWidget	*button,
 }
 
 static void
-e_cell_date_edit_show_time_invalid_warning	(ECellDateEdit	*ecde)
+e_cell_date_edit_show_time_invalid_warning (ECellDateEdit *ecde)
 {
 	GtkWidget *dialog;
 	struct tm date_tm;
@@ -873,46 +873,48 @@ e_cell_date_edit_show_time_invalid_warning	(ECellDateEdit	*ecde)
 }
 
 static void
-e_cell_date_edit_on_now_clicked		(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
+e_cell_date_edit_on_now_clicked (GtkWidget *button,
+                                 ECellDateEdit *ecde)
 {
 	struct tm tmp_tm;
 	time_t t;
 	gchar buffer[64];
 
 	if (ecde->time_callback) {
-		tmp_tm = (*ecde->time_callback) (ecde, ecde->time_callback_data);
+		tmp_tm = ecde->time_callback (
+			ecde, ecde->time_callback_data);
 	} else {
 		t = time (NULL);
 		tmp_tm = *localtime (&t);
 	}
-	e_time_format_date_and_time (&tmp_tm,
-				     ecde->use_24_hour_format,
-				     TRUE, FALSE,
-				     buffer, sizeof (buffer));
+
+	e_time_format_date_and_time (
+		&tmp_tm, ecde->use_24_hour_format,
+		TRUE, FALSE, buffer, sizeof (buffer));
 
 	e_cell_date_edit_update_cell (ecde, buffer);
 	e_cell_date_edit_hide_popup (ecde);
 }
 
 static void
-e_cell_date_edit_on_none_clicked	(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
+e_cell_date_edit_on_none_clicked (GtkWidget *button,
+                                  ECellDateEdit *ecde)
 {
 	e_cell_date_edit_update_cell (ecde, "");
 	e_cell_date_edit_hide_popup (ecde);
 }
 
 static void
-e_cell_date_edit_on_today_clicked	(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
+e_cell_date_edit_on_today_clicked (GtkWidget *button,
+                                   ECellDateEdit *ecde)
 {
 	struct tm tmp_tm;
 	time_t t;
 	gchar buffer[64];
 
 	if (ecde->time_callback) {
-		tmp_tm = (*ecde->time_callback) (ecde, ecde->time_callback_data);
+		tmp_tm = ecde->time_callback (
+			ecde, ecde->time_callback_data);
 	} else {
 		t = time (NULL);
 		tmp_tm = *localtime (&t);
@@ -921,18 +923,18 @@ e_cell_date_edit_on_today_clicked	(GtkWidget	*button,
 	tmp_tm.tm_hour = 0;
 	tmp_tm.tm_min = 0;
 	tmp_tm.tm_sec = 0;
-	e_time_format_date_and_time (&tmp_tm,
-				     ecde->use_24_hour_format,
-				     FALSE, FALSE,
-				     buffer, sizeof (buffer));
+
+	e_time_format_date_and_time (
+		&tmp_tm, ecde->use_24_hour_format,
+		FALSE, FALSE, buffer, sizeof (buffer));
 
 	e_cell_date_edit_update_cell (ecde, buffer);
 	e_cell_date_edit_hide_popup (ecde);
 }
 
 static void
-e_cell_date_edit_update_cell		(ECellDateEdit	*ecde,
-					 const gchar	*text)
+e_cell_date_edit_update_cell (ECellDateEdit *ecde,
+                              const gchar *text)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecde);
 	ECellText *ecell_text = E_CELL_TEXT (ecp->child);
@@ -944,21 +946,26 @@ e_cell_date_edit_update_cell		(ECellDateEdit	*ecde,
 	/* Compare the new text with the existing cell contents. */
 	ecol = e_table_header_get_column (eti->header, ecp->popup_view_col);
 
-	old_text = e_cell_text_get_text (ecell_text, ecv->e_table_model,
-					 ecol->col_idx, ecp->popup_row);
+	old_text = e_cell_text_get_text (
+		ecell_text, ecv->e_table_model,
+		ecol->col_idx, ecp->popup_row);
 
 	/* If they are different, update the cell contents. */
 	if (strcmp (old_text, text)) {
-		e_cell_text_set_value (ecell_text, ecv->e_table_model,
-				       ecol->col_idx, ecp->popup_row, text);
-		e_cell_leave_edit (ecv, ecp->popup_view_col, ecol->col_idx, ecp->popup_row, NULL);
+		e_cell_text_set_value (
+			ecell_text, ecv->e_table_model,
+			ecol->col_idx, ecp->popup_row, text);
+		e_cell_leave_edit (
+			ecv, ecp->popup_view_col,
+			ecol->col_idx, ecp->popup_row, NULL);
 	}
 
 	e_cell_text_free_text (ecell_text, old_text);
 }
 
 static void
-e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *ecde)
+e_cell_date_edit_on_time_selected (GtkTreeSelection *selection,
+                                   ECellDateEdit *ecde)
 {
 	gchar *list_item_text = NULL;
 	GtkTreeIter iter;
@@ -977,7 +984,7 @@ e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *e
 }
 
 static void
-e_cell_date_edit_hide_popup		(ECellDateEdit	*ecde)
+e_cell_date_edit_hide_popup (ECellDateEdit *ecde)
 {
 	gtk_grab_remove (ecde->popup_window);
 	gtk_widget_hide (ecde->popup_window);
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index b1edb1424e..76fd452397 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -185,11 +185,8 @@ cell_toggle_draw (ECellView *ecell_view,
 
 	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
-	if (value < 0 || value >= priv->pixbufs->len) {
-		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
-			   value, priv->pixbufs->len);
+	if (value < 0 || value >= priv->pixbufs->len)
 		return;
-	}
 
 	image = g_ptr_array_index (priv->pixbufs, value);
 
@@ -238,7 +235,8 @@ cell_toggle_event (ECellView *ecell_view,
                    ECellActions *actions)
 {
 	ECellToggleView *toggle_view = (ECellToggleView *) ecell_view;
-	gpointer _value = e_table_model_value_at (ecell_view->e_table_model, model_col, row);
+	gpointer _value = e_table_model_value_at (
+		ecell_view->e_table_model, model_col, row);
 	const gint value = GPOINTER_TO_INT (_value);
 
 	switch (event->type) {
@@ -290,11 +288,8 @@ cell_toggle_print (ECellView *ecell_view,
 
 	priv = E_CELL_TOGGLE (ecell_view->ecell)->priv;
 
-	if (value >= priv->pixbufs->len) {
-		g_warning ("Value from the table model is %d, the states we support are [0..%d)\n",
-				value, priv->pixbufs->len);
+	if (value >= priv->pixbufs->len)
 		return;
-	}
 
 	image = g_ptr_array_index (priv->pixbufs, value);
 	if (image) {
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 00ad664e61..01d62602e2 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -835,7 +835,14 @@ configure_sort_dialog (ETableConfig *config, GtkBuilder *builder)
 {
 	GSList *l;
 	gint i;
-	const gchar *algs[] = {"alignment4", "alignment3", "alignment2", "alignment1", NULL};
+
+	const gchar *algs[] = {
+		"alignment4",
+		"alignment3",
+		"alignment2",
+		"alignment1",
+		NULL
+	};
 
 	for (i = 0; i < 4; i++) {
 		gchar buffer[80];
@@ -1268,7 +1275,9 @@ setup_gui (ETableConfig *config)
 		builder, "e-table-config");
 
 	if (config->header)
-		gtk_window_set_title (GTK_WINDOW (config->dialog_toplevel), config->header);
+		gtk_window_set_title (
+			GTK_WINDOW (config->dialog_toplevel),
+			config->header);
 
 	config->dialog_show_fields = e_builder_get_widget (
 		builder, "dialog-show-fields");
@@ -1284,9 +1293,15 @@ setup_gui (ETableConfig *config)
 	config->fields_label = e_builder_get_widget (
 		builder, "label-fields");
 
-	connect_button (config, builder, "button-sort", G_CALLBACK (config_button_sort));
-	connect_button (config, builder, "button-group", G_CALLBACK (config_button_group));
-	connect_button (config, builder, "button-fields", G_CALLBACK (config_button_fields));
+	connect_button (
+		config, builder, "button-sort",
+		G_CALLBACK (config_button_sort));
+	connect_button (
+		config, builder, "button-group",
+		G_CALLBACK (config_button_group));
+	connect_button (
+		config, builder, "button-fields",
+		G_CALLBACK (config_button_fields));
 
 	if (!can_group) {
 		GtkWidget *w;
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index db18a8cf9e..75626aa2a9 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -123,7 +123,8 @@ g_utf8_strncasecmp (const gchar *s1,
 			c1 = g_unichar_tolower (g_utf8_get_char (s1));
 			c2 = g_unichar_tolower (g_utf8_get_char (s2));
 
-			/* Collation is locale-dependent, so this totally fails to do the right thing. */
+			/* Collation is locale-dependent, so this
+			 * totally fails to do the right thing. */
 			if (c1 != c2)
 				return c1 < c2 ? -1 : 1;
 
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 5d38b686a0..12fc9b95bb 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -131,7 +131,8 @@ ethi_dispose (GObject *object) {
 	ethi->full_header = NULL;
 
 	if (ethi->etfcd.widget)
-		g_object_remove_weak_pointer (G_OBJECT (ethi->etfcd.widget), &ethi->etfcd.pointer);
+		g_object_remove_weak_pointer (
+			G_OBJECT (ethi->etfcd.widget), &ethi->etfcd.pointer);
 
 	if (ethi->config)
 		g_object_unref (ethi->config);
@@ -586,7 +587,8 @@ do_drag_motion (ETableHeaderItem *ethi,
 		col = ethi_find_col_by_x_nearest (ethi, x);
 		suggested_action = gdk_drag_context_get_suggested_action (context);
 
-		if (ethi->drag_col != -1 && (col == ethi->drag_col || col == ethi->drag_col + 1)) {
+		if (ethi->drag_col != -1 && (col == ethi->drag_col ||
+		    col == ethi->drag_col + 1)) {
 			if (ethi->drag_col != -1)
 				ethi_remove_destroy_marker (ethi);
 
@@ -701,10 +703,10 @@ static void
 context_connect (ETableHeaderItem *ethi,
                  GdkDragContext *context)
 {
-	if (g_dataset_get_data (context, "e-table-header-item") == NULL) {
-		g_object_ref (ethi);
-		g_dataset_set_data_full (context, "e-table-header-item", ethi, context_destroyed);
-	}
+	if (g_dataset_get_data (context, "e-table-header-item") == NULL)
+		g_dataset_set_data_full (
+			context, "e-table-header-item",
+			g_object_ref (ethi), context_destroyed);
 }
 
 static gboolean
@@ -984,26 +986,39 @@ ethi_draw (GnomeCanvasItem *item,
 	style = gtk_widget_get_style (GTK_WIDGET (canvas));
 
 	if (ethi->sort_info) {
-		gint length = e_table_sort_info_grouping_get_count (ethi->sort_info);
+		gint length;
 		gint i;
+
+		length = e_table_sort_info_grouping_get_count (ethi->sort_info);
 		for (i = 0; i < length; i++) {
-			ETableSortColumn column =
-				e_table_sort_info_grouping_get_nth (
+			ETableSortColumn column;
+
+			column = e_table_sort_info_grouping_get_nth (
 				ethi->sort_info, i);
-			g_hash_table_insert (arrows,
-					     GINT_TO_POINTER ((gint) column.column),
-					     GINT_TO_POINTER (column.ascending ?
-							      E_TABLE_COL_ARROW_DOWN :
-							      E_TABLE_COL_ARROW_UP));
+
+			g_hash_table_insert (
+				arrows,
+				GINT_TO_POINTER ((gint) column.column),
+				GINT_TO_POINTER (
+					column.ascending ?
+					E_TABLE_COL_ARROW_DOWN :
+					E_TABLE_COL_ARROW_UP));
 		}
+
 		length = e_table_sort_info_sorting_get_count (ethi->sort_info);
 		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_sorting_get_nth (ethi->sort_info, i);
-			g_hash_table_insert (arrows,
-					     GINT_TO_POINTER ((gint) column.column),
-					     GINT_TO_POINTER (column.ascending ?
-							      E_TABLE_COL_ARROW_DOWN :
-							      E_TABLE_COL_ARROW_UP));
+			ETableSortColumn column;
+
+			column = e_table_sort_info_sorting_get_nth (
+				ethi->sort_info, i);
+
+			g_hash_table_insert (
+				arrows,
+				GINT_TO_POINTER ((gint) column.column),
+				GINT_TO_POINTER (
+					column.ascending ?
+					E_TABLE_COL_ARROW_DOWN :
+					E_TABLE_COL_ARROW_UP));
 		}
 	}
 
@@ -1710,7 +1725,11 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 
 	length = e_table_sort_info_grouping_get_count (ethi->sort_info);
 	for (i = 0; i < length; i++) {
-		ETableSortColumn column = e_table_sort_info_grouping_get_nth (ethi->sort_info, i);
+		ETableSortColumn column;
+
+		column = e_table_sort_info_grouping_get_nth (
+			ethi->sort_info, i);
+
 		if (model_col == column.column || model_col == -1) {
 			gint ascending = column.ascending;
 			ascending = !ascending;
@@ -1725,7 +1744,10 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 	if (!found) {
 		length = e_table_sort_info_sorting_get_count (ethi->sort_info);
 		for (i = 0; i < length; i++) {
-			ETableSortColumn column = e_table_sort_info_sorting_get_nth (ethi->sort_info, i);
+			ETableSortColumn column;
+
+			column = e_table_sort_info_sorting_get_nth (
+				ethi->sort_info, i);
 
 			if (model_col == column.column || model_col == -1) {
 				gint ascending = column.ascending;
@@ -1909,13 +1931,15 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			info->col = ethi->selected_col;
 			ecol = e_table_header_get_column (ethi->eth, info->col);
 
-			popup = e_popup_menu_create_with_domain (ethi_context_menu,
-								 1 +
-								 (ecol->sortable ? 0 : 2) +
-								 ((ethi->table || ethi->tree) ? 0 : 4) +
-								 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
-								 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
-								 128, info, GETTEXT_PACKAGE);
+			popup = e_popup_menu_create_with_domain (
+				ethi_context_menu,
+				1 +
+				(ecol->sortable ? 0 : 2) +
+				((ethi->table || ethi->tree) ? 0 : 4) +
+				((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
+				((e_table_sort_info_get_can_group (
+					ethi->sort_info)) ? 0 : 16) +
+				128, info, GETTEXT_PACKAGE);
 			g_object_ref_sink (popup);
 			g_signal_connect (popup, "selection-done",
 					  G_CALLBACK (free_popup_info), info);
@@ -1932,13 +1956,15 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 				(e->key.keyval == GDK_KEY_KP_Right)) {
 			ETableCol *ecol;
 
-			if ((ethi->selected_col < 0) || (ethi->selected_col >= ethi->eth->col_count - 1))
+			if ((ethi->selected_col < 0) ||
+			    (ethi->selected_col >= ethi->eth->col_count - 1))
 				ethi->selected_col = 0;
 			else
 				ethi->selected_col++;
 			ecol = e_table_header_get_column (ethi->eth, ethi->selected_col);
 			ethi_change_sort_state (ethi, ecol);
-		} else if ((e->key.keyval == GDK_KEY_Left) || (e->key.keyval == GDK_KEY_KP_Left)) {
+		} else if ((e->key.keyval == GDK_KEY_Left) ||
+			   (e->key.keyval == GDK_KEY_KP_Left)) {
 			ETableCol *ecol;
 
 			if ((ethi->selected_col <= 0) || (ethi->selected_col >= ethi->eth->col_count))
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index cc5b147747..e890d4836c 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -395,7 +395,8 @@ e_table_header_add_column (ETableHeader *eth, ETableCol *tc, gint pos)
 
 	if (pos == -1)
 		pos = eth->col_count;
-	eth->columns = g_realloc (eth->columns, sizeof (ETableCol *) * (eth->col_count + 1));
+	eth->columns = g_realloc (
+		eth->columns, sizeof (ETableCol *) * (eth->col_count + 1));
 
 	/*
 	 * We are the primary owners of the column
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index be9e3e29ec..78a980a660 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -48,7 +48,9 @@ etssv_add       (ETableSubsetVariable *etssv,
 
 	if (etss->n_map + 1 > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += INCREMENT_AMOUNT;
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof (gint));
+		etss->map_table = g_realloc (
+			etss->map_table,
+			etssv->n_vals_allocated * sizeof (gint));
 	}
 
 	etss->map_table[etss->n_map++] = row;
@@ -69,7 +71,9 @@ etssv_add_array (ETableSubsetVariable *etssv,
 
 	if (etss->n_map + count > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += MAX (INCREMENT_AMOUNT, count);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof (gint));
+		etss->map_table = g_realloc (
+			etss->map_table,
+			etssv->n_vals_allocated * sizeof (gint));
 	}
 	for (i = 0; i < count; i++)
 		etss->map_table[etss->n_map++] = array[i];
@@ -90,7 +94,9 @@ etssv_add_all   (ETableSubsetVariable *etssv)
 	rows = e_table_model_row_count (etss->source);
 	if (etss->n_map + rows > etssv->n_vals_allocated) {
 		etssv->n_vals_allocated += MAX (INCREMENT_AMOUNT, rows);
-		etss->map_table = g_realloc (etss->map_table, etssv->n_vals_allocated * sizeof (gint));
+		etss->map_table = g_realloc (
+			etss->map_table,
+			etssv->n_vals_allocated * sizeof (gint));
 	}
 	for (i = 0; i < rows; i++)
 		etss->map_table[etss->n_map++] = i;
@@ -109,7 +115,10 @@ etssv_remove    (ETableSubsetVariable *etssv,
 	for (i = 0; i < etss->n_map; i++) {
 		if (etss->map_table[i] == row) {
 			e_table_model_pre_change (etm);
-			memmove (etss->map_table + i, etss->map_table + i + 1, (etss->n_map - i - 1) * sizeof (gint));
+			memmove (
+				etss->map_table + i,
+				etss->map_table + i + 1,
+				(etss->n_map - i - 1) * sizeof (gint));
 			etss->n_map--;
 
 			e_table_model_row_deleted (etm, i);
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index c1d0a2ad94..d1241543a5 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -1665,41 +1665,47 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 	e_table->horizontal_resize = specification->horizontal_resize;
 	e_table->allow_grouping = specification->allow_grouping;
 
-	e_table->sort_info = state->sort_info;
-	g_object_ref (state->sort_info);
-	e_table_sort_info_set_can_group (e_table->sort_info, e_table->allow_grouping);
+	e_table->sort_info = g_object_ref (state->sort_info);
+
+	e_table_sort_info_set_can_group (
+		e_table->sort_info, e_table->allow_grouping);
 
-	e_table->group_info_change_id =
-		g_signal_connect (G_OBJECT (e_table->sort_info), "group_info_changed",
-				  G_CALLBACK (group_info_changed), e_table);
+	e_table->group_info_change_id = g_signal_connect (
+		e_table->sort_info, "group_info_changed",
+		G_CALLBACK (group_info_changed), e_table);
 
-	e_table->sort_info_change_id =
-		g_signal_connect (G_OBJECT (e_table->sort_info), "sort_info_changed",
-				  G_CALLBACK (sort_info_changed), e_table);
+	e_table->sort_info_change_id = g_signal_connect (
+		e_table->sort_info, "sort_info_changed",
+		G_CALLBACK (sort_info_changed), e_table);
 
 	g_value_set_object (val, e_table->sort_info);
 	g_object_set_property (G_OBJECT(e_table->header), "sort_info", val);
 	g_free (val);
 
-	e_table->sorter = e_table_sorter_new (etm, e_table->full_header, e_table->sort_info);
+	e_table->sorter = e_table_sorter_new (
+		etm, e_table->full_header, e_table->sort_info);
 
-	g_object_set (e_table->selection,
-		      "model", etm,
-		      "selection_mode", specification->selection_mode,
-		      "cursor_mode", specification->cursor_mode,
-		      "sorter", e_table->sorter,
-		      "header", e_table->header,
-		      NULL);
+	g_object_set (
+		e_table->selection,
+		"model", etm,
+		"selection_mode", specification->selection_mode,
+		"cursor_mode", specification->cursor_mode,
+		"sorter", e_table->sorter,
+		"header", e_table->header,
+		NULL);
 
-	g_signal_connect(e_table->selection, "selection_changed",
-			 G_CALLBACK (et_selection_model_selection_changed), e_table);
-	g_signal_connect(e_table->selection, "selection_row_changed",
-			 G_CALLBACK (et_selection_model_selection_row_changed), e_table);
+	g_signal_connect (
+		e_table->selection, "selection_changed",
+		G_CALLBACK (et_selection_model_selection_changed), e_table);
+	g_signal_connect (
+		e_table->selection, "selection_row_changed",
+		G_CALLBACK (et_selection_model_selection_row_changed), e_table);
 
-	if (!specification->no_headers) {
+	if (!specification->no_headers)
 		e_table_setup_header (e_table);
-	}
-	e_table_setup_table (e_table, e_table->full_header, e_table->header, etm);
+
+	e_table_setup_table (
+		e_table, e_table->full_header, e_table->header, etm);
 	e_table_fill_table (e_table, etm);
 
 	scrollable = GTK_SCROLLABLE (e_table->table_canvas);
@@ -2235,7 +2241,8 @@ e_table_commit_click_to_add (ETable *table)
 {
 	et_eti_leave_edit (table);
 	if (table->click_to_add)
-		e_table_click_to_add_commit (E_TABLE_CLICK_TO_ADD (table->click_to_add));
+		e_table_click_to_add_commit (
+			E_TABLE_CLICK_TO_ADD (table->click_to_add));
 }
 
 static void
@@ -2261,25 +2268,33 @@ et_get_property (GObject *object,
 		break;
 	case PROP_HADJUSTMENT:
 		if (etable->table_canvas)
-			g_object_get_property (G_OBJECT (etable->table_canvas), "hadjustment", value);
+			g_object_get_property (
+				G_OBJECT (etable->table_canvas),
+				"hadjustment", value);
 		else
 			g_value_set_object (value, NULL);
 		break;
 	case PROP_VADJUSTMENT:
 		if (etable->table_canvas)
-			g_object_get_property (G_OBJECT (etable->table_canvas), "vadjustment", value);
+			g_object_get_property (
+				G_OBJECT (etable->table_canvas),
+				"vadjustment", value);
 		else
 			g_value_set_object (value, NULL);
 		break;
 	case PROP_HSCROLL_POLICY:
 		if (etable->table_canvas)
-			g_object_get_property (G_OBJECT (etable->table_canvas), "hscroll-policy", value);
+			g_object_get_property (
+				G_OBJECT (etable->table_canvas),
+				"hscroll-policy", value);
 		else
 			g_value_set_enum (value, 0);
 		break;
 	case PROP_VSCROLL_POLICY:
 		if (etable->table_canvas)
-			g_object_get_property (G_OBJECT (etable->table_canvas), "vscroll-policy", value);
+			g_object_get_property (
+				G_OBJECT (etable->table_canvas),
+				"vscroll-policy", value);
 		else
 			g_value_set_enum (value, 0);
 		break;
@@ -2295,9 +2310,9 @@ typedef struct {
 
 static void
 et_set_property (GObject *object,
-		  guint prop_id,
-		  const GValue *value,
-		  GParamSpec *pspec)
+                 guint prop_id,
+                 const GValue *value,
+                 GParamSpec *pspec)
 {
 	ETable *etable = E_TABLE (object);
 
@@ -2305,17 +2320,21 @@ et_set_property (GObject *object,
 	case PROP_LENGTH_THRESHOLD:
 		etable->length_threshold = g_value_get_int (value);
 		if (etable->group) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM (etable->group),
-					       "length_threshold", etable->length_threshold,
-					       NULL);
+			gnome_canvas_item_set (
+				GNOME_CANVAS_ITEM (etable->group),
+				"length_threshold",
+				etable->length_threshold,
+				NULL);
 		}
 		break;
 	case PROP_UNIFORM_ROW_HEIGHT:
 		etable->uniform_row_height = g_value_get_boolean (value);
 		if (etable->group) {
-			gnome_canvas_item_set (GNOME_CANVAS_ITEM (etable->group),
-					       "uniform_row_height", etable->uniform_row_height,
-					       NULL);
+			gnome_canvas_item_set (
+				GNOME_CANVAS_ITEM (etable->group),
+				"uniform_row_height",
+				etable->uniform_row_height,
+				NULL);
 		}
 		break;
 	case PROP_ALWAYS_SEARCH:
@@ -2333,23 +2352,27 @@ et_set_property (GObject *object,
 		clear_current_search_col (etable);
 
 		if (etable->use_click_to_add) {
-			etable->click_to_add = gnome_canvas_item_new
-				(GNOME_CANVAS_GROUP (etable->canvas_vbox),
-				 e_table_click_to_add_get_type (),
-				 "header", etable->header,
-				 "model", etable->model,
-				 "message", etable->click_to_add_message,
-				 NULL);
+			etable->click_to_add = gnome_canvas_item_new (
+				GNOME_CANVAS_GROUP (etable->canvas_vbox),
+				e_table_click_to_add_get_type (),
+				"header", etable->header,
+				"model", etable->model,
+				"message", etable->click_to_add_message,
+				NULL);
 
 			if (etable->use_click_to_add_end)
-				e_canvas_vbox_add_item (E_CANVAS_VBOX (etable->canvas_vbox),
-							etable->click_to_add);
+				e_canvas_vbox_add_item (
+					E_CANVAS_VBOX (etable->canvas_vbox),
+					etable->click_to_add);
 			else
-				e_canvas_vbox_add_item_start (E_CANVAS_VBOX (etable->canvas_vbox),
-							      etable->click_to_add);
-
-			g_signal_connect (G_OBJECT (etable->click_to_add), "cursor_change",
-					  G_CALLBACK (click_to_add_cursor_change), etable);
+				e_canvas_vbox_add_item_start (
+					E_CANVAS_VBOX (etable->canvas_vbox),
+					etable->click_to_add);
+
+			g_signal_connect (
+				etable->click_to_add, "cursor_change",
+				G_CALLBACK (click_to_add_cursor_change),
+				etable);
 		} else {
 			g_object_run_dispose (G_OBJECT (etable->click_to_add));
 			etable->click_to_add = NULL;
@@ -2357,19 +2380,27 @@ et_set_property (GObject *object,
 		break;
 	case PROP_HADJUSTMENT:
 		if (etable->table_canvas)
-			g_object_set_property (G_OBJECT (etable->table_canvas), "hadjustment", value);
+			g_object_set_property (
+				G_OBJECT (etable->table_canvas),
+				"hadjustment", value);
 		break;
 	case PROP_VADJUSTMENT:
 		if (etable->table_canvas)
-			g_object_set_property (G_OBJECT (etable->table_canvas), "vadjustment", value);
+			g_object_set_property (
+				G_OBJECT (etable->table_canvas),
+				"vadjustment", value);
 		break;
 	case PROP_HSCROLL_POLICY:
 		if (etable->table_canvas)
-			g_object_set_property (G_OBJECT (etable->table_canvas), "hscroll-policy", value);
+			g_object_set_property (
+				G_OBJECT (etable->table_canvas),
+				"hscroll-policy", value);
 		break;
 	case PROP_VSCROLL_POLICY:
 		if (etable->table_canvas)
-			g_object_set_property (G_OBJECT (etable->table_canvas), "vscroll-policy", value);
+			g_object_set_property (
+				G_OBJECT (etable->table_canvas),
+				"vscroll-policy", value);
 		break;
 	}
 }
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 61200cda4c..0fe0cb79b0 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -338,12 +338,15 @@ etmm_clear_children_computed (ETreeMemoryPath *path)
 static void
 etmm_node_request_collapse (ETreeModel *etm, ETreePath node)
 {
+	ETreeModelClass *parent_class;
+
 	if (node)
 		etmm_clear_children_computed (node);
 
-	if (E_TREE_MODEL_CLASS (e_tree_memory_parent_class)->node_request_collapse) {
-		E_TREE_MODEL_CLASS (e_tree_memory_parent_class)->node_request_collapse (etm, node);
-	}
+	parent_class = E_TREE_MODEL_CLASS (e_tree_memory_parent_class);
+
+	if (parent_class->node_request_collapse != NULL)
+		parent_class->node_request_collapse (etm, node);
 }
 
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 1b7ce531e2..a118359b1c 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -36,7 +36,9 @@
 static AtkObjectClass *parent_class;
 static GType parent_type;
 static gint priv_offset;
-#define GET_PRIVATE(object) ((GalA11yETableClickToAddPrivate *) (((gchar *) object) + priv_offset))
+#define GET_PRIVATE(object) \
+	((GalA11yETableClickToAddPrivate *) \
+	(((gchar *) object) + priv_offset))
 #define PARENT_TYPE (parent_type)
 
 struct _GalA11yETableClickToAddPrivate {
@@ -128,7 +130,9 @@ etcta_get_name (AtkObject *obj)
 
 	g_return_val_if_fail (GAL_A11Y_IS_E_TABLE_CLICK_TO_ADD (obj), NULL);
 
-	etcta = E_TABLE_CLICK_TO_ADD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj)));
+	etcta = E_TABLE_CLICK_TO_ADD (
+		atk_gobject_accessible_get_object (
+		ATK_GOBJECT_ACCESSIBLE (obj)));
 	if (etcta && etcta->message != NULL)
 		return etcta->message;
 
@@ -141,9 +145,9 @@ etcta_get_n_children (AtkObject *accessible)
 	return 1;
 }
 
-static AtkObject*
+static AtkObject *
 etcta_ref_child (AtkObject *accessible,
-		 gint i)
+                 gint i)
 {
 	AtkObject * atk_obj = NULL;
 	ETableClickToAdd * etcta;
@@ -151,14 +155,18 @@ etcta_ref_child (AtkObject *accessible,
 	if (i != 0)
 		return NULL;
 
-	etcta  = E_TABLE_CLICK_TO_ADD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
+	etcta  = E_TABLE_CLICK_TO_ADD (
+		atk_gobject_accessible_get_object (
+		ATK_GOBJECT_ACCESSIBLE (accessible)));
 
 	g_return_val_if_fail (etcta, NULL);
 
 	if (etcta->rect) {
-		atk_obj = atk_gobject_accessible_for_object (G_OBJECT (etcta->rect));
+		atk_obj = atk_gobject_accessible_for_object (
+			G_OBJECT (etcta->rect));
 	} else if (etcta->row) {
-		atk_obj = atk_gobject_accessible_for_object (G_OBJECT (etcta->row));
+		atk_obj = atk_gobject_accessible_for_object (
+			G_OBJECT (etcta->row));
 	}
 
 	g_object_ref (atk_obj);
@@ -198,15 +206,6 @@ etcta_init (GalA11yETableClickToAdd *a11y)
 {
 }
 
-/**
- * gal_a11y_e_table_click_to_add_get_type:
- * @void:
- *
- * Registers the &GalA11yETableClickToAdd class if necessary, and returns the type ID
- * associated to it.
- *
- * Return value: The type ID of the &GalA11yETableClickToAdd class.
- **/
 GType
 gal_a11y_e_table_click_to_add_get_type (void)
 {
@@ -234,7 +233,9 @@ gal_a11y_e_table_click_to_add_get_type (void)
 			NULL
 		};
 
-		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
+		factory = atk_registry_get_factory (
+			atk_get_default_registry (),
+			GNOME_TYPE_CANVAS_ITEM);
 
 		parent_type = atk_object_factory_get_accessible_type (factory);
 		type = gal_a11y_type_register_static_with_private (PARENT_TYPE,
@@ -288,14 +289,19 @@ etcta_selection_cursor_changed (ESelectionModel *esm, gint row, gint col,
 	ETableClickToAdd *etcta;
 	AtkObject *row_a11y;
 
-	etcta = E_TABLE_CLICK_TO_ADD (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (a11y)));
+	etcta = E_TABLE_CLICK_TO_ADD (
+		atk_gobject_accessible_get_object (
+		ATK_GOBJECT_ACCESSIBLE (a11y)));
 
 	if (etcta == NULL || etcta->row == NULL)
 		return;
 
 	row_a11y = atk_gobject_accessible_for_object (G_OBJECT (etcta->row));
 	if (row_a11y) {
-		AtkObject *cell_a11y = g_object_get_data (G_OBJECT(row_a11y), "gail-focus-object");
+		AtkObject *cell_a11y;
+
+		cell_a11y = g_object_get_data (
+			G_OBJECT (row_a11y), "gail-focus-object");
 		if (cell_a11y) {
 			atk_focus_tracker_notify (cell_a11y);
 		}
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index ffa4bd51c2..1d0add2353 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -654,7 +654,10 @@ table_remove_row_selection (AtkTable *table, gint row)
 
 	if (!atk_table_is_row_selected (table, row))
 		return TRUE;
-	e_selection_model_toggle_single_row (item->selection, view_to_model_row (item, row));
+
+	e_selection_model_toggle_single_row (
+		item->selection, view_to_model_row (item, row));
+
 	return TRUE;
 }
 
-- 
cgit v1.2.3


From 756c8abcb840b8da588031f4a0d7e1fc979fab70 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 27 May 2011 15:23:07 +0200
Subject: Bug #646109 - Fix use of include <config.h> to make sure translations
 work

---
 widgets/table/e-cell-checkbox.c                       | 2 ++
 widgets/table/e-cell-combo.c                          | 2 ++
 widgets/table/e-cell-date.c                           | 2 ++
 widgets/table/e-cell-hbox.c                           | 2 ++
 widgets/table/e-cell-number.c                         | 2 ++
 widgets/table/e-cell-pixbuf.c                         | 2 ++
 widgets/table/e-cell-popup.c                          | 2 ++
 widgets/table/e-cell-size.c                           | 2 ++
 widgets/table/e-cell-text.c                           | 2 ++
 widgets/table/e-cell-toggle.c                         | 2 ++
 widgets/table/e-cell-tree.c                           | 2 ++
 widgets/table/e-cell-vbox.c                           | 2 ++
 widgets/table/e-cell.c                                | 3 +++
 widgets/table/e-table-click-to-add.c                  | 2 ++
 widgets/table/e-table-col.c                           | 2 ++
 widgets/table/e-table-column-specification.c          | 2 ++
 widgets/table/e-table-config.c                        | 2 ++
 widgets/table/e-table-extras.c                        | 2 ++
 widgets/table/e-table-field-chooser-dialog.c          | 2 ++
 widgets/table/e-table-field-chooser-item.c            | 2 ++
 widgets/table/e-table-field-chooser.c                 | 2 ++
 widgets/table/e-table-group-container.c               | 2 ++
 widgets/table/e-table-group-leaf.c                    | 2 ++
 widgets/table/e-table-group.c                         | 2 ++
 widgets/table/e-table-header-item.c                   | 2 ++
 widgets/table/e-table-header-utils.c                  | 2 ++
 widgets/table/e-table-header.c                        | 2 ++
 widgets/table/e-table-item.c                          | 2 ++
 widgets/table/e-table-memory-callbacks.c              | 2 ++
 widgets/table/e-table-memory-store.c                  | 2 ++
 widgets/table/e-table-memory.c                        | 2 ++
 widgets/table/e-table-model.c                         | 2 ++
 widgets/table/e-table-one.c                           | 2 ++
 widgets/table/e-table-search.c                        | 2 ++
 widgets/table/e-table-selection-model.c               | 2 ++
 widgets/table/e-table-sort-info.c                     | 2 ++
 widgets/table/e-table-sorted-variable.c               | 2 ++
 widgets/table/e-table-sorted.c                        | 2 ++
 widgets/table/e-table-sorter.c                        | 2 ++
 widgets/table/e-table-sorting-utils.c                 | 2 ++
 widgets/table/e-table-specification.c                 | 2 ++
 widgets/table/e-table-state.c                         | 2 ++
 widgets/table/e-table-subset-variable.c               | 2 ++
 widgets/table/e-table-subset.c                        | 2 ++
 widgets/table/e-table-utils.c                         | 2 ++
 widgets/table/e-table-without.c                       | 2 ++
 widgets/table/e-table.c                               | 2 ++
 widgets/table/e-tree-memory-callbacks.c               | 2 ++
 widgets/table/e-tree-memory.c                         | 2 ++
 widgets/table/e-tree-model.c                          | 2 ++
 widgets/table/e-tree-selection-model.c                | 2 ++
 widgets/table/e-tree-sorted.c                         | 2 ++
 widgets/table/e-tree-table-adapter.c                  | 2 ++
 widgets/table/e-tree.c                                | 2 ++
 widgets/table/gal-a11y-e-cell-popup.c                 | 2 ++
 widgets/table/gal-a11y-e-cell-registry.c              | 2 ++
 widgets/table/gal-a11y-e-cell-toggle.c                | 4 ++++
 widgets/table/gal-a11y-e-cell-tree.c                  | 2 ++
 widgets/table/gal-a11y-e-cell-vbox.c                  | 2 ++
 widgets/table/gal-a11y-e-cell.c                       | 2 ++
 widgets/table/gal-a11y-e-table-click-to-add-factory.c | 2 ++
 widgets/table/gal-a11y-e-table-click-to-add.c         | 2 ++
 widgets/table/gal-a11y-e-table-column-header.c        | 3 +++
 widgets/table/gal-a11y-e-table-factory.c              | 2 ++
 widgets/table/gal-a11y-e-table-item-factory.c         | 2 ++
 widgets/table/gal-a11y-e-table-item.c                 | 2 ++
 widgets/table/gal-a11y-e-table.c                      | 2 ++
 widgets/table/gal-a11y-e-tree-factory.c               | 2 ++
 widgets/table/gal-a11y-e-tree.c                       | 2 ++
 69 files changed, 142 insertions(+)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index de26a5df9f..7969e2b4f0 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index b366c9382c..f759185a56 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -53,7 +53,9 @@
  *   close the popup, like the Escape key, or a button press outside the popup.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index 9040f80ccd..fb3dd9fc71 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/time.h>
 #include <time.h>
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index e268b23dea..c8485b983a 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -24,7 +24,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <math.h>
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 72f25ce2f4..7e9395ba6c 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 45f1fb3727..9a9e31c7e4 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 334e6be77a..b3ba9bdfac 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -29,7 +29,9 @@
  * popup.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index d624cf6cfa..d596713977 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <sys/time.h>
 #include <unistd.h>
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index e3d095cc34..9d652372d0 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -33,7 +33,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 76fd452397..8583446734 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index b06b3d492b..77f25ae387 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -28,7 +28,9 @@
  * 02110-1301, USA.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <math.h>
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 1d36d4e5ce..1c0cbc62ca 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <ctype.h>
 #include <math.h>
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 19c5e37848..cbc0bfc0ae 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -22,7 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 773aefc674..662a9c50a5 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 2eb688e54f..7296408594 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib/gi18n.h>
 #include "e-util/e-util.h"
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index 9f7ea53ebe..7fb0756085 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 01d62602e2..9b85cd3b85 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -27,7 +27,9 @@
  *    Make Clear all work.
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index 75626aa2a9..b07651a22c 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 9c24a64496..b4ac8e53ef 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 14a080362a..451b0388b0 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 20ecb6edec..2f945bb079 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 564d48494c..0a933769f9 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 7ec55301a0..46f30a9cf4 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 0efc08dd71..8fd56bc7b1 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 12fc9b95bb..020f1d8ca5 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <glib.h>
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 8911867652..174d20a1de 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h> /* strlen() */
 #include <glib.h>
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index e890d4836c..9950ee69e4 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 6da76cf77f..4b4299fc58 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -26,7 +26,9 @@
  * TODO:
  *   Add a border to the thing, so that focusing works properly.
  */
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <math.h>
 #include <stdio.h>
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index a68e9a2822..bc85c7d39a 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 4cfd97e41c..dc77e13410 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 166cfdb1e1..cc62a6d0b5 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 3bf5ec5c8f..51d1a9d81b 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <glib-object.h>
 
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index 69880b9113..7683b935a4 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "e-util/e-util.h"
 
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index cf7edf3592..955547fd7f 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 18c0f5ea03..b8f33c639e 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index b238e6b444..b488dbce06 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index f2970209bf..0ed35c95a6 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 73dbac102e..61ea10c082 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 4727103f22..d74dbd3d04 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 5254a5e698..e654f94b9c 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 #include <camel/camel.h>
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 3324748e61..03a66f9b98 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 2f58715504..0bb311b8c4 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 78a980a660..99fed4ba02 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 77ea5fe9b5..03871771f6 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index 57878722b8..d84b244fdf 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <libintl.h>		/* This file uses dgettext() but no _() */
 #include <string.h>
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 8a180efab1..ea2554b7bc 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index d1241543a5..3acf7c6c21 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -23,7 +23,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 9c46cf7fda..7281f3d327 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 0fe0cb79b0..eec9333e65 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 79197aade0..8772e5309f 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index f486f7eec7..dd00fca2e0 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "table/e-tree-table-adapter.h"
 #include <glib/gi18n.h>
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 9abb6772b2..c92bb45c65 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -25,7 +25,9 @@
 
 /* FIXME: Overall e-tree-sorted.c needs to be made more efficient. */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdio.h>
 #include <errno.h>
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index e162030e0f..56669ec515 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 470fc074e4..fe9f3d7474 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index 89894ab99d..f1c2540820 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index 863813348d..79ad4cacb2 100644
--- a/widgets/table/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-e-cell.h"
 #include "gal-a11y-e-cell-registry.h"
diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index c57d7083e6..98fcdcd92f 100644
--- a/widgets/table/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <gtk/gtk.h>
 
 #include "table/e-cell-toggle.h"
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 808a611934..70880fc0cc 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index 637a53e7e3..bbe278537a 100644
--- a/widgets/table/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
@@ -22,7 +22,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index 1cac917edd..0ba51dcb4d 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index 9c9390a9c2..c71199cebb 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index a118359b1c..263af62e9a 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index 6eec994eb2..a7503352a3 100644
--- a/widgets/table/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
@@ -21,7 +21,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
+
 #include <glib/gi18n.h>
 #include <atk/atkobject.h>
 #include <atk/atkregistry.h>
diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index 5d9c4bbdb8..e89bb799bb 100644
--- a/widgets/table/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-e-table.h"
 #include "gal-a11y-e-table-factory.h"
diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index fb1b3a9966..3aeab505f3 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <atk/atk.h>
 
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 1d0add2353..560ea3f54a 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -21,7 +21,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include <string.h>
 
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index d04bda280e..5db3f44b22 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "a11y/gal-a11y-util.h"
 #include "table/e-table.h"
diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index 8d1951580d..4e22c1ca70 100644
--- a/widgets/table/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "gal-a11y-e-tree.h"
 #include "gal-a11y-e-tree-factory.h"
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index d474f96af5..4507e21363 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -20,7 +20,9 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
 #include <config.h>
+#endif
 
 #include "a11y/gal-a11y-util.h"
 #include "table/e-table-item.h"
-- 
cgit v1.2.3


From 394e580dfdb04342c2e457ced400908e4dd5c88e Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 28 May 2011 10:18:56 -0400
Subject: Including <glib.h> directly is rarely needed.

---
 widgets/table/e-cell-date-edit.c      | 1 -
 widgets/table/e-table-header-item.c   | 1 -
 widgets/table/e-table-header-utils.c  | 1 -
 widgets/table/e-table-specification.c | 1 -
 widgets/table/e-table.c               | 1 -
 widgets/table/e-tree-table-adapter.c  | 1 -
 6 files changed, 6 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 750b4dea0b..7517ad0e9c 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -33,7 +33,6 @@
 
 #include <string.h>
 #include <time.h>
-#include <glib.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 020f1d8ca5..9215e7b2fb 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -26,7 +26,6 @@
 #endif
 
 #include <string.h>
-#include <glib.h>
 
 #include <gtk/gtk.h>
 #include <libgnomecanvas/libgnomecanvas.h>
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 174d20a1de..659677eceb 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -27,7 +27,6 @@
 #endif
 
 #include <string.h> /* strlen() */
-#include <glib.h>
 
 #include <gtk/gtk.h>
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 03a66f9b98..76c268ad11 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 3acf7c6c21..f755cbc451 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -31,7 +31,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 56669ec515..4cfd74fe68 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gstdio.h>
 #include <libxml/tree.h>
 #include <libxml/parser.h>
-- 
cgit v1.2.3


From de752b010fb47177e91b0fdaba86b8bed0953a23 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 28 May 2011 11:12:08 -0400
Subject: Including <glib-object.h> directly is rarely needed.

---
 widgets/table/e-table-header.c | 1 -
 widgets/table/e-table-model.c  | 2 --
 2 files changed, 3 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 9950ee69e4..90dec061c1 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -27,7 +27,6 @@
 
 #include <string.h>
 
-#include <glib-object.h>
 #include <gtk/gtk.h>
 
 #include "e-util/e-util.h"
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 51d1a9d81b..77b462ec2a 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -25,8 +25,6 @@
 #include <config.h>
 #endif
 
-#include <glib-object.h>
-
 #include "e-util/e-util.h"
 
 #include "e-table-model.h"
-- 
cgit v1.2.3


From 03320071af0ec6c676df56508bfca2ec03794070 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 1 Jun 2011 09:07:50 -0400
Subject: Move EPopupMenu to /widgets/table.

ETableHeaderItem is the last user of EPopupMenu.  Move it to
/widgets/table to discourage further use and strip out unused features.

The functionality it provides has long since been superseded by
GtkUIManager and GtkAction.
---
 widgets/table/Makefile.am           |   2 +
 widgets/table/e-popup-menu.c        | 109 ++++++++++++++++++++++++++++++++++++
 widgets/table/e-popup-menu.h        |  55 ++++++++++++++++++
 widgets/table/e-table-header-item.c |   2 +-
 4 files changed, 167 insertions(+), 1 deletion(-)
 create mode 100644 widgets/table/e-popup-menu.c
 create mode 100644 widgets/table/e-popup-menu.h

(limited to 'widgets/table')

diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 2764c96c81..0ae1e2b7e9 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -29,6 +29,7 @@ libetable_la_SOURCES = 				\
 	e-cell-tree.c				\
 	e-cell-vbox.c				\
 	e-cell-hbox.c				\
+	e-popup-menu.c				\
 	e-table-click-to-add.c			\
 	e-table-col.c				\
 	e-table-column-specification.c		\
@@ -104,6 +105,7 @@ libetableinclude_HEADERS = 			\
 	e-cell-tree.h				\
 	e-cell-vbox.h				\
 	e-cell-hbox.h				\
+	e-popup-menu.h				\
 	e-table-click-to-add.h			\
 	e-table-col-dnd.h			\
 	e-table-col.h				\
diff --git a/widgets/table/e-popup-menu.c b/widgets/table/e-popup-menu.c
new file mode 100644
index 0000000000..07589b1589
--- /dev/null
+++ b/widgets/table/e-popup-menu.c
@@ -0,0 +1,109 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Jody Goldberg (jgoldberg@home.com)
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <libintl.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include "e-popup-menu.h"
+
+/*
+ * Creates an item with an optional icon
+ */
+static void
+make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name)
+{
+	GtkWidget *label;
+
+	if (*name == '\0')
+		return;
+
+	/*
+	 * Ugh.  This needs to go into Gtk+
+	 */
+	label = gtk_label_new_with_mnemonic (name);
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_widget_show (label);
+
+	gtk_container_add (GTK_CONTAINER (item), label);
+}
+
+GtkMenu *
+e_popup_menu_create_with_domain (EPopupMenu *menu_list,
+				 guint32 disable_mask,
+				 guint32 hide_mask,
+				 gpointer default_closure,
+				 const gchar *domain)
+{
+	GtkMenu *menu = GTK_MENU (gtk_menu_new ());
+	gboolean last_item_separator = TRUE;
+	gint last_non_separator = -1;
+	gint i;
+
+	for (i = 0; menu_list[i].name; i++) {
+		if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
+			last_non_separator = i;
+		}
+	}
+
+	for (i = 0; i <= last_non_separator; i++) {
+		gboolean separator;
+
+		separator = !strcmp ("", menu_list[i].name);
+
+		if ((!(separator && last_item_separator)) && !(menu_list[i].disable_mask & hide_mask)) {
+			GtkWidget *item = NULL;
+
+			if (!separator) {
+				item = gtk_menu_item_new ();
+
+				make_item (menu, GTK_MENU_ITEM (item), dgettext (domain, menu_list[i].name));
+			} else {
+				item = gtk_menu_item_new ();
+			}
+
+			gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+			if (menu_list[i].fn)
+				g_signal_connect (item, "activate",
+						  G_CALLBACK (menu_list[i].fn),
+						  default_closure);
+
+			if (menu_list[i].disable_mask & disable_mask)
+				gtk_widget_set_sensitive (item, FALSE);
+
+			gtk_widget_show (item);
+
+			last_item_separator = separator;
+		}
+	}
+
+	return menu;
+}
diff --git a/widgets/table/e-popup-menu.h b/widgets/table/e-popup-menu.h
new file mode 100644
index 0000000000..9fd3616eb2
--- /dev/null
+++ b/widgets/table/e-popup-menu.h
@@ -0,0 +1,55 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
+ *
+ *
+ * Authors:
+ *		Miguel de Icaza <miguel@ximian.com>
+ *		Jody Goldberg (jgoldberg@home.com)
+ *		Jeffrey Stedfast <fejj@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+ *
+ */
+
+#ifndef E_POPUP_MENU_H
+#define E_POPUP_MENU_H
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define E_POPUP_SEPARATOR  { (gchar *) "", NULL, (NULL), 0 }
+#define E_POPUP_TERMINATOR { NULL, NULL, (NULL), 0 }
+
+#define E_POPUP_ITEM(name,fn,disable_mask) \
+	{ (gchar *) (name), NULL, (fn), (disable_mask) }
+
+typedef struct _EPopupMenu EPopupMenu;
+
+struct _EPopupMenu {
+	gchar *name;
+	gchar *pixname;
+	GCallback fn;
+	guint32 disable_mask;
+};
+
+GtkMenu *	e_popup_menu_create_with_domain	(EPopupMenu *menu_list,
+						 guint32 disable_mask,
+						 guint32 hide_mask,
+						 gpointer default_closure,
+						 const gchar *domain);
+
+G_END_DECLS
+
+#endif /* E_POPUP_MENU_H */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 9215e7b2fb..d8a7d0d7a0 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -36,8 +36,8 @@
 #include "e-util/e-util.h"
 #include "e-util/e-xml-utils.h"
 #include "misc/e-canvas.h"
-#include "misc/e-popup-menu.h"
 
+#include "e-popup-menu.h"
 #include "e-table.h"
 #include "e-table-col-dnd.h"
 #include "e-table-config.h"
-- 
cgit v1.2.3


From 8494cbd4f1b3ad4a3d738df03170f945afce237b Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 1 Jun 2011 09:27:12 -0400
Subject: Embed e_hsv_tweak() directly in e-table-item.c.

ETableItem is the last user of e_hsv_tweak().
This allows us to remove widgets/misc/e-hsv-utils.[ch].
---
 widgets/table/e-cell-toggle.c |  1 -
 widgets/table/e-table-item.c  | 44 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 43 insertions(+), 2 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 8583446734..06b26c53d4 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -35,7 +35,6 @@
 #include "gal-a11y-e-cell-toggle.h"
 #include "gal-a11y-e-cell-registry.h"
 #include "e-util/e-util.h"
-#include "misc/e-hsv-utils.h"
 
 #include "e-cell-toggle.h"
 #include "e-table-item.h"
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 4b4299fc58..ac46df2cd3 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -44,7 +44,6 @@
 #include "e-util/e-util.h"
 #include "misc/e-canvas.h"
 #include "misc/e-canvas-utils.h"
-#include "misc/e-hsv-utils.h"
 
 #include "e-cell.h"
 #include "e-table-item.h"
@@ -122,6 +121,49 @@ static void e_table_item_redraw_row (ETableItem *eti, gint row);
 #define ETI_MULTIPLE_ROW_HEIGHT(eti,row) ((eti)->height_cache && (eti)->height_cache[(row)] != -1 ? (eti)->height_cache[(row)] : eti_row_height((eti),(row)))
 #define ETI_ROW_HEIGHT(eti,row) ((eti)->uniform_row_height ? ETI_SINGLE_ROW_HEIGHT ((eti)) : ETI_MULTIPLE_ROW_HEIGHT((eti),(row)))
 
+/* tweak_hsv is a really tweaky function. it modifies its first argument, which
+   should be the color you want tweaked. delta_h, delta_s and delta_v specify
+   how much you want their respective channels modified (and in what direction).
+   if it can't do the specified modification, it does it in the oppositon direction */
+static void
+e_hsv_tweak (GdkColor *color,
+             gdouble delta_h,
+             gdouble delta_s,
+             gdouble delta_v)
+{
+	gdouble h, s, v, r, g, b;
+
+	r = color->red   / 65535.0f;
+	g = color->green / 65535.0f;
+	b = color->blue  / 65535.0f;
+
+	gtk_rgb_to_hsv (r, g, b, &h, &s, &v);
+
+	if (h + delta_h < 0) {
+		h -= delta_h;
+	} else {
+		h += delta_h;
+	}
+
+	if (s + delta_s < 0) {
+		s -= delta_s;
+	} else {
+		s += delta_s;
+	}
+
+	if (v + delta_v < 0) {
+		v -= delta_v;
+	} else {
+		v += delta_v;
+	}
+
+	gtk_hsv_to_rgb (h, s, v, &r, &g, &b);
+
+	color->red   = r * 65535.0f;
+	color->green = g * 65535.0f;
+	color->blue  = b * 65535.0f;
+}
+
 inline static gint
 model_to_view_row (ETableItem *eti, gint row)
 {
-- 
cgit v1.2.3


From 8f01d97298b6f7d226fc5df4a0d8afe8f78c55c1 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 6 Jun 2011 15:54:19 +0200
Subject: Bug #643526 - Crash in et_get_n_children

---
 widgets/table/gal-a11y-e-table.c | 7 ++++---
 widgets/table/gal-a11y-e-tree.c  | 3 +--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index 5db3f44b22..436de1ec0f 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -131,7 +131,7 @@ et_get_n_children (AtkObject *accessible)
 
 	et = E_TABLE (gtk_accessible_get_widget (GTK_ACCESSIBLE (a11y)));
 
-	if (et->group) {
+	if (et && et->group) {
 		if (E_IS_TABLE_GROUP_LEAF (et->group))
 			n = 1;
 		else if (E_IS_TABLE_GROUP_CONTAINER (et->group)) {
@@ -155,6 +155,8 @@ et_ref_child (AtkObject *accessible,
 	gint child_no;
 
 	et = E_TABLE (gtk_accessible_get_widget (GTK_ACCESSIBLE (a11y)));
+	if (!et)
+		return NULL;
 
 	child_no = et_get_n_children (accessible);
 	if (i == 0 || i < child_no - 1) {
@@ -283,8 +285,7 @@ gal_a11y_e_table_new (GObject *widget)
 
 	a11y = g_object_new (gal_a11y_e_table_get_type (), NULL);
 
-	/* FIXME No way to do this in GTK 3. */
-	/*GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);*/
+	gtk_accessible_set_widget (GTK_ACCESSIBLE (a11y), GTK_WIDGET (widget));
 
 	/* we need to init all the children for multiple table items */
 	if (table && gtk_widget_get_mapped (GTK_WIDGET (table)) && table->group && E_IS_TABLE_GROUP_CONTAINER (table->group)) {
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index 4507e21363..f26c525550 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -178,8 +178,7 @@ gal_a11y_e_tree_new (GObject *widget)
 
 	a11y = g_object_new (gal_a11y_e_tree_get_type (), NULL);
 
-	/* FIXME No way to do this in GTK 3. */
-	/*GTK_ACCESSIBLE (a11y)->widget = GTK_WIDGET (widget);*/
+	gtk_accessible_set_widget (GTK_ACCESSIBLE (a11y), GTK_WIDGET (widget));
 
 	return ATK_OBJECT (a11y);
 }
-- 
cgit v1.2.3


From f014ab82c81078d60cb1df8c986305c2cc9948c2 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 4 Jun 2011 15:53:10 -0500
Subject: Coding style and whitespace cleanups.

---
 widgets/table/e-cell-number.c              |  6 ++-
 widgets/table/e-cell-toggle.c              |  7 ++-
 widgets/table/e-table-config.c             | 18 +++----
 widgets/table/e-table-field-chooser-item.c | 12 +++--
 widgets/table/e-table-group-leaf.c         | 83 ++++++++++++++++++------------
 widgets/table/e-table-header-item.c        | 23 +++++----
 widgets/table/e-table-without.c            |  3 +-
 widgets/table/e-tree-memory.c              |  7 ++-
 widgets/table/e-tree.c                     | 13 +++--
 widgets/table/gal-a11y-e-cell-vbox.c       |  3 +-
 widgets/table/gal-a11y-e-cell.c            |  4 +-
 11 files changed, 111 insertions(+), 68 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 7e9395ba6c..7944bbea51 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -37,7 +37,11 @@ G_DEFINE_TYPE (ECellNumber, e_cell_number, E_TYPE_CELL_TEXT)
 static gchar *
 ecn_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 {
-	return e_format_number (GPOINTER_TO_INT (e_table_model_value_at (model, col, row)));
+	gpointer value;
+
+	value = e_table_model_value_at (model, col, row);
+
+	return e_format_number (GPOINTER_TO_INT (value));
 }
 
 static void
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 06b26c53d4..bec9f5d005 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -246,10 +246,13 @@ cell_toggle_event (ECellView *ecell_view,
 			return FALSE;
 		/* Fall through */
 	case GDK_BUTTON_PRESS:
-		if (!e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row))
+		if (!e_table_model_is_cell_editable (
+			ecell_view->e_table_model, model_col, row))
 			return FALSE;
 
-		etog_set_value (toggle_view, model_col, view_col, row, value + 1);
+		etog_set_value (
+			toggle_view, model_col, view_col, row, value + 1);
+
 		return TRUE;
 
 	default:
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 9b85cd3b85..4bfb80d1e9 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -1398,19 +1398,19 @@ e_table_config_construct (ETableConfig        *config,
  * Returns: The config object.
  */
 ETableConfig *
-e_table_config_new (const gchar          *header,
-		    ETableSpecification *spec,
-		    ETableState         *state,
-		    GtkWindow           *parent_window)
+e_table_config_new (const gchar *header,
+                    ETableSpecification *spec,
+                    ETableState *state,
+                    GtkWindow *parent_window)
 {
-	ETableConfig *config = g_object_new (E_TYPE_TABLE_CONFIG, NULL);
+	ETableConfig *config;
 	GtkDialog *dialog;
 	GtkWidget *widget;
 
-	if (e_table_config_construct (config, header, spec, state, parent_window) == NULL) {
-		g_object_unref (config);
-		return NULL;
-	}
+	config = g_object_new (E_TYPE_TABLE_CONFIG, NULL);
+
+	e_table_config_construct (
+		config, header, spec, state, parent_window);
 
 	dialog = GTK_DIALOG (config->dialog_toplevel);
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 451b0388b0..e2dc6f1721 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -129,7 +129,9 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci)
 		ETableCol *ecol = e_table_header_get_column (etfci->header, i);
 		if (ecol->disabled)
 			continue;
-		g_hash_table_insert (hash, GINT_TO_POINTER (ecol->col_idx), GINT_TO_POINTER (1));
+		g_hash_table_insert (
+			hash, GINT_TO_POINTER (ecol->col_idx),
+			GINT_TO_POINTER (1));
 	}
 
 	count = e_table_header_count (etfci->full_header);
@@ -357,13 +359,17 @@ etfci_set_property (GObject *object,
 	case PROP_FULL_HEADER:
 		etfci_drop_full_header (etfci);
 		if (g_value_get_object (value))
-			etfci_add_full_header (etfci, E_TABLE_HEADER (g_value_get_object (value)));
+			etfci_add_full_header (
+				etfci, E_TABLE_HEADER (
+				g_value_get_object (value)));
 		break;
 
 	case PROP_HEADER:
 		etfci_drop_table_header (etfci);
 		if (g_value_get_object (value))
-			etfci_add_table_header (etfci, E_TABLE_HEADER (g_value_get_object (value)));
+			etfci_add_table_header (
+				etfci, E_TABLE_HEADER (
+				g_value_get_object (value)));
 		break;
 
 	case PROP_DND_CODE:
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 46f30a9cf4..bf4f1553aa 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -151,10 +151,10 @@ e_table_group_leaf_construct (GnomeCanvasGroup *parent,
  */
 ETableGroup *
 e_table_group_leaf_new (GnomeCanvasGroup *parent,
-                        ETableHeader     *full_header,
-                        ETableHeader     *header,
-                        ETableModel      *model,
-                        ETableSortInfo   *sort_info)
+                        ETableHeader *full_header,
+                        ETableHeader *header,
+                        ETableModel *model,
+                        ETableSortInfo *sort_info)
 {
 	ETableGroupLeaf *etgl;
 
@@ -162,32 +162,44 @@ e_table_group_leaf_new (GnomeCanvasGroup *parent,
 
 	etgl = g_object_new (E_TYPE_TABLE_GROUP_LEAF, NULL);
 
-	e_table_group_leaf_construct (parent, etgl, full_header,
-				      header, model, sort_info);
+	e_table_group_leaf_construct (
+		parent, etgl, full_header,
+		header, model, sort_info);
+
 	return E_TABLE_GROUP (etgl);
 }
 
 static void
-etgl_cursor_change (GObject *object, gint row, ETableGroupLeaf *etgl)
+etgl_cursor_change (GObject *object,
+                    gint row,
+                    ETableGroupLeaf *etgl)
 {
 	if (row < E_TABLE_SUBSET (etgl->ets)->n_map)
-		e_table_group_cursor_change (E_TABLE_GROUP (etgl),
-					     E_TABLE_SUBSET (etgl->ets)->map_table[row]);
+		e_table_group_cursor_change (
+			E_TABLE_GROUP (etgl),
+			E_TABLE_SUBSET (etgl->ets)->map_table[row]);
 }
 
 static void
-etgl_cursor_activated (GObject *object, gint view_row, ETableGroupLeaf *etgl)
+etgl_cursor_activated (GObject *object,
+                       gint view_row,
+                       ETableGroupLeaf *etgl)
 {
 	if (view_row < E_TABLE_SUBSET (etgl->ets)->n_map)
-		e_table_group_cursor_activated (E_TABLE_GROUP (etgl),
-						E_TABLE_SUBSET (etgl->ets)->map_table[view_row]);
+		e_table_group_cursor_activated (
+			E_TABLE_GROUP (etgl),
+			E_TABLE_SUBSET (etgl->ets)->map_table[view_row]);
 }
 
 static void
-etgl_double_click (GObject *object, gint model_row, gint model_col, GdkEvent *event,
-		   ETableGroupLeaf *etgl)
+etgl_double_click (GObject *object,
+                   gint model_row,
+                   gint model_col,
+                   GdkEvent *event,
+                   ETableGroupLeaf *etgl)
 {
-	e_table_group_double_click (E_TABLE_GROUP (etgl), model_row, model_col, event);
+	e_table_group_double_click (
+		E_TABLE_GROUP (etgl), model_row, model_col, event);
 }
 
 static gboolean
@@ -207,21 +219,28 @@ etgl_key_press (GObject *object,
 }
 
 static gboolean
-etgl_start_drag (GObject *object, gint model_row, gint model_col, GdkEvent *event,
-		 ETableGroupLeaf *etgl)
+etgl_start_drag (GObject *object,
+                 gint model_row,
+                 gint model_col,
+                 GdkEvent *event,
+                 ETableGroupLeaf *etgl)
 {
-	return e_table_group_start_drag (E_TABLE_GROUP (etgl), model_row, model_col, event);
+	return e_table_group_start_drag (
+		E_TABLE_GROUP (etgl), model_row, model_col, event);
 }
 
 static gboolean
-etgl_right_click (GObject *object, gint view_row, gint model_col, GdkEvent *event,
-		  ETableGroupLeaf *etgl)
+etgl_right_click (GObject *object,
+                  gint view_row,
+                  gint model_col,
+                  GdkEvent *event,
+                  ETableGroupLeaf *etgl)
 {
 	if (view_row < E_TABLE_SUBSET (etgl->ets)->n_map)
-		return e_table_group_right_click (E_TABLE_GROUP (etgl),
-						  E_TABLE_SUBSET (etgl->ets)->map_table[view_row],
-						  model_col,
-						  event);
+		return e_table_group_right_click (
+			E_TABLE_GROUP (etgl),
+			E_TABLE_SUBSET (etgl->ets)->map_table[view_row],
+			model_col, event);
 	else
 		return FALSE;
 }
@@ -234,10 +253,10 @@ etgl_click (GObject *object,
             ETableGroupLeaf *etgl)
 {
 	if (row < E_TABLE_SUBSET (etgl->ets)->n_map)
-		return e_table_group_click (E_TABLE_GROUP (etgl),
-					    E_TABLE_SUBSET (etgl->ets)->map_table[row],
-					    col,
-					    event);
+		return e_table_group_click (
+			E_TABLE_GROUP (etgl),
+			E_TABLE_SUBSET (etgl->ets)->map_table[row],
+			col, event);
 	else
 		return FALSE;
 }
@@ -247,12 +266,8 @@ etgl_reflow (GnomeCanvasItem *item, gint flags)
 {
 	ETableGroupLeaf *leaf = E_TABLE_GROUP_LEAF (item);
 
-	g_object_get (leaf->item,
-		     "height", &leaf->height,
-		     NULL);
-	g_object_get (leaf->item,
-		     "width", &leaf->width,
-		     NULL);
+	g_object_get (leaf->item, "height", &leaf->height, NULL);
+	g_object_get (leaf->item, "width", &leaf->width, NULL);
 
 	e_canvas_item_request_parent_reflow (item);
 }
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index d8a7d0d7a0..16633f967c 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -1625,13 +1625,13 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 	info->ethi = ethi;
 	info->col = ethi_find_col_by_x (ethi, event->x);
 
-	popup = e_popup_menu_create_with_domain (ethi_context_menu,
-						 1 +
-						 0 +
-						 ((ethi->table || ethi->tree) ? 0 : 4) +
-						 ((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
-						 ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
-						 128, info, GETTEXT_PACKAGE);
+	popup = e_popup_menu_create_with_domain (
+		ethi_context_menu,
+		1 +
+		((ethi->table || ethi->tree) ? 0 : 4) +
+		((e_table_header_count (ethi->eth) > 1) ? 0 : 8),
+		((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) +
+		128, info, GETTEXT_PACKAGE);
 
 	menu_item = gtk_menu_item_new_with_mnemonic (_("_Sort By"));
 	gtk_widget_show (menu_item);
@@ -1761,9 +1761,9 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 					gint j;
 
 					for (j = i + 1; j < length; j++)
-						e_table_sort_info_sorting_set_nth (ethi->sort_info,
-										j - 1,
-										e_table_sort_info_sorting_get_nth (ethi->sort_info, j));
+						e_table_sort_info_sorting_set_nth (
+							ethi->sort_info, j - 1,
+							e_table_sort_info_sorting_get_nth (ethi->sort_info, j));
 
 					e_table_sort_info_sorting_truncate (ethi->sort_info, length - 1);
 					length--;
@@ -1968,7 +1968,8 @@ ethi_event (GnomeCanvasItem *item, GdkEvent *e)
 			   (e->key.keyval == GDK_KEY_KP_Left)) {
 			ETableCol *ecol;
 
-			if ((ethi->selected_col <= 0) || (ethi->selected_col >= ethi->eth->col_count))
+			if ((ethi->selected_col <= 0) ||
+			    (ethi->selected_col >= ethi->eth->col_count))
 				ethi->selected_col = ethi->eth->col_count - 1;
 			else
 				ethi->selected_col--;
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index ea2554b7bc..59d254c862 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -193,7 +193,8 @@ etw_proxy_model_rows_deleted (ETableSubset *etss,
 	gboolean shift = FALSE;
 
 	for (i = 0; i < etss->n_map; i++) {
-		if (etss->map_table[i] >= model_row && etss->map_table[i] < model_row + count) {
+		if (etss->map_table[i] >= model_row &&
+		    etss->map_table[i] < model_row + count) {
 			remove_row (etw, i);
 			i--;
 		} else if (etss->map_table[i] >= model_row + count) {
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index eec9333e65..4b9a977f05 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -514,11 +514,14 @@ e_tree_memory_node_insert (ETreeMemory *tree_model,
 	if (parent_path != NULL) {
 		e_tree_memory_path_insert (parent_path, position, new_path);
 		if (!tree_model->priv->frozen)
-			e_tree_model_node_inserted (E_TREE_MODEL (tree_model), parent_path, new_path);
+			e_tree_model_node_inserted (
+				E_TREE_MODEL (tree_model),
+				parent_path, new_path);
 	} else {
 		priv->root = new_path;
 		if (!tree_model->priv->frozen)
-			e_tree_model_node_changed (E_TREE_MODEL (tree_model), new_path);
+			e_tree_model_node_changed (
+				E_TREE_MODEL (tree_model), new_path);
 	}
 
 	return new_path;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index fe9f3d7474..25fdcc7e48 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1257,7 +1257,8 @@ e_tree_set_state_object (ETree *e_tree, ETableState *state)
 			     NULL);
 
 	if (e_tree->priv->etta)
-		e_tree_table_adapter_set_sort_info (e_tree->priv->etta, e_tree->priv->sort_info);
+		e_tree_table_adapter_set_sort_info (
+			e_tree->priv->etta, e_tree->priv->sort_info);
 
 	e_tree_state_change (e_tree);
 }
@@ -2065,11 +2066,17 @@ e_tree_get_next_row      (ETree *e_tree,
 			return e_sorter_sorted_to_model (E_SORTER (e_tree->priv->sorter), i);
 		} else
 			return -1;
-	} else
-		if (model_row < e_table_model_row_count (E_TABLE_MODEL (e_tree->priv->etta)) - 1)
+	} else {
+		gint row_count;
+
+		row_count = e_table_model_row_count (
+			E_TABLE_MODEL (e_tree->priv->etta));
+
+		if (model_row < row_count - 1)
 			return model_row + 1;
 		else
 			return -1;
+	}
 }
 
 gint
diff --git a/widgets/table/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index bbe278537a..e663bb1f1f 100644
--- a/widgets/table/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
@@ -220,7 +220,8 @@ AtkObject *gal_a11y_e_cell_vbox_new	(ETableItem *item,
 
 	a11y = g_object_new (gal_a11y_e_cell_vbox_get_type (), NULL);
 
-	gal_a11y_e_cell_construct (a11y, item, cell_view, parent, model_col, view_col, row);
+	gal_a11y_e_cell_construct (
+		a11y, item, cell_view, parent, model_col, view_col, row);
 
 	gaec = GAL_A11Y_E_CELL (a11y);
 	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index 0ba51dcb4d..d5853270a4 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -350,7 +350,9 @@ gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell,
 	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
 	for (list_node = cell->action_list; list_node && !action_found;
 			  list_node = list_node->next) {
-		if (!g_ascii_strcasecmp (((ActionInfo *)(list_node->data))->name, action_name)) {
+		if (!g_ascii_strcasecmp (
+				((ActionInfo *)(list_node->data))->name,
+				action_name)) {
 			action_found = TRUE;
 			break;
 		}
-- 
cgit v1.2.3


From 89d7c38c8bd3aac0060e7e8e3913507444c00608 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 9 Jun 2011 15:00:03 -0400
Subject: Replace G_CONST_RETURN with 'const'.

GLib is finally dropping this hack.
---
 widgets/table/gal-a11y-e-cell.c                | 8 ++++----
 widgets/table/gal-a11y-e-table-click-to-add.c  | 6 +++---
 widgets/table/gal-a11y-e-table-column-header.c | 4 ++--
 widgets/table/gal-a11y-e-table-item.c          | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index d5853270a4..e48977f026 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -103,7 +103,7 @@ gal_a11y_e_cell_dispose (GObject *object)
 }
 
 /* Static functions */
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_get_name (AtkObject * a11y)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (a11y);
@@ -375,7 +375,7 @@ gal_a11y_e_cell_action_get_n_actions (AtkAction *action)
 		return 0;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_action_get_name (AtkAction *action,
                            gint      index)
 {
@@ -387,7 +387,7 @@ gal_a11y_e_cell_action_get_name (AtkAction *action,
 	return info->name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_action_get_description (AtkAction *action,
 					gint      index)
 {
@@ -414,7 +414,7 @@ gal_a11y_e_cell_action_set_description (AtkAction   *action,
 	return TRUE;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_cell_action_get_keybinding (AtkAction *action,
 				       gint      index)
 {
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index 263af62e9a..a947415c15 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -54,7 +54,7 @@ etcta_get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 etcta_get_description (AtkAction *action,
                              gint      i)
 {
@@ -64,7 +64,7 @@ etcta_get_description (AtkAction *action,
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 etcta_action_get_name (AtkAction *action, gint      i)
 {
 	if (i == 0)
@@ -125,7 +125,7 @@ atk_action_interface_init (AtkActionIface *iface)
 	iface->get_name = etcta_action_get_name;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 etcta_get_name (AtkObject *obj)
 {
 	ETableClickToAdd * etcta;
diff --git a/widgets/table/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index a7503352a3..ccbfffadc9 100644
--- a/widgets/table/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
@@ -146,11 +146,11 @@ gal_a11y_e_table_column_header_get_n_actions (AtkAction *action)
 	return 1;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 gal_a11y_e_table_column_header_action_get_name (AtkAction *action,
 						gint      i)
 {
-	G_CONST_RETURN gchar *return_value;
+	const gchar *return_value;
 
 	switch (i) {
 		case 0:
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 560ea3f54a..e296882e65 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -511,7 +511,7 @@ eti_get_caption (AtkTable *table)
 	return NULL;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 eti_get_column_description (AtkTable *table,
 			    gint column)
 {
@@ -546,7 +546,7 @@ eti_get_column_header (AtkTable *table, gint column)
 	return atk_obj;
 }
 
-static G_CONST_RETURN gchar *
+static const gchar *
 eti_get_row_description (AtkTable *table,
 			 gint row)
 {
-- 
cgit v1.2.3


From 72d408c8a31479c887822c9a2b7f1a25d0007f4f Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Thu, 11 Aug 2011 19:13:06 +0200
Subject: Bug #645476 - Message list unnecessarily scrolls back to selected row

---
 widgets/table/e-tree.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 25fdcc7e48..996a6b1e51 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -828,7 +828,6 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 	if (e_tree->priv->reflow_idle_id)
 		g_source_remove (e_tree->priv->reflow_idle_id);
 	tree_canvas_reflow_idle (e_tree);
-	scroll_to_cursor (e_tree);
 }
 
 static void
-- 
cgit v1.2.3


From fcbbdfbd18e15b4ee8322a0217cf03a689a5e033 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 16 Aug 2011 11:25:56 -0400
Subject: Coding style and whitespace cleanup.

---
 widgets/table/e-cell-checkbox.c                    |  10 +-
 widgets/table/e-cell-combo.c                       | 103 ++---
 widgets/table/e-cell-date-edit.c                   | 130 +++---
 widgets/table/e-cell-date-edit.h                   |  10 +-
 widgets/table/e-cell-date.c                        |  14 +-
 widgets/table/e-cell-hbox.c                        |  30 +-
 widgets/table/e-cell-number.c                      |  11 +-
 widgets/table/e-cell-percent.c                     |  18 +-
 widgets/table/e-cell-pixbuf.c                      |  77 ++--
 widgets/table/e-cell-popup.c                       | 102 +++--
 widgets/table/e-cell-popup.h                       |   8 +-
 widgets/table/e-cell-size.c                        |  11 +-
 widgets/table/e-cell-text.c                        | 273 +++++++----
 widgets/table/e-cell-text.h                        |   8 +-
 widgets/table/e-cell-tree.c                        |  94 ++--
 widgets/table/e-cell-vbox.c                        |  27 +-
 widgets/table/e-cell.c                             | 163 +++++--
 widgets/table/e-cell.h                             |   2 +-
 widgets/table/e-popup-menu.c                       |  12 +-
 widgets/table/e-table-click-to-add.c               |  47 +-
 widgets/table/e-table-col.c                        |  10 +-
 widgets/table/e-table-col.h                        |  10 +-
 widgets/table/e-table-column-specification.c       |   4 +-
 widgets/table/e-table-config.c                     | 104 +++--
 widgets/table/e-table-extras.c                     |   8 +-
 widgets/table/e-table-field-chooser-dialog.c       |  27 +-
 widgets/table/e-table-field-chooser-item.c         |  55 ++-
 widgets/table/e-table-field-chooser-item.h         |   2 +-
 widgets/table/e-table-field-chooser.c              |  26 +-
 widgets/table/e-table-group-container.c            | 213 +++++----
 widgets/table/e-table-group-container.h            |   2 +-
 widgets/table/e-table-group-leaf.c                 |  58 ++-
 widgets/table/e-table-group.c                      |  71 +--
 widgets/table/e-table-header-item.c                | 176 +++++---
 widgets/table/e-table-header-item.h                |   4 +-
 widgets/table/e-table-header-utils.c               |  37 +-
 widgets/table/e-table-header-utils.h               |   2 +-
 widgets/table/e-table-header.c                     |  86 ++--
 widgets/table/e-table-item.c                       | 402 +++++++++++------
 widgets/table/e-table-item.h                       |  12 +-
 widgets/table/e-table-memory-callbacks.c           |  54 ++-
 widgets/table/e-table-memory-store.c               |  95 +++-
 widgets/table/e-table-memory.c                     |  14 +-
 widgets/table/e-table-model.c                      |  60 ++-
 widgets/table/e-table-one.c                        |  32 +-
 widgets/table/e-table-search.c                     |   7 +-
 widgets/table/e-table-selection-model.c            |  85 ++--
 widgets/table/e-table-selection-model.h            |   2 +-
 widgets/table/e-table-sort-info.c                  |  42 +-
 widgets/table/e-table-sorted-variable.c            |  20 +-
 widgets/table/e-table-sorted.c                     |  36 +-
 widgets/table/e-table-sorter.c                     |  61 ++-
 widgets/table/e-table-sorting-utils.c              |  75 +++-
 widgets/table/e-table-specification.c              |  10 +-
 widgets/table/e-table-state.c                      |  20 +-
 widgets/table/e-table-subset-variable.c            |  44 +-
 widgets/table/e-table-subset.c                     | 150 +++++--
 widgets/table/e-table-utils.c                      |   9 +-
 widgets/table/e-table-without.c                    |  73 +--
 widgets/table/e-table.c                            | 499 +++++++++++++--------
 widgets/table/e-table.h                            |   4 +-
 widgets/table/e-tree-memory-callbacks.c            |  79 ++--
 widgets/table/e-tree-memory.c                      |  82 ++--
 widgets/table/e-tree-model.c                       | 128 ++++--
 widgets/table/e-tree-selection-model.c             | 132 ++++--
 widgets/table/e-tree-sorted.c                      | 237 ++++++----
 widgets/table/e-tree-table-adapter.c               | 253 +++++++----
 widgets/table/e-tree.c                             | 441 +++++++++++-------
 widgets/table/gal-a11y-e-cell-popup.c              |  12 +-
 widgets/table/gal-a11y-e-cell-registry.c           |  20 +-
 widgets/table/gal-a11y-e-cell-toggle.c             |  18 +-
 widgets/table/gal-a11y-e-cell-tree.c               |  20 +-
 widgets/table/gal-a11y-e-cell-vbox.c               |  15 +-
 widgets/table/gal-a11y-e-cell.c                    |  90 ++--
 .../table/gal-a11y-e-table-click-to-add-factory.c  |   2 +-
 widgets/table/gal-a11y-e-table-click-to-add.c      |  18 +-
 widgets/table/gal-a11y-e-table-column-header.c     |  10 +-
 widgets/table/gal-a11y-e-table-factory.c           |   2 +-
 widgets/table/gal-a11y-e-table-item-factory.c      |   2 +-
 widgets/table/gal-a11y-e-table-item.c              | 184 +++++---
 widgets/table/gal-a11y-e-table.c                   |  19 +-
 widgets/table/gal-a11y-e-tree-factory.c            |   2 +-
 widgets/table/gal-a11y-e-tree.c                    |  14 +-
 83 files changed, 3635 insertions(+), 1996 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index 7969e2b4f0..9e775761c7 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -42,9 +42,13 @@ G_DEFINE_TYPE (ECellCheckbox, e_cell_checkbox, E_TYPE_CELL_TOGGLE)
 static GdkPixbuf *checks[2];
 
 static void
-ecc_print (ECellView *ecell_view, GtkPrintContext *context,
-	    gint model_col, gint view_col, gint row,
-	    gdouble width, gdouble height)
+ecc_print (ECellView *ecell_view,
+           GtkPrintContext *context,
+           gint model_col,
+           gint view_col,
+           gint row,
+           gdouble width,
+           gdouble height)
 {
 	cairo_t *cr = gtk_print_context_get_cairo_context (context);
 	const gint value = GPOINTER_TO_INT (
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index f759185a56..2617cfafdf 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -109,7 +109,7 @@ static void	e_cell_combo_restart_edit	(ECellCombo *ecc);
 G_DEFINE_TYPE (ECellCombo, e_cell_combo, E_TYPE_CELL_POPUP)
 
 static void
-e_cell_combo_class_init			(ECellComboClass	*class)
+e_cell_combo_class_init (ECellComboClass *class)
 {
 	ECellPopupClass *ecpc = E_CELL_POPUP_CLASS (class);
 	GObjectClass *object_class = G_OBJECT_CLASS (class);
@@ -120,7 +120,7 @@ e_cell_combo_class_init			(ECellComboClass	*class)
 }
 
 static void
-e_cell_combo_init			(ECellCombo	*ecc)
+e_cell_combo_init (ECellCombo *ecc)
 {
 	GtkWidget *frame;
 	AtkObject *a11y;
@@ -129,7 +129,7 @@ e_cell_combo_init			(ECellCombo	*ecc)
 	GtkScrolledWindow *scrolled_window;
 
 	/* We create one popup window for the ECell, since there will only
-	   ever be one popup in use at a time. */
+	 * ever be one popup in use at a time. */
 	ecc->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
 
 	gtk_window_set_type_hint (
@@ -292,10 +292,10 @@ e_cell_combo_do_popup (ECellPopup *ecp,
 }
 
 static void
-e_cell_combo_select_matching_item	(ECellCombo	*ecc)
+e_cell_combo_select_matching_item (ECellCombo *ecc)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
+	ECellView *ecv = (ECellView *) ecp->popup_cell_view;
 	ECellText *ecell_text = E_CELL_TEXT (ecp->child);
 	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
 	ETableCol *ecol;
@@ -342,7 +342,9 @@ e_cell_combo_select_matching_item	(ECellCombo	*ecc)
 }
 
 static void
-e_cell_combo_show_popup			(ECellCombo	*ecc, gint row, gint view_col)
+e_cell_combo_show_popup (ECellCombo *ecc,
+                         gint row,
+                         gint view_col)
 {
 	GdkWindow *window;
 	GtkAllocation allocation;
@@ -379,13 +381,13 @@ e_cell_combo_show_popup			(ECellCombo	*ecc, gint row, gint view_col)
 
 /* Calculates the size and position of the popup window (like GtkCombo). */
 static void
-e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
-					 gint             row,
-					 gint             view_col,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width)
+e_cell_combo_get_popup_pos (ECellCombo *ecc,
+                            gint row,
+                            gint view_col,
+                            gint *x,
+                            gint *y,
+                            gint *height,
+                            gint *width)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecc);
 	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
@@ -448,7 +450,7 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	avail_height = gdk_screen_height () - *y;
 
 	/* We'll use the entire screen width if needed, but we save space for
-	   the vertical scrollbar in case we need to show that. */
+	 * the vertical scrollbar in case we need to show that. */
 	screen_width = gdk_screen_width ();
 	avail_width = screen_width - scrollbar_width;
 
@@ -481,7 +483,7 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 		*width = column_width;
 
 	/* If it is larger than the available width, use that instead and show
-	   the horizontal scrollbar. */
+	 * the horizontal scrollbar. */
 	if (*width > avail_width) {
 		*width = avail_width;
 		show_hscroll = TRUE;
@@ -506,11 +508,11 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	/* Check if it fits in the available height. */
 	if (work_height + list_requisition.height > avail_height) {
 		/* It doesn't fit, so we see if we have the minimum space
-		   needed. */
+		 * needed. */
 		if (work_height + min_height > avail_height
 		    && *y - row_height > avail_height) {
 			/* We don't, so we show the popup above the cell
-			   instead of below it. */
+			 * instead of below it. */
 			avail_height = *y - row_height;
 			*y -= (work_height + list_requisition.height
 			       + row_height);
@@ -526,7 +528,7 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	}
 
 	/* We try to line it up with the right edge of the column, but we don't
-	   want it to go off the edges of the screen. */
+	 * want it to go off the edges of the screen. */
 	if (*x > screen_width)
 		*x = screen_width;
 	*x -= *width;
@@ -540,7 +542,8 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 }
 
 static void
-e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc)
+e_cell_combo_selection_changed (GtkTreeSelection *selection,
+                                ECellCombo *ecc)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model;
@@ -554,25 +557,25 @@ e_cell_combo_selection_changed (GtkTreeSelection *selection, ECellCombo *ecc)
 }
 
 /* This handles button press events in the popup window.
-   Note that since we have a pointer grab on this window, we also get button
-   press events for windows outside the application here, so we hide the popup
-   window if that happens. We also get propagated events from child widgets
-   which we ignore. */
+ * Note that since we have a pointer grab on this window, we also get button
+ * press events for windows outside the application here, so we hide the popup
+ * window if that happens. We also get propagated events from child widgets
+ * which we ignore. */
 static gint
-e_cell_combo_button_press		(GtkWidget	*popup_window,
-					 GdkEvent	*event,
-					 ECellCombo	*ecc)
+e_cell_combo_button_press (GtkWidget *popup_window,
+                           GdkEvent *event,
+                           ECellCombo *ecc)
 {
 	GtkWidget *event_widget;
 
 	event_widget = gtk_get_event_widget (event);
 
 	/* If the button press was for a widget inside the popup list, but
-	   not the popup window itself, then we ignore the event and return
-	   FALSE. Otherwise we will hide the popup.
-	   Note that since we have a pointer grab on the popup list, button
-	   presses outside the application will be reported to this window,
-	   which is why we hide the popup in this case. */
+	 * not the popup window itself, then we ignore the event and return
+	 * FALSE. Otherwise we will hide the popup.
+	 * Note that since we have a pointer grab on the popup list, button
+	 * presses outside the application will be reported to this window,
+	 * which is why we hide the popup in this case. */
 	while (event_widget) {
 		event_widget = gtk_widget_get_parent (event_widget);
 		if (event_widget == ecc->popup_tree_view)
@@ -588,10 +591,10 @@ e_cell_combo_button_press		(GtkWidget	*popup_window,
 	d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
 
 	/* We don't want to update the cell here. Since the list is in browse
-	   mode there will always be one item selected, so when we popup the
-	   list one item is selected even if it doesn't match the current text
-	   in the cell. So if you click outside the popup (which is what has
-	   happened here) it is better to not update the cell. */
+	 * mode there will always be one item selected, so when we popup the
+	 * list one item is selected even if it doesn't match the current text
+	 * in the cell. So if you click outside the popup (which is what has
+	 * happened here) it is better to not update the cell. */
 	/*e_cell_combo_update_cell (ecc);*/
 	e_cell_combo_restart_edit (ecc);
 
@@ -599,16 +602,16 @@ e_cell_combo_button_press		(GtkWidget	*popup_window,
 }
 
 /* This handles button release events in the popup window. If the button is
-   released inside the list, we want to hide the popup window and update the
-   cell with the new selection. */
+ * released inside the list, we want to hide the popup window and update the
+ * cell with the new selection. */
 static gint
-e_cell_combo_button_release		(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellCombo	*ecc)
+e_cell_combo_button_release (GtkWidget *popup_window,
+                             GdkEventButton *event,
+                             ECellCombo *ecc)
 {
 	GtkWidget *event_widget;
 
-	event_widget = gtk_get_event_widget ((GdkEvent*) event);
+	event_widget = gtk_get_event_widget ((GdkEvent *) event);
 
 	/* See if the button was released in the list (or its children). */
 	while (event_widget && event_widget != ecc->popup_tree_view)
@@ -619,7 +622,7 @@ e_cell_combo_button_release		(GtkWidget	*popup_window,
 		return FALSE;
 
 	/* The button was released inside the list, so we hide the popup and
-	   update the cell to reflect the new selection. */
+	 * update the cell to reflect the new selection. */
 	gtk_grab_remove (ecc->popup_window);
 	gdk_pointer_ungrab (event->time);
 	gdk_keyboard_ungrab (event->time);
@@ -635,11 +638,11 @@ e_cell_combo_button_release		(GtkWidget	*popup_window,
 }
 
 /* This handles key press events in the popup window. If the Escape key is
-   pressed we hide the popup, and do not change the cell contents. */
+ * pressed we hide the popup, and do not change the cell contents. */
 static gint
-e_cell_combo_key_press			(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellCombo	*ecc)
+e_cell_combo_key_press (GtkWidget *popup_window,
+                        GdkEventKey *event,
+                        ECellCombo *ecc)
 {
 	/* If the Escape key is pressed we hide the popup. */
 	if (event->keyval != GDK_KEY_Escape
@@ -670,10 +673,10 @@ e_cell_combo_key_press			(GtkWidget	*popup_window,
 }
 
 static void
-e_cell_combo_update_cell		(ECellCombo	*ecc)
+e_cell_combo_update_cell (ECellCombo *ecc)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecc);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
+	ECellView *ecv = (ECellView *) ecp->popup_cell_view;
 	ECellText *ecell_text = E_CELL_TEXT (ecp->child);
 	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
 	ETableCol *ecol;
@@ -708,11 +711,11 @@ e_cell_combo_update_cell		(ECellCombo	*ecc)
 }
 
 static void
-e_cell_combo_restart_edit		(ECellCombo	*ecc)
+e_cell_combo_restart_edit (ECellCombo *ecc)
 {
 	/* This doesn't work. ETable stops the edit straight-away again. */
 #if 0
-	ECellView *ecv = (ECellView*) ecc->popup_cell_view;
+	ECellView *ecv = (ECellView *) ecc->popup_cell_view;
 	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
 
 	e_table_item_enter_edit (eti, ecc->popup_view_col, ecc->popup_row);
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index 7517ad0e9c..3035652116 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -219,7 +219,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	ecde->time_callback_destroy = NULL;
 
 	/* We create one popup window for the ECell, since there will only
-	   ever be one popup in use at a time. */
+	 * ever be one popup in use at a time. */
 	ecde->popup_window = gtk_window_new (GTK_WINDOW_POPUP);
 
 	gtk_window_set_type_hint (GTK_WINDOW (ecde->popup_window),
@@ -299,7 +299,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	now_button = gtk_button_new_with_label (_("Now"));
 	gtk_container_add (GTK_CONTAINER (bbox), now_button);
 	gtk_widget_show (now_button);
-	g_signal_connect((now_button), "clicked",
+	g_signal_connect ((now_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_now_clicked),
 			    ecde);
 	ecde->now_button = now_button;
@@ -307,7 +307,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	today_button = gtk_button_new_with_label (_("Today"));
 	gtk_container_add (GTK_CONTAINER (bbox), today_button);
 	gtk_widget_show (today_button);
-	g_signal_connect((today_button), "clicked",
+	g_signal_connect ((today_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_today_clicked),
 			    ecde);
 	ecde->today_button = today_button;
@@ -316,7 +316,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	none_button = gtk_button_new_with_label (C_("table-date", "None"));
 	gtk_container_add (GTK_CONTAINER (bbox), none_button);
 	gtk_widget_show (none_button);
-	g_signal_connect((none_button), "clicked",
+	g_signal_connect ((none_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_none_clicked),
 			    ecde);
 	ecde->none_button = none_button;
@@ -324,7 +324,7 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 	ok_button = gtk_button_new_with_label (_("OK"));
 	gtk_container_add (GTK_CONTAINER (bbox), ok_button);
 	gtk_widget_show (ok_button);
-	g_signal_connect((ok_button), "clicked",
+	g_signal_connect ((ok_button), "clicked",
 			    G_CALLBACK (e_cell_date_edit_on_ok_clicked),
 			    ecde);
 
@@ -346,16 +346,16 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
  * Returns: an ECellDateEdit object.
  */
 ECell *
-e_cell_date_edit_new			(void)
+e_cell_date_edit_new (void)
 {
 	return g_object_new (e_cell_date_edit_get_type (), NULL);
 }
 
 static void
-e_cell_date_edit_get_property		(GObject	*object,
-					 guint		 property_id,
-					 GValue		*value,
-					 GParamSpec	*pspec)
+e_cell_date_edit_get_property (GObject *object,
+                               guint property_id,
+                               GValue *value,
+                               GParamSpec *pspec)
 {
 	ECellDateEdit *ecde;
 
@@ -389,10 +389,10 @@ e_cell_date_edit_get_property		(GObject	*object,
 }
 
 static void
-e_cell_date_edit_set_property		(GObject	*object,
-					 guint		 property_id,
-					 const GValue	*value,
-					 GParamSpec	*pspec)
+e_cell_date_edit_set_property (GObject *object,
+                               guint property_id,
+                               const GValue *value,
+                               GParamSpec *pspec)
 {
 	ECellDateEdit *ecde;
 	gint ivalue;
@@ -477,10 +477,10 @@ e_cell_date_edit_dispose (GObject *object)
 }
 
 static gint
-e_cell_date_edit_do_popup		(ECellPopup	*ecp,
-					 GdkEvent	*event,
-					 gint             row,
-					 gint             view_col)
+e_cell_date_edit_do_popup (ECellPopup *ecp,
+                           GdkEvent *event,
+                           gint row,
+                           gint view_col)
 {
 	ECellDateEdit *ecde = E_CELL_DATE_EDIT (ecp);
 	GdkWindow *window;
@@ -499,11 +499,11 @@ e_cell_date_edit_do_popup		(ECellPopup	*ecp,
 }
 
 static void
-e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
+e_cell_date_edit_set_popup_values (ECellDateEdit *ecde)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecde);
 	ECellText *ecell_text = E_CELL_TEXT (ecp->child);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
+	ECellView *ecv = (ECellView *) ecp->popup_cell_view;
 	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
 	ETableCol *ecol;
 	gchar *cell_text;
@@ -519,7 +519,7 @@ e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
 					  ecol->col_idx, ecp->popup_row);
 
 	/* Try to parse just a date first. If the value is only a date, we
-	   use a DATE value. */
+	 * use a DATE value. */
 	status = e_time_parse_date (cell_text, &date_tm);
 	if (status == E_TIME_PARSE_INVALID) {
 		is_date = FALSE;
@@ -527,7 +527,7 @@ e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
 	}
 
 	/* If there is no date and time set, or the date is invalid, we clear
-	   the selections, else we select the appropriate date & time. */
+	 * the selections, else we select the appropriate date & time. */
 	calitem = E_CALENDAR_ITEM (E_CALENDAR (ecde->calendar)->calitem);
 	if (status == E_TIME_PARSE_NONE || status == E_TIME_PARSE_INVALID) {
 		gtk_entry_set_text (GTK_ENTRY (ecde->time_entry), "");
@@ -562,8 +562,8 @@ e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
 }
 
 static void
-e_cell_date_edit_select_matching_time	(ECellDateEdit	*ecde,
-					 gchar		*time)
+e_cell_date_edit_select_matching_time (ECellDateEdit *ecde,
+                                       gchar *time)
 {
 	gboolean found = FALSE;
 	gboolean valid;
@@ -605,9 +605,9 @@ e_cell_date_edit_select_matching_time	(ECellDateEdit	*ecde,
 }
 
 static void
-e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
-					 gint             row,
-					 gint             view_col)
+e_cell_date_edit_show_popup (ECellDateEdit *ecde,
+                             gint row,
+                             gint view_col)
 {
 	GdkWindow *window;
 	gint x, y, width, height;
@@ -631,13 +631,13 @@ e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
 
 /* Calculates the size and position of the popup window (like GtkCombo). */
 static void
-e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
-					 gint             row,
-					 gint             view_col,
-					 gint		*x,
-					 gint		*y,
-					 gint		*height,
-					 gint		*width)
+e_cell_date_edit_get_popup_pos (ECellDateEdit *ecde,
+                                gint row,
+                                gint view_col,
+                                gint *x,
+                                gint *y,
+                                gint *height,
+                                gint *width)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecde);
 	ETableItem *eti = E_TABLE_ITEM (ecp->popup_cell_view->cell_view.e_table_item_view);
@@ -672,7 +672,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 
 	*x += x1;
 	/* The ETable positions don't include the grid lines, I think, so we
-	   add 1. */
+	 * add 1. */
 	scrollable = GTK_SCROLLABLE (&GNOME_CANVAS (canvas)->layout);
 	adjustment = gtk_scrollable_get_vadjustment (scrollable);
 	value = (gint) gtk_adjustment_get_value (adjustment);
@@ -681,7 +681,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	avail_height = gdk_screen_height () - *y;
 
 	/* We'll use the entire screen width if needed, but we save space for
-	   the vertical scrollbar in case we need to show that. */
+	 * the vertical scrollbar in case we need to show that. */
 	screen_width = gdk_screen_width ();
 
 	gtk_widget_get_preferred_size (ecde->popup_window, &popup_requisition, NULL);
@@ -696,10 +696,10 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	/* Check if it fits in the available height. */
 	if (popup_requisition.height > avail_height) {
 		/* It doesn't fit, so we see if we have the minimum space
-		   needed. */
+		 * needed. */
 		if (*y - row_height > avail_height) {
 			/* We don't, so we show the popup above the cell
-			   instead of below it. */
+			 * instead of below it. */
 			*y -= (popup_requisition.height + row_height);
 			if (*y < 0)
 				*y = 0;
@@ -707,7 +707,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	}
 
 	/* We try to line it up with the right edge of the column, but we don't
-	   want it to go off the edges of the screen. */
+	 * want it to go off the edges of the screen. */
 	if (*x > screen_width)
 		*x = screen_width;
 	*x -= *width;
@@ -718,11 +718,11 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 }
 
 /* This handles key press events in the popup window. If the Escape key is
-   pressed we hide the popup, and do not change the cell contents. */
+ * pressed we hide the popup, and do not change the cell contents. */
 static gint
-e_cell_date_edit_key_press		(GtkWidget	*popup_window,
-					 GdkEventKey	*event,
-					 ECellDateEdit	*ecde)
+e_cell_date_edit_key_press (GtkWidget *popup_window,
+                            GdkEventKey *event,
+                            ECellDateEdit *ecde)
 {
 	/* If the Escape key is pressed we hide the popup. */
 	if (event->keyval != GDK_KEY_Escape)
@@ -734,16 +734,16 @@ e_cell_date_edit_key_press		(GtkWidget	*popup_window,
 }
 
 /* This handles button press events in the popup window. If the button is
-   pressed outside the popup, we hide it and do not change the cell contents.
+ * pressed outside the popup, we hide it and do not change the cell contents.
 */
 static gint
-e_cell_date_edit_button_press		(GtkWidget	*popup_window,
-					 GdkEventButton	*event,
-					 ECellDateEdit	*ecde)
+e_cell_date_edit_button_press (GtkWidget *popup_window,
+                               GdkEventButton *event,
+                               ECellDateEdit *ecde)
 {
 	GtkWidget *event_widget;
 
-	event_widget = gtk_get_event_widget ((GdkEvent*) event);
+	event_widget = gtk_get_event_widget ((GdkEvent *) event);
 	if (gtk_widget_get_toplevel (event_widget) != popup_window) {
 		e_cell_date_edit_hide_popup (ecde);
 	}
@@ -752,9 +752,9 @@ e_cell_date_edit_button_press		(GtkWidget	*popup_window,
 }
 
 /* Clears the time list and rebuilds it using the lower_hour, upper_hour
-   and use_24_hour_format settings. */
+ * and use_24_hour_format settings. */
 static void
-e_cell_date_edit_rebuild_time_list		(ECellDateEdit	*ecde)
+e_cell_date_edit_rebuild_time_list (ECellDateEdit *ecde)
 {
 	GtkListStore *store;
 	gchar buffer[40];
@@ -774,7 +774,7 @@ e_cell_date_edit_rebuild_time_list		(ECellDateEdit	*ecde)
 
 	for (hour = ecde->lower_hour; hour <= ecde->upper_hour; hour++) {
 		/* We don't want to display midnight at the end, since that is
-		   really in the next day. */
+		 * really in the next day. */
 		if (hour == 24)
 			break;
 
@@ -798,8 +798,8 @@ e_cell_date_edit_rebuild_time_list		(ECellDateEdit	*ecde)
 }
 
 static void
-e_cell_date_edit_on_ok_clicked		(GtkWidget	*button,
-					 ECellDateEdit	*ecde)
+e_cell_date_edit_on_ok_clicked (GtkWidget *button,
+                                ECellDateEdit *ecde)
 {
 	ECalendarItem *calitem;
 	GDate start_date, end_date;
@@ -860,7 +860,7 @@ e_cell_date_edit_show_time_invalid_warning (ECellDateEdit *ecde)
 			    buffer, sizeof (buffer));
 
 	/* FIXME: Fix transient settings - I'm not sure it works with popup
-	   windows. Maybe we need to use a normal window without decorations.*/
+	 * windows. Maybe we need to use a normal window without decorations.*/
 	dialog = gtk_message_dialog_new (
 		GTK_WINDOW (ecde->popup_window),
 		GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -937,7 +937,7 @@ e_cell_date_edit_update_cell (ECellDateEdit *ecde,
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecde);
 	ECellText *ecell_text = E_CELL_TEXT (ecp->child);
-	ECellView *ecv = (ECellView*) ecp->popup_cell_view;
+	ECellView *ecv = (ECellView *) ecp->popup_cell_view;
 	ETableItem *eti = E_TABLE_ITEM (ecv->e_table_item_view);
 	ETableCol *ecol;
 	gchar *old_text;
@@ -991,10 +991,10 @@ e_cell_date_edit_hide_popup (ECellDateEdit *ecde)
 }
 
 /* These freeze and thaw the rebuilding of the time list. They are useful when
-   setting several properties which result in rebuilds of the list, e.g. the
-   lower_hour, upper_hour and use_24_hour_format properties. */
+ * setting several properties which result in rebuilds of the list, e.g. the
+ * lower_hour, upper_hour and use_24_hour_format properties. */
 void
-e_cell_date_edit_freeze			(ECellDateEdit	*ecde)
+e_cell_date_edit_freeze (ECellDateEdit *ecde)
 {
 	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
 
@@ -1002,7 +1002,7 @@ e_cell_date_edit_freeze			(ECellDateEdit	*ecde)
 }
 
 void
-e_cell_date_edit_thaw			(ECellDateEdit	*ecde)
+e_cell_date_edit_thaw (ECellDateEdit *ecde)
 {
 	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
 
@@ -1015,13 +1015,13 @@ e_cell_date_edit_thaw			(ECellDateEdit	*ecde)
 }
 
 /* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
+ * application needs to use its own timezone data rather than rely on the
+ * Unix timezone. */
 void
-e_cell_date_edit_set_get_time_callback (ECellDateEdit	*ecde,
-					ECellDateEditGetTimeCallback cb,
-					gpointer	 data,
-					GDestroyNotify   destroy)
+e_cell_date_edit_set_get_time_callback (ECellDateEdit *ecde,
+                                        ECellDateEditGetTimeCallback cb,
+                                        gpointer data,
+                                        GDestroyNotify destroy)
 {
 	g_return_if_fail (E_IS_CELL_DATE_EDIT (ecde));
 
diff --git a/widgets/table/e-cell-date-edit.h b/widgets/table/e-cell-date-edit.h
index 5224b0ddff..186302d79a 100644
--- a/widgets/table/e-cell-date-edit.h
+++ b/widgets/table/e-cell-date-edit.h
@@ -84,7 +84,7 @@ struct _ECellDateEdit {
 	gboolean need_time_list_rebuild;
 
 	/* The freeze count for rebuilding the time list. We only rebuild when
-	   this is 0. */
+	 * this is 0. */
 	gint freeze_count;
 
 	ECellDateEditGetTimeCallback time_callback;
@@ -100,14 +100,14 @@ GType		e_cell_date_edit_get_type	(void) G_GNUC_CONST;
 ECell *		e_cell_date_edit_new		(void);
 
 /* These freeze and thaw the rebuilding of the time list. They are useful when
-   setting several properties which result in rebuilds of the list, e.g. the
-   lower_hour, upper_hour and use_24_hour_format properties. */
+ * setting several properties which result in rebuilds of the list, e.g. the
+ * lower_hour, upper_hour and use_24_hour_format properties. */
 void		e_cell_date_edit_freeze		(ECellDateEdit *ecde);
 void		e_cell_date_edit_thaw		(ECellDateEdit *ecde);
 
 /* Sets a callback to use to get the current time. This is useful if the
-   application needs to use its own timezone data rather than rely on the
-   Unix timezone. */
+ * application needs to use its own timezone data rather than rely on the
+ * Unix timezone. */
 void		e_cell_date_edit_set_get_time_callback
 						(ECellDateEdit *ecde,
 						 ECellDateEditGetTimeCallback cb,
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index fb3dd9fc71..79534aff45 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -39,7 +39,10 @@
 G_DEFINE_TYPE (ECellDate, e_cell_date, E_TYPE_CELL_TEXT)
 
 static gchar *
-ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
+ecd_get_text (ECellText *cell,
+              ETableModel *model,
+              gint col,
+              gint row)
 {
 	time_t date = GPOINTER_TO_INT (e_table_model_value_at (model, col, row));
 	const gchar *fmt_component, *fmt_part = NULL;
@@ -59,7 +62,8 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 }
 
 static void
-ecd_free_text (ECellText *cell, gchar *text)
+ecd_free_text (ECellText *cell,
+               gchar *text)
 {
 	g_free (text);
 }
@@ -104,7 +108,8 @@ e_cell_date_init (ECellDate *ecd)
  * Returns: an ECell object that can be used to render dates.
  */
 ECell *
-e_cell_date_new (const gchar *fontname, GtkJustification justify)
+e_cell_date_new (const gchar *fontname,
+                 GtkJustification justify)
 {
 	ECellDate *ecd = g_object_new (E_TYPE_CELL_DATE, NULL);
 
@@ -114,7 +119,8 @@ e_cell_date_new (const gchar *fontname, GtkJustification justify)
 }
 
 void
-e_cell_date_set_format_component (ECellDate *ecd, const gchar *fmt_component)
+e_cell_date_set_format_component (ECellDate *ecd,
+                                  const gchar *fmt_component)
 {
 	g_return_if_fail (ecd != NULL);
 
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index c8485b983a..a8eb4ccb76 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -50,7 +50,9 @@ G_DEFINE_TYPE (ECellHbox, e_cell_hbox, E_TYPE_CELL)
  * ECell::new_view method
  */
 static ECellView *
-ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+ecv_new_view (ECell *ecell,
+              ETableModel *table_model,
+              gpointer e_table_item_view)
 {
 	ECellHbox *ecv = E_CELL_HBOX (ecell);
 	ECellHboxView *hbox_view = g_new0 (ECellHboxView, 1);
@@ -155,11 +157,11 @@ ecv_draw (ECellView *ecell_view,
 
 	gint subcell_offset = 0;
 	gint i;
-	gint allotted_width = x2-x1;
+	gint allotted_width = x2 - x1;
 
 	for (i = 0; i < hbox_view->subcell_view_count; i++) {
 		/* Now cause our subcells to draw their contents,
-		   shifted by subcell_offset pixels */
+		 * shifted by subcell_offset pixels */
 		gint width = allotted_width * hbox_view->def_size_cols[i] / 100;
 			/* e_cell_max_width_by_row (hbox_view->subcell_views[i], hbox_view->model_cols[i], view_col, row);
 		if (width < hbox_view->def_size_cols[i])
@@ -180,7 +182,13 @@ ecv_draw (ECellView *ecell_view,
  * ECell::event method
  */
 static gint
-ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
+ecv_event (ECellView *ecell_view,
+           GdkEvent *event,
+           gint model_col,
+           gint view_col,
+           gint row,
+           ECellFlags flags,
+           ECellActions *actions)
 {
 	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 	gint y = 0;
@@ -217,7 +225,10 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
  * ECell::height method
  */
 static gint
-ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ecv_height (ECellView *ecell_view,
+            gint model_col,
+            gint view_col,
+            gint row)
 {
 	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 	gint height = 0, max_height = 0;
@@ -234,7 +245,9 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * ECell::max_width method
  */
 static gint
-ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col)
+ecv_max_width (ECellView *ecell_view,
+               gint model_col,
+               gint view_col)
 {
 	ECellHboxView *hbox_view = (ECellHboxView *) ecell_view;
 	gint width = 0;
@@ -321,7 +334,10 @@ e_cell_hbox_new (void)
 }
 
 void
-e_cell_hbox_append (ECellHbox *hbox, ECell *subcell, gint model_col, gint size)
+e_cell_hbox_append (ECellHbox *hbox,
+                    ECell *subcell,
+                    gint model_col,
+                    gint size)
 {
 	hbox->subcell_count++;
 
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 7944bbea51..6e2f685a86 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -35,7 +35,10 @@
 G_DEFINE_TYPE (ECellNumber, e_cell_number, E_TYPE_CELL_TEXT)
 
 static gchar *
-ecn_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
+ecn_get_text (ECellText *cell,
+              ETableModel *model,
+              gint col,
+              gint row)
 {
 	gpointer value;
 
@@ -45,7 +48,8 @@ ecn_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 }
 
 static void
-ecn_free_text (ECellText *cell, gchar *text)
+ecn_free_text (ECellText *cell,
+               gchar *text)
 {
 	g_free (text);
 }
@@ -78,7 +82,8 @@ e_cell_number_init (ECellNumber *cell_number)
  * Returns: an ECell object that can be used to render numbers.
  */
 ECell *
-e_cell_number_new (const gchar *fontname, GtkJustification justify)
+e_cell_number_new (const gchar *fontname,
+                   GtkJustification justify)
 {
 	ECellNumber *ecn = g_object_new (E_TYPE_CELL_NUMBER, NULL);
 
diff --git a/widgets/table/e-cell-percent.c b/widgets/table/e-cell-percent.c
index 5b54527f67..61543b0e0c 100644
--- a/widgets/table/e-cell-percent.c
+++ b/widgets/table/e-cell-percent.c
@@ -41,7 +41,10 @@
 G_DEFINE_TYPE (ECellPercent, e_cell_percent, E_TYPE_CELL_TEXT)
 
 static gchar *
-ecp_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
+ecp_get_text (ECellText *cell,
+              ETableModel *model,
+              gint col,
+              gint row)
 {
 	gint percent;
 	static gchar buffer[8];
@@ -59,7 +62,8 @@ ecp_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 }
 
 static void
-ecp_free_text (ECellText *cell, gchar *text)
+ecp_free_text (ECellText *cell,
+               gchar *text)
 {
 	/* Do Nothing. */
 }
@@ -79,8 +83,11 @@ show_percent_warning (void)
 }
 
 static void
-ecp_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
-	       const gchar *text)
+ecp_set_value (ECellText *cell,
+               ETableModel *model,
+               gint col,
+               gint row,
+               const gchar *text)
 {
 	gint matched, percent;
 	gboolean empty = TRUE;
@@ -141,7 +148,8 @@ e_cell_percent_init (ECellPercent *ecp)
  * Returns: an ECell object that can be used to render numbers.
  */
 ECell *
-e_cell_percent_new (const gchar *fontname, GtkJustification justify)
+e_cell_percent_new (const gchar *fontname,
+                    GtkJustification justify)
 {
 	ECellPercent *ecn = g_object_new (E_TYPE_CELL_PERCENT, NULL);
 
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 9a9e31c7e4..b2cf3e2a2d 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -66,7 +66,9 @@ e_cell_pixbuf_new (void)
  */
 
 static ECellView *
-pixbuf_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+pixbuf_new_view (ECell *ecell,
+                 ETableModel *table_model,
+                 gpointer e_table_item_view)
 {
     ECellPixbufView *pixbuf_view = g_new0 (ECellPixbufView, 1);
     ETableItem *eti = E_TABLE_ITEM (e_table_item_view);
@@ -99,9 +101,16 @@ pixbuf_kill_view (ECellView *ecell_view)
 }
 
 static void
-pixbuf_draw (ECellView *ecell_view, cairo_t *cr,
-             gint model_col, gint view_col, gint row, ECellFlags flags,
-             gint x1, gint y1, gint x2, gint y2)
+pixbuf_draw (ECellView *ecell_view,
+             cairo_t *cr,
+             gint model_col,
+             gint view_col,
+             gint row,
+             ECellFlags flags,
+             gint x1,
+             gint y1,
+             gint x2,
+             gint y2)
 {
     GdkPixbuf *cell_pixbuf;
     gint real_x, real_y;
@@ -124,14 +133,14 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr,
     /* We center the pixbuf within our allocated space */
     if (x2 - x1 > pix_w) {
 	gint diff = (x2 - x1) - pix_w;
-	real_x = x1 + diff/2;
+	real_x = x1 + diff / 2;
     } else {
 	real_x = x1;
     }
 
     if (y2 - y1 > pix_h) {
 	gint diff = (y2 - y1) - pix_h;
-	real_y = y1 + diff/2;
+	real_y = y1 + diff / 2;
     } else {
 	real_y = y1;
     }
@@ -143,9 +152,13 @@ pixbuf_draw (ECellView *ecell_view, cairo_t *cr,
 }
 
 static gint
-pixbuf_event (ECellView *ecell_view, GdkEvent *event,
-              gint model_col, gint view_col, gint row,
-              ECellFlags flags, ECellActions *actions)
+pixbuf_event (ECellView *ecell_view,
+              GdkEvent *event,
+              gint model_col,
+              gint view_col,
+              gint row,
+              ECellFlags flags,
+              ECellActions *actions)
 {
     /* noop */
 
@@ -153,7 +166,10 @@ pixbuf_event (ECellView *ecell_view, GdkEvent *event,
 }
 
 static gint
-pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+pixbuf_height (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row)
 {
     GdkPixbuf *pixbuf;
     if (row == -1) {
@@ -176,9 +192,13 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * ECell::print method
  */
 static void
-pixbuf_print (ECellView *ecell_view, GtkPrintContext *context,
-	      gint model_col, gint view_col, gint row,
-	      gdouble width, gdouble height)
+pixbuf_print (ECellView *ecell_view,
+              GtkPrintContext *context,
+              gint model_col,
+              gint view_col,
+              gint row,
+              gdouble width,
+              gdouble height)
 {
 	GdkPixbuf *pixbuf;
 	gint scale;
@@ -197,9 +217,12 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context,
 }
 
 static gdouble
-pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context,
-		     gint model_col, gint view_col, gint row,
-		     gdouble width)
+pixbuf_print_height (ECellView *ecell_view,
+                     GtkPrintContext *context,
+                     gint model_col,
+                     gint view_col,
+                     gint row,
+                     gdouble width)
 {
 	GdkPixbuf *pixbuf;
 
@@ -220,7 +243,9 @@ pixbuf_print_height (ECellView *ecell_view, GtkPrintContext *context,
 }
 
 static gint
-pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col)
+pixbuf_max_width (ECellView *ecell_view,
+                  gint model_col,
+                  gint view_col)
 {
     gint pw;
     gint num_rows, i;
@@ -249,15 +274,15 @@ pixbuf_max_width (ECellView *ecell_view, gint model_col, gint view_col)
 
 static void
 pixbuf_set_property (GObject *object,
-		     guint prop_id,
-		     const GValue *value,
-		     GParamSpec *pspec)
+                     guint property_id,
+                     const GValue *value,
+                     GParamSpec *pspec)
 {
 	ECellPixbuf *pixbuf;
 
 	pixbuf = E_CELL_PIXBUF (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_SELECTED_COLUMN:
 		pixbuf->selected_column = g_value_get_int (value);
 		break;
@@ -278,15 +303,15 @@ pixbuf_set_property (GObject *object,
 /* Get_arg handler for the pixbuf item */
 static void
 pixbuf_get_property (GObject *object,
-		     guint prop_id,
-		     GValue *value,
-		     GParamSpec *pspec)
+                     guint property_id,
+                     GValue *value,
+                     GParamSpec *pspec)
 {
 	ECellPixbuf *pixbuf;
 
 	pixbuf = E_CELL_PIXBUF (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_SELECTED_COLUMN:
 		g_value_set_int (value, pixbuf->selected_column);
 		break;
@@ -300,7 +325,7 @@ pixbuf_get_property (GObject *object,
 		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/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index b3ba9bdfac..65440b2465 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -49,7 +49,7 @@
 
 static void	e_cell_popup_dispose	(GObject	*object);
 
-static ECellView* ecp_new_view		(ECell		*ecell,
+static ECellView * ecp_new_view		(ECell		*ecell,
 					 ETableModel	*table_model,
 					 void		*e_table_item_view);
 static void	ecp_kill_view		(ECellView	*ecv);
@@ -111,7 +111,7 @@ static gint e_cell_popup_do_popup	(ECellPopupView	*ecp_view,
 G_DEFINE_TYPE (ECellPopup, e_cell_popup, E_TYPE_CELL)
 
 static void
-e_cell_popup_class_init		(ECellPopupClass	*class)
+e_cell_popup_class_init (ECellPopupClass *class)
 {
 	ECellClass *ecc = E_CELL_CLASS (class);
 
@@ -137,7 +137,7 @@ e_cell_popup_class_init		(ECellPopupClass	*class)
 }
 
 static void
-e_cell_popup_init		(ECellPopup	*ecp)
+e_cell_popup_init (ECellPopup *ecp)
 {
 	ecp->popup_shown = FALSE;
 	ecp->popup_model = NULL;
@@ -172,7 +172,9 @@ e_cell_popup_dispose (GObject *object)
  * ECell::new_view method
  */
 static ECellView *
-ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+ecp_new_view (ECell *ecell,
+              ETableModel *table_model,
+              gpointer e_table_item_view)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecell);
 	ECellPopupView *ecp_view;
@@ -191,7 +193,7 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	ecp_view->child_view = e_cell_new_view (ecp->child, table_model,
 						e_table_item_view);
 
-	return (ECellView*) ecp_view;
+	return (ECellView *) ecp_view;
 }
 
 /*
@@ -247,9 +249,16 @@ ecp_unrealize (ECellView *ecv)
  * ECell::draw method
  */
 static void
-ecp_draw (ECellView *ecv, cairo_t *cr,
-	  gint model_col, gint view_col, gint row, ECellFlags flags,
-	  gint x1, gint y1, gint x2, gint y2)
+ecp_draw (ECellView *ecv,
+          cairo_t *cr,
+          gint model_col,
+          gint view_col,
+          gint row,
+          ECellFlags flags,
+          gint x1,
+          gint y1,
+          gint x2,
+          gint y2)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecv->ecell);
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
@@ -263,7 +272,7 @@ ecp_draw (ECellView *ecv, cairo_t *cr,
 	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (ecv->e_table_item_view)->canvas);
 
 	/* Display the popup arrow if we are the cursor cell, or the popup
-	   is shown for this cell. */
+	 * is shown for this cell. */
 	show_popup_arrow =
 		e_table_model_is_cell_editable (
 			ecv->e_table_model, model_col, row) &&
@@ -318,8 +327,13 @@ ecp_draw (ECellView *ecv, cairo_t *cr,
  * ECell::event method
  */
 static gint
-ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col,
-	   gint row, ECellFlags flags, ECellActions *actions)
+ecp_event (ECellView *ecv,
+           GdkEvent *event,
+           gint model_col,
+           gint view_col,
+           gint row,
+           ECellFlags flags,
+           ECellActions *actions)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
@@ -335,7 +349,7 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col,
 							 view_col + 1);
 
 			/* FIXME: The event coords seem to be relative to the
-			   text within the cell, so we have to add 4. */
+			 * text within the cell, so we have to add 4. */
 			if (event->button.x + 4 >= width - E_CELL_POPUP_ARROW_WIDTH) {
 				return e_cell_popup_do_popup (ecp_view, event, row, view_col);
 			}
@@ -360,7 +374,10 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col,
  * ECell::height method
  */
 static gint
-ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row)
+ecp_height (ECellView *ecv,
+            gint model_col,
+            gint view_col,
+            gint row)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -371,7 +388,10 @@ ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row)
  * ECellView::enter_edit method
  */
 static gpointer
-ecp_enter_edit (ECellView *ecv, gint model_col, gint view_col, gint row)
+ecp_enter_edit (ECellView *ecv,
+                gint model_col,
+                gint view_col,
+                gint row)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -382,8 +402,11 @@ ecp_enter_edit (ECellView *ecv, gint model_col, gint view_col, gint row)
  * ECellView::leave_edit method
  */
 static void
-ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row,
-		gpointer edit_context)
+ecp_leave_edit (ECellView *ecv,
+                gint model_col,
+                gint view_col,
+                gint row,
+                gpointer edit_context)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -392,8 +415,13 @@ ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row,
 }
 
 static void
-ecp_print (ECellView *ecv, GtkPrintContext *context,
-	   gint model_col, gint view_col, gint row, gdouble width, gdouble height)
+ecp_print (ECellView *ecv,
+           GtkPrintContext *context,
+           gint model_col,
+           gint view_col,
+           gint row,
+           gdouble width,
+           gdouble height)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -402,9 +430,12 @@ ecp_print (ECellView *ecv, GtkPrintContext *context,
 }
 
 static gdouble
-ecp_print_height (ECellView *ecv, GtkPrintContext *context,
-		  gint model_col, gint view_col, gint row,
-		  gdouble width)
+ecp_print_height (ECellView *ecv,
+                  GtkPrintContext *context,
+                  gint model_col,
+                  gint view_col,
+                  gint row,
+                  gdouble width)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -414,8 +445,8 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context,
 
 static gint
 ecp_max_width (ECellView *ecv,
-	       gint model_col,
-	       gint view_col)
+               gint model_col,
+               gint view_col)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -423,15 +454,16 @@ ecp_max_width (ECellView *ecv,
 }
 
 static gchar *
-ecp_get_bg_color (ECellView *ecell_view, gint row)
+ecp_get_bg_color (ECellView *ecell_view,
+                  gint row)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecell_view;
 
 	return e_cell_get_bg_color (ecp_view->child_view, row);
 }
 
-ECell*
-e_cell_popup_get_child			(ECellPopup	*ecp)
+ECell *
+e_cell_popup_get_child (ECellPopup *ecp)
 {
 	g_return_val_if_fail (E_IS_CELL_POPUP (ecp), NULL);
 
@@ -439,8 +471,8 @@ e_cell_popup_get_child			(ECellPopup	*ecp)
 }
 
 void
-e_cell_popup_set_child			(ECellPopup	*ecp,
-					 ECell		*child)
+e_cell_popup_set_child (ECellPopup *ecp,
+                        ECell *child)
 {
 	g_return_if_fail (E_IS_CELL_POPUP (ecp));
 
@@ -452,10 +484,10 @@ e_cell_popup_set_child			(ECellPopup	*ecp,
 }
 
 static gint
-e_cell_popup_do_popup			(ECellPopupView	*ecp_view,
-					 GdkEvent	*event,
-					 gint             row,
-					 gint             view_col)
+e_cell_popup_do_popup (ECellPopupView *ecp_view,
+                       GdkEvent *event,
+                       gint row,
+                       gint view_col)
 {
 	ECellPopup *ecp = E_CELL_POPUP (ecp_view->cell_view.ecell);
 	gint (*popup_func) (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
@@ -472,7 +504,7 @@ e_cell_popup_do_popup			(ECellPopupView	*ecp_view,
 }
 
 /* This redraws the popup cell. Only use this if you know popup_view_col and
-   popup_row are valid. */
+ * popup_row are valid. */
 void
 e_cell_popup_queue_cell_redraw (ECellPopup *ecp)
 {
@@ -486,8 +518,8 @@ e_cell_popup_queue_cell_redraw (ECellPopup *ecp)
 }
 
 void
-e_cell_popup_set_shown  (ECellPopup *ecp,
-			 gboolean    shown)
+e_cell_popup_set_shown (ECellPopup *ecp,
+                        gboolean shown)
 {
 	ecp->popup_shown = shown;
 	e_cell_popup_queue_cell_redraw (ecp);
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index 6d04fb3c8d..bc99196eaf 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -66,13 +66,13 @@ struct _ECellPopup {
 	ECell *child;
 
 	/* This is TRUE if the popup window is shown for the cell being
-	   edited. While shown we display the arrow indented. */
+	 * edited. While shown we display the arrow indented. */
 	gboolean popup_shown;
 
 	/* This is TRUE if the popup arrow is shown for the cell being edited.
-	   This is needed to stop the first click on the cell from popping up
-	   the popup window. We only popup the window after we have drawn the
-	   arrow. */
+	 * This is needed to stop the first click on the cell from popping up
+	 * the popup window. We only popup the window after we have drawn the
+	 * arrow. */
 	gboolean popup_arrow_shown;
 
 	/* The view in which the popup is shown. */
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index d596713977..b330a95a96 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -34,7 +34,10 @@
 G_DEFINE_TYPE (ECellSize, e_cell_size, E_TYPE_CELL_TEXT)
 
 static gchar *
-ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
+ecd_get_text (ECellText *cell,
+              ETableModel *model,
+              gint col,
+              gint row)
 {
 	gint size = GPOINTER_TO_INT (e_table_model_value_at (model, col, row));
 	gfloat fsize;
@@ -53,7 +56,8 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 }
 
 static void
-ecd_free_text (ECellText *cell, gchar *text)
+ecd_free_text (ECellText *cell,
+               gchar *text)
 {
 	g_free (text);
 }
@@ -98,7 +102,8 @@ e_cell_size_init (ECellSize *e_cell_size)
  *
  * Returns: an ECell object that can be used to render file sizes.  */
 ECell *
-e_cell_size_new (const gchar *fontname, GtkJustification justify)
+e_cell_size_new (const gchar *fontname,
+                 GtkJustification justify)
 {
 	ECellSize *ecd = g_object_new (E_TYPE_CELL_SIZE, NULL);
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 9d652372d0..7e391c3ba9 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -205,33 +205,42 @@ static gboolean e_cell_text_retrieve_surrounding_cb (GtkIMContext *context, ECel
 static gboolean e_cell_text_delete_surrounding_cb   (GtkIMContext *context, gint          offset, gint          n_chars, ECellTextView        *text_view);
 static void _insert (ECellTextView *text_view, const gchar *string, gint value);
 static void _delete_selection (ECellTextView *text_view);
-static PangoAttrList* build_attr_list (ECellTextView *text_view, gint row, gint text_length);
+static PangoAttrList * build_attr_list (ECellTextView *text_view, gint row, gint text_length);
 static void update_im_cursor_location (ECellTextView *tv);
 
 static gchar *
-ect_real_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
+ect_real_get_text (ECellText *cell,
+                   ETableModel *model,
+                   gint col,
+                   gint row)
 {
 	return e_table_model_value_at (model, col, row);
 }
 
 static void
-ect_real_free_text (ECellText *cell, gchar *text)
+ect_real_free_text (ECellText *cell,
+                    gchar *text)
 {
 }
 
 /* This is the default method for setting the ETableModel value based on
-   the text in the ECellText. This simply uses the text as it is - it assumes
-   the value in the model is a gchar *. Subclasses may parse the text into
-   data structures to pass to the model. */
+ * the text in the ECellText. This simply uses the text as it is - it assumes
+ * the value in the model is a gchar *. Subclasses may parse the text into
+ * data structures to pass to the model. */
 static void
-ect_real_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
-		    const gchar *text)
+ect_real_set_value (ECellText *cell,
+                    ETableModel *model,
+                    gint col,
+                    gint row,
+                    const gchar *text)
 {
 	e_table_model_set_value_at (model, col, row, text);
 }
 
 static void
-ect_queue_redraw (ECellTextView *text_view, gint view_col, gint view_row)
+ect_queue_redraw (ECellTextView *text_view,
+                  gint view_col,
+                  gint view_row)
 {
 	e_table_item_redraw_range (
 		text_view->cell_view.e_table_item_view,
@@ -242,7 +251,8 @@ ect_queue_redraw (ECellTextView *text_view, gint view_col, gint view_row)
  * Shuts down the editing process
  */
 static void
-ect_stop_editing (ECellTextView *text_view, gboolean commit)
+ect_stop_editing (ECellTextView *text_view,
+                  gboolean commit)
 {
 	GdkWindow *window;
 	CellEdit *edit = text_view->edit;
@@ -319,7 +329,9 @@ ect_cancel_edit (ECellTextView *text_view)
  * ECell::new_view method
  */
 static ECellView *
-ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+ect_new_view (ECell *ecell,
+              ETableModel *table_model,
+              gpointer e_table_item_view)
 {
 	ECellTextView *text_view = g_new0 (ECellTextView, 1);
 	GnomeCanvas *canvas = GNOME_CANVAS_ITEM (e_table_item_view)->canvas;
@@ -388,8 +400,10 @@ ect_unrealize (ECellView *ecv)
 
 }
 
-static PangoAttrList*
-build_attr_list (ECellTextView *text_view, gint row, gint text_length)
+static PangoAttrList *
+build_attr_list (ECellTextView *text_view,
+                 gint row,
+                 gint text_length)
 {
 
 	ECellView *ecell_view = (ECellView *) text_view;
@@ -434,7 +448,10 @@ build_attr_list (ECellTextView *text_view, gint row, gint text_length)
 }
 
 static PangoLayout *
-layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint width)
+layout_with_preedit (ECellTextView *text_view,
+                     gint row,
+                     const gchar *text,
+                     gint width)
 {
 	CellEdit *edit = text_view->edit;
 	PangoAttrList *attrs;
@@ -463,9 +480,9 @@ layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint
 		 */
 
 		if (mlen < text_length) {
-			if (!g_utf8_validate (text+mlen, -1, NULL)) {
+			if (!g_utf8_validate (text + mlen, -1, NULL)) {
 				gchar *tc;
-				tc = g_utf8_find_next_char (text+mlen,NULL);
+				tc = g_utf8_find_next_char (text + mlen,NULL);
 				if (tc) {
 					mlen = (gint) (tc - text);
 				}
@@ -495,7 +512,10 @@ layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint
 }
 
 static PangoLayout *
-build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
+build_layout (ECellTextView *text_view,
+              gint row,
+              const gchar *text,
+              gint width)
 {
 	ECellView *ecell_view = (ECellView *) text_view;
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
@@ -560,7 +580,11 @@ build_layout (ECellTextView *text_view, gint row, const gchar *text, gint width)
 }
 
 static PangoLayout *
-generate_layout (ECellTextView *text_view, gint model_col, gint view_col, gint row, gint width)
+generate_layout (ECellTextView *text_view,
+                 gint model_col,
+                 gint view_col,
+                 gint row,
+                 gint width)
 {
 	ECellView *ecell_view = (ECellView *) text_view;
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
@@ -583,7 +607,10 @@ generate_layout (ECellTextView *text_view, gint model_col, gint view_col, gint r
 }
 
 static void
-draw_cursor (cairo_t *cr, gint x1, gint y1, PangoRectangle rect)
+draw_cursor (cairo_t *cr,
+             gint x1,
+             gint y1,
+             PangoRectangle rect)
 {
 	gdouble scaled_x;
 	gdouble scaled_y;
@@ -602,7 +629,8 @@ draw_cursor (cairo_t *cr, gint x1, gint y1, PangoRectangle rect)
 }
 
 static gboolean
-show_pango_rectangle (CellEdit *edit, PangoRectangle rect)
+show_pango_rectangle (CellEdit *edit,
+                      PangoRectangle rect)
 {
 	gint x1 = rect.x / PANGO_SCALE;
 	gint x2 = (rect.x + rect.width) / PANGO_SCALE;
@@ -664,9 +692,16 @@ get_vertical_spacing (GtkWidget *canvas)
  * ECell::draw method
  */
 static void
-ect_draw (ECellView *ecell_view, cairo_t *cr,
-	  gint model_col, gint view_col, gint row, ECellFlags flags,
-	  gint x1, gint y1, gint x2, gint y2)
+ect_draw (ECellView *ecell_view,
+          cairo_t *cr,
+          gint model_col,
+          gint view_col,
+          gint row,
+          ECellFlags flags,
+          gint x1,
+          gint y1,
+          gint x2,
+          gint y2)
 {
 	PangoLayout *layout;
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
@@ -771,7 +806,8 @@ ect_draw (ECellView *ecell_view, cairo_t *cr,
  * Get the background color
  */
 static gchar *
-ect_get_bg_color (ECellView *ecell_view, gint row)
+ect_get_bg_color (ECellView *ecell_view,
+                  gint row)
 {
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
 	gchar *color_spec;
@@ -811,7 +847,13 @@ key_begins_editing (GdkEventKey *event)
  * ECell::event method
  */
 static gint
-ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
+ect_event (ECellView *ecell_view,
+           GdkEvent *event,
+           gint model_col,
+           gint view_col,
+           gint row,
+           ECellFlags flags,
+           ECellActions *actions)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	ETextEventProcessorEvent e_tep_event;
@@ -849,7 +891,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		if (edit_display && edit->im_context &&
 				gtk_im_context_filter_keypress (\
 					edit->im_context,
-					(GdkEventKey*) event)) {
+					(GdkEventKey *) event)) {
 
 			edit->need_im_reset = TRUE;
 			if (preedit_len && flags & E_CELL_PREEDIT)
@@ -1022,7 +1064,10 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
  * ECell::height method
  */
 static gint
-ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ect_height (ECellView *ecell_view,
+            gint model_col,
+            gint view_col,
+            gint row)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	gint height;
@@ -1038,7 +1083,10 @@ ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * ECellView::enter_edit method
  */
 static gpointer
-ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ect_enter_edit (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	CellEdit *edit;
@@ -1127,7 +1175,11 @@ ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * ECellView::leave_edit method
  */
 static void
-ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context)
+ect_leave_edit (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row,
+                gpointer edit_context)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	CellEdit *edit = text_view->edit;
@@ -1153,7 +1205,11 @@ ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row,
  * ECellView::save_state method
  */
 static gpointer
-ect_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context)
+ect_save_state (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row,
+                gpointer edit_context)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	CellEdit *edit = text_view->edit;
@@ -1169,7 +1225,12 @@ ect_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row,
  * ECellView::load_state method
  */
 static void
-ect_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context, gpointer save_state)
+ect_load_state (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row,
+                gpointer edit_context,
+                gpointer save_state)
 {
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
 	CellEdit *edit = text_view->edit;
@@ -1188,14 +1249,21 @@ ect_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row,
  * ECellView::free_state method
  */
 static void
-ect_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state)
+ect_free_state (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row,
+                gpointer save_state)
 {
 	g_free (save_state);
 }
 
 static void
-get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *text,
-		gdouble *width, gdouble *height)
+get_font_size (PangoLayout *layout,
+               PangoFontDescription *font,
+               const gchar *text,
+               gdouble *width,
+               gdouble *height)
 {
 	gint w;
 	gint h;
@@ -1213,9 +1281,13 @@ get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *tex
 }
 
 static void
-ect_print (ECellView *ecell_view, GtkPrintContext *context,
-	   gint model_col, gint view_col, gint row,
-	   gdouble width, gdouble height)
+ect_print (ECellView *ecell_view,
+           GtkPrintContext *context,
+           gint model_col,
+           gint view_col,
+           gint row,
+           gdouble width,
+           gdouble height)
 {
 	PangoFontDescription *font_des;
 	PangoLayout *layout;
@@ -1263,7 +1335,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	dir = pango_find_base_dir (string, strlen (string));
 
 	if (underline) {
-		ly = ty + (gdouble) pango_font_metrics_get_underline_position (font_metrics)/(gdouble) PANGO_SCALE;
+		ly = ty + (gdouble) pango_font_metrics_get_underline_position (font_metrics) / (gdouble) PANGO_SCALE;
 		cairo_new_path (cr);
 		if (dir == PANGO_DIRECTION_RTL) {
 			cairo_move_to (cr, width - 2, ly + text_height + 6);
@@ -1273,12 +1345,12 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 			cairo_move_to (cr, 2, ly + text_height + 6);
 			cairo_line_to (cr, MIN (2 + text_width, width - 2), ly + text_height + 6);
 		}
-		cairo_set_line_width (cr, (gdouble) pango_font_metrics_get_underline_thickness (font_metrics)/(gdouble) PANGO_SCALE);
+		cairo_set_line_width (cr, (gdouble) pango_font_metrics_get_underline_thickness (font_metrics) / (gdouble) PANGO_SCALE);
 		cairo_stroke (cr);
 	}
 
 	if (strikeout) {
-		ly = ty + (gdouble) pango_font_metrics_get_strikethrough_position (font_metrics)/(gdouble) PANGO_SCALE;
+		ly = ty + (gdouble) pango_font_metrics_get_strikethrough_position (font_metrics) / (gdouble) PANGO_SCALE;
 		cairo_new_path (cr);
 		if (dir == PANGO_DIRECTION_RTL) {
 			cairo_move_to (cr, width - 2, ly + text_height + 6);
@@ -1288,13 +1360,13 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 			cairo_move_to (cr, 2, ly + text_height + 6);
 			cairo_line_to (cr, MIN (2 + text_width, width - 2), ly + text_height + 6);
 		}
-			cairo_set_line_width (cr,(gdouble) pango_font_metrics_get_strikethrough_thickness (font_metrics)/(gdouble) PANGO_SCALE);
+			cairo_set_line_width (cr,(gdouble) pango_font_metrics_get_strikethrough_thickness (font_metrics) / (gdouble) PANGO_SCALE);
 
 			cairo_stroke (cr);
 	}
 
 	cairo_move_to (cr, 2, text_height- 5);
-	pango_layout_set_width (layout, (width - 4)*PANGO_SCALE);
+	pango_layout_set_width (layout, (width - 4) * PANGO_SCALE);
 	pango_layout_set_wrap (layout, PANGO_WRAP_CHAR);
 	pango_cairo_show_layout (cr, layout);
 	cairo_restore (cr);
@@ -1305,9 +1377,12 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 }
 
 static gdouble
-ect_print_height (ECellView *ecell_view, GtkPrintContext *context,
-		  gint model_col, gint view_col, gint row,
-		  gdouble width)
+ect_print_height (ECellView *ecell_view,
+                  GtkPrintContext *context,
+                  gint model_col,
+                  gint view_col,
+                  gint row,
+                  gdouble width)
 {
 	/*
 	 * Font size is 16 by default. To leave some margin for cell
@@ -1321,7 +1396,7 @@ ect_print_height (ECellView *ecell_view, GtkPrintContext *context,
 	ECellText *ect = E_CELL_TEXT (ecell_view->ecell);
 	gchar *string;
 	gdouble text_width = 0.0, text_height = 0.0;
-	gint lines=1;
+	gint lines = 1;
 
 	string = e_cell_text_get_text (ect, ecell_view->e_table_model, model_col, row);
 
@@ -1334,15 +1409,15 @@ ect_print_height (ECellView *ecell_view, GtkPrintContext *context,
 	/* Checking if the text width goes beyond the column width to increase the
 	 * number of lines.
 	 */
-	if ( text_width > width-4)
-		lines = (text_width / (width-4)) + 1;
-	return 16*lines + 8;
+	if ( text_width > width - 4)
+		lines = (text_width / (width - 4)) + 1;
+	return 16 *lines + 8;
 }
 
 static gint
 ect_max_width (ECellView *ecell_view,
-	       gint model_col,
-	       gint view_col)
+               gint model_col,
+               gint view_col)
 {
 	/* New ECellText */
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
@@ -1367,9 +1442,9 @@ ect_max_width (ECellView *ecell_view,
 
 static gint
 ect_max_width_by_row (ECellView *ecell_view,
-		      gint model_col,
-		      gint view_col,
-		      gint row)
+                      gint model_col,
+                      gint view_col,
+                      gint row)
 {
 	/* New ECellText */
 	ECellTextView *text_view = (ECellTextView *) ecell_view;
@@ -1399,15 +1474,15 @@ ect_finalize (GObject *object)
 /* Set_arg handler for the text item */
 static void
 ect_set_property (GObject *object,
-		  guint prop_id,
-		  const GValue *value,
-		  GParamSpec *pspec)
+                  guint property_id,
+                  const GValue *value,
+                  GParamSpec *pspec)
 {
 	ECellText *text;
 
 	text = E_CELL_TEXT (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_STRIKEOUT_COLUMN:
 		text->strikeout_column = g_value_get_int (value);
 		break;
@@ -1440,15 +1515,15 @@ ect_set_property (GObject *object,
 /* Get_arg handler for the text item */
 static void
 ect_get_property (GObject *object,
-		  guint prop_id,
-		  GValue *value,
-		  GParamSpec *pspec)
+                  guint property_id,
+                  GValue *value,
+                  GParamSpec *pspec)
 {
 	ECellText *text;
 
 	text = E_CELL_TEXT (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_STRIKEOUT_COLUMN:
 		g_value_set_int (value, text->strikeout_column);
 		break;
@@ -1474,7 +1549,7 @@ ect_get_property (GObject *object,
 		break;
 
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -1597,11 +1672,11 @@ e_cell_text_class_init (ECellTextClass *class)
 
 static void
 e_cell_text_get_cursor_locations (ECellTextView *tv,
-				  GdkRectangle *strong_pos,
-				  GdkRectangle *weak_pos)
+                                  GdkRectangle *strong_pos,
+                                  GdkRectangle *weak_pos)
 {
 	GdkRectangle area;
-	CellEdit *edit=tv->edit;
+	CellEdit *edit = tv->edit;
 	ECellView *cell_view = (ECellView *) tv;
 	ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view);
 	GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent;
@@ -1647,7 +1722,7 @@ e_cell_text_get_cursor_locations (ECellTextView *tv,
 static void
 update_im_cursor_location (ECellTextView *tv)
 {
-	CellEdit *edit=tv->edit;
+	CellEdit *edit = tv->edit;
 	GdkRectangle area;
 
 	e_cell_text_get_cursor_locations (tv, &area, NULL);
@@ -1657,11 +1732,11 @@ update_im_cursor_location (ECellTextView *tv)
 
 static void
 e_cell_text_preedit_changed_cb (GtkIMContext *context,
-		  ECellTextView    *tv)
+                                ECellTextView *tv)
 {
 	gchar *preedit_string;
 	gint cursor_pos;
-	CellEdit *edit=tv->edit;
+	CellEdit *edit = tv->edit;
 	gtk_im_context_get_preedit_string (edit->im_context, &preedit_string,
 					NULL, &cursor_pos);
 
@@ -1675,8 +1750,8 @@ e_cell_text_preedit_changed_cb (GtkIMContext *context,
 
 static void
 e_cell_text_commit_cb (GtkIMContext *context,
-		  const gchar  *str,
-		  ECellTextView    *tv)
+                       const gchar *str,
+                       ECellTextView *tv)
 {
 	CellEdit *edit = tv->edit;
 	ETextEventProcessorCommand command;
@@ -1693,7 +1768,7 @@ e_cell_text_commit_cb (GtkIMContext *context,
 
 static gboolean
 e_cell_text_retrieve_surrounding_cb (GtkIMContext *context,
-				ECellTextView        *tv)
+                                     ECellTextView *tv)
 {
 	CellEdit *edit = tv->edit;
 
@@ -1707,10 +1782,10 @@ e_cell_text_retrieve_surrounding_cb (GtkIMContext *context,
 }
 
 static gboolean
-e_cell_text_delete_surrounding_cb   (GtkIMContext *context,
-				gint          offset,
-				gint          n_chars,
-				ECellTextView        *tv)
+e_cell_text_delete_surrounding_cb (GtkIMContext *context,
+                                   gint offset,
+                                   gint n_chars,
+                                   ECellTextView *tv)
 {
 	gint begin_pos, end_pos;
 	glong text_len;
@@ -1774,7 +1849,8 @@ e_cell_text_init (ECellText *ect)
  * Returns: an ECell object that can be used to render strings.
  */
 ECell *
-e_cell_text_new (const gchar *fontname, GtkJustification justify)
+e_cell_text_new (const gchar *fontname,
+                 GtkJustification justify)
 {
 	ECellText *ect = g_object_new (E_TYPE_CELL_TEXT, NULL);
 
@@ -1861,7 +1937,9 @@ e_cell_text_set_value (ECellText *cell,
 /* position is in BYTES */
 
 static gint
-get_position_from_xy (CellEdit *edit, gint x, gint y)
+get_position_from_xy (CellEdit *edit,
+                      gint x,
+                      gint y)
 {
 	gint index;
 	gint trailing;
@@ -1955,7 +2033,8 @@ _blink_scroll_timeout (gpointer data)
 }
 
 static gint
-next_word (CellEdit *edit, gint start)
+next_word (CellEdit *edit,
+           gint start)
 {
 	gchar *p;
 	gint length;
@@ -1977,7 +2056,8 @@ next_word (CellEdit *edit, gint start)
 }
 
 static gint
-_get_position (ECellTextView *text_view, ETextEventProcessorCommand *command)
+_get_position (ECellTextView *text_view,
+               ETextEventProcessorCommand *command)
 {
 	gint length;
 	CellEdit *edit = text_view->edit;
@@ -2144,14 +2224,16 @@ _delete_selection (ECellTextView *text_view)
 
 	edit->selection_end = edit->selection_start;
 
-	g_signal_emit (VIEW_TO_CELL (text_view), signals[TEXT_DELETED], 0, text_view, edit->selection_start, ep-sp, edit->row, edit->model_col);
+	g_signal_emit (VIEW_TO_CELL (text_view), signals[TEXT_DELETED], 0, text_view, edit->selection_start, ep - sp, edit->row, edit->model_col);
 }
 
 /* fixme: */
 /* NB! We expect value to be length IN BYTES */
 
 static void
-_insert (ECellTextView *text_view, const gchar *string, gint value)
+_insert (ECellTextView *text_view,
+         const gchar *string,
+         gint value)
 {
 	CellEdit *edit = text_view->edit;
 	gchar *temp;
@@ -2173,11 +2255,14 @@ _insert (ECellTextView *text_view, const gchar *string, gint value)
 	edit->selection_start += value;
 	edit->selection_end = edit->selection_start;
 
-	g_signal_emit (VIEW_TO_CELL (text_view), signals[TEXT_INSERTED], 0, text_view, edit->selection_end-value, value, edit->row, edit->model_col);
+	g_signal_emit (VIEW_TO_CELL (text_view), signals[TEXT_INSERTED], 0, text_view, edit->selection_end - value, value, edit->row, edit->model_col);
 }
 
 static void
-capitalize (CellEdit *edit, gint start, gint end, ETextEventProcessorCaps type)
+capitalize (CellEdit *edit,
+            gint start,
+            gint end,
+            ETextEventProcessorCaps type)
 {
 	ECellTextView *text_view = edit->text_view;
 
@@ -2228,7 +2313,9 @@ capitalize (CellEdit *edit, gint start, gint end, ETextEventProcessorCaps type)
 }
 
 static void
-e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *command, gpointer data)
+e_cell_text_view_command (ETextEventProcessor *tep,
+                          ETextEventProcessorCommand *command,
+                          gpointer data)
 {
 	CellEdit *edit = (CellEdit *) data;
 	ECellTextView *text_view = edit->text_view;
@@ -2240,7 +2327,7 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *
 	gint sel_start, sel_end;
 
 	/* If the EText isn't editable, then ignore any commands that would
-	   modify the text. */
+	 * modify the text. */
 	if (!ect->editable && (command->action == E_TEP_DELETE
 			       || command->action == E_TEP_INSERT
 			       || command->action == E_TEP_PASTE
@@ -2372,7 +2459,11 @@ e_cell_text_view_command (ETextEventProcessor *tep, ETextEventProcessorCommand *
 }
 
 static void
-e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection, gchar *data, gint length)
+e_cell_text_view_supply_selection (CellEdit *edit,
+                                   guint time,
+                                   GdkAtom selection,
+                                   gchar *data,
+                                   gint length)
 {
 #if DO_SELECTION
 	GtkClipboard *clipboard;
@@ -2390,8 +2481,8 @@ e_cell_text_view_supply_selection (CellEdit *edit, guint time, GdkAtom selection
 #ifdef DO_SELECTION
 static void
 paste_received (GtkClipboard *clipboard,
-		const gchar  *text,
-		gpointer      data)
+                const gchar *text,
+                gpointer data)
 {
 	CellEdit *edit;
 
@@ -2412,7 +2503,9 @@ paste_received (GtkClipboard *clipboard,
 #endif
 
 static void
-e_cell_text_view_get_selection (CellEdit *edit, GdkAtom selection, guint32 time)
+e_cell_text_view_get_selection (CellEdit *edit,
+                                GdkAtom selection,
+                                guint32 time)
 {
 #if DO_SELECTION
 	gtk_clipboard_request_text (gtk_widget_get_clipboard (GTK_WIDGET (edit->text_view->canvas),
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index 7645a0064b..850d0caf29 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -87,8 +87,8 @@ struct _ECellText {
 	gint bold_column;
 
 	/* This column in the ETable should return a string specifying a color,
-	   either a color name like "red" or a color spec like "rgb:F/0/0".
-	   See the XParseColor man page for the formats available. */
+	 * either a color name like "red" or a color spec like "rgb:F/0/0".
+	 * See the XParseColor man page for the formats available. */
 	gint color_column;
 	gint bg_color_column;
 };
@@ -132,8 +132,8 @@ ECell *		e_cell_text_construct		(ECellText *cell,
 						 GtkJustification justify);
 
 /* Gets the value from the model and converts it into a string. In ECellText
-   itself, the value is assumed to be a gchar * and so needs no conversion.
-   In subclasses the ETableModel value may be a more complicated datatype. */
+ * itself, the value is assumed to be a gchar * and so needs no conversion.
+ * In subclasses the ETableModel value may be a more complicated datatype. */
 gchar *		e_cell_text_get_text		(ECellText *cell,
 						 ETableModel *model,
 						 gint col,
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 77f25ae387..e4bb093912 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -71,25 +71,29 @@ e_cell_tree_view_get_subcell_view (ECellView *ect)
 }
 
 static ETreePath
-e_cell_tree_get_node (ETableModel *table_model, gint row)
+e_cell_tree_get_node (ETableModel *table_model,
+                      gint row)
 {
 	return e_table_model_value_at (table_model, -1, row);
 }
 
-static ETreeModel*
-e_cell_tree_get_tree_model (ETableModel *table_model, gint row)
+static ETreeModel *
+e_cell_tree_get_tree_model (ETableModel *table_model,
+                            gint row)
 {
 	return e_table_model_value_at (table_model, -2, row);
 }
 
 static ETreeTableAdapter *
-e_cell_tree_get_tree_table_adapter (ETableModel *table_model, gint row)
+e_cell_tree_get_tree_table_adapter (ETableModel *table_model,
+                                    gint row)
 {
 	return e_table_model_value_at (table_model, -3, row);
 }
 
 static gint
-visible_depth_of_node (ETableModel *model, gint row)
+visible_depth_of_node (ETableModel *model,
+                       gint row)
 {
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (model, row);
 	ETreeTableAdapter *adapter = e_cell_tree_get_tree_table_adapter (model, row);
@@ -99,10 +103,11 @@ visible_depth_of_node (ETableModel *model, gint row)
 }
 
 /* If this is changed to not include the width of the expansion pixmap
-   if the path is not expandable, then max_width needs to change as
-   well. */
+ * if the path is not expandable, then max_width needs to change as
+ * well. */
 static gint
-offset_of_node (ETableModel *table_model, gint row)
+offset_of_node (ETableModel *table_model,
+                gint row)
 {
 	ETreeModel *tree_model = e_cell_tree_get_tree_model (table_model, row);
 	ETreePath path = e_cell_tree_get_node (table_model, row);
@@ -119,7 +124,9 @@ offset_of_node (ETableModel *table_model, gint row)
  * ECell::new_view method
  */
 static ECellView *
-ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+ect_new_view (ECell *ecell,
+              ETableModel *table_model,
+              gpointer e_table_item_view)
 {
 	ECellTree *ect = E_CELL_TREE (ecell);
 	ECellTreeView *tree_view = g_new0 (ECellTreeView, 1);
@@ -283,7 +290,7 @@ ect_draw (ECellView *ecell_view,
 	}
 
 	/* Now cause our subcell to draw its contents, shifted by
-	   subcell_offset pixels */
+	 * subcell_offset pixels */
 	e_cell_draw (tree_view->subcell_view, cr,
 		     model_col, view_col, row, flags,
 		     x1 + subcell_offset, y1, x2, y2);
@@ -292,7 +299,8 @@ ect_draw (ECellView *ecell_view,
 }
 
 static void
-adjust_event_position (GdkEvent *event, gint offset)
+adjust_event_position (GdkEvent *event,
+                       gint offset)
 {
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
@@ -310,7 +318,9 @@ adjust_event_position (GdkEvent *event, gint offset)
 }
 
 static gboolean
-event_in_expander (GdkEvent *event, gint offset, gint height)
+event_in_expander (GdkEvent *event,
+                   gint offset,
+                   gint height)
 {
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
@@ -329,7 +339,10 @@ event_in_expander (GdkEvent *event, gint offset, gint height)
  * ECell::height method
  */
 static gint
-ect_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ect_height (ECellView *ecell_view,
+            gint model_col,
+            gint view_col,
+            gint row)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 
@@ -381,7 +394,13 @@ animate_expander (gpointer data)
  * ECell::event method
  */
 static gint
-ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
+ect_event (ECellView *ecell_view,
+           GdkEvent *event,
+           gint model_col,
+           gint view_col,
+           gint row,
+           ECellFlags flags,
+           ECellActions *actions)
 {
 	GtkLayout *layout;
 	GdkWindow *window;
@@ -504,7 +523,9 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
  * ECell::max_width method
  */
 static gint
-ect_max_width (ECellView *ecell_view, gint model_col, gint view_col)
+ect_max_width (ECellView *ecell_view,
+               gint model_col,
+               gint view_col)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	gint row;
@@ -578,7 +599,8 @@ ect_max_width (ECellView *ecell_view, gint model_col, gint view_col)
  * ECellView::get_bg_color method
  */
 static gchar *
-ect_get_bg_color (ECellView *ecell_view, gint row)
+ect_get_bg_color (ECellView *ecell_view,
+                  gint row)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 
@@ -589,7 +611,10 @@ ect_get_bg_color (ECellView *ecell_view, gint row)
  * ECellView::enter_edit method
  */
 static gpointer
-ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ect_enter_edit (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row)
 {
 	/* just defer to our subcell's view */
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
@@ -601,7 +626,11 @@ ect_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * ECellView::leave_edit method
  */
 static void
-ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context)
+ect_leave_edit (ECellView *ecell_view,
+                gint model_col,
+                gint view_col,
+                gint row,
+                gpointer edit_context)
 {
 	/* just defer to our subcell's view */
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
@@ -610,9 +639,13 @@ ect_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row,
 }
 
 static void
-ect_print (ECellView *ecell_view, GtkPrintContext *context,
-	   gint model_col, gint view_col, gint row,
-	   gdouble width, gdouble height)
+ect_print (ECellView *ecell_view,
+           GtkPrintContext *context,
+           gint model_col,
+           gint view_col,
+           gint row,
+           gdouble width,
+           gdouble height)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	cairo_t *cr = gtk_print_context_get_cairo_context (context);
@@ -650,8 +683,8 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 			}
 
 			/* now traverse back up to the root of the tree, checking at
-			   each level if the node has siblings, and drawing the
-			   correct vertical pipe for it's configuration. */
+			 * each level if the node has siblings, and drawing the
+			 * correct vertical pipe for it's configuration. */
 			node = e_tree_model_node_get_parent (tree_model, node);
 			depth = visible_depth_of_node (ecell_view->e_table_model, row) - 1;
 			offset -= INDENT_AMOUNT;
@@ -700,9 +733,12 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 }
 
 static gdouble
-ect_print_height (ECellView *ecell_view, GtkPrintContext *context,
-		  gint model_col, gint view_col, gint row,
-		  gdouble width)
+ect_print_height (ECellView *ecell_view,
+                  GtkPrintContext *context,
+                  gint model_col,
+                  gint view_col,
+                  gint row,
+                  gdouble width)
 {
 	return 12; /* XXX */
 }
@@ -766,8 +802,8 @@ e_cell_tree_init (ECellTree *ect)
  **/
 void
 e_cell_tree_construct (ECellTree *ect,
-		       gboolean draw_lines,
-		       ECell *subcell)
+                       gboolean draw_lines,
+                       ECell *subcell)
 {
 	ect->subcell = subcell;
 	if (subcell)
@@ -792,7 +828,7 @@ e_cell_tree_construct (ECellTree *ect,
  **/
 ECell *
 e_cell_tree_new (gboolean draw_lines,
-		 ECell *subcell)
+                 ECell *subcell)
 {
 	ECellTree *ect = g_object_new (E_TYPE_CELL_TREE, NULL);
 
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 1c0cbc62ca..9830a06aff 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -46,7 +46,9 @@ G_DEFINE_TYPE (ECellVbox, e_cell_vbox, E_TYPE_CELL)
  * ECell::new_view method
  */
 static ECellView *
-ecv_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+ecv_new_view (ECell *ecell,
+              ETableModel *table_model,
+              gpointer e_table_item_view)
 {
 	ECellVbox *ecv = E_CELL_VBOX (ecell);
 	ECellVboxView *vbox_view = g_new0 (ECellVboxView, 1);
@@ -151,7 +153,7 @@ ecv_draw (ECellView *ecell_view,
 
 	for (i = 0; i < vbox_view->subcell_view_count; i++) {
 		/* Now cause our subcells to draw their contents,
-		   shifted by subcell_offset pixels */
+		 * shifted by subcell_offset pixels */
 		gint height;
 
 		height = e_cell_height (
@@ -173,7 +175,13 @@ ecv_draw (ECellView *ecell_view,
  * ECell::event method
  */
 static gint
-ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
+ecv_event (ECellView *ecell_view,
+           GdkEvent *event,
+           gint model_col,
+           gint view_col,
+           gint row,
+           ECellFlags flags,
+           ECellActions *actions)
 {
 	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 	gint y = 0;
@@ -208,7 +216,10 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
  * ECell::height method
  */
 static gint
-ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ecv_height (ECellView *ecell_view,
+            gint model_col,
+            gint view_col,
+            gint row)
 {
 	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 	gint height = 0;
@@ -224,7 +235,9 @@ ecv_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * ECell::max_width method
  */
 static gint
-ecv_max_width (ECellView *ecell_view, gint model_col, gint view_col)
+ecv_max_width (ECellView *ecell_view,
+               gint model_col,
+               gint view_col)
 {
 	ECellVboxView *vbox_view = (ECellVboxView *) ecell_view;
 	gint max_width = 0;
@@ -312,7 +325,9 @@ e_cell_vbox_new (void)
 }
 
 void
-e_cell_vbox_append (ECellVbox *vbox, ECell *subcell, gint model_col)
+e_cell_vbox_append (ECellVbox *vbox,
+                    ECell *subcell,
+                    gint model_col)
 {
 	vbox->subcell_count++;
 
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index cbc0bfc0ae..88762f6a7a 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -36,7 +36,9 @@ G_DEFINE_TYPE (ECell, e_cell, G_TYPE_OBJECT)
 #define ECVIEW_EC_CLASS(v) (E_CELL_GET_CLASS (v->ecell))
 
 static ECellView *
-ec_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+ec_new_view (ECell *ecell,
+             ETableModel *table_model,
+             gpointer e_table_item_view)
 {
 	return NULL;
 }
@@ -57,15 +59,28 @@ ec_unrealize (ECellView *e_cell)
 }
 
 static void
-ec_draw (ECellView *ecell_view, cairo_t *cr,
-	 gint model_col, gint view_col, gint row, ECellFlags flags,
-	 gint x1, gint y1, gint x2, gint y2)
+ec_draw (ECellView *ecell_view,
+         cairo_t *cr,
+         gint model_col,
+         gint view_col,
+         gint row,
+         ECellFlags flags,
+         gint x1,
+         gint y1,
+         gint x2,
+         gint y2)
 {
 	g_critical ("e-cell-draw invoked");
 }
 
 static gint
-ec_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
+ec_event (ECellView *ecell_view,
+          GdkEvent *event,
+          gint model_col,
+          gint view_col,
+          gint row,
+          ECellFlags flags,
+          ECellActions *actions)
 {
 	g_critical ("e-cell-event invoked");
 
@@ -73,7 +88,10 @@ ec_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col,
 }
 
 static gint
-ec_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ec_height (ECellView *ecell_view,
+           gint model_col,
+           gint view_col,
+           gint row)
 {
 	g_critical ("e-cell-height invoked");
 
@@ -81,7 +99,14 @@ ec_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 }
 
 static void
-ec_focus (ECellView *ecell_view, gint model_col, gint view_col, gint row, gint x1, gint y1, gint x2, gint y2)
+ec_focus (ECellView *ecell_view,
+          gint model_col,
+          gint view_col,
+          gint row,
+          gint x1,
+          gint y1,
+          gint x2,
+          gint y2)
 {
 	ecell_view->focus_col = view_col;
 	ecell_view->focus_row = row;
@@ -103,29 +128,49 @@ ec_unfocus (ECellView *ecell_view)
 }
 
 static gpointer
-ec_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+ec_enter_edit (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row)
 {
 	return NULL;
 }
 
 static void
-ec_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context)
+ec_leave_edit (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row,
+               gpointer context)
 {
 }
 
 static gpointer
-ec_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context)
+ec_save_state (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row,
+               gpointer context)
 {
 	return NULL;
 }
 
 static void
-ec_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer context, gpointer save_state)
+ec_load_state (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row,
+               gpointer context,
+               gpointer save_state)
 {
 }
 
 static void
-ec_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state)
+ec_free_state (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row,
+               gpointer save_state)
 {
 }
 
@@ -172,7 +217,13 @@ e_cell_init (ECell *cell)
  * Returns: processing state from the GdkEvent handling.
  */
 gint
-e_cell_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col, gint row, ECellFlags flags, ECellActions *actions)
+e_cell_event (ECellView *ecell_view,
+              GdkEvent *event,
+              gint model_col,
+              gint view_col,
+              gint row,
+              ECellFlags flags,
+              ECellActions *actions)
 {
 	return ECVIEW_EC_CLASS (ecell_view)->event (
 		ecell_view, event, model_col, view_col, row, flags, actions);
@@ -194,7 +245,9 @@ e_cell_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_
  * Returns: a new ECellView for this @ecell on the @table_model displayed on the @e_table_item_view.
  */
 ECellView *
-e_cell_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view)
+e_cell_new_view (ECell *ecell,
+                 ETableModel *table_model,
+                 gpointer e_table_item_view)
 {
 	return E_CELL_GET_CLASS (ecell)->new_view (
 		ecell, table_model, e_table_item_view);
@@ -260,9 +313,16 @@ e_cell_unrealize (ECellView *ecell_view)
  * flags include alignments and justifications.
  */
 void
-e_cell_draw (ECellView *ecell_view, cairo_t *cr,
-	     gint model_col, gint view_col, gint row, ECellFlags flags,
-	     gint x1, gint y1, gint x2, gint y2)
+e_cell_draw (ECellView *ecell_view,
+             cairo_t *cr,
+             gint model_col,
+             gint view_col,
+             gint row,
+             ECellFlags flags,
+             gint x1,
+             gint y1,
+             gint x2,
+             gint y2)
 {
 	g_return_if_fail (ecell_view != NULL);
 	g_return_if_fail (row >= 0);
@@ -288,9 +348,13 @@ e_cell_draw (ECellView *ecell_view, cairo_t *cr,
  * FIXME:
  */
 void
-e_cell_print (ECellView *ecell_view, GtkPrintContext *context,
-	      gint model_col, gint view_col, gint row,
-	      gdouble width, gdouble height)
+e_cell_print (ECellView *ecell_view,
+              GtkPrintContext *context,
+              gint model_col,
+              gint view_col,
+              gint row,
+              gdouble width,
+              gdouble height)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->print)
 		ECVIEW_EC_CLASS (ecell_view)->print (ecell_view, context, model_col, view_col, row, width, height);
@@ -302,9 +366,12 @@ e_cell_print (ECellView *ecell_view, GtkPrintContext *context,
  * FIXME:
  */
 gdouble
-e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context,
-		     gint model_col, gint view_col, gint row,
-		     gdouble width)
+e_cell_print_height (ECellView *ecell_view,
+                     GtkPrintContext *context,
+                     gint model_col,
+                     gint view_col,
+                     gint row,
+                     gdouble width)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->print_height)
 		return ECVIEW_EC_CLASS (ecell_view)->print_height
@@ -324,7 +391,10 @@ e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context,
  * @view_col, @row.
  */
 gint
-e_cell_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+e_cell_height (ECellView *ecell_view,
+               gint model_col,
+               gint view_col,
+               gint row)
 {
 	return ECVIEW_EC_CLASS (ecell_view)->height (ecell_view, model_col, view_col, row);
 }
@@ -340,7 +410,10 @@ e_cell_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
  * @model_col, @row rendered at @view_col, @row.
  */
 gpointer
-e_cell_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+e_cell_enter_edit (ECellView *ecell_view,
+                   gint model_col,
+                   gint view_col,
+                   gint row)
 {
 	return ECVIEW_EC_CLASS (ecell_view)->enter_edit (ecell_view, model_col, view_col, row);
 }
@@ -357,7 +430,11 @@ e_cell_enter_edit (ECellView *ecell_view, gint model_col, gint view_col, gint ro
  * rendered at @view_col, @row.
  */
 void
-e_cell_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context)
+e_cell_leave_edit (ECellView *ecell_view,
+                   gint model_col,
+                   gint view_col,
+                   gint row,
+                   gpointer edit_context)
 {
 	ECVIEW_EC_CLASS (ecell_view)->leave_edit (ecell_view, model_col, view_col, row, edit_context);
 }
@@ -377,7 +454,11 @@ e_cell_leave_edit (ECellView *ecell_view, gint model_col, gint view_col, gint ro
  * or scrolling.
  */
 gpointer
-e_cell_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context)
+e_cell_save_state (ECellView *ecell_view,
+                   gint model_col,
+                   gint view_col,
+                   gint row,
+                   gpointer edit_context)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->save_state)
 		return ECVIEW_EC_CLASS (ecell_view)->save_state (ecell_view, model_col, view_col, row, edit_context);
@@ -397,7 +478,12 @@ e_cell_save_state (ECellView *ecell_view, gint model_col, gint view_col, gint ro
  * Requests that the ECellView load from the given save state.
  */
 void
-e_cell_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer edit_context, gpointer save_state)
+e_cell_load_state (ECellView *ecell_view,
+                   gint model_col,
+                   gint view_col,
+                   gint row,
+                   gpointer edit_context,
+                   gpointer save_state)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->load_state)
 		ECVIEW_EC_CLASS (ecell_view)->load_state (ecell_view, model_col, view_col, row, edit_context, save_state);
@@ -415,7 +501,11 @@ e_cell_load_state (ECellView *ecell_view, gint model_col, gint view_col, gint ro
  * Requests that the ECellView free the given save state.
  */
 void
-e_cell_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row, gpointer save_state)
+e_cell_free_state (ECellView *ecell_view,
+                   gint model_col,
+                   gint view_col,
+                   gint row,
+                   gpointer save_state)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->free_state)
 		ECVIEW_EC_CLASS (ecell_view)->free_state (ecell_view, model_col, view_col, row, save_state);
@@ -431,7 +521,9 @@ e_cell_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint ro
  * is being rendered as @view_col
  */
 gint
-e_cell_max_width (ECellView *ecell_view, gint model_col, gint view_col)
+e_cell_max_width (ECellView *ecell_view,
+                  gint model_col,
+                  gint view_col)
 {
 	return ECVIEW_EC_CLASS (ecell_view)->max_width
 		(ecell_view, model_col, view_col);
@@ -448,7 +540,10 @@ e_cell_max_width (ECellView *ecell_view, gint model_col, gint view_col)
  * is being rendered as @view_col for the data in @row.
  */
 gint
-e_cell_max_width_by_row (ECellView *ecell_view, gint model_col, gint view_col, gint row)
+e_cell_max_width_by_row (ECellView *ecell_view,
+                         gint model_col,
+                         gint view_col,
+                         gint row)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->max_width_by_row)
 		return ECVIEW_EC_CLASS (ecell_view)->max_width_by_row
@@ -474,7 +569,8 @@ e_cell_max_width_by_row_implemented (ECellView *ecell_view)
 }
 
 gchar *
-e_cell_get_bg_color (ECellView *ecell_view, gint row)
+e_cell_get_bg_color (ECellView *ecell_view,
+                     gint row)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->get_bg_color)
 		return ECVIEW_EC_CLASS (ecell_view)->get_bg_color (ecell_view, row);
@@ -483,7 +579,8 @@ e_cell_get_bg_color (ECellView *ecell_view, gint row)
 }
 
 void
-e_cell_style_set (ECellView *ecell_view, GtkStyle *previous_style)
+e_cell_style_set (ECellView *ecell_view,
+                  GtkStyle *previous_style)
 {
 	if (ECVIEW_EC_CLASS (ecell_view)->style_set)
 		ECVIEW_EC_CLASS (ecell_view)->style_set (ecell_view, previous_style);
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 3a41db0afe..830184c06d 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -92,7 +92,7 @@ struct _ECellView {
 	gint   focus_x1, focus_y1, focus_x2, focus_y2;
 	gint   focus_col, focus_row;
 
-	void  (*kill_view_cb) (struct _ECellView*, gpointer );
+	void  (*kill_view_cb) (struct _ECellView *, gpointer );
 	GList *kill_view_cb_data;
 };
 
diff --git a/widgets/table/e-popup-menu.c b/widgets/table/e-popup-menu.c
index 07589b1589..a4cfec07e9 100644
--- a/widgets/table/e-popup-menu.c
+++ b/widgets/table/e-popup-menu.c
@@ -38,7 +38,9 @@
  * Creates an item with an optional icon
  */
 static void
-make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name)
+make_item (GtkMenu *menu,
+           GtkMenuItem *item,
+           const gchar *name)
 {
 	GtkWidget *label;
 
@@ -57,10 +59,10 @@ make_item (GtkMenu *menu, GtkMenuItem *item, const gchar *name)
 
 GtkMenu *
 e_popup_menu_create_with_domain (EPopupMenu *menu_list,
-				 guint32 disable_mask,
-				 guint32 hide_mask,
-				 gpointer default_closure,
-				 const gchar *domain)
+                                 guint32 disable_mask,
+                                 guint32 hide_mask,
+                                 gpointer default_closure,
+                                 const gchar *domain)
 {
 	GtkMenu *menu = GTK_MENU (gtk_menu_new ());
 	gboolean last_item_separator = TRUE;
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 662a9c50a5..8defc2c479 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -63,7 +63,10 @@ enum {
 };
 
 static void
-etcta_cursor_change (GObject *object, gint row, gint col, ETableClickToAdd *etcta)
+etcta_cursor_change (GObject *object,
+                     gint row,
+                     gint col,
+                     ETableClickToAdd *etcta)
 {
 	g_signal_emit (etcta,
 		       etcta_signals[CURSOR_CHANGE], 0,
@@ -71,7 +74,8 @@ etcta_cursor_change (GObject *object, gint row, gint col, ETableClickToAdd *etct
 }
 
 static void
-etcta_style_set (ETableClickToAdd *etcta, GtkStyle *previous_style)
+etcta_style_set (ETableClickToAdd *etcta,
+                 GtkStyle *previous_style)
 {
 	GtkWidget *widget;
 	GtkStyle *style;
@@ -94,7 +98,8 @@ etcta_style_set (ETableClickToAdd *etcta, GtkStyle *previous_style)
 }
 
 static void
-etcta_add_table_header (ETableClickToAdd *etcta, ETableHeader *header)
+etcta_add_table_header (ETableClickToAdd *etcta,
+                        ETableHeader *header)
 {
 	etcta->eth = header;
 	if (etcta->eth)
@@ -116,7 +121,8 @@ etcta_drop_table_header (ETableClickToAdd *etcta)
 }
 
 static void
-etcta_add_one (ETableClickToAdd *etcta, ETableModel *one)
+etcta_add_one (ETableClickToAdd *etcta,
+               ETableModel *one)
 {
 	etcta->one = one;
 	if (etcta->one)
@@ -143,7 +149,8 @@ etcta_drop_one (ETableClickToAdd *etcta)
 }
 
 static void
-etcta_add_model (ETableClickToAdd *etcta, ETableModel *model)
+etcta_add_model (ETableClickToAdd *etcta,
+                 ETableModel *model)
 {
 	etcta->model = model;
 	if (etcta->model)
@@ -161,7 +168,8 @@ etcta_drop_model (ETableClickToAdd *etcta)
 }
 
 static void
-etcta_add_message (ETableClickToAdd *etcta, const gchar *message)
+etcta_add_message (ETableClickToAdd *etcta,
+                   const gchar *message)
 {
 	etcta->message = g_strdup (message);
 }
@@ -191,7 +199,7 @@ etcta_dispose (GObject *object)
 
 static void
 etcta_set_property (GObject *object,
-                    guint prop_id,
+                    guint property_id,
                     const GValue *value,
                     GParamSpec *pspec)
 {
@@ -201,7 +209,7 @@ etcta_set_property (GObject *object,
 	item = GNOME_CANVAS_ITEM (object);
 	etcta = E_TABLE_CLICK_TO_ADD (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_HEADER:
 		etcta_drop_table_header (etcta);
 		etcta_add_table_header (etcta, E_TABLE_HEADER (g_value_get_object (value)));
@@ -230,7 +238,7 @@ etcta_set_property (GObject *object,
 					      NULL);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		return;
 
 	}
@@ -270,13 +278,16 @@ create_rect_and_text (ETableClickToAdd *etcta)
 }
 
 static void
-etcta_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etcta_get_property (GObject *object,
+                    guint property_id,
+                    GValue *value,
+                    GParamSpec *pspec)
 {
 	ETableClickToAdd *etcta;
 
 	etcta = E_TABLE_CLICK_TO_ADD (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_HEADER:
 		g_value_set_object (value, etcta->eth);
 		break;
@@ -293,7 +304,7 @@ etcta_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *p
 		g_value_set_double (value, etcta->height);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -376,7 +387,7 @@ finish_editing (ETableClickToAdd *etcta)
 						   "cursor_mode", E_CURSOR_SPREADSHEET,
 						   NULL);
 
-		g_signal_connect(etcta->row, "key_press",
+		g_signal_connect (etcta->row, "key_press",
 				 G_CALLBACK (item_key_press), etcta);
 
 		set_initial_selection (etcta);
@@ -386,7 +397,8 @@ finish_editing (ETableClickToAdd *etcta)
 /* Handles the events on the ETableClickToAdd, particularly
  * it creates the ETableItem and passes in some events. */
 static gint
-etcta_event (GnomeCanvasItem *item, GdkEvent *e)
+etcta_event (GnomeCanvasItem *item,
+             GdkEvent *e)
 {
 	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
 
@@ -424,7 +436,7 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
 							   "cursor_mode", E_CURSOR_SPREADSHEET,
 							   NULL);
 
-			g_signal_connect(etcta->row, "key_press",
+			g_signal_connect (etcta->row, "key_press",
 					 G_CALLBACK (item_key_press), etcta);
 
 			e_canvas_item_grab_focus (GNOME_CANVAS_ITEM (etcta->row), TRUE);
@@ -462,7 +474,8 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e)
 }
 
 static void
-etcta_reflow (GnomeCanvasItem *item, gint flags)
+etcta_reflow (GnomeCanvasItem *item,
+              gint flags)
 {
 	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
 
@@ -583,7 +596,7 @@ etcta_init (ETableClickToAdd *etcta)
 	etcta->height = 6;
 
 	etcta->selection = e_table_selection_model_new ();
-	g_signal_connect(etcta->selection, "cursor_changed",
+	g_signal_connect (etcta->selection, "cursor_changed",
 			 G_CALLBACK (etcta_cursor_change), etcta);
 
 	e_canvas_item_set_reflow_callback (GNOME_CANVAS_ITEM (etcta), etcta_reflow);
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 7296408594..fc7da9c9f5 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -82,13 +82,13 @@ etc_dispose (GObject *object)
 
 static void
 etc_set_property (GObject *object,
-                  guint prop_id,
+                  guint property_id,
                   const GValue *value,
                   GParamSpec *pspec)
 {
 	ETableCol *etc = E_TABLE_COL (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_COMPARE_COL:
 		etc->compare_col = g_value_get_int (value);
 		break;
@@ -99,18 +99,18 @@ etc_set_property (GObject *object,
 
 static void
 etc_get_property (GObject *object,
-                  guint prop_id,
+                  guint property_id,
                   GValue *value,
                   GParamSpec *pspec)
 {
 	ETableCol *etc = E_TABLE_COL (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_COMPARE_COL:
 		g_value_set_int (value, etc->compare_col);
 		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/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
index b82886a5ca..042137b40a 100644
--- a/widgets/table/e-table-col.h
+++ b/widgets/table/e-table-col.h
@@ -73,11 +73,11 @@ struct _ETableCol {
 	GCompareDataFunc compare;
 	ETableSearchFunc search;
 
-	guint selected:1;
-	guint resizable:1;
-	guint disabled:1;
-	guint sortable:1;
-	guint groupable:1;
+	guint selected : 1;
+	guint resizable : 1;
+	guint disabled : 1;
+	guint sortable : 1;
+	guint groupable : 1;
 
 	gint col_idx;
 	gint compare_col;
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index 7fb0756085..cd7e07acca 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -102,7 +102,7 @@ e_table_column_specification_new (void)
 
 void
 e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
-					     const xmlNode       *node)
+                                             const xmlNode *node)
 {
 	free_strings (etcs);
 
@@ -128,7 +128,7 @@ e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
 
 xmlNode *
 e_table_column_specification_save_to_node (ETableColumnSpecification *specification,
-					   xmlNode                   *parent)
+                                           xmlNode *parent)
 {
 	xmlNode *node;
 	if (parent)
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 4bfb80d1e9..4e9fe81117 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -94,7 +94,8 @@ config_finalize (GObject *object)
 }
 
 static void
-e_table_config_changed (ETableConfig *config, ETableState *state)
+e_table_config_changed (ETableConfig *config,
+                        ETableState *state)
 {
 	g_return_if_fail (E_IS_TABLE_CONFIG (config));
 
@@ -113,13 +114,13 @@ config_dialog_changed (ETableConfig *config)
 
 static void
 config_get_property (GObject *object,
-		     guint prop_id,
-		     GValue *value,
-		     GParamSpec *pspec)
+                     guint property_id,
+                     GValue *value,
+                     GParamSpec *pspec)
 {
 	ETableConfig *config = E_TABLE_CONFIG (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_STATE:
 		g_value_set_object (value, config->state);
 		break;
@@ -156,7 +157,8 @@ e_table_config_class_init (ETableConfigClass *class)
 }
 
 static void
-configure_combo_box_add (GtkComboBox *combo_box, const gchar *item,
+configure_combo_box_add (GtkComboBox *combo_box,
+                         const gchar *item,
                          const gchar *value)
 {
 	GtkTreeRowReference *reference;
@@ -203,7 +205,8 @@ configure_combo_box_get_active (GtkComboBox *combo_box)
 }
 
 static void
-configure_combo_box_set_active (GtkComboBox *combo_box, const gchar *value)
+configure_combo_box_set_active (GtkComboBox *combo_box,
+                                const gchar *value)
 {
 	GtkTreeRowReference *reference;
 	GHashTable *index;
@@ -231,7 +234,8 @@ configure_combo_box_set_active (GtkComboBox *combo_box, const gchar *value)
 }
 
 static ETableColumnSpecification *
-find_column_in_spec (ETableSpecification *spec, gint model_col)
+find_column_in_spec (ETableSpecification *spec,
+                     gint model_col)
 {
 	ETableColumnSpecification **column;
 
@@ -248,7 +252,8 @@ find_column_in_spec (ETableSpecification *spec, gint model_col)
 }
 
 static gint
-find_model_column_by_name (ETableSpecification *spec, const gchar *s)
+find_model_column_by_name (ETableSpecification *spec,
+                           const gchar *s)
 {
 	ETableColumnSpecification **column;
 
@@ -263,7 +268,8 @@ find_model_column_by_name (ETableSpecification *spec, const gchar *s)
 }
 
 static void
-update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
+update_sort_and_group_config_dialog (ETableConfig *config,
+                                     gboolean is_sort)
 {
 	ETableConfigSortWidgets *widgets;
 	gint count, i;
@@ -328,7 +334,7 @@ update_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 			d = GTK_TOGGLE_BUTTON (
 				widgets[i].radio_descending);
 
-			gtk_toggle_button_set_active (col.ascending ? a:d, 1);
+			gtk_toggle_button_set_active (col.ascending ? a : d, 1);
 		} else {
 			GtkToggleButton *t;
 
@@ -428,7 +434,7 @@ config_group_info_update (ETableConfig *config)
 			col.ascending ?
 			_("(Ascending)") : _("(Descending)"));
 
-		if ((i+1) != count)
+		if ((i + 1) != count)
 			g_string_append (res, ", ");
 	}
 	if (res->str[0] == 0)
@@ -492,7 +498,8 @@ config_fields_info_update (ETableConfig *config)
 }
 
 static void
-do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
+do_sort_and_group_config_dialog (ETableConfig *config,
+                                 gboolean is_sort)
 {
 	GtkDialog *dialog;
 	gint response, running = 1;
@@ -682,32 +689,38 @@ e_table_proxy_etable_available_new (ETableModel *store)
 }
 
 static void
-config_button_fields (GtkWidget *widget, ETableConfig *config)
+config_button_fields (GtkWidget *widget,
+                      ETableConfig *config)
 {
 	do_fields_config_dialog (config);
 }
 
 static void
-config_button_sort (GtkWidget *widget, ETableConfig *config)
+config_button_sort (GtkWidget *widget,
+                    ETableConfig *config)
 {
 	do_sort_and_group_config_dialog (config, TRUE);
 }
 
 static void
-config_button_group (GtkWidget *widget, ETableConfig *config)
+config_button_group (GtkWidget *widget,
+                     ETableConfig *config)
 {
 	do_sort_and_group_config_dialog (config, FALSE);
 }
 
 static void
-dialog_destroyed (gpointer data, GObject *where_object_was)
+dialog_destroyed (gpointer data,
+                  GObject *where_object_was)
 {
 	ETableConfig *config = data;
 	g_object_unref (config);
 }
 
 static void
-dialog_response (GtkWidget *dialog, gint response_id, ETableConfig *config)
+dialog_response (GtkWidget *dialog,
+                 gint response_id,
+                 ETableConfig *config)
 {
 	if (response_id == GTK_RESPONSE_APPLY
 	    || response_id == GTK_RESPONSE_OK) {
@@ -760,14 +773,13 @@ connect_button (ETableConfig *config,
 {
 	GtkWidget *button = e_builder_get_widget (builder, widget_name);
 
-	if (button) {
-		g_signal_connect (G_OBJECT (button), "clicked",
-				  cback, config);
-	}
+	if (button)
+		g_signal_connect (button, "clicked", cback, config);
 }
 
 static gint
-get_source_model_col_index (ETableConfig *config, gint idx)
+get_source_model_col_index (ETableConfig *config,
+                            gint idx)
 {
 	gint visible_index;
 	ETableModel *src_model;
@@ -781,7 +793,8 @@ get_source_model_col_index (ETableConfig *config, gint idx)
 }
 
 static void
-sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort)
+sort_combo_changed (GtkComboBox *combo_box,
+                    ETableConfigSortWidgets *sort)
 {
 	ETableConfig *config = sort->e_table_config;
 	ETableSortInfo *sort_info = config->temp_state->sort_info;
@@ -819,7 +832,8 @@ sort_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *sort)
 }
 
 static void
-sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort)
+sort_ascending_toggled (GtkToggleButton *t,
+                        ETableConfigSortWidgets *sort)
 {
 	ETableConfig *config = sort->e_table_config;
 	ETableSortInfo *si = config->temp_state->sort_info;
@@ -833,7 +847,8 @@ sort_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *sort)
 }
 
 static void
-configure_sort_dialog (ETableConfig *config, GtkBuilder *builder)
+configure_sort_dialog (ETableConfig *config,
+                       GtkBuilder *builder)
 {
 	GSList *l;
 	gint i;
@@ -904,7 +919,8 @@ configure_sort_dialog (ETableConfig *config, GtkBuilder *builder)
 }
 
 static void
-group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group)
+group_combo_changed (GtkComboBox *combo_box,
+                     ETableConfigSortWidgets *group)
 {
 	ETableConfig *config = group->e_table_config;
 	ETableSortInfo *sort_info = config->temp_state->sort_info;
@@ -942,7 +958,8 @@ group_combo_changed (GtkComboBox *combo_box, ETableConfigSortWidgets *group)
 }
 
 static void
-group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group)
+group_ascending_toggled (GtkToggleButton *t,
+                         ETableConfigSortWidgets *group)
 {
 	ETableConfig *config = group->e_table_config;
 	ETableSortInfo *si = config->temp_state->sort_info;
@@ -956,7 +973,8 @@ group_ascending_toggled (GtkToggleButton *t, ETableConfigSortWidgets *group)
 }
 
 static void
-configure_group_dialog (ETableConfig *config, GtkBuilder *builder)
+configure_group_dialog (ETableConfig *config,
+                        GtkBuilder *builder)
 {
 	GSList *l;
 	gint i;
@@ -1027,14 +1045,16 @@ configure_group_dialog (ETableConfig *config, GtkBuilder *builder)
 }
 
 static void
-add_column (gint model_row, gpointer closure)
+add_column (gint model_row,
+            gpointer closure)
 {
 	GList **columns = closure;
 	*columns = g_list_prepend (*columns, GINT_TO_POINTER (model_row));
 }
 
 static void
-config_button_add (GtkWidget *widget, ETableConfig *config)
+config_button_add (GtkWidget *widget,
+                   ETableConfig *config)
 {
 	GList *columns = NULL;
 	GList *column;
@@ -1070,7 +1090,8 @@ config_button_add (GtkWidget *widget, ETableConfig *config)
 }
 
 static void
-config_button_remove (GtkWidget *widget, ETableConfig *config)
+config_button_remove (GtkWidget *widget,
+                      ETableConfig *config)
 {
 	GList *columns = NULL;
 	GList *column;
@@ -1103,7 +1124,8 @@ config_button_remove (GtkWidget *widget, ETableConfig *config)
 }
 
 static void
-config_button_up (GtkWidget *widget, ETableConfig *config)
+config_button_up (GtkWidget *widget,
+                  ETableConfig *config)
 {
 	GList *columns = NULL;
 	GList *column;
@@ -1158,7 +1180,8 @@ config_button_up (GtkWidget *widget, ETableConfig *config)
 }
 
 static void
-config_button_down (GtkWidget *widget, ETableConfig *config)
+config_button_down (GtkWidget *widget,
+                    ETableConfig *config)
 {
 	GList *columns = NULL;
 	GList *column;
@@ -1211,7 +1234,8 @@ config_button_down (GtkWidget *widget, ETableConfig *config)
 }
 
 static void
-configure_fields_dialog (ETableConfig *config, GtkBuilder *builder)
+configure_fields_dialog (ETableConfig *config,
+                         GtkBuilder *builder)
 {
 	GtkWidget *scrolled;
 	GtkWidget *etable;
@@ -1341,11 +1365,11 @@ e_table_config_init (ETableConfig *config)
 }
 
 ETableConfig *
-e_table_config_construct (ETableConfig        *config,
-			  const gchar          *header,
-			  ETableSpecification *spec,
-			  ETableState         *state,
-			  GtkWindow           *parent_window)
+e_table_config_construct (ETableConfig *config,
+                          const gchar *header,
+                          ETableSpecification *spec,
+                          ETableState *state,
+                          GtkWindow *parent_window)
 {
 	ETableColumnSpecification **column;
 
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index b07651a22c..f3e55cf8cf 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -156,7 +156,9 @@ e_string_search (gconstpointer haystack,
 }
 
 static gint
-e_table_str_case_compare (gconstpointer x, gconstpointer y, gpointer cmp_cache)
+e_table_str_case_compare (gconstpointer x,
+                          gconstpointer y,
+                          gpointer cmp_cache)
 {
 	const gchar *cx = NULL, *cy = NULL;
 
@@ -190,7 +192,9 @@ e_table_str_case_compare (gconstpointer x, gconstpointer y, gpointer cmp_cache)
 }
 
 static gint
-e_table_collate_compare (gconstpointer x, gconstpointer y, gpointer cmp_cache)
+e_table_collate_compare (gconstpointer x,
+                         gconstpointer y,
+                         gpointer cmp_cache)
 {
 	const gchar *cx = NULL, *cy = NULL;
 
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index b4ac8e53ef..354095b0c8 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -32,8 +32,8 @@
 
 #include "e-table-field-chooser-dialog.h"
 
-static void e_table_field_chooser_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_table_field_chooser_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void e_table_field_chooser_dialog_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
+static void e_table_field_chooser_dialog_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_dialog_dispose (GObject *object);
 static void e_table_field_chooser_dialog_response (GtkDialog *dialog, gint id);
 
@@ -53,7 +53,7 @@ e_table_field_chooser_dialog_class_init (ETableFieldChooserDialogClass *class)
 	GObjectClass *object_class;
 	GtkDialogClass *dialog_class;
 
-	object_class = (GObjectClass*) class;
+	object_class = (GObjectClass *) class;
 	dialog_class = GTK_DIALOG_CLASS (class);
 
 	object_class->dispose      = e_table_field_chooser_dialog_dispose;
@@ -119,7 +119,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
 	gtk_window_set_title (GTK_WINDOW (dialog), _("Add a Column"));
 }
 
-GtkWidget*
+GtkWidget *
 e_table_field_chooser_dialog_new (void)
 {
 	return g_object_new (E_TYPE_TABLE_FIELD_CHOOSER_DIALOG, NULL);
@@ -146,10 +146,13 @@ e_table_field_chooser_dialog_dispose (GObject *object)
 }
 
 static void
-e_table_field_chooser_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+e_table_field_chooser_dialog_set_property (GObject *object,
+                                           guint property_id,
+                                           const GValue *value,
+                                           GParamSpec *pspec)
 {
 	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG (object);
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_DND_CODE:
 		g_free (etfcd->dnd_code);
 		etfcd->dnd_code = g_strdup (g_value_get_string (value));
@@ -192,10 +195,13 @@ e_table_field_chooser_dialog_set_property (GObject *object, guint prop_id, const
 }
 
 static void
-e_table_field_chooser_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+e_table_field_chooser_dialog_get_property (GObject *object,
+                                           guint property_id,
+                                           GValue *value,
+                                           GParamSpec *pspec)
 {
 	ETableFieldChooserDialog *etfcd = E_TABLE_FIELD_CHOOSER_DIALOG (object);
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_DND_CODE:
 		g_value_set_string (value, etfcd->dnd_code);
 		break;
@@ -206,13 +212,14 @@ e_table_field_chooser_dialog_get_property (GObject *object, guint prop_id, GValu
 		g_value_set_object (value, etfcd->header);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
 
 static void
-e_table_field_chooser_dialog_response (GtkDialog *dialog, gint id)
+e_table_field_chooser_dialog_response (GtkDialog *dialog,
+                                       gint id)
 {
 	if (id == GTK_RESPONSE_OK)
 		gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index e2dc6f1721..ecc414853c 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -89,7 +89,8 @@ etfci_dispose (GObject *object)
 }
 
 static gint
-etfci_find_button (ETableFieldChooserItem *etfci, gdouble loc)
+etfci_find_button (ETableFieldChooserItem *etfci,
+                   gdouble loc)
 {
 	gint i;
 	gint count;
@@ -148,7 +149,8 @@ etfci_rebuild_combined (ETableFieldChooserItem *etfci)
 }
 
 static void
-etfci_reflow (GnomeCanvasItem *item, gint flags)
+etfci_reflow (GnomeCanvasItem *item,
+              gint flags)
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
 	gdouble old_height;
@@ -345,7 +347,7 @@ etfci_add_table_header (ETableFieldChooserItem *etfci,
 
 static void
 etfci_set_property (GObject *object,
-                    guint prop_id,
+                    guint property_id,
                     const GValue *value,
                     GParamSpec *pspec)
 {
@@ -355,7 +357,7 @@ etfci_set_property (GObject *object,
 	item = GNOME_CANVAS_ITEM (object);
 	etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FULL_HEADER:
 		etfci_drop_full_header (etfci);
 		if (g_value_get_object (value))
@@ -385,13 +387,16 @@ etfci_set_property (GObject *object,
 }
 
 static void
-etfci_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etfci_get_property (GObject *object,
+                    guint property_id,
+                    GValue *value,
+                    GParamSpec *pspec)
 {
 	ETableFieldChooserItem *etfci;
 
 	etfci = E_TABLE_FIELD_CHOOSER_ITEM (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 
 	case PROP_DND_CODE:
 		g_value_set_string (value, etfci->dnd_code);
@@ -403,18 +408,18 @@ etfci_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *p
 		g_value_set_double (value, etfci->height);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
 
 static void
-etfci_drag_data_get (GtkWidget          *widget,
-		     GdkDragContext     *context,
-		     GtkSelectionData   *selection_data,
-		     guint               info,
-		     guint               time,
-		     ETableFieldChooserItem *etfci)
+etfci_drag_data_get (GtkWidget *widget,
+                     GdkDragContext *context,
+                     GtkSelectionData *selection_data,
+                     guint info,
+                     guint time,
+                     ETableFieldChooserItem *etfci)
 {
 	if (etfci->drag_col != -1) {
 		gchar *string = g_strdup_printf("%d", etfci->drag_col);
@@ -428,9 +433,9 @@ etfci_drag_data_get (GtkWidget          *widget,
 }
 
 static void
-etfci_drag_end (GtkWidget      *canvas,
-		GdkDragContext *context,
-		ETableFieldChooserItem *etfci)
+etfci_drag_end (GtkWidget *canvas,
+                GdkDragContext *context,
+                ETableFieldChooserItem *etfci)
 {
 	etfci->drag_col = -1;
 }
@@ -529,13 +534,19 @@ etfci_draw (GnomeCanvasItem *item,
 }
 
 static GnomeCanvasItem *
-etfci_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy)
+etfci_point (GnomeCanvasItem *item,
+             gdouble x,
+             gdouble y,
+             gint cx,
+             gint cy)
 {
 	return item;
 }
 
 static gboolean
-etfci_maybe_start_drag (ETableFieldChooserItem *etfci, gint x, gint y)
+etfci_maybe_start_drag (ETableFieldChooserItem *etfci,
+                        gint x,
+                        gint y)
 {
 	if (!etfci->maybe_drag)
 		return FALSE;
@@ -548,7 +559,10 @@ etfci_maybe_start_drag (ETableFieldChooserItem *etfci, gint x, gint y)
 }
 
 static void
-etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdouble y)
+etfci_start_drag (ETableFieldChooserItem *etfci,
+                  GdkEvent *event,
+                  gdouble x,
+                  gdouble y)
 {
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
 	GtkTargetList *list;
@@ -622,7 +636,8 @@ etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdo
  * Handles the events on the ETableFieldChooserItem
  */
 static gint
-etfci_event (GnomeCanvasItem *item, GdkEvent *e)
+etfci_event (GnomeCanvasItem *item,
+             GdkEvent *e)
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
 	GnomeCanvas *canvas = item->canvas;
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
index 066dd52ffb..f08b94ac6f 100644
--- a/widgets/table/e-table-field-chooser-item.h
+++ b/widgets/table/e-table-field-chooser-item.h
@@ -74,7 +74,7 @@ struct _ETableFieldChooserItem {
 	/*
 	 * For dragging columns
 	 */
-	guint            maybe_drag:1;
+	guint            maybe_drag : 1;
 	gint              click_x, click_y;
 	gint              drag_col;
 	guint            drag_data_get_id;
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 2f945bb079..5e2cb13880 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -36,8 +36,8 @@
 #include "e-table-field-chooser.h"
 #include "e-table-field-chooser-item.h"
 
-static void e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void e_table_field_chooser_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec);
+static void e_table_field_chooser_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec);
 static void e_table_field_chooser_dispose (GObject *object);
 
 /* The arguments we take */
@@ -55,7 +55,7 @@ e_table_field_chooser_class_init (ETableFieldChooserClass *class)
 {
 	GObjectClass *object_class;
 
-	object_class = (GObjectClass*) class;
+	object_class = (GObjectClass *) class;
 
 	object_class->set_property = e_table_field_chooser_set_property;
 	object_class->get_property = e_table_field_chooser_get_property;
@@ -202,7 +202,7 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
 					   "dnd_code", etfc->dnd_code,
 					   NULL );
 
-	g_signal_connect( etfc->canvas, "reflow",
+	g_signal_connect ( etfc->canvas, "reflow",
 			  G_CALLBACK ( resize ),
 			  etfc);
 
@@ -238,18 +238,21 @@ e_table_field_chooser_dispose (GObject *object)
 	G_OBJECT_CLASS (e_table_field_chooser_parent_class)->dispose (object);
 }
 
-GtkWidget*
+GtkWidget *
 e_table_field_chooser_new (void)
 {
 	return g_object_new (E_TYPE_TABLE_FIELD_CHOOSER, NULL);
 }
 
 static void
-e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+e_table_field_chooser_set_property (GObject *object,
+                                    guint property_id,
+                                    const GValue *value,
+                                    GParamSpec *pspec)
 {
 	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_DND_CODE:
 		g_free (etfc->dnd_code);
 		etfc->dnd_code = g_strdup (g_value_get_string (value));
@@ -292,11 +295,14 @@ e_table_field_chooser_set_property (GObject *object, guint prop_id, const GValue
 }
 
 static void
-e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+e_table_field_chooser_get_property (GObject *object,
+                                    guint property_id,
+                                    GValue *value,
+                                    GParamSpec *pspec)
 {
 	ETableFieldChooser *etfc = E_TABLE_FIELD_CHOOSER (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_DND_CODE:
 		g_value_set_string (value, etfc->dnd_code);
 		break;
@@ -307,7 +313,7 @@ e_table_field_chooser_get_property (GObject *object, guint prop_id, GValue *valu
 		g_value_set_object (value, etfc->header);
 		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/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 0a933769f9..d874834db1 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -68,8 +68,8 @@ static EPrintable *
 etgc_get_printable (ETableGroup *etg);
 
 static void
-e_table_group_container_child_node_free (ETableGroupContainer          *etgc,
-					ETableGroupContainerChildNode *child_node)
+e_table_group_container_child_node_free (ETableGroupContainer *etgc,
+                                         ETableGroupContainerChildNode *child_node)
 {
 	ETableGroup *etg = E_TABLE_GROUP (etgc);
 	ETableGroup *child = child_node->child;
@@ -141,10 +141,13 @@ etgc_dispose (GObject *object)
  * This routine constructs the new %ETableGroupContainer.
  */
 void
-e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
-				   ETableHeader *full_header,
-				   ETableHeader     *header,
-				   ETableModel *model, ETableSortInfo *sort_info, gint n)
+e_table_group_container_construct (GnomeCanvasGroup *parent,
+                                   ETableGroupContainer *etgc,
+                                   ETableHeader *full_header,
+                                   ETableHeader *header,
+                                   ETableModel *model,
+                                   ETableSortInfo *sort_info,
+                                   gint n)
 {
 	ETableCol *col;
 	ETableSortColumn column = e_table_sort_info_grouping_get_nth (sort_info, n);
@@ -186,9 +189,12 @@ e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContaine
  * Returns: The new %ETableGroupContainer.
  */
 ETableGroup *
-e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header,
-			     ETableHeader     *header,
-			     ETableModel *model, ETableSortInfo *sort_info, gint n)
+e_table_group_container_new (GnomeCanvasGroup *parent,
+                             ETableHeader *full_header,
+                             ETableHeader *header,
+                             ETableModel *model,
+                             ETableSortInfo *sort_info,
+                             gint n)
 {
 	ETableGroupContainer *etgc;
 
@@ -202,7 +208,8 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header
 }
 
 static gint
-etgc_event (GnomeCanvasItem *item, GdkEvent *event)
+etgc_event (GnomeCanvasItem *item,
+            GdkEvent *event)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (item);
 	gboolean return_val = TRUE;
@@ -338,17 +345,18 @@ etgc_unrealize (GnomeCanvasItem *item)
 }
 
 static void
-compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_node)
+compute_text (ETableGroupContainer *etgc,
+              ETableGroupContainerChildNode *child_node)
 {
 	gchar *text;
 
 	if (etgc->ecol->text) {
 		/* Translators: This text is used as a special row when an ETable
-		   has turned on grouping on a column, which has set a title.
-		   The first %s is replaced with a column title.
-		   The second %s is replaced with an actual  group value.
-		   Finally the %d is replaced with count of items in this group.
-		   Example: "Family name: Smith (13 items)"
+		 * has turned on grouping on a column, which has set a title.
+		 * The first %s is replaced with a column title.
+		 * The second %s is replaced with an actual  group value.
+		 * Finally the %d is replaced with count of items in this group.
+		 * Example: "Family name: Smith (13 items)"
 		*/
 		text = g_strdup_printf (ngettext("%s: %s (%d item)",
 						 "%s: %s (%d items)",
@@ -357,10 +365,10 @@ compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_n
 					(gint) child_node->count);
 	} else {
 		/* Translators: This text is used as a special row when an ETable
-		   has turned on grouping on a column, which doesn't have set a title.
-		   The %s is replaced with an actual group value.
-		   The %d is replaced with count of items in this group.
-		   Example: "Smith (13 items)"
+		 * has turned on grouping on a column, which doesn't have set a title.
+		 * The %s is replaced with an actual group value.
+		 * The %d is replaced with count of items in this group.
+		 * Example: "Smith (13 items)"
 		*/
 		text = g_strdup_printf (ngettext("%s (%d item)",
 						 "%s (%d items)",
@@ -375,56 +383,74 @@ compute_text (ETableGroupContainer *etgc, ETableGroupContainerChildNode *child_n
 }
 
 static void
-child_cursor_change (ETableGroup *etg, gint row,
-		    ETableGroupContainer *etgc)
+child_cursor_change (ETableGroup *etg,
+                     gint row,
+                     ETableGroupContainer *etgc)
 {
 	e_table_group_cursor_change (E_TABLE_GROUP (etgc), row);
 }
 
 static void
-child_cursor_activated (ETableGroup *etg, gint row,
-		    ETableGroupContainer *etgc)
+child_cursor_activated (ETableGroup *etg,
+                        gint row,
+                        ETableGroupContainer *etgc)
 {
 	e_table_group_cursor_activated (E_TABLE_GROUP (etgc), row);
 }
 
 static void
-child_double_click (ETableGroup *etg, gint row, gint col, GdkEvent *event,
-		    ETableGroupContainer *etgc)
+child_double_click (ETableGroup *etg,
+                    gint row,
+                    gint col,
+                    GdkEvent *event,
+                    ETableGroupContainer *etgc)
 {
 	e_table_group_double_click (E_TABLE_GROUP (etgc), row, col, event);
 }
 
 static gboolean
-child_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event,
-		   ETableGroupContainer *etgc)
+child_right_click (ETableGroup *etg,
+                   gint row,
+                   gint col,
+                   GdkEvent *event,
+                   ETableGroupContainer *etgc)
 {
 	return e_table_group_right_click (E_TABLE_GROUP (etgc), row, col, event);
 }
 
 static gboolean
-child_click (ETableGroup *etg, gint row, gint col, GdkEvent *event,
-		   ETableGroupContainer *etgc)
+child_click (ETableGroup *etg,
+             gint row,
+             gint col,
+             GdkEvent *event,
+             ETableGroupContainer *etgc)
 {
 	return e_table_group_click (E_TABLE_GROUP (etgc), row, col, event);
 }
 
 static gboolean
-child_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event,
-		 ETableGroupContainer *etgc)
+child_key_press (ETableGroup *etg,
+                 gint row,
+                 gint col,
+                 GdkEvent *event,
+                 ETableGroupContainer *etgc)
 {
 	return e_table_group_key_press (E_TABLE_GROUP (etgc), row, col, event);
 }
 
 static gboolean
-child_start_drag (ETableGroup *etg, gint row, gint col, GdkEvent *event,
-		 ETableGroupContainer *etgc)
+child_start_drag (ETableGroup *etg,
+                  gint row,
+                  gint col,
+                  GdkEvent *event,
+                  ETableGroupContainer *etgc)
 {
 	return e_table_group_start_drag (E_TABLE_GROUP (etgc), row, col, event);
 }
 
 static ETableGroupContainerChildNode *
-create_child_node (ETableGroupContainer *etgc, gpointer val)
+create_child_node (ETableGroupContainer *etgc,
+                   gpointer val)
 {
 	ETableGroup *child;
 	ETableGroupContainerChildNode *child_node;
@@ -478,7 +504,8 @@ create_child_node (ETableGroupContainer *etgc, gpointer val)
 }
 
 static void
-etgc_add (ETableGroup *etg, gint row)
+etgc_add (ETableGroup *etg,
+          gint row)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	gpointer val = e_table_model_value_at (etg->model, etgc->ecol->col_idx, row);
@@ -522,7 +549,9 @@ etgc_add (ETableGroup *etg, gint row)
 }
 
 static void
-etgc_add_array (ETableGroup *etg, const gint *array, gint count)
+etgc_add_array (ETableGroup *etg,
+                const gint *array,
+                gint count)
 {
 	gint i;
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
@@ -589,7 +618,8 @@ etgc_add_all (ETableGroup *etg)
 }
 
 static gboolean
-etgc_remove (ETableGroup *etg, gint row)
+etgc_remove (ETableGroup *etg,
+             gint row)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	GList *list;
@@ -630,7 +660,9 @@ etgc_row_count (ETableGroup *etg)
 }
 
 static void
-etgc_increment (ETableGroup *etg, gint position, gint amount)
+etgc_increment (ETableGroup *etg,
+                gint position,
+                gint amount)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	GList *list;
@@ -641,7 +673,9 @@ etgc_increment (ETableGroup *etg, gint position, gint amount)
 }
 
 static void
-etgc_decrement (ETableGroup *etg, gint position, gint amount)
+etgc_decrement (ETableGroup *etg,
+                gint position,
+                gint amount)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	GList *list;
@@ -652,7 +686,9 @@ etgc_decrement (ETableGroup *etg, gint position, gint amount)
 }
 
 static void
-etgc_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
+etgc_set_focus (ETableGroup *etg,
+                EFocus direction,
+                gint view_col)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 	if (etgc->children) {
@@ -683,7 +719,11 @@ etgc_get_focus_column (ETableGroup *etg)
 }
 
 static void
-etgc_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col)
+etgc_compute_location (ETableGroup *etg,
+                       gint *x,
+                       gint *y,
+                       gint *row,
+                       gint *col)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 
@@ -709,7 +749,9 @@ etgc_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col)
 }
 
 static void
-etgc_get_mouse_over (ETableGroup *etg, gint *row, gint *col)
+etgc_get_mouse_over (ETableGroup *etg,
+                     gint *row,
+                     gint *col)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 
@@ -740,7 +782,13 @@ etgc_get_mouse_over (ETableGroup *etg, gint *row, gint *col)
 }
 
 static void
-etgc_get_cell_geometry (ETableGroup *etg, gint *row, gint *col, gint *x, gint *y, gint *width, gint *height)
+etgc_get_cell_geometry (ETableGroup *etg,
+                        gint *row,
+                        gint *col,
+                        gint *x,
+                        gint *y,
+                        gint *width,
+                        gint *height)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
 
@@ -773,13 +821,16 @@ static void etgc_thaw (ETableGroup *etg)
 }
 
 static void
-etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+etgc_set_property (GObject *object,
+                   guint property_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
 {
 	ETableGroup *etg = E_TABLE_GROUP (object);
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
 	GList *list;
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FROZEN:
 		if (g_value_get_boolean (value))
 			etg->frozen = TRUE;
@@ -887,12 +938,15 @@ etgc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 }
 
 static void
-etgc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etgc_get_property (GObject *object,
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
 	ETableGroup *etg = E_TABLE_GROUP (object);
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FROZEN:
 		g_value_set_boolean (value, etg->frozen);
 		break;
@@ -909,7 +963,7 @@ etgc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 		g_value_set_boolean (value, etgc->uniform_row_height);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -1029,7 +1083,8 @@ etgc_class_init (ETableGroupContainerClass *class)
 }
 
 static void
-etgc_reflow (GnomeCanvasItem *item, gint flags)
+etgc_reflow (GnomeCanvasItem *item,
+             gint flags)
 {
 	ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (item);
 	gboolean frozen;
@@ -1136,7 +1191,9 @@ etgc_init (ETableGroupContainer *container)
 }
 
 void
-e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, gpointer closure)
+e_table_group_apply_to_leafs (ETableGroup *etg,
+                              ETableGroupLeafFn fn,
+                              gpointer closure)
 {
 	if (E_IS_TABLE_GROUP_CONTAINER (etg)) {
 		ETableGroupContainer *etgc = E_TABLE_GROUP_CONTAINER (etg);
@@ -1170,7 +1227,11 @@ typedef struct {
 
 #if 0
 static gint
-gp_draw_rect (GtkPrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height)
+gp_draw_rect (GtkPrintContext *context,
+              gdouble x,
+              gdouble y,
+              gdouble width,
+              gdouble height)
 {
 	cairo_t *cr;
 	cr = gtk_print_context_get_cairo_context (context);
@@ -1184,12 +1245,12 @@ gp_draw_rect (GtkPrintContext *context, gdouble x, gdouble y, gdouble width, gdo
 #define TEXT_AREA_HEIGHT (TEXT_HEIGHT + 4)
 
 static void
-e_table_group_container_print_page  (EPrintable *ep,
-				     GtkPrintContext *context,
-				     gdouble width,
-				     gdouble height,
-				     gboolean quantize,
-				     ETGCPrintContext *groupcontext)
+e_table_group_container_print_page (EPrintable *ep,
+                                    GtkPrintContext *context,
+                                    gdouble width,
+                                    gdouble height,
+                                    gboolean quantize,
+                                    ETGCPrintContext *groupcontext)
 {
 	cairo_t *cr;
 	GtkPageSetup *setup;
@@ -1283,7 +1344,7 @@ e_table_group_container_print_page  (EPrintable *ep,
 		cairo_rectangle (cr, 0, child_margin, width - 2 * TEXT_AREA_HEIGHT, child_height + child_margin + 20);
 		cairo_clip (cr);
 
-		e_printable_print_page (child_printable, context, width-2 * TEXT_AREA_HEIGHT, child_margin, quantize);
+		e_printable_print_page (child_printable, context, width - 2 * TEXT_AREA_HEIGHT, child_margin, quantize);
 		yd -= child_height + TEXT_AREA_HEIGHT;
 
 		if (e_printable_data_left (child_printable)) {
@@ -1319,16 +1380,16 @@ e_table_group_container_print_page  (EPrintable *ep,
 }
 
 static gboolean
-e_table_group_container_data_left   (EPrintable *ep,
-				     ETGCPrintContext *groupcontext)
+e_table_group_container_data_left (EPrintable *ep,
+                                     ETGCPrintContext *groupcontext)
 {
 	g_signal_stop_emission_by_name(ep, "data_left");
 	return groupcontext->child != NULL;
 }
 
 static void
-e_table_group_container_reset       (EPrintable *ep,
-				     ETGCPrintContext *groupcontext)
+e_table_group_container_reset (EPrintable *ep,
+                               ETGCPrintContext *groupcontext)
 {
 	groupcontext->child = groupcontext->etgc->children;
 	if (groupcontext->child_printable)
@@ -1337,12 +1398,12 @@ e_table_group_container_reset       (EPrintable *ep,
 }
 
 static gdouble
-e_table_group_container_height      (EPrintable *ep,
-				     GtkPrintContext *context,
-				     gdouble width,
-				     gdouble max_height,
-				     gboolean quantize,
-				     ETGCPrintContext *groupcontext)
+e_table_group_container_height (EPrintable *ep,
+                                GtkPrintContext *context,
+                                gdouble width,
+                                gdouble max_height,
+                                gboolean quantize,
+                                ETGCPrintContext *groupcontext)
 {
 	gdouble height = 0;
 	gdouble child_height;
@@ -1405,12 +1466,12 @@ e_table_group_container_height      (EPrintable *ep,
 }
 
 static gboolean
-e_table_group_container_will_fit      (EPrintable *ep,
-				       GtkPrintContext *context,
-				       gdouble width,
-				       gdouble max_height,
-				       gboolean quantize,
-				       ETGCPrintContext *groupcontext)
+e_table_group_container_will_fit (EPrintable *ep,
+                                  GtkPrintContext *context,
+                                  gdouble width,
+                                  gdouble max_height,
+                                  gboolean quantize,
+                                  ETGCPrintContext *groupcontext)
 {
 	gboolean will_fit = TRUE;
 	gdouble child_height;
@@ -1476,7 +1537,7 @@ e_table_group_container_will_fit      (EPrintable *ep,
 
 static void
 e_table_group_container_printable_destroy (gpointer data,
-					   GObject *where_object_was)
+                                           GObject *where_object_was)
 
 {
 	ETGCPrintContext *groupcontext = data;
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index 5ea0910ef0..ac5f7c9033 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -95,7 +95,7 @@ struct _ETableGroupContainer {
 	/*
 	 * State: the ETableGroup is open or closed
 	 */
-	guint open:1;
+	guint open : 1;
 };
 
 struct _ETableGroupContainerClass {
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index bf4f1553aa..27a62bbb16 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -114,11 +114,11 @@ etgl_dispose (GObject *object)
 
 static void
 e_table_group_leaf_construct (GnomeCanvasGroup *parent,
-                              ETableGroupLeaf  *etgl,
-                              ETableHeader     *full_header,
-                              ETableHeader     *header,
-                              ETableModel      *model,
-                              ETableSortInfo   *sort_info)
+                              ETableGroupLeaf *etgl,
+                              ETableHeader *full_header,
+                              ETableHeader *header,
+                              ETableModel *model,
+                              ETableSortInfo *sort_info)
 {
 	etgl->is_grouped =
 		(e_table_sort_info_grouping_get_count (sort_info) > 0);
@@ -262,7 +262,8 @@ etgl_click (GObject *object,
 }
 
 static void
-etgl_reflow (GnomeCanvasItem *item, gint flags)
+etgl_reflow (GnomeCanvasItem *item,
+             gint flags)
 {
 	ETableGroupLeaf *leaf = E_TABLE_GROUP_LEAF (item);
 
@@ -330,7 +331,8 @@ etgl_realize (GnomeCanvasItem *item)
 }
 
 static void
-etgl_add (ETableGroup *etg, gint row)
+etgl_add (ETableGroup *etg,
+          gint row)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -341,7 +343,9 @@ etgl_add (ETableGroup *etg, gint row)
 }
 
 static void
-etgl_add_array (ETableGroup *etg, const gint *array, gint count)
+etgl_add_array (ETableGroup *etg,
+                const gint *array,
+                gint count)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -363,7 +367,8 @@ etgl_add_all (ETableGroup *etg)
 }
 
 static gboolean
-etgl_remove (ETableGroup *etg, gint row)
+etgl_remove (ETableGroup *etg,
+             gint row)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -375,7 +380,9 @@ etgl_remove (ETableGroup *etg, gint row)
 }
 
 static void
-etgl_increment (ETableGroup *etg, gint position, gint amount)
+etgl_increment (ETableGroup *etg,
+                gint position,
+                gint amount)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -387,7 +394,9 @@ etgl_increment (ETableGroup *etg, gint position, gint amount)
 }
 
 static void
-etgl_decrement (ETableGroup *etg, gint position, gint amount)
+etgl_decrement (ETableGroup *etg,
+                gint position,
+                gint amount)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -407,7 +416,9 @@ etgl_row_count (ETableGroup *etg)
 }
 
 static void
-etgl_set_focus (ETableGroup *etg, EFocus direction, gint view_col)
+etgl_set_focus (ETableGroup *etg,
+                EFocus direction,
+                gint view_col)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -437,7 +448,11 @@ etgl_get_printable (ETableGroup *etg)
 }
 
 static void
-etgl_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col)
+etgl_compute_location (ETableGroup *etg,
+                       gint *x,
+                       gint *y,
+                       gint *row,
+                       gint *col)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -445,7 +460,9 @@ etgl_compute_location (ETableGroup *etg, gint *x, gint *y, gint *row, gint *col)
 }
 
 static void
-etgl_get_mouse_over (ETableGroup *etg, gint *row, gint *col)
+etgl_get_mouse_over (ETableGroup *etg,
+                     gint *row,
+                     gint *col)
 {
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (etg);
 
@@ -473,14 +490,14 @@ etgl_get_cell_geometry (ETableGroup *etg,
 
 static void
 etgl_set_property (GObject *object,
-                   guint prop_id,
+                   guint property_id,
                    const GValue *value,
                    GParamSpec *pspec)
 {
 	ETableGroup *etg = E_TABLE_GROUP (object);
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FROZEN:
 		etg->frozen = g_value_get_boolean (value);
 		break;
@@ -574,12 +591,15 @@ etgl_set_property (GObject *object,
 }
 
 static void
-etgl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etgl_get_property (GObject *object,
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
 	ETableGroup *etg = E_TABLE_GROUP (object);
 	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FROZEN:
 		g_value_set_boolean (value, etg->frozen);
 		break;
@@ -595,7 +615,7 @@ etgl_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 	case PROP_UNIFORM_ROW_HEIGHT:
 		g_value_set_boolean (value, etgl->uniform_row_height);
 	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/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 8fd56bc7b1..8d820f861a 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -99,11 +99,11 @@ etg_dispose (GObject *object)
  */
 ETableGroup *
 e_table_group_new (GnomeCanvasGroup *parent,
-		   ETableHeader     *full_header,
-		   ETableHeader     *header,
-		   ETableModel      *model,
-		   ETableSortInfo   *sort_info,
-		   gint               n)
+                   ETableHeader *full_header,
+                   ETableHeader *header,
+                   ETableModel *model,
+                   ETableSortInfo *sort_info,
+                   gint n)
 {
 	g_return_val_if_fail (model != NULL, NULL);
 
@@ -128,10 +128,10 @@ e_table_group_new (GnomeCanvasGroup *parent,
  */
 void
 e_table_group_construct (GnomeCanvasGroup *parent,
-			 ETableGroup      *etg,
-			 ETableHeader     *full_header,
-			 ETableHeader     *header,
-			 ETableModel      *model)
+                         ETableGroup *etg,
+                         ETableHeader *full_header,
+                         ETableHeader *header,
+                         ETableModel *model)
 {
 	etg->full_header = full_header;
 	g_object_ref (etg->full_header);
@@ -139,9 +139,7 @@ e_table_group_construct (GnomeCanvasGroup *parent,
 	g_object_ref (etg->header);
 	etg->model = model;
 	g_object_ref (etg->model);
-	g_object_set (G_OBJECT (etg),
-		"parent", parent,
-		NULL);
+	g_object_set (etg, "parent", parent, NULL);
 }
 
 /**
@@ -154,7 +152,7 @@ e_table_group_construct (GnomeCanvasGroup *parent,
  */
 void
 e_table_group_add (ETableGroup *etg,
-		   gint row)
+                   gint row)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -174,8 +172,8 @@ e_table_group_add (ETableGroup *etg,
  */
 void
 e_table_group_add_array (ETableGroup *etg,
-			 const gint *array,
-			 gint count)
+                         const gint *array,
+                         gint count)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -214,7 +212,7 @@ e_table_group_add_all (ETableGroup *etg)
  */
 gboolean
 e_table_group_remove (ETableGroup *etg,
-		      gint row)
+                      gint row)
 {
 	g_return_val_if_fail (etg != NULL, FALSE);
 	g_return_val_if_fail (E_IS_TABLE_GROUP (etg), FALSE);
@@ -235,8 +233,8 @@ e_table_group_remove (ETableGroup *etg,
  */
 void
 e_table_group_increment (ETableGroup *etg,
-			 gint position,
-			 gint amount)
+                         gint position,
+                         gint amount)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -257,8 +255,8 @@ e_table_group_increment (ETableGroup *etg,
  */
 void
 e_table_group_decrement (ETableGroup *etg,
-			 gint position,
-			 gint amount)
+                         gint position,
+                         gint amount)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -296,8 +294,8 @@ e_table_group_row_count (ETableGroup *etg)
  */
 void
 e_table_group_set_focus (ETableGroup *etg,
-			 EFocus direction,
-			 gint view_col)
+                         EFocus direction,
+                         gint view_col)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -390,7 +388,9 @@ e_table_group_compute_location (ETableGroup *etg,
 }
 
 void
-e_table_group_get_mouse_over (ETableGroup *etg, gint *row, gint *col)
+e_table_group_get_mouse_over (ETableGroup *etg,
+                              gint *row,
+                              gint *col)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -414,13 +414,13 @@ e_table_group_get_mouse_over (ETableGroup *etg, gint *row, gint *col)
  * removed from the value row points to.
  */
 void
-e_table_group_get_cell_geometry  (ETableGroup *etg,
-				  gint         *row,
-				  gint         *col,
-				  gint         *x,
-				  gint         *y,
-				  gint         *width,
-				  gint         *height)
+e_table_group_get_cell_geometry (ETableGroup *etg,
+                                 gint *row,
+                                 gint *col,
+                                 gint *x,
+                                 gint *y,
+                                 gint *width,
+                                 gint *height)
 {
 	g_return_if_fail (etg != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (etg));
@@ -437,7 +437,8 @@ e_table_group_get_cell_geometry  (ETableGroup *etg,
  * This routine emits the "cursor_change" signal.
  */
 void
-e_table_group_cursor_change (ETableGroup *e_table_group, gint row)
+e_table_group_cursor_change (ETableGroup *e_table_group,
+                             gint row)
 {
 	g_return_if_fail (e_table_group != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
@@ -455,7 +456,8 @@ e_table_group_cursor_change (ETableGroup *e_table_group, gint row)
  * This routine emits the "cursor_activated" signal.
  */
 void
-e_table_group_cursor_activated (ETableGroup *e_table_group, gint row)
+e_table_group_cursor_activated (ETableGroup *e_table_group,
+                                gint row)
 {
 	g_return_if_fail (e_table_group != NULL);
 	g_return_if_fail (E_IS_TABLE_GROUP (e_table_group));
@@ -614,7 +616,8 @@ e_table_group_get_header (ETableGroup *etg)
 }
 
 static gint
-etg_event (GnomeCanvasItem *item, GdkEvent *event)
+etg_event (GnomeCanvasItem *item,
+           GdkEvent *event)
 {
 	ETableGroup *etg = E_TABLE_GROUP (item);
 	gboolean return_val = TRUE;
@@ -638,7 +641,7 @@ etg_event (GnomeCanvasItem *item, GdkEvent *event)
 }
 
 static gboolean
-etg_get_focus (ETableGroup      *etg)
+etg_get_focus (ETableGroup *etg)
 {
 	return etg->has_focus;
 }
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 16633f967c..11d8f31f81 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -101,7 +101,8 @@ static void scroll_off (ETableHeaderItem *ethi);
 static void scroll_on (ETableHeaderItem *ethi, guint scroll_direction);
 
 static void
-ethi_dispose (GObject *object) {
+ethi_dispose (GObject *object)
+{
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (object);
 
 	ethi_drop_table_header (ethi);
@@ -223,7 +224,8 @@ ethi_update (GnomeCanvasItem *item,
 }
 
 static void
-ethi_font_set (ETableHeaderItem *ethi, PangoFontDescription *font_desc)
+ethi_font_set (ETableHeaderItem *ethi,
+               PangoFontDescription *font_desc)
 {
 	if (ethi->font_desc)
 		pango_font_description_free (ethi->font_desc);
@@ -252,19 +254,23 @@ ethi_drop_table_header (ETableHeaderItem *ethi)
 }
 
 static void
-structure_changed (ETableHeader *header, ETableHeaderItem *ethi)
+structure_changed (ETableHeader *header,
+                   ETableHeaderItem *ethi)
 {
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ethi));
 }
 
 static void
-dimension_changed (ETableHeader *header, gint col, ETableHeaderItem *ethi)
+dimension_changed (ETableHeader *header,
+                   gint col,
+                   ETableHeaderItem *ethi)
 {
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ethi));
 }
 
 static void
-ethi_add_table_header (ETableHeaderItem *ethi, ETableHeader *header)
+ethi_add_table_header (ETableHeaderItem *ethi,
+                       ETableHeader *header)
 {
 	ethi->eth = header;
 	g_object_ref (ethi->eth);
@@ -282,16 +288,17 @@ ethi_add_table_header (ETableHeaderItem *ethi, ETableHeader *header)
 }
 
 static void
-ethi_sort_info_changed (ETableSortInfo *sort_info, ETableHeaderItem *ethi)
+ethi_sort_info_changed (ETableSortInfo *sort_info,
+                        ETableHeaderItem *ethi)
 {
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (ethi));
 }
 
 static void
 ethi_set_property (GObject *object,
-		   guint prop_id,
-		   const GValue *value,
-		   GParamSpec *pspec)
+                   guint property_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
 {
 	GnomeCanvasItem *item;
 	ETableHeaderItem *ethi;
@@ -299,7 +306,7 @@ ethi_set_property (GObject *object,
 	item = GNOME_CANVAS_ITEM (object);
 	ethi = E_TABLE_HEADER_ITEM (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_TABLE_HEADER:
 		ethi_drop_table_header (ethi);
 		ethi_add_table_header (ethi, E_TABLE_HEADER (g_value_get_object (value)));
@@ -364,15 +371,15 @@ ethi_set_property (GObject *object,
 
 static void
 ethi_get_property (GObject *object,
-		   guint prop_id,
-		   GValue *value,
-		   GParamSpec *pspec)
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
 	ETableHeaderItem *ethi;
 
 	ethi = E_TABLE_HEADER_ITEM (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_FULL_HEADER:
 		g_value_set_object (value, ethi->full_header);
 		break;
@@ -380,13 +387,14 @@ ethi_get_property (GObject *object,
 		g_value_set_string (value, ethi->dnd_code);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
 
 static gint
-ethi_find_col_by_x (ETableHeaderItem *ethi, gint x)
+ethi_find_col_by_x (ETableHeaderItem *ethi,
+                    gint x)
 {
 	const gint cols = e_table_header_count (ethi->eth);
 	gint x1 = 0;
@@ -416,7 +424,8 @@ ethi_find_col_by_x (ETableHeaderItem *ethi, gint x)
 }
 
 static gint
-ethi_find_col_by_x_nearest (ETableHeaderItem *ethi, gint x)
+ethi_find_col_by_x_nearest (ETableHeaderItem *ethi,
+                            gint x)
 {
 	const gint cols = e_table_header_count (ethi->eth);
 	gint x1 = 0;
@@ -473,7 +482,9 @@ make_shaped_window_from_xpm (const gchar **xpm)
 }
 
 static void
-ethi_add_drop_marker (ETableHeaderItem *ethi, gint col, gboolean recreate)
+ethi_add_drop_marker (ETableHeaderItem *ethi,
+                      gint col,
+                      gboolean recreate)
 {
 	GnomeCanvas *canvas;
 	GtkAdjustment *adjustment;
@@ -536,7 +547,7 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		"x1", x1 + 1,
 		"y1", (gdouble) 1,
 		"x2", (gdouble) x1 + e_table_header_col_diff (
-			ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
+			ethi->eth, ethi->drag_col, ethi->drag_col + 1) - 2,
 
 		"y2", (gdouble) ethi->height - 2,
 		"fill_color_rgba", 0xFF000080,
@@ -555,7 +566,9 @@ ethi_remove_destroy_marker (ETableHeaderItem *ethi)
 
 #if 0
 static gboolean
-moved (ETableHeaderItem *ethi, guint col, guint model_col)
+moved (ETableHeaderItem *ethi,
+       guint col,
+       guint model_col)
 {
 	if (col == -1)
 		return TRUE;
@@ -667,7 +680,8 @@ scroll_timeout (gpointer data)
 }
 
 static void
-scroll_on (ETableHeaderItem *ethi, guint scroll_direction)
+scroll_on (ETableHeaderItem *ethi,
+           guint scroll_direction)
 {
 	if (ethi->scroll_idle_id == 0 || scroll_direction != ethi->scroll_direction) {
 		if (ethi->scroll_idle_id != 0)
@@ -786,13 +800,13 @@ ethi_drag_end (GtkWidget *canvas,
 
 static void
 ethi_drag_data_received (GtkWidget *canvas,
-			 GdkDragContext *drag_context,
-			 gint x,
-			 gint y,
-			 GtkSelectionData *selection_data,
-			 guint info,
-			 guint time,
-			 ETableHeaderItem *ethi)
+                         GdkDragContext *drag_context,
+                         gint x,
+                         gint y,
+                         GtkSelectionData *selection_data,
+                         guint info,
+                         guint time,
+                         ETableHeaderItem *ethi)
 {
 	const guchar *data;
 	gint found = FALSE;
@@ -836,11 +850,11 @@ ethi_drag_data_received (GtkWidget *canvas,
 
 static void
 ethi_drag_data_get (GtkWidget *canvas,
-		    GdkDragContext     *context,
-		    GtkSelectionData   *selection_data,
-		    guint               info,
-		    guint               time,
-		    ETableHeaderItem *ethi)
+                    GdkDragContext *context,
+                    GtkSelectionData *selection_data,
+                    guint info,
+                    guint time,
+                    ETableHeaderItem *ethi)
 {
 	if (ethi->drag_col != -1) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
@@ -857,11 +871,11 @@ ethi_drag_data_get (GtkWidget *canvas,
 
 static gboolean
 ethi_drag_drop (GtkWidget *canvas,
-		GdkDragContext *context,
-		gint x,
-		gint y,
-		guint time,
-		ETableHeaderItem *ethi)
+                GdkDragContext *context,
+                gint x,
+                gint y,
+                guint time,
+                ETableHeaderItem *ethi)
 {
 	gboolean successful = FALSE;
 
@@ -1059,7 +1073,11 @@ ethi_draw (GnomeCanvasItem *item,
 }
 
 static GnomeCanvasItem *
-ethi_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy)
+ethi_point (GnomeCanvasItem *item,
+            gdouble x,
+            gdouble y,
+            gint cx,
+            gint cy)
 {
 	return item;
 }
@@ -1089,7 +1107,7 @@ is_pointer_on_division (ETableHeaderItem *ethi,
 
 		total += ecol->width;
 
-		if ((total - TOLERANCE < pos)&& (pos < total + TOLERANCE)) {
+		if ((total - TOLERANCE < pos) && (pos < total + TOLERANCE)) {
 			if (return_col)
 				*return_col = col;
 			if (the_total)
@@ -1110,7 +1128,8 @@ is_pointer_on_division (ETableHeaderItem *ethi,
 #define convert(c,sx,sy,x,y) gnome_canvas_w2c (c,sx,sy,x,y)
 
 static void
-set_cursor (ETableHeaderItem *ethi, gint pos)
+set_cursor (ETableHeaderItem *ethi,
+            gint pos)
 {
 	GnomeCanvas *canvas;
 	GdkWindow *window;
@@ -1133,7 +1152,7 @@ set_cursor (ETableHeaderItem *ethi, gint pos)
 			gint c = col + 1;
 
 			/* Column is not resizable if all columns after it
-			   are also not resizable */
+			 * are also not resizable */
 			for (; c <= last_col; c++) {
 				ETableCol *ecol2;
 
@@ -1162,7 +1181,8 @@ ethi_end_resize (ETableHeaderItem *ethi)
 }
 
 static gboolean
-ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event)
+ethi_maybe_start_drag (ETableHeaderItem *ethi,
+                       GdkEventMotion *event)
 {
 	if (!ethi->maybe_drag)
 		return FALSE;
@@ -1180,7 +1200,8 @@ ethi_maybe_start_drag (ETableHeaderItem *ethi, GdkEventMotion *event)
 }
 
 static void
-ethi_start_drag (ETableHeaderItem *ethi, GdkEvent *event)
+ethi_start_drag (ETableHeaderItem *ethi,
+                 GdkEvent *event)
 {
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
 	GtkTargetList *list;
@@ -1281,7 +1302,8 @@ typedef struct {
 } EthiHeaderInfo;
 
 static void
-ethi_popup_sort_ascending (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_sort_ascending (GtkWidget *widget,
+                           EthiHeaderInfo *info)
 {
 	ETableCol *col;
 	gint model_col = -1;
@@ -1336,7 +1358,8 @@ ethi_popup_sort_ascending (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-ethi_popup_sort_descending (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_sort_descending (GtkWidget *widget,
+                            EthiHeaderInfo *info)
 {
 	ETableCol *col;
 	gint model_col=-1;
@@ -1391,7 +1414,8 @@ ethi_popup_sort_descending (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-ethi_popup_unsort (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_unsort (GtkWidget *widget,
+                   EthiHeaderInfo *info)
 {
 	ETableHeaderItem *ethi = info->ethi;
 
@@ -1400,7 +1424,8 @@ ethi_popup_unsort (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-ethi_popup_group_field (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_group_field (GtkWidget *widget,
+                        EthiHeaderInfo *info)
 {
 	ETableCol *col;
 	gint model_col;
@@ -1417,18 +1442,21 @@ ethi_popup_group_field (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-ethi_popup_group_box (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_group_box (GtkWidget *widget,
+                      EthiHeaderInfo *info)
 {
 }
 
 static void
-ethi_popup_remove_column (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_remove_column (GtkWidget *widget,
+                          EthiHeaderInfo *info)
 {
 	e_table_header_remove (info->ethi->eth, info->col);
 }
 
 static void
-ethi_popup_field_chooser (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_field_chooser (GtkWidget *widget,
+                          EthiHeaderInfo *info)
 {
 	GtkWidget *etfcd = info->ethi->etfcd.widget;
 
@@ -1453,12 +1481,14 @@ ethi_popup_field_chooser (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-ethi_popup_alignment (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_alignment (GtkWidget *widget,
+                      EthiHeaderInfo *info)
 {
 }
 
 static void
-ethi_popup_best_fit (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_best_fit (GtkWidget *widget,
+                     EthiHeaderInfo *info)
 {
 	ETableHeaderItem *ethi = info->ethi;
 	gint width;
@@ -1474,19 +1504,22 @@ ethi_popup_best_fit (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-ethi_popup_format_columns (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_format_columns (GtkWidget *widget,
+                           EthiHeaderInfo *info)
 {
 }
 
 static void
-config_destroyed (gpointer data, GObject *where_object_was)
+config_destroyed (gpointer data,
+                  GObject *where_object_was)
 {
 	ETableHeaderItem *ethi = data;
 	ethi->config = NULL;
 }
 
 static void
-apply_changes (ETableConfig *config, ETableHeaderItem *ethi)
+apply_changes (ETableConfig *config,
+               ETableHeaderItem *ethi)
 {
 	gchar *state = e_table_state_save_to_string (config->state);
 
@@ -1501,7 +1534,8 @@ apply_changes (ETableConfig *config, ETableHeaderItem *ethi)
 }
 
 static void
-ethi_popup_customize_view (GtkWidget *widget, EthiHeaderInfo *info)
+ethi_popup_customize_view (GtkWidget *widget,
+                           EthiHeaderInfo *info)
 {
 	ETableHeaderItem *ethi = info->ethi;
 	ETableState *state;
@@ -1531,7 +1565,8 @@ ethi_popup_customize_view (GtkWidget *widget, EthiHeaderInfo *info)
 }
 
 static void
-free_popup_info (GtkWidget *w, EthiHeaderInfo *info)
+free_popup_info (GtkWidget *w,
+                 EthiHeaderInfo *info)
 {
 	g_free (info);
 }
@@ -1580,7 +1615,8 @@ static EPopupMenu ethi_context_menu[] = {
 };
 
 static void
-sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
+sort_by_id (GtkWidget *menu_item,
+            ETableHeaderItem *ethi)
 {
 	ETableCol *ecol;
 	gboolean clearfirst;
@@ -1606,13 +1642,15 @@ sort_by_id (GtkWidget *menu_item, ETableHeaderItem *ethi)
 }
 
 static void
-popup_custom (GtkWidget *menu_item, EthiHeaderInfo *info)
+popup_custom (GtkWidget *menu_item,
+              EthiHeaderInfo *info)
 {
 	ethi_popup_customize_view (menu_item, info);
 }
 
 static void
-ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
+ethi_header_context_menu (ETableHeaderItem *ethi,
+                          GdkEventButton *event)
 {
 	EthiHeaderInfo *info = g_new (EthiHeaderInfo, 1);
 	GtkMenu *popup;
@@ -1664,9 +1702,9 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 	gtk_widget_show (menu_item);
 	gtk_menu_shell_prepend (GTK_MENU_SHELL (sub_menu), menu_item);
 	/* Headers */
-	for (ncol = 0; ncol<ethi->full_header->col_count; ncol++)
+	for (ncol = 0; ncol < ethi->full_header->col_count; ncol++)
 	{
-		gchar *text=NULL;
+		gchar *text = NULL;
 
 		if (!ethi->full_header->columns[ncol]->sortable ||
 		    ethi->full_header->columns[ncol]->disabled)
@@ -1704,14 +1742,15 @@ ethi_header_context_menu (ETableHeaderItem *ethi, GdkEventButton *event)
 }
 
 static void
-ethi_button_pressed (ETableHeaderItem *ethi, GdkEventButton *event)
+ethi_button_pressed (ETableHeaderItem *ethi,
+                     GdkEventButton *event)
 {
-	g_signal_emit (ethi,
-		       ethi_signals[BUTTON_PRESSED], 0, event);
+	g_signal_emit (ethi, ethi_signals[BUTTON_PRESSED], 0, event);
 }
 
 void
-ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
+ethi_change_sort_state (ETableHeaderItem *ethi,
+                        ETableCol *col)
 {
 	gint model_col = -1;
 	gint length;
@@ -1793,7 +1832,8 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
  * Handles the events on the ETableHeaderItem, particularly it handles resizing
  */
 static gint
-ethi_event (GnomeCanvasItem *item, GdkEvent *e)
+ethi_event (GnomeCanvasItem *item,
+            GdkEvent *e)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
 	GnomeCanvas *canvas = item->canvas;
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index 96f167b4e8..be8e10820a 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -84,8 +84,8 @@ struct _ETableHeaderItem {
 	/*
 	 * For dragging columns
 	 */
-	guint maybe_drag:1;
-	guint dnd_ready:1;
+	guint maybe_drag : 1;
+	guint dnd_ready : 1;
 	gint click_x, click_y;
 	gint drag_col, drop_col, drag_mark;
 	guint drag_motion_id;
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 659677eceb..34f93a701b 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -35,8 +35,9 @@
 #include "e-table-defines.h"
 #include "e-table-header-utils.h"
 
-static PangoLayout*
-build_header_layout (GtkWidget *widget, const gchar *str)
+static PangoLayout *
+build_header_layout (GtkWidget *widget,
+                     const gchar *str)
 {
 	PangoLayout *layout;
 
@@ -69,7 +70,8 @@ build_header_layout (GtkWidget *widget, const gchar *str)
  * Return value: The height of the button, in pixels.
  **/
 gdouble
-e_table_header_compute_height (ETableCol *ecol, GtkWidget *widget)
+e_table_header_compute_height (ETableCol *ecol,
+                               GtkWidget *widget)
 {
 	gint ythick;
 	gint height;
@@ -112,9 +114,14 @@ e_table_header_width_extras (GtkStyle *style)
  */
 #if 0
 static GdkPixmap *
-make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
-		       GdkPixbuf *pixbuf, GdkColor *bg, gint width, gint height,
-		       gint dither_xofs, gint dither_yofs)
+make_composite_pixmap (GdkDrawable *drawable,
+                       GdkGC *gc,
+                       GdkPixbuf *pixbuf,
+                       GdkColor *bg,
+                       gint width,
+                       gint height,
+                       gint dither_xofs,
+                       gint dither_yofs)
 {
 	gint pwidth, pheight;
 	GdkPixmap *pixmap;
@@ -240,12 +247,18 @@ make_composite_pixmap (GdkDrawable *drawable, GdkGC *gc,
  * Draws a button suitable for a table header.
  **/
 void
-e_table_header_draw_button (cairo_t *cr, ETableCol *ecol,
-			    GtkStyle *style, GtkStateType state,
-			    GtkWidget *widget,
-			    gint x, gint y, gint width, gint height,
-			    gint button_width, gint button_height,
-			    ETableColArrow arrow)
+e_table_header_draw_button (cairo_t *cr,
+                            ETableCol *ecol,
+                            GtkStyle *style,
+                            GtkStateType state,
+                            GtkWidget *widget,
+                            gint x,
+                            gint y,
+                            gint width,
+                            gint height,
+                            gint button_width,
+                            gint button_height,
+                            ETableColArrow arrow)
 {
 	gint xthick, ythick;
 	gint inner_x, inner_y;
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index cfa568bcdd..c3b2de89c7 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -34,7 +34,7 @@ gdouble		e_table_header_compute_height	(ETableCol *ecol,
 						 GtkWidget *widget);
 gdouble		e_table_header_width_extras	(GtkStyle *style);
 void		e_table_header_draw_button	(cairo_t *cr,
-						 ETableCol*ecol,
+						 ETableCol *ecol,
 						 GtkStyle *style,
 						 GtkStateType state,
 						 GtkWidget *widget,
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 90dec061c1..aab0971518 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -63,13 +63,16 @@ struct two_ints {
 };
 
 static void
-eth_set_width (ETableHeader *eth, gint width)
+eth_set_width (ETableHeader *eth,
+               gint width)
 {
 	eth->width = width;
 }
 
 static void
-dequeue (ETableHeader *eth, gint *column, gint *width)
+dequeue (ETableHeader *eth,
+         gint *column,
+         gint *width)
 {
 	GSList *head;
 	struct two_ints *store;
@@ -110,7 +113,9 @@ dequeue_idle (ETableHeader *eth)
 }
 
 static void
-enqueue (ETableHeader *eth, gint column, gint width)
+enqueue (ETableHeader *eth,
+         gint column,
+         gint width)
 {
 	struct two_ints *store;
 	store = g_new (struct two_ints, 1);
@@ -129,7 +134,9 @@ enqueue (ETableHeader *eth, gint column, gint width)
 }
 
 void
-e_table_header_set_size (ETableHeader *eth, gint idx, gint size)
+e_table_header_set_size (ETableHeader *eth,
+                         gint idx,
+                         gint size)
 {
 	g_return_if_fail (eth != NULL);
 	g_return_if_fail (E_IS_TABLE_HEADER (eth));
@@ -138,12 +145,14 @@ e_table_header_set_size (ETableHeader *eth, gint idx, gint size)
 }
 
 static void
-eth_do_remove (ETableHeader *eth, gint idx, gboolean do_unref)
+eth_do_remove (ETableHeader *eth,
+               gint idx,
+               gboolean do_unref)
 {
 	if (do_unref)
 		g_object_unref (eth->columns[idx]);
 
-	memmove (&eth->columns[idx], &eth->columns[idx+1],
+	memmove (&eth->columns[idx], &eth->columns[idx + 1],
 		 sizeof (ETableCol *) * (eth->col_count - idx - 1));
 	eth->col_count--;
 }
@@ -189,17 +198,21 @@ eth_finalize (GObject *object)
 }
 
 static void
-eth_group_info_changed (ETableSortInfo *info, ETableHeader *eth)
+eth_group_info_changed (ETableSortInfo *info,
+                        ETableHeader *eth)
 {
 	enqueue (eth, -1, eth->nominal_width);
 }
 
 static void
-eth_set_property (GObject *object, guint prop_id, const GValue *val, GParamSpec *pspec)
+eth_set_property (GObject *object,
+                  guint property_id,
+                  const GValue *val,
+                  GParamSpec *pspec)
 {
 	ETableHeader *eth = E_TABLE_HEADER (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_WIDTH:
 		eth->nominal_width = g_value_get_double (val);
 		enqueue (eth, -1, eth->nominal_width);
@@ -219,9 +232,9 @@ eth_set_property (GObject *object, guint prop_id, const GValue *val, GParamSpec
 		eth->sort_info = E_TABLE_SORT_INFO (g_value_get_object (val));
 		if (eth->sort_info) {
 			g_object_ref (eth->sort_info);
-			eth->sort_info_group_change_id
-				= g_signal_connect(G_OBJECT(eth->sort_info), "group_info_changed",
-						   G_CALLBACK (eth_group_info_changed), eth);
+			eth->sort_info_group_change_id = g_signal_connect (
+				eth->sort_info, "group_info_changed",
+				G_CALLBACK (eth_group_info_changed), eth);
 		}
 		enqueue (eth, -1, eth->nominal_width);
 		break;
@@ -231,11 +244,14 @@ eth_set_property (GObject *object, guint prop_id, const GValue *val, GParamSpec
 }
 
 static void
-eth_get_property (GObject *object, guint prop_id, GValue *val, GParamSpec *pspec)
+eth_get_property (GObject *object,
+                  guint property_id,
+                  GValue *val,
+                  GParamSpec *pspec)
 {
 	ETableHeader *eth = E_TABLE_HEADER (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_SORT_INFO:
 		g_value_set_object (val, G_OBJECT (eth->sort_info));
 		break;
@@ -246,7 +262,7 @@ eth_get_property (GObject *object, guint prop_id, GValue *val, GParamSpec *pspec
 		g_value_set_double (val, eth->width_extras);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -363,9 +379,11 @@ eth_update_offsets (ETableHeader *eth)
 }
 
 static void
-eth_do_insert (ETableHeader *eth, gint pos, ETableCol *val)
+eth_do_insert (ETableHeader *eth,
+               gint pos,
+               ETableCol *val)
 {
-	memmove (&eth->columns[pos+1], &eth->columns[pos],
+	memmove (&eth->columns[pos + 1], &eth->columns[pos],
 		sizeof (ETableCol *) * (eth->col_count - pos));
 	eth->columns[pos] = val;
 	eth->col_count++;
@@ -386,7 +404,9 @@ eth_do_insert (ETableHeader *eth, gint pos, ETableCol *val)
  * The ETableCol is assumed
  */
 void
-e_table_header_add_column (ETableHeader *eth, ETableCol *tc, gint pos)
+e_table_header_add_column (ETableHeader *eth,
+                           ETableCol *tc,
+                           gint pos)
 {
 	g_return_if_fail (eth != NULL);
 	g_return_if_fail (E_IS_TABLE_HEADER (eth));
@@ -418,7 +438,8 @@ e_table_header_add_column (ETableHeader *eth, ETableCol *tc, gint pos)
  * Returns: The ETableCol at @column in the @eth object
  */
 ETableCol *
-e_table_header_get_column (ETableHeader *eth, gint column)
+e_table_header_get_column (ETableHeader *eth,
+                           gint column)
 {
 	g_return_val_if_fail (eth != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), NULL);
@@ -440,7 +461,8 @@ e_table_header_get_column (ETableHeader *eth, gint column)
  * Returns: The ETableCol with col_idx = @col_idx in the @eth object
  */
 ETableCol *
-e_table_header_get_column_by_col_idx (ETableHeader *eth, gint col_idx)
+e_table_header_get_column_by_col_idx (ETableHeader *eth,
+                                      gint col_idx)
 {
 	gint i;
 	g_return_val_if_fail (eth != NULL, NULL);
@@ -483,7 +505,8 @@ e_table_header_count (ETableHeader *eth)
  * Returns: the column in the model that the @col column
  * in the ETableHeader points to.  */
 gint
-e_table_header_index (ETableHeader *eth, gint col)
+e_table_header_index (ETableHeader *eth,
+                      gint col)
 {
 	g_return_val_if_fail (eth != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE_HEADER (eth), -1);
@@ -504,7 +527,8 @@ e_table_header_index (ETableHeader *eth, gint col)
  * if no column inside this ETableHeader contains that pixel.
  */
 gint
-e_table_header_get_index_at (ETableHeader *eth, gint x_offset)
+e_table_header_get_index_at (ETableHeader *eth,
+                             gint x_offset)
 {
 	gint i, total;
 
@@ -629,7 +653,9 @@ e_table_header_min_width (ETableHeader *eth)
  * and "structure_change" will be emmited
  */
 void
-e_table_header_move (ETableHeader *eth, gint source_index, gint target_index)
+e_table_header_move (ETableHeader *eth,
+                     gint source_index,
+                     gint target_index)
 {
 	ETableCol *old;
 
@@ -663,7 +689,8 @@ e_table_header_move (ETableHeader *eth, gint source_index, gint target_index)
  * This emmits the "structure_change" signal on the @eth object.
  */
 void
-e_table_header_remove (ETableHeader *eth, gint idx)
+e_table_header_remove (ETableHeader *eth,
+                       gint idx)
 {
 	g_return_if_fail (eth != NULL);
 	g_return_if_fail (E_IS_TABLE_HEADER (eth));
@@ -679,14 +706,17 @@ e_table_header_remove (ETableHeader *eth, gint idx)
  * FIXME: deprecated?
  */
 void
-e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection)
+e_table_header_set_selection (ETableHeader *eth,
+                              gboolean allow_selection)
 {
 	g_return_if_fail (eth != NULL);
 	g_return_if_fail (E_IS_TABLE_HEADER (eth));
 }
 
 static void
-eth_set_size (ETableHeader *eth, gint idx, gint size)
+eth_set_size (ETableHeader *eth,
+              gint idx,
+              gint size)
 {
 	gdouble expansion;
 	gdouble old_expansion;
@@ -824,7 +854,9 @@ eth_set_size (ETableHeader *eth, gint idx, gint size)
  * @eth ETableHeader object
  */
 gint
-e_table_header_col_diff (ETableHeader *eth, gint start_col, gint end_col)
+e_table_header_col_diff (ETableHeader *eth,
+                         gint start_col,
+                         gint end_col)
 {
 	gint total, col;
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index ac46df2cd3..25ea433a66 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -67,8 +67,8 @@ static void eti_check_cursor_bounds (ETableItem *eti);
 static void eti_cancel_drag_due_to_model_change (ETableItem *eti);
 
 /* FIXME: Do an analysis of which cell functions are needed before
-   realize and make sure that all of them are doable by all the cells
-   and that all of the others are only done after realization. */
+ * realize and make sure that all of them are doable by all the cells
+ * and that all of the others are only done after realization. */
 
 enum {
 	CURSOR_CHANGE,
@@ -122,9 +122,9 @@ static void e_table_item_redraw_row (ETableItem *eti, gint row);
 #define ETI_ROW_HEIGHT(eti,row) ((eti)->uniform_row_height ? ETI_SINGLE_ROW_HEIGHT ((eti)) : ETI_MULTIPLE_ROW_HEIGHT((eti),(row)))
 
 /* tweak_hsv is a really tweaky function. it modifies its first argument, which
-   should be the color you want tweaked. delta_h, delta_s and delta_v specify
-   how much you want their respective channels modified (and in what direction).
-   if it can't do the specified modification, it does it in the oppositon direction */
+ * should be the color you want tweaked. delta_h, delta_s and delta_v specify
+ * how much you want their respective channels modified (and in what direction).
+ * if it can't do the specified modification, it does it in the oppositon direction */
 static void
 e_hsv_tweak (GdkColor *color,
              gdouble delta_h,
@@ -165,7 +165,8 @@ e_hsv_tweak (GdkColor *color,
 }
 
 inline static gint
-model_to_view_row (ETableItem *eti, gint row)
+model_to_view_row (ETableItem *eti,
+                   gint row)
 {
 	gint i;
 	if (row == -1)
@@ -187,7 +188,8 @@ model_to_view_row (ETableItem *eti, gint row)
 }
 
 inline static gint
-view_to_model_row (ETableItem *eti, gint row)
+view_to_model_row (ETableItem *eti,
+                   gint row)
 {
 	if (eti->uses_source_model) {
 		ETableSubset *etss = E_TABLE_SUBSET (eti->table_model);
@@ -201,7 +203,8 @@ view_to_model_row (ETableItem *eti, gint row)
 }
 
 inline static gint
-model_to_view_col (ETableItem *eti, gint col)
+model_to_view_col (ETableItem *eti,
+                   gint col)
 {
 	gint i;
 	if (col == -1)
@@ -215,14 +218,17 @@ model_to_view_col (ETableItem *eti, gint col)
 }
 
 inline static gint
-view_to_model_col (ETableItem *eti, gint col)
+view_to_model_col (ETableItem *eti,
+                   gint col)
 {
 	ETableCol *ecol = e_table_header_get_column (eti->header, col);
 	return ecol ? ecol->col_idx : -1;
 }
 
 static void
-grab_cancelled (ECanvas *canvas, GnomeCanvasItem *item, gpointer data)
+grab_cancelled (ECanvas *canvas,
+                GnomeCanvasItem *item,
+                gpointer data)
 {
 	ETableItem *eti = data;
 
@@ -230,7 +236,8 @@ grab_cancelled (ECanvas *canvas, GnomeCanvasItem *item, gpointer data)
 }
 
 inline static void
-eti_grab (ETableItem *eti, guint32 time)
+eti_grab (ETableItem *eti,
+          guint32 time)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 	d(g_print ("%s: time: %d\n", __FUNCTION__, time));
@@ -253,7 +260,8 @@ eti_grab (ETableItem *eti, guint32 time)
 }
 
 inline static void
-eti_ungrab (ETableItem *eti, guint32 time)
+eti_ungrab (ETableItem *eti,
+            guint32 time)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 	d(g_print ("%s: time: %d\n", __FUNCTION__, time));
@@ -286,7 +294,11 @@ eti_editing (ETableItem *eti)
 }
 
 inline static GdkColor *
-eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocatedp)
+eti_get_cell_background_color (ETableItem *eti,
+                               gint row,
+                               gint col,
+                               gboolean selected,
+                               gboolean *allocatedp)
 {
 	ECellView *ecell_view = eti->cell_views[col];
 	GtkWidget *canvas;
@@ -334,7 +346,11 @@ eti_get_cell_background_color (ETableItem *eti, gint row, gint col, gboolean sel
 }
 
 inline static GdkColor *
-eti_get_cell_foreground_color (ETableItem *eti, gint row, gint col, gboolean selected, gboolean *allocated)
+eti_get_cell_foreground_color (ETableItem *eti,
+                               gint row,
+                               gint col,
+                               gboolean selected,
+                               gboolean *allocated)
 {
 	GtkWidget *canvas;
 	GdkColor *foreground;
@@ -381,7 +397,7 @@ eti_free_save_state (ETableItem *eti)
  * we might want to avoid realizing each e-cell.
  */
 static void
-eti_realize_cell_views ( ETableItem *eti)
+eti_realize_cell_views (ETableItem *eti)
 {
 	GnomeCanvasItem *item;
 	gint i;
@@ -470,7 +486,11 @@ eti_detach_cell_views (ETableItem *eti)
 }
 
 static void
-eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2)
+eti_bounds (GnomeCanvasItem *item,
+            gdouble *x1,
+            gdouble *y1,
+            gdouble *x2,
+            gdouble *y2)
 {
 	cairo_matrix_t i2c;
 	ETableItem *eti = E_TABLE_ITEM (item);
@@ -487,7 +507,8 @@ eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdoubl
 }
 
 static void
-eti_reflow (GnomeCanvasItem *item, gint flags)
+eti_reflow (GnomeCanvasItem *item,
+            gint flags)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
 
@@ -518,7 +539,9 @@ eti_reflow (GnomeCanvasItem *item, gint flags)
  * GnomeCanvasItem::update method
  */
 static void
-eti_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags)
+eti_update (GnomeCanvasItem *item,
+            const cairo_matrix_t *i2c,
+            gint flags)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
 	gdouble x1, x2, y1, y2;
@@ -652,7 +675,8 @@ eti_remove_header_model (ETableItem *eti)
  * used as a separator between rows
  */
 static gint
-eti_row_height_real (ETableItem *eti, gint row)
+eti_row_height_real (ETableItem *eti,
+                     gint row)
 {
 	const gint cols = e_table_header_count (eti->header);
 	gint col;
@@ -744,7 +768,8 @@ calculate_height_cache (ETableItem *eti)
  * used as a separator between rows
  */
 static gint
-eti_row_height (ETableItem *eti, gint row)
+eti_row_height (ETableItem *eti,
+                gint row)
 {
 	if (eti->uniform_row_height) {
 		eti->uniform_row_height_cache = eti_row_height_real (eti, -1);
@@ -826,7 +851,11 @@ eti_get_height (ETableItem *eti)
 }
 
 static void
-eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1)
+eti_item_region_redraw (ETableItem *eti,
+                        gint x0,
+                        gint y0,
+                        gint x1,
+                        gint y1)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 	gdouble dx1, dy1, dx2, dy2;
@@ -847,7 +876,9 @@ eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1)
  * Computes the distance between @start_row and @end_row in pixels
  */
 gint
-e_table_item_row_diff (ETableItem *eti, gint start_row, gint end_row)
+e_table_item_row_diff (ETableItem *eti,
+                       gint start_row,
+                       gint end_row)
 {
 	gint height_extra = eti->horizontal_draw_grid ? 1 : 0;
 
@@ -870,10 +901,14 @@ e_table_item_row_diff (ETableItem *eti, gint start_row, gint end_row)
 
 static void
 eti_get_region (ETableItem *eti,
-		gint start_col, gint start_row,
-		gint end_col, gint end_row,
-		gint *x1p, gint *y1p,
-		gint *x2p, gint *y2p)
+                gint start_col,
+                gint start_row,
+                gint end_col,
+                gint end_row,
+                gint *x1p,
+                gint *y1p,
+                gint *x2p,
+                gint *y2p)
 {
 	gint x1, y1, x2, y2;
 
@@ -903,8 +938,11 @@ eti_get_region (ETableItem *eti,
  */
 static void
 eti_request_region_redraw (ETableItem *eti,
-			   gint start_col, gint start_row,
-			   gint end_col, gint end_row, gint border)
+                           gint start_col,
+                           gint start_row,
+                           gint end_col,
+                           gint end_row,
+                           gint border)
 {
 	gint x1, y1, x2, y2;
 
@@ -930,8 +968,11 @@ eti_request_region_redraw (ETableItem *eti,
  */
 static void
 eti_request_region_show (ETableItem *eti,
-			 gint start_col, gint start_row,
-			 gint end_col, gint end_row, gint delay)
+                         gint start_col,
+                         gint start_row,
+                         gint end_col,
+                         gint end_row,
+                         gint delay)
 {
 	gint x1, y1, x2, y2;
 
@@ -947,7 +988,8 @@ eti_request_region_show (ETableItem *eti,
 }
 
 static void
-eti_show_cursor (ETableItem *eti, gint delay)
+eti_show_cursor (ETableItem *eti,
+                 gint delay)
 {
 	GnomeCanvasItem *item;
 	gint cursor_row;
@@ -1028,7 +1070,8 @@ eti_check_cursor_bounds (ETableItem *eti)
 }
 
 static void
-eti_maybe_show_cursor (ETableItem *eti, gint delay)
+eti_maybe_show_cursor (ETableItem *eti,
+                       gint delay)
 {
 	d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
 	if (eti->cursor_on_screen)
@@ -1101,7 +1144,8 @@ eti_unfreeze (ETableItem *eti)
  * Callback routine: invoked before the ETableModel suffers a change
  */
 static void
-eti_table_model_pre_change (ETableModel *table_model, ETableItem *eti)
+eti_table_model_pre_change (ETableModel *table_model,
+                            ETableItem *eti)
 {
 	eti_cancel_drag_due_to_model_change (eti);
 	eti_check_cursor_bounds (eti);
@@ -1116,7 +1160,8 @@ eti_table_model_pre_change (ETableModel *table_model, ETableItem *eti)
  * Callback routine: invoked when the ETableModel has not suffered a change
  */
 static void
-eti_table_model_no_change (ETableModel *table_model, ETableItem *eti)
+eti_table_model_no_change (ETableModel *table_model,
+                           ETableItem *eti)
 {
 	eti_unfreeze (eti);
 }
@@ -1126,7 +1171,8 @@ eti_table_model_no_change (ETableModel *table_model, ETableItem *eti)
  */
 
 static void
-eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
+eti_table_model_changed (ETableModel *table_model,
+                         ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -1150,7 +1196,9 @@ eti_table_model_changed (ETableModel *table_model, ETableItem *eti)
 }
 
 static void
-eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti)
+eti_table_model_row_changed (ETableModel *table_model,
+                             gint row,
+                             ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -1170,7 +1218,10 @@ eti_table_model_row_changed (ETableModel *table_model, gint row, ETableItem *eti
 }
 
 static void
-eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETableItem *eti)
+eti_table_model_cell_changed (ETableModel *table_model,
+                              gint col,
+                              gint row,
+                              ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -1190,7 +1241,10 @@ eti_table_model_cell_changed (ETableModel *table_model, gint col, gint row, ETab
 }
 
 static void
-eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, ETableItem *eti)
+eti_table_model_rows_inserted (ETableModel *table_model,
+                               gint row,
+                               gint count,
+                               ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -1219,7 +1273,10 @@ eti_table_model_rows_inserted (ETableModel *table_model, gint row, gint count, E
 }
 
 static void
-eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ETableItem *eti)
+eti_table_model_rows_deleted (ETableModel *table_model,
+                              gint row,
+                              gint count,
+                              ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -1257,8 +1314,10 @@ eti_table_model_rows_deleted (ETableModel *table_model, gint row, gint count, ET
  */
 void
 e_table_item_redraw_range (ETableItem *eti,
-			   gint start_col, gint start_row,
-			   gint end_col, gint end_row)
+                           gint start_col,
+                           gint start_row,
+                           gint end_col,
+                           gint end_row)
 {
 	gint border;
 	gint cursor_col, cursor_row;
@@ -1284,14 +1343,15 @@ e_table_item_redraw_range (ETableItem *eti,
 
 static void
 e_table_item_redraw_row (ETableItem *eti,
-			 gint row)
+                         gint row)
 {
 	if (row != -1)
 		e_table_item_redraw_range (eti, 0, row, eti->cols - 1, row);
 }
 
 static void
-eti_add_table_model (ETableItem *eti, ETableModel *table_model)
+eti_add_table_model (ETableItem *eti,
+                     ETableModel *table_model)
 {
 	g_return_if_fail (eti->table_model == NULL);
 
@@ -1344,7 +1404,8 @@ eti_add_table_model (ETableItem *eti, ETableModel *table_model)
 }
 
 static void
-eti_add_selection_model (ETableItem *eti, ESelectionModel *selection)
+eti_add_selection_model (ETableItem *eti,
+                         ESelectionModel *selection)
 {
 	g_return_if_fail (eti->selection == NULL);
 
@@ -1373,7 +1434,9 @@ eti_add_selection_model (ETableItem *eti, ESelectionModel *selection)
 }
 
 static void
-eti_header_dim_changed (ETableHeader *eth, gint col, ETableItem *eti)
+eti_header_dim_changed (ETableHeader *eth,
+                        gint col,
+                        ETableItem *eti)
 {
 	eti->needs_compute_width = 1;
 	e_canvas_item_request_reflow (GNOME_CANVAS_ITEM (eti));
@@ -1382,7 +1445,8 @@ eti_header_dim_changed (ETableHeader *eth, gint col, ETableItem *eti)
 }
 
 static void
-eti_header_structure_changed (ETableHeader *eth, ETableItem *eti)
+eti_header_structure_changed (ETableHeader *eth,
+                              ETableItem *eti)
 {
 	eti->cols = e_table_header_count (eti->header);
 
@@ -1409,7 +1473,9 @@ eti_header_structure_changed (ETableHeader *eth, ETableItem *eti)
 }
 
 static gint
-eti_request_column_width (ETableHeader *eth, gint col, ETableItem *eti)
+eti_request_column_width (ETableHeader *eth,
+                          gint col,
+                          ETableItem *eti)
 {
 	gint width = 0;
 
@@ -1421,7 +1487,8 @@ eti_request_column_width (ETableHeader *eth, gint col, ETableItem *eti)
 }
 
 static void
-eti_add_header_model (ETableItem *eti, ETableHeader *header)
+eti_add_header_model (ETableItem *eti,
+                      ETableHeader *header)
 {
 	g_return_if_fail (eti->header == NULL);
 
@@ -1475,13 +1542,16 @@ eti_dispose (GObject *object)
 }
 
 static void
-eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+eti_set_property (GObject *object,
+                  guint property_id,
+                  const GValue *value,
+                  GParamSpec *pspec)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (object);
 	ETableItem *eti = E_TABLE_ITEM (object);
 	gint cursor_col;
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_TABLE_HEADER:
 		eti_remove_header_model (eti);
 		eti_add_header_model (eti, E_TABLE_HEADER (g_value_get_object (value)));
@@ -1558,14 +1628,17 @@ eti_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe
 }
 
 static void
-eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+eti_get_property (GObject *object,
+                  guint property_id,
+                  GValue *value,
+                  GParamSpec *pspec)
 {
 	ETableItem *eti;
 	gint row;
 
 	eti = E_TABLE_ITEM (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_WIDTH:
 		g_value_set_double (value, eti->width);
 		break;
@@ -1585,7 +1658,7 @@ eti_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *psp
 		g_value_set_boolean (value, eti->uniform_row_height);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -1666,7 +1739,9 @@ static const gchar gray50_bits[] = {
 	0x02, 0x01, };
 
 static gboolean
-eti_tree_unfreeze (GtkWidget *widget,  GdkEvent *event, ETableItem *eti)
+eti_tree_unfreeze (GtkWidget *widget,
+                   GdkEvent *event,
+                   ETableItem *eti)
 {
 
 	if (widget)
@@ -1745,8 +1820,13 @@ eti_unrealize (GnomeCanvasItem *item)
 }
 
 static void
-eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style,
-                    gint x1, gint y1, gint x2, gint y2)
+eti_draw_grid_line (ETableItem *eti,
+                    cairo_t *cr,
+                    GtkStyle *style,
+                    gint x1,
+                    gint y1,
+                    gint x2,
+                    gint y2)
 {
 	cairo_save (cr);
 
@@ -1761,7 +1841,12 @@ eti_draw_grid_line (ETableItem *eti, cairo_t *cr, GtkStyle *style,
 }
 
 static void
-eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint height)
+eti_draw (GnomeCanvasItem *item,
+          cairo_t *cr,
+          gint x,
+          gint y,
+          gint width,
+          gint height)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
 	const gint rows = eti->rows;
@@ -1915,26 +2000,26 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 			}
 
 			x1 = xd;
-			y1 = yd+1;
+			y1 = yd + 1;
 			x2 = x1 + ecol->width;
-			y2 = yd+height;
+			y2 = yd + height;
 
 			background = eti_get_cell_background_color (eti, row, col, col_selected, &free_background);
 
 			cairo_save (cr);
 			pat = cairo_pattern_create_linear (0, y1, 0, y2);
-			cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 ,
-								     background->green/65535.0,
-								     background->blue/65535.0, selected ? 0.8: 1.0);
+			cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red / 65535.0 ,
+								     background->green / 65535.0,
+								     background->blue / 65535.0, selected ? 0.8: 1.0);
 			if (selected)
-				cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 ,
-									     background->green/65535.0,
-									     background->blue/65535.0, 0.9);
-
-			cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 ,
-								   background->green/65535.0,
-								   background->blue/65535.0, selected ? 0.8 : 1.0);
-			cairo_rectangle (cr, x1, y1, ecol->width, height-1);
+				cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red / 65535.0 ,
+									     background->green / 65535.0,
+									     background->blue / 65535.0, 0.9);
+
+			cairo_pattern_add_color_stop_rgba (pat, 1, background->red / 65535.0 ,
+								   background->green / 65535.0,
+								   background->blue / 65535.0, selected ? 0.8 : 1.0);
+			cairo_rectangle (cr, x1, y1, ecol->width, height - 1);
 			cairo_set_source (cr, pat);
 			cairo_fill_preserve (cr);
 			cairo_pattern_destroy (pat);
@@ -1944,17 +2029,17 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 
 			cairo_save (cr);
 			cairo_set_line_width (cr, 1.0);
-			cairo_set_source_rgba (cr, background->red/65535.0 ,
-						   background->green/65535.0,
-						   background->blue/65535.0, 1);
+			cairo_set_source_rgba (cr, background->red / 65535.0 ,
+						   background->green / 65535.0,
+						   background->blue / 65535.0, 1);
 			cairo_move_to (cr, x1, y1);
 			cairo_line_to (cr, x2, y1);
 			cairo_stroke (cr);
 
 			cairo_set_line_width (cr, 1.0);
-			cairo_set_source_rgba (cr, background->red/65535.0 ,
-						  background->green/65535.0,
-						  background->blue/65535.0, 1);
+			cairo_set_source_rgba (cr, background->red / 65535.0 ,
+						  background->green / 65535.0,
+						  background->blue / 65535.0, 1);
 			cairo_move_to (cr, x1, y2);
 			cairo_line_to (cr, x2, y2);
 			cairo_stroke (cr);
@@ -1991,7 +2076,7 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 					if (view_to_model_row (eti, row) == cursor_row) {
 						f_x1 = floor (eti_base_x) - x;
 						f_x2 = floor (lower_right_x) - x;
-						f_y1 = yd+1;
+						f_y1 = yd + 1;
 						f_y2 = yd + height;
 						f_found = TRUE;
 					}
@@ -2055,13 +2140,23 @@ eti_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint h
 }
 
 static GnomeCanvasItem *
-eti_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy)
+eti_point (GnomeCanvasItem *item,
+           gdouble x,
+           gdouble y,
+           gint cx,
+           gint cy)
 {
 	return item;
 }
 
 static gboolean
-find_cell (ETableItem *eti, gdouble x, gdouble y, gint *view_col_res, gint *view_row_res, gdouble *x1_res, gdouble *y1_res)
+find_cell (ETableItem *eti,
+           gdouble x,
+           gdouble y,
+           gint *view_col_res,
+           gint *view_row_res,
+           gdouble *x1_res,
+           gdouble *y1_res)
 {
 	const gint cols = eti->cols;
 	const gint rows = eti->rows;
@@ -2127,7 +2222,9 @@ find_cell (ETableItem *eti, gdouble x, gdouble y, gint *view_col_res, gint *view
 }
 
 static void
-eti_cursor_move (ETableItem *eti, gint row, gint column)
+eti_cursor_move (ETableItem *eti,
+                 gint row,
+                 gint column)
 {
 	e_table_item_leave_edit_(eti);
 	e_table_item_focus (eti, view_to_model_col (eti, column), view_to_model_row (eti, row), 0);
@@ -2158,7 +2255,14 @@ eti_cursor_move_right (ETableItem *eti)
 }
 
 static gint
-eti_e_cell_event     (ETableItem *item, ECellView *ecell_view, GdkEvent *event, gint time, gint model_col, gint view_col, gint row, ECellFlags flags)
+eti_e_cell_event (ETableItem *item,
+                  ECellView *ecell_view,
+                  GdkEvent *event,
+                  gint time,
+                  gint model_col,
+                  gint view_col,
+                  gint row,
+                  ECellFlags flags)
 {
 	ECellActions actions = 0;
 	gint ret_val;
@@ -2184,7 +2288,8 @@ eti_e_cell_event     (ETableItem *item, ECellView *ecell_view, GdkEvent *event,
 
 /* FIXME: cursor */
 static gint
-eti_event (GnomeCanvasItem *item, GdkEvent *e)
+eti_event (GnomeCanvasItem *item,
+           GdkEvent *e)
 {
 	ETableItem *eti = E_TABLE_ITEM (item);
 	ECellView *ecell_view;
@@ -2786,7 +2891,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 }
 
 static void
-eti_style_set (ETableItem *eti, GtkStyle *previous_style)
+eti_style_set (ETableItem *eti,
+               GtkStyle *previous_style)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -3057,13 +3163,18 @@ eti_class_init (ETableItemClass *class)
  * This routine sets the cursor of the %ETableItem canvas item.
  */
 void
-e_table_item_set_cursor    (ETableItem *eti, gint col, gint row)
+e_table_item_set_cursor (ETableItem *eti,
+                         gint col,
+                         gint row)
 {
 	e_table_item_focus (eti, col, view_to_model_row (eti, row), 0);
 }
 
 static void
-e_table_item_focus (ETableItem *eti, gint col, gint row, GdkModifierType state)
+e_table_item_focus (ETableItem *eti,
+                    gint col,
+                    gint row,
+                    GdkModifierType state)
 {
 	g_return_if_fail (eti != NULL);
 	g_return_if_fail (E_IS_TABLE_ITEM (eti));
@@ -3107,7 +3218,10 @@ e_table_item_get_focused_column (ETableItem *eti)
 }
 
 static void
-eti_cursor_change (ESelectionModel *selection, gint row, gint col, ETableItem *eti)
+eti_cursor_change (ESelectionModel *selection,
+                   gint row,
+                   gint col,
+                   ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 	gint view_row;
@@ -3146,7 +3260,10 @@ eti_cursor_change (ESelectionModel *selection, gint row, gint col, ETableItem *e
 }
 
 static void
-eti_cursor_activated (ESelectionModel *selection, gint row, gint col, ETableItem *eti)
+eti_cursor_activated (ESelectionModel *selection,
+                      gint row,
+                      gint col,
+                      ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 	gint view_row;
@@ -3178,7 +3295,8 @@ eti_cursor_activated (ESelectionModel *selection, gint row, gint col, ETableItem
 }
 
 static void
-eti_selection_change (ESelectionModel *selection, ETableItem *eti)
+eti_selection_change (ESelectionModel *selection,
+                      ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -3190,7 +3308,9 @@ eti_selection_change (ESelectionModel *selection, ETableItem *eti)
 }
 
 static void
-eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti)
+eti_selection_row_change (ESelectionModel *selection,
+                          gint row,
+                          ETableItem *eti)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 
@@ -3212,7 +3332,9 @@ eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti)
  * column and row.
  */
 void
-e_table_item_enter_edit (ETableItem *eti, gint col, gint row)
+e_table_item_enter_edit (ETableItem *eti,
+                         gint col,
+                         gint row)
 {
 	g_return_if_fail (eti != NULL);
 	g_return_if_fail (E_IS_TABLE_ITEM (eti));
@@ -3276,14 +3398,14 @@ e_table_item_leave_edit (ETableItem *eti)
  * is removed from the value y points to.
  */
 void
-e_table_item_compute_location (ETableItem        *eti,
-			       gint               *x,
-			       gint               *y,
-			       gint               *row,
-			       gint               *col)
+e_table_item_compute_location (ETableItem *eti,
+                               gint *x,
+                               gint *y,
+                               gint *row,
+                               gint *col)
 {
 	/* Save the grabbed row but make sure that we don't get flawed
-	   results because the cursor is grabbed. */
+	 * results because the cursor is grabbed. */
 	gint grabbed_row = eti->grabbed_row;
 	eti->grabbed_row = -1;
 
@@ -3300,15 +3422,15 @@ e_table_item_compute_location (ETableItem        *eti,
  * the position inside the item too.
  **/
 void
-e_table_item_compute_mouse_over (ETableItem        *eti,
-				 gint                x,
-				 gint                y,
-				 gint               *row,
-				 gint               *col)
+e_table_item_compute_mouse_over (ETableItem *eti,
+                                 gint x,
+                                 gint y,
+                                 gint *row,
+                                 gint *col)
 {
 	gdouble realx, realy;
 	/* Save the grabbed row but make sure that we don't get flawed
-	   results because the cursor is grabbed. */
+	 * results because the cursor is grabbed. */
 	gint grabbed_row = eti->grabbed_row;
 	eti->grabbed_row = -1;
 
@@ -3326,13 +3448,13 @@ e_table_item_compute_mouse_over (ETableItem        *eti,
 }
 
 void
-e_table_item_get_cell_geometry   (ETableItem        *eti,
-				  gint               *row,
-				  gint               *col,
-				  gint               *x,
-				  gint               *y,
-				  gint               *width,
-				  gint               *height)
+e_table_item_get_cell_geometry (ETableItem *eti,
+                                gint *row,
+                                gint *col,
+                                gint *x,
+                                gint *y,
+                                gint *width,
+                                gint *height)
 {
 	if (eti->rows > *row) {
 		if (x)
@@ -3356,7 +3478,8 @@ typedef struct {
 } ETableItemPrintContext;
 
 static gdouble *
-e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width)
+e_table_item_calculate_print_widths (ETableHeader *eth,
+                                     gdouble width)
 {
 	gint i;
 	gdouble extra;
@@ -3375,14 +3498,17 @@ e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width)
 		widths[i] = eth->columns[i]->min_width * scale;
 	}
 	for (i = 0; i <= last_resizable; i++) {
-		widths[i] += extra * (eth->columns[i]->resizable ? eth->columns[i]->expansion : 0)/expansion;
+		widths[i] += extra * (eth->columns[i]->resizable ? eth->columns[i]->expansion : 0) / expansion;
 	}
 
 	return widths;
 }
 
 static gdouble
-eti_printed_row_height (ETableItem *eti, gdouble *widths, GtkPrintContext *context, gint row)
+eti_printed_row_height (ETableItem *eti,
+                        gdouble *widths,
+                        GtkPrintContext *context,
+                        gint row)
 {
 	gint col;
 	gint cols = eti->cols;
@@ -3400,7 +3526,11 @@ eti_printed_row_height (ETableItem *eti, gdouble *widths, GtkPrintContext *conte
 #define CHECK(x) if((x) == -1) return -1;
 
 static gint
-gp_draw_rect (GtkPrintContext *context, gdouble x, gdouble y, gdouble width, gdouble height)
+gp_draw_rect (GtkPrintContext *context,
+              gdouble x,
+              gdouble y,
+              gdouble width,
+              gdouble height)
 {
 	cairo_t *cr;
 	cr = gtk_print_context_get_cairo_context (context);
@@ -3413,12 +3543,12 @@ gp_draw_rect (GtkPrintContext *context, gdouble x, gdouble y, gdouble width, gdo
 }
 
 static void
-e_table_item_print_page  (EPrintable *ep,
-			  GtkPrintContext *context,
-			  gdouble width,
-			  gdouble height,
-			  gboolean quantize,
-			  ETableItemPrintContext *itemcontext)
+e_table_item_print_page (EPrintable *ep,
+                         GtkPrintContext *context,
+                         gdouble width,
+                         gdouble height,
+                         gboolean quantize,
+                         ETableItemPrintContext *itemcontext)
 {
 	ETableItem *eti = itemcontext->item;
 	const gint rows = eti->rows;
@@ -3503,8 +3633,8 @@ e_table_item_print_page  (EPrintable *ep,
 }
 
 static gboolean
-e_table_item_data_left   (EPrintable *ep,
-			  ETableItemPrintContext *itemcontext)
+e_table_item_data_left (EPrintable *ep,
+                        ETableItemPrintContext *itemcontext)
 {
 	ETableItem *item = itemcontext->item;
 	gint rows_printed = itemcontext->rows_printed;
@@ -3514,19 +3644,19 @@ e_table_item_data_left   (EPrintable *ep,
 }
 
 static void
-e_table_item_reset       (EPrintable *ep,
-			  ETableItemPrintContext *itemcontext)
+e_table_item_reset (EPrintable *ep,
+                    ETableItemPrintContext *itemcontext)
 {
 	itemcontext->rows_printed = 0;
 }
 
 static gdouble
-e_table_item_height      (EPrintable *ep,
-			  GtkPrintContext *context,
-			  gdouble width,
-			  gdouble max_height,
-			  gboolean quantize,
-			  ETableItemPrintContext *itemcontext)
+e_table_item_height (EPrintable *ep,
+                     GtkPrintContext *context,
+                     gdouble width,
+                     gdouble max_height,
+                     gboolean quantize,
+                     ETableItemPrintContext *itemcontext)
 {
 	ETableItem *item = itemcontext->item;
 	const gint rows = item->rows;
@@ -3571,12 +3701,12 @@ e_table_item_height      (EPrintable *ep,
 }
 
 static gboolean
-e_table_item_will_fit     (EPrintable *ep,
-			   GtkPrintContext *context,
-			   gdouble width,
-			   gdouble max_height,
-			   gboolean quantize,
-			   ETableItemPrintContext *itemcontext)
+e_table_item_will_fit (EPrintable *ep,
+                       GtkPrintContext *context,
+                       gdouble width,
+                       gdouble max_height,
+                       gboolean quantize,
+                       ETableItemPrintContext *itemcontext)
 {
 	ETableItem *item = itemcontext->item;
 	const gint rows = item->rows;
@@ -3622,7 +3752,7 @@ e_table_item_will_fit     (EPrintable *ep,
 
 static void
 e_table_item_printable_destroy (gpointer data,
-				GObject *where_object_was)
+                                GObject *where_object_was)
 {
 	ETableItemPrintContext *itemcontext = data;
 
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index d2fd2c56d6..26a181dd64 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -94,12 +94,12 @@ struct _ETableItem {
 	/* View row, -1 means unknown */
 	gint              old_cursor_row;
 
-	guint		 alternating_row_colors:1;
-	guint		 horizontal_draw_grid:1;
-	guint		 vertical_draw_grid:1;
-	guint		 draw_focus:1;
-	guint		 uniform_row_height:1;
-	guint		 cell_views_realized:1;
+	guint		 alternating_row_colors : 1;
+	guint		 horizontal_draw_grid : 1;
+	guint		 vertical_draw_grid : 1;
+	guint		 draw_focus : 1;
+	guint		 uniform_row_height : 1;
+	guint		 cell_views_realized : 1;
 
 	guint		 needs_redraw : 1;
 	guint		 needs_compute_height : 1;
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index bc85c7d39a..279d0a505e 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -43,7 +43,9 @@ etmc_column_count (ETableModel *etm)
 }
 
 static gpointer
-etmc_value_at (ETableModel *etm, gint col, gint row)
+etmc_value_at (ETableModel *etm,
+               gint col,
+               gint row)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -54,7 +56,10 @@ etmc_value_at (ETableModel *etm, gint col, gint row)
 }
 
 static void
-etmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
+etmc_set_value_at (ETableModel *etm,
+                   gint col,
+                   gint row,
+                   gconstpointer val)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -63,7 +68,9 @@ etmc_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 }
 
 static gboolean
-etmc_is_cell_editable (ETableModel *etm, gint col, gint row)
+etmc_is_cell_editable (ETableModel *etm,
+                       gint col,
+                       gint row)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -75,7 +82,9 @@ etmc_is_cell_editable (ETableModel *etm, gint col, gint row)
 
 /* The default for etmc_duplicate_value is to return the raw value. */
 static gpointer
-etmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
+etmc_duplicate_value (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -86,7 +95,9 @@ etmc_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etmc_free_value (ETableModel *etm, gint col, gpointer value)
+etmc_free_value (ETableModel *etm,
+                 gint col,
+                 gpointer value)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -95,7 +106,8 @@ etmc_free_value (ETableModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-etmc_initialize_value (ETableModel *etm, gint col)
+etmc_initialize_value (ETableModel *etm,
+                       gint col)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -106,7 +118,9 @@ etmc_initialize_value (ETableModel *etm, gint col)
 }
 
 static gboolean
-etmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
+etmc_value_is_empty (ETableModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -117,7 +131,9 @@ etmc_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-etmc_value_to_string (ETableModel *etm, gint col, gconstpointer value)
+etmc_value_to_string (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -128,7 +144,9 @@ etmc_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etmc_append_row (ETableModel *etm, ETableModel *source, gint row)
+etmc_append_row (ETableModel *etm,
+                 ETableModel *source,
+                 gint row)
 {
 	ETableMemoryCallbacks *etmc = E_TABLE_MEMORY_CALLBACKS (etm);
 
@@ -189,15 +207,15 @@ e_table_memory_callbacks_init (ETableMemoryCallbacks *etmc)
  */
 ETableModel *
 e_table_memory_callbacks_new (ETableMemoryCallbacksColumnCountFn col_count,
-			      ETableMemoryCallbacksValueAtFn value_at,
-			      ETableMemoryCallbacksSetValueAtFn set_value_at,
-			      ETableMemoryCallbacksIsCellEditableFn is_cell_editable,
-			      ETableMemoryCallbacksDuplicateValueFn duplicate_value,
-			      ETableMemoryCallbacksFreeValueFn free_value,
-			      ETableMemoryCallbacksInitializeValueFn initialize_value,
-			      ETableMemoryCallbacksValueIsEmptyFn value_is_empty,
-			      ETableMemoryCallbacksValueToStringFn value_to_string,
-			      gpointer data)
+                              ETableMemoryCallbacksValueAtFn value_at,
+                              ETableMemoryCallbacksSetValueAtFn set_value_at,
+                              ETableMemoryCallbacksIsCellEditableFn is_cell_editable,
+                              ETableMemoryCallbacksDuplicateValueFn duplicate_value,
+                              ETableMemoryCallbacksFreeValueFn free_value,
+                              ETableMemoryCallbacksInitializeValueFn initialize_value,
+                              ETableMemoryCallbacksValueIsEmptyFn value_is_empty,
+                              ETableMemoryCallbacksValueToStringFn value_to_string,
+                              gpointer data)
 {
 	ETableMemoryCallbacks *et;
 
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index dc77e13410..55f96f5862 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -41,7 +41,9 @@ struct _ETableMemoryStorePrivate {
 G_DEFINE_TYPE (ETableMemoryStore, e_table_memory_store, E_TYPE_TABLE_MEMORY)
 
 static gpointer
-duplicate_value (ETableMemoryStore *etms, gint col, gconstpointer val)
+duplicate_value (ETableMemoryStore *etms,
+                 gint col,
+                 gconstpointer val)
 {
 	switch (etms->priv->columns[col].type) {
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
@@ -65,7 +67,9 @@ duplicate_value (ETableMemoryStore *etms, gint col, gconstpointer val)
 }
 
 static void
-free_value (ETableMemoryStore *etms, gint col, gpointer value)
+free_value (ETableMemoryStore *etms,
+            gint col,
+            gpointer value)
 {
 	switch (etms->priv->columns[col].type) {
 	case E_TABLE_MEMORY_STORE_COLUMN_TYPE_STRING:
@@ -97,7 +101,9 @@ etms_column_count (ETableModel *etm)
 }
 
 static gpointer
-etms_value_at (ETableModel *etm, gint col, gint row)
+etms_value_at (ETableModel *etm,
+               gint col,
+               gint row)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -105,7 +111,10 @@ etms_value_at (ETableModel *etm, gint col, gint row)
 }
 
 static void
-etms_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
+etms_set_value_at (ETableModel *etm,
+                   gint col,
+                   gint row,
+                   gconstpointer val)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -117,7 +126,9 @@ etms_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 }
 
 static gboolean
-etms_is_cell_editable (ETableModel *etm, gint col, gint row)
+etms_is_cell_editable (ETableModel *etm,
+                       gint col,
+                       gint row)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -126,7 +137,9 @@ etms_is_cell_editable (ETableModel *etm, gint col, gint row)
 
 /* The default for etms_duplicate_value is to return the raw value. */
 static gpointer
-etms_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
+etms_duplicate_value (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -134,7 +147,9 @@ etms_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etms_free_value (ETableModel *etm, gint col, gpointer value)
+etms_free_value (ETableModel *etm,
+                 gint col,
+                 gpointer value)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -142,7 +157,8 @@ etms_free_value (ETableModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-etms_initialize_value (ETableModel *etm, gint col)
+etms_initialize_value (ETableModel *etm,
+                       gint col)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -163,7 +179,9 @@ etms_initialize_value (ETableModel *etm, gint col)
 }
 
 static gboolean
-etms_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
+etms_value_is_empty (ETableModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -184,7 +202,9 @@ etms_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-etms_value_to_string (ETableModel *etm, gint col, gconstpointer value)
+etms_value_to_string (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 
@@ -205,7 +225,9 @@ etms_value_to_string (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etms_append_row (ETableModel *etm, ETableModel *source, gint row)
+etms_append_row (ETableModel *etm,
+                 ETableModel *source,
+                 gint row)
 {
 	ETableMemoryStore *etms = E_TABLE_MEMORY_STORE (etm);
 	gpointer *new_data;
@@ -310,7 +332,8 @@ e_table_memory_store_new (ETableMemoryStoreColumnInfo *columns)
 }
 
 ETableModel *
-e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumnInfo *columns)
+e_table_memory_store_construct (ETableMemoryStore *etms,
+                                ETableMemoryStoreColumnInfo *columns)
 {
 	gint i;
 	for (i = 0; columns[i].type != E_TABLE_MEMORY_STORE_COLUMN_TYPE_TERMINATOR; i++)
@@ -325,7 +348,10 @@ e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumn
 }
 
 void
-e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, gint col, gint row, gpointer value)
+e_table_memory_store_adopt_value_at (ETableMemoryStore *etms,
+                                     gint col,
+                                     gint row,
+                                     gpointer value)
 {
 	e_table_model_pre_change (E_TABLE_MODEL (etms));
 
@@ -336,7 +362,10 @@ e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, gint col, gint row
 
 /* The size of these arrays is the number of columns. */
 void
-e_table_memory_store_insert_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data)
+e_table_memory_store_insert_array (ETableMemoryStore *etms,
+                                   gint row,
+                                   gpointer *store,
+                                   gpointer data)
 {
 	gint row_count;
 	gint i;
@@ -357,7 +386,10 @@ e_table_memory_store_insert_array (ETableMemoryStore *etms, gint row, gpointer *
 }
 
 void
-e_table_memory_store_insert (ETableMemoryStore *etms, gint row, gpointer data, ...)
+e_table_memory_store_insert (ETableMemoryStore *etms,
+                             gint row,
+                             gpointer data,
+                             ...)
 {
 	gpointer *store;
 	va_list args;
@@ -377,7 +409,10 @@ e_table_memory_store_insert (ETableMemoryStore *etms, gint row, gpointer data, .
 }
 
 void
-e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data)
+e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms,
+                                         gint row,
+                                         gpointer *store,
+                                         gpointer data)
 {
 	gint row_count;
 	gint i;
@@ -398,7 +433,10 @@ e_table_memory_store_insert_adopt_array (ETableMemoryStore *etms, gint row, gpoi
 }
 
 void
-e_table_memory_store_insert_adopt (ETableMemoryStore *etms, gint row, gpointer data, ...)
+e_table_memory_store_insert_adopt (ETableMemoryStore *etms,
+                                   gint row,
+                                   gpointer data,
+                                   ...)
 {
 	gpointer *store;
 	va_list args;
@@ -429,7 +467,10 @@ e_table_memory_store_insert_adopt (ETableMemoryStore *etms, gint row, gpointer d
  *
  */
 void
-e_table_memory_store_change_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data)
+e_table_memory_store_change_array (ETableMemoryStore *etms,
+                                   gint row,
+                                   gpointer *store,
+                                   gpointer data)
 {
 	gint i;
 
@@ -456,7 +497,10 @@ e_table_memory_store_change_array (ETableMemoryStore *etms, gint row, gpointer *
  * pass in etms->col_count args.
  */
 void
-e_table_memory_store_change (ETableMemoryStore *etms, gint row, gpointer data, ...)
+e_table_memory_store_change (ETableMemoryStore *etms,
+                             gint row,
+                             gpointer data,
+                             ...)
 {
 	gpointer *store;
 	va_list args;
@@ -490,7 +534,10 @@ e_table_memory_store_change (ETableMemoryStore *etms, gint row, gpointer data, .
  * duplicate the data.
  */
 void
-e_table_memory_store_change_adopt_array (ETableMemoryStore *etms, gint row, gpointer *store, gpointer data)
+e_table_memory_store_change_adopt_array (ETableMemoryStore *etms,
+                                         gint row,
+                                         gpointer *store,
+                                         gpointer data)
 {
 	gint i;
 
@@ -515,7 +562,10 @@ e_table_memory_store_change_adopt_array (ETableMemoryStore *etms, gint row, gpoi
  * must pass in etms->col_count args.
  */
 void
-e_table_memory_store_change_adopt (ETableMemoryStore *etms, gint row, gpointer data, ...)
+e_table_memory_store_change_adopt (ETableMemoryStore *etms,
+                                   gint row,
+                                   gpointer data,
+                                   ...)
 {
 	gpointer *store;
 	va_list args;
@@ -537,7 +587,8 @@ e_table_memory_store_change_adopt (ETableMemoryStore *etms, gint row, gpointer d
 }
 
 void
-e_table_memory_store_remove (ETableMemoryStore *etms, gint row)
+e_table_memory_store_remove (ETableMemoryStore *etms,
+                             gint row)
 {
 	ETableModel *model;
 	gint column_count, row_count;
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index cc62a6d0b5..28f10264f8 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -113,7 +113,8 @@ e_table_memory_new (void)
  * Return value:
  **/
 gpointer
-e_table_memory_get_data (ETableMemory *etmm, gint row)
+e_table_memory_get_data (ETableMemory *etmm,
+                         gint row)
 {
 	g_return_val_if_fail (row >= 0, NULL);
 	g_return_val_if_fail (row < etmm->priv->num_rows, NULL);
@@ -130,7 +131,9 @@ e_table_memory_get_data (ETableMemory *etmm, gint row)
  *
  **/
 void
-e_table_memory_set_data (ETableMemory *etmm, gint row, gpointer data)
+e_table_memory_set_data (ETableMemory *etmm,
+                         gint row,
+                         gpointer data)
 {
 	g_return_if_fail (row >= 0);
 	g_return_if_fail (row < etmm->priv->num_rows);
@@ -151,8 +154,8 @@ e_table_memory_set_data (ETableMemory *etmm, gint row, gpointer data)
  **/
 void
 e_table_memory_insert (ETableMemory *etmm,
-		       gint row,
-		       gpointer data)
+                       gint row,
+                       gpointer data)
 {
 	g_return_if_fail (row >= -1);
 	g_return_if_fail (row <= etmm->priv->num_rows);
@@ -185,7 +188,8 @@ e_table_memory_insert (ETableMemory *etmm,
  * Return value:
  **/
 gpointer
-e_table_memory_remove (ETableMemory *etmm, gint row)
+e_table_memory_remove (ETableMemory *etmm,
+                       gint row)
 {
 	gpointer ret;
 
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 77b462ec2a..6f44379858 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -90,7 +90,9 @@ e_table_model_row_count (ETableModel *e_table_model)
  *
  */
 void
-e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, gint row)
+e_table_model_append_row (ETableModel *e_table_model,
+                          ETableModel *source,
+                          gint row)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -119,7 +121,9 @@ e_table_model_append_row (ETableModel *e_table_model, ETableModel *source, gint
  * rows_inserted and no_change don't affect any data in this way.
  **/
 gpointer
-e_table_model_value_at (ETableModel *e_table_model, gint col, gint row)
+e_table_model_value_at (ETableModel *e_table_model,
+                        gint col,
+                        gint row)
 {
 	g_return_val_if_fail (e_table_model != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
@@ -143,7 +147,10 @@ e_table_model_value_at (ETableModel *e_table_model, gint col, gint row)
  * be a pointer to a set of data, or a datum that fits inside a gpointer .
  */
 void
-e_table_model_set_value_at (ETableModel *e_table_model, gint col, gint row, gconstpointer value)
+e_table_model_set_value_at (ETableModel *e_table_model,
+                            gint col,
+                            gint row,
+                            gconstpointer value)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -161,7 +168,9 @@ e_table_model_set_value_at (ETableModel *e_table_model, gint col, gint row, gcon
  * edited, %FALSE otherwise
  */
 gboolean
-e_table_model_is_cell_editable (ETableModel *e_table_model, gint col, gint row)
+e_table_model_is_cell_editable (ETableModel *e_table_model,
+                                gint col,
+                                gint row)
 {
 	g_return_val_if_fail (e_table_model != NULL, FALSE);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
@@ -170,7 +179,9 @@ e_table_model_is_cell_editable (ETableModel *e_table_model, gint col, gint row)
 }
 
 gpointer
-e_table_model_duplicate_value (ETableModel *e_table_model, gint col, gconstpointer value)
+e_table_model_duplicate_value (ETableModel *e_table_model,
+                               gint col,
+                               gconstpointer value)
 {
 	g_return_val_if_fail (e_table_model != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
@@ -182,7 +193,9 @@ e_table_model_duplicate_value (ETableModel *e_table_model, gint col, gconstpoint
 }
 
 void
-e_table_model_free_value (ETableModel *e_table_model, gint col, gpointer value)
+e_table_model_free_value (ETableModel *e_table_model,
+                          gint col,
+                          gpointer value)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -204,7 +217,8 @@ e_table_model_has_save_id (ETableModel *e_table_model)
 }
 
 gchar *
-e_table_model_get_save_id (ETableModel *e_table_model, gint row)
+e_table_model_get_save_id (ETableModel *e_table_model,
+                           gint row)
 {
 	g_return_val_if_fail (e_table_model != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
@@ -228,7 +242,8 @@ e_table_model_has_change_pending (ETableModel *e_table_model)
 }
 
 gpointer
-e_table_model_initialize_value (ETableModel *e_table_model, gint col)
+e_table_model_initialize_value (ETableModel *e_table_model,
+                                gint col)
 {
 	g_return_val_if_fail (e_table_model != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
@@ -240,7 +255,9 @@ e_table_model_initialize_value (ETableModel *e_table_model, gint col)
 }
 
 gboolean
-e_table_model_value_is_empty (ETableModel *e_table_model, gint col, gconstpointer value)
+e_table_model_value_is_empty (ETableModel *e_table_model,
+                              gint col,
+                              gconstpointer value)
 {
 	g_return_val_if_fail (e_table_model != NULL, FALSE);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), FALSE);
@@ -252,7 +269,9 @@ e_table_model_value_is_empty (ETableModel *e_table_model, gint col, gconstpointe
 }
 
 gchar *
-e_table_model_value_to_string (ETableModel *e_table_model, gint col, gconstpointer value)
+e_table_model_value_to_string (ETableModel *e_table_model,
+                               gint col,
+                               gconstpointer value)
 {
 	g_return_val_if_fail (e_table_model != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
@@ -462,7 +481,8 @@ e_table_model_changed (ETableModel *e_table_model)
  * object
  */
 void
-e_table_model_row_changed (ETableModel *e_table_model, gint row)
+e_table_model_row_changed (ETableModel *e_table_model,
+                           gint row)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -490,7 +510,9 @@ e_table_model_row_changed (ETableModel *e_table_model, gint row)
  * object
  */
 void
-e_table_model_cell_changed (ETableModel *e_table_model, gint col, gint row)
+e_table_model_cell_changed (ETableModel *e_table_model,
+                            gint col,
+                            gint row)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -518,7 +540,9 @@ e_table_model_cell_changed (ETableModel *e_table_model, gint col, gint row)
  * @e_table_model object
  */
 void
-e_table_model_rows_inserted (ETableModel *e_table_model, gint row, gint count)
+e_table_model_rows_inserted (ETableModel *e_table_model,
+                             gint row,
+                             gint count)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -544,7 +568,8 @@ e_table_model_rows_inserted (ETableModel *e_table_model, gint row, gint count)
  * the "model_rows_inserted" signal on the @e_table_model object
  */
 void
-e_table_model_row_inserted (ETableModel *e_table_model, gint row)
+e_table_model_row_inserted (ETableModel *e_table_model,
+                            gint row)
 {
 	e_table_model_rows_inserted (e_table_model, row, 1);
 }
@@ -561,7 +586,9 @@ e_table_model_row_inserted (ETableModel *e_table_model, gint row)
  * @e_table_model object
  */
 void
-e_table_model_rows_deleted (ETableModel *e_table_model, gint row, gint count)
+e_table_model_rows_deleted (ETableModel *e_table_model,
+                            gint row,
+                            gint count)
 {
 	g_return_if_fail (e_table_model != NULL);
 	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
@@ -587,7 +614,8 @@ e_table_model_rows_deleted (ETableModel *e_table_model, gint row, gint count)
  * the "model_rows_deleted" signal on the @e_table_model object
  */
 void
-e_table_model_row_deleted (ETableModel *e_table_model, gint row)
+e_table_model_row_deleted (ETableModel *e_table_model,
+                           gint row)
 {
 	e_table_model_rows_deleted (e_table_model, row, 1);
 }
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index 7683b935a4..ff38d94131 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -49,7 +49,9 @@ one_row_count (ETableModel *etm)
 }
 
 static gpointer
-one_value_at (ETableModel *etm, gint col, gint row)
+one_value_at (ETableModel *etm,
+              gint col,
+              gint row)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -60,7 +62,10 @@ one_value_at (ETableModel *etm, gint col, gint row)
 }
 
 static void
-one_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
+one_set_value_at (ETableModel *etm,
+                  gint col,
+                  gint row,
+                  gconstpointer val)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -71,7 +76,9 @@ one_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 }
 
 static gboolean
-one_is_cell_editable (ETableModel *etm, gint col, gint row)
+one_is_cell_editable (ETableModel *etm,
+                      gint col,
+                      gint row)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -83,7 +90,9 @@ one_is_cell_editable (ETableModel *etm, gint col, gint row)
 
 /* The default for one_duplicate_value is to return the raw value. */
 static gpointer
-one_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
+one_duplicate_value (ETableModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -94,7 +103,9 @@ one_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-one_free_value (ETableModel *etm, gint col, gpointer value)
+one_free_value (ETableModel *etm,
+                gint col,
+                gpointer value)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -103,7 +114,8 @@ one_free_value (ETableModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-one_initialize_value (ETableModel *etm, gint col)
+one_initialize_value (ETableModel *etm,
+                      gint col)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -114,7 +126,9 @@ one_initialize_value (ETableModel *etm, gint col)
 }
 
 static gboolean
-one_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
+one_value_is_empty (ETableModel *etm,
+                    gint col,
+                    gconstpointer value)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
@@ -125,7 +139,9 @@ one_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-one_value_to_string (ETableModel *etm, gint col, gconstpointer value)
+one_value_to_string (ETableModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETableOne *one = E_TABLE_ONE (etm);
 
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 955547fd7f..99f282c76f 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -32,8 +32,6 @@
 
 #define d(x)
 
-d (static gint depth = 0)
-
 struct _ETableSearchPrivate {
 	guint timeout_id;
 
@@ -49,6 +47,8 @@ enum {
 	LAST_SIGNAL
 };
 
+d (static gint depth = 0)
+
 static guint e_table_search_signals[LAST_SIGNAL] = { 0, };
 
 static gboolean
@@ -174,7 +174,8 @@ e_table_search_new (void)
  * Returns: the number of columns in the table search.
  */
 void
-e_table_search_input_character (ETableSearch *ets, gunichar character)
+e_table_search_input_character (ETableSearch *ets,
+                                gunichar character)
 {
 	gchar character_utf8[7];
 	gchar *temp_string;
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index b8f33c639e..0320663e8e 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -44,7 +44,8 @@ enum {
 };
 
 static void
-save_to_hash (gint model_row, gpointer closure)
+save_to_hash (gint model_row,
+              gpointer closure)
 {
 	ETableSelectionModel *etsm = closure;
 	const gchar *key = e_table_model_get_save_id (etsm->model, model_row);
@@ -65,7 +66,8 @@ free_hash (ETableSelectionModel *etsm)
 }
 
 static void
-model_pre_change (ETableModel *etm, ETableSelectionModel *etsm)
+model_pre_change (ETableModel *etm,
+                  ETableSelectionModel *etsm)
 {
 	free_hash (etsm);
 
@@ -131,7 +133,8 @@ model_changed_idle (ETableSelectionModel *etsm)
 }
 
 static void
-model_changed (ETableModel *etm, ETableSelectionModel *etsm)
+model_changed (ETableModel *etm,
+               ETableSelectionModel *etsm)
 {
 	e_selection_model_clear (E_SELECTION_MODEL (etsm));
 	if (!etsm->model_changed_idle_id && etm && e_table_model_has_save_id (etm)) {
@@ -140,27 +143,38 @@ model_changed (ETableModel *etm, ETableSelectionModel *etsm)
 }
 
 static void
-model_row_changed (ETableModel *etm, gint row, ETableSelectionModel *etsm)
+model_row_changed (ETableModel *etm,
+                   gint row,
+                   ETableSelectionModel *etsm)
 {
 	free_hash (etsm);
 }
 
 static void
-model_cell_changed (ETableModel *etm, gint col, gint row, ETableSelectionModel *etsm)
+model_cell_changed (ETableModel *etm,
+                    gint col,
+                    gint row,
+                    ETableSelectionModel *etsm)
 {
 	free_hash (etsm);
 }
 
 #if 1
 static void
-model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm)
+model_rows_inserted (ETableModel *etm,
+                     gint row,
+                     gint count,
+                     ETableSelectionModel *etsm)
 {
 	e_selection_model_array_insert_rows (E_SELECTION_MODEL_ARRAY (etsm), row, count);
 	free_hash (etsm);
 }
 
 static void
-model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm)
+model_rows_deleted (ETableModel *etm,
+                    gint row,
+                    gint count,
+                    ETableSelectionModel *etsm)
 {
 	e_selection_model_array_delete_rows (E_SELECTION_MODEL_ARRAY (etsm), row, count);
 	free_hash (etsm);
@@ -169,36 +183,49 @@ model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSelectionModel
 #else
 
 static void
-model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm)
+model_rows_inserted (ETableModel *etm,
+                     gint row,
+                     gint count,
+                     ETableSelectionModel *etsm)
 {
 	model_changed (etm, etsm);
 }
 
 static void
-model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSelectionModel *etsm)
+model_rows_deleted (ETableModel *etm,
+                    gint row,
+                    gint count,
+                    ETableSelectionModel *etsm)
 {
 	model_changed (etm, etsm);
 }
 #endif
 
 inline static void
-add_model (ETableSelectionModel *etsm, ETableModel *model)
+add_model (ETableSelectionModel *etsm,
+           ETableModel *model)
 {
 	etsm->model = model;
 	if (model) {
 		g_object_ref (model);
-		etsm->model_pre_change_id = g_signal_connect(G_OBJECT(model), "model_pre_change",
-							G_CALLBACK (model_pre_change), etsm);
-		etsm->model_changed_id = g_signal_connect(G_OBJECT(model), "model_changed",
-							G_CALLBACK (model_changed), etsm);
-		etsm->model_row_changed_id = g_signal_connect(G_OBJECT(model), "model_row_changed",
-							G_CALLBACK (model_row_changed), etsm);
-		etsm->model_cell_changed_id = g_signal_connect(G_OBJECT(model), "model_cell_changed",
-							G_CALLBACK (model_cell_changed), etsm);
-		etsm->model_rows_inserted_id = g_signal_connect(G_OBJECT(model), "model_rows_inserted",
-							G_CALLBACK (model_rows_inserted), etsm);
-		etsm->model_rows_deleted_id = g_signal_connect(G_OBJECT(model), "model_rows_deleted",
-							G_CALLBACK (model_rows_deleted), etsm);
+		etsm->model_pre_change_id = g_signal_connect (
+			model, "model_pre_change",
+			G_CALLBACK (model_pre_change), etsm);
+		etsm->model_changed_id = g_signal_connect (
+			model, "model_changed",
+			G_CALLBACK (model_changed), etsm);
+		etsm->model_row_changed_id = g_signal_connect (
+			model, "model_row_changed",
+			G_CALLBACK (model_row_changed), etsm);
+		etsm->model_cell_changed_id = g_signal_connect (
+			model, "model_cell_changed",
+			G_CALLBACK (model_cell_changed), etsm);
+		etsm->model_rows_inserted_id = g_signal_connect (
+			model, "model_rows_inserted",
+			G_CALLBACK (model_rows_inserted), etsm);
+		etsm->model_rows_deleted_id = g_signal_connect (
+			model, "model_rows_deleted",
+			G_CALLBACK (model_rows_deleted), etsm);
 	}
 	e_selection_model_array_confirm_row_count (E_SELECTION_MODEL_ARRAY (etsm));
 }
@@ -244,11 +271,14 @@ etsm_dispose (GObject *object)
 }
 
 static void
-etsm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etsm_get_property (GObject *object,
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
 	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_MODEL:
 		g_value_set_object (value, etsm->model);
 		break;
@@ -259,11 +289,14 @@ etsm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 }
 
 static void
-etsm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+etsm_set_property (GObject *object,
+                   guint property_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
 {
 	ETableSelectionModel *etsm = E_TABLE_SELECTION_MODEL (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_MODEL:
 		drop_model (etsm);
 		add_model (etsm, g_value_get_object (value) ? E_TABLE_MODEL (g_value_get_object (value)) : NULL);
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index f144980f03..02309c047a 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -35,7 +35,7 @@
 	(G_TYPE_CHECK_INSTANCE_CAST \
 	((obj), E_TYPE_TABLE_SELECTION_MODEL, ETableSelectionModel))
 #define E_TABLE_SELECTION_MODEL_CLASS(cls) \
-	(G_TYPE-CHECK_CLASS_CAST \
+	(G_TYPE - CHECK_CLASS_CAST \
 	((cls), E_TYPE_TABLE_SELECTION_MODEL, ETableSelectionModelClass))
 #define E_IS_TABLE_SELECTION_MODEL(obj) \
 	(G_TYPE_CHECK_INSTANCE_TYPE \
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index b488dbce06..cac2586b8a 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -141,7 +141,7 @@ e_table_sort_info_group_info_changed (ETableSortInfo *info)
  * trigger any signals that might have been queued.
  */
 void
-e_table_sort_info_freeze             (ETableSortInfo *info)
+e_table_sort_info_freeze (ETableSortInfo *info)
 {
 	info->frozen++;
 }
@@ -158,7 +158,7 @@ e_table_sort_info_freeze             (ETableSortInfo *info)
  * this object.
  */
 void
-e_table_sort_info_thaw               (ETableSortInfo *info)
+e_table_sort_info_thaw (ETableSortInfo *info)
 {
 	info->frozen--;
 	if (info->frozen != 0)
@@ -190,7 +190,8 @@ e_table_sort_info_grouping_get_count (ETableSortInfo *info)
 }
 
 static void
-e_table_sort_info_grouping_real_truncate  (ETableSortInfo *info, gint length)
+e_table_sort_info_grouping_real_truncate (ETableSortInfo *info,
+                                          gint length)
 {
 	if (length < info->group_count) {
 		info->group_count = length;
@@ -210,7 +211,8 @@ e_table_sort_info_grouping_real_truncate  (ETableSortInfo *info, gint length)
  * criteria in the object.
  */
 void
-e_table_sort_info_grouping_truncate  (ETableSortInfo *info, gint length)
+e_table_sort_info_grouping_truncate (ETableSortInfo *info,
+                                     gint length)
 {
 	e_table_sort_info_grouping_real_truncate (info, length);
 	e_table_sort_info_group_info_changed (info);
@@ -224,7 +226,8 @@ e_table_sort_info_grouping_truncate  (ETableSortInfo *info, gint length)
  * Returns: the description of the @n-th grouping criteria in the @info object.
  */
 ETableSortColumn
-e_table_sort_info_grouping_get_nth   (ETableSortInfo *info, gint n)
+e_table_sort_info_grouping_get_nth (ETableSortInfo *info,
+                                    gint n)
 {
 	if (info->can_group && n < info->group_count) {
 		return info->groupings[n];
@@ -244,7 +247,9 @@ e_table_sort_info_grouping_get_nth   (ETableSortInfo *info, gint n)
  * whether it is ascending or descending).
  */
 void
-e_table_sort_info_grouping_set_nth   (ETableSortInfo *info, gint n, ETableSortColumn column)
+e_table_sort_info_grouping_set_nth (ETableSortInfo *info,
+                                    gint n,
+                                    ETableSortColumn column)
 {
 	if (n >= info->group_count) {
 		e_table_sort_info_grouping_real_truncate (info, n + 1);
@@ -266,7 +271,8 @@ e_table_sort_info_sorting_get_count (ETableSortInfo *info)
 }
 
 static void
-e_table_sort_info_sorting_real_truncate  (ETableSortInfo *info, gint length)
+e_table_sort_info_sorting_real_truncate (ETableSortInfo *info,
+                                         gint length)
 {
 	if (length < info->sort_count) {
 		info->sort_count = length;
@@ -286,7 +292,8 @@ e_table_sort_info_sorting_real_truncate  (ETableSortInfo *info, gint length)
  * criteria in the object.
  */
 void
-e_table_sort_info_sorting_truncate  (ETableSortInfo *info, gint length)
+e_table_sort_info_sorting_truncate (ETableSortInfo *info,
+                                    gint length)
 {
 	e_table_sort_info_sorting_real_truncate  (info, length);
 	e_table_sort_info_sort_info_changed (info);
@@ -300,7 +307,8 @@ e_table_sort_info_sorting_truncate  (ETableSortInfo *info, gint length)
  * Returns: the description of the @n-th grouping criteria in the @info object.
  */
 ETableSortColumn
-e_table_sort_info_sorting_get_nth   (ETableSortInfo *info, gint n)
+e_table_sort_info_sorting_get_nth (ETableSortInfo *info,
+                                   gint n)
 {
 	if (n < info->sort_count) {
 		return info->sortings[n];
@@ -320,7 +328,9 @@ e_table_sort_info_sorting_get_nth   (ETableSortInfo *info, gint n)
  * column number and whether it is ascending or descending).
  */
 void
-e_table_sort_info_sorting_set_nth   (ETableSortInfo *info, gint n, ETableSortColumn column)
+e_table_sort_info_sorting_set_nth (ETableSortInfo *info,
+                                   gint n,
+                                   ETableSortColumn column)
 {
 	if (n >= info->sort_count) {
 		e_table_sort_info_sorting_real_truncate (info, n + 1);
@@ -356,8 +366,8 @@ e_table_sort_info_new (void)
  */
 void
 e_table_sort_info_load_from_node (ETableSortInfo *info,
-				  xmlNode        *node,
-				  gdouble         state_version)
+                                  xmlNode *node,
+                                  gdouble state_version)
 {
 	gint i;
 	xmlNode *grouping;
@@ -412,7 +422,7 @@ e_table_sort_info_load_from_node (ETableSortInfo *info,
  */
 xmlNode *
 e_table_sort_info_save_to_node (ETableSortInfo *info,
-				xmlNode        *parent)
+                                xmlNode *parent)
 {
 	xmlNode *grouping;
 	gint i;
@@ -461,14 +471,14 @@ e_table_sort_info_duplicate (ETableSortInfo *info)
 }
 
 void
-e_table_sort_info_set_can_group       (ETableSortInfo   *info,
-				       gboolean          can_group)
+e_table_sort_info_set_can_group (ETableSortInfo *info,
+                                 gboolean can_group)
 {
 	info->can_group = can_group;
 }
 
 gboolean
-e_table_sort_info_get_can_group       (ETableSortInfo   *info)
+e_table_sort_info_get_can_group (ETableSortInfo *info)
 {
 	return info->can_group;
 }
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 0ed35c95a6..7792795477 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -122,8 +122,8 @@ etsv_insert_idle (ETableSortedVariable *etsv)
 }
 
 static void
-etsv_add       (ETableSubsetVariable *etssv,
-		gint                  row)
+etsv_add (ETableSubsetVariable *etssv,
+          gint row)
 {
 	ETableModel *etm = E_TABLE_MODEL (etssv);
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -139,7 +139,7 @@ etsv_add       (ETableSubsetVariable *etssv,
 	i = etss->n_map;
 	if (etsv->sort_idle_id == 0) {
 		/* this is to see if we're inserting a lot of things between idle loops.
-		   If we are, we're busy, its faster to just append and perform a full sort later */
+		 * If we are, we're busy, its faster to just append and perform a full sort later */
 		etsv->insert_count++;
 		if (etsv->insert_count > ETSV_INSERT_MAX) {
 			/* schedule a sort, and append instead */
@@ -160,7 +160,7 @@ etsv_add       (ETableSubsetVariable *etssv,
 }
 
 static void
-etsv_add_all   (ETableSubsetVariable *etssv)
+etsv_add_all (ETableSubsetVariable *etssv)
 {
 	ETableModel *etm = E_TABLE_MODEL (etssv);
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -187,7 +187,9 @@ etsv_add_all   (ETableSubsetVariable *etssv)
 }
 
 ETableModel *
-e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
+e_table_sorted_variable_new (ETableModel *source,
+                             ETableHeader *full_header,
+                             ETableSortInfo *sort_info)
 {
 	ETableSortedVariable *etsv = g_object_new (E_TYPE_TABLE_SORTED_VARIABLE, NULL);
 	ETableSubsetVariable *etssv = E_TABLE_SUBSET_VARIABLE (etsv);
@@ -202,14 +204,16 @@ e_table_sorted_variable_new (ETableModel *source, ETableHeader *full_header, ETa
 	etsv->full_header = full_header;
 	g_object_ref (etsv->full_header);
 
-	etsv->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed",
-						       G_CALLBACK (etsv_sort_info_changed), etsv);
+	etsv->sort_info_changed_id = g_signal_connect (
+		sort_info, "sort_info_changed",
+		G_CALLBACK (etsv_sort_info_changed), etsv);
 
 	return E_TABLE_MODEL (etsv);
 }
 
 static void
-etsv_sort_info_changed (ETableSortInfo *info, ETableSortedVariable *etsv)
+etsv_sort_info_changed (ETableSortInfo *info,
+                        ETableSortedVariable *etsv)
 {
 	etsv_sort (etsv);
 }
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 61ea10c082..fe5f644dbf 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -125,7 +125,9 @@ ets_insert_idle (ETableSorted *ets)
 }
 
 ETableModel *
-e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
+e_table_sorted_new (ETableModel *source,
+                    ETableHeader *full_header,
+                    ETableSortInfo *sort_info)
 {
 	ETableSorted *ets = g_object_new (E_TYPE_TABLE_SORTED, NULL);
 	ETableSubset *etss = E_TABLE_SUBSET (ets);
@@ -145,20 +147,23 @@ e_table_sorted_new (ETableModel *source, ETableHeader *full_header, ETableSortIn
 
 	ets_proxy_model_changed (etss, source);
 
-	ets->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed",
-						      G_CALLBACK (ets_sort_info_changed), ets);
+	ets->sort_info_changed_id = g_signal_connect (
+		sort_info, "sort_info_changed",
+		G_CALLBACK (ets_sort_info_changed), ets);
 
 	return E_TABLE_MODEL (ets);
 }
 
 static void
-ets_sort_info_changed (ETableSortInfo *info, ETableSorted *ets)
+ets_sort_info_changed (ETableSortInfo *info,
+                       ETableSorted *ets)
 {
 	ets_sort (ets);
 }
 
 static void
-ets_proxy_model_changed (ETableSubset *subset, ETableModel *source)
+ets_proxy_model_changed (ETableSubset *subset,
+                         ETableModel *source)
 {
 	gint rows, i;
 
@@ -179,7 +184,9 @@ ets_proxy_model_changed (ETableSubset *subset, ETableModel *source)
 }
 
 static void
-ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, gint row)
+ets_proxy_model_row_changed (ETableSubset *subset,
+                             ETableModel *source,
+                             gint row)
 {
 	if (!E_TABLE_SORTED (subset)->sort_idle_id)
 		E_TABLE_SORTED (subset)->sort_idle_id = g_idle_add_full (50, (GSourceFunc) ets_sort_idle, subset, NULL);
@@ -189,7 +196,10 @@ ets_proxy_model_row_changed (ETableSubset *subset, ETableModel *source, gint row
 }
 
 static void
-ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint col, gint row)
+ets_proxy_model_cell_changed (ETableSubset *subset,
+                              ETableModel *source,
+                              gint col,
+                              gint row)
 {
 	ETableSorted *ets = E_TABLE_SORTED (subset);
 	if (e_table_sorting_utils_affects_sort (ets->sort_info, ets->full_header, col))
@@ -199,7 +209,10 @@ ets_proxy_model_cell_changed (ETableSubset *subset, ETableModel *source, gint co
 }
 
 static void
-ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row, gint count)
+ets_proxy_model_rows_inserted (ETableSubset *etss,
+                               ETableModel *source,
+                               gint row,
+                               gint count)
 {
 	ETableModel *etm = E_TABLE_MODEL (etss);
 	ETableSorted *ets = E_TABLE_SORTED (etss);
@@ -228,7 +241,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row
 		i = etss->n_map;
 		if (ets->sort_idle_id == 0) {
 			/* this is to see if we're inserting a lot of things between idle loops.
-			   If we are, we're busy, its faster to just append and perform a full sort later */
+			 * If we are, we're busy, its faster to just append and perform a full sort later */
 			ets->insert_count++;
 			if (ets->insert_count > ETS_INSERT_MAX) {
 				/* schedule a sort, and append instead */
@@ -259,7 +272,10 @@ ets_proxy_model_rows_inserted (ETableSubset *etss, ETableModel *source, gint row
 }
 
 static void
-ets_proxy_model_rows_deleted (ETableSubset *etss, ETableModel *source, gint row, gint count)
+ets_proxy_model_rows_deleted (ETableSubset *etss,
+                              ETableModel *source,
+                              gint row,
+                              gint count)
 {
 	ETableModel *etm = E_TABLE_MODEL (etss);
 	gint i;
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index d74dbd3d04..418ce3a5e8 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -115,11 +115,14 @@ ets_dispose (GObject *object)
 }
 
 static void
-ets_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+ets_set_property (GObject *object,
+                  guint property_id,
+                  const GValue *value,
+                  GParamSpec *pspec)
 {
 	ETableSorter *ets = E_TABLE_SORTER (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_SORT_INFO:
 		if (ets->sort_info) {
 			if (ets->sort_info_changed_id)
@@ -144,10 +147,13 @@ ets_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpe
 }
 
 static void
-ets_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+ets_get_property (GObject *object,
+                  guint property_id,
+                  GValue *value,
+                  GParamSpec *pspec)
 {
 	ETableSorter *ets = E_TABLE_SORTER (object);
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_SORT_INFO:
 		g_value_set_object (value, ets->sort_info);
 		break;
@@ -197,7 +203,9 @@ ets_init (ETableSorter *ets)
 }
 
 ETableSorter *
-e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
+e_table_sorter_new (ETableModel *source,
+                    ETableHeader *full_header,
+                    ETableSortInfo *sort_info)
 {
 	ETableSorter *ets = g_object_new (E_TYPE_TABLE_SORTER, NULL);
 
@@ -227,37 +235,50 @@ e_table_sorter_new (ETableModel *source, ETableHeader *full_header, ETableSortIn
 }
 
 static void
-ets_model_changed (ETableModel *etm, ETableSorter *ets)
+ets_model_changed (ETableModel *etm,
+                   ETableSorter *ets)
 {
 	ets_clean (ets);
 }
 
 static void
-ets_model_row_changed (ETableModel *etm, gint row, ETableSorter *ets)
+ets_model_row_changed (ETableModel *etm,
+                       gint row,
+                       ETableSorter *ets)
 {
 	ets_clean (ets);
 }
 
 static void
-ets_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSorter *ets)
+ets_model_cell_changed (ETableModel *etm,
+                        gint col,
+                        gint row,
+                        ETableSorter *ets)
 {
 	ets_clean (ets);
 }
 
 static void
-ets_model_rows_inserted (ETableModel *etm, gint row, gint count, ETableSorter *ets)
+ets_model_rows_inserted (ETableModel *etm,
+                         gint row,
+                         gint count,
+                         ETableSorter *ets)
 {
 	ets_clean (ets);
 }
 
 static void
-ets_model_rows_deleted (ETableModel *etm, gint row, gint count, ETableSorter *ets)
+ets_model_rows_deleted (ETableModel *etm,
+                        gint row,
+                        gint count,
+                        ETableSorter *ets)
 {
 	ets_clean (ets);
 }
 
 static void
-ets_sort_info_changed (ETableSortInfo *info, ETableSorter *ets)
+ets_sort_info_changed (ETableSortInfo *info,
+                       ETableSorter *ets)
 {
 	d(g_print ("sort info changed\n"));
 	ets_clean (ets);
@@ -275,7 +296,9 @@ struct qsort_data {
 /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
 
 static gint
-qsort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
+qsort_callback (gconstpointer data1,
+                gconstpointer data2,
+                gpointer user_data)
 {
 	struct qsort_data *qd = (struct qsort_data *) user_data;
 	gint row1 = *(gint *) data1;
@@ -390,7 +413,8 @@ ets_backsort (ETableSorter *ets)
 }
 
 static gint
-ets_model_to_sorted (ESorter *es, gint row)
+ets_model_to_sorted (ESorter *es,
+                     gint row)
 {
 	ETableSorter *ets = E_TABLE_SORTER (es);
 	gint rows = e_table_model_row_count (ets->source);
@@ -408,7 +432,8 @@ ets_model_to_sorted (ESorter *es, gint row)
 }
 
 static gint
-ets_sorted_to_model (ESorter *es, gint row)
+ets_sorted_to_model (ESorter *es,
+                     gint row)
 {
 	ETableSorter *ets = E_TABLE_SORTER (es);
 	gint rows = e_table_model_row_count (ets->source);
@@ -426,7 +451,9 @@ ets_sorted_to_model (ESorter *es, gint row)
 }
 
 static void
-ets_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
+ets_get_model_to_sorted_array (ESorter *es,
+                               gint **array,
+                               gint *count)
 {
 	ETableSorter *ets = E_TABLE_SORTER (es);
 	if (array || count) {
@@ -440,7 +467,9 @@ ets_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
 }
 
 static void
-ets_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
+ets_get_sorted_to_model_array (ESorter *es,
+                               gint **array,
+                               gint *count)
 {
 	ETableSorter *ets = E_TABLE_SORTER (es);
 	if (array || count) {
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index e654f94b9c..a94c45f7b0 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -35,7 +35,12 @@
 
 /* This takes source rows. */
 static gint
-etsu_compare (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint row1, gint row2, gpointer cmp_cache)
+etsu_compare (ETableModel *source,
+              ETableSortInfo *sort_info,
+              ETableHeader *full_header,
+              gint row1,
+              gint row2,
+              gpointer cmp_cache)
 {
 	gint j;
 	gint sort_count = e_table_sort_info_sorting_get_count (sort_info);
@@ -84,7 +89,9 @@ typedef struct {
 /* FIXME: Make it not cache the second and later columns (as if anyone cares.) */
 
 static gint
-e_sort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
+e_sort_callback (gconstpointer data1,
+                 gconstpointer data2,
+                 gpointer user_data)
 {
 	gint row1 = *(gint *) data1;
 	gint row2 = *(gint *) data2;
@@ -111,7 +118,11 @@ e_sort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
 }
 
 void
-e_table_sorting_utils_sort (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows)
+e_table_sorting_utils_sort (ETableModel *source,
+                            ETableSortInfo *sort_info,
+                            ETableHeader *full_header,
+                            gint *map_table,
+                            gint rows)
 {
 	gint total_rows;
 	gint i;
@@ -158,9 +169,9 @@ e_table_sorting_utils_sort (ETableModel *source, ETableSortInfo *sort_info, ETab
 }
 
 gboolean
-e_table_sorting_utils_affects_sort  (ETableSortInfo *sort_info,
-				     ETableHeader   *full_header,
-				     gint             col)
+e_table_sorting_utils_affects_sort (ETableSortInfo *sort_info,
+                                    ETableHeader *full_header,
+                                    gint col)
 {
 	gint j;
 	gint cols;
@@ -186,7 +197,12 @@ e_table_sorting_utils_affects_sort  (ETableSortInfo *sort_info,
 
 /* FIXME: This could be done in time log n instead of time n with a binary search. */
 gint
-e_table_sorting_utils_insert (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint row)
+e_table_sorting_utils_insert (ETableModel *source,
+                              ETableSortInfo *sort_info,
+                              ETableHeader *full_header,
+                              gint *map_table,
+                              gint rows,
+                              gint row)
 {
 	gint i;
 	gpointer cmp_cache = e_table_sorting_utils_create_cmp_cache ();
@@ -203,7 +219,12 @@ e_table_sorting_utils_insert (ETableModel *source, ETableSortInfo *sort_info, ET
 
 /* FIXME: This could be done in time log n instead of time n with a binary search. */
 gint
-e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint view_row)
+e_table_sorting_utils_check_position (ETableModel *source,
+                                      ETableSortInfo *sort_info,
+                                      ETableHeader *full_header,
+                                      gint *map_table,
+                                      gint rows,
+                                      gint view_row)
 {
 	gint i;
 	gint row;
@@ -231,7 +252,12 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_
 
 /* This takes source rows. */
 static gint
-etsu_tree_compare (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2, gpointer cmp_cache)
+etsu_tree_compare (ETreeModel *source,
+                   ETableSortInfo *sort_info,
+                   ETableHeader *full_header,
+                   ETreePath path1,
+                   ETreePath path2,
+                   gpointer cmp_cache)
 {
 	gint j;
 	gint sort_count = e_table_sort_info_sorting_get_count (sort_info);
@@ -257,7 +283,9 @@ etsu_tree_compare (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *
 }
 
 static gint
-e_sort_tree_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
+e_sort_tree_callback (gconstpointer data1,
+                      gconstpointer data2,
+                      gpointer user_data)
 {
 	ETreePath *path1 = *(ETreePath *) data1;
 	ETreePath *path2 = *(ETreePath *) data2;
@@ -267,7 +295,11 @@ e_sort_tree_callback (gconstpointer data1, gconstpointer data2, gpointer user_da
 }
 
 void
-e_table_sorting_utils_tree_sort (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count)
+e_table_sorting_utils_tree_sort (ETreeModel *source,
+                                 ETableSortInfo *sort_info,
+                                 ETableHeader *full_header,
+                                 ETreePath *map_table,
+                                 gint count)
 {
 	ETableSortClosure closure;
 	gint cols;
@@ -331,7 +363,12 @@ e_table_sorting_utils_tree_sort (ETreeModel *source, ETableSortInfo *sort_info,
 
 /* FIXME: This could be done in time log n instead of time n with a binary search. */
 gint
-e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count, gint old_index)
+e_table_sorting_utils_tree_check_position (ETreeModel *source,
+                                           ETableSortInfo *sort_info,
+                                           ETableHeader *full_header,
+                                           ETreePath *map_table,
+                                           gint count,
+                                           gint old_index)
 {
 	gint i;
 	ETreePath path;
@@ -357,7 +394,12 @@ e_table_sorting_utils_tree_check_position (ETreeModel *source, ETableSortInfo *s
 
 /* FIXME: This does not pay attention to making sure that it's a stable insert.  This needs to be fixed. */
 gint
-e_table_sorting_utils_tree_insert (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath *map_table, gint count, ETreePath path)
+e_table_sorting_utils_tree_insert (ETreeModel *source,
+                                   ETableSortInfo *sort_info,
+                                   ETableHeader *full_header,
+                                   ETreePath *map_table,
+                                   gint count,
+                                   ETreePath path)
 {
 	gsize start;
 	gsize end;
@@ -418,7 +460,9 @@ e_table_sorting_utils_free_cmp_cache (gpointer cmp_cache)
  * Note: Given @value will be stolen and later freed with g_free.
  **/
 void
-e_table_sorting_utils_add_to_cmp_cache (gpointer cmp_cache, const gchar *key, gchar *value)
+e_table_sorting_utils_add_to_cmp_cache (gpointer cmp_cache,
+                                        const gchar *key,
+                                        gchar *value)
 {
 	g_return_if_fail (cmp_cache != NULL);
 	g_return_if_fail (key != NULL);
@@ -436,7 +480,8 @@ e_table_sorting_utils_add_to_cmp_cache (gpointer cmp_cache, const gchar *key, gc
  * with a key.
  **/
 const gchar *
-e_table_sorting_utils_lookup_cmp_cache (gpointer cmp_cache, const gchar *key)
+e_table_sorting_utils_lookup_cmp_cache (gpointer cmp_cache,
+                                        const gchar *key)
 {
 	g_return_val_if_fail (key != NULL, NULL);
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 76c268ad11..03f0e4503b 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -129,7 +129,7 @@ e_table_specification_new (void)
  */
 gboolean
 e_table_specification_load_from_file (ETableSpecification *specification,
-				      const gchar          *filename)
+                                      const gchar *filename)
 {
 	xmlDoc *doc;
 
@@ -156,7 +156,7 @@ e_table_specification_load_from_file (ETableSpecification *specification,
  */
 gboolean
 e_table_specification_load_from_string (ETableSpecification *specification,
-					const gchar          *xml)
+                                        const gchar *xml)
 {
 	xmlDoc *doc;
 	doc = xmlParseMemory ( (gchar *) xml, strlen (xml));
@@ -180,7 +180,7 @@ e_table_specification_load_from_string (ETableSpecification *specification,
  */
 void
 e_table_specification_load_from_node (ETableSpecification *specification,
-				      const xmlNode       *node)
+                                      const xmlNode *node)
 {
 	gchar *temp;
 	xmlNode *children;
@@ -285,7 +285,7 @@ e_table_specification_load_from_node (ETableSpecification *specification,
  */
 gint
 e_table_specification_save_to_file (ETableSpecification *specification,
-				    const gchar          *filename)
+                                    const gchar *filename)
 {
 	xmlDoc *doc;
 	gint ret;
@@ -349,7 +349,7 @@ e_table_specification_save_to_string (ETableSpecification *specification)
  */
 xmlNode *
 e_table_specification_save_to_node (ETableSpecification *specification,
-				    xmlDoc              *doc)
+                                    xmlDoc *doc)
 {
 	xmlNode *node;
 	const gchar *s;
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 0bb311b8c4..785c807442 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -116,8 +116,8 @@ e_table_state_vanilla (gint col_count)
 }
 
 gboolean
-e_table_state_load_from_file    (ETableState *state,
-				 const gchar          *filename)
+e_table_state_load_from_file (ETableState *state,
+                              const gchar *filename)
 {
 	xmlDoc *doc;
 
@@ -135,8 +135,8 @@ e_table_state_load_from_file    (ETableState *state,
 }
 
 void
-e_table_state_load_from_string  (ETableState *state,
-				 const gchar          *xml)
+e_table_state_load_from_string (ETableState *state,
+                                const gchar *xml)
 {
 	xmlDoc *doc;
 
@@ -158,7 +158,7 @@ typedef struct {
 
 void
 e_table_state_load_from_node (ETableState *state,
-			      const xmlNode *node)
+                              const xmlNode *node)
 {
 	xmlNode *children;
 	GList *list = NULL, *iterator;
@@ -215,8 +215,8 @@ e_table_state_load_from_node (ETableState *state,
 }
 
 void
-e_table_state_save_to_file      (ETableState *state,
-				 const gchar          *filename)
+e_table_state_save_to_file (ETableState *state,
+                            const gchar *filename)
 {
 	xmlDoc *doc;
 
@@ -231,7 +231,7 @@ e_table_state_save_to_file      (ETableState *state,
 }
 
 gchar *
-e_table_state_save_to_string    (ETableState *state)
+e_table_state_save_to_string (ETableState *state)
 {
 	gchar *ret_val;
 	xmlChar *string;
@@ -251,8 +251,8 @@ e_table_state_save_to_string    (ETableState *state)
 }
 
 xmlNode *
-e_table_state_save_to_node      (ETableState *state,
-				 xmlNode     *parent)
+e_table_state_save_to_node (ETableState *state,
+                            xmlNode *parent)
 {
 	gint i;
 	xmlNode *node;
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 99fed4ba02..a40859b492 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -40,8 +40,8 @@ G_DEFINE_TYPE (ETableSubsetVariable, etssv, E_TYPE_TABLE_SUBSET)
 #define INCREMENT_AMOUNT 10
 
 static void
-etssv_add       (ETableSubsetVariable *etssv,
-		 gint                  row)
+etssv_add (ETableSubsetVariable *etssv,
+           gint row)
 {
 	ETableModel *etm = E_TABLE_MODEL (etssv);
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -62,8 +62,8 @@ etssv_add       (ETableSubsetVariable *etssv,
 
 static void
 etssv_add_array (ETableSubsetVariable *etssv,
-		 const gint           *array,
-		 gint                  count)
+                 const gint *array,
+                 gint count)
 {
 	ETableModel *etm = E_TABLE_MODEL (etssv);
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -84,7 +84,7 @@ etssv_add_array (ETableSubsetVariable *etssv,
 }
 
 static void
-etssv_add_all   (ETableSubsetVariable *etssv)
+etssv_add_all (ETableSubsetVariable *etssv)
 {
 	ETableModel *etm = E_TABLE_MODEL (etssv);
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -107,8 +107,8 @@ etssv_add_all   (ETableSubsetVariable *etssv)
 }
 
 static gboolean
-etssv_remove    (ETableSubsetVariable *etssv,
-		 gint                  row)
+etssv_remove (ETableSubsetVariable *etssv,
+              gint row)
 {
 	ETableModel *etm = E_TABLE_MODEL (etssv);
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -147,7 +147,7 @@ etssv_init (ETableSubsetVariable *etssv)
 
 ETableModel *
 e_table_subset_variable_construct (ETableSubsetVariable *etssv,
-				   ETableModel          *source)
+                                   ETableModel *source)
 {
 	if (e_table_subset_construct (E_TABLE_SUBSET (etssv), source, 1) == NULL)
 		return NULL;
@@ -170,8 +170,8 @@ e_table_subset_variable_new (ETableModel *source)
 }
 
 void
-e_table_subset_variable_add       (ETableSubsetVariable *etssv,
-				   gint                  row)
+e_table_subset_variable_add (ETableSubsetVariable *etssv,
+                             gint row)
 {
 	g_return_if_fail (etssv != NULL);
 	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE (etssv));
@@ -181,9 +181,9 @@ e_table_subset_variable_add       (ETableSubsetVariable *etssv,
 }
 
 void
-e_table_subset_variable_add_array   (ETableSubsetVariable *etssv,
-				     const gint           *array,
-				     gint                  count)
+e_table_subset_variable_add_array (ETableSubsetVariable *etssv,
+                                   const gint *array,
+                                   gint count)
 {
 	g_return_if_fail (etssv != NULL);
 	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE (etssv));
@@ -193,7 +193,7 @@ e_table_subset_variable_add_array   (ETableSubsetVariable *etssv,
 }
 
 void
-e_table_subset_variable_add_all   (ETableSubsetVariable *etssv)
+e_table_subset_variable_add_all (ETableSubsetVariable *etssv)
 {
 	g_return_if_fail (etssv != NULL);
 	g_return_if_fail (E_IS_TABLE_SUBSET_VARIABLE (etssv));
@@ -203,8 +203,8 @@ e_table_subset_variable_add_all   (ETableSubsetVariable *etssv)
 }
 
 gboolean
-e_table_subset_variable_remove    (ETableSubsetVariable *etssv,
-				   gint                  row)
+e_table_subset_variable_remove (ETableSubsetVariable *etssv,
+                                gint row)
 {
 	g_return_val_if_fail (etssv != NULL, FALSE);
 	g_return_val_if_fail (E_IS_TABLE_SUBSET_VARIABLE (etssv), FALSE);
@@ -224,7 +224,7 @@ e_table_subset_variable_clear (ETableSubsetVariable *etssv)
 	e_table_model_pre_change (etm);
 	etss->n_map = 0;
 	g_free (etss->map_table);
-	etss->map_table = (gint *) g_new (unsigned int, 1);
+	etss->map_table = (gint *) g_new (guint, 1);
 	etssv->n_vals_allocated = 1;
 
 	e_table_model_changed (etm);
@@ -232,8 +232,8 @@ e_table_subset_variable_clear (ETableSubsetVariable *etssv)
 
 void
 e_table_subset_variable_increment (ETableSubsetVariable *etssv,
-				   gint                  position,
-				   gint                  amount)
+                                   gint position,
+                                   gint amount)
 {
 	gint i;
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -245,8 +245,8 @@ e_table_subset_variable_increment (ETableSubsetVariable *etssv,
 
 void
 e_table_subset_variable_decrement (ETableSubsetVariable *etssv,
-				   gint                  position,
-				   gint                  amount)
+                                   gint position,
+                                   gint amount)
 {
 	gint i;
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
@@ -258,7 +258,7 @@ e_table_subset_variable_decrement (ETableSubsetVariable *etssv,
 
 void
 e_table_subset_variable_set_allocation (ETableSubsetVariable *etssv,
-					gint total)
+                                        gint total)
 {
 	ETableSubset *etss = E_TABLE_SUBSET (etssv);
 	if (total <= 0)
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 03871771f6..9a26020296 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -52,7 +52,8 @@ G_DEFINE_TYPE (ETableSubset, etss, E_TYPE_TABLE_MODEL)
 #define MAP_ROW(etss, row) (row == -1 ? -1 : etss->map_table[row])
 
 static gint
-etss_get_view_row (ETableSubset *etss, gint row)
+etss_get_view_row (ETableSubset *etss,
+                   gint row)
 {
 	const gint n = etss->n_map;
 	const gint * const map_table = etss->map_table;
@@ -150,7 +151,9 @@ etss_row_count (ETableModel *etm)
 }
 
 static gpointer
-etss_value_at (ETableModel *etm, gint col, gint row)
+etss_value_at (ETableModel *etm,
+               gint col,
+               gint row)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -162,7 +165,10 @@ etss_value_at (ETableModel *etm, gint col, gint row)
 }
 
 static void
-etss_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
+etss_set_value_at (ETableModel *etm,
+                   gint col,
+                   gint row,
+                   gconstpointer val)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -174,7 +180,9 @@ etss_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 }
 
 static gboolean
-etss_is_cell_editable (ETableModel *etm, gint col, gint row)
+etss_is_cell_editable (ETableModel *etm,
+                       gint col,
+                       gint row)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -190,7 +198,8 @@ etss_has_save_id (ETableModel *etm)
 }
 
 static gchar *
-etss_get_save_id (ETableModel *etm, gint row)
+etss_get_save_id (ETableModel *etm,
+                  gint row)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -203,14 +212,18 @@ etss_get_save_id (ETableModel *etm, gint row)
 }
 
 static void
-etss_append_row (ETableModel *etm, ETableModel *source, gint row)
+etss_append_row (ETableModel *etm,
+                 ETableModel *source,
+                 gint row)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 	e_table_model_append_row (etss->source, source, row);
 }
 
 static gpointer
-etss_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
+etss_duplicate_value (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -218,7 +231,9 @@ etss_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etss_free_value (ETableModel *etm, gint col, gpointer value)
+etss_free_value (ETableModel *etm,
+                 gint col,
+                 gpointer value)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -226,7 +241,8 @@ etss_free_value (ETableModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-etss_initialize_value (ETableModel *etm, gint col)
+etss_initialize_value (ETableModel *etm,
+                       gint col)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -234,7 +250,9 @@ etss_initialize_value (ETableModel *etm, gint col)
 }
 
 static gboolean
-etss_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
+etss_value_is_empty (ETableModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -242,7 +260,9 @@ etss_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-etss_value_to_string (ETableModel *etm, gint col, gconstpointer value)
+etss_value_to_string (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETableSubset *etss = (ETableSubset *) etm;
 
@@ -291,25 +311,30 @@ etss_init (ETableSubset *etss)
 }
 
 static void
-etss_proxy_model_pre_change_real (ETableSubset *etss, ETableModel *etm)
+etss_proxy_model_pre_change_real (ETableSubset *etss,
+                                  ETableModel *etm)
 {
 	e_table_model_pre_change (E_TABLE_MODEL (etss));
 }
 
 static void
-etss_proxy_model_no_change_real (ETableSubset *etss, ETableModel *etm)
+etss_proxy_model_no_change_real (ETableSubset *etss,
+                                 ETableModel *etm)
 {
 	e_table_model_no_change (E_TABLE_MODEL (etss));
 }
 
 static void
-etss_proxy_model_changed_real (ETableSubset *etss, ETableModel *etm)
+etss_proxy_model_changed_real (ETableSubset *etss,
+                               ETableModel *etm)
 {
 	e_table_model_changed (E_TABLE_MODEL (etss));
 }
 
 static void
-etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, gint row)
+etss_proxy_model_row_changed_real (ETableSubset *etss,
+                                   ETableModel *etm,
+                                   gint row)
 {
 	gint view_row = etss_get_view_row (etss, row);
 	if (view_row != -1)
@@ -319,7 +344,10 @@ etss_proxy_model_row_changed_real (ETableSubset *etss, ETableModel *etm, gint ro
 }
 
 static void
-etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, gint col, gint row)
+etss_proxy_model_cell_changed_real (ETableSubset *etss,
+                                    ETableModel *etm,
+                                    gint col,
+                                    gint row)
 {
 	gint view_row = etss_get_view_row (etss, row);
 	if (view_row != -1)
@@ -329,68 +357,90 @@ etss_proxy_model_cell_changed_real (ETableSubset *etss, ETableModel *etm, gint c
 }
 
 static void
-etss_proxy_model_rows_inserted_real (ETableSubset *etss, ETableModel *etm, gint row, gint count)
+etss_proxy_model_rows_inserted_real (ETableSubset *etss,
+                                     ETableModel *etm,
+                                     gint row,
+                                     gint count)
 {
 	e_table_model_no_change (E_TABLE_MODEL (etss));
 }
 
 static void
-etss_proxy_model_rows_deleted_real (ETableSubset *etss, ETableModel *etm, gint row, gint count)
+etss_proxy_model_rows_deleted_real (ETableSubset *etss,
+                                    ETableModel *etm,
+                                    gint row,
+                                    gint count)
 {
 	e_table_model_no_change (E_TABLE_MODEL (etss));
 }
 
 static void
-etss_proxy_model_pre_change (ETableModel *etm, ETableSubset *etss)
+etss_proxy_model_pre_change (ETableModel *etm,
+                             ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_pre_change)
 		(ETSS_CLASS (etss)->proxy_model_pre_change) (etss, etm);
 }
 
 static void
-etss_proxy_model_no_change (ETableModel *etm, ETableSubset *etss)
+etss_proxy_model_no_change (ETableModel *etm,
+                            ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_no_change)
 		(ETSS_CLASS (etss)->proxy_model_no_change) (etss, etm);
 }
 
 static void
-etss_proxy_model_changed (ETableModel *etm, ETableSubset *etss)
+etss_proxy_model_changed (ETableModel *etm,
+                          ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_changed)
 		(ETSS_CLASS (etss)->proxy_model_changed) (etss, etm);
 }
 
 static void
-etss_proxy_model_row_changed (ETableModel *etm, gint row, ETableSubset *etss)
+etss_proxy_model_row_changed (ETableModel *etm,
+                              gint row,
+                              ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_row_changed)
 		(ETSS_CLASS (etss)->proxy_model_row_changed) (etss, etm, row);
 }
 
 static void
-etss_proxy_model_cell_changed (ETableModel *etm, gint col, gint row, ETableSubset *etss)
+etss_proxy_model_cell_changed (ETableModel *etm,
+                               gint col,
+                               gint row,
+                               ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_cell_changed)
 		(ETSS_CLASS (etss)->proxy_model_cell_changed) (etss, etm, col, row);
 }
 
 static void
-etss_proxy_model_rows_inserted (ETableModel *etm, gint row, gint col, ETableSubset *etss)
+etss_proxy_model_rows_inserted (ETableModel *etm,
+                                gint row,
+                                gint col,
+                                ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_rows_inserted)
 		(ETSS_CLASS (etss)->proxy_model_rows_inserted) (etss, etm, row, col);
 }
 
 static void
-etss_proxy_model_rows_deleted (ETableModel *etm, gint row, gint col, ETableSubset *etss)
+etss_proxy_model_rows_deleted (ETableModel *etm,
+                               gint row,
+                               gint col,
+                               ETableSubset *etss)
 {
 	if (ETSS_CLASS (etss)->proxy_model_rows_deleted)
 		(ETSS_CLASS (etss)->proxy_model_rows_deleted) (etss, etm, row, col);
 }
 
 ETableModel *
-e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals)
+e_table_subset_construct (ETableSubset *etss,
+                          ETableModel *source,
+                          gint nvals)
 {
 	guint *buffer;
 	gint i;
@@ -410,26 +460,34 @@ e_table_subset_construct (ETableSubset *etss, ETableModel *source, gint nvals)
 	for (i = 0; i < nvals; i++)
 		etss->map_table[i] = i;
 
-	etss->table_model_pre_change_id    = g_signal_connect (G_OBJECT (source), "model_pre_change",
-							G_CALLBACK (etss_proxy_model_pre_change), etss);
-	etss->table_model_no_change_id     = g_signal_connect (G_OBJECT (source), "model_no_change",
-							G_CALLBACK (etss_proxy_model_no_change), etss);
-	etss->table_model_changed_id       = g_signal_connect (G_OBJECT (source), "model_changed",
-							G_CALLBACK (etss_proxy_model_changed), etss);
-	etss->table_model_row_changed_id   = g_signal_connect (G_OBJECT (source), "model_row_changed",
-							G_CALLBACK (etss_proxy_model_row_changed), etss);
-	etss->table_model_cell_changed_id  = g_signal_connect (G_OBJECT (source), "model_cell_changed",
-							G_CALLBACK (etss_proxy_model_cell_changed), etss);
-	etss->table_model_rows_inserted_id = g_signal_connect (G_OBJECT (source), "model_rows_inserted",
-							G_CALLBACK (etss_proxy_model_rows_inserted), etss);
-	etss->table_model_rows_deleted_id  = g_signal_connect (G_OBJECT (source), "model_rows_deleted",
-							G_CALLBACK (etss_proxy_model_rows_deleted), etss);
+	etss->table_model_pre_change_id = g_signal_connect (
+		source, "model_pre_change",
+		G_CALLBACK (etss_proxy_model_pre_change), etss);
+	etss->table_model_no_change_id = g_signal_connect (
+		source, "model_no_change",
+		G_CALLBACK (etss_proxy_model_no_change), etss);
+	etss->table_model_changed_id = g_signal_connect (
+		source, "model_changed",
+		G_CALLBACK (etss_proxy_model_changed), etss);
+	etss->table_model_row_changed_id = g_signal_connect (
+		source, "model_row_changed",
+		G_CALLBACK (etss_proxy_model_row_changed), etss);
+	etss->table_model_cell_changed_id = g_signal_connect (
+		source, "model_cell_changed",
+		G_CALLBACK (etss_proxy_model_cell_changed), etss);
+	etss->table_model_rows_inserted_id = g_signal_connect (
+		source, "model_rows_inserted",
+		G_CALLBACK (etss_proxy_model_rows_inserted), etss);
+	etss->table_model_rows_deleted_id = g_signal_connect (
+		source, "model_rows_deleted",
+		G_CALLBACK (etss_proxy_model_rows_deleted), etss);
 
 	return E_TABLE_MODEL (etss);
 }
 
 ETableModel *
-e_table_subset_new (ETableModel *source, const gint nvals)
+e_table_subset_new (ETableModel *source,
+                    const gint nvals)
 {
 	ETableSubset *etss = g_object_new (E_TYPE_TABLE_SUBSET, NULL);
 
@@ -442,8 +500,8 @@ e_table_subset_new (ETableModel *source, const gint nvals)
 }
 
 gint
-e_table_subset_model_to_view_row  (ETableSubset *ets,
-				   gint           model_row)
+e_table_subset_model_to_view_row (ETableSubset *ets,
+                                  gint model_row)
 {
 	gint i;
 	for (i = 0; i < ets->n_map; i++) {
@@ -454,8 +512,8 @@ e_table_subset_model_to_view_row  (ETableSubset *ets,
 }
 
 gint
-e_table_subset_view_to_model_row  (ETableSubset *ets,
-				   gint           view_row)
+e_table_subset_view_to_model_row (ETableSubset *ets,
+                                  gint view_row)
 {
 	if (view_row >= 0 && view_row < ets->n_map)
 		return ets->map_table[view_row];
@@ -476,7 +534,7 @@ e_table_subset_get_toplevel (ETableSubset *table)
 }
 
 void
-e_table_subset_print_debugging  (ETableSubset *table_model)
+e_table_subset_print_debugging (ETableSubset *table_model)
 {
 	gint i;
 	for (i = 0; i < table_model->n_map; i++) {
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index d84b244fdf..007803585e 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -81,8 +81,8 @@ e_table_state_to_header (GtkWidget *widget,
 
 static ETableCol *
 et_col_spec_to_col (ETableColumnSpecification *col_spec,
-		    ETableExtras              *ete,
-		    const gchar                *domain)
+                    ETableExtras *ete,
+                    const gchar *domain)
 {
 	ETableCol *col = NULL;
 	ECell *cell = NULL;
@@ -146,7 +146,7 @@ et_col_spec_to_col (ETableColumnSpecification *col_spec,
 
 ETableHeader *
 e_table_spec_to_full_header (ETableSpecification *spec,
-			     ETableExtras        *ete)
+                             ETableExtras *ete)
 {
 	ETableHeader *nh;
 	gint column;
@@ -170,7 +170,8 @@ e_table_spec_to_full_header (ETableSpecification *spec,
 }
 
 static gboolean
-check_col (ETableCol *col, gpointer user_data)
+check_col (ETableCol *col,
+           gpointer user_data)
 {
 	return col->search ? TRUE : FALSE;
 }
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 59d254c862..785feb456b 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -53,7 +53,8 @@ struct _ETableWithoutPrivate {
 };
 
 static gboolean
-check (ETableWithout *etw, gint model_row)
+check (ETableWithout *etw,
+       gint model_row)
 {
 	gboolean ret_val;
 	gpointer key;
@@ -70,7 +71,9 @@ check (ETableWithout *etw, gint model_row)
 }
 
 static gboolean
-check_with_key (ETableWithout *etw, gpointer key, gint model_row)
+check_with_key (ETableWithout *etw,
+                gpointer key,
+                gint model_row)
 {
 	gboolean ret_val;
 	gpointer key2;
@@ -90,14 +93,16 @@ check_with_key (ETableWithout *etw, gpointer key, gint model_row)
 }
 
 static gint
-etw_view_to_model_row (ETableWithout *etw, gint view_row)
+etw_view_to_model_row (ETableWithout *etw,
+                       gint view_row)
 {
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
 	return etss->map_table[view_row];
 }
 
 static void
-add_row (ETableWithout *etw, gint model_row)
+add_row (ETableWithout *etw,
+         gint model_row)
 {
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
 
@@ -111,7 +116,8 @@ add_row (ETableWithout *etw, gint model_row)
 }
 
 static void
-remove_row (ETableWithout *etw, gint view_row)
+remove_row (ETableWithout *etw,
+            gint view_row)
 {
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
 
@@ -126,8 +132,8 @@ remove_row (ETableWithout *etw, gint view_row)
 
 static void
 delete_hash_element (gpointer key,
-		     gpointer value,
-		     gpointer closure)
+                     gpointer value,
+                     gpointer closure)
 {
 	ETableWithout *etw = closure;
 	if (etw->priv->free_duplicated_key_func)
@@ -209,7 +215,8 @@ etw_proxy_model_rows_deleted (ETableSubset *etss,
 }
 
 static void
-etw_proxy_model_changed (ETableSubset *etss, ETableModel *etm)
+etw_proxy_model_changed (ETableSubset *etss,
+                         ETableModel *etm)
 {
 	gint i; /* Model row */
 	gint j; /* View row */
@@ -256,15 +263,15 @@ etw_init (ETableWithout *etw)
 }
 
 ETableModel *
-e_table_without_construct (ETableWithout                 *etw,
-			   ETableModel                   *source,
-			   GHashFunc                      hash_func,
-			   GCompareFunc                   compare_func,
-			   ETableWithoutGetKeyFunc        get_key_func,
-			   ETableWithoutDuplicateKeyFunc  duplicate_key_func,
-			   ETableWithoutFreeKeyFunc       free_gotten_key_func,
-			   ETableWithoutFreeKeyFunc       free_duplicated_key_func,
-			   void                          *closure)
+e_table_without_construct (ETableWithout *etw,
+                           ETableModel *source,
+                           GHashFunc hash_func,
+                           GCompareFunc compare_func,
+                           ETableWithoutGetKeyFunc get_key_func,
+                           ETableWithoutDuplicateKeyFunc duplicate_key_func,
+                           ETableWithoutFreeKeyFunc free_gotten_key_func,
+                           ETableWithoutFreeKeyFunc free_duplicated_key_func,
+                           gpointer closure)
 {
 	if (e_table_subset_construct (E_TABLE_SUBSET (etw), source, 1) == NULL)
 		return NULL;
@@ -284,14 +291,14 @@ e_table_without_construct (ETableWithout                 *etw,
 }
 
 ETableModel *
-e_table_without_new        (ETableModel                   *source,
-			    GHashFunc                      hash_func,
-			    GCompareFunc                   compare_func,
-			    ETableWithoutGetKeyFunc        get_key_func,
-			    ETableWithoutDuplicateKeyFunc  duplicate_key_func,
-			    ETableWithoutFreeKeyFunc       free_gotten_key_func,
-			    ETableWithoutFreeKeyFunc       free_duplicated_key_func,
-			    void                          *closure)
+e_table_without_new (ETableModel *source,
+                     GHashFunc hash_func,
+                     GCompareFunc compare_func,
+                     ETableWithoutGetKeyFunc get_key_func,
+                     ETableWithoutDuplicateKeyFunc duplicate_key_func,
+                     ETableWithoutFreeKeyFunc free_gotten_key_func,
+                     ETableWithoutFreeKeyFunc free_duplicated_key_func,
+                     gpointer closure)
 {
 	ETableWithout *etw = g_object_new (E_TYPE_TABLE_WITHOUT, NULL);
 
@@ -312,8 +319,9 @@ e_table_without_new        (ETableModel                   *source,
 	return (ETableModel *) etw;
 }
 
-void         e_table_without_hide       (ETableWithout *etw,
-					 void          *key)
+void
+e_table_without_hide (ETableWithout *etw,
+                      gpointer key)
 {
 	gint i; /* View row */
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
@@ -331,8 +339,9 @@ void         e_table_without_hide       (ETableWithout *etw,
 }
 
 /* An adopted key will later be freed using the free_duplicated_key function. */
-void         e_table_without_hide_adopt (ETableWithout *etw,
-					 void          *key)
+void
+e_table_without_hide_adopt (ETableWithout *etw,
+                            gpointer key)
 {
 	gint i; /* View row */
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
@@ -347,8 +356,8 @@ void         e_table_without_hide_adopt (ETableWithout *etw,
 }
 
 void
-e_table_without_show       (ETableWithout *etw,
-			    void          *key)
+e_table_without_show (ETableWithout *etw,
+                      gpointer key)
 {
 	gint i; /* Model row */
 	ETableSubset *etss = E_TABLE_SUBSET (etw);
@@ -372,7 +381,7 @@ e_table_without_show       (ETableWithout *etw,
 }
 
 void
-e_table_without_show_all   (ETableWithout *etw)
+e_table_without_show_all (ETableWithout *etw)
 {
 	gint i; /* Model row */
 	gint row_count;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index f755cbc451..472681796f 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -232,7 +232,9 @@ current_search_col (ETable *et)
 }
 
 static void
-et_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural)
+et_get_preferred_width (GtkWidget *widget,
+                        gint *minimum,
+                        gint *natural)
 {
 	ETable *et = E_TABLE (widget);
 
@@ -246,7 +248,9 @@ et_get_preferred_width (GtkWidget *widget, gint *minimum, gint *natural)
 }
 
 static void
-et_get_preferred_height (GtkWidget *widget, gint *minimum, gint *natural)
+et_get_preferred_height (GtkWidget *widget,
+                         gint *minimum,
+                         gint *natural)
 {
 	GTK_WIDGET_CLASS (e_table_parent_class)->
 		get_preferred_height (widget, minimum, natural);
@@ -262,7 +266,8 @@ set_header_width (ETable *et)
 }
 
 static void
-structure_changed (ETableHeader *header, ETable *et)
+structure_changed (ETableHeader *header,
+                   ETable *et)
 {
 	e_table_state_change (et);
 	set_header_width (et);
@@ -270,14 +275,17 @@ structure_changed (ETableHeader *header, ETable *et)
 }
 
 static void
-expansion_changed (ETableHeader *header, ETable *et)
+expansion_changed (ETableHeader *header,
+                   ETable *et)
 {
 	e_table_state_change (et);
 	set_header_width (et);
 }
 
 static void
-dimension_changed (ETableHeader *header, gint total_width, ETable *et)
+dimension_changed (ETableHeader *header,
+                   gint total_width,
+                   ETable *et)
 {
 	set_header_width (et);
 }
@@ -303,7 +311,8 @@ disconnect_header (ETable *e_table)
 }
 
 static void
-connect_header (ETable *e_table, ETableState *state)
+connect_header (ETable *e_table,
+                ETableState *state)
 {
 	if (e_table->header != NULL)
 		disconnect_header (e_table);
@@ -311,15 +320,15 @@ connect_header (ETable *e_table, ETableState *state)
 	e_table->header = e_table_state_to_header (
 		GTK_WIDGET (e_table), e_table->full_header, state);
 
-	e_table->structure_change_id =
-		g_signal_connect (G_OBJECT (e_table->header), "structure_change",
-				  G_CALLBACK (structure_changed), e_table);
-	e_table->expansion_change_id =
-		g_signal_connect (G_OBJECT (e_table->header), "expansion_change",
-				  G_CALLBACK (expansion_changed), e_table);
-	e_table->dimension_change_id =
-		g_signal_connect (G_OBJECT (e_table->header), "dimension_change",
-				  G_CALLBACK (dimension_changed), e_table);
+	e_table->structure_change_id = g_signal_connect (
+		e_table->header, "structure_change",
+		G_CALLBACK (structure_changed), e_table);
+	e_table->expansion_change_id = g_signal_connect (
+		e_table->header, "expansion_change",
+		G_CALLBACK (expansion_changed), e_table);
+	e_table->dimension_change_id = g_signal_connect (
+		e_table->header, "dimension_change",
+		G_CALLBACK (dimension_changed), e_table);
 }
 
 static void
@@ -499,7 +508,8 @@ et_search_search (ETableSearch *search,
 }
 
 static void
-et_search_accept (ETableSearch *search, ETable *et)
+et_search_accept (ETableSearch *search,
+                  ETable *et)
 {
 	gint cursor;
 	ETableCol *col = current_search_col (et);
@@ -521,12 +531,12 @@ init_search (ETable *e_table)
 
 	e_table->search           = e_table_search_new ();
 
-	e_table->search_search_id =
-		g_signal_connect (G_OBJECT (e_table->search), "search",
-				  G_CALLBACK (et_search_search), e_table);
-	e_table->search_accept_id =
-		g_signal_connect (G_OBJECT (e_table->search), "accept",
-				  G_CALLBACK (et_search_accept), e_table);
+	e_table->search_search_id = g_signal_connect (
+		e_table->search, "search",
+		G_CALLBACK (et_search_search), e_table);
+	e_table->search_accept_id = g_signal_connect (
+		e_table->search, "accept",
+		G_CALLBACK (et_search_accept), e_table);
 }
 
 static void
@@ -610,7 +620,8 @@ et_grab_focus (GtkWidget *widget)
 
 /* Focus handler for the ETable */
 static gint
-et_focus (GtkWidget *container, GtkDirectionType direction)
+et_focus (GtkWidget *container,
+          GtkDirectionType direction)
 {
 	ETable *e_table;
 
@@ -647,7 +658,9 @@ set_header_canvas_width (ETable *e_table)
 }
 
 static void
-header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETable *e_table)
+header_canvas_size_allocate (GtkWidget *widget,
+                             GtkAllocation *alloc,
+                             ETable *e_table)
 {
 	GtkAllocation allocation;
 
@@ -657,9 +670,9 @@ header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETable *e_
 		GTK_WIDGET (e_table->header_canvas), &allocation);
 
 	/* When the header item is created ->height == 0,
-	   as the font is only created when everything is realized.
-	   So we set the usize here as well, so that the size of the
-	   header is correct */
+	 * as the font is only created when everything is realized.
+	 * So we set the usize here as well, so that the size of the
+	 * header is correct */
 	if (allocation.height != E_TABLE_HEADER_ITEM (e_table->header_item)->height)
 		g_object_set (
 			e_table->header_canvas, "height-request",
@@ -668,7 +681,8 @@ header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETable *e_
 }
 
 static void
-group_info_changed (ETableSortInfo *info, ETable *et)
+group_info_changed (ETableSortInfo *info,
+                    ETable *et)
 {
 	gboolean will_be_grouped = e_table_sort_info_grouping_get_count (info) > 0;
 	clear_current_search_col (et);
@@ -684,7 +698,8 @@ group_info_changed (ETableSortInfo *info, ETable *et)
 }
 
 static void
-sort_info_changed (ETableSortInfo *info, ETable *et)
+sort_info_changed (ETableSortInfo *info,
+                   ETable *et)
 {
 	clear_current_search_col (et);
 	e_table_state_change (et);
@@ -751,8 +766,9 @@ table_canvas_reflow_idle (ETable *e_table)
 }
 
 static void
-table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-			    ETable *e_table)
+table_canvas_size_allocate (GtkWidget *widget,
+                            GtkAllocation *alloc,
+                            ETable *e_table)
 {
 	gdouble width;
 	gdouble height;
@@ -782,7 +798,8 @@ table_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 }
 
 static void
-table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table)
+table_canvas_reflow (GnomeCanvas *canvas,
+                     ETable *e_table)
 {
 	if (!e_table->reflow_idle_id)
 		e_table->reflow_idle_id = g_idle_add_full (
@@ -791,7 +808,10 @@ table_canvas_reflow (GnomeCanvas *canvas, ETable *e_table)
 }
 
 static void
-click_to_add_cursor_change (ETableClickToAdd *etcta, gint row, gint col, ETable *et)
+click_to_add_cursor_change (ETableClickToAdd *etcta,
+                            gint row,
+                            gint col,
+                            ETable *et)
 {
 	if (et->cursor_loc == E_TABLE_CURSOR_LOC_TABLE) {
 		e_selection_model_clear (E_SELECTION_MODEL (et->selection));
@@ -800,7 +820,9 @@ click_to_add_cursor_change (ETableClickToAdd *etcta, gint row, gint col, ETable
 }
 
 static void
-group_cursor_change (ETableGroup *etg, gint row, ETable *et)
+group_cursor_change (ETableGroup *etg,
+                     gint row,
+                     ETable *et)
 {
 	ETableCursorLoc old_cursor_loc;
 
@@ -814,19 +836,29 @@ group_cursor_change (ETableGroup *etg, gint row, ETable *et)
 }
 
 static void
-group_cursor_activated (ETableGroup *etg, gint row, ETable *et)
+group_cursor_activated (ETableGroup *etg,
+                        gint row,
+                        ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[CURSOR_ACTIVATED], 0, row);
 }
 
 static void
-group_double_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
+group_double_click (ETableGroup *etg,
+                    gint row,
+                    gint col,
+                    GdkEvent *event,
+                    ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[DOUBLE_CLICK], 0, row, col, event);
 }
 
 static gboolean
-group_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
+group_right_click (ETableGroup *etg,
+                   gint row,
+                   gint col,
+                   GdkEvent *event,
+                   ETable *et)
 {
 	gboolean return_val = FALSE;
 
@@ -838,7 +870,11 @@ group_right_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable
 }
 
 static gboolean
-group_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
+group_click (ETableGroup *etg,
+             gint row,
+             gint col,
+             GdkEvent *event,
+             ETable *et)
 {
 	gboolean return_val = 0;
 	g_signal_emit (G_OBJECT (et), et_signals[CLICK], 0, row, col, event, &return_val);
@@ -846,7 +882,11 @@ group_click (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
 }
 
 static gboolean
-group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
+group_key_press (ETableGroup *etg,
+                 gint row,
+                 gint col,
+                 GdkEvent *event,
+                 ETable *et)
 {
 	gboolean return_val = FALSE;
 	GdkEventKey *key = (GdkEventKey *) event;
@@ -923,7 +963,11 @@ group_key_press (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *
 }
 
 static gboolean
-group_start_drag (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable *et)
+group_start_drag (ETableGroup *etg,
+                  gint row,
+                  gint col,
+                  GdkEvent *event,
+                  ETable *et)
 {
 	gboolean return_val = TRUE;
 	g_signal_emit (G_OBJECT (et), et_signals[START_DRAG], 0,
@@ -932,7 +976,8 @@ group_start_drag (ETableGroup *etg, gint row, gint col, GdkEvent *event, ETable
 }
 
 static void
-et_table_model_changed (ETableModel *model, ETable *et)
+et_table_model_changed (ETableModel *model,
+                        ETable *et)
 {
 	et->need_rebuild = TRUE;
 	if (!et->rebuild_idle_id) {
@@ -943,7 +988,9 @@ et_table_model_changed (ETableModel *model, ETable *et)
 }
 
 static void
-et_table_row_changed (ETableModel *table_model, gint row, ETable *et)
+et_table_row_changed (ETableModel *table_model,
+                      gint row,
+                      ETable *et)
 {
 	if (!et->need_rebuild) {
 		if (e_table_group_remove (et->group, row))
@@ -953,13 +1000,19 @@ et_table_row_changed (ETableModel *table_model, gint row, ETable *et)
 }
 
 static void
-et_table_cell_changed (ETableModel *table_model, gint view_col, gint row, ETable *et)
+et_table_cell_changed (ETableModel *table_model,
+                       gint view_col,
+                       gint row,
+                       ETable *et)
 {
 	et_table_row_changed (table_model, row, et);
 }
 
 static void
-et_table_rows_inserted (ETableModel *table_model, gint row, gint count, ETable *et)
+et_table_rows_inserted (ETableModel *table_model,
+                        gint row,
+                        gint count,
+                        ETable *et)
 {
 	/* This number has already been decremented. */
 	gint row_count = e_table_model_row_count (table_model);
@@ -974,7 +1027,10 @@ et_table_rows_inserted (ETableModel *table_model, gint row, gint count, ETable *
 }
 
 static void
-et_table_rows_deleted (ETableModel *table_model, gint row, gint count, ETable *et)
+et_table_rows_deleted (ETableModel *table_model,
+                       gint row,
+                       gint count,
+                       ETable *et)
 {
 	gint row_count = e_table_model_row_count (table_model);
 	if (!et->need_rebuild) {
@@ -1022,20 +1078,27 @@ et_build_groups (ETable *et)
 		"selection_model", et->selection,
 		NULL);
 
-	g_signal_connect (G_OBJECT (et->group), "cursor_change",
-			  G_CALLBACK (group_cursor_change), et);
-	g_signal_connect (G_OBJECT (et->group), "cursor_activated",
-			  G_CALLBACK (group_cursor_activated), et);
-	g_signal_connect (G_OBJECT (et->group), "double_click",
-			  G_CALLBACK (group_double_click), et);
-	g_signal_connect (G_OBJECT (et->group), "right_click",
-			  G_CALLBACK (group_right_click), et);
-	g_signal_connect (G_OBJECT (et->group), "click",
-			  G_CALLBACK (group_click), et);
-	g_signal_connect (G_OBJECT (et->group), "key_press",
-			  G_CALLBACK (group_key_press), et);
-	g_signal_connect (G_OBJECT (et->group), "start_drag",
-			  G_CALLBACK (group_start_drag), et);
+	g_signal_connect (
+		et->group, "cursor_change",
+		G_CALLBACK (group_cursor_change), et);
+	g_signal_connect (
+		et->group, "cursor_activated",
+		G_CALLBACK (group_cursor_activated), et);
+	g_signal_connect (
+		et->group, "double_click",
+		G_CALLBACK (group_double_click), et);
+	g_signal_connect (
+		et->group, "right_click",
+		G_CALLBACK (group_right_click), et);
+	g_signal_connect (
+		et->group, "click",
+		G_CALLBACK (group_click), et);
+	g_signal_connect (
+		et->group, "key_press",
+		G_CALLBACK (group_key_press), et);
+	g_signal_connect (
+		et->group, "start_drag",
+		G_CALLBACK (group_start_drag), et);
 
 	if (!(et->is_grouped) && was_grouped)
 		et_disconnect_model (et);
@@ -1102,7 +1165,8 @@ changed_idle (gpointer data)
 }
 
 static void
-et_canvas_realize (GtkWidget *canvas, ETable *e_table)
+et_canvas_realize (GtkWidget *canvas,
+                   ETable *e_table)
 {
 	GtkWidget *widget;
 	GtkStyle *style;
@@ -1120,7 +1184,9 @@ et_canvas_realize (GtkWidget *canvas, ETable *e_table)
 }
 
 static gboolean
-white_item_event (GnomeCanvasItem *white_item, GdkEvent *event, ETable *e_table)
+white_item_event (GnomeCanvasItem *white_item,
+                  GdkEvent *event,
+                  ETable *e_table)
 {
 	gboolean return_val = 0;
 	g_signal_emit (G_OBJECT (e_table), et_signals[WHITE_SPACE_EVENT], 0,
@@ -1143,7 +1209,9 @@ et_eti_leave_edit (ETable *et)
 }
 
 static gint
-et_canvas_root_event (GnomeCanvasItem *root, GdkEvent *event, ETable *e_table)
+et_canvas_root_event (GnomeCanvasItem *root,
+                      GdkEvent *event,
+                      ETable *e_table)
 {
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
@@ -1188,7 +1256,9 @@ focus_first_etable_item (ETableGroup *group)
  * always, and also give the focus to some ETableItem if we get focused.
  */
 static gint
-table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+table_canvas_focus_event_cb (GtkWidget *widget,
+                             GdkEventFocus *event,
+                             gpointer data)
 {
 	GnomeCanvas *canvas;
 	ECanvas *ecanvas;
@@ -1232,7 +1302,9 @@ table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer d
 }
 
 static gboolean
-canvas_vbox_event (ECanvasVbox *vbox, GdkEventKey *key, ETable *etable)
+canvas_vbox_event (ECanvasVbox *vbox,
+                   GdkEventKey *key,
+                   ETable *etable)
 {
 	if (key->type != GDK_KEY_PRESS  &&
 		key->type != GDK_KEY_RELEASE) {
@@ -1254,7 +1326,9 @@ canvas_vbox_event (ECanvasVbox *vbox, GdkEventKey *key, ETable *etable)
 }
 
 static gboolean
-click_to_add_event (ETableClickToAdd *etcta, GdkEventKey *key, ETable *etable)
+click_to_add_event (ETableClickToAdd *etcta,
+                    GdkEventKey *key,
+                    ETable *etable)
 {
 	if (key->type != GDK_KEY_PRESS  &&
 		key->type != GDK_KEY_RELEASE) {
@@ -1284,50 +1358,53 @@ click_to_add_event (ETableClickToAdd *etcta, GdkEventKey *key, ETable *etable)
 }
 
 static void
-e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *header,
-		     ETableModel *model)
+e_table_setup_table (ETable *e_table,
+                     ETableHeader *full_header,
+                     ETableHeader *header,
+                     ETableModel *model)
 {
 	GtkWidget *widget;
 	GtkStyle *style;
 
 	e_table->table_canvas = GNOME_CANVAS (e_canvas_new ());
 	g_signal_connect (
-		G_OBJECT (e_table->table_canvas), "size_allocate",
+		e_table->table_canvas, "size_allocate",
 		G_CALLBACK (table_canvas_size_allocate), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table->table_canvas), "focus_in_event",
+		e_table->table_canvas, "focus_in_event",
 		G_CALLBACK (table_canvas_focus_event_cb), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table->table_canvas), "focus_out_event",
+		e_table->table_canvas, "focus_out_event",
 		G_CALLBACK (table_canvas_focus_event_cb), e_table);
 
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_begin",
+		e_table, "drag_begin",
 		G_CALLBACK (et_drag_begin), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_end",
+		e_table, "drag_end",
 		G_CALLBACK (et_drag_end), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_data_get",
+		e_table, "drag_data_get",
 		G_CALLBACK (et_drag_data_get), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_data_delete",
+		e_table, "drag_data_delete",
 		G_CALLBACK (et_drag_data_delete), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_motion",
+		e_table, "drag_motion",
 		G_CALLBACK (et_drag_motion), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_leave",
+		e_table, "drag_leave",
 		G_CALLBACK (et_drag_leave), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_drop",
+		e_table, "drag_drop",
 		G_CALLBACK (et_drag_drop), e_table);
 	g_signal_connect (
-		G_OBJECT (e_table), "drag_data_received",
+		e_table, "drag_data_received",
 		G_CALLBACK (et_drag_data_received), e_table);
 
-	g_signal_connect (G_OBJECT(e_table->table_canvas), "reflow",
-			  G_CALLBACK (table_canvas_reflow), e_table);
+	g_signal_connect (
+		e_table->table_canvas, "reflow",
+		G_CALLBACK (table_canvas_reflow), e_table);
 
 	widget = GTK_WIDGET (e_table->table_canvas);
 	style = gtk_widget_get_style (widget);
@@ -1340,14 +1417,17 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 		"fill_color_gdk", &style->base[GTK_STATE_NORMAL],
 		NULL);
 
-	g_signal_connect (G_OBJECT (e_table->white_item), "event",
-			  G_CALLBACK (white_item_event), e_table);
+	g_signal_connect (
+		e_table->white_item, "event",
+		G_CALLBACK (white_item_event), e_table);
 
-	g_signal_connect (G_OBJECT(e_table->table_canvas), "realize",
-			  G_CALLBACK (et_canvas_realize), e_table);
+	g_signal_connect (
+		e_table->table_canvas, "realize",
+		G_CALLBACK (et_canvas_realize), e_table);
 
-	g_signal_connect (G_OBJECT(gnome_canvas_root (e_table->table_canvas)), "event",
-			  G_CALLBACK (et_canvas_root_event), e_table);
+	g_signal_connect (
+		gnome_canvas_root (e_table->table_canvas), "event",
+		G_CALLBACK (et_canvas_root_event), e_table);
 
 	e_table->canvas_vbox = gnome_canvas_item_new (
 		gnome_canvas_root (e_table->table_canvas),
@@ -1389,7 +1469,8 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 }
 
 static void
-e_table_fill_table (ETable *e_table, ETableModel *model)
+e_table_fill_table (ETable *e_table,
+                    ETableModel *model)
 {
 	e_table_group_add_all (e_table->group);
 }
@@ -1404,7 +1485,8 @@ e_table_fill_table (ETable *e_table, ETableModel *model)
  *
  **/
 void
-e_table_set_state_object (ETable *e_table, ETableState *state)
+e_table_set_state_object (ETable *e_table,
+                          ETableState *state)
 {
 	GValue *val;
 	GtkWidget *widget;
@@ -1434,12 +1516,13 @@ e_table_set_state_object (ETable *e_table, ETableState *state)
 	if (state->sort_info) {
 		e_table->sort_info = e_table_sort_info_duplicate (state->sort_info);
 		e_table_sort_info_set_can_group (e_table->sort_info, e_table->allow_grouping);
-		e_table->group_info_change_id =
-			g_signal_connect (G_OBJECT (e_table->sort_info), "group_info_changed",
-					  G_CALLBACK (group_info_changed), e_table);
-		e_table->sort_info_change_id =
-			g_signal_connect (G_OBJECT (e_table->sort_info), "sort_info_changed",
-					  G_CALLBACK (sort_info_changed), e_table);
+		e_table->group_info_change_id = g_signal_connect (
+			e_table->sort_info, "group_info_changed",
+			G_CALLBACK (group_info_changed), e_table);
+
+		e_table->sort_info_change_id = g_signal_connect (
+			e_table->sort_info, "sort_info_changed",
+			G_CALLBACK (sort_info_changed), e_table);
 	}
 	else
 		e_table->sort_info = NULL;
@@ -1474,8 +1557,8 @@ e_table_set_state_object (ETable *e_table, ETableState *state)
  *
  **/
 void
-e_table_set_state (ETable      *e_table,
-		   const gchar *state_str)
+e_table_set_state (ETable *e_table,
+                   const gchar *state_str)
 {
 	ETableState *state;
 
@@ -1501,8 +1584,8 @@ e_table_set_state (ETable      *e_table,
  *
  **/
 void
-e_table_load_state (ETable      *e_table,
-		    const gchar *filename)
+e_table_load_state (ETable *e_table,
+                    const gchar *filename)
 {
 	ETableState *state;
 
@@ -1592,8 +1675,8 @@ gchar          *e_table_get_state                 (ETable               *e_table
  *
  **/
 void
-e_table_save_state (ETable      *e_table,
-		    const gchar *filename)
+e_table_save_state (ETable *e_table,
+                    const gchar *filename)
 {
 	ETableState *state;
 
@@ -1603,20 +1686,26 @@ e_table_save_state (ETable      *e_table,
 }
 
 static void
-et_selection_model_selection_changed (ETableGroup *etg, ETable *et)
+et_selection_model_selection_changed (ETableGroup *etg,
+                                      ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[SELECTION_CHANGE], 0);
 }
 
 static void
-et_selection_model_selection_row_changed (ETableGroup *etg, gint row, ETable *et)
+et_selection_model_selection_row_changed (ETableGroup *etg,
+                                          gint row,
+                                          ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[SELECTION_CHANGE], 0);
 }
 
 static ETable *
-et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-		   ETableSpecification *specification, ETableState *state)
+et_real_construct (ETable *e_table,
+                   ETableModel *etm,
+                   ETableExtras *ete,
+                   ETableSpecification *specification,
+                   ETableState *state)
 {
 	gint row = 0;
 	gint col_count, i;
@@ -1751,8 +1840,11 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
  * The passed in value @e_table or %NULL if there's an error.
  **/
 ETable *
-e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-		   const gchar *spec_str, const gchar *state_str)
+e_table_construct (ETable *e_table,
+                   ETableModel *etm,
+                   ETableExtras *ete,
+                   const gchar *spec_str,
+                   const gchar *state_str)
 {
 	ETableSpecification *specification;
 	ETableState *state;
@@ -1811,8 +1903,11 @@ e_table_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
  * The passed in value @e_table or %NULL if there's an error.
  **/
 ETable *
-e_table_construct_from_spec_file (ETable *e_table, ETableModel *etm, ETableExtras *ete,
-				  const gchar *spec_fn, const gchar *state_fn)
+e_table_construct_from_spec_file (ETable *e_table,
+                                  ETableModel *etm,
+                                  ETableExtras *ete,
+                                  const gchar *spec_fn,
+                                  const gchar *state_fn)
 {
 	ETableSpecification *specification;
 	ETableState *state;
@@ -2027,7 +2122,8 @@ e_table_get_specification (ETable *e_table)
 }
 
 gint
-e_table_set_specification (ETable *e_table, const gchar *spec)
+e_table_set_specification (ETable *e_table,
+                           const gchar *spec)
 {
 	xmlDoc *xmlSpec;
 	gint ret;
@@ -2045,7 +2141,8 @@ e_table_set_specification (ETable *e_table, const gchar *spec)
 }
 
 void
-e_table_save_specification (ETable *e_table, const gchar *filename)
+e_table_save_specification (ETable *e_table,
+                            const gchar *filename)
 {
 	xmlDoc *doc = et_build_tree (e_table);
 
@@ -2059,7 +2156,8 @@ e_table_save_specification (ETable *e_table, const gchar *filename)
 }
 
 gint
-e_table_load_specification (ETable *e_table, gchar *filename)
+e_table_load_specification (ETable *e_table,
+                            gchar *filename)
 {
 	xmlDoc *xmlSpec;
 	gint ret;
@@ -2093,7 +2191,8 @@ e_table_load_specification (ETable *e_table, gchar *filename)
  * Sets the cursor row and the selection to the given row number.
  **/
 void
-e_table_set_cursor_row (ETable *e_table, gint row)
+e_table_set_cursor_row (ETable *e_table,
+                        gint row)
 {
 	g_return_if_fail (e_table != NULL);
 	g_return_if_fail (E_IS_TABLE (e_table));
@@ -2140,9 +2239,9 @@ e_table_get_cursor_row (ETable *e_table)
  * and then act upon that list. (In inverse order if it's rows.)
  **/
 void
-e_table_selected_row_foreach     (ETable *e_table,
-				  EForeachFunc callback,
-				  gpointer closure)
+e_table_selected_row_foreach (ETable *e_table,
+                              EForeachFunc callback,
+                              gpointer closure)
 {
 	g_return_if_fail (e_table != NULL);
 	g_return_if_fail (E_IS_TABLE (e_table));
@@ -2162,7 +2261,7 @@ e_table_selected_row_foreach     (ETable *e_table,
  * The number of rows selected.
  **/
 gint
-e_table_selected_count     (ETable *e_table)
+e_table_selected_count (ETable *e_table)
 {
 	g_return_val_if_fail (e_table != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE (e_table), -1);
@@ -2248,13 +2347,13 @@ e_table_commit_click_to_add (ETable *table)
 
 static void
 et_get_property (GObject *object,
-		 guint prop_id,
-		 GValue *value,
-		 GParamSpec *pspec)
+                 guint property_id,
+                 GValue *value,
+                 GParamSpec *pspec)
 {
 	ETable *etable = E_TABLE (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_MODEL:
 		g_value_set_object (value, etable->model);
 		break;
@@ -2311,13 +2410,13 @@ typedef struct {
 
 static void
 et_set_property (GObject *object,
-                 guint prop_id,
+                 guint property_id,
                  const GValue *value,
                  GParamSpec *pspec)
 {
 	ETable *etable = E_TABLE (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_LENGTH_THRESHOLD:
 		etable->length_threshold = g_value_get_int (value);
 		if (etable->group) {
@@ -2418,8 +2517,8 @@ et_set_property (GObject *object,
  * The model row number.
  **/
 gint
-e_table_get_next_row      (ETable *e_table,
-			   gint    model_row)
+e_table_get_next_row (ETable *e_table,
+                      gint model_row)
 {
 	g_return_val_if_fail (e_table != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE (e_table), -1);
@@ -2452,8 +2551,8 @@ e_table_get_next_row      (ETable *e_table,
  * The model row number.
  **/
 gint
-e_table_get_prev_row      (ETable *e_table,
-			   gint    model_row)
+e_table_get_prev_row (ETable *e_table,
+                      gint model_row)
 {
 	g_return_val_if_fail (e_table != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE (e_table), -1);
@@ -2481,8 +2580,8 @@ e_table_get_prev_row      (ETable *e_table,
  * The view row number.
  **/
 gint
-e_table_model_to_view_row        (ETable *e_table,
-				  gint    model_row)
+e_table_model_to_view_row (ETable *e_table,
+                           gint model_row)
 {
 	g_return_val_if_fail (e_table != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE (e_table), -1);
@@ -2504,8 +2603,8 @@ e_table_model_to_view_row        (ETable *e_table,
  * The model row number.
  **/
 gint
-e_table_view_to_model_row        (ETable *e_table,
-				  gint    view_row)
+e_table_view_to_model_row (ETable *e_table,
+                           gint view_row)
 {
 	g_return_val_if_fail (e_table != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE (e_table), -1);
@@ -2529,8 +2628,10 @@ e_table_view_to_model_row        (ETable *e_table,
  **/
 void
 e_table_get_cell_at (ETable *table,
-		     gint x, gint y,
-		     gint *row_return, gint *col_return)
+                     gint x,
+                     gint y,
+                     gint *row_return,
+                     gint *col_return)
 {
 	GtkAdjustment *adjustment;
 	GtkScrollable *scrollable;
@@ -2571,9 +2672,12 @@ e_table_get_cell_at (ETable *table,
  **/
 void
 e_table_get_cell_geometry (ETable *table,
-			   gint row, gint col,
-			   gint *x_return, gint *y_return,
-			   gint *width_return, gint *height_return)
+                           gint row,
+                           gint col,
+                           gint *x_return,
+                           gint *y_return,
+                           gint *width_return,
+                           gint *height_return)
 {
 	GtkAllocation allocation;
 	GtkAdjustment *adjustment;
@@ -2614,7 +2718,9 @@ e_table_get_cell_geometry (ETable *table,
  * based on the mouse motion information in the group.
  **/
 void
-e_table_get_mouse_over_cell (ETable *table, gint *row, gint *col)
+e_table_get_mouse_over_cell (ETable *table,
+                             gint *row,
+                             gint *col)
 {
 	g_return_if_fail (table != NULL);
 	g_return_if_fail (E_IS_TABLE (table));
@@ -2724,12 +2830,12 @@ struct _GtkDragSourceInfo
  *
  **/
 void
-e_table_drag_get_data (ETable         *table,
-		       gint             row,
-		       gint             col,
-		       GdkDragContext *context,
-		       GdkAtom         target,
-		       guint32         time)
+e_table_drag_get_data (ETable *table,
+                       gint row,
+                       gint col,
+                       GdkDragContext *context,
+                       GdkAtom target,
+                       guint32 time)
 {
 	g_return_if_fail (table != NULL);
 	g_return_if_fail (E_IS_TABLE (table));
@@ -2751,8 +2857,8 @@ e_table_drag_get_data (ETable         *table,
  **/
 void
 e_table_drag_highlight (ETable *table,
-			gint     row,
-			gint     col)
+                        gint row,
+                        gint col)
 {
 	GtkAllocation allocation;
 	GtkAdjustment *adjustment;
@@ -2867,7 +2973,10 @@ e_table_drag_dest_unset (GtkWidget *widget)
 /* Source side */
 
 static gint
-et_real_start_drag (ETable *table, gint row, gint col, GdkEvent *event)
+et_real_start_drag (ETable *table,
+                    gint row,
+                    gint col,
+                    GdkEvent *event)
 {
 	GtkDragSourceInfo *info;
 	GdkDragContext *context;
@@ -2910,11 +3019,11 @@ et_real_start_drag (ETable *table, gint row, gint col, GdkEvent *event)
  * Registers this table as a drag site, and possibly adds default behaviors.
  **/
 void
-e_table_drag_source_set  (ETable               *table,
-			  GdkModifierType       start_button_mask,
-			  const GtkTargetEntry *targets,
-			  gint                  n_targets,
-			  GdkDragAction         actions)
+e_table_drag_source_set (ETable *table,
+                         GdkModifierType start_button_mask,
+                         const GtkTargetEntry *targets,
+                         gint n_targets,
+                         GdkDragAction actions)
 {
 	ETableDragSourceSite *site;
 	GtkWidget *canvas;
@@ -2995,13 +3104,13 @@ e_table_drag_source_unset (ETable *table)
  * The drag context.
  **/
 GdkDragContext *
-e_table_drag_begin (ETable            *table,
-		    gint	       row,
-		    gint	       col,
-		    GtkTargetList     *targets,
-		    GdkDragAction      actions,
-		    gint               button,
-		    GdkEvent          *event)
+e_table_drag_begin (ETable *table,
+                    gint row,
+                    gint col,
+                    GtkTargetList *targets,
+                    GdkDragAction actions,
+                    gint button,
+                    GdkEvent *event)
 {
 	g_return_val_if_fail (table != NULL, NULL);
 	g_return_val_if_fail (E_IS_TABLE (table), NULL);
@@ -3018,8 +3127,8 @@ e_table_drag_begin (ETable            *table,
 
 static void
 et_drag_begin (GtkWidget *widget,
-	       GdkDragContext *context,
-	       ETable *et)
+               GdkDragContext *context,
+               ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[TABLE_DRAG_BEGIN], 0,
 		       et->drag_row, et->drag_col, context);
@@ -3027,8 +3136,8 @@ et_drag_begin (GtkWidget *widget,
 
 static void
 et_drag_end (GtkWidget *widget,
-	     GdkDragContext *context,
-	     ETable *et)
+             GdkDragContext *context,
+             ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[TABLE_DRAG_END], 0,
 		       et->drag_row, et->drag_col, context);
@@ -3036,11 +3145,11 @@ et_drag_end (GtkWidget *widget,
 
 static void
 et_drag_data_get (GtkWidget *widget,
-		 GdkDragContext *context,
-		 GtkSelectionData *selection_data,
-		 guint info,
-		 guint time,
-		 ETable *et)
+                  GdkDragContext *context,
+                  GtkSelectionData *selection_data,
+                  guint info,
+                  guint time,
+                  ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[TABLE_DRAG_DATA_GET], 0,
 		       et->drag_row, et->drag_col, context, selection_data,
@@ -3049,8 +3158,8 @@ et_drag_data_get (GtkWidget *widget,
 
 static void
 et_drag_data_delete (GtkWidget *widget,
-		    GdkDragContext *context,
-		    ETable *et)
+                     GdkDragContext *context,
+                     ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[TABLE_DRAG_DATA_DELETE], 0,
 		       et->drag_row, et->drag_col, context);
@@ -3058,10 +3167,10 @@ et_drag_data_delete (GtkWidget *widget,
 
 static gboolean
 do_drag_motion (ETable *et,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time)
+                GdkDragContext *context,
+                gint x,
+                gint y,
+                guint time)
 {
 	gboolean ret_val;
 	gint row = -1, col = -1;
@@ -3141,7 +3250,8 @@ scroll_timeout (gpointer data)
 }
 
 static void
-scroll_on (ETable *et, guint scroll_direction)
+scroll_on (ETable *et,
+           guint scroll_direction)
 {
 	if (et->scroll_idle_id == 0 || scroll_direction != et->scroll_direction) {
 		if (et->scroll_idle_id != 0)
@@ -3177,7 +3287,8 @@ context_destroyed (gpointer data)
 }
 
 static void
-context_connect (ETable *et, GdkDragContext *context)
+context_connect (ETable *et,
+                 GdkDragContext *context)
 {
 	if (g_dataset_get_data (context, "e-table") == NULL) {
 		g_object_ref (et);
@@ -3187,9 +3298,9 @@ context_connect (ETable *et, GdkDragContext *context)
 
 static void
 et_drag_leave (GtkWidget *widget,
-	      GdkDragContext *context,
-	      guint time,
-	      ETable *et)
+               GdkDragContext *context,
+               guint time,
+               ETable *et)
 {
 	g_signal_emit (G_OBJECT (et), et_signals[TABLE_DRAG_LEAVE], 0,
 		       et->drop_row, et->drop_col, context, time);
@@ -3201,11 +3312,11 @@ et_drag_leave (GtkWidget *widget,
 
 static gboolean
 et_drag_motion (GtkWidget *widget,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time,
-	       ETable *et)
+                GdkDragContext *context,
+                gint x,
+                gint y,
+                guint time,
+                ETable *et)
 {
 	GtkAllocation allocation;
 	gboolean ret_val;
@@ -3240,11 +3351,11 @@ et_drag_motion (GtkWidget *widget,
 
 static gboolean
 et_drag_drop (GtkWidget *widget,
-	     GdkDragContext *context,
-	     gint x,
-	     gint y,
-	     guint time,
-	     ETable *et)
+              GdkDragContext *context,
+              gint x,
+              gint y,
+              guint time,
+              ETable *et)
 {
 	gboolean ret_val;
 	gint row, col;
@@ -3271,13 +3382,13 @@ et_drag_drop (GtkWidget *widget,
 
 static void
 et_drag_data_received (GtkWidget *widget,
-		      GdkDragContext *context,
-		      gint x,
-		      gint y,
-		      GtkSelectionData *selection_data,
-		      guint info,
-		      guint time,
-		      ETable *et)
+                       GdkDragContext *context,
+                       gint x,
+                       gint y,
+                       GtkSelectionData *selection_data,
+                       guint info,
+                       guint time,
+                       ETable *et)
 {
 	gint row, col;
 
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 99daf6d1e5..e1e4e0eb8f 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -121,8 +121,8 @@ struct _ETable {
 	gint length_threshold;
 
 	gint rebuild_idle_id;
-	guint need_rebuild:1;
-	guint size_allocated:1;
+	guint need_rebuild : 1;
+	guint size_allocated : 1;
 
 	/*
 	 * Configuration settings
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 7281f3d327..9f8d7d468a 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -34,7 +34,8 @@
 G_DEFINE_TYPE (ETreeMemoryCallbacks, e_tree_memory_callbacks, E_TYPE_TREE_MEMORY)
 
 static GdkPixbuf *
-etmc_icon_at (ETreeModel *etm, ETreePath node)
+etmc_icon_at (ETreeModel *etm,
+              ETreePath node)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -64,7 +65,8 @@ etmc_has_save_id (ETreeModel *etm)
 }
 
 static gchar *
-etmc_get_save_id (ETreeModel *etm, ETreePath node)
+etmc_get_save_id (ETreeModel *etm,
+                  ETreePath node)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -86,7 +88,8 @@ etmc_has_get_node_by_id (ETreeModel *etm)
 }
 
 static ETreePath
-etmc_get_node_by_id (ETreeModel *etm, const gchar *save_id)
+etmc_get_node_by_id (ETreeModel *etm,
+                     const gchar *save_id)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -97,7 +100,9 @@ etmc_get_node_by_id (ETreeModel *etm, const gchar *save_id)
 }
 
 static gpointer
-etmc_sort_value_at (ETreeModel *etm, ETreePath node, gint col)
+etmc_sort_value_at (ETreeModel *etm,
+                    ETreePath node,
+                    gint col)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -108,7 +113,9 @@ etmc_sort_value_at (ETreeModel *etm, ETreePath node, gint col)
 }
 
 static gpointer
-etmc_value_at (ETreeModel *etm, ETreePath node, gint col)
+etmc_value_at (ETreeModel *etm,
+               ETreePath node,
+               gint col)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -116,7 +123,10 @@ etmc_value_at (ETreeModel *etm, ETreePath node, gint col)
 }
 
 static void
-etmc_set_value_at (ETreeModel *etm, ETreePath node, gint col, gconstpointer val)
+etmc_set_value_at (ETreeModel *etm,
+                   ETreePath node,
+                   gint col,
+                   gconstpointer val)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -124,7 +134,9 @@ etmc_set_value_at (ETreeModel *etm, ETreePath node, gint col, gconstpointer val)
 }
 
 static gboolean
-etmc_is_editable (ETreeModel *etm, ETreePath node, gint col)
+etmc_is_editable (ETreeModel *etm,
+                  ETreePath node,
+                  gint col)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -133,7 +145,9 @@ etmc_is_editable (ETreeModel *etm, ETreePath node, gint col)
 
 /* The default for etmc_duplicate_value is to return the raw value. */
 static gpointer
-etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
+etmc_duplicate_value (ETreeModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -144,7 +158,9 @@ etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etmc_free_value (ETreeModel *etm, gint col, gpointer value)
+etmc_free_value (ETreeModel *etm,
+                 gint col,
+                 gpointer value)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -153,7 +169,8 @@ etmc_free_value (ETreeModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-etmc_initialize_value (ETreeModel *etm, gint col)
+etmc_initialize_value (ETreeModel *etm,
+                       gint col)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -164,7 +181,9 @@ etmc_initialize_value (ETreeModel *etm, gint col)
 }
 
 static gboolean
-etmc_value_is_empty (ETreeModel *etm, gint col, gconstpointer value)
+etmc_value_is_empty (ETreeModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -175,7 +194,9 @@ etmc_value_is_empty (ETreeModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-etmc_value_to_string (ETreeModel *etm, gint col, gconstpointer value)
+etmc_value_to_string (ETreeModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETreeMemoryCallbacks *etmc = E_TREE_MEMORY_CALLBACKS (etm);
 
@@ -240,28 +261,28 @@ e_tree_memory_callbacks_init (ETreeMemoryCallbacks *etmc)
  *
  */
 ETreeModel *
-e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
+e_tree_memory_callbacks_new (ETreeMemoryCallbacksIconAtFn icon_at,
 
-			      ETreeMemoryCallbacksColumnCountFn        column_count,
+                             ETreeMemoryCallbacksColumnCountFn column_count,
 
-			      ETreeMemoryCallbacksHasSaveIdFn          has_save_id,
-			      ETreeMemoryCallbacksGetSaveIdFn          get_save_id,
+                             ETreeMemoryCallbacksHasSaveIdFn has_save_id,
+                             ETreeMemoryCallbacksGetSaveIdFn get_save_id,
 
-			      ETreeMemoryCallbacksHasGetNodeByIdFn     has_get_node_by_id,
-			      ETreeMemoryCallbacksGetNodeByIdFn        get_node_by_id,
+                             ETreeMemoryCallbacksHasGetNodeByIdFn has_get_node_by_id,
+                             ETreeMemoryCallbacksGetNodeByIdFn get_node_by_id,
 
-			      ETreeMemoryCallbacksValueAtFn	       sort_value_at,
-			      ETreeMemoryCallbacksValueAtFn            value_at,
-			      ETreeMemoryCallbacksSetValueAtFn         set_value_at,
-			      ETreeMemoryCallbacksIsEditableFn         is_editable,
+                             ETreeMemoryCallbacksValueAtFn sort_value_at,
+                             ETreeMemoryCallbacksValueAtFn value_at,
+                             ETreeMemoryCallbacksSetValueAtFn set_value_at,
+                             ETreeMemoryCallbacksIsEditableFn is_editable,
 
-			      ETreeMemoryCallbacksDuplicateValueFn     duplicate_value,
-			      ETreeMemoryCallbacksFreeValueFn          free_value,
-			      ETreeMemoryCallbacksInitializeValueFn    initialize_value,
-			      ETreeMemoryCallbacksValueIsEmptyFn       value_is_empty,
-			      ETreeMemoryCallbacksValueToStringFn      value_to_string,
+                             ETreeMemoryCallbacksDuplicateValueFn duplicate_value,
+                             ETreeMemoryCallbacksFreeValueFn free_value,
+                             ETreeMemoryCallbacksInitializeValueFn initialize_value,
+                             ETreeMemoryCallbacksValueIsEmptyFn value_is_empty,
+                             ETreeMemoryCallbacksValueToStringFn value_to_string,
 
-			      gpointer                                 model_data)
+                             gpointer model_data)
 {
 	ETreeMemoryCallbacks *etmc;
 
@@ -290,6 +311,6 @@ e_tree_memory_callbacks_new  (ETreeMemoryCallbacksIconAtFn icon_at,
 
 	etmc->model_data         = model_data;
 
-	return (ETreeModel*) etmc;
+	return (ETreeModel *) etmc;
 }
 
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 4b9a977f05..43fb41b29c 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -81,7 +81,8 @@ struct _ETreeMemoryPrivate {
 /* ETreeMemoryPath functions */
 
 static inline void
-check_children (ETreeMemory *memory, ETreePath node)
+check_children (ETreeMemory *memory,
+                ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 	if (!path->children_computed) {
@@ -236,14 +237,16 @@ etmm_get_root (ETreeModel *etm)
 }
 
 static ETreePath
-etmm_get_parent (ETreeModel *etm, ETreePath node)
+etmm_get_parent (ETreeModel *etm,
+                 ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 	return path->parent;
 }
 
 static ETreePath
-etmm_get_first_child (ETreeModel *etm, ETreePath node)
+etmm_get_first_child (ETreeModel *etm,
+                      ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 
@@ -252,7 +255,8 @@ etmm_get_first_child (ETreeModel *etm, ETreePath node)
 }
 
 static ETreePath
-etmm_get_last_child (ETreeModel *etm, ETreePath node)
+etmm_get_last_child (ETreeModel *etm,
+                     ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 
@@ -261,28 +265,32 @@ etmm_get_last_child (ETreeModel *etm, ETreePath node)
 }
 
 static ETreePath
-etmm_get_next (ETreeModel *etm, ETreePath node)
+etmm_get_next (ETreeModel *etm,
+               ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 	return path->next_sibling;
 }
 
 static ETreePath
-etmm_get_prev (ETreeModel *etm, ETreePath node)
+etmm_get_prev (ETreeModel *etm,
+               ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 	return path->prev_sibling;
 }
 
 static gboolean
-etmm_is_root (ETreeModel *etm, ETreePath node)
+etmm_is_root (ETreeModel *etm,
+              ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 	return e_tree_memory_path_depth (path) == 0;
 }
 
 static gboolean
-etmm_is_expandable (ETreeModel *etm, ETreePath node)
+etmm_is_expandable (ETreeModel *etm,
+                    ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 
@@ -291,7 +299,9 @@ etmm_is_expandable (ETreeModel *etm, ETreePath node)
 }
 
 static guint
-etmm_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes)
+etmm_get_children (ETreeModel *etm,
+                   ETreePath node,
+                   ETreePath **nodes)
 {
 	ETreeMemoryPath *path = node;
 	guint n_children;
@@ -314,7 +324,8 @@ etmm_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes)
 }
 
 static guint
-etmm_depth (ETreeModel *etm, ETreePath path)
+etmm_depth (ETreeModel *etm,
+            ETreePath path)
 {
 	return e_tree_memory_path_depth (path);
 }
@@ -338,7 +349,8 @@ etmm_clear_children_computed (ETreeMemoryPath *path)
 }
 
 static void
-etmm_node_request_collapse (ETreeModel *etm, ETreePath node)
+etmm_node_request_collapse (ETreeModel *etm,
+                            ETreePath node)
 {
 	ETreeModelClass *parent_class;
 
@@ -430,7 +442,8 @@ e_tree_memory_new (void)
  * the value of @expanded.
  */
 void
-e_tree_memory_set_expanded_default         (ETreeMemory *etree, gboolean expanded)
+e_tree_memory_set_expanded_default (ETreeMemory *etree,
+                                    gboolean expanded)
 {
 	g_return_if_fail (etree != NULL);
 
@@ -447,7 +460,8 @@ e_tree_memory_set_expanded_default         (ETreeMemory *etree, gboolean expande
  * Return value:
  **/
 gpointer
-e_tree_memory_node_get_data (ETreeMemory *etmm, ETreePath node)
+e_tree_memory_node_get_data (ETreeMemory *etmm,
+                             ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 
@@ -465,7 +479,9 @@ e_tree_memory_node_get_data (ETreeMemory *etmm, ETreePath node)
  *
  **/
 void
-e_tree_memory_node_set_data (ETreeMemory *etmm, ETreePath node, gpointer node_data)
+e_tree_memory_node_set_data (ETreeMemory *etmm,
+                             ETreePath node,
+                             gpointer node_data)
 {
 	ETreeMemoryPath *path = node;
 
@@ -487,9 +503,9 @@ e_tree_memory_node_set_data (ETreeMemory *etmm, ETreePath node, gpointer node_da
  **/
 ETreePath
 e_tree_memory_node_insert (ETreeMemory *tree_model,
-			   ETreePath parent_node,
-			   gint position,
-			   gpointer node_data)
+                           ETreePath parent_node,
+                           gint position,
+                           gpointer node_data)
 {
 	ETreeMemoryPrivate *priv;
 	ETreeMemoryPath *new_path;
@@ -550,9 +566,9 @@ e_tree_memory_node_insert_id (ETreeMemory *etree,
  **/
 ETreePath
 e_tree_memory_node_insert_before (ETreeMemory *etree,
-				  ETreePath parent,
-				  ETreePath sibling,
-				  gpointer node_data)
+                                  ETreePath parent,
+                                  ETreePath sibling,
+                                  gpointer node_data)
 {
 	ETreeMemoryPath *child;
 	ETreeMemoryPath *parent_path = parent;
@@ -574,7 +590,8 @@ e_tree_memory_node_insert_before (ETreeMemory *etree,
 
 /* just blows away child data, doesn't take into account unlinking/etc */
 static void
-child_free (ETreeMemory *etree, ETreeMemoryPath *node)
+child_free (ETreeMemory *etree,
+            ETreeMemoryPath *node)
 {
 	ETreeMemoryPath *child, *next;
 
@@ -602,7 +619,8 @@ child_free (ETreeMemory *etree, ETreeMemoryPath *node)
  * Return value:
  **/
 gpointer
-e_tree_memory_node_remove (ETreeMemory *etree, ETreePath node)
+e_tree_memory_node_remove (ETreeMemory *etree,
+                           ETreePath node)
 {
 	ETreeMemoryPath *path = node;
 	ETreeMemoryPath *parent = path->parent;
@@ -622,7 +640,7 @@ e_tree_memory_node_remove (ETreeMemory *etree, ETreePath node)
 	}
 
 	/* unlink this node - we only have to unlink the root node being removed,
-	   since the others are only references from this node */
+	 * since the others are only references from this node */
 	e_tree_path_unlink (path);
 
 	/*printf("removing %d nodes from position %d\n", visible, base);*/
@@ -647,7 +665,9 @@ typedef struct {
 } MemoryAndClosure;
 
 static gint
-sort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
+sort_callback (gconstpointer data1,
+               gconstpointer data2,
+               gpointer user_data)
 {
 	ETreePath path1 = *(ETreePath *) data1;
 	ETreePath path2 = *(ETreePath *) data2;
@@ -656,10 +676,10 @@ sort_callback (gconstpointer data1, gconstpointer data2, gpointer user_data)
 }
 
 void
-e_tree_memory_sort_node             (ETreeMemory             *etmm,
-				     ETreePath                node,
-				     ETreeMemorySortCallback  callback,
-				     gpointer                 user_data)
+e_tree_memory_sort_node (ETreeMemory *etmm,
+                         ETreePath node,
+                         ETreeMemorySortCallback callback,
+                         gpointer user_data)
 {
 	ETreeMemoryPath **children;
 	ETreeMemoryPath *child;
@@ -716,9 +736,9 @@ e_tree_memory_sort_node             (ETreeMemory             *etmm,
 }
 
 void
-e_tree_memory_set_node_destroy_func  (ETreeMemory             *etmm,
-				      GFunc                    destroy_func,
-				      gpointer                 user_data)
+e_tree_memory_set_node_destroy_func (ETreeMemory *etmm,
+                                     GFunc destroy_func,
+                                     gpointer user_data)
 {
 	etmm->priv->destroy_func = destroy_func;
 	etmm->priv->destroy_user_data = user_data;
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 8772e5309f..b37ce4bf17 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -223,7 +223,7 @@ e_tree_model_init (ETreeModel *tree_model)
  * Return value:
  **/
 void
-e_tree_model_pre_change  (ETreeModel *tree_model)
+e_tree_model_pre_change (ETreeModel *tree_model)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -243,7 +243,7 @@ e_tree_model_pre_change  (ETreeModel *tree_model)
  * Return value:
  **/
 void
-e_tree_model_no_change  (ETreeModel *tree_model)
+e_tree_model_no_change (ETreeModel *tree_model)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -263,7 +263,7 @@ e_tree_model_no_change  (ETreeModel *tree_model)
  * Return value:
  **/
 void
-e_tree_model_rebuilt  (ETreeModel *tree_model)
+e_tree_model_rebuilt (ETreeModel *tree_model)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -282,7 +282,8 @@ e_tree_model_rebuilt  (ETreeModel *tree_model)
  * Return value:
  **/
 void
-e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath node)
+e_tree_model_node_changed (ETreeModel *tree_model,
+                           ETreePath node)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -302,7 +303,8 @@ e_tree_model_node_changed  (ETreeModel *tree_model, ETreePath node)
  * Return value:
  **/
 void
-e_tree_model_node_data_changed  (ETreeModel *tree_model, ETreePath node)
+e_tree_model_node_data_changed (ETreeModel *tree_model,
+                                ETreePath node)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -322,7 +324,9 @@ e_tree_model_node_data_changed  (ETreeModel *tree_model, ETreePath node)
  * Return value:
  **/
 void
-e_tree_model_node_col_changed  (ETreeModel *tree_model, ETreePath node, gint col)
+e_tree_model_node_col_changed (ETreeModel *tree_model,
+                               ETreePath node,
+                               gint col)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -342,8 +346,8 @@ e_tree_model_node_col_changed  (ETreeModel *tree_model, ETreePath node, gint col
  **/
 void
 e_tree_model_node_inserted (ETreeModel *tree_model,
-			    ETreePath parent_node,
-			    ETreePath inserted_node)
+                            ETreePath parent_node,
+                            ETreePath inserted_node)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -363,7 +367,10 @@ e_tree_model_node_inserted (ETreeModel *tree_model,
  *
  **/
 void
-e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath parent_node, ETreePath removed_node, gint old_position)
+e_tree_model_node_removed (ETreeModel *tree_model,
+                           ETreePath parent_node,
+                           ETreePath removed_node,
+                           gint old_position)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -382,7 +389,8 @@ e_tree_model_node_removed  (ETreeModel *tree_model, ETreePath parent_node, ETree
  *
  **/
 void
-e_tree_model_node_deleted  (ETreeModel *tree_model, ETreePath deleted_node)
+e_tree_model_node_deleted (ETreeModel *tree_model,
+                           ETreePath deleted_node)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -400,7 +408,8 @@ e_tree_model_node_deleted  (ETreeModel *tree_model, ETreePath deleted_node)
  *
  **/
 void
-e_tree_model_node_request_collapse  (ETreeModel *tree_model, ETreePath collapsed_node)
+e_tree_model_node_request_collapse (ETreeModel *tree_model,
+                                    ETreePath collapsed_node)
 {
 	g_return_if_fail (tree_model != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (tree_model));
@@ -455,7 +464,8 @@ e_tree_model_get_root (ETreeModel *etree)
  * Return value:
  **/
 ETreePath
-e_tree_model_node_get_parent (ETreeModel *etree, ETreePath node)
+e_tree_model_node_get_parent (ETreeModel *etree,
+                              ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	if (ETM_CLASS (etree)->get_parent)
@@ -474,7 +484,8 @@ e_tree_model_node_get_parent (ETreeModel *etree, ETreePath node)
  * Return value:
  **/
 ETreePath
-e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath node)
+e_tree_model_node_get_first_child (ETreeModel *etree,
+                                   ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -495,7 +506,8 @@ e_tree_model_node_get_first_child (ETreeModel *etree, ETreePath node)
  * Return value:
  **/
 ETreePath
-e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node)
+e_tree_model_node_get_last_child (ETreeModel *etree,
+                                  ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -516,7 +528,8 @@ e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node)
  * Return value:
  **/
 ETreePath
-e_tree_model_node_get_next (ETreeModel *etree, ETreePath node)
+e_tree_model_node_get_next (ETreeModel *etree,
+                            ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -537,7 +550,8 @@ e_tree_model_node_get_next (ETreeModel *etree, ETreePath node)
  * Return value:
  **/
 ETreePath
-e_tree_model_node_get_prev (ETreeModel *etree, ETreePath node)
+e_tree_model_node_get_prev (ETreeModel *etree,
+                            ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -558,7 +572,8 @@ e_tree_model_node_get_prev (ETreeModel *etree, ETreePath node)
  * Return value:
  **/
 gboolean
-e_tree_model_node_is_root (ETreeModel *etree, ETreePath node)
+e_tree_model_node_is_root (ETreeModel *etree,
+                           ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, FALSE);
 
@@ -578,7 +593,8 @@ e_tree_model_node_is_root (ETreeModel *etree, ETreePath node)
  * Return value:
  **/
 gboolean
-e_tree_model_node_is_expandable (ETreeModel *etree, ETreePath node)
+e_tree_model_node_is_expandable (ETreeModel *etree,
+                                 ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, FALSE);
 	g_return_val_if_fail (node != NULL, FALSE);
@@ -590,7 +606,9 @@ e_tree_model_node_is_expandable (ETreeModel *etree, ETreePath node)
 }
 
 guint
-e_tree_model_node_get_children (ETreeModel *etree, ETreePath node, ETreePath **nodes)
+e_tree_model_node_get_children (ETreeModel *etree,
+                                ETreePath node,
+                                ETreePath **nodes)
 {
 	g_return_val_if_fail (etree != NULL, 0);
 	if (ETM_CLASS (etree)->get_children)
@@ -609,7 +627,8 @@ e_tree_model_node_get_children (ETreeModel *etree, ETreePath node, ETreePath **n
  * Return value:
  **/
 guint
-e_tree_model_node_depth (ETreeModel *etree, ETreePath node)
+e_tree_model_node_depth (ETreeModel *etree,
+                         ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, 0);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), 0);
@@ -630,7 +649,8 @@ e_tree_model_node_depth (ETreeModel *etree, ETreePath node)
  * return values: the GdkPixbuf associated with this node.
  */
 GdkPixbuf *
-e_tree_model_icon_at (ETreeModel *etree, ETreePath node)
+e_tree_model_icon_at (ETreeModel *etree,
+                      ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -711,7 +731,8 @@ e_tree_model_has_save_id (ETreeModel *etree)
  * return values: The save id for this path.
  */
 gchar *
-e_tree_model_get_save_id (ETreeModel *etree, ETreePath node)
+e_tree_model_get_save_id (ETreeModel *etree,
+                          ETreePath node)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -755,7 +776,8 @@ e_tree_model_has_get_node_by_id (ETreeModel *etree)
  * return values: The path for this save id.
  */
 ETreePath
-e_tree_model_get_node_by_id (ETreeModel *etree, const gchar *save_id)
+e_tree_model_get_node_by_id (ETreeModel *etree,
+                             const gchar *save_id)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -807,7 +829,9 @@ e_tree_model_has_change_pending (ETreeModel *etree)
  * node_removed, and no_change don't affect any data in this way.
  **/
 gpointer
-e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, gint col)
+e_tree_model_sort_value_at (ETreeModel *etree,
+                            ETreePath node,
+                            gint col)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -838,7 +862,9 @@ e_tree_model_sort_value_at (ETreeModel *etree, ETreePath node, gint col)
  * node_removed, and no_change don't affect any data in this way.
  **/
 gpointer
-e_tree_model_value_at (ETreeModel *etree, ETreePath node, gint col)
+e_tree_model_value_at (ETreeModel *etree,
+                       ETreePath node,
+                       gint col)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE_MODEL (etree), NULL);
@@ -850,7 +876,10 @@ e_tree_model_value_at (ETreeModel *etree, ETreePath node, gint col)
 }
 
 void
-e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, gint col, gconstpointer val)
+e_tree_model_set_value_at (ETreeModel *etree,
+                           ETreePath node,
+                           gint col,
+                           gconstpointer val)
 {
 	g_return_if_fail (etree != NULL);
 	g_return_if_fail (E_IS_TREE_MODEL (etree));
@@ -869,7 +898,9 @@ e_tree_model_set_value_at (ETreeModel *etree, ETreePath node, gint col, gconstpo
  * Return value:
  **/
 gboolean
-e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, gint col)
+e_tree_model_node_is_editable (ETreeModel *etree,
+                               ETreePath node,
+                               gint col)
 {
 	g_return_val_if_fail (etree != NULL, FALSE);
 
@@ -889,7 +920,9 @@ e_tree_model_node_is_editable (ETreeModel *etree, ETreePath node, gint col)
  * Return value:
  **/
 gpointer
-e_tree_model_duplicate_value (ETreeModel *etree, gint col, gconstpointer value)
+e_tree_model_duplicate_value (ETreeModel *etree,
+                              gint col,
+                              gconstpointer value)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 
@@ -909,7 +942,9 @@ e_tree_model_duplicate_value (ETreeModel *etree, gint col, gconstpointer value)
  * Return value:
  **/
 void
-e_tree_model_free_value (ETreeModel *etree, gint col, gpointer value)
+e_tree_model_free_value (ETreeModel *etree,
+                         gint col,
+                         gpointer value)
 {
 	g_return_if_fail (etree != NULL);
 
@@ -927,7 +962,8 @@ e_tree_model_free_value (ETreeModel *etree, gint col, gpointer value)
  * Return value:
  **/
 gpointer
-e_tree_model_initialize_value (ETreeModel *etree, gint col)
+e_tree_model_initialize_value (ETreeModel *etree,
+                               gint col)
 {
 	g_return_val_if_fail (etree != NULL, NULL);
 
@@ -947,7 +983,9 @@ e_tree_model_initialize_value (ETreeModel *etree, gint col)
  * Return value:
  **/
 gboolean
-e_tree_model_value_is_empty (ETreeModel *etree, gint col, gconstpointer value)
+e_tree_model_value_is_empty (ETreeModel *etree,
+                             gint col,
+                             gconstpointer value)
 {
 	g_return_val_if_fail (etree != NULL, TRUE);
 
@@ -967,7 +1005,9 @@ e_tree_model_value_is_empty (ETreeModel *etree, gint col, gconstpointer value)
  * Return value:
  **/
 gchar *
-e_tree_model_value_to_string (ETreeModel *etree, gint col, gconstpointer value)
+e_tree_model_value_to_string (ETreeModel *etree,
+                              gint col,
+                              gconstpointer value)
 {
 	g_return_val_if_fail(etree != NULL, g_strdup(""));
 
@@ -987,7 +1027,10 @@ e_tree_model_value_to_string (ETreeModel *etree, gint col, gconstpointer value)
  *
  **/
 void
-e_tree_model_node_traverse (ETreeModel *model, ETreePath path, ETreePathFunc func, gpointer data)
+e_tree_model_node_traverse (ETreeModel *model,
+                            ETreePath path,
+                            ETreePathFunc func,
+                            gpointer data)
 {
 	ETreePath child;
 
@@ -1019,7 +1062,10 @@ e_tree_model_node_traverse (ETreeModel *model, ETreePath path, ETreePathFunc fun
  *
  **/
 void
-e_tree_model_node_traverse_preorder (ETreeModel *model, ETreePath path, ETreePathFunc func, gpointer data)
+e_tree_model_node_traverse_preorder (ETreeModel *model,
+                                     ETreePath path,
+                                     ETreePathFunc func,
+                                     gpointer data)
 {
 	ETreePath child;
 
@@ -1052,7 +1098,12 @@ e_tree_model_node_traverse_preorder (ETreeModel *model, ETreePath path, ETreePat
  *
  **/
 static ETreePath
-e_tree_model_node_real_traverse (ETreeModel *model, ETreePath path, ETreePath end_path, gboolean forward_direction, ETreePathFunc func, gpointer data)
+e_tree_model_node_real_traverse (ETreeModel *model,
+                                 ETreePath path,
+                                 ETreePath end_path,
+                                 gboolean forward_direction,
+                                 ETreePathFunc func,
+                                 gpointer data)
 {
 	ETreePath child;
 
@@ -1095,7 +1146,12 @@ e_tree_model_node_real_traverse (ETreeModel *model, ETreePath path, ETreePath en
  *
  **/
 ETreePath
-e_tree_model_node_find (ETreeModel *model, ETreePath path, ETreePath end_path, gboolean forward_direction, ETreePathFunc func, gpointer data)
+e_tree_model_node_find (ETreeModel *model,
+                        ETreePath path,
+                        ETreePath end_path,
+                        gboolean forward_direction,
+                        ETreePathFunc func,
+                        gpointer data)
 {
 	ETreePath result;
 	ETreePath next;
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index dd00fca2e0..9d04086b2f 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -79,7 +79,9 @@ clear_selection (ETreeSelectionModel *etsm)
 }
 
 static void
-change_one_path (ETreeSelectionModel *etsm, ETreePath path, gboolean grow)
+change_one_path (ETreeSelectionModel *etsm,
+                 ETreePath path,
+                 gboolean grow)
 {
 	if (!path)
 		return;
@@ -91,7 +93,8 @@ change_one_path (ETreeSelectionModel *etsm, ETreePath path, gboolean grow)
 }
 
 static void
-select_single_path (ETreeSelectionModel *etsm, ETreePath path)
+select_single_path (ETreeSelectionModel *etsm,
+                    ETreePath path)
 {
 	clear_selection (etsm);
 	change_one_path (etsm, path, TRUE);
@@ -100,7 +103,9 @@ select_single_path (ETreeSelectionModel *etsm, ETreePath path)
 }
 
 static void
-select_range (ETreeSelectionModel *etsm, gint start, gint end)
+select_range (ETreeSelectionModel *etsm,
+              gint start,
+              gint end)
 {
 	gint i;
 
@@ -125,7 +130,8 @@ free_id (ETreeSelectionModel *etsm)
 }
 
 static void
-restore_cursor (ETreeSelectionModel *etsm, ETreeModel *etm)
+restore_cursor (ETreeSelectionModel *etsm,
+                ETreeModel *etm)
 {
 	clear_selection (etsm);
 	etsm->priv->cursor_path = NULL;
@@ -153,7 +159,8 @@ restore_cursor (ETreeSelectionModel *etsm, ETreeModel *etm)
 }
 
 static void
-etsm_pre_change (ETreeModel *etm, ETreeSelectionModel *etsm)
+etsm_pre_change (ETreeModel *etm,
+                 ETreeSelectionModel *etsm)
 {
 	g_free (etsm->priv->cursor_save_id);
 	etsm->priv->cursor_save_id = NULL;
@@ -164,49 +171,67 @@ etsm_pre_change (ETreeModel *etm, ETreeSelectionModel *etsm)
 }
 
 static void
-etsm_no_change (ETreeModel *etm, ETreeSelectionModel *etsm)
+etsm_no_change (ETreeModel *etm,
+                ETreeSelectionModel *etsm)
 {
 	free_id (etsm);
 }
 
 static void
-etsm_node_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *etsm)
+etsm_node_changed (ETreeModel *etm,
+                   ETreePath node,
+                   ETreeSelectionModel *etsm)
 {
 	restore_cursor (etsm, etm);
 }
 
 static void
-etsm_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSelectionModel *etsm)
+etsm_node_data_changed (ETreeModel *etm,
+                        ETreePath node,
+                        ETreeSelectionModel *etsm)
 {
 	free_id (etsm);
 }
 
 static void
-etsm_node_col_changed (ETreeModel *etm, ETreePath node, gint col, ETreeSelectionModel *etsm)
+etsm_node_col_changed (ETreeModel *etm,
+                       ETreePath node,
+                       gint col,
+                       ETreeSelectionModel *etsm)
 {
 	free_id (etsm);
 }
 
 static void
-etsm_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeSelectionModel *etsm)
+etsm_node_inserted (ETreeModel *etm,
+                    ETreePath parent,
+                    ETreePath child,
+                    ETreeSelectionModel *etsm)
 {
 	restore_cursor (etsm, etm);
 }
 
 static void
-etsm_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint old_position, ETreeSelectionModel *etsm)
+etsm_node_removed (ETreeModel *etm,
+                   ETreePath parent,
+                   ETreePath child,
+                   gint old_position,
+                   ETreeSelectionModel *etsm)
 {
 	restore_cursor (etsm, etm);
 }
 
 static void
-etsm_node_deleted (ETreeModel *etm, ETreePath child, ETreeSelectionModel *etsm)
+etsm_node_deleted (ETreeModel *etm,
+                   ETreePath child,
+                   ETreeSelectionModel *etsm)
 {
 	restore_cursor (etsm, etm);
 }
 
 static void
-add_model (ETreeSelectionModel *etsm, ETreeModel *model)
+add_model (ETreeSelectionModel *etsm,
+           ETreeModel *model)
 {
 	ETreeSelectionModelPrivate *priv = etsm->priv;
 
@@ -298,11 +323,14 @@ etsm_finalize (GObject *object)
 }
 
 static void
-etsm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+etsm_get_property (GObject *object,
+                   guint property_id,
+                   GValue *value,
+                   GParamSpec *pspec)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_CURSOR_ROW:
 		g_value_set_int (value, get_cursor_row (etsm));
 		break;
@@ -322,12 +350,15 @@ etsm_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *ps
 }
 
 static void
-etsm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
+etsm_set_property (GObject *object,
+                   guint property_id,
+                   const GValue *value,
+                   GParamSpec *pspec)
 {
 	ESelectionModel *esm = E_SELECTION_MODEL (object);
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_CURSOR_ROW:
 		e_selection_model_do_something (esm, g_value_get_int (value), etsm->priv->cursor_col, 0);
 		break;
@@ -348,7 +379,8 @@ etsm_set_property (GObject *object, guint prop_id, const GValue *value, GParamSp
 }
 
 static gboolean
-etsm_is_path_selected (ETreeSelectionModel *etsm, ETreePath path)
+etsm_is_path_selected (ETreeSelectionModel *etsm,
+                       ETreePath path)
 {
 	if (path && g_hash_table_lookup (etsm->priv->paths, path))
 		return TRUE;
@@ -367,7 +399,7 @@ etsm_is_path_selected (ETreeSelectionModel *etsm, ETreePath path)
  */
 static gboolean
 etsm_is_row_selected (ESelectionModel *selection,
-		      gint             row)
+                      gint row)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 	ETreePath path;
@@ -387,7 +419,9 @@ typedef struct {
 } ModelAndCallback;
 
 static void
-etsm_row_foreach_cb (gpointer key, gpointer value, gpointer user_data)
+etsm_row_foreach_cb (gpointer key,
+                     gpointer value,
+                     gpointer user_data)
 {
 	ETreePath path = key;
 	ModelAndCallback *mac = user_data;
@@ -407,8 +441,8 @@ etsm_row_foreach_cb (gpointer key, gpointer value, gpointer user_data)
  */
 static void
 etsm_foreach (ESelectionModel *selection,
-	      EForeachFunc     callback,
-	      gpointer         closure)
+              EForeachFunc callback,
+              gpointer closure)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 	ModelAndCallback mac;
@@ -520,7 +554,9 @@ etsm_invert_selection (ESelectionModel *selection)
 }
 
 static void
-etsm_change_one_row (ESelectionModel *selection, gint row, gboolean grow)
+etsm_change_one_row (ESelectionModel *selection,
+                     gint row,
+                     gboolean grow)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 	ETreePath path;
@@ -538,7 +574,9 @@ etsm_change_one_row (ESelectionModel *selection, gint row, gboolean grow)
 }
 
 static void
-etsm_change_cursor (ESelectionModel *selection, gint row, gint col)
+etsm_change_cursor (ESelectionModel *selection,
+                    gint row,
+                    gint col)
 {
 	ETreeSelectionModel *etsm;
 
@@ -569,7 +607,8 @@ etsm_cursor_col (ESelectionModel *selection)
 }
 
 static void
-etsm_get_rows (gint row, gpointer d)
+etsm_get_rows (gint row,
+               gpointer d)
 {
 	gint **rowp = d;
 
@@ -578,7 +617,8 @@ etsm_get_rows (gint row, gpointer d)
 }
 
 static void
-etsm_select_single_row (ESelectionModel *selection, gint row)
+etsm_select_single_row (ESelectionModel *selection,
+                        gint row)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 	ETreePath path = e_tree_table_adapter_node_at_row (etsm->priv->etta, row);
@@ -587,7 +627,7 @@ etsm_select_single_row (ESelectionModel *selection, gint row)
 	g_return_if_fail (path != NULL);
 
 	/* we really only care about the size=1 case (cursor changed),
-	   but this doesn't cost much */
+	 * but this doesn't cost much */
 	size = g_hash_table_size (etsm->priv->paths);
 	if (size > 0 && size <= 5) {
 		rowp = rows;
@@ -596,13 +636,13 @@ etsm_select_single_row (ESelectionModel *selection, gint row)
 
 	select_single_path (etsm, path);
 
-	if (size>5) {
+	if (size > 5) {
 		e_selection_model_selection_changed (E_SELECTION_MODEL (etsm));
 	} else {
 		if (rowp) {
 			gint *p = rows;
 
-			while (p<rowp)
+			while (p < rowp)
 				e_selection_model_selection_row_changed ((ESelectionModel *) etsm, *p++);
 		}
 		e_selection_model_selection_row_changed ((ESelectionModel *) etsm, row);
@@ -610,7 +650,8 @@ etsm_select_single_row (ESelectionModel *selection, gint row)
 }
 
 static void
-etsm_toggle_single_row (ESelectionModel *selection, gint row)
+etsm_toggle_single_row (ESelectionModel *selection,
+                        gint row)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 	ETreePath path = e_tree_table_adapter_node_at_row (etsm->priv->etta, row);
@@ -628,7 +669,8 @@ etsm_toggle_single_row (ESelectionModel *selection, gint row)
 }
 
 static void
-etsm_real_move_selection_end (ETreeSelectionModel *etsm, gint row)
+etsm_real_move_selection_end (ETreeSelectionModel *etsm,
+                              gint row)
 {
 	ETreePath end_path = e_tree_table_adapter_node_at_row (etsm->priv->etta, row);
 	gint start;
@@ -641,7 +683,8 @@ etsm_real_move_selection_end (ETreeSelectionModel *etsm, gint row)
 }
 
 static void
-etsm_move_selection_end (ESelectionModel *selection, gint row)
+etsm_move_selection_end (ESelectionModel *selection,
+                         gint row)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 
@@ -652,7 +695,8 @@ etsm_move_selection_end (ESelectionModel *selection, gint row)
 }
 
 static void
-etsm_set_selection_end (ESelectionModel *selection, gint row)
+etsm_set_selection_end (ESelectionModel *selection,
+                        gint row)
 {
 	ETreeSelectionModel *etsm = E_TREE_SELECTION_MODEL (selection);
 
@@ -670,7 +714,9 @@ struct foreach_path_t {
 };
 
 static void
-foreach_path (gpointer key, gpointer value, gpointer data)
+foreach_path (gpointer key,
+              gpointer value,
+              gpointer data)
 {
 	ETreePath path = key;
 	struct foreach_path_t *c = data;
@@ -678,7 +724,9 @@ foreach_path (gpointer key, gpointer value, gpointer data)
 }
 
 void
-e_tree_selection_model_foreach (ETreeSelectionModel *etsm, ETreeForeachFunc callback, gpointer closure)
+e_tree_selection_model_foreach (ETreeSelectionModel *etsm,
+                                ETreeForeachFunc callback,
+                                gpointer closure)
 {
 	if (etsm->priv->paths) {
 		struct foreach_path_t c;
@@ -690,7 +738,8 @@ e_tree_selection_model_foreach (ETreeSelectionModel *etsm, ETreeForeachFunc call
 }
 
 void
-e_tree_selection_model_select_single_path (ETreeSelectionModel *etsm, ETreePath path)
+e_tree_selection_model_select_single_path (ETreeSelectionModel *etsm,
+                                           ETreePath path)
 {
 	select_single_path (etsm, path);
 
@@ -698,12 +747,13 @@ e_tree_selection_model_select_single_path (ETreeSelectionModel *etsm, ETreePath
 }
 
 void
-e_tree_selection_model_select_paths (ETreeSelectionModel *etsm, GPtrArray *paths)
+e_tree_selection_model_select_paths (ETreeSelectionModel *etsm,
+                                     GPtrArray *paths)
 {
 	ETreePath path;
 	gint i;
 
-	for (i=0;i<paths->len;i++) {
+	for (i = 0; i < paths->len; i++) {
 		path = paths->pdata[i];
 		change_one_path (etsm, path, TRUE);
 	}
@@ -712,7 +762,8 @@ e_tree_selection_model_select_paths (ETreeSelectionModel *etsm, GPtrArray *paths
 }
 
 void
-e_tree_selection_model_add_to_selection (ETreeSelectionModel *etsm, ETreePath path)
+e_tree_selection_model_add_to_selection (ETreeSelectionModel *etsm,
+                                         ETreePath path)
 {
 	change_one_path (etsm, path, TRUE);
 
@@ -720,7 +771,8 @@ e_tree_selection_model_add_to_selection (ETreeSelectionModel *etsm, ETreePath pa
 }
 
 void
-e_tree_selection_model_change_cursor (ETreeSelectionModel *etsm, ETreePath path)
+e_tree_selection_model_change_cursor (ETreeSelectionModel *etsm,
+                                      ETreePath path)
 {
 	gint row;
 
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index c92bb45c65..72b4cba091 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -169,7 +169,8 @@ ets_insert_idle (ETreeSorted *ets)
 #define CHECK_AROUND_LAST_ACCESS
 
 static inline ETreeSortedPath *
-check_last_access (ETreeSorted *ets, ETreePath corresponding)
+check_last_access (ETreeSorted *ets,
+                   ETreePath corresponding)
 {
 #ifdef CHECK_AROUND_LAST_ACCESS
 	ETreeSortedPath *parent;
@@ -211,7 +212,8 @@ check_last_access (ETreeSorted *ets, ETreePath corresponding)
 }
 
 static ETreeSortedPath *
-find_path (ETreeSorted *ets, ETreePath corresponding)
+find_path (ETreeSorted *ets,
+           ETreePath corresponding)
 {
 	gint depth;
 	ETreePath *sequence;
@@ -268,7 +270,9 @@ find_path (ETreeSorted *ets, ETreePath corresponding)
 }
 
 static ETreeSortedPath *
-find_child_path (ETreeSorted *ets, ETreeSortedPath *parent, ETreePath corresponding)
+find_child_path (ETreeSorted *ets,
+                 ETreeSortedPath *parent,
+                 ETreePath corresponding)
 {
 	gint i;
 
@@ -287,7 +291,8 @@ find_child_path (ETreeSorted *ets, ETreeSortedPath *parent, ETreePath correspond
 }
 
 static ETreeSortedPath *
-find_or_create_path (ETreeSorted *ets, ETreePath corresponding)
+find_or_create_path (ETreeSorted *ets,
+                     ETreePath corresponding)
 {
 	gint depth;
 	ETreePath *sequence;
@@ -367,7 +372,8 @@ free_path (ETreeSortedPath *path)
 }
 
 static ETreeSortedPath *
-new_path (ETreeSortedPath *parent, ETreePath corresponding)
+new_path (ETreeSortedPath *parent,
+          ETreePath corresponding)
 {
 	ETreeSortedPath *path;
 
@@ -388,7 +394,8 @@ new_path (ETreeSortedPath *parent, ETreePath corresponding)
 }
 
 static gboolean
-reposition_path (ETreeSorted *ets, ETreeSortedPath *path)
+reposition_path (ETreeSorted *ets,
+                 ETreeSortedPath *path)
 {
 	gint new_index;
 	gint old_index = path->position;
@@ -442,7 +449,8 @@ reposition_path (ETreeSorted *ets, ETreeSortedPath *path)
 }
 
 static void
-regenerate_children (ETreeSorted *ets, ETreeSortedPath *path)
+regenerate_children (ETreeSorted *ets,
+                     ETreeSortedPath *path)
 {
 	ETreeSortedPath **children;
 	gint i;
@@ -455,7 +463,8 @@ regenerate_children (ETreeSorted *ets, ETreeSortedPath *path)
 }
 
 static void
-generate_children (ETreeSorted *ets, ETreeSortedPath *path)
+generate_children (ETreeSorted *ets,
+                   ETreeSortedPath *path)
 {
 	ETreePath child;
 	gint i;
@@ -484,7 +493,11 @@ generate_children (ETreeSorted *ets, ETreeSortedPath *path)
 }
 
 static void
-resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_children, gboolean needs_regen, gboolean send_signals)
+resort_node (ETreeSorted *ets,
+             ETreeSortedPath *path,
+             gboolean resort_all_children,
+             gboolean needs_regen,
+             gboolean send_signals)
 {
 	gboolean needs_resort;
 	if (path) {
@@ -532,7 +545,8 @@ resort_node (ETreeSorted *ets, ETreeSortedPath *path, gboolean resort_all_childr
 }
 
 static void
-mark_path_child_needs_resort (ETreeSorted *ets, ETreeSortedPath *path)
+mark_path_child_needs_resort (ETreeSorted *ets,
+                              ETreeSortedPath *path)
 {
 	if (path == NULL)
 		return;
@@ -543,7 +557,10 @@ mark_path_child_needs_resort (ETreeSorted *ets, ETreeSortedPath *path)
 }
 
 static void
-mark_path_needs_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_regen, gboolean resort_all_children)
+mark_path_needs_resort (ETreeSorted *ets,
+                        ETreeSortedPath *path,
+                        gboolean needs_regen,
+                        gboolean resort_all_children)
 {
 	if (path == NULL)
 		return;
@@ -556,7 +573,10 @@ mark_path_needs_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_
 }
 
 static void
-schedule_resort (ETreeSorted *ets, ETreeSortedPath *path, gboolean needs_regen, gboolean resort_all_children)
+schedule_resort (ETreeSorted *ets,
+                 ETreeSortedPath *path,
+                 gboolean needs_regen,
+                 gboolean resort_all_children)
 {
 	ets->priv->insert_count = 0;
 	if (ets->priv->insert_idle_id != 0) {
@@ -681,14 +701,16 @@ ets_get_root (ETreeModel *etm)
 }
 
 static ETreePath
-ets_get_parent (ETreeModel *etm, ETreePath node)
+ets_get_parent (ETreeModel *etm,
+                ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	return path->parent;
 }
 
 static ETreePath
-ets_get_first_child (ETreeModel *etm, ETreePath node)
+ets_get_first_child (ETreeModel *etm,
+                     ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED (etm);
@@ -703,7 +725,8 @@ ets_get_first_child (ETreeModel *etm, ETreePath node)
 }
 
 static ETreePath
-ets_get_last_child (ETreeModel *etm, ETreePath node)
+ets_get_last_child (ETreeModel *etm,
+                    ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED (etm);
@@ -718,7 +741,8 @@ ets_get_last_child (ETreeModel *etm, ETreePath node)
 }
 
 static ETreePath
-ets_get_next (ETreeModel *etm, ETreePath node)
+ets_get_next (ETreeModel *etm,
+              ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSortedPath *parent = path->parent;
@@ -732,7 +756,8 @@ ets_get_next (ETreeModel *etm, ETreePath node)
 }
 
 static ETreePath
-ets_get_prev (ETreeModel *etm, ETreePath node)
+ets_get_prev (ETreeModel *etm,
+              ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSortedPath *parent = path->parent;
@@ -746,7 +771,8 @@ ets_get_prev (ETreeModel *etm, ETreePath node)
 }
 
 static gboolean
-ets_is_root (ETreeModel *etm, ETreePath node)
+ets_is_root (ETreeModel *etm,
+             ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED (etm);
@@ -755,7 +781,8 @@ ets_is_root (ETreeModel *etm, ETreePath node)
 }
 
 static gboolean
-ets_is_expandable (ETreeModel *etm, ETreePath node)
+ets_is_expandable (ETreeModel *etm,
+                   ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED (etm);
@@ -769,7 +796,9 @@ ets_is_expandable (ETreeModel *etm, ETreePath node)
 }
 
 static guint
-ets_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes)
+ets_get_children (ETreeModel *etm,
+                  ETreePath node,
+                  ETreePath **nodes)
 {
 	ETreeSortedPath *path = node;
 	guint n_children;
@@ -793,7 +822,8 @@ ets_get_children (ETreeModel *etm, ETreePath node, ETreePath **nodes)
 }
 
 static guint
-ets_depth (ETreeModel *etm, ETreePath node)
+ets_depth (ETreeModel *etm,
+           ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED (etm);
@@ -802,7 +832,8 @@ ets_depth (ETreeModel *etm, ETreePath node)
 }
 
 static GdkPixbuf *
-ets_icon_at (ETreeModel *etm, ETreePath node)
+ets_icon_at (ETreeModel *etm,
+             ETreePath node)
 {
 	ETreeSortedPath *path = node;
 	ETreeSorted *ets = E_TREE_SORTED (etm);
@@ -833,7 +864,8 @@ ets_has_save_id (ETreeModel *etm)
 }
 
 static gchar *
-ets_get_save_id (ETreeModel *etm, ETreePath node)
+ets_get_save_id (ETreeModel *etm,
+                 ETreePath node)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 	ETreeSortedPath *path = node;
@@ -852,7 +884,8 @@ ets_has_get_node_by_id (ETreeModel *etm)
 }
 
 static ETreePath
-ets_get_node_by_id (ETreeModel *etm, const gchar *save_id)
+ets_get_node_by_id (ETreeModel *etm,
+                    const gchar *save_id)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 	ETreePath node;
@@ -871,7 +904,9 @@ ets_has_change_pending (ETreeModel *etm)
 }
 
 static gpointer
-ets_value_at (ETreeModel *etm, ETreePath node, gint col)
+ets_value_at (ETreeModel *etm,
+              ETreePath node,
+              gint col)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 	ETreeSortedPath *path = node;
@@ -880,7 +915,10 @@ ets_value_at (ETreeModel *etm, ETreePath node, gint col)
 }
 
 static void
-ets_set_value_at (ETreeModel *etm, ETreePath node, gint col, gconstpointer val)
+ets_set_value_at (ETreeModel *etm,
+                  ETreePath node,
+                  gint col,
+                  gconstpointer val)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 	ETreeSortedPath *path = node;
@@ -889,7 +927,9 @@ ets_set_value_at (ETreeModel *etm, ETreePath node, gint col, gconstpointer val)
 }
 
 static gboolean
-ets_is_editable (ETreeModel *etm, ETreePath node, gint col)
+ets_is_editable (ETreeModel *etm,
+                 ETreePath node,
+                 gint col)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 	ETreeSortedPath *path = node;
@@ -899,7 +939,9 @@ ets_is_editable (ETreeModel *etm, ETreePath node, gint col)
 
 /* The default for ets_duplicate_value is to return the raw value. */
 static gpointer
-ets_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
+ets_duplicate_value (ETreeModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 
@@ -907,7 +949,9 @@ ets_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
 }
 
 static void
-ets_free_value (ETreeModel *etm, gint col, gpointer value)
+ets_free_value (ETreeModel *etm,
+                gint col,
+                gpointer value)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 
@@ -915,7 +959,8 @@ ets_free_value (ETreeModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-ets_initialize_value (ETreeModel *etm, gint col)
+ets_initialize_value (ETreeModel *etm,
+                      gint col)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 
@@ -923,7 +968,9 @@ ets_initialize_value (ETreeModel *etm, gint col)
 }
 
 static gboolean
-ets_value_is_empty (ETreeModel *etm, gint col, gconstpointer value)
+ets_value_is_empty (ETreeModel *etm,
+                    gint col,
+                    gconstpointer value)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 
@@ -931,7 +978,9 @@ ets_value_is_empty (ETreeModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-ets_value_to_string (ETreeModel *etm, gint col, gconstpointer value)
+ets_value_to_string (ETreeModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETreeSorted *ets = E_TREE_SORTED (etm);
 
@@ -941,19 +990,23 @@ ets_value_to_string (ETreeModel *etm, gint col, gconstpointer value)
 /* Proxy functions */
 
 static void
-ets_proxy_pre_change (ETreeModel *etm, ETreeSorted *ets)
+ets_proxy_pre_change (ETreeModel *etm,
+                      ETreeSorted *ets)
 {
 	e_tree_model_pre_change (E_TREE_MODEL (ets));
 }
 
 static void
-ets_proxy_no_change (ETreeModel *etm, ETreeSorted *ets)
+ets_proxy_no_change (ETreeModel *etm,
+                     ETreeSorted *ets)
 {
 	e_tree_model_no_change (E_TREE_MODEL (ets));
 }
 
 static void
-ets_proxy_node_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
+ets_proxy_node_changed (ETreeModel *etm,
+                        ETreePath node,
+                        ETreeSorted *ets)
 {
 	ets->priv->last_access = NULL;
 	d(g_print("Setting last access %p. (ets_proxy_node_changed)\n", ets->priv->last_access));
@@ -984,7 +1037,9 @@ ets_proxy_node_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
 }
 
 static void
-ets_proxy_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
+ets_proxy_node_data_changed (ETreeModel *etm,
+                             ETreePath node,
+                             ETreeSorted *ets)
 {
 	ETreeSortedPath *path = find_path (ets, node);
 
@@ -998,7 +1053,10 @@ ets_proxy_node_data_changed (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
 }
 
 static void
-ets_proxy_node_col_changed (ETreeModel *etm, ETreePath node, gint col, ETreeSorted *ets)
+ets_proxy_node_col_changed (ETreeModel *etm,
+                            ETreePath node,
+                            gint col,
+                            ETreeSorted *ets)
 {
 	ETreeSortedPath *path = find_path (ets, node);
 
@@ -1015,7 +1073,10 @@ ets_proxy_node_col_changed (ETreeModel *etm, ETreePath node, gint col, ETreeSort
 }
 
 static void
-ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeSorted *ets)
+ets_proxy_node_inserted (ETreeModel *etm,
+                         ETreePath parent,
+                         ETreePath child,
+                         ETreeSorted *ets)
 {
 	ETreeSortedPath *parent_path = find_path (ets, parent);
 
@@ -1083,7 +1144,11 @@ ets_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETr
 }
 
 static void
-ets_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint old_position, ETreeSorted *ets)
+ets_proxy_node_removed (ETreeModel *etm,
+                        ETreePath parent,
+                        ETreePath child,
+                        gint old_position,
+                        ETreeSorted *ets)
 {
 	ETreeSortedPath *parent_path = find_path (ets, parent);
 	ETreeSortedPath *path;
@@ -1120,13 +1185,17 @@ ets_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint
 }
 
 static void
-ets_proxy_node_deleted (ETreeModel *etm, ETreePath child, ETreeSorted *ets)
+ets_proxy_node_deleted (ETreeModel *etm,
+                        ETreePath child,
+                        ETreeSorted *ets)
 {
 	e_tree_model_node_deleted (E_TREE_MODEL (ets), NULL);
 }
 
 static void
-ets_proxy_node_request_collapse (ETreeModel *etm, ETreePath node, ETreeSorted *ets)
+ets_proxy_node_request_collapse (ETreeModel *etm,
+                                 ETreePath node,
+                                 ETreeSorted *ets)
 {
 	ETreeSortedPath *path = find_path (ets, node);
 	if (path) {
@@ -1135,7 +1204,8 @@ ets_proxy_node_request_collapse (ETreeModel *etm, ETreePath node, ETreeSorted *e
 }
 
 static void
-ets_sort_info_changed (ETableSortInfo *sort_info, ETreeSorted *ets)
+ets_sort_info_changed (ETableSortInfo *sort_info,
+                       ETreeSorted *ets)
 {
 	schedule_resort (ets, ets->priv->root, TRUE, TRUE);
 }
@@ -1216,7 +1286,10 @@ e_tree_sorted_init (ETreeSorted *ets)
  *
  **/
 void
-e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
+e_tree_sorted_construct (ETreeSorted *ets,
+                         ETreeModel *source,
+                         ETableHeader *full_header,
+                         ETableSortInfo *sort_info)
 {
 	ets->priv->source                              = source;
 	if (source)
@@ -1228,24 +1301,33 @@ e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *ful
 
 	e_tree_sorted_set_sort_info (ets, sort_info);
 
-	ets->priv->tree_model_pre_change_id            = g_signal_connect (G_OBJECT (source), "pre_change",
-									   G_CALLBACK (ets_proxy_pre_change), ets);
-	ets->priv->tree_model_no_change_id             = g_signal_connect (G_OBJECT (source), "no_change",
-									   G_CALLBACK (ets_proxy_no_change), ets);
-	ets->priv->tree_model_node_changed_id          = g_signal_connect (G_OBJECT (source), "node_changed",
-									   G_CALLBACK (ets_proxy_node_changed), ets);
-	ets->priv->tree_model_node_data_changed_id     = g_signal_connect (G_OBJECT (source), "node_data_changed",
-									   G_CALLBACK (ets_proxy_node_data_changed), ets);
-	ets->priv->tree_model_node_col_changed_id      = g_signal_connect (G_OBJECT (source), "node_col_changed",
-									   G_CALLBACK (ets_proxy_node_col_changed), ets);
-	ets->priv->tree_model_node_inserted_id         = g_signal_connect (G_OBJECT (source), "node_inserted",
-									   G_CALLBACK (ets_proxy_node_inserted), ets);
-	ets->priv->tree_model_node_removed_id          = g_signal_connect (G_OBJECT (source), "node_removed",
-									   G_CALLBACK (ets_proxy_node_removed), ets);
-	ets->priv->tree_model_node_deleted_id          = g_signal_connect (G_OBJECT (source), "node_deleted",
-									   G_CALLBACK (ets_proxy_node_deleted), ets);
-	ets->priv->tree_model_node_request_collapse_id = g_signal_connect (G_OBJECT (source), "node_request_collapse",
-									   G_CALLBACK (ets_proxy_node_request_collapse), ets);
+	ets->priv->tree_model_pre_change_id = g_signal_connect (
+		source, "pre_change",
+		G_CALLBACK (ets_proxy_pre_change), ets);
+	ets->priv->tree_model_no_change_id = g_signal_connect (
+		source, "no_change",
+		G_CALLBACK (ets_proxy_no_change), ets);
+	ets->priv->tree_model_node_changed_id = g_signal_connect (
+		source, "node_changed",
+		G_CALLBACK (ets_proxy_node_changed), ets);
+	ets->priv->tree_model_node_data_changed_id = g_signal_connect (
+		source, "node_data_changed",
+		G_CALLBACK (ets_proxy_node_data_changed), ets);
+	ets->priv->tree_model_node_col_changed_id = g_signal_connect (
+		source, "node_col_changed",
+		G_CALLBACK (ets_proxy_node_col_changed), ets);
+	ets->priv->tree_model_node_inserted_id = g_signal_connect (
+		source, "node_inserted",
+		G_CALLBACK (ets_proxy_node_inserted), ets);
+	ets->priv->tree_model_node_removed_id = g_signal_connect (
+		source, "node_removed",
+		G_CALLBACK (ets_proxy_node_removed), ets);
+	ets->priv->tree_model_node_deleted_id = g_signal_connect (
+		source, "node_deleted",
+		G_CALLBACK (ets_proxy_node_deleted), ets);
+	ets->priv->tree_model_node_request_collapse_id = g_signal_connect (
+		source, "node_request_collapse",
+		G_CALLBACK (ets_proxy_node_request_collapse), ets);
 
 }
 
@@ -1257,7 +1339,9 @@ e_tree_sorted_construct (ETreeSorted *ets, ETreeModel *source, ETableHeader *ful
  * return values: a newly constructed ETreeSorted.
  */
 ETreeSorted *
-e_tree_sorted_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
+e_tree_sorted_new (ETreeModel *source,
+                   ETableHeader *full_header,
+                   ETableSortInfo *sort_info)
 {
 	ETreeSorted *ets = g_object_new (E_TYPE_TREE_SORTED, NULL);
 
@@ -1267,8 +1351,8 @@ e_tree_sorted_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo
 }
 
 ETreePath
-e_tree_sorted_view_to_model_path  (ETreeSorted    *ets,
-				   ETreePath       view_path)
+e_tree_sorted_view_to_model_path (ETreeSorted *ets,
+                                  ETreePath view_path)
 {
 	ETreeSortedPath *path = view_path;
 	if (path) {
@@ -1280,23 +1364,23 @@ e_tree_sorted_view_to_model_path  (ETreeSorted    *ets,
 }
 
 ETreePath
-e_tree_sorted_model_to_view_path  (ETreeSorted    *ets,
-				   ETreePath       model_path)
+e_tree_sorted_model_to_view_path (ETreeSorted *ets,
+                                  ETreePath model_path)
 {
 	return find_or_create_path (ets, model_path);
 }
 
 gint
-e_tree_sorted_orig_position       (ETreeSorted    *ets,
-				   ETreePath       path)
+e_tree_sorted_orig_position (ETreeSorted *ets,
+                             ETreePath path)
 {
 	ETreeSortedPath *sorted_path = path;
 	return sorted_path->orig_position;
 }
 
 gint
-e_tree_sorted_node_num_children   (ETreeSorted    *ets,
-				   ETreePath       path)
+e_tree_sorted_node_num_children (ETreeSorted *ets,
+                                 ETreePath path)
 {
 	ETreeSortedPath *sorted_path = path;
 
@@ -1308,7 +1392,8 @@ e_tree_sorted_node_num_children   (ETreeSorted    *ets,
 }
 
 void
-e_tree_sorted_node_resorted  (ETreeSorted *sorted, ETreePath node)
+e_tree_sorted_node_resorted (ETreeSorted *sorted,
+                             ETreePath node)
 {
 	g_return_if_fail (sorted != NULL);
 	g_return_if_fail (E_IS_TREE_SORTED (sorted));
@@ -1317,7 +1402,8 @@ e_tree_sorted_node_resorted  (ETreeSorted *sorted, ETreePath node)
 }
 
 void
-e_tree_sorted_set_sort_info (ETreeSorted *ets, ETableSortInfo *sort_info)
+e_tree_sorted_set_sort_info (ETreeSorted *ets,
+                             ETableSortInfo *sort_info)
 {
 
 	g_return_if_fail (ets != NULL);
@@ -1333,15 +1419,16 @@ e_tree_sorted_set_sort_info (ETreeSorted *ets, ETableSortInfo *sort_info)
 	ets->priv->sort_info = sort_info;
 	if (sort_info) {
 		g_object_ref (sort_info);
-		ets->priv->sort_info_changed_id = g_signal_connect (G_OBJECT (ets->priv->sort_info), "sort_info_changed",
-								    G_CALLBACK (ets_sort_info_changed), ets);
+		ets->priv->sort_info_changed_id = g_signal_connect (
+			ets->priv->sort_info, "sort_info_changed",
+			G_CALLBACK (ets_sort_info_changed), ets);
 	}
 
 	if (ets->priv->root)
 		schedule_resort (ets, ets->priv->root, TRUE, TRUE);
 }
 
-ETableSortInfo*
+ETableSortInfo *
 e_tree_sorted_get_sort_info (ETreeSorted *ets)
 {
 	return ets->priv->sort_info;
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 4cfd74fe68..1b87211c7b 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -98,7 +98,8 @@ struct _ETreeTableAdapterPrivate {
 static void etta_sort_info_changed (ETableSortInfo *sort_info, ETreeTableAdapter *etta);
 
 static GNode *
-lookup_gnode (ETreeTableAdapter *etta, ETreePath path)
+lookup_gnode (ETreeTableAdapter *etta,
+              ETreePath path)
 {
 	GNode *gnode;
 
@@ -111,7 +112,8 @@ lookup_gnode (ETreeTableAdapter *etta, ETreePath path)
 }
 
 static void
-resize_map (ETreeTableAdapter *etta, gint size)
+resize_map (ETreeTableAdapter *etta,
+            gint size)
 {
 	if (size > etta->priv->n_vals_allocated) {
 		etta->priv->n_vals_allocated = MAX (etta->priv->n_vals_allocated + INCREMENT_AMOUNT, size);
@@ -122,7 +124,10 @@ resize_map (ETreeTableAdapter *etta, gint size)
 }
 
 static void
-move_map_elements (ETreeTableAdapter *etta, gint to, gint from, gint count)
+move_map_elements (ETreeTableAdapter *etta,
+                   gint to,
+                   gint from,
+                   gint count)
 {
 	if (count <= 0 || from >= etta->priv->n_map)
 		return;
@@ -131,7 +136,9 @@ move_map_elements (ETreeTableAdapter *etta, gint to, gint from, gint count)
 }
 
 static gint
-fill_map (ETreeTableAdapter *etta, gint index, GNode *gnode)
+fill_map (ETreeTableAdapter *etta,
+          gint index,
+          GNode *gnode)
 {
 	GNode *p;
 
@@ -155,7 +162,8 @@ remap_indices (ETreeTableAdapter *etta)
 }
 
 static node_t *
-get_node (ETreeTableAdapter *etta, ETreePath path)
+get_node (ETreeTableAdapter *etta,
+          ETreePath path)
 {
 	GNode *gnode = lookup_gnode (etta, path);
 
@@ -166,7 +174,9 @@ get_node (ETreeTableAdapter *etta, ETreePath path)
 }
 
 static void
-resort_node (ETreeTableAdapter *etta, GNode *gnode, gboolean recurse)
+resort_node (ETreeTableAdapter *etta,
+             GNode *gnode,
+             gboolean recurse)
 {
 	node_t *node = (node_t *) gnode->data;
 	ETreePath *paths, path;
@@ -217,7 +227,8 @@ resort_node (ETreeTableAdapter *etta, GNode *gnode, gboolean recurse)
 }
 
 static gint
-get_row (ETreeTableAdapter *etta, ETreePath path)
+get_row (ETreeTableAdapter *etta,
+         ETreePath path)
 {
 	node_t *node = get_node (etta, path);
 	if (!node)
@@ -230,7 +241,8 @@ get_row (ETreeTableAdapter *etta, ETreePath path)
 }
 
 static ETreePath
-get_path (ETreeTableAdapter *etta, gint row)
+get_path (ETreeTableAdapter *etta,
+          gint row)
 {
 	if (row == -1 && etta->priv->n_map > 0)
 		row = etta->priv->n_map - 1;
@@ -241,7 +253,8 @@ get_path (ETreeTableAdapter *etta, gint row)
 }
 
 static void
-kill_gnode (GNode *node, ETreeTableAdapter *etta)
+kill_gnode (GNode *node,
+            ETreeTableAdapter *etta)
 {
 	g_hash_table_remove (etta->priv->nodes, ((node_t *) node->data)->path);
 
@@ -258,7 +271,8 @@ kill_gnode (GNode *node, ETreeTableAdapter *etta)
 }
 
 static void
-update_child_counts (GNode *gnode, gint delta)
+update_child_counts (GNode *gnode,
+                     gint delta)
 {
 	while (gnode) {
 		node_t *node = (node_t *) gnode->data;
@@ -268,7 +282,8 @@ update_child_counts (GNode *gnode, gint delta)
 }
 
 static gint
-delete_children (ETreeTableAdapter *etta, GNode *gnode)
+delete_children (ETreeTableAdapter *etta,
+                 GNode *gnode)
 {
 	node_t *node = (node_t *) gnode->data;
 	gint to_remove = node ? node->num_visible_children : 0;
@@ -286,7 +301,9 @@ delete_children (ETreeTableAdapter *etta, GNode *gnode)
 }
 
 static void
-delete_node (ETreeTableAdapter *etta, ETreePath parent, ETreePath path)
+delete_node (ETreeTableAdapter *etta,
+             ETreePath parent,
+             ETreePath path)
 {
 	gint to_remove = 1;
 	gint parent_row = get_row (etta, parent);
@@ -325,7 +342,8 @@ delete_node (ETreeTableAdapter *etta, ETreePath parent, ETreePath path)
 }
 
 static GNode *
-create_gnode (ETreeTableAdapter *etta, ETreePath path)
+create_gnode (ETreeTableAdapter *etta,
+              ETreePath path)
 {
 	GNode *gnode;
 	node_t *node;
@@ -343,7 +361,8 @@ create_gnode (ETreeTableAdapter *etta, ETreePath path)
 }
 
 static gint
-insert_children (ETreeTableAdapter *etta, GNode *gnode)
+insert_children (ETreeTableAdapter *etta,
+                 GNode *gnode)
 {
 	ETreePath path, tmp;
 	gint count = 0;
@@ -365,7 +384,8 @@ insert_children (ETreeTableAdapter *etta, GNode *gnode)
 }
 
 static void
-generate_tree (ETreeTableAdapter *etta, ETreePath path)
+generate_tree (ETreeTableAdapter *etta,
+               ETreePath path)
 {
 	GNode *gnode;
 	node_t *node;
@@ -394,7 +414,9 @@ generate_tree (ETreeTableAdapter *etta, ETreePath path)
 }
 
 static void
-insert_node (ETreeTableAdapter *etta, ETreePath parent, ETreePath path)
+insert_node (ETreeTableAdapter *etta,
+             ETreePath parent,
+             ETreePath path)
 {
 	GNode *gnode, *parent_gnode;
 	node_t *node, *parent_node;
@@ -467,7 +489,8 @@ typedef struct {
 } check_expanded_closure;
 
 static gboolean
-check_expanded (GNode *gnode, gpointer data)
+check_expanded (GNode *gnode,
+                gpointer data)
 {
 	check_expanded_closure *closure = (check_expanded_closure *) data;
 	node_t *node = (node_t *) gnode->data;
@@ -479,7 +502,8 @@ check_expanded (GNode *gnode, gpointer data)
 }
 
 static void
-update_node (ETreeTableAdapter *etta, ETreePath path)
+update_node (ETreeTableAdapter *etta,
+             ETreePath path)
 {
 	check_expanded_closure closure;
 	ETreePath parent = e_tree_model_node_get_parent (etta->priv->source, path);
@@ -595,7 +619,8 @@ etta_has_save_id (ETableModel *etm)
 }
 
 static gchar *
-etta_get_save_id (ETableModel *etm, gint row)
+etta_get_save_id (ETableModel *etm,
+                  gint row)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -619,7 +644,9 @@ etta_row_count (ETableModel *etm)
 }
 
 static gpointer
-etta_value_at (ETableModel *etm, gint col, gint row)
+etta_value_at (ETableModel *etm,
+               gint col,
+               gint row)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -638,7 +665,10 @@ etta_value_at (ETableModel *etm, gint col, gint row)
 }
 
 static void
-etta_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
+etta_set_value_at (ETableModel *etm,
+                   gint col,
+                   gint row,
+                   gconstpointer val)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -646,7 +676,9 @@ etta_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer val)
 }
 
 static gboolean
-etta_is_cell_editable (ETableModel *etm, gint col, gint row)
+etta_is_cell_editable (ETableModel *etm,
+                       gint col,
+                       gint row)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -654,12 +686,16 @@ etta_is_cell_editable (ETableModel *etm, gint col, gint row)
 }
 
 static void
-etta_append_row (ETableModel *etm, ETableModel *source, gint row)
+etta_append_row (ETableModel *etm,
+                 ETableModel *source,
+                 gint row)
 {
 }
 
 static gpointer
-etta_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
+etta_duplicate_value (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -667,7 +703,9 @@ etta_duplicate_value (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static void
-etta_free_value (ETableModel *etm, gint col, gpointer value)
+etta_free_value (ETableModel *etm,
+                 gint col,
+                 gpointer value)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -675,7 +713,8 @@ etta_free_value (ETableModel *etm, gint col, gpointer value)
 }
 
 static gpointer
-etta_initialize_value (ETableModel *etm, gint col)
+etta_initialize_value (ETableModel *etm,
+                       gint col)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -683,7 +722,9 @@ etta_initialize_value (ETableModel *etm, gint col)
 }
 
 static gboolean
-etta_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
+etta_value_is_empty (ETableModel *etm,
+                     gint col,
+                     gconstpointer value)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -691,7 +732,9 @@ etta_value_is_empty (ETableModel *etm, gint col, gconstpointer value)
 }
 
 static gchar *
-etta_value_to_string (ETableModel *etm, gint col, gconstpointer value)
+etta_value_to_string (ETableModel *etm,
+                      gint col,
+                      gconstpointer value)
 {
 	ETreeTableAdapter *etta = (ETreeTableAdapter *) etm;
 
@@ -752,19 +795,22 @@ etta_init (ETreeTableAdapter *etta)
 }
 
 static void
-etta_proxy_pre_change (ETreeModel *etm, ETreeTableAdapter *etta)
+etta_proxy_pre_change (ETreeModel *etm,
+                       ETreeTableAdapter *etta)
 {
 	e_table_model_pre_change (E_TABLE_MODEL (etta));
 }
 
 static void
-etta_proxy_no_change (ETreeModel *etm, ETreeTableAdapter *etta)
+etta_proxy_no_change (ETreeModel *etm,
+                      ETreeTableAdapter *etta)
 {
 	e_table_model_no_change (E_TABLE_MODEL (etta));
 }
 
 static void
-etta_proxy_rebuilt (ETreeModel *etm, ETreeTableAdapter *etta)
+etta_proxy_rebuilt (ETreeModel *etm,
+                    ETreeTableAdapter *etta)
 {
 	if (!etta->priv->root)
 		return;
@@ -783,7 +829,9 @@ resort_model (ETreeTableAdapter *etta)
 }
 
 static void
-etta_proxy_node_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *etta)
+etta_proxy_node_changed (ETreeModel *etm,
+                         ETreePath path,
+                         ETreeTableAdapter *etta)
 {
 	update_node (etta, path);
 	e_table_model_changed (E_TABLE_MODEL (etta));
@@ -796,7 +844,9 @@ etta_proxy_node_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *ett
 }
 
 static void
-etta_proxy_node_data_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter *etta)
+etta_proxy_node_data_changed (ETreeModel *etm,
+                              ETreePath path,
+                              ETreeTableAdapter *etta)
 {
 	gint row = get_row (etta, path);
 
@@ -809,7 +859,10 @@ etta_proxy_node_data_changed (ETreeModel *etm, ETreePath path, ETreeTableAdapter
 }
 
 static void
-etta_proxy_node_col_changed (ETreeModel *etm, ETreePath path, gint col, ETreeTableAdapter *etta)
+etta_proxy_node_col_changed (ETreeModel *etm,
+                             ETreePath path,
+                             gint col,
+                             ETreeTableAdapter *etta)
 {
 	gint row = get_row (etta, path);
 
@@ -822,7 +875,10 @@ etta_proxy_node_col_changed (ETreeModel *etm, ETreePath path, gint col, ETreeTab
 }
 
 static void
-etta_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ETreeTableAdapter *etta)
+etta_proxy_node_inserted (ETreeModel *etm,
+                          ETreePath parent,
+                          ETreePath child,
+                          ETreeTableAdapter *etta)
 {
 	if (e_tree_model_node_is_root (etm, child))
 		generate_tree (etta, child);
@@ -833,26 +889,33 @@ etta_proxy_node_inserted (ETreeModel *etm, ETreePath parent, ETreePath child, ET
 }
 
 static void
-etta_proxy_node_removed (ETreeModel *etm, ETreePath parent, ETreePath child, gint old_position, ETreeTableAdapter *etta)
+etta_proxy_node_removed (ETreeModel *etm,
+                         ETreePath parent,
+                         ETreePath child,
+                         gint old_position,
+                         ETreeTableAdapter *etta)
 {
 	delete_node (etta, parent, child);
 	e_table_model_changed (E_TABLE_MODEL (etta));
 }
 
 static void
-etta_proxy_node_request_collapse (ETreeModel *etm, ETreePath node, ETreeTableAdapter *etta)
+etta_proxy_node_request_collapse (ETreeModel *etm,
+                                  ETreePath node,
+                                  ETreeTableAdapter *etta)
 {
 	e_tree_table_adapter_node_set_expanded (etta, node, FALSE);
 }
 
 static void
-etta_sort_info_changed (ETableSortInfo *sort_info, ETreeTableAdapter *etta)
+etta_sort_info_changed (ETableSortInfo *sort_info,
+                        ETreeTableAdapter *etta)
 {
 	if (!etta->priv->root)
 		return;
 
 	/* the function is called also internally, with sort_info = NULL,
-	   thus skip those in signal emit */
+	 * thus skip those in signal emit */
 	if (sort_info) {
 		gboolean handled = FALSE;
 
@@ -869,7 +932,10 @@ etta_sort_info_changed (ETableSortInfo *sort_info, ETreeTableAdapter *etta)
 }
 
 ETableModel *
-e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *header)
+e_tree_table_adapter_construct (ETreeTableAdapter *etta,
+                                ETreeModel *source,
+                                ETableSortInfo *sort_info,
+                                ETableHeader *header)
 {
 	ETreePath root;
 
@@ -879,8 +945,9 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETa
 	etta->priv->sort_info = sort_info;
 	if (sort_info) {
 		g_object_ref (sort_info);
-		etta->priv->sort_info_changed_id = g_signal_connect (G_OBJECT (sort_info), "sort_info_changed",
-								     G_CALLBACK (etta_sort_info_changed), etta);
+		etta->priv->sort_info_changed_id = g_signal_connect (
+			sort_info, "sort_info_changed",
+			G_CALLBACK (etta_sort_info_changed), etta);
 	}
 
 	etta->priv->header = header;
@@ -894,30 +961,41 @@ e_tree_table_adapter_construct (ETreeTableAdapter *etta, ETreeModel *source, ETa
 	if (root)
 		generate_tree (etta, root);
 
-	etta->priv->pre_change_id = g_signal_connect(G_OBJECT(source), "pre_change",
-					G_CALLBACK (etta_proxy_pre_change), etta);
-	etta->priv->no_change_id = g_signal_connect (G_OBJECT (source), "no_change",
-					G_CALLBACK (etta_proxy_no_change), etta);
-	etta->priv->rebuilt_id = g_signal_connect (G_OBJECT (source), "rebuilt",
-					G_CALLBACK (etta_proxy_rebuilt), etta);
-	etta->priv->node_changed_id = g_signal_connect (G_OBJECT (source), "node_changed",
-					G_CALLBACK (etta_proxy_node_changed), etta);
-	etta->priv->node_data_changed_id = g_signal_connect (G_OBJECT (source), "node_data_changed",
-					G_CALLBACK (etta_proxy_node_data_changed), etta);
-	etta->priv->node_col_changed_id = g_signal_connect (G_OBJECT (source), "node_col_changed",
-					G_CALLBACK (etta_proxy_node_col_changed), etta);
-	etta->priv->node_inserted_id = g_signal_connect (G_OBJECT (source), "node_inserted",
-					G_CALLBACK (etta_proxy_node_inserted), etta);
-	etta->priv->node_removed_id = g_signal_connect (G_OBJECT (source), "node_removed",
-					G_CALLBACK (etta_proxy_node_removed), etta);
-	etta->priv->node_request_collapse_id = g_signal_connect (G_OBJECT (source), "node_request_collapse",
-					G_CALLBACK (etta_proxy_node_request_collapse), etta);
+	etta->priv->pre_change_id = g_signal_connect (
+		source, "pre_change",
+		G_CALLBACK (etta_proxy_pre_change), etta);
+	etta->priv->no_change_id = g_signal_connect (
+		source, "no_change",
+		G_CALLBACK (etta_proxy_no_change), etta);
+	etta->priv->rebuilt_id = g_signal_connect (
+		source, "rebuilt",
+		G_CALLBACK (etta_proxy_rebuilt), etta);
+	etta->priv->node_changed_id = g_signal_connect (
+		source, "node_changed",
+		G_CALLBACK (etta_proxy_node_changed), etta);
+	etta->priv->node_data_changed_id = g_signal_connect (
+		source, "node_data_changed",
+		G_CALLBACK (etta_proxy_node_data_changed), etta);
+	etta->priv->node_col_changed_id = g_signal_connect (
+		source, "node_col_changed",
+		G_CALLBACK (etta_proxy_node_col_changed), etta);
+	etta->priv->node_inserted_id = g_signal_connect (
+		source, "node_inserted",
+		G_CALLBACK (etta_proxy_node_inserted), etta);
+	etta->priv->node_removed_id = g_signal_connect (
+		source, "node_removed",
+		G_CALLBACK (etta_proxy_node_removed), etta);
+	etta->priv->node_request_collapse_id = g_signal_connect (
+		source, "node_request_collapse",
+		G_CALLBACK (etta_proxy_node_request_collapse), etta);
 
 	return E_TABLE_MODEL (etta);
 }
 
 ETableModel *
-e_tree_table_adapter_new (ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *header)
+e_tree_table_adapter_new (ETreeModel *source,
+                          ETableSortInfo *sort_info,
+                          ETableHeader *header)
 {
 	ETreeTableAdapter *etta = g_object_new (E_TYPE_TREE_TABLE_ADAPTER, NULL);
 
@@ -933,7 +1011,9 @@ typedef struct {
 } TreeAndRoot;
 
 static void
-save_expanded_state_func (gpointer keyp, gpointer value, gpointer data)
+save_expanded_state_func (gpointer keyp,
+                          gpointer value,
+                          gpointer data)
 {
 	ETreePath path = keyp;
 	node_t *node = ((GNode *) value)->data;
@@ -974,7 +1054,8 @@ e_tree_table_adapter_save_expanded_state_xml (ETreeTableAdapter *etta)
 }
 
 void
-e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const gchar *filename)
+e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta,
+                                          const gchar *filename)
 {
 	xmlDoc *doc;
 
@@ -988,7 +1069,8 @@ e_tree_table_adapter_save_expanded_state (ETreeTableAdapter *etta, const gchar *
 }
 
 static xmlDoc *
-open_file (ETreeTableAdapter *etta, const gchar *filename)
+open_file (ETreeTableAdapter *etta,
+           const gchar *filename)
 {
 	xmlDoc *doc;
 	xmlNode *root;
@@ -1034,7 +1116,8 @@ open_file (ETreeTableAdapter *etta, const gchar *filename)
 
 /* state: <0 ... collapse;  0 ... use default; >0 ... expand */
 void
-e_tree_table_adapter_force_expanded_state (ETreeTableAdapter *etta, gint state)
+e_tree_table_adapter_force_expanded_state (ETreeTableAdapter *etta,
+                                           gint state)
 {
 	g_return_if_fail (etta != NULL);
 
@@ -1042,7 +1125,8 @@ e_tree_table_adapter_force_expanded_state (ETreeTableAdapter *etta, gint state)
 }
 
 void
-e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta, xmlDoc *doc)
+e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta,
+                                              xmlDoc *doc)
 {
 	xmlNode *root, *child;
 	gboolean model_default;
@@ -1104,7 +1188,8 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta, xmlDoc *d
 }
 
 void
-e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const gchar *filename)
+e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta,
+                                          const gchar *filename)
 {
 	xmlDoc *doc;
 
@@ -1120,7 +1205,8 @@ e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta, const gchar *
 }
 
 void
-e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta, gboolean visible)
+e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta,
+                                            gboolean visible)
 {
 	gint size;
 
@@ -1145,7 +1231,9 @@ e_tree_table_adapter_root_node_set_visible (ETreeTableAdapter *etta, gboolean vi
 }
 
 void
-e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path, gboolean expanded)
+e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta,
+                                        ETreePath path,
+                                        gboolean expanded)
 {
 	GNode *gnode = lookup_gnode (etta, path);
 	node_t *node;
@@ -1203,7 +1291,9 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path,
 }
 
 void
-e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter *etta, ETreePath path, gboolean expanded)
+e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter *etta,
+                                                ETreePath path,
+                                                gboolean expanded)
 {
 	ETreePath children;
 
@@ -1217,13 +1307,15 @@ e_tree_table_adapter_node_set_expanded_recurse (ETreeTableAdapter *etta, ETreePa
 }
 
 ETreePath
-e_tree_table_adapter_node_at_row (ETreeTableAdapter *etta, gint row)
+e_tree_table_adapter_node_at_row (ETreeTableAdapter *etta,
+                                  gint row)
 {
 	return get_path (etta, row);
 }
 
 gint
-e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta, ETreePath path)
+e_tree_table_adapter_row_of_node (ETreeTableAdapter *etta,
+                                  ETreePath path)
 {
 	return get_row (etta, path);
 }
@@ -1235,7 +1327,8 @@ e_tree_table_adapter_root_node_is_visible (ETreeTableAdapter *etta)
 }
 
 void
-e_tree_table_adapter_show_node (ETreeTableAdapter *etta, ETreePath path)
+e_tree_table_adapter_show_node (ETreeTableAdapter *etta,
+                                ETreePath path)
 {
 	ETreePath parent;
 
@@ -1248,7 +1341,8 @@ e_tree_table_adapter_show_node (ETreeTableAdapter *etta, ETreePath path)
 }
 
 gboolean
-e_tree_table_adapter_node_is_expanded (ETreeTableAdapter *etta, ETreePath path)
+e_tree_table_adapter_node_is_expanded (ETreeTableAdapter *etta,
+                                       ETreePath path)
 {
 	node_t *node = get_node (etta, path);
 	if (!e_tree_model_node_is_expandable (etta->priv->source, path) || !node)
@@ -1258,7 +1352,8 @@ e_tree_table_adapter_node_is_expanded (ETreeTableAdapter *etta, ETreePath path)
 }
 
 void
-e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sort_info)
+e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta,
+                                    ETableSortInfo *sort_info)
 {
 	if (etta->priv->sort_info) {
 		g_signal_handler_disconnect (G_OBJECT (etta->priv->sort_info),
@@ -1269,8 +1364,9 @@ e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta, ETableSortInfo *sor
 	etta->priv->sort_info = sort_info;
 	if (sort_info) {
 		g_object_ref (sort_info);
-		etta->priv->sort_info_changed_id = g_signal_connect(G_OBJECT(sort_info), "sort_info_changed",
-								    G_CALLBACK (etta_sort_info_changed), etta);
+		etta->priv->sort_info_changed_id = g_signal_connect (
+			sort_info, "sort_info_changed",
+			G_CALLBACK (etta_sort_info_changed), etta);
 	}
 
 	if (!etta->priv->root)
@@ -1299,7 +1395,8 @@ e_tree_table_adapter_get_header (ETreeTableAdapter *etta)
 }
 
 ETreePath
-e_tree_table_adapter_node_get_next (ETreeTableAdapter *etta, ETreePath path)
+e_tree_table_adapter_node_get_next (ETreeTableAdapter *etta,
+                                    ETreePath path)
 {
 	GNode *node = lookup_gnode (etta, path);
 
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 996a6b1e51..770b2ad653 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -303,13 +303,15 @@ e_tree_state_change (ETree *et)
 }
 
 static void
-change_trigger (GObject *object, ETree *et)
+change_trigger (GObject *object,
+                ETree *et)
 {
 	e_tree_state_change (et);
 }
 
 static void
-search_col_change_trigger (GObject *object, ETree *et)
+search_col_change_trigger (GObject *object,
+                           ETree *et)
 {
 	clear_current_search_col (et);
 	e_tree_state_change (et);
@@ -343,7 +345,8 @@ disconnect_header (ETree *e_tree)
 }
 
 static void
-connect_header (ETree *e_tree, ETableState *state)
+connect_header (ETree *e_tree,
+                ETableState *state)
 {
 	GValue *val = g_new0 (GValue, 1);
 
@@ -489,7 +492,9 @@ typedef struct {
 } SearchSearchStruct;
 
 static gboolean
-search_search_callback (ETreeModel *model, ETreePath path, gpointer data)
+search_search_callback (ETreeModel *model,
+                        ETreePath path,
+                        gpointer data)
 {
 	SearchSearchStruct *cb_data = data;
 	gconstpointer value;
@@ -561,7 +566,8 @@ et_search_search (ETableSearch *search,
 }
 
 static void
-et_search_accept (ETableSearch *search, ETree *et)
+et_search_accept (ETableSearch *search,
+                  ETree *et)
 {
 	ETableCol *col = current_search_col (et);
 	gint cursor;
@@ -609,12 +615,13 @@ e_tree_init (ETree *e_tree)
 
 	e_tree->priv->search = e_table_search_new ();
 
-	e_tree->priv->search_search_id =
-		g_signal_connect (G_OBJECT (e_tree->priv->search), "search",
-				 G_CALLBACK (et_search_search), e_tree);
-	e_tree->priv->search_accept_id =
-		g_signal_connect (G_OBJECT (e_tree->priv->search), "accept",
-				 G_CALLBACK (et_search_accept), e_tree);
+	e_tree->priv->search_search_id = g_signal_connect (
+		e_tree->priv->search, "search",
+		G_CALLBACK (et_search_search), e_tree);
+
+	e_tree->priv->search_accept_id = g_signal_connect (
+		e_tree->priv->search, "accept",
+		G_CALLBACK (et_search_accept), e_tree);
 
 	e_tree->priv->always_search = g_getenv ("GAL_ALWAYS_SEARCH") ? TRUE : FALSE;
 }
@@ -632,7 +639,8 @@ et_grab_focus (GtkWidget *widget)
 
 /* Focus handler for the ETree */
 static gint
-et_focus (GtkWidget *container, GtkDirectionType direction)
+et_focus (GtkWidget *container,
+          GtkDirectionType direction)
 {
 	ETree *e_tree;
 
@@ -670,7 +678,9 @@ set_header_canvas_width (ETree *e_tree)
 }
 
 static void
-header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *e_tree)
+header_canvas_size_allocate (GtkWidget *widget,
+                             GtkAllocation *alloc,
+                             ETree *e_tree)
 {
 	GtkAllocation allocation;
 
@@ -680,9 +690,9 @@ header_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *e_t
 	gtk_widget_get_allocation (widget, &allocation);
 
 	/* When the header item is created ->height == 0,
-	   as the font is only created when everything is realized.
-	   So we set the usize here as well, so that the size of the
-	   header is correct */
+	 * as the font is only created when everything is realized.
+	 * So we set the usize here as well, so that the size of the
+	 * header is correct */
 	if (allocation.height != E_TABLE_HEADER_ITEM (e_tree->priv->header_item)->height)
 		gtk_widget_set_size_request (
 			widget, -1,
@@ -804,8 +814,9 @@ tree_canvas_reflow_idle (ETree *e_tree)
 }
 
 static void
-tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
-			    ETree *e_tree)
+tree_canvas_size_allocate (GtkWidget *widget,
+                           GtkAllocation *alloc,
+                           ETree *e_tree)
 {
 	gdouble width;
 	gdouble height;
@@ -831,7 +842,8 @@ tree_canvas_size_allocate (GtkWidget *widget, GtkAllocation *alloc,
 }
 
 static void
-tree_canvas_reflow (GnomeCanvas *canvas, ETree *e_tree)
+tree_canvas_reflow (GnomeCanvas *canvas,
+                    ETree *e_tree)
 {
 	if (!e_tree->priv->reflow_idle_id)
 		e_tree->priv->reflow_idle_id = g_idle_add_full (
@@ -840,7 +852,9 @@ tree_canvas_reflow (GnomeCanvas *canvas, ETree *e_tree)
 }
 
 static void
-item_cursor_change (ETableItem *eti, gint row, ETree *et)
+item_cursor_change (ETableItem *eti,
+                    gint row,
+                    ETree *et)
 {
 	ETreePath path = e_tree_table_adapter_node_at_row (et->priv->etta, row);
 
@@ -848,7 +862,9 @@ item_cursor_change (ETableItem *eti, gint row, ETree *et)
 }
 
 static void
-item_cursor_activated (ETableItem *eti, gint row, ETree *et)
+item_cursor_activated (ETableItem *eti,
+                       gint row,
+                       ETree *et)
 {
 	ETreePath path = e_tree_table_adapter_node_at_row (et->priv->etta, row);
 
@@ -856,7 +872,11 @@ item_cursor_activated (ETableItem *eti, gint row, ETree *et)
 }
 
 static void
-item_double_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
+item_double_click (ETableItem *eti,
+                   gint row,
+                   gint col,
+                   GdkEvent *event,
+                   ETree *et)
 {
 	ETreePath path = e_tree_table_adapter_node_at_row (et->priv->etta, row);
 
@@ -864,7 +884,11 @@ item_double_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *
 }
 
 static gboolean
-item_right_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
+item_right_click (ETableItem *eti,
+                  gint row,
+                  gint col,
+                  GdkEvent *event,
+                  ETree *et)
 {
 	ETreePath path = e_tree_table_adapter_node_at_row (et->priv->etta, row);
 	gboolean return_val = 0;
@@ -877,7 +901,11 @@ item_right_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *e
 }
 
 static gboolean
-item_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
+item_click (ETableItem *eti,
+            gint row,
+            gint col,
+            GdkEvent *event,
+            ETree *et)
 {
 	gboolean return_val = 0;
 	ETreePath path = e_tree_table_adapter_node_at_row (et->priv->etta, row);
@@ -889,7 +917,11 @@ item_click (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
 }
 
 static gint
-item_key_press (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
+item_key_press (ETableItem *eti,
+                gint row,
+                gint col,
+                GdkEvent *event,
+                ETree *et)
 {
 	gint return_val = 0;
 	GdkEventKey *key = (GdkEventKey *) event;
@@ -1000,7 +1032,11 @@ item_key_press (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
 }
 
 static gint
-item_start_drag (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et)
+item_start_drag (ETableItem *eti,
+                 gint row,
+                 gint col,
+                 GdkEvent *event,
+                 ETree *et)
 {
 	ETreePath path;
 	gint return_val = 0;
@@ -1015,7 +1051,8 @@ item_start_drag (ETableItem *eti, gint row, gint col, GdkEvent *event, ETree *et
 }
 
 static void
-et_selection_model_selection_changed (ETableSelectionModel *etsm, ETree *et)
+et_selection_model_selection_changed (ETableSelectionModel *etsm,
+                                      ETree *et)
 {
 	g_signal_emit (et, et_signals[SELECTION_CHANGE], 0);
 }
@@ -1064,7 +1101,8 @@ et_build_item (ETree *et)
 }
 
 static void
-et_canvas_style_set (GtkWidget *widget, GtkStyle *prev_style)
+et_canvas_style_set (GtkWidget *widget,
+                     GtkStyle *prev_style)
 {
 	GtkStyle *style;
 
@@ -1077,7 +1115,9 @@ et_canvas_style_set (GtkWidget *widget, GtkStyle *prev_style)
 }
 
 static gboolean
-white_item_event (GnomeCanvasItem *white_item, GdkEvent *event, ETree *e_tree)
+white_item_event (GnomeCanvasItem *white_item,
+                  GdkEvent *event,
+                  ETree *e_tree)
 {
 	gboolean return_val = 0;
 	g_signal_emit (e_tree,
@@ -1087,7 +1127,9 @@ white_item_event (GnomeCanvasItem *white_item, GdkEvent *event, ETree *e_tree)
 }
 
 static gint
-et_canvas_root_event (GnomeCanvasItem *root, GdkEvent *event, ETree *e_tree)
+et_canvas_root_event (GnomeCanvasItem *root,
+                      GdkEvent *event,
+                      ETree *e_tree)
 {
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
@@ -1115,7 +1157,9 @@ et_canvas_root_event (GnomeCanvasItem *root, GdkEvent *event, ETree *e_tree)
  * and give the focus to some ETableItem.
  */
 static gint
-table_canvas_focus_event_cb (GtkWidget *widget, GdkEventFocus *event, gpointer data)
+table_canvas_focus_event_cb (GtkWidget *widget,
+                             GdkEventFocus *event,
+                             gpointer data)
 {
 	GnomeCanvas *canvas;
 	ETree *tree;
@@ -1213,7 +1257,8 @@ e_tree_setup_table (ETree *e_tree)
  * search column is cleared.
  */
 void
-e_tree_set_search_column (ETree *e_tree, gint  col)
+e_tree_set_search_column (ETree *e_tree,
+                          gint col)
 {
 	if (col == -1) {
 		clear_current_search_col (e_tree);
@@ -1226,7 +1271,8 @@ e_tree_set_search_column (ETree *e_tree, gint  col)
 }
 
 void
-e_tree_set_state_object (ETree *e_tree, ETableState *state)
+e_tree_set_state_object (ETree *e_tree,
+                         ETableState *state)
 {
 	GValue *val;
 	GtkAllocation allocation;
@@ -1271,8 +1317,8 @@ e_tree_set_state_object (ETree *e_tree, ETableState *state)
  * #ETree object.
  */
 void
-e_tree_set_state (ETree      *e_tree,
-		   const gchar *state_str)
+e_tree_set_state (ETree *e_tree,
+                  const gchar *state_str)
 {
 	ETableState *state;
 
@@ -1298,8 +1344,8 @@ e_tree_set_state (ETree      *e_tree,
  * @e_tree object.
  */
 void
-e_tree_load_state (ETree      *e_tree,
-		    const gchar *filename)
+e_tree_load_state (ETree *e_tree,
+                   const gchar *filename)
 {
 	ETableState *state;
 
@@ -1388,8 +1434,8 @@ e_tree_get_state (ETree *e_tree)
  * @filename.
  **/
 void
-e_tree_save_state (ETree      *e_tree,
-		   const gchar *filename)
+e_tree_save_state (ETree *e_tree,
+                   const gchar *filename)
 {
 	ETableState *state;
 
@@ -1413,26 +1459,35 @@ e_tree_get_spec (ETree *e_tree)
 }
 
 static void
-et_table_model_changed (ETableModel *model, ETree *et)
+et_table_model_changed (ETableModel *model,
+                        ETree *et)
 {
 	if (et->priv->horizontal_scrolling)
 		e_table_header_update_horizontal (et->priv->header);
 }
 
 static void
-et_table_row_changed (ETableModel *table_model, gint row, ETree *et)
+et_table_row_changed (ETableModel *table_model,
+                      gint row,
+                      ETree *et)
 {
 	et_table_model_changed (table_model, et);
 }
 
 static void
-et_table_cell_changed (ETableModel *table_model, gint view_col, gint row, ETree *et)
+et_table_cell_changed (ETableModel *table_model,
+                       gint view_col,
+                       gint row,
+                       ETree *et)
 {
 	et_table_model_changed (table_model, et);
 }
 
 static void
-et_table_rows_deleted (ETableModel *table_model, gint row, gint count, ETree *et)
+et_table_rows_deleted (ETableModel *table_model,
+                       gint row,
+                       gint count,
+                       ETree *et)
 {
 	ETreePath * node, * prev_node;
 
@@ -1441,7 +1496,7 @@ et_table_rows_deleted (ETableModel *table_model, gint row, gint count, ETree *et
 			|| row == 0)
 		return;
 
-	prev_node = e_tree_node_at_row (et, row-1);
+	prev_node = e_tree_node_at_row (et, row - 1);
 	node = e_tree_get_cursor (et);
 
 	/* Check if the cursor is a child of the node directly before the
@@ -1479,8 +1534,11 @@ et_connect_to_etta (ETree *et)
 }
 
 static gboolean
-et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
-		   ETableSpecification *specification, ETableState *state)
+et_real_construct (ETree *e_tree,
+                   ETreeModel *etm,
+                   ETableExtras *ete,
+                   ETableSpecification *specification,
+                   ETableState *state)
 {
 	GtkAdjustment *adjustment;
 	GtkScrollable *scrollable;
@@ -1525,9 +1583,9 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
 		      "cursor_mode", specification->cursor_mode,
 		      NULL);
 
-	g_signal_connect(e_tree->priv->selection, "selection_changed",
+	g_signal_connect (e_tree->priv->selection, "selection_changed",
 			 G_CALLBACK (et_selection_model_selection_changed), e_tree);
-	g_signal_connect(e_tree->priv->selection, "selection_row_changed",
+	g_signal_connect (e_tree->priv->selection, "selection_row_changed",
 			 G_CALLBACK (et_selection_model_selection_row_changed), e_tree);
 
 	if (!specification->no_headers) {
@@ -1578,8 +1636,11 @@ et_real_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
  * Return value: %TRUE on success, %FALSE if an error occurred
  **/
 gboolean
-e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
-		   const gchar *spec_str, const gchar *state_str)
+e_tree_construct (ETree *e_tree,
+                  ETreeModel *etm,
+                  ETableExtras *ete,
+                  const gchar *spec_str,
+                  const gchar *state_str)
 {
 	ETableSpecification *specification;
 	ETableState *state;
@@ -1637,8 +1698,11 @@ e_tree_construct (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
  * Return value: %TRUE on success, %FALSE if an error occurred
  **/
 gboolean
-e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *ete,
-				  const gchar *spec_fn, const gchar *state_fn)
+e_tree_construct_from_spec_file (ETree *e_tree,
+                                 ETreeModel *etm,
+                                 ETableExtras *ete,
+                                 const gchar *spec_fn,
+                                 const gchar *state_fn)
 {
 	ETableSpecification *specification;
 	ETableState *state;
@@ -1707,7 +1771,10 @@ e_tree_construct_from_spec_file (ETree *e_tree, ETreeModel *etm, ETableExtras *e
  * The newly created #ETree or %NULL if there's an error.
  **/
 GtkWidget *
-e_tree_new (ETreeModel *etm, ETableExtras *ete, const gchar *spec, const gchar *state)
+e_tree_new (ETreeModel *etm,
+            ETableExtras *ete,
+            const gchar *spec,
+            const gchar *state)
 {
 	ETree *e_tree;
 
@@ -1779,7 +1846,8 @@ e_tree_show_cursor_after_reflow (ETree *e_tree)
 }
 
 void
-e_tree_set_cursor (ETree *e_tree, ETreePath path)
+e_tree_set_cursor (ETree *e_tree,
+                   ETreePath path)
 {
 #ifndef E_TREE_USE_TREE_SELECTION
 	gint row;
@@ -1829,9 +1897,9 @@ e_tree_get_cursor (ETree *e_tree)
 }
 
 void
-e_tree_selected_row_foreach     (ETree *e_tree,
-				  EForeachFunc callback,
-				  gpointer closure)
+e_tree_selected_row_foreach (ETree *e_tree,
+                             EForeachFunc callback,
+                             gpointer closure)
 {
 	g_return_if_fail (e_tree != NULL);
 	g_return_if_fail (E_IS_TREE (e_tree));
@@ -1843,9 +1911,9 @@ e_tree_selected_row_foreach     (ETree *e_tree,
 
 #ifdef E_TREE_USE_TREE_SELECTION
 void
-e_tree_selected_path_foreach     (ETree *e_tree,
-				 ETreeForeachFunc callback,
-				 gpointer closure)
+e_tree_selected_path_foreach (ETree *e_tree,
+                              ETreeForeachFunc callback,
+                              gpointer closure)
 {
 	g_return_if_fail (e_tree != NULL);
 	g_return_if_fail (E_IS_TREE (e_tree));
@@ -1858,9 +1926,9 @@ e_tree_selected_path_foreach     (ETree *e_tree,
 /* Standard functions */
 static void
 et_foreach_recurse (ETreeModel *model,
-		    ETreePath path,
-		    ETreeForeachFunc callback,
-		    gpointer closure)
+                    ETreePath path,
+                    ETreeForeachFunc callback,
+                    gpointer closure)
 {
 	ETreePath child;
 
@@ -1874,8 +1942,8 @@ et_foreach_recurse (ETreeModel *model,
 
 void
 e_tree_path_foreach (ETree *e_tree,
-		     ETreeForeachFunc callback,
-		     gpointer closure)
+                     ETreeForeachFunc callback,
+                     gpointer closure)
 {
 	ETreePath root;
 
@@ -1903,13 +1971,13 @@ e_tree_get_printable (ETree *e_tree)
 
 static void
 et_get_property (GObject *object,
-		 guint prop_id,
-		 GValue *value,
-		 GParamSpec *pspec)
+                 guint property_id,
+                 GValue *value,
+                 GParamSpec *pspec)
 {
 	ETree *etree = E_TREE (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_ETTA:
 		g_value_set_object (value, etree->priv->etta);
 		break;
@@ -1952,7 +2020,7 @@ et_get_property (GObject *object,
 			g_value_set_enum (value, 0);
 		break;
 	default:
-		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 		break;
 	}
 }
@@ -1964,13 +2032,13 @@ typedef struct {
 
 static void
 et_set_property (GObject *object,
-		 guint prop_id,
-		 const GValue *value,
-		 GParamSpec *pspec)
+                 guint property_id,
+                 const GValue *value,
+                 GParamSpec *pspec)
 {
 	ETree *etree = E_TREE (object);
 
-	switch (prop_id) {
+	switch (property_id) {
 	case PROP_LENGTH_THRESHOLD:
 		etree->priv->length_threshold = g_value_get_int (value);
 		if (etree->priv->item) {
@@ -2051,8 +2119,8 @@ et_set_property (GObject *object,
 }
 
 gint
-e_tree_get_next_row      (ETree *e_tree,
-			   gint    model_row)
+e_tree_get_next_row (ETree *e_tree,
+                     gint model_row)
 {
 	g_return_val_if_fail (e_tree != NULL, -1);
 	g_return_val_if_fail (E_IS_TREE (e_tree), -1);
@@ -2079,8 +2147,8 @@ e_tree_get_next_row      (ETree *e_tree,
 }
 
 gint
-e_tree_get_prev_row      (ETree *e_tree,
-			  gint    model_row)
+e_tree_get_prev_row (ETree *e_tree,
+                     gint model_row)
 {
 	g_return_val_if_fail (e_tree != NULL, -1);
 	g_return_val_if_fail (E_IS_TREE (e_tree), -1);
@@ -2098,8 +2166,8 @@ e_tree_get_prev_row      (ETree *e_tree,
 }
 
 gint
-e_tree_model_to_view_row        (ETree *e_tree,
-				  gint    model_row)
+e_tree_model_to_view_row (ETree *e_tree,
+                          gint model_row)
 {
 	g_return_val_if_fail (e_tree != NULL, -1);
 	g_return_val_if_fail (E_IS_TREE (e_tree), -1);
@@ -2111,8 +2179,8 @@ e_tree_model_to_view_row        (ETree *e_tree,
 }
 
 gint
-e_tree_view_to_model_row        (ETree *e_tree,
-				  gint    view_row)
+e_tree_view_to_model_row (ETree *e_tree,
+                          gint view_row)
 {
 	g_return_val_if_fail (e_tree != NULL, -1);
 	g_return_val_if_fail (E_IS_TREE (e_tree), -1);
@@ -2124,7 +2192,8 @@ e_tree_view_to_model_row        (ETree *e_tree,
 }
 
 gboolean
-e_tree_node_is_expanded (ETree *et, ETreePath path)
+e_tree_node_is_expanded (ETree *et,
+                         ETreePath path)
 {
 	g_return_val_if_fail (path, FALSE);
 
@@ -2132,7 +2201,9 @@ e_tree_node_is_expanded (ETree *et, ETreePath path)
 }
 
 void
-e_tree_node_set_expanded (ETree *et, ETreePath path, gboolean expanded)
+e_tree_node_set_expanded (ETree *et,
+                          ETreePath path,
+                          gboolean expanded)
 {
 	g_return_if_fail (et != NULL);
 	g_return_if_fail (E_IS_TREE (et));
@@ -2141,7 +2212,9 @@ e_tree_node_set_expanded (ETree *et, ETreePath path, gboolean expanded)
 }
 
 void
-e_tree_node_set_expanded_recurse (ETree *et, ETreePath path, gboolean expanded)
+e_tree_node_set_expanded_recurse (ETree *et,
+                                  ETreePath path,
+                                  gboolean expanded)
 {
 	g_return_if_fail (et != NULL);
 	g_return_if_fail (E_IS_TREE (et));
@@ -2150,7 +2223,8 @@ e_tree_node_set_expanded_recurse (ETree *et, ETreePath path, gboolean expanded)
 }
 
 void
-e_tree_root_node_set_visible (ETree *et, gboolean visible)
+e_tree_root_node_set_visible (ETree *et,
+                              gboolean visible)
 {
 	g_return_if_fail (et != NULL);
 	g_return_if_fail (E_IS_TREE (et));
@@ -2159,7 +2233,8 @@ e_tree_root_node_set_visible (ETree *et, gboolean visible)
 }
 
 ETreePath
-e_tree_node_at_row (ETree *et, gint row)
+e_tree_node_at_row (ETree *et,
+                    gint row)
 {
 	ETreePath path;
 
@@ -2169,7 +2244,8 @@ e_tree_node_at_row (ETree *et, gint row)
 }
 
 gint
-e_tree_row_of_node (ETree *et, ETreePath path)
+e_tree_row_of_node (ETree *et,
+                    ETreePath path)
 {
 	return e_tree_table_adapter_row_of_node (et->priv->etta, path);
 }
@@ -2181,7 +2257,8 @@ e_tree_root_node_is_visible (ETree *et)
 }
 
 void
-e_tree_show_node (ETree *et, ETreePath path)
+e_tree_show_node (ETree *et,
+                  ETreePath path)
 {
 	g_return_if_fail (et != NULL);
 	g_return_if_fail (E_IS_TREE (et));
@@ -2190,7 +2267,8 @@ e_tree_show_node (ETree *et, ETreePath path)
 }
 
 void
-e_tree_save_expanded_state (ETree *et, gchar *filename)
+e_tree_save_expanded_state (ETree *et,
+                            gchar *filename)
 {
 	g_return_if_fail (et != NULL);
 	g_return_if_fail (E_IS_TREE (et));
@@ -2199,7 +2277,8 @@ e_tree_save_expanded_state (ETree *et, gchar *filename)
 }
 
 void
-e_tree_load_expanded_state (ETree *et, gchar *filename)
+e_tree_load_expanded_state (ETree *et,
+                            gchar *filename)
 {
 	e_tree_table_adapter_load_expanded_state (et->priv->etta, filename);
 }
@@ -2214,7 +2293,8 @@ e_tree_save_expanded_state_xml (ETree *et)
 }
 
 void
-e_tree_load_expanded_state_xml (ETree *et, xmlDoc *doc)
+e_tree_load_expanded_state_xml (ETree *et,
+                                xmlDoc *doc)
 {
 	g_return_if_fail (et != NULL);
 	g_return_if_fail (E_IS_TREE (et));
@@ -2224,10 +2304,11 @@ e_tree_load_expanded_state_xml (ETree *et, xmlDoc *doc)
 }
 
 /* state: <0 ... collapse; 0 ... no force - use default; >0 ... expand;
-   when using this, be sure to reset to 0 once no forcing is required
-   anymore, aka the build of the tree is done */
+ * when using this, be sure to reset to 0 once no forcing is required
+ * anymore, aka the build of the tree is done */
 void
-e_tree_force_expanded_state (ETree *et, gint state)
+e_tree_force_expanded_state (ETree *et,
+                             gint state)
 {
 	e_tree_table_adapter_force_expanded_state (et->priv->etta, state);
 }
@@ -2245,7 +2326,11 @@ e_tree_get_tooltip (ETree *et)
 }
 
 static ETreePath
-find_next_in_range (ETree *et, gint start, gint end, ETreePathFunc func, gpointer data)
+find_next_in_range (ETree *et,
+                    gint start,
+                    gint end,
+                    ETreePathFunc func,
+                    gpointer data)
 {
 	ETreePath path;
 	gint row;
@@ -2260,7 +2345,11 @@ find_next_in_range (ETree *et, gint start, gint end, ETreePathFunc func, gpointe
 }
 
 static ETreePath
-find_prev_in_range (ETree *et, gint start, gint end, ETreePathFunc func, gpointer data)
+find_prev_in_range (ETree *et,
+                    gint start,
+                    gint end,
+                    ETreePathFunc func,
+                    gpointer data)
 {
 	ETreePath path;
 	gint row;
@@ -2372,7 +2461,7 @@ e_tree_get_table_adapter (ETree *et)
 }
 
 ETableItem *
-e_tree_get_item (ETree * et)
+e_tree_get_item (ETree *et)
 {
 	g_return_val_if_fail (et != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE (et), NULL);
@@ -2381,7 +2470,7 @@ e_tree_get_item (ETree * et)
 }
 
 GnomeCanvasItem *
-e_tree_get_header_item (ETree * et)
+e_tree_get_header_item (ETree *et)
 {
 	g_return_val_if_fail (et != NULL, NULL);
 	g_return_val_if_fail (E_IS_TREE (et), NULL);
@@ -2458,12 +2547,12 @@ struct _GtkDragSourceInfo
 /* Target */
 
 void
-e_tree_drag_get_data (ETree         *tree,
-		      gint             row,
-		      gint             col,
-		      GdkDragContext *context,
-		      GdkAtom         target,
-		      guint32         time)
+e_tree_drag_get_data (ETree *tree,
+                      gint row,
+                      gint col,
+                      GdkDragContext *context,
+                      GdkAtom target,
+                      guint32 time)
 {
 	g_return_if_fail (tree != NULL);
 	g_return_if_fail (E_IS_TREE (tree));
@@ -2486,8 +2575,8 @@ e_tree_drag_get_data (ETree         *tree,
  */
 void
 e_tree_drag_highlight (ETree *tree,
-		       gint     row,
-		       gint     col)
+                       gint row,
+                       gint col)
 {
 	GtkAllocation allocation;
 	GtkAdjustment *adjustment;
@@ -2596,7 +2685,11 @@ e_tree_drag_dest_unset (GtkWidget *widget)
 /* Source side */
 
 static gint
-et_real_start_drag (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *event)
+et_real_start_drag (ETree *tree,
+                    gint row,
+                    ETreePath path,
+                    gint col,
+                    GdkEvent *event)
 {
 	GtkDragSourceInfo *info;
 	GdkDragContext *context;
@@ -2629,11 +2722,11 @@ et_real_start_drag (ETree *tree, gint row, ETreePath path, gint col, GdkEvent *e
 }
 
 void
-e_tree_drag_source_set  (ETree               *tree,
-			 GdkModifierType       start_button_mask,
-			 const GtkTargetEntry *targets,
-			 gint                  n_targets,
-			 GdkDragAction         actions)
+e_tree_drag_source_set (ETree *tree,
+                        GdkModifierType start_button_mask,
+                        const GtkTargetEntry *targets,
+                        gint n_targets,
+                        GdkDragAction actions)
 {
 	ETreeDragSourceSite *site;
 	GtkWidget *canvas;
@@ -2692,13 +2785,13 @@ e_tree_drag_source_unset (ETree *tree)
  */
 
 GdkDragContext *
-e_tree_drag_begin (ETree            *tree,
-		   gint	       row,
-		   gint	       col,
-		   GtkTargetList     *targets,
-		   GdkDragAction      actions,
-		   gint               button,
-		   GdkEvent          *event)
+e_tree_drag_begin (ETree *tree,
+                   gint row,
+                   gint col,
+                   GtkTargetList *targets,
+                   GdkDragAction actions,
+                   gint button,
+                   GdkEvent *event)
 {
 	ETreePath path;
 	g_return_val_if_fail (tree != NULL, NULL);
@@ -2730,8 +2823,10 @@ e_tree_drag_begin (ETree            *tree,
  **/
 void
 e_tree_get_cell_at (ETree *tree,
-		     gint x, gint y,
-		     gint *row_return, gint *col_return)
+                    gint x,
+                    gint y,
+                    gint *row_return,
+                    gint *col_return)
 {
 	GtkAdjustment *adjustment;
 	GtkScrollable *scrollable;
@@ -2777,9 +2872,12 @@ e_tree_get_cell_at (ETree *tree,
  **/
 void
 e_tree_get_cell_geometry (ETree *tree,
-			  gint row, gint col,
-			  gint *x_return, gint *y_return,
-			  gint *width_return, gint *height_return)
+                          gint row,
+                          gint col,
+                          gint *x_return,
+                          gint *y_return,
+                          gint *width_return,
+                          gint *height_return)
 {
 	GtkAdjustment *adjustment;
 	GtkScrollable *scrollable;
@@ -2811,8 +2909,8 @@ e_tree_get_cell_geometry (ETree *tree,
 
 static void
 et_drag_begin (GtkWidget *widget,
-	       GdkDragContext *context,
-	       ETree *et)
+               GdkDragContext *context,
+               ETree *et)
 {
 	g_signal_emit (et,
 		       et_signals[TREE_DRAG_BEGIN], 0,
@@ -2824,8 +2922,8 @@ et_drag_begin (GtkWidget *widget,
 
 static void
 et_drag_end (GtkWidget *widget,
-	     GdkDragContext *context,
-	     ETree *et)
+             GdkDragContext *context,
+             ETree *et)
 {
 	g_signal_emit (et,
 		       et_signals[TREE_DRAG_END], 0,
@@ -2837,11 +2935,11 @@ et_drag_end (GtkWidget *widget,
 
 static void
 et_drag_data_get (GtkWidget *widget,
-		 GdkDragContext *context,
-		 GtkSelectionData *selection_data,
-		 guint info,
-		 guint time,
-		 ETree *et)
+                  GdkDragContext *context,
+                  GtkSelectionData *selection_data,
+                  guint info,
+                  guint time,
+                  ETree *et)
 {
 	g_signal_emit (et,
 		       et_signals[TREE_DRAG_DATA_GET], 0,
@@ -2856,8 +2954,8 @@ et_drag_data_get (GtkWidget *widget,
 
 static void
 et_drag_data_delete (GtkWidget *widget,
-		    GdkDragContext *context,
-		    ETree *et)
+                     GdkDragContext *context,
+                     ETree *et)
 {
 	g_signal_emit (et,
 		       et_signals[TREE_DRAG_DATA_DELETE], 0,
@@ -2869,10 +2967,10 @@ et_drag_data_delete (GtkWidget *widget,
 
 static gboolean
 do_drag_motion (ETree *et,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time)
+                GdkDragContext *context,
+                gint x,
+                gint y,
+                guint time)
 {
 	gboolean ret_val = FALSE;
 	gint row, col;
@@ -2973,7 +3071,8 @@ scroll_timeout (gpointer data)
 }
 
 static void
-scroll_on (ETree *et, guint scroll_direction)
+scroll_on (ETree *et,
+           guint scroll_direction)
 {
 	if (et->priv->scroll_idle_id == 0 ||
 			scroll_direction != et->priv->scroll_direction) {
@@ -3027,7 +3126,9 @@ hover_timeout (gpointer data)
 }
 
 static void
-hover_on (ETree *et, gint x, gint y)
+hover_on (ETree *et,
+          gint x,
+          gint y)
 {
 	et->priv->hover_x = x;
 	et->priv->hover_y = y;
@@ -3046,7 +3147,8 @@ hover_off (ETree *et)
 }
 
 static void
-collapse_drag (ETree *et, ETreePath drop)
+collapse_drag (ETree *et,
+               ETreePath drop)
 {
 	GList *list;
 
@@ -3085,7 +3187,8 @@ collapse_drag (ETree *et, ETreePath drop)
 }
 
 static void
-context_destroyed (gpointer data, GObject *ctx)
+context_destroyed (gpointer data,
+                   GObject *ctx)
 {
 	ETree *et = data;
 	if (et->priv) {
@@ -3101,7 +3204,8 @@ context_destroyed (gpointer data, GObject *ctx)
 }
 
 static void
-context_connect (ETree *et, GdkDragContext *context)
+context_connect (ETree *et,
+                 GdkDragContext *context)
 {
 	if (context == et->priv->last_drop_context)
 		return;
@@ -3118,9 +3222,9 @@ context_connect (ETree *et, GdkDragContext *context)
 
 static void
 et_drag_leave (GtkWidget *widget,
-	      GdkDragContext *context,
-	      guint time,
-	      ETree *et)
+               GdkDragContext *context,
+               guint time,
+               ETree *et)
 {
 	g_signal_emit (et,
 		       et_signals[TREE_DRAG_LEAVE], 0,
@@ -3138,11 +3242,11 @@ et_drag_leave (GtkWidget *widget,
 
 static gboolean
 et_drag_motion (GtkWidget *widget,
-	       GdkDragContext *context,
-	       gint x,
-	       gint y,
-	       guint time,
-	       ETree *et)
+                GdkDragContext *context,
+                gint x,
+                gint y,
+                guint time,
+                ETree *et)
 {
 	GtkAllocation allocation;
 	gint ret_val;
@@ -3186,11 +3290,11 @@ et_drag_motion (GtkWidget *widget,
 
 static gboolean
 et_drag_drop (GtkWidget *widget,
-	     GdkDragContext *context,
-	     gint x,
-	     gint y,
-	     guint time,
-	     ETree *et)
+              GdkDragContext *context,
+              gint x,
+              gint y,
+              guint time,
+              ETree *et)
 {
 	gboolean ret_val = FALSE;
 	gint row, col;
@@ -3248,13 +3352,13 @@ et_drag_drop (GtkWidget *widget,
 
 static void
 et_drag_data_received (GtkWidget *widget,
-		      GdkDragContext *context,
-		      gint x,
-		      gint y,
-		      GtkSelectionData *selection_data,
-		      guint info,
-		      guint time,
-		      ETree *et)
+                       GdkDragContext *context,
+                       gint x,
+                       gint y,
+                       GtkSelectionData *selection_data,
+                       guint info,
+                       guint time,
+                       ETree *et)
 {
 	gint row, col;
 	ETreePath path;
@@ -3602,7 +3706,9 @@ e_tree_class_init (ETreeClass *class)
 }
 
 static void
-tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree)
+tree_size_allocate (GtkWidget *widget,
+                    GtkAllocation *alloc,
+                    ETree *tree)
 {
 	gdouble width;
 
@@ -3629,7 +3735,8 @@ tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree)
  * Creates an info message in table area, or removes old.
  **/
 void
-e_tree_set_info_message (ETree *tree, const gchar *info_message)
+e_tree_set_info_message (ETree *tree,
+                         const gchar *info_message)
 {
 	GtkAllocation allocation;
 	GtkWidget *widget;
diff --git a/widgets/table/gal-a11y-e-cell-popup.c b/widgets/table/gal-a11y-e-cell-popup.c
index f1c2540820..b1232a6b84 100644
--- a/widgets/table/gal-a11y-e-cell-popup.c
+++ b/widgets/table/gal-a11y-e-cell-popup.c
@@ -83,16 +83,16 @@ gal_a11y_e_cell_popup_class_init (GalA11yECellPopupClass *class)
 
 AtkObject *
 gal_a11y_e_cell_popup_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  gint         model_col,
-			  gint         view_col,
-			  gint         row)
+                           ECellView *cell_view,
+                           AtkObject *parent,
+                           gint model_col,
+                           gint view_col,
+                           gint row)
 {
 	AtkObject *a11y;
 	GalA11yECell *cell;
 	ECellPopup *popupcell;
-	ECellView* child_view = NULL;
+	ECellView * child_view = NULL;
 
 	popupcell=  E_CELL_POPUP (cell_view->ecell);
 
diff --git a/widgets/table/gal-a11y-e-cell-registry.c b/widgets/table/gal-a11y-e-cell-registry.c
index 79ad4cacb2..ce533882ab 100644
--- a/widgets/table/gal-a11y-e-cell-registry.c
+++ b/widgets/table/gal-a11y-e-cell-registry.c
@@ -108,13 +108,13 @@ init_default_registry (void)
 }
 
 AtkObject *
-gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
-					 ETableItem               *item,
-					 ECellView                *cell_view,
-					 AtkObject                *parent,
-					 gint                       model_col,
-					 gint                       view_col,
-					 gint                       row)
+gal_a11y_e_cell_registry_get_object (GalA11yECellRegistry *registry,
+                                     ETableItem *item,
+                                     ECellView *cell_view,
+                                     AtkObject *parent,
+                                     gint model_col,
+                                     gint view_col,
+                                     gint row)
 {
 	GalA11yECellRegistryFunc func = NULL;
 	GType type;
@@ -137,9 +137,9 @@ gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
 }
 
 void
-gal_a11y_e_cell_registry_add_cell_type  (GalA11yECellRegistry     *registry,
-					 GType                     type,
-					 GalA11yECellRegistryFunc  func)
+gal_a11y_e_cell_registry_add_cell_type (GalA11yECellRegistry *registry,
+                                        GType type,
+                                        GalA11yECellRegistryFunc func)
 {
 	if (registry == NULL) {
 		init_default_registry ();
diff --git a/widgets/table/gal-a11y-e-cell-toggle.c b/widgets/table/gal-a11y-e-cell-toggle.c
index 98fcdcd92f..991d3c0721 100644
--- a/widgets/table/gal-a11y-e-cell-toggle.c
+++ b/widgets/table/gal-a11y-e-cell-toggle.c
@@ -122,9 +122,9 @@ toggle_cell_action (GalA11yECell *cell)
 
 static void
 model_change_cb (ETableModel *etm,
-		 gint col,
-		 gint row,
-		 GalA11yECell *cell)
+                 gint col,
+                 gint row,
+                 GalA11yECell *cell)
 {
 	gint value;
 
@@ -143,13 +143,13 @@ model_change_cb (ETableModel *etm,
 	}
 }
 
-AtkObject*
+AtkObject *
 gal_a11y_e_cell_toggle_new (ETableItem *item,
-			    ECellView  *cell_view,
-			    AtkObject  *parent,
-			    gint         model_col,
-			    gint         view_col,
-			    gint         row)
+                            ECellView *cell_view,
+                            AtkObject *parent,
+                            gint model_col,
+                            gint view_col,
+                            gint row)
 {
 	AtkObject *a11y;
 	GalA11yECell *cell;
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 70880fc0cc..148731d4b8 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -43,8 +43,8 @@ static AtkObjectClass *a11y_parent_class;
 
 static void
 ectr_model_row_changed_cb (ETableModel *etm,
-			   gint row,
-			   GalA11yECell *a11y)
+                           gint row,
+                           GalA11yECell *a11y)
 {
 	ETreePath node;
 	ETreeModel *tree_model;
@@ -88,7 +88,7 @@ kill_view_cb (ECellView *subcell_view,
 
 static void
 ectr_subcell_weak_ref (GalA11yECellTree *a11y,
-		       GalA11yECell     *subcell_a11y)
+                       GalA11yECell *subcell_a11y)
 {
 	ECellView *subcell_view = subcell_a11y ? subcell_a11y->cell_view : NULL;
 	if (subcell_a11y && subcell_view && subcell_view->kill_view_cb_data)
@@ -184,11 +184,11 @@ gal_a11y_e_cell_tree_get_type (void)
 
 AtkObject *
 gal_a11y_e_cell_tree_new (ETableItem *item,
-			  ECellView  *cell_view,
-			  AtkObject  *parent,
-			  gint         model_col,
-			  gint         view_col,
-			  gint         row)
+                          ECellView *cell_view,
+                          AtkObject *parent,
+                          gint model_col,
+                          gint view_col,
+                          gint row)
 {
 	AtkObject *subcell_a11y;
 	GalA11yECellTree *a11y;
@@ -236,8 +236,8 @@ gal_a11y_e_cell_tree_new (ETableItem *item,
 		subcell_a11y = NULL;
 
 	/* create a companion a11y object, this object has type GalA11yECellTree
-	   and it connects to some signals to determine whether a tree cell is
-	   expanded or collapsed */
+	 * and it connects to some signals to determine whether a tree cell is
+	 * expanded or collapsed */
 	a11y = g_object_new (gal_a11y_e_cell_tree_get_type (), NULL);
 	gal_a11y_e_cell_construct (ATK_OBJECT (a11y),
 				   item,
diff --git a/widgets/table/gal-a11y-e-cell-vbox.c b/widgets/table/gal-a11y-e-cell-vbox.c
index e663bb1f1f..d0b9d26036 100644
--- a/widgets/table/gal-a11y-e-cell-vbox.c
+++ b/widgets/table/gal-a11y-e-cell-vbox.c
@@ -63,8 +63,9 @@ subcell_destroyed (gpointer data)
 		gaev->a11y_subcells[cell->view_col] = NULL;
 }
 
-static AtkObject*
-ecv_ref_child (AtkObject *a11y, gint i)
+static AtkObject *
+ecv_ref_child (AtkObject *a11y,
+               gint i)
 {
 	GalA11yECellVbox *gaev = GAL_A11Y_E_CELL_VBOX (a11y);
 	GalA11yECell *gaec = GAL_A11Y_E_CELL (a11y);
@@ -117,11 +118,11 @@ ecv_dispose (GObject *object)
 }
 
 /* AtkComponet interface */
-static AtkObject*
+static AtkObject *
 ecv_ref_accessible_at_point (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
+                             gint x,
+                             gint y,
+                             AtkCoordType coord_type)
 {
 	gint x0, y0, width, height;
 	gint subcell_height, i;
@@ -227,6 +228,6 @@ AtkObject *gal_a11y_e_cell_vbox_new	(ETableItem *item,
 	gaev = GAL_A11Y_E_CELL_VBOX (a11y);
 	ecvv = (ECellVboxView *) (gaec->cell_view);
 	gaev->a11y_subcell_count = ecvv->subcell_view_count;
-	gaev->a11y_subcells = g_malloc0 (sizeof (AtkObject *)*gaev->a11y_subcell_count);
+	gaev->a11y_subcells = g_malloc0 (sizeof (AtkObject *) * gaev->a11y_subcell_count);
 	return a11y;
 }
diff --git a/widgets/table/gal-a11y-e-cell.c b/widgets/table/gal-a11y-e-cell.c
index e48977f026..4a75c97ce4 100644
--- a/widgets/table/gal-a11y-e-cell.c
+++ b/widgets/table/gal-a11y-e-cell.c
@@ -42,7 +42,8 @@ static GObjectClass *parent_class;
 
 #if 0
 static void
-unref_item (gpointer user_data, GObject *obj_loc)
+unref_item (gpointer user_data,
+            GObject *obj_loc)
 {
 	GalA11yECell *a11y = GAL_A11Y_E_CELL (user_data);
 	a11y->item = NULL;
@@ -50,7 +51,8 @@ unref_item (gpointer user_data, GObject *obj_loc)
 }
 
 static void
-unref_cell (gpointer user_data, GObject *obj_loc)
+unref_cell (gpointer user_data,
+            GObject *obj_loc)
 {
 	GalA11yECell *a11y = GAL_A11Y_E_CELL (user_data);
 	a11y->cell_view = NULL;
@@ -104,7 +106,7 @@ gal_a11y_e_cell_dispose (GObject *object)
 
 /* Static functions */
 static const gchar *
-gal_a11y_e_cell_get_name (AtkObject * a11y)
+gal_a11y_e_cell_get_name (AtkObject *a11y)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (a11y);
 	ETableCol *ecol;
@@ -133,7 +135,7 @@ gal_a11y_e_cell_ref_state_set (AtkObject *accessible)
 	return cell->state_set;
 }
 
-static AtkObject*
+static AtkObject *
 gal_a11y_e_cell_get_parent (AtkObject *accessible)
 {
 	GalA11yECell *a11y = GAL_A11Y_E_CELL (accessible);
@@ -154,11 +156,11 @@ gal_a11y_e_cell_get_index_in_parent (AtkObject *accessible)
 /* Component IFace */
 static void
 gal_a11y_e_cell_get_extents (AtkComponent *component,
-		gint *x,
-		gint *y,
-		gint *width,
-		gint *height,
-		AtkCoordType coord_type)
+                             gint *x,
+                             gint *y,
+                             gint *width,
+                             gint *height,
+                             AtkCoordType coord_type)
 {
 	GalA11yECell *a11y = GAL_A11Y_E_CELL (component);
 	GtkWidget *tableOrTree;
@@ -267,7 +269,7 @@ gal_a11y_e_cell_init (GalA11yECell *a11y)
 
 static ActionInfo *
 _gal_a11y_e_cell_get_action_info (GalA11yECell *cell,
-                            gint     index)
+                                  gint index)
 {
 	GList *list_node;
 
@@ -282,7 +284,7 @@ _gal_a11y_e_cell_get_action_info (GalA11yECell *cell,
 
 static void
 _gal_a11y_e_cell_destroy_action_info (gpointer action_info,
-				      gpointer user_data)
+                                      gpointer user_data)
 {
 	ActionInfo *info = (ActionInfo *) action_info;
 
@@ -294,11 +296,11 @@ _gal_a11y_e_cell_destroy_action_info (gpointer action_info,
 }
 
 gboolean
-gal_a11y_e_cell_add_action ( GalA11yECell * cell,
-			     const gchar *action_name,
-			     const gchar *action_description,
-			     const gchar *action_keybinding,
-			     ACTION_FUNC action_func)
+gal_a11y_e_cell_add_action (GalA11yECell *cell,
+                            const gchar *action_name,
+                            const gchar *action_description,
+                            const gchar *action_keybinding,
+                            ACTION_FUNC action_func)
 {
 	ActionInfo *info;
 	g_return_val_if_fail (GAL_A11Y_IS_E_CELL (cell), FALSE);
@@ -325,7 +327,7 @@ gal_a11y_e_cell_add_action ( GalA11yECell * cell,
 
 gboolean
 gal_a11y_e_cell_remove_action (GalA11yECell *cell,
-			       gint     action_index)
+                               gint action_index)
 {
 	GList *list_node;
 
@@ -342,7 +344,7 @@ gal_a11y_e_cell_remove_action (GalA11yECell *cell,
 
 gboolean
 gal_a11y_e_cell_remove_action_by_name (GalA11yECell *cell,
-				       const gchar *action_name)
+                                       const gchar *action_name)
 {
 	GList *list_node;
 	gboolean action_found= FALSE;
@@ -377,7 +379,7 @@ gal_a11y_e_cell_action_get_n_actions (AtkAction *action)
 
 static const gchar *
 gal_a11y_e_cell_action_get_name (AtkAction *action,
-                           gint      index)
+                                 gint index)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (action);
 	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
@@ -389,7 +391,7 @@ gal_a11y_e_cell_action_get_name (AtkAction *action,
 
 static const gchar *
 gal_a11y_e_cell_action_get_description (AtkAction *action,
-					gint      index)
+                                        gint index)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (action);
 	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
@@ -400,9 +402,9 @@ gal_a11y_e_cell_action_get_description (AtkAction *action,
 }
 
 static gboolean
-gal_a11y_e_cell_action_set_description (AtkAction   *action,
-					gint        index,
-					const gchar *desc)
+gal_a11y_e_cell_action_set_description (AtkAction *action,
+                                        gint index,
+                                        const gchar *desc)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (action);
 	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
@@ -416,7 +418,7 @@ gal_a11y_e_cell_action_set_description (AtkAction   *action,
 
 static const gchar *
 gal_a11y_e_cell_action_get_keybinding (AtkAction *action,
-				       gint      index)
+                                       gint index)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (action);
 	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
@@ -445,7 +447,7 @@ idle_do_action (gpointer data)
 
 static gboolean
 gal_a11y_e_cell_action_do_action (AtkAction *action,
-				  gint      index)
+                                  gint index)
 {
 	GalA11yECell *cell = GAL_A11Y_E_CELL (action);
 	ActionInfo *info = _gal_a11y_e_cell_get_action_info (cell, index);
@@ -493,9 +495,9 @@ gal_a11y_e_cell_type_add_action_interface (GType type)
 }
 
 gboolean
-gal_a11y_e_cell_add_state (GalA11yECell     *cell,
-			   AtkStateType state_type,
-			   gboolean     emit_signal)
+gal_a11y_e_cell_add_state (GalA11yECell *cell,
+                           AtkStateType state_type,
+                           gboolean emit_signal)
 {
 	if (!atk_state_set_contains_state (cell->state_set, state_type)) {
 		gboolean rc;
@@ -510,7 +512,7 @@ gal_a11y_e_cell_add_state (GalA11yECell     *cell,
 		if (emit_signal) {
 			atk_object_notify_state_change (ATK_OBJECT (cell), state_type, TRUE);
 			/* If state_type is ATK_STATE_VISIBLE, additional
-			   notification */
+			 * notification */
 			if (state_type == ATK_STATE_VISIBLE)
 				g_signal_emit_by_name (cell, "visible_data_changed");
 		}
@@ -522,9 +524,9 @@ gal_a11y_e_cell_add_state (GalA11yECell     *cell,
 }
 
 gboolean
-gal_a11y_e_cell_remove_state (GalA11yECell     *cell,
-			      AtkStateType state_type,
-			      gboolean     emit_signal)
+gal_a11y_e_cell_remove_state (GalA11yECell *cell,
+                              AtkStateType state_type,
+                              gboolean emit_signal)
 {
 	if (atk_state_set_contains_state (cell->state_set, state_type)) {
 		gboolean rc;
@@ -592,11 +594,11 @@ gal_a11y_e_cell_get_type (void)
 
 AtkObject *
 gal_a11y_e_cell_new (ETableItem *item,
-		     ECellView  *cell_view,
-		     AtkObject  *parent,
-		     gint         model_col,
-		     gint         view_col,
-		     gint         row)
+                     ECellView *cell_view,
+                     AtkObject *parent,
+                     gint model_col,
+                     gint view_col,
+                     gint row)
 {
 	AtkObject *a11y;
 
@@ -613,13 +615,13 @@ gal_a11y_e_cell_new (ETableItem *item,
 }
 
 void
-gal_a11y_e_cell_construct (AtkObject  *object,
-			   ETableItem *item,
-			   ECellView  *cell_view,
-			   AtkObject  *parent,
-			   gint         model_col,
-			   gint         view_col,
-			   gint         row)
+gal_a11y_e_cell_construct (AtkObject *object,
+                           ETableItem *item,
+                           ECellView *cell_view,
+                           AtkObject *parent,
+                           gint model_col,
+                           gint view_col,
+                           gint row)
 {
 	GalA11yECell *a11y = GAL_A11Y_E_CELL (object);
 	a11y->item      = item;
diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.c b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
index c71199cebb..1a4b418adf 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.c
@@ -45,7 +45,7 @@ gal_a11y_e_table_click_to_add_factory_get_accessible_type (void)
 	return GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD;
 }
 
-static AtkObject*
+static AtkObject *
 gal_a11y_e_table_click_to_add_factory_create_accessible (GObject *obj)
 {
 	AtkObject * atk_object;
diff --git a/widgets/table/gal-a11y-e-table-click-to-add.c b/widgets/table/gal-a11y-e-table-click-to-add.c
index a947415c15..e4b5255e4c 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -56,7 +56,7 @@ etcta_get_n_actions (AtkAction *action)
 
 static const gchar *
 etcta_get_description (AtkAction *action,
-                             gint      i)
+                       gint i)
 {
 	if (i == 0)
 		return _("click to add");
@@ -65,7 +65,8 @@ etcta_get_description (AtkAction *action,
 }
 
 static const gchar *
-etcta_action_get_name (AtkAction *action, gint      i)
+etcta_action_get_name (AtkAction *action,
+                       gint i)
 {
 	if (i == 0)
 		return _("click");
@@ -105,7 +106,8 @@ idle_do_action (gpointer data)
 }
 
 static gboolean
-etcta_do_action (AtkAction * action, gint i)
+etcta_do_action (AtkAction *action,
+                 gint i)
 {
 	g_return_val_if_fail (i == 0, FALSE);
 
@@ -252,7 +254,9 @@ gal_a11y_e_table_click_to_add_get_type (void)
 }
 
 static gboolean
-etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data)
+etcta_event (GnomeCanvasItem *item,
+             GdkEvent *e,
+             gpointer data)
 {
 	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
 	GalA11yETableClickToAdd *a11y;
@@ -285,8 +289,10 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data)
 }
 
 static void
-etcta_selection_cursor_changed (ESelectionModel *esm, gint row, gint col,
-			GalA11yETableClickToAdd *a11y)
+etcta_selection_cursor_changed (ESelectionModel *esm,
+                                gint row,
+                                gint col,
+                                GalA11yETableClickToAdd *a11y)
 {
 	ETableClickToAdd *etcta;
 	AtkObject *row_a11y;
diff --git a/widgets/table/gal-a11y-e-table-column-header.c b/widgets/table/gal-a11y-e-table-column-header.c
index ccbfffadc9..8e13fd6865 100644
--- a/widgets/table/gal-a11y-e-table-column-header.c
+++ b/widgets/table/gal-a11y-e-table-column-header.c
@@ -67,7 +67,8 @@ gal_a11y_e_table_column_header_ref_state_set (AtkObject *accessible)
 }
 
 static void
-gal_a11y_e_table_column_header_real_initialize (AtkObject *obj, gpointer data)
+gal_a11y_e_table_column_header_real_initialize (AtkObject *obj,
+                                                gpointer data)
 {
 	ATK_OBJECT_CLASS (parent_class)->initialize (obj, data);
 }
@@ -110,7 +111,7 @@ etch_a11y_get_gobject (AtkGObjectAccessible *accessible)
 
 static gboolean
 gal_a11y_e_table_column_header_do_action (AtkAction *action,
-					  gint      i)
+                                          gint i)
 {
 	gboolean return_value = TRUE;
 	GtkWidget *widget;
@@ -148,7 +149,7 @@ gal_a11y_e_table_column_header_get_n_actions (AtkAction *action)
 
 static const gchar *
 gal_a11y_e_table_column_header_action_get_name (AtkAction *action,
-						gint      i)
+                                                gint i)
 {
 	const gchar *return_value;
 
@@ -209,7 +210,8 @@ gal_a11y_e_table_column_header_get_type (void)
 }
 
 AtkObject *
-gal_a11y_e_table_column_header_new (ETableCol *ecol, ETableItem *item)
+gal_a11y_e_table_column_header_new (ETableCol *ecol,
+                                    ETableItem *item)
 {
 	GalA11yETableColumnHeader *a11y;
 	AtkObject *accessible;
diff --git a/widgets/table/gal-a11y-e-table-factory.c b/widgets/table/gal-a11y-e-table-factory.c
index e89bb799bb..2270cbaa5b 100644
--- a/widgets/table/gal-a11y-e-table-factory.c
+++ b/widgets/table/gal-a11y-e-table-factory.c
@@ -39,7 +39,7 @@ gal_a11y_e_table_factory_get_accessible_type (void)
 	return GAL_A11Y_TYPE_E_TABLE;
 }
 
-static AtkObject*
+static AtkObject *
 gal_a11y_e_table_factory_create_accessible (GObject *obj)
 {
 	AtkObject *accessible;
diff --git a/widgets/table/gal-a11y-e-table-item-factory.c b/widgets/table/gal-a11y-e-table-item-factory.c
index 3aeab505f3..a38269bd81 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.c
+++ b/widgets/table/gal-a11y-e-table-item-factory.c
@@ -45,7 +45,7 @@ gal_a11y_e_table_item_factory_get_accessible_type (void)
 	return GAL_A11Y_TYPE_E_TABLE_ITEM;
 }
 
-static AtkObject*
+static AtkObject *
 gal_a11y_e_table_item_factory_create_accessible (GObject *obj)
 {
 	AtkObject *accessible;
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index e296882e65..5b0e565714 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -68,10 +68,11 @@ static gboolean gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
 						     ESelectionModel *selection);
 static gboolean gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y);
 
-static AtkObject* eti_ref_at (AtkTable *table, gint row, gint column);
+static AtkObject * eti_ref_at (AtkTable *table, gint row, gint column);
 
 static void
-item_finalized (gpointer user_data, GObject *gone_item)
+item_finalized (gpointer user_data,
+                GObject *gone_item)
 {
 	GalA11yETableItem *a11y;
 	GalA11yETableItemPrivate *priv;
@@ -103,7 +104,8 @@ eti_ref_state_set (AtkObject *accessible)
 }
 
 inline static gint
-view_to_model_row (ETableItem *eti, gint row)
+view_to_model_row (ETableItem *eti,
+                   gint row)
 {
 	if (eti->uses_source_model) {
 		ETableSubset *etss = E_TABLE_SUBSET (eti->table_model);
@@ -117,14 +119,16 @@ view_to_model_row (ETableItem *eti, gint row)
 }
 
 inline static gint
-view_to_model_col (ETableItem *eti, gint col)
+view_to_model_col (ETableItem *eti,
+                   gint col)
 {
 	ETableCol *ecol = e_table_header_get_column (eti->header, col);
 	return ecol ? ecol->col_idx : -1;
 }
 
 inline static gint
-model_to_view_row (ETableItem *eti, gint row)
+model_to_view_row (ETableItem *eti,
+                   gint row)
 {
 	gint i;
 	if (row == -1)
@@ -146,7 +150,8 @@ model_to_view_row (ETableItem *eti, gint row)
 }
 
 inline static gint
-model_to_view_col (ETableItem *eti, gint col)
+model_to_view_col (ETableItem *eti,
+                   gint col)
 {
 	gint i;
 	if (col == -1)
@@ -235,8 +240,9 @@ eti_get_n_children (AtkObject *accessible)
 		(atk_table_get_n_rows (ATK_TABLE (accessible)) + 1);
 }
 
-static AtkObject*
-eti_ref_child (AtkObject *accessible, gint index)
+static AtkObject *
+eti_ref_child (AtkObject *accessible,
+               gint index)
 {
 	ETableItem *item;
 	gint col, row;
@@ -264,11 +270,11 @@ eti_ref_child (AtkObject *accessible, gint index)
 
 static void
 eti_get_extents (AtkComponent *component,
-		 gint *x,
-		 gint *y,
-		 gint *width,
-		 gint *height,
-		 AtkCoordType coord_type)
+                 gint *x,
+                 gint *y,
+                 gint *width,
+                 gint *height,
+                 AtkCoordType coord_type)
 {
 	ETableItem *item;
 	AtkObject *parent;
@@ -294,11 +300,11 @@ eti_get_extents (AtkComponent *component,
 	}
 }
 
-static AtkObject*
+static AtkObject *
 eti_ref_accessible_at_point (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
+                             gint x,
+                             gint y,
+                             AtkCoordType coord_type)
 {
 	gint row = -1;
 	gint col = -1;
@@ -349,11 +355,13 @@ cell_destroyed (gpointer data)
 }
 
 /* atk table */
-static AtkObject*
-eti_ref_at (AtkTable *table, gint row, gint column)
+static AtkObject *
+eti_ref_at (AtkTable *table,
+            gint row,
+            gint column)
 {
 	ETableItem *item;
-	AtkObject* ret;
+	AtkObject * ret;
 	GalA11yETableItemPrivate *priv = GET_PRIVATE (table);
 
 	if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT))
@@ -399,7 +407,9 @@ eti_ref_at (AtkTable *table, gint row, gint column)
 }
 
 static gint
-eti_get_index_at (AtkTable *table, gint row, gint column)
+eti_get_index_at (AtkTable *table,
+                  gint row,
+                  gint column)
 {
 	ETableItem *item;
 
@@ -411,7 +421,8 @@ eti_get_index_at (AtkTable *table, gint row, gint column)
 }
 
 static gint
-eti_get_column_at_index (AtkTable *table, gint index)
+eti_get_column_at_index (AtkTable *table,
+                         gint index)
 {
 	ETableItem *item;
 
@@ -423,7 +434,8 @@ eti_get_column_at_index (AtkTable *table, gint index)
 }
 
 static gint
-eti_get_row_at_index (AtkTable *table, gint index)
+eti_get_row_at_index (AtkTable *table,
+                      gint index)
 {
 	ETableItem *item;
 
@@ -460,8 +472,8 @@ eti_get_n_rows (AtkTable *table)
 
 static gint
 eti_get_column_extent_at (AtkTable *table,
-			  gint row,
-			  gint column)
+                          gint row,
+                          gint column)
 {
 	ETableItem *item;
 	gint width;
@@ -483,8 +495,8 @@ eti_get_column_extent_at (AtkTable *table,
 
 static gint
 eti_get_row_extent_at (AtkTable *table,
-		       gint row,
-		       gint column)
+                       gint row,
+                       gint column)
 {
 	ETableItem *item;
 	gint height;
@@ -513,7 +525,7 @@ eti_get_caption (AtkTable *table)
 
 static const gchar *
 eti_get_column_description (AtkTable *table,
-			    gint column)
+                            gint column)
 {
 	ETableItem *item;
 	ETableCol *ecol;
@@ -528,7 +540,8 @@ eti_get_column_description (AtkTable *table,
 }
 
 static AtkObject *
-eti_get_column_header (AtkTable *table, gint column)
+eti_get_column_header (AtkTable *table,
+                       gint column)
 {
 	ETableItem *item;
 	ETableCol *ecol;
@@ -548,7 +561,7 @@ eti_get_column_header (AtkTable *table, gint column)
 
 static const gchar *
 eti_get_row_description (AtkTable *table,
-			 gint row)
+                         gint row)
 {
 	/* Unimplemented */
 	return NULL;
@@ -556,7 +569,7 @@ eti_get_row_description (AtkTable *table,
 
 static AtkObject *
 eti_get_row_header (AtkTable *table,
-		    gint row)
+                    gint row)
 {
 	/* Unimplemented */
 	return NULL;
@@ -570,7 +583,8 @@ eti_get_summary (AtkTable *table)
 }
 
 static gboolean
-table_is_row_selected (AtkTable *table, gint row)
+table_is_row_selected (AtkTable *table,
+                       gint row)
 {
 	ETableItem *item;
 	GalA11yETableItemPrivate *priv = GET_PRIVATE (table);
@@ -590,13 +604,16 @@ table_is_row_selected (AtkTable *table, gint row)
 }
 
 static gboolean
-table_is_selected (AtkTable *table, gint row, gint column)
+table_is_selected (AtkTable *table,
+                   gint row,
+                   gint column)
 {
 	return table_is_row_selected (table, row);
 }
 
 static gint
-table_get_selected_rows (AtkTable *table, gint **rows_selected)
+table_get_selected_rows (AtkTable *table,
+                         gint **rows_selected)
 {
 	ETableItem *item;
 	gint n_selected, row, index_selected;
@@ -625,7 +642,8 @@ table_get_selected_rows (AtkTable *table, gint **rows_selected)
 }
 
 static gboolean
-table_add_row_selection (AtkTable *table, gint row)
+table_add_row_selection (AtkTable *table,
+                         gint row)
 {
 	ETableItem *item;
 
@@ -642,7 +660,8 @@ table_add_row_selection (AtkTable *table, gint row)
 }
 
 static gboolean
-table_remove_row_selection (AtkTable *table, gint row)
+table_remove_row_selection (AtkTable *table,
+                            gint row)
 {
 	ETableItem *item;
 	GalA11yETableItemPrivate *priv = GET_PRIVATE (table);
@@ -698,8 +717,10 @@ eti_atk_component_iface_init (AtkComponentIface *iface)
 }
 
 static void
-eti_rows_inserted (ETableModel * model, gint row, gint count,
-		   AtkObject * table_item)
+eti_rows_inserted (ETableModel *model,
+                   gint row,
+                   gint count,
+                   AtkObject *table_item)
 {
 	gint n_cols,n_rows,i,j;
 	GalA11yETableItem * item_a11y;
@@ -725,7 +746,7 @@ eti_rows_inserted (ETableModel * model, gint row, gint count,
 		for (j = 0; j < n_cols; j++) {
 			g_signal_emit_by_name (table_item,
 					       "children_changed::add",
-					       ( ((i + 1)*n_cols) + j), NULL, NULL);
+					       ( ((i + 1) * n_cols) + j), NULL, NULL);
 		}
 	}
 
@@ -733,8 +754,10 @@ eti_rows_inserted (ETableModel * model, gint row, gint count,
 }
 
 static void
-eti_rows_deleted (ETableModel * model, gint row, gint count,
-		  AtkObject * table_item)
+eti_rows_deleted (ETableModel *model,
+                  gint row,
+                  gint count,
+                  AtkObject *table_item)
 {
 	gint i,j, n_rows, n_cols, old_nrows;
 	ETableItem *item = E_TABLE_ITEM (
@@ -746,7 +769,7 @@ eti_rows_deleted (ETableModel * model, gint row, gint count,
 
 	old_nrows = GET_PRIVATE (table_item)->rows;
 
-	g_return_if_fail ( row+count <= old_nrows);
+	g_return_if_fail ( row + count <= old_nrows);
 	g_return_if_fail (old_nrows == n_rows + count);
 	GET_PRIVATE (table_item)->rows = n_rows;
 
@@ -757,7 +780,7 @@ eti_rows_deleted (ETableModel * model, gint row, gint count,
 		for (j = 0; j < n_cols; j++) {
 			g_signal_emit_by_name (table_item,
 					       "children_changed::remove",
-					       ( ((i + 1)*n_cols) + j), NULL, NULL);
+					       ( ((i + 1) * n_cols) + j), NULL, NULL);
 		}
 	}
 	g_signal_emit_by_name (table_item, "visible-data-changed");
@@ -765,7 +788,9 @@ eti_rows_deleted (ETableModel * model, gint row, gint count,
 }
 
 static void
-eti_tree_model_node_changed_cb (ETreeModel *model, ETreePath node, ETableItem *eti)
+eti_tree_model_node_changed_cb (ETreeModel *model,
+                                ETreePath node,
+                                ETableItem *eti)
 {
 	AtkObject *atk_obj;
 	GalA11yETableItem *a11y;
@@ -793,10 +818,11 @@ enum {
  * 3. Emit signals
  */
 static void
-eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
+eti_header_structure_changed (ETableHeader *eth,
+                              AtkObject *a11y)
 {
 
-	gboolean reorder_found=FALSE, added_found=FALSE, removed_found=FALSE;
+	gboolean reorder_found = FALSE, added_found = FALSE, removed_found = FALSE;
 	GalA11yETableItem * a11y_item;
 	ETableCol ** cols, **prev_cols;
 	GalA11yETableItemPrivate *priv;
@@ -876,7 +902,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 					g_signal_emit_by_name (
 						G_OBJECT (a11y_item),
 						"children_changed::remove",
-						((j+1)*prev_n_cols+i),
+						((j + 1) * prev_n_cols + i),
 						NULL, NULL);
 			}
 		}
@@ -892,7 +918,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 					g_signal_emit_by_name (
 						G_OBJECT (a11y_item),
 						"children_changed::add",
-						((j+1)*n_cols+i),
+						((j + 1) * n_cols + i),
 						NULL, NULL);
 			}
 		}
@@ -910,7 +936,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 
 static void
 eti_real_initialize (AtkObject *obj,
-		     gpointer data)
+                     gpointer data)
 {
 	ETableItem * eti;
 	ETableModel * model;
@@ -920,14 +946,15 @@ eti_real_initialize (AtkObject *obj,
 
 	model = eti->table_model;
 
-	g_signal_connect (model, "model-rows-inserted",
-			  G_CALLBACK (eti_rows_inserted),
-			  obj);
-	g_signal_connect (model, "model-rows-deleted",
-			  G_CALLBACK (eti_rows_deleted),
-			  obj);
-	g_signal_connect (G_OBJECT (eti->header), "structure_change",
-			  G_CALLBACK (eti_header_structure_changed), obj);
+	g_signal_connect (
+		model, "model-rows-inserted",
+		G_CALLBACK (eti_rows_inserted), obj);
+	g_signal_connect (
+		model, "model-rows-deleted",
+		G_CALLBACK (eti_rows_deleted), obj);
+	g_signal_connect (
+		eti->header, "structure_change",
+		G_CALLBACK (eti_header_structure_changed), obj);
 
 }
 
@@ -1084,10 +1111,12 @@ gal_a11y_e_table_item_new (ETableItem *item)
 		return NULL;
 
 	if (item) {
-		g_signal_connect (G_OBJECT(item), "selection_model_removed",
-				  G_CALLBACK (eti_a11y_selection_model_removed_cb), NULL);
-		g_signal_connect (G_OBJECT(item), "selection_model_added",
-				  G_CALLBACK (eti_a11y_selection_model_added_cb), NULL);
+		g_signal_connect (
+			item, "selection_model_removed",
+			G_CALLBACK (eti_a11y_selection_model_removed_cb), NULL);
+		g_signal_connect (
+			item, "selection_model_added",
+			G_CALLBACK (eti_a11y_selection_model_added_cb), NULL);
 		if (item->selection)
 			gal_a11y_e_table_item_ref_selection (a11y,
 							     item->selection);
@@ -1104,8 +1133,9 @@ gal_a11y_e_table_item_new (ETableItem *item)
 		if (E_IS_TREE (GET_PRIVATE (a11y)->widget)) {
 			ETreeModel *model;
 			model = e_tree_get_model (E_TREE (GET_PRIVATE (a11y)->widget));
-			g_signal_connect (G_OBJECT(model), "node_changed",
-					G_CALLBACK (eti_tree_model_node_changed_cb), item);
+			g_signal_connect (
+				model, "node_changed",
+				G_CALLBACK (eti_tree_model_node_changed_cb), item);
 			accessible->role = ATK_ROLE_TREE_TABLE;
 		} else if (E_IS_TABLE (GET_PRIVATE (a11y)->widget)) {
 			accessible->role = ATK_ROLE_TABLE;
@@ -1126,7 +1156,7 @@ gal_a11y_e_table_item_new (ETableItem *item)
 
 static gboolean
 gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
-				     ESelectionModel *selection)
+                                     ESelectionModel *selection)
 {
 	GalA11yETableItemPrivate *priv;
 
@@ -1174,8 +1204,9 @@ gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y)
 /* callbacks */
 
 static void
-eti_a11y_selection_model_removed_cb (ETableItem *eti, ESelectionModel *selection,
-				     gpointer data)
+eti_a11y_selection_model_removed_cb (ETableItem *eti,
+                                     ESelectionModel *selection,
+                                     gpointer data)
 {
 	AtkObject *atk_obj;
 	GalA11yETableItem *a11y;
@@ -1191,8 +1222,9 @@ eti_a11y_selection_model_removed_cb (ETableItem *eti, ESelectionModel *selection
 }
 
 static void
-eti_a11y_selection_model_added_cb (ETableItem *eti, ESelectionModel *selection,
-				   gpointer data)
+eti_a11y_selection_model_added_cb (ETableItem *eti,
+                                   ESelectionModel *selection,
+                                   gpointer data)
 {
 	AtkObject *atk_obj;
 	GalA11yETableItem *a11y;
@@ -1209,7 +1241,8 @@ eti_a11y_selection_model_added_cb (ETableItem *eti, ESelectionModel *selection,
 }
 
 static void
-eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a11y)
+eti_a11y_selection_changed_cb (ESelectionModel *selection,
+                               GalA11yETableItem *a11y)
 {
 	GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
 
@@ -1223,7 +1256,9 @@ eti_a11y_selection_changed_cb (ESelectionModel *selection, GalA11yETableItem *a1
 
 static void
 eti_a11y_cursor_changed_cb (ESelectionModel *selection,
-			    gint row, gint col,  GalA11yETableItem *a11y)
+                            gint row,
+                            gint col,
+                            GalA11yETableItem *a11y)
 {
 	ETableItem *item;
 	GalA11yETableItemPrivate *priv = GET_PRIVATE (a11y);
@@ -1255,7 +1290,8 @@ static void atk_selection_interface_init (AtkSelectionIface *iface)
 }
 
 static gboolean
-selection_add_selection (AtkSelection *selection, gint index)
+selection_add_selection (AtkSelection *selection,
+                         gint index)
 {
 	AtkTable *table;
 	gint row, col, cursor_row, cursor_col, model_row, model_col;
@@ -1315,7 +1351,8 @@ selection_clear_selection (AtkSelection *selection)
 }
 
 static AtkObject *
-selection_ref_selection (AtkSelection *selection, gint index)
+selection_ref_selection (AtkSelection *selection,
+                         gint index)
 {
 	AtkTable *table;
 	gint row, col;
@@ -1343,7 +1380,8 @@ selection_get_selection_count (AtkSelection *selection)
 }
 
 static gboolean
-selection_is_child_selected (AtkSelection *selection, gint i)
+selection_is_child_selected (AtkSelection *selection,
+                             gint i)
 {
 	gint row;
 
diff --git a/widgets/table/gal-a11y-e-table.c b/widgets/table/gal-a11y-e-table.c
index 436de1ec0f..6ba51303ed 100644
--- a/widgets/table/gal-a11y-e-table.c
+++ b/widgets/table/gal-a11y-e-table.c
@@ -70,8 +70,9 @@ find_first_table_item (ETableGroup *group)
 	return NULL;
 }
 
-static AtkObject*
-eti_get_accessible (ETableItem *eti, AtkObject *parent)
+static AtkObject *
+eti_get_accessible (ETableItem *eti,
+                    AtkObject *parent)
 {
 	AtkObject *a11y = NULL;
 
@@ -110,11 +111,11 @@ init_child_item (GalA11yETable *a11y)
 	return FALSE;
 }
 
-static AtkObject*
-et_ref_accessible_at_point  (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
+static AtkObject *
+et_ref_accessible_at_point (AtkComponent *component,
+                            gint x,
+                            gint y,
+                            AtkCoordType coord_type)
 {
 	GalA11yETable *a11y = GAL_A11Y_E_TABLE (component);
 	if (GET_PRIVATE (a11y)->child_item)
@@ -146,9 +147,9 @@ et_get_n_children (AtkObject *accessible)
 	return n;
 }
 
-static AtkObject*
+static AtkObject *
 et_ref_child (AtkObject *accessible,
-	      gint i)
+              gint i)
 {
 	GalA11yETable *a11y = GAL_A11Y_E_TABLE (accessible);
 	ETable * et;
diff --git a/widgets/table/gal-a11y-e-tree-factory.c b/widgets/table/gal-a11y-e-tree-factory.c
index 4e22c1ca70..00ce55c8c0 100644
--- a/widgets/table/gal-a11y-e-tree-factory.c
+++ b/widgets/table/gal-a11y-e-tree-factory.c
@@ -38,7 +38,7 @@ gal_a11y_e_tree_factory_get_accessible_type (void)
 	return GAL_A11Y_TYPE_E_TREE;
 }
 
-static AtkObject*
+static AtkObject *
 gal_a11y_e_tree_factory_create_accessible (GObject *obj)
 {
 	AtkObject *accessible;
diff --git a/widgets/table/gal-a11y-e-tree.c b/widgets/table/gal-a11y-e-tree.c
index f26c525550..12697f4535 100644
--- a/widgets/table/gal-a11y-e-tree.c
+++ b/widgets/table/gal-a11y-e-tree.c
@@ -61,11 +61,11 @@ init_child_item (GalA11yETree *a11y)
 	}
 }
 
-static AtkObject*
-et_ref_accessible_at_point  (AtkComponent *component,
-			     gint x,
-			     gint y,
-			     AtkCoordType coord_type)
+static AtkObject *
+et_ref_accessible_at_point (AtkComponent *component,
+                             gint x,
+                             gint y,
+                             AtkCoordType coord_type)
 {
 	GalA11yETree *a11y = GAL_A11Y_E_TREE (component);
 	init_child_item (a11y);
@@ -78,9 +78,9 @@ et_get_n_children (AtkObject *accessible)
 	return 1;
 }
 
-static AtkObject*
+static AtkObject *
 et_ref_child (AtkObject *accessible,
-	      gint i)
+              gint i)
 {
 	GalA11yETree *a11y = GAL_A11Y_E_TREE (accessible);
 	if (i != 0)
-- 
cgit v1.2.3


From 07b58617f36d0061adf14046b4baf5299038d61c Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 5 Sep 2011 18:20:38 +0200
Subject: Bug #655709 - Hide 'Group by' in views when not supported

---
 widgets/table/e-table-state.c | 6 +++++-
 widgets/table/e-tree.c        | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 785c807442..a3362819b4 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -164,6 +164,7 @@ e_table_state_load_from_node (ETableState *state,
 	GList *list = NULL, *iterator;
 	gdouble state_version;
 	gint i;
+	gboolean can_group = TRUE;
 
 	g_return_if_fail (E_IS_TABLE_STATE (state));
 	g_return_if_fail (node != NULL);
@@ -171,8 +172,10 @@ e_table_state_load_from_node (ETableState *state,
 	state_version = e_xml_get_double_prop_by_name_with_default (
 		node, (const guchar *)"state-version", STATE_VERSION);
 
-	if (state->sort_info)
+	if (state->sort_info) {
+		can_group = e_table_sort_info_get_can_group (state->sort_info);
 		g_object_unref (state->sort_info);
+	}
 
 	state->sort_info = NULL;
 	children = node->xmlChildrenNode;
@@ -202,6 +205,7 @@ e_table_state_load_from_node (ETableState *state,
 
 	if (!state->sort_info)
 		state->sort_info = e_table_sort_info_new ();
+	e_table_sort_info_set_can_group (state->sort_info, can_group);
 
 	for (iterator = list, i = 0; iterator; i++) {
 		int_and_double *column_info = iterator->data;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 770b2ad653..67d9020106 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1677,6 +1677,7 @@ e_tree_construct (ETree *e_tree,
 	}
 
 	e_tree->priv->spec = specification;
+	e_tree->priv->spec->allow_grouping = FALSE;
 
 	g_object_unref (state);
 
@@ -1743,6 +1744,7 @@ e_tree_construct_from_spec_file (ETree *e_tree,
 	}
 
 	e_tree->priv->spec = specification;
+	e_tree->priv->spec->allow_grouping = FALSE;
 
 	g_object_unref (state);
 
-- 
cgit v1.2.3


From a6de7fa6b8253eb4149c57f2807786dc46a6d8a7 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 26 Sep 2011 12:26:59 +0200
Subject: Bug #659828 - Selecting a message with a sound attached loses focus

---
 widgets/table/e-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 67d9020106..41818652bd 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1156,7 +1156,7 @@ et_canvas_root_event (GnomeCanvasItem *root,
 /* Handler for focus events in the table_canvas; we have to repaint ourselves
  * and give the focus to some ETableItem.
  */
-static gint
+static gboolean
 table_canvas_focus_event_cb (GtkWidget *widget,
                              GdkEventFocus *event,
                              gpointer data)
-- 
cgit v1.2.3


From 23f5359c41e50c189425ab043162e0b6e0ccda80 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 26 Sep 2011 12:30:06 +0200
Subject: Bug #655625 - Crash in atk_state_set_contains_state

---
 widgets/table/gal-a11y-e-table-click-to-add-factory.h |  2 +-
 widgets/table/gal-a11y-e-table-item.c                 | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/gal-a11y-e-table-click-to-add-factory.h b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
index c8f9782a7e..c7b2cf8e6a 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add-factory.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add-factory.h
@@ -25,7 +25,7 @@
 
 #include <atk/atkobjectfactory.h>
 
-#define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY            (gal_a11y_e_table_item_factory_get_type ())
+#define GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY            (gal_a11y_e_table_item_click_to_add_factory_get_type ())
 #define GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY, GalA11yETableClickToAddFactory))
 #define GAL_A11Y_E_TABLE_CLICK_TO_ADD_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY, GalA11yETableClickToAddFactoryClass))
 #define GAL_A11Y_IS_E_TABLE_CLICK_TO_ADD_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAL_A11Y_TYPE_E_TABLE_CLICK_TO_ADD_FACTORY))
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 5b0e565714..2c6de549b9 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -54,6 +54,7 @@ static GQuark		quark_accessible_object = 0;
 #define PARENT_TYPE (parent_type)
 
 struct _GalA11yETableItemPrivate {
+	ETableItem *item;
 	gint cols;
 	gint rows;
 	gint selection_change_id;
@@ -77,20 +78,18 @@ item_finalized (gpointer user_data,
 	GalA11yETableItem *a11y;
 	GalA11yETableItemPrivate *priv;
 
-	/* XXX GalA11yETableItem may already be finalized.
-	 *     Just work around it for now. */
-	if (!GAL_A11Y_IS_E_TABLE_ITEM (user_data))
-		return;
-
 	a11y = GAL_A11Y_E_TABLE_ITEM (user_data);
 	priv = GET_PRIVATE (a11y);
 
+	priv->item = NULL;
+
 	atk_state_set_add_state (priv->state_set, ATK_STATE_DEFUNCT);
 	atk_object_notify_state_change (ATK_OBJECT (a11y), ATK_STATE_DEFUNCT, TRUE);
 
 	if (priv->selection)
 		gal_a11y_e_table_item_unref_selection (a11y);
 
+	g_object_unref (a11y);
 }
 
 static AtkStateSet *
@@ -224,6 +223,11 @@ eti_dispose (GObject *object)
 		priv->columns = NULL;
 	}
 
+	if (priv->item) {
+		g_object_weak_unref (G_OBJECT (priv->item), item_finalized, a11y);
+		priv->item = NULL;
+	}
+
 	if (parent_class->dispose)
 		parent_class->dispose (object);
 }
@@ -1102,6 +1106,7 @@ gal_a11y_e_table_item_new (ETableItem *item)
 
 	accessible  = ATK_OBJECT (a11y);
 
+	GET_PRIVATE (a11y)->item = item;
 	/* Initialize cell data. */
 	GET_PRIVATE (a11y)->cols = item->cols;
 	GET_PRIVATE (a11y)->rows = item->rows;
@@ -1143,7 +1148,7 @@ gal_a11y_e_table_item_new (ETableItem *item)
 	}
 
 	if (item)
-		g_object_weak_ref (G_OBJECT (item), item_finalized, a11y);
+		g_object_weak_ref (G_OBJECT (item), item_finalized, g_object_ref (a11y));
 
 	esm = item->selection;
 
-- 
cgit v1.2.3


From 5ddad039926944120fa8f138f3a0039292d736de Mon Sep 17 00:00:00 2001
From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Thu, 29 Sep 2011 11:59:34 +0200
Subject: Remove Ctrl + l () character from source files

From ccc980da1fd84ebfca25cf8caf9a5d62333099fc Mon Sep 17 00:00:00 2001
From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Wed, 28 Sep 2011 10:18:18 +0200
Subject: [PATCH] Remove Ctrl + l () character from source files

The following commits

        git show aac3f2c8
        git show 1510304c
        git show 13cabd9e
        git show 350a7a33
        git show 9b7cc54d
        git show e6972011
        git show 1d3a7938
        git show 934524b9
        git show b2954936
        git show a7f677b5
        git show 4369c400
        git show d509f47a
        git show a6d5818f
        git show c3876df7
        git show 4583098b
        git show 2831ada5
        git show 4e1bce59
        git show 1609f699
        git show 4e4c1676
        git show d6fade43

among others(?) introduced several occurrences of Ctrl + l (). Probably this was caused by the used editor.

These control characters can be searched for using the following command [1].

	$ git grep ^L

[1] http://unstableme.blogspot.com/2009/10/grep-and-print-control-characters-in.html
---
 widgets/table/e-table-memory.c | 2 --
 widgets/table/e-tree-memory.c  | 5 -----
 widgets/table/e-tree-model.c   | 3 ---
 widgets/table/e-tree-sorted.c  | 8 --------
 4 files changed, 18 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 28f10264f8..6fe853e6bb 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -176,8 +176,6 @@ e_table_memory_insert (ETableMemory *etmm,
 		e_table_model_row_inserted (E_TABLE_MODEL (etmm), row);
 }
 
-
-
 /**
  * e_table_memory_remove:
  * @etable:
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index 43fb41b29c..4f279aabb9 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -77,7 +77,6 @@ struct _ETreeMemoryPrivate {
 	gpointer         destroy_user_data;
 };
 
-
 /* ETreeMemoryPath functions */
 
 static inline void
@@ -169,8 +168,6 @@ e_tree_path_unlink (ETreeMemoryPath *path)
 	path->prev_sibling = NULL;
 }
 
-
-
 /**
  * e_tree_memory_freeze:
  * @etmm: the ETreeModel to freeze.
@@ -212,7 +209,6 @@ e_tree_memory_thaw (ETreeMemory *etmm)
 	}
 }
 
-
 /* virtual methods */
 
 static void
@@ -363,7 +359,6 @@ etmm_node_request_collapse (ETreeModel *etm,
 		parent_class->node_request_collapse (etm, node);
 }
 
-
 static void
 e_tree_memory_class_init (ETreeMemoryClass *class)
 {
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index b37ce4bf17..24221418c0 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -61,7 +61,6 @@ enum {
 
 static guint e_tree_model_signals[LAST_SIGNAL] = {0, };
 
-
 static void
 e_tree_model_class_init (ETreeModelClass *class)
 {
@@ -419,8 +418,6 @@ e_tree_model_node_request_collapse (ETreeModel *tree_model,
 	g_signal_emit (G_OBJECT (tree_model), e_tree_model_signals[NODE_REQUEST_COLLAPSE], 0, collapsed_node);
 }
 
-
-
 /**
  * e_tree_model_new
  *
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index 72b4cba091..4d95fcc74b 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -119,8 +119,6 @@ static void free_path (ETreeSortedPath *path);
 static void generate_children (ETreeSorted *ets, ETreeSortedPath *path);
 static void regenerate_children (ETreeSorted *ets, ETreeSortedPath *path);
 
-
-
 /* idle callbacks */
 
 static gboolean
@@ -162,8 +160,6 @@ ets_insert_idle (ETreeSorted *ets)
 	return FALSE;
 }
 
-
-
 /* Helper functions */
 
 #define CHECK_AROUND_LAST_ACCESS
@@ -597,8 +593,6 @@ schedule_resort (ETreeSorted *ets,
 	}
 }
 
-
-
 /* virtual methods */
 
 static void
@@ -1210,8 +1204,6 @@ ets_sort_info_changed (ETableSortInfo *sort_info,
 	schedule_resort (ets, ets->priv->root, TRUE, TRUE);
 }
 
-
-
 /* Initialization and creation */
 
 static void
-- 
cgit v1.2.3


From 4c56856e05c6ab1468fe8ace4b73ac31b333990b Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 30 Sep 2011 15:39:57 +0200
Subject: Fix few 'may be used uninitialized' compiler warnings

---
 widgets/table/e-table-group-container.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index d874834db1..7d04eda9d9 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1252,7 +1252,7 @@ e_table_group_container_print_page (EPrintable *ep,
                                     gboolean quantize,
                                     ETGCPrintContext *groupcontext)
 {
-	cairo_t *cr;
+	cairo_t *cr = NULL;
 	GtkPageSetup *setup;
 	gdouble yd;
 	gdouble page_height, page_margin;
@@ -1301,8 +1301,7 @@ e_table_group_container_print_page (EPrintable *ep,
 		child_height = e_printable_height (child_printable, context, width,yd, quantize);
 		if (child_height < 0)
 			child_height = -child_height;
-		if (yd < 2 * TEXT_AREA_HEIGHT + 20 + child_height )
-		{
+		if (cr && yd < 2 * TEXT_AREA_HEIGHT + 20 + child_height) {
 			cairo_show_page (cr);
 			cairo_translate (cr, -2 * TEXT_AREA_HEIGHT, -TEXT_AREA_HEIGHT);
 			break;
-- 
cgit v1.2.3


From b73a8f243ea4446f39012d7a64c107c25ff6d854 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Fri, 30 Sep 2011 11:34:38 -0400
Subject: ETableHeader: Rework the header button drawing code for GTK+ 3

The code in ETable that draws the button headers is outdated, and uses
deprecated gtk_paint_* functions mixed with cairo.

Port the code to use the GtkStyleContext API, which allows themes to
give the header the same appearance of a regular GtkTreeView header.
---
 widgets/table/e-table-field-chooser-item.c |  36 ++-------
 widgets/table/e-table-header-item.c        |  49 ++++++------
 widgets/table/e-table-header-utils.c       | 119 +++++++++++++++--------------
 widgets/table/e-table-header-utils.h       |   4 +-
 widgets/table/e-table-utils.c              |   5 +-
 5 files changed, 93 insertions(+), 120 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index ecc414853c..67fe22968f 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -491,17 +491,12 @@ etfci_draw (GnomeCanvasItem *item,
 	gint rows;
 	gint y1, y2;
 	gint row;
-	GtkStyle *style;
-	GtkStateType state;
 
 	if (etfci->combined_header == NULL)
 		return;
 
 	rows = e_table_header_count (etfci->combined_header);
 
-	style = gtk_widget_get_style (GTK_WIDGET (canvas));
-	state = gtk_widget_get_state (GTK_WIDGET (canvas));
-
 	y1 = y2 = 0;
 	for (row = 0; row < rows; row++, y1 = y2) {
 		ETableCol *ecol;
@@ -519,17 +514,12 @@ etfci_draw (GnomeCanvasItem *item,
 		if (y2 < y)
 			continue;
 
-		cairo_save (cr);
-
 		e_table_header_draw_button (cr, ecol,
-					    style, state,
 					    GTK_WIDGET (canvas),
 					    -x, y1 - y,
 					    width, height,
 					    etfci->width, y2 - y1,
 					    E_TABLE_COL_ARROW_NONE);
-
-		cairo_restore (cr);
 	}
 }
 
@@ -567,15 +557,11 @@ etfci_start_drag (ETableFieldChooserItem *etfci,
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
 	GtkTargetList *list;
 	GdkDragContext *context;
-	GdkWindow *window;
-	GtkStyle *style;
-	GtkStateType state;
 	ETableCol *ecol;
 	cairo_surface_t *cs;
 	cairo_t *cr;
 	gint drag_col;
 	gint button_height;
-	GdkPixbuf *pixbuf;
 
 	GtkTargetEntry  etfci_drag_types[] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
@@ -604,28 +590,18 @@ etfci_start_drag (ETableFieldChooserItem *etfci,
 	g_free ((gpointer) etfci_drag_types[0].target);
 
 	button_height = e_table_header_compute_height (ecol, widget);
-	window = gtk_widget_get_window (widget);
-	cs = gdk_window_create_similar_surface (
-		window, CAIRO_CONTENT_COLOR, etfci->width, button_height);
-
-	style = gtk_widget_get_style (widget);
-	state = gtk_widget_get_state (widget);
-
+	cs = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+					 etfci->width, button_height);
 	cr = cairo_create (cs);
+
 	e_table_header_draw_button (
-		cr, ecol, style,
-		state, widget, 0, 0,
+		cr, ecol,
+		widget, 0, 0,
 		etfci->width, button_height,
 		etfci->width, button_height,
 		E_TABLE_COL_ARROW_NONE);
 
-	pixbuf = gdk_pixbuf_get_from_window (window, 0, 0, etfci->width, button_height);
-	gtk_drag_set_icon_pixbuf (
-		context,
-		pixbuf,
-		etfci->width / 2,
-		button_height / 2);
-	g_object_unref (pixbuf);
+	gtk_drag_set_icon_surface (context, cs);
 
 	cairo_surface_destroy (cs);
 	cairo_destroy (cr);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 11d8f31f81..b8aa55f369 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -996,9 +996,7 @@ ethi_draw (GnomeCanvasItem *item,
 	gint x1, x2;
 	gint col;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-	GtkStyle *style;
-
-	style = gtk_widget_get_style (GTK_WIDGET (canvas));
+	GtkStyleContext *context;
 
 	if (ethi->sort_info) {
 		gint length;
@@ -1040,10 +1038,13 @@ ethi_draw (GnomeCanvasItem *item,
 	ethi->width = e_table_header_total_width (ethi->eth) + ethi->group_indent_width;
 	x1 = x2 = 0;
 	x2 += ethi->group_indent_width;
+
+	context = gtk_widget_get_style_context (GTK_WIDGET (canvas));
+
 	for (col = 0; col < cols; col++, x1 = x2) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
-		GtkStateType state;
 		gint col_width;
+		GtkRegionFlags flags = 0;
 
 		col_width = ecol->width;
 
@@ -1058,15 +1059,29 @@ ethi_draw (GnomeCanvasItem *item,
 		if (x2 <= x1)
 			continue;
 
-		state = gtk_widget_get_state (GTK_WIDGET (canvas));
+		if (((col + 1) % 2) == 0)
+			flags |= GTK_REGION_EVEN;
+		else
+			flags |= GTK_REGION_ODD;
+
+		if (col == 0)
+			flags |= GTK_REGION_FIRST;
+
+		if (col + 1 == cols)
+			flags |= GTK_REGION_LAST;
+
+		gtk_style_context_save (context);
+		gtk_style_context_add_region (
+			context, GTK_STYLE_REGION_COLUMN_HEADER, flags);
 
 		e_table_header_draw_button (
-			cr, ecol,
-			style, state, GTK_WIDGET (canvas),
+			cr, ecol, GTK_WIDGET (canvas),
 			x1 - x, -y, width, height,
 			x2 - x1, ethi->height,
 			(ETableColArrow) g_hash_table_lookup (
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
+
+		gtk_style_context_restore (context);
 	}
 
 	g_hash_table_destroy (arrows);
@@ -1209,22 +1224,16 @@ ethi_start_drag (ETableHeaderItem *ethi,
 	ETableCol *ecol;
 	gint col_width;
 	cairo_surface_t *s;
-	GdkPixbuf *pixbuf;
 	cairo_t *cr;
 
 	gint group_indent = 0;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
-	GtkStateType state;
-	GtkStyle *style;
 
 	GtkTargetEntry  ethi_drag_types[] = {
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
 
 	widget = GTK_WIDGET (GNOME_CANVAS_ITEM (ethi)->canvas);
-	state = gtk_widget_get_state (widget);
-	style = gtk_widget_get_style (widget);
-
 	ethi->drag_col = ethi_find_col_by_x (ethi, event->motion.x);
 
 	if (ethi->drag_col == -1)
@@ -1269,27 +1278,17 @@ ethi_start_drag (ETableHeaderItem *ethi,
 
 	ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
 	col_width = ecol->width;
-	s = cairo_image_surface_create (CAIRO_FORMAT_A1, col_width, ethi->height);
+	s = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, col_width, ethi->height);
 	cr = cairo_create (s);
-	pixbuf = gdk_pixbuf_get_from_surface (
-		s, 0, 0, col_width, ethi->height);
-
-	state = gtk_widget_get_state (widget);
 
 	e_table_header_draw_button (
 		cr, ecol,
-		style, state,
 		widget, 0, 0,
 		col_width, ethi->height,
 		col_width, ethi->height,
 		(ETableColArrow) g_hash_table_lookup (
 			arrows, GINT_TO_POINTER (ecol->col_idx)));
-	gtk_drag_set_icon_pixbuf (
-		context,
-		pixbuf,
-		col_width / 2,
-		ethi->height / 2);
-	g_object_unref (pixbuf);
+	gtk_drag_set_icon_surface (context, s);
 	cairo_surface_destroy (s);
 
 	ethi->maybe_drag = FALSE;
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 34f93a701b..431009016f 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -60,6 +60,23 @@ build_header_layout (GtkWidget *widget,
 	return layout;
 }
 
+static void
+get_button_padding (GtkWidget *widget,
+                    GtkBorder *padding)
+{
+	GtkStyleContext *context;
+	GtkStateFlags state_flags;
+
+	context = gtk_widget_get_style_context (widget);
+	state_flags = gtk_widget_get_state_flags (widget);
+
+	gtk_style_context_save (context);
+	gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
+	gtk_style_context_get_padding (context, state_flags, padding);
+
+	gtk_style_context_restore (context);
+}
+
 /**
  * e_table_header_compute_height:
  * @ecol: Table column description.
@@ -73,15 +90,15 @@ gdouble
 e_table_header_compute_height (ETableCol *ecol,
                                GtkWidget *widget)
 {
-	gint ythick;
 	gint height;
 	PangoLayout *layout;
+	GtkBorder padding;
 
 	g_return_val_if_fail (ecol != NULL, -1);
 	g_return_val_if_fail (E_IS_TABLE_COL (ecol), -1);
 	g_return_val_if_fail (GTK_IS_WIDGET (widget), -1);
 
-	ythick = gtk_widget_get_style (widget)->ythickness;
+	get_button_padding (widget, &padding);
 
 	layout = build_header_layout (widget, ecol->text);
 
@@ -93,8 +110,7 @@ e_table_header_compute_height (ETableCol *ecol,
 	}
 
 	height = MAX (height, MIN_ARROW_SIZE);
-
-	height += 2 * (ythick + HEADER_PADDING);
+	height += padding.top + padding.bottom + 2 * HEADER_PADDING;
 
 	g_object_unref (layout);
 
@@ -102,11 +118,12 @@ e_table_header_compute_height (ETableCol *ecol,
 }
 
 gdouble
-e_table_header_width_extras (GtkStyle *style)
+e_table_header_width_extras (GtkWidget *widget)
 {
-	g_return_val_if_fail (style != NULL, -1);
+	GtkBorder padding;
 
-	return 2 * (style->xthickness + HEADER_PADDING);
+	get_button_padding (widget, &padding);
+	return padding.left + padding.right + 2 * HEADER_PADDING;
 }
 
 /* Creates a pixmap that is a composite of a background color and the upper-left
@@ -233,8 +250,6 @@ make_composite_pixmap (GdkDrawable *drawable,
  * e_table_header_draw_button:
  * @drawable: Destination drawable.
  * @ecol: Table column for the header information.
- * @style: Style to use for drawing the button.
- * @state: State of the table widget.
  * @widget: The table widget.
  * @x: Leftmost coordinate of the button.
  * @y: Topmost coordinate of the button.
@@ -249,8 +264,6 @@ make_composite_pixmap (GdkDrawable *drawable,
 void
 e_table_header_draw_button (cairo_t *cr,
                             ETableCol *ecol,
-                            GtkStyle *style,
-                            GtkStateType state,
                             GtkWidget *widget,
                             gint x,
                             gint y,
@@ -260,58 +273,49 @@ e_table_header_draw_button (cairo_t *cr,
                             gint button_height,
                             ETableColArrow arrow)
 {
-	gint xthick, ythick;
 	gint inner_x, inner_y;
 	gint inner_width, inner_height;
 	gint arrow_width = 0, arrow_height = 0;
 	PangoLayout *layout;
-	static gpointer g_label = NULL;
+	GtkStyleContext *context;
+	GtkBorder padding;
+	GtkStateFlags state_flags;
 
 	g_return_if_fail (cr != NULL);
 	g_return_if_fail (ecol != NULL);
 	g_return_if_fail (E_IS_TABLE_COL (ecol));
-	g_return_if_fail (style != NULL);
 	g_return_if_fail (widget != NULL);
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 	g_return_if_fail (button_width > 0 && button_height > 0);
 
-	if (g_label == NULL) {
-		GtkWidget *button = gtk_button_new_with_label("Hi");
-		GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-		gtk_container_add (GTK_CONTAINER (window), button);
-		gtk_widget_ensure_style (window);
-		gtk_widget_ensure_style (button);
-		g_label = gtk_bin_get_child (GTK_BIN (button));
-		g_object_add_weak_pointer (G_OBJECT (g_label), &g_label);
-		gtk_widget_ensure_style (g_label);
-		gtk_widget_realize (g_label);
-	}
-
-	cairo_save (cr);
-	gdk_cairo_set_source_color (
-		cr, &gtk_widget_get_style (GTK_WIDGET (g_label))->fg[state]);
+	/* Button bevel */
+	context = gtk_widget_get_style_context (widget);
+	state_flags = gtk_widget_get_state_flags (widget);
 
-	xthick = style->xthickness;
-	ythick = style->ythickness;
+	gtk_style_context_save (context);
+	gtk_style_context_set_state (context, state_flags);
+	gtk_style_context_add_class (context, GTK_STYLE_CLASS_BUTTON);
 
-	/* Button bevel */
+	gtk_style_context_get_padding (context, state_flags, &padding);
 
-	gtk_paint_box (style, cr, state, GTK_SHADOW_OUT,
-		       widget, "button",
-		       x, y, button_width, button_height);
+	gtk_render_background (
+		context, cr, x, y,
+		button_width, button_height);
+	gtk_render_frame (
+		context, cr, x, y,
+		button_width, button_height);
 
 	/* Inside area */
 
-	inner_width = button_width - 2 * (xthick + HEADER_PADDING);
-	inner_height = button_height - 2 * (ythick + HEADER_PADDING);
+	inner_width = button_width - (padding.left + padding.right + 2 * HEADER_PADDING);
+	inner_height = button_height - (padding.top + padding.bottom + 2 * HEADER_PADDING);
 
 	if (inner_width < 1 || inner_height < 1) {
-		cairo_restore (cr);
 		return; /* nothing fits */
 	}
 
-	inner_x = x + xthick + HEADER_PADDING;
-	inner_y = y + ythick + HEADER_PADDING;
+	inner_x = x + padding.left + HEADER_PADDING;
+	inner_y = y + padding.top + HEADER_PADDING;
 
 	/* Arrow space */
 
@@ -328,12 +332,11 @@ e_table_header_draw_button (cairo_t *cr,
 			inner_width -= arrow_width + HEADER_PADDING;
 		break;
 	default:
-		cairo_restore (cr);
 		g_return_if_reached ();
 	}
 
 	if (inner_width < 1) {
-		cairo_restore (cr);
+		gtk_style_context_restore (context);
 		return; /* nothing else fits */
 	}
 
@@ -370,18 +373,19 @@ e_table_header_draw_button (cairo_t *cr,
 				layout, (inner_width - (xpos - inner_x)) *
 				PANGO_SCALE);
 
-			cairo_move_to (cr, xpos + pwidth + 1, ypos);
-			pango_cairo_show_layout (cr, layout);
+			gtk_render_layout (
+				context, cr, xpos + pwidth + 1,
+				ypos, layout);
 		}
 
-		gdk_cairo_set_source_pixbuf (cr, ecol->pixbuf,
-					     xpos, inner_y + (inner_height - clip_height) / 2);
-		cairo_paint (cr);
+		gtk_render_icon (
+			context, cr, ecol->pixbuf, xpos,
+			inner_y + (inner_height - clip_height) / 2);
+
 	} else {
 		pango_layout_set_width (layout, inner_width * PANGO_SCALE);
 
-		cairo_move_to (cr, inner_x, inner_y);
-		pango_cairo_show_layout (cr, layout);
+		gtk_render_layout (context, cr, inner_x, inner_y, layout);
 	}
 
 	switch (arrow) {
@@ -393,21 +397,20 @@ e_table_header_draw_button (cairo_t *cr,
 		if (ecol->icon_name == NULL)
 			inner_width += arrow_width + HEADER_PADDING;
 
-		gtk_paint_arrow (style, cr, state,
-				 GTK_SHADOW_NONE, widget, "header",
-				 (arrow == E_TABLE_COL_ARROW_UP) ? GTK_ARROW_UP : GTK_ARROW_DOWN,
-				 (ecol->icon_name == NULL),
-				 inner_x + inner_width - arrow_width,
-				 inner_y + (inner_height - arrow_height) / 2,
-				 arrow_width, arrow_height);
+		gtk_render_arrow (
+			context, cr,
+			(arrow == E_TABLE_COL_ARROW_UP) ? 0 : G_PI,
+			inner_x + inner_width - arrow_width,
+			inner_y + (inner_height - arrow_height) / 2,
+			MAX (arrow_width, arrow_height));
+
 		break;
 	}
 
 	default:
-		cairo_restore (cr);
 		g_return_if_reached ();
 	}
 
 	g_object_unref (layout);
-	cairo_restore (cr);
+	gtk_style_context_restore (context);
 }
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index c3b2de89c7..e6d2aaba1d 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -32,11 +32,9 @@ G_BEGIN_DECLS
 
 gdouble		e_table_header_compute_height	(ETableCol *ecol,
 						 GtkWidget *widget);
-gdouble		e_table_header_width_extras	(GtkStyle *style);
+gdouble		e_table_header_width_extras	(GtkWidget *widget);
 void		e_table_header_draw_button	(cairo_t *cr,
 						 ETableCol *ecol,
-						 GtkStyle *style,
-						 GtkStateType state,
 						 GtkWidget *widget,
 						 gint x,
 						 gint y,
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index 007803585e..a534f22f07 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -40,7 +40,6 @@ e_table_state_to_header (GtkWidget *widget,
                          ETableState *state)
 {
 	ETableHeader *nh;
-	GtkStyle *style;
 	const gint max_cols = e_table_header_count (full_header);
 	gint column;
 	GValue *val = g_new0 (GValue, 1);
@@ -49,11 +48,9 @@ e_table_state_to_header (GtkWidget *widget,
 	g_return_val_if_fail (full_header, NULL);
 	g_return_val_if_fail (state, NULL);
 
-	style = gtk_widget_get_style (widget);
-
 	nh = e_table_header_new ();
 	g_value_init (val, G_TYPE_DOUBLE);
-	g_value_set_double (val, e_table_header_width_extras (style));
+	g_value_set_double (val, e_table_header_width_extras (widget));
 	g_object_set_property (G_OBJECT(nh), "width_extras", val);
 	g_free (val);
 
-- 
cgit v1.2.3


From 4674fb54872a093b9e116de91e7122c42be735fa Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimoc@gnome.org>
Date: Fri, 30 Sep 2011 11:48:06 -0400
Subject: ETableHeader: Nuke unused code.

---
 widgets/table/e-table-header-utils.c | 149 +----------------------------------
 1 file changed, 2 insertions(+), 147 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index 431009016f..0150ff02a6 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -35,31 +35,6 @@
 #include "e-table-defines.h"
 #include "e-table-header-utils.h"
 
-static PangoLayout *
-build_header_layout (GtkWidget *widget,
-                     const gchar *str)
-{
-	PangoLayout *layout;
-
-	layout = gtk_widget_create_pango_layout (widget, str);
-
-#ifdef FROB_FONT_DESC
-	{
-		PangoFontDescription *desc;
-		desc = pango_font_description_copy (gtk_widget_get_style (widget)->font_desc);
-		pango_font_description_set_size (desc,
-						 pango_font_description_get_size (desc) * 1.2);
-
-		pango_font_description_set_weight (desc, PANGO_WEIGHT_BOLD);
-		pango_layout_set_font_description (layout, desc);
-
-		pango_font_description_free (desc);
-	}
-#endif
-
-	return layout;
-}
-
 static void
 get_button_padding (GtkWidget *widget,
                     GtkBorder *padding)
@@ -100,7 +75,7 @@ e_table_header_compute_height (ETableCol *ecol,
 
 	get_button_padding (widget, &padding);
 
-	layout = build_header_layout (widget, ecol->text);
+	layout = gtk_widget_create_pango_layout (widget, ecol->text);
 
 	pango_layout_get_pixel_size (layout, NULL, &height);
 
@@ -126,126 +101,6 @@ e_table_header_width_extras (GtkWidget *widget)
 	return padding.left + padding.right + 2 * HEADER_PADDING;
 }
 
-/* Creates a pixmap that is a composite of a background color and the upper-left
- * corner rectangle of a pixbuf.
- */
-#if 0
-static GdkPixmap *
-make_composite_pixmap (GdkDrawable *drawable,
-                       GdkGC *gc,
-                       GdkPixbuf *pixbuf,
-                       GdkColor *bg,
-                       gint width,
-                       gint height,
-                       gint dither_xofs,
-                       gint dither_yofs)
-{
-	gint pwidth, pheight;
-	GdkPixmap *pixmap;
-	GdkPixbuf *tmp;
-	gint color;
-
-	pwidth = gdk_pixbuf_get_width (pixbuf);
-	pheight = gdk_pixbuf_get_height (pixbuf);
-	g_return_val_if_fail (width <= pwidth && height <= pheight, NULL);
-
-	color = ((bg->red & 0xff00) << 8) |
-		(bg->green & 0xff00) |
-		((bg->blue & 0xff00) >> 8);
-
-	if (width >= pwidth && height >= pheight) {
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp)
-			return NULL;
-
-		gdk_pixbuf_composite_color (pixbuf, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-	} else {
-		gint x, y, rowstride;
-		GdkPixbuf *fade;
-		guchar *pixels;
-
-		/* Do a nice fade of the pixbuf down and to the right */
-
-		fade = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
-		if (!fade)
-			return NULL;
-
-		gdk_pixbuf_copy_area (pixbuf,
-				      0, 0,
-				      width, height,
-				      fade,
-				      0, 0);
-
-		rowstride = gdk_pixbuf_get_rowstride (fade);
-		pixels = gdk_pixbuf_get_pixels (fade);
-
-		for (y = 0; y < height; y++) {
-			guchar *p;
-			gint yfactor;
-
-			p = pixels + y * rowstride;
-
-			if (height < pheight)
-				yfactor = height - y;
-			else
-				yfactor = height;
-
-			for (x = 0; x < width; x++) {
-				gint xfactor;
-
-				if (width < pwidth)
-					xfactor = width - x;
-				else
-					xfactor = width;
-
-				p[3] = ((gint) p[3] * xfactor * yfactor / (width * height));
-				p += 4;
-			}
-		}
-
-		tmp = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
-		if (!tmp) {
-			g_object_unref (fade);
-			return NULL;
-		}
-
-		gdk_pixbuf_composite_color (fade, tmp,
-					    0, 0,
-					    width, height,
-					    0, 0,
-					    1.0, 1.0,
-					    GDK_INTERP_NEAREST,
-					    255,
-					    0, 0,
-					    16,
-					    color, color);
-
-		g_object_unref (fade);
-	}
-
-	pixmap = gdk_pixmap_new (drawable, width, height, -1);
-	gdk_draw_rgb_image_dithalign (pixmap, gc,
-				      0, 0,
-				      width, height,
-				      GDK_RGB_DITHER_NORMAL,
-				      gdk_pixbuf_get_pixels (tmp),
-				      gdk_pixbuf_get_rowstride (tmp),
-				      dither_xofs, dither_yofs);
-	g_object_unref (tmp);
-
-	return pixmap;
-}
-#endif
-
 /**
  * e_table_header_draw_button:
  * @drawable: Destination drawable.
@@ -340,7 +195,7 @@ e_table_header_draw_button (cairo_t *cr,
 		return; /* nothing else fits */
 	}
 
-	layout = build_header_layout (widget, ecol->text);
+	layout = gtk_widget_create_pango_layout (widget, ecol->text);
 	pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
 
 	/* Pixbuf or label */
-- 
cgit v1.2.3


From d58d259aa0cfb513ea165cedd558561890656d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Vr=C3=A1til?= <dvratil@redhat.com>
Date: Sat, 1 Oct 2011 01:02:13 +0200
Subject: Fix two little memory leaks

---
 widgets/table/e-tree.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'widgets/table')

diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 41818652bd..effd1e9aa6 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -472,6 +472,11 @@ et_dispose (GObject *object)
 		priv->table_canvas = NULL;
 	}
 
+	if (priv->item != NULL) {
+		g_object_unref (G_OBJECT (priv->item));
+		priv->item = NULL;
+	}
+
 	/* Chain up to parent's dispose() method. */
 	G_OBJECT_CLASS (e_tree_parent_class)->dispose (object);
 }
-- 
cgit v1.2.3


From 1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Tue, 4 Oct 2011 21:32:41 -0400
Subject: Simplify library dependency flags.

We have a confusing array of nearly-identical CFLAGS/LIBS definitions in
configure.ac.  Time to simplify.  Instead let's just have one definition
that includes all the libraries provided by Evolution-Data-Server (incl.
Camel).  That, in combination with GNOME_PLATFORM, gives us most of what
we need for compliation and linking, and we can sprinkle definitions for
additional library dependencies in Makefile.am's as needed.
---
 widgets/table/Makefile.am | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'widgets/table')

diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am
index 0ae1e2b7e9..36af5ec2bf 100644
--- a/widgets/table/Makefile.am
+++ b/widgets/table/Makefile.am
@@ -7,11 +7,10 @@ libetable_la_CPPFLAGS =				\
 	$(AM_CPPFLAGS)				\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/widgets			\
-	$(E_UTIL_CFLAGS)			\
-	$(E_WIDGETS_CFLAGS)			\
+	$(EVOLUTION_DATA_SERVER_CFLAGS)		\
 	$(GNOME_PLATFORM_CFLAGS)		\
-	-DEVOLUTION_UIDIR=\"$(uidir)\"	\
-        -DG_LOG_DOMAIN=\"e-table\"
+	-DEVOLUTION_UIDIR=\"$(uidir)\"		\
+	-DG_LOG_DOMAIN=\"e-table\"
 
 libetable_la_SOURCES = 				\
 	e-cell.c				\
@@ -173,10 +172,9 @@ libetable_la_LIBADD =						\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/widgets/text/libetext.la		\
 	$(top_builddir)/libgnomecanvas/libgnomecanvas.la	\
-	$(E_UTIL_LIBS)						\
-	$(E_WIDGETS_LIBS)					\
-	$(MATH_LIB)						\
-	$(GNOME_PLATFORM_LIBS)
+	$(EVOLUTION_DATA_SERVER_LIBS)				\
+	$(GNOME_PLATFORM_LIBS)					\
+	$(MATH_LIB)
 
 icons = 			\
 	arrow-down.xpm		\
-- 
cgit v1.2.3