Coding style and whitespace cleanup.

29 files changed, 148 insertions, 148 deletions

diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 20a19165be..422f9da815 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -388,7 +388,7 @@ e_cell_combo_show_popup (ECellCombo *ecc,
 	gtk_widget_show (ecc->popup_window);
 
 	e_cell_popup_set_shown (E_CELL_POPUP (ecc), TRUE);
-	d(g_print("%s: popup_shown = TRUE\n", __FUNCTION__));
+	d (g_print ("%s: popup_shown = TRUE\n", __FUNCTION__));
 }
 
 /* Calculates the size and position of the popup window (like GtkCombo). */
@@ -603,7 +603,7 @@ e_cell_combo_button_press (GtkWidget *popup_window,
 	gtk_widget_hide (ecc->popup_window);
 
 	e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
-	d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
+	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
@@ -644,7 +644,7 @@ e_cell_combo_button_release (GtkWidget *popup_window,
 	gtk_widget_hide (ecc->popup_window);
 
 	e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
-	d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
+	d (g_print ("%s: popup_shown = FALSE\n", __FUNCTION__));
 
 	e_cell_combo_update_cell (ecc);
 	e_cell_combo_restart_edit (ecc);
@@ -677,7 +677,7 @@ e_cell_combo_key_press (GtkWidget *popup_window,
 	gtk_widget_hide (ecc->popup_window);
 
 	e_cell_popup_set_shown (E_CELL_POPUP (ecc), FALSE);
-	d(g_print("%s: popup_shown = FALSE\n", __FUNCTION__));
+	d (g_print ("%s: popup_shown = FALSE\n", __FUNCTION__));
 
 	if (event->keyval != GDK_KEY_Escape)
 		e_cell_combo_update_cell (ecc);
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index 98bbf897cd..6bca769174 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -166,7 +166,7 @@ ecv_draw (ECellView *ecell_view,
 			/* 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])
 			width = hbox_view->def_size_cols[i];
-		printf("width of %d %d of %d\n", width,hbox_view->def_size_cols[i], allotted_width ); */
+		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], cr,
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index b330a95a96..8f01847d7c 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -47,7 +47,7 @@ ecd_get_text (ECellText *cell,
 	} else {
 		fsize = ((gfloat) size) / 1024.0;
 		if (fsize < 1024.0) {
-			return g_strdup_printf ("%d K", (gint)fsize);
+			return g_strdup_printf ("%d K", (gint) fsize);
 		} else {
 			fsize /= 1024.0;
 			return g_strdup_printf ("%.1f MB", fsize);
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 54998bc8b9..6e28c8b7b2 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -950,7 +950,7 @@ ect_event (ECellView *ecell_view,
 	case GDK_BUTTON_PRESS: /* Fall Through */
 		d (press = TRUE);
 	case GDK_BUTTON_RELEASE:
-		d(g_print ("%s: %s\n", __FUNCTION__, press ? "GDK_BUTTON_PRESS" : "GDK_BUTTON_RELEASE"));
+		d (g_print ("%s: %s\n", __FUNCTION__, press ? "GDK_BUTTON_PRESS" : "GDK_BUTTON_RELEASE"));
 		event->button.x -= 4;
 		event->button.y -= 1;
 		if ((!edit_display)
diff --git a/widgets/table/e-popup-menu.c b/widgets/table/e-popup-menu.c
index faffd9d1a0..3e82496748 100644
--- a/widgets/table/e-popup-menu.c
+++ b/widgets/table/e-popup-menu.c
@@ -70,7 +70,7 @@ e_popup_menu_create_with_domain (EPopupMenu *menu_list,
 	gint i;
 
 	for (i = 0; menu_list[i].name; i++) {
-		if (strcmp ("", menu_list[i].name) && !(menu_list [i].disable_mask & hide_mask)) {
+		if (strcmp ("", menu_list[i].name) && !(menu_list[i].disable_mask & hide_mask)) {
 			last_non_separator = i;
 		}
 	}
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index a242d95bfa..033b693073 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -80,7 +80,7 @@ etcs_init (ETableColumnSpecification *specification)
 {
 	specification->model_col     = 0;
 	specification->compare_col   = 0;
-	specification->title         = g_strdup("");
+	specification->title         = g_strdup ("");
 	specification->pixbuf        = NULL;
 
 	specification->expansion     = 0;
@@ -123,7 +123,7 @@ e_table_column_specification_load_from_node (ETableColumnSpecification *etcs,
 	etcs->priority      = e_xml_get_integer_prop_by_name_with_default (node, (const guchar *)"priority", 0);
 
 	if (etcs->title == NULL)
-		etcs->title = g_strdup("");
+		etcs->title = g_strdup ("");
 }
 
 xmlNode *
@@ -132,24 +132,24 @@ e_table_column_specification_save_to_node (ETableColumnSpecification *specificat
 {
 	xmlNode *node;
 	if (parent)
-		node = xmlNewChild(parent, NULL, (const guchar *)"ETableColumn", NULL);
+		node = xmlNewChild (parent, NULL, (const guchar *)"ETableColumn", NULL);
 	else
-		node = xmlNewNode(NULL, (const guchar *)"ETableColumn");
+		node = xmlNewNode (NULL, (const guchar *)"ETableColumn");
 
-	e_xml_set_integer_prop_by_name(node, (const guchar *)"model_col", specification->model_col);
+	e_xml_set_integer_prop_by_name (node, (const guchar *)"model_col", specification->model_col);
 	if (specification->compare_col != specification->model_col)
-		e_xml_set_integer_prop_by_name(node, (const guchar *)"compare_col", specification->compare_col);
-	e_xml_set_string_prop_by_name(node, (const guchar *)"_title", specification->title);
-	e_xml_set_string_prop_by_name(node, (const guchar *)"pixbuf", specification->pixbuf);
-
-	e_xml_set_double_prop_by_name(node, (const guchar *)"expansion", specification->expansion);
-	e_xml_set_integer_prop_by_name(node, (const guchar *)"minimum_width", specification->minimum_width);
-	e_xml_set_bool_prop_by_name(node, (const guchar *)"resizable", specification->resizable);
-	e_xml_set_bool_prop_by_name(node, (const guchar *)"disabled", specification->disabled);
-
-	e_xml_set_string_prop_by_name(node, (const guchar *)"cell", specification->cell);
-	e_xml_set_string_prop_by_name(node, (const guchar *)"compare", specification->compare);
-	e_xml_set_string_prop_by_name(node, (const guchar *)"search", specification->search);
+		e_xml_set_integer_prop_by_name (node, (const guchar *)"compare_col", specification->compare_col);
+	e_xml_set_string_prop_by_name (node, (const guchar *)"_title", specification->title);
+	e_xml_set_string_prop_by_name (node, (const guchar *)"pixbuf", specification->pixbuf);
+
+	e_xml_set_double_prop_by_name (node, (const guchar *)"expansion", specification->expansion);
+	e_xml_set_integer_prop_by_name (node, (const guchar *)"minimum_width", specification->minimum_width);
+	e_xml_set_bool_prop_by_name (node, (const guchar *)"resizable", specification->resizable);
+	e_xml_set_bool_prop_by_name (node, (const guchar *)"disabled", specification->disabled);
+
+	e_xml_set_string_prop_by_name (node, (const guchar *)"cell", specification->cell);
+	e_xml_set_string_prop_by_name (node, (const guchar *)"compare", specification->compare);
+	e_xml_set_string_prop_by_name (node, (const guchar *)"search", specification->search);
 	if (specification->priority != 0)
 		e_xml_set_integer_prop_by_name (node, (const guchar *)"priority", specification->priority);
 
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 728616db3b..3547bb3169 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -879,13 +879,13 @@ configure_sort_dialog (ETableConfig *config,
 
 		snprintf (
 			buffer, sizeof (buffer),
-			"radiobutton-ascending-sort-%d", i+1);
+			"radiobutton-ascending-sort-%d", i + 1);
 		config->sort[i].radio_ascending = e_builder_get_widget (
 			builder, buffer);
 
 		snprintf (
 			buffer, sizeof (buffer),
-			"radiobutton-descending-sort-%d", i+1);
+			"radiobutton-descending-sort-%d", i + 1);
 		config->sort[i].radio_descending = e_builder_get_widget (
 			builder, buffer);
 
@@ -999,19 +999,19 @@ configure_group_dialog (ETableConfig *config,
 
 		snprintf (
 			buffer, sizeof (buffer),
-			"radiobutton-ascending-group-%d", i+1);
+			"radiobutton-ascending-group-%d", i + 1);
 		config->group[i].radio_ascending = e_builder_get_widget (
 			builder, buffer);
 
 		snprintf (
 			buffer, sizeof (buffer),
-			"radiobutton-descending-group-%d", i+1);
+			"radiobutton-descending-group-%d", i + 1);
 		config->group[i].radio_descending = e_builder_get_widget (
 			builder, buffer);
 
 		snprintf (
 			buffer, sizeof (buffer),
-			"checkbutton-group-%d", i+1);
+			"checkbutton-group-%d", i + 1);
 		config->group[i].view_check = e_builder_get_widget (
 			builder, buffer);
 
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 5b99c3a79f..6e69ccd6ad 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -199,7 +199,7 @@ e_table_field_chooser_dialog_init (ETableFieldChooserDialog *e_table_field_choos
 	dialog = GTK_DIALOG (e_table_field_chooser_dialog);
 
 	e_table_field_chooser_dialog->etfc = NULL;
-	e_table_field_chooser_dialog->dnd_code = g_strdup("");
+	e_table_field_chooser_dialog->dnd_code = g_strdup ("");
 	e_table_field_chooser_dialog->full_header = NULL;
 	e_table_field_chooser_dialog->header = NULL;
 
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 25e1f3f34f..32d2904bb9 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -424,7 +424,7 @@ etfci_drag_data_get (GtkWidget *widget,
                      ETableFieldChooserItem *etfci)
 {
 	if (etfci->drag_col != -1) {
-		gchar *string = g_strdup_printf("%d", etfci->drag_col);
+		gchar *string = g_strdup_printf ("%d", etfci->drag_col);
 		gtk_selection_data_set (selection_data,
 				       GDK_SELECTION_TYPE_STRING,
 				       sizeof (string[0]),
@@ -590,7 +590,7 @@ etfci_start_drag (ETableFieldChooserItem *etfci,
 
 	etfci_drag_types[0].target = g_strdup_printf (
 		"%s-%s", etfci_drag_types[0].target, etfci->dnd_code);
-	d(g_print ("etfci - %s\n", etfci_drag_types[0].target));
+	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 ((gpointer) etfci_drag_types[0].target);
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 937a3cce26..9841b99d99 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -357,7 +357,7 @@ compute_text (ETableGroupContainer *etgc,
 		 * 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)",
+		text = g_strdup_printf (ngettext ("%s: %s (%d item)",
 						 "%s: %s (%d items)",
 						 child_node->count),
 					etgc->ecol->text, child_node->string,
@@ -369,7 +369,7 @@ compute_text (ETableGroupContainer *etgc,
 		 * The %d is replaced with count of items in this group.
 		 * Example: "Smith (13 items)"
 		*/
-		text = g_strdup_printf (ngettext("%s (%d item)",
+		text = g_strdup_printf (ngettext ("%s (%d item)",
 						 "%s (%d items)",
 						 child_node->count),
 					child_node->string,
@@ -1387,7 +1387,7 @@ static gboolean
 e_table_group_container_data_left (EPrintable *ep,
                                      ETGCPrintContext *groupcontext)
 {
-	g_signal_stop_emission_by_name(ep, "data_left");
+	g_signal_stop_emission_by_name (ep, "data_left");
 	return groupcontext->child != NULL;
 }
 
@@ -1423,7 +1423,7 @@ e_table_group_container_height (EPrintable *ep,
 		g_object_ref (child_printable);
 	else {
 		if (!child) {
-			g_signal_stop_emission_by_name(ep, "height");
+			g_signal_stop_emission_by_name (ep, "height");
 			return 0;
 		} else {
 			child_node = child->data;
@@ -1465,7 +1465,7 @@ e_table_group_container_height (EPrintable *ep,
 	}
 	if (child_printable)
 		g_object_unref (child_printable);
-	g_signal_stop_emission_by_name(ep, "height");
+	g_signal_stop_emission_by_name (ep, "height");
 	return height;
 }
 
@@ -1491,7 +1491,7 @@ e_table_group_container_will_fit (EPrintable *ep,
 		g_object_ref (child_printable);
 	else {
 		if (!child) {
-			g_signal_stop_emission_by_name(ep, "will_fit");
+			g_signal_stop_emission_by_name (ep, "will_fit");
 			return will_fit;
 		} else {
 			child_node = child->data;
@@ -1535,7 +1535,7 @@ e_table_group_container_will_fit (EPrintable *ep,
 	if (child_printable)
 		g_object_unref (child_printable);
 
-	g_signal_stop_emission_by_name(ep, "will_fit");
+	g_signal_stop_emission_by_name (ep, "will_fit");
 	return will_fit;
 }
 
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index 730a7b7160..fba38abfbb 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -283,7 +283,7 @@ etgl_realize (GnomeCanvasItem *item)
 	etgl->item = E_TABLE_ITEM (gnome_canvas_item_new (
 		GNOME_CANVAS_GROUP (etgl),
 		e_table_item_get_type (),
-		"ETableHeader", E_TABLE_GROUP(etgl)->header,
+		"ETableHeader", E_TABLE_GROUP (etgl)->header,
 		"ETableModel", etgl->ets,
 		"alternating_row_colors", etgl->alternating_row_colors,
 		"horizontal_draw_grid", etgl->horizontal_draw_grid,
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 8054a95a36..ef24716e33 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -398,12 +398,12 @@ ethi_find_col_by_x (ETableHeaderItem *ethi,
 	gint x1 = 0;
 	gint col;
 
-	d(g_print ("%s:%d: x = %d, x1 = %d\n", __FUNCTION__, __LINE__, x, x1));
+	d (g_print ("%s:%d: x = %d, x1 = %d\n", __FUNCTION__, __LINE__, x, x1));
 
 	x1 += ethi->group_indent_width;
 
 	if (x < x1) {
-		d(g_print ("%s:%d: Returning 0\n", __FUNCTION__, __LINE__));
+		d (g_print ("%s:%d: Returning 0\n", __FUNCTION__, __LINE__));
 		return 0;
 	}
 
@@ -411,13 +411,13 @@ ethi_find_col_by_x (ETableHeaderItem *ethi,
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, col);
 
 		if ((x >= x1) && (x <= x1 + ecol->width)) {
-			d(g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, col));
+			d (g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, col));
 			return col;
 		}
 
 		x1 += ecol->width;
 	}
-	d(g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, cols - 1));
+	d (g_print ("%s:%d: Returning %d\n", __FUNCTION__, __LINE__, cols - 1));
 	return cols - 1;
 }
 
@@ -594,7 +594,7 @@ do_drag_motion (ETableHeaderItem *ethi,
 	    (y >= 0) && (y <= (ethi->height))) {
 		GdkDragAction suggested_action;
 		gint col;
-		d(g_print("In header\n"));
+		d (g_print ("In header\n"));
 
 		col = ethi_find_col_by_x_nearest (ethi, x);
 		suggested_action = gdk_drag_context_get_suggested_action (context);
@@ -863,7 +863,7 @@ ethi_drag_data_get (GtkWidget *canvas,
 	if (ethi->drag_col != -1) {
 		ETableCol *ecol = e_table_header_get_column (ethi->eth, ethi->drag_col);
 
-		gchar *string = g_strdup_printf("%d", ecol->col_idx);
+		gchar *string = g_strdup_printf ("%d", ecol->col_idx);
 		gtk_selection_data_set (selection_data,
 				       GDK_SELECTION_TYPE_STRING,
 				       sizeof (string[0]),
@@ -896,7 +896,7 @@ ethi_drag_drop (GtkWidget *canvas,
 		if (col != -1) {
 			gchar *target = g_strdup_printf (
 				"%s-%s", TARGET_ETABLE_COL_TYPE, ethi->dnd_code);
-			d(g_print ("ethi -  %s\n", target));
+			d (g_print ("ethi -  %s\n", target));
 			gtk_drag_get_data (
 				canvas, context,
 				gdk_atom_intern (target, FALSE),
@@ -1675,7 +1675,7 @@ ethi_header_context_menu (ETableHeaderItem *ethi,
 	GtkWidget *menu_item, *sub_menu;
 	ETableSortColumn column;
 	gboolean ascending = TRUE;
-	d( g_print("ethi_header_context_menu: \n") );
+	d ( g_print ("ethi_header_context_menu: \n") );
 
 	info->ethi = ethi;
 	info->col = ethi_find_col_by_x (ethi, event->x);
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 616da4be80..b9e2cce10d 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -240,7 +240,7 @@ eti_grab (ETableItem *eti,
           guint32 time)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
-	d(g_print ("%s: time: %d\n", __FUNCTION__, time));
+	d (g_print ("%s: time: %d\n", __FUNCTION__, time));
 	if (eti->grabbed_count == 0) {
 		eti->gtk_grabbed = FALSE;
 		eti->grab_cancelled = FALSE;
@@ -251,7 +251,7 @@ eti_grab (ETableItem *eti,
 				       NULL, time,
 				       grab_cancelled,
 				       eti) != GDK_GRAB_SUCCESS) {
-			d(g_print ("%s: gtk_grab_add\n", __FUNCTION__));
+			d (g_print ("%s: gtk_grab_add\n", __FUNCTION__));
 			gtk_grab_add (GTK_WIDGET (item->canvas));
 			eti->gtk_grabbed = TRUE;
 		}
@@ -264,14 +264,14 @@ eti_ungrab (ETableItem *eti,
             guint32 time)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
-	d(g_print ("%s: time: %d\n", __FUNCTION__, time));
+	d (g_print ("%s: time: %d\n", __FUNCTION__, time));
 	eti->grabbed_count--;
 	if (eti->grabbed_count == 0) {
 		if (eti->grab_cancelled) {
 			eti->grab_cancelled = FALSE;
 		} else {
 			if (eti->gtk_grabbed) {
-				d(g_print ("%s: gtk_grab_remove\n", __FUNCTION__));
+				d (g_print ("%s: gtk_grab_remove\n", __FUNCTION__));
 				gtk_grab_remove (GTK_WIDGET (item->canvas));
 				eti->gtk_grabbed = FALSE;
 			}
@@ -285,7 +285,7 @@ eti_ungrab (ETableItem *eti,
 inline static gboolean
 eti_editing (ETableItem *eti)
 {
-	d(g_print("%s: %s\n", __FUNCTION__, (eti->editing_col == -1) ? "false":"true"));
+	d (g_print ("%s: %s\n", __FUNCTION__, (eti->editing_col == -1) ? "false":"true"));
 
 	if (eti->editing_col == -1)
 		return FALSE;
@@ -1012,7 +1012,7 @@ eti_show_cursor (ETableItem *eti,
 	cursor_row = e_selection_model_cursor_row (eti->selection);
 #endif
 
-	d(g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
+	d (g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
 
 	if (cursor_row != -1) {
 		cursor_row = model_to_view_row (eti, cursor_row);
@@ -1051,11 +1051,11 @@ eti_check_cursor_bounds (ETableItem *eti)
 		return;
 	}
 
-	d(g_print ("%s: model cursor row: %d\n", __FUNCTION__, cursor_row));
+	d (g_print ("%s: model cursor row: %d\n", __FUNCTION__, cursor_row));
 
 	cursor_row = model_to_view_row (eti, cursor_row);
 
-	d(g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
+	d (g_print ("%s: cursor row: %d\n", __FUNCTION__, cursor_row));
 
 	eti_get_region (eti,
 			0, cursor_row, eti->cols - 1, cursor_row,
@@ -1066,14 +1066,14 @@ eti_check_cursor_bounds (ETableItem *eti)
 	eti->cursor_y2 = y2;
 	eti->cursor_on_screen = e_canvas_item_area_shown (GNOME_CANVAS_ITEM (eti), x1, y1, x2, y2);
 
-	d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
+	d (g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
 }
 
 static void
 eti_maybe_show_cursor (ETableItem *eti,
                        gint delay)
 {
-	d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
+	d (g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
 	if (eti->cursor_on_screen)
 		eti_show_cursor (eti, delay);
 	eti_check_cursor_bounds (eti);
@@ -1097,7 +1097,7 @@ eti_idle_show_cursor_cb (gpointer data)
 static void
 eti_idle_maybe_show_cursor (ETableItem *eti)
 {
-	d(g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
+	d (g_print ("%s: cursor on screen: %s\n", __FUNCTION__, eti->cursor_on_screen ? "TRUE" : "FALSE"));
 	if (eti->cursor_on_screen) {
 		g_object_ref (eti);
 		if (!eti->cursor_idle_id)
@@ -1122,7 +1122,7 @@ static void
 eti_freeze (ETableItem *eti)
 {
 	eti->frozen_count++;
-	d(g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
+	d (g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
 }
 
 static void
@@ -1132,7 +1132,7 @@ eti_unfreeze (ETableItem *eti)
 		return;
 
 	eti->frozen_count--;
-	d(g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
+	d (g_print ("%s: %d\n", __FUNCTION__, eti->frozen_count));
 	if (eti->frozen_count == 0 && eti->queue_show_cursor) {
 		eti_show_cursor (eti, 0);
 		eti_check_cursor_bounds (eti);
@@ -1796,7 +1796,7 @@ eti_unrealize (GnomeCanvasItem *item)
 	ETableItem *eti = E_TABLE_ITEM (item);
 
 	if (eti->grabbed_count > 0) {
-		d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+		d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
 		eti_ungrab (eti, -1);
 	}
 
@@ -2272,14 +2272,14 @@ eti_e_cell_event (ETableItem *item,
 	ret_val = e_cell_event (ecell_view, event, model_col, view_col, row, flags, &actions);
 
 	if (actions & E_CELL_GRAB) {
-		d(g_print ("%s: eti_grab\n", __FUNCTION__));
+		d (g_print ("%s: eti_grab\n", __FUNCTION__));
 		eti_grab (item, time);
 		item->grabbed_col = view_col;
 		item->grabbed_row = row;
 	}
 
 	if (actions & E_CELL_UNGRAB) {
-		d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+		d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
 		eti_ungrab (item, time);
 		item->grabbed_col = -1;
 		item->grabbed_row = -1;
@@ -2313,7 +2313,7 @@ eti_event (GnomeCanvasItem *item,
 		gint new_cursor_row, new_cursor_col;
 		ECellFlags flags = 0;
 
-		d(g_print("%s: GDK_BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
+		d (g_print ("%s: GDK_BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
 
 		switch (e->button.button) {
 		case 1: /* Fall through. */
@@ -2402,7 +2402,7 @@ eti_event (GnomeCanvasItem *item,
 				eti->drag_y        = realy;
 				eti->drag_state    = e->button.state;
 				eti->grabbed       = TRUE;
-				d(g_print ("%s: eti_grab\n", __FUNCTION__));
+				d (g_print ("%s: eti_grab\n", __FUNCTION__));
 				eti_grab (eti, e->button.time);
 			}
 
@@ -2433,10 +2433,10 @@ eti_event (GnomeCanvasItem *item,
 		gint col, row;
 		gint cursor_row, cursor_col;
 
-		d(g_print("%s: GDK_BUTTON_RELEASE received, button %d\n", __FUNCTION__, e->button.button));
+		d (g_print ("%s: GDK_BUTTON_RELEASE received, button %d\n", __FUNCTION__, e->button.button));
 
 		if (eti->grabbed_count > 0) {
-			d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+			d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
 			eti_ungrab (eti, e->button.time);
 		}
 
@@ -2459,7 +2459,7 @@ eti_event (GnomeCanvasItem *item,
 #if d(!)0
 			{
 				gboolean cell_found = find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1);
-				g_print("%s: find_cell(%f, %f) = %s(%d, %d, %f, %f)\n", __FUNCTION__, e->button.x, e->button.y,
+				g_print ("%s: find_cell(%f, %f) = %s(%d, %d, %f, %f)\n", __FUNCTION__, e->button.x, e->button.y,
 					cell_found?"true":"false", col, row, x1, y1);
 			}
 #endif
@@ -2472,13 +2472,13 @@ eti_event (GnomeCanvasItem *item,
 				     "cursor_col", &cursor_col,
 				     NULL);
 
-			d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n"
+			d (g_print ("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n"
 				  "eti_editing: %s, row:%d:%d, col:%d:%d\n", __FUNCTION__, e->button.button, __LINE__,
-				  eti_editing(eti)?"true":"false", cursor_row, view_to_model_row(eti, row), cursor_col, view_to_model_col(eti, col)));
+				  eti_editing (eti)?"true":"false", cursor_row, view_to_model_row (eti, row), cursor_col, view_to_model_col (eti, col)));
 
 			if (eti_editing (eti) && cursor_row == view_to_model_row (eti, row) && cursor_col == view_to_model_col (eti, col)) {
 
-				d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n", __FUNCTION__, e->button.button, __LINE__))
+				d (g_print ("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n", __FUNCTION__, e->button.button, __LINE__))
 ;
 
 				ecell_view = eti->cell_views[col];
@@ -2511,7 +2511,7 @@ eti_event (GnomeCanvasItem *item,
 		gdouble x1, y1;
 #endif
 
-		d(g_print("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
+		d (g_print ("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
 
 		/*
 		 * click_count is so that if you click on two
@@ -2550,7 +2550,7 @@ eti_event (GnomeCanvasItem *item,
 			}
 
 			if (eti->grabbed_count > 0) {
-				d(g_print ("%s: eti_ungrab\n", __FUNCTION__));
+				d (g_print ("%s: eti_ungrab\n", __FUNCTION__));
 				eti_ungrab (eti, e->button.time);
 			}
 
@@ -2626,7 +2626,7 @@ eti_event (GnomeCanvasItem *item,
 		gint cursor_row, cursor_col;
 		gint handled = TRUE;
 
-		d(g_print("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
+		d (g_print ("%s: GDK_KEY_PRESS received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
 
 		g_object_get (eti->selection,
 			     "cursor_row", &cursor_row,
@@ -2827,7 +2827,7 @@ eti_event (GnomeCanvasItem *item,
 	case GDK_KEY_RELEASE: {
 		gint cursor_row, cursor_col;
 
-		d(g_print("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
+		d (g_print ("%s: GDK_KEY_RELEASE received, keyval: %d\n", __FUNCTION__, (gint) e->key.keyval));
 
 		g_object_get (eti->selection,
 			     "cursor_row", &cursor_row,
@@ -2849,7 +2849,7 @@ eti_event (GnomeCanvasItem *item,
 	case GDK_LEAVE_NOTIFY:
 		d (leave = TRUE);
 	case GDK_ENTER_NOTIFY:
-		d(g_print("%s: %s received\n", __FUNCTION__, leave ? "GDK_LEAVE_NOTIFY" : "GDK_ENTER_NOTIFY"));
+		d (g_print ("%s: %s received\n", __FUNCTION__, leave ? "GDK_LEAVE_NOTIFY" : "GDK_ENTER_NOTIFY"));
 		if (eti->motion_row != -1 && eti->motion_col != -1)
 			return_val = eti_e_cell_event (eti, eti->cell_views[eti->motion_col],
 						       e, e->crossing.time,
@@ -2861,7 +2861,7 @@ eti_event (GnomeCanvasItem *item,
 		break;
 
 	case GDK_FOCUS_CHANGE:
-		d(g_print("%s: GDK_FOCUS_CHANGE received, %s\n", __FUNCTION__, e->focus_change.in ? "in": "out"));
+		d (g_print ("%s: GDK_FOCUS_CHANGE received, %s\n", __FUNCTION__, e->focus_change.in ? "in": "out"));
 		if (e->focus_change.in) {
 			if (eti->save_row != -1 &&
 			    eti->save_col != -1 &&
@@ -3341,7 +3341,7 @@ e_table_item_enter_edit (ETableItem *eti,
 	g_return_if_fail (eti != NULL);
 	g_return_if_fail (E_IS_TABLE_ITEM (eti));
 
-	d(g_print("%s: %d, %d, eti_editing() = %s\n", __FUNCTION__, col, row, eti_editing(eti)?"true":"false"));
+	d (g_print ("%s: %d, %d, eti_editing() = %s\n", __FUNCTION__, col, row, eti_editing (eti)?"true":"false"));
 
 	if (eti_editing (eti))
 		e_table_item_leave_edit_(eti);
@@ -3367,7 +3367,7 @@ e_table_item_leave_edit (ETableItem *eti)
 	g_return_if_fail (eti != NULL);
 	g_return_if_fail (E_IS_TABLE_ITEM (eti));
 
-	d(g_print("%s: eti_editing() = %s\n", __FUNCTION__, eti_editing(eti)?"true":"false"));
+	d (g_print ("%s: eti_editing() = %s\n", __FUNCTION__, eti_editing (eti)?"true":"false"));
 
 	if (!eti_editing (eti))
 		return;
@@ -3641,7 +3641,7 @@ e_table_item_data_left (EPrintable *ep,
 	ETableItem *item = itemcontext->item;
 	gint rows_printed = itemcontext->rows_printed;
 
-	g_signal_stop_emission_by_name(ep, "data_left");
+	g_signal_stop_emission_by_name (ep, "data_left");
 	return rows_printed < item->rows;
 }
 
@@ -3698,7 +3698,7 @@ e_table_item_height (EPrintable *ep,
 	if (max_height != -1 && (!quantize) && yd > max_height)
 		yd = max_height;
 
-	g_signal_stop_emission_by_name(ep, "height");
+	g_signal_stop_emission_by_name (ep, "height");
 	return yd;
 }
 
@@ -3748,7 +3748,7 @@ e_table_item_will_fit (EPrintable *ep,
 
 	g_free (widths);
 
-	g_signal_stop_emission_by_name(ep, "will_fit");
+	g_signal_stop_emission_by_name (ep, "will_fit");
 	return ret_val;
 }
 
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 15b5286eb7..7c12496af9 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -30,7 +30,7 @@
 #include "e-table-model.h"
 
 #define ETM_FROZEN(e) \
-	(GPOINTER_TO_INT (g_object_get_data (G_OBJECT(e), "frozen")) != 0)
+	(GPOINTER_TO_INT (g_object_get_data (G_OBJECT (e), "frozen")) != 0)
 
 #define d(x)
 
@@ -443,7 +443,7 @@ print_tabs (void)
 {
 	gint i;
 	for (i = 0; i < depth; i++)
-		g_print("\t");
+		g_print ("\t");
 }
 #endif
 
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index ff38d94131..503b6a47a7 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -148,7 +148,7 @@ one_value_to_string (ETableModel *etm,
 	if (one->source)
 		return e_table_model_value_to_string (one->source, col, value);
 	else
-		return g_strdup("");
+		return g_strdup ("");
 }
 
 static void
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index c85731bc36..4740c0fb50 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -372,14 +372,14 @@ e_table_sort_info_load_from_node (ETableSortInfo *info,
 
 	if (state_version <= 0.05) {
 		i = 0;
-		for (grouping = node->xmlChildrenNode; grouping && !strcmp ((gchar *)grouping->name, "group"); grouping = grouping->xmlChildrenNode) {
+		for (grouping = node->xmlChildrenNode; grouping && !strcmp ((gchar *) grouping->name, "group"); grouping = grouping->xmlChildrenNode) {
 			ETableSortColumn column;
 			column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
 			column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
 			e_table_sort_info_grouping_set_nth (info, i++, column);
 		}
 		i = 0;
-		for (; grouping && !strcmp ((gchar *)grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) {
+		for (; grouping && !strcmp ((gchar *) grouping->name, "leaf"); grouping = grouping->xmlChildrenNode) {
 			ETableSortColumn column;
 			column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
 			column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
@@ -394,11 +394,11 @@ e_table_sort_info_load_from_node (ETableSortInfo *info,
 			if (grouping->type != XML_ELEMENT_NODE)
 				continue;
 
-			if (!strcmp ((gchar *)grouping->name, "group")) {
+			if (!strcmp ((gchar *) grouping->name, "group")) {
 				column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
 				column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
 				e_table_sort_info_grouping_set_nth (info, gcnt++, column);
-			} else if (!strcmp ((gchar *)grouping->name, "leaf")) {
+			} else if (!strcmp ((gchar *) grouping->name, "leaf")) {
 				column.column = e_xml_get_integer_prop_by_name (grouping, (const guchar *)"column");
 				column.ascending = e_xml_get_bool_prop_by_name (grouping, (const guchar *)"ascending");
 				e_table_sort_info_sorting_set_nth (info, scnt++, column);
@@ -431,7 +431,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info,
 
 	for (i = 0; i < group_count; i++) {
 		ETableSortColumn column = e_table_sort_info_grouping_get_nth (info, i);
-		xmlNode *new_node = xmlNewChild(grouping, NULL, (const guchar *)"group", NULL);
+		xmlNode *new_node = xmlNewChild (grouping, NULL, (const guchar *)"group", NULL);
 
 		e_xml_set_integer_prop_by_name (new_node, (const guchar *)"column", column.column);
 		e_xml_set_bool_prop_by_name (new_node, (const guchar *)"ascending", column.ascending);
@@ -439,7 +439,7 @@ e_table_sort_info_save_to_node (ETableSortInfo *info,
 
 	for (i = 0; i < sort_count; i++) {
 		ETableSortColumn column = e_table_sort_info_sorting_get_nth (info, i);
-		xmlNode *new_node = xmlNewChild(grouping, NULL, (const guchar *)"leaf", NULL);
+		xmlNode *new_node = xmlNewChild (grouping, NULL, (const guchar *)"leaf", NULL);
 
 		e_xml_set_integer_prop_by_name (new_node, (const guchar *)"column", column.column);
 		e_xml_set_bool_prop_by_name (new_node, (const guchar *)"ascending", column.ascending);
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index fe5f644dbf..022e4e9582 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -261,7 +261,7 @@ ets_proxy_model_rows_inserted (ETableSubset *etss,
 			e_table_model_row_inserted (etm, i);
 		}
 
-		d(g_print("inserted row %d", row));
+		d (g_print ("inserted row %d", row));
 		row++;
 	}
 	if (full_change)
@@ -307,7 +307,7 @@ ets_proxy_model_rows_deleted (ETableSubset *etss,
 		e_table_model_no_change (etm);
 	}
 
-	d(g_print("deleted row %d count %d", row, count));
+	d (g_print ("deleted row %d count %d", row, count));
 	d (e_table_subset_print_debugging (etss));
 }
 
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 7dc50c4782..022c27a3a1 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -294,7 +294,7 @@ static void
 ets_sort_info_changed (ETableSortInfo *info,
                        ETableSorter *ets)
 {
-	d(g_print ("sort info changed\n"));
+	d (g_print ("sort info changed\n"));
 	ets_clean (ets);
 }
 
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index 5cc0f34652..e5f5b17757 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -193,8 +193,8 @@ e_table_specification_load_from_node (ETableSpecification *specification,
 	specification->alternating_row_colors = e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"alternating-row-colors", TRUE);
 	specification->horizontal_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"horizontal-draw-grid");
 	specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"vertical-draw-grid");
-	if (e_xml_get_bool_prop_by_name_with_default(node, (const guchar *)"draw-grid", TRUE) ==
-	    e_xml_get_bool_prop_by_name_with_default(node, (const guchar *)"draw-grid", FALSE)) {
+	if (e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-grid", TRUE) ==
+	    e_xml_get_bool_prop_by_name_with_default (node, (const guchar *)"draw-grid", FALSE)) {
 		specification->horizontal_draw_grid =
 			specification->vertical_draw_grid = e_xml_get_bool_prop_by_name (node, (const guchar *)"draw-grid");
 	}
@@ -249,12 +249,12 @@ e_table_specification_load_from_node (ETableSpecification *specification,
 	specification->columns = NULL;
 
 	for (children = node->xmlChildrenNode; children; children = children->next) {
-		if (!strcmp ((gchar *)children->name, "ETableColumn")) {
+		if (!strcmp ((gchar *) children->name, "ETableColumn")) {
 			ETableColumnSpecification *col_spec = e_table_column_specification_new ();
 
 			e_table_column_specification_load_from_node (col_spec, children);
 			list = g_list_append (list, col_spec);
-		} else if (specification->state == NULL && !strcmp ((gchar *)children->name, "ETableState")) {
+		} else if (specification->state == NULL && !strcmp ((gchar *) children->name, "ETableState")) {
 			specification->state = e_table_state_new ();
 			e_table_state_load_from_node (specification->state, children);
 			e_table_sort_info_set_can_group (specification->state->sort_info, specification->allow_grouping);
@@ -381,15 +381,15 @@ e_table_specification_save_to_node (ETableSpecification *specification,
 	case GTK_SELECTION_MULTIPLE:
 		s = "extended";
 	}
-	xmlSetProp (node, (const guchar *)"selection-mode", (guchar *)s);
+	xmlSetProp (node, (const guchar *)"selection-mode", (guchar *) s);
 	if (specification->cursor_mode == E_CURSOR_LINE)
 		s = "line";
 	else
 		s = "cell";
-	xmlSetProp (node, (const guchar *)"cursor-mode", (guchar *)s);
+	xmlSetProp (node, (const guchar *)"cursor-mode", (guchar *) s);
 
-	xmlSetProp (node, (const guchar *)"_click-to-add-message", (guchar *)specification->click_to_add_message);
-	xmlSetProp (node, (const guchar *)"gettext-domain", (guchar *)specification->domain);
+	xmlSetProp (node, (const guchar *)"_click-to-add-message", (guchar *) specification->click_to_add_message);
+	xmlSetProp (node, (const guchar *)"gettext-domain", (guchar *) specification->domain);
 
 	if (specification->columns) {
 		gint i;
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index cfc8661388..61c0e5ced5 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -180,7 +180,7 @@ e_table_state_load_from_node (ETableState *state,
 	state->sort_info = NULL;
 	children = node->xmlChildrenNode;
 	for (; children; children = children->next) {
-		if (!strcmp ((gchar *)children->name, "column")) {
+		if (!strcmp ((gchar *) children->name, "column")) {
 			int_and_double *column_info = g_new (int_and_double, 1);
 
 			column_info->column = e_xml_get_integer_prop_by_name (
@@ -191,7 +191,7 @@ e_table_state_load_from_node (ETableState *state,
 
 			list = g_list_append (list, column_info);
 		} else if (state->sort_info == NULL &&
-			   !strcmp ((gchar *)children->name, "grouping")) {
+			   !strcmp ((gchar *) children->name, "grouping")) {
 			state->sort_info = e_table_sort_info_new ();
 			e_table_sort_info_load_from_node (
 				state->sort_info, children, state_version);
@@ -244,7 +244,7 @@ e_table_state_save_to_string (ETableState *state)
 
 	g_return_val_if_fail (E_IS_TABLE_STATE (state), NULL);
 
-	doc = xmlNewDoc((const guchar *)"1.0");
+	doc = xmlNewDoc ((const guchar *)"1.0");
 	xmlDocSetRootElement (doc, e_table_state_save_to_node (state, NULL));
 	xmlDocDumpMemory (doc, &string, &length);
 	xmlFreeDoc (doc);
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index 0d5cd1ae63..ae4e891ac9 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -84,7 +84,7 @@ etss_get_view_row (ETableSubset *etss,
 
 	for (i = initial; i < end; i++) {
 		if (map_table[i] == row) {
-			d(g_print("a) Found %d from %d\n", i, etss->last_access));
+			d (g_print ("a) Found %d from %d\n", i, etss->last_access));
 			etss->last_access = i;
 			return i;
 		}
@@ -92,7 +92,7 @@ etss_get_view_row (ETableSubset *etss,
 
 	for (i = initial - 1; i >= start; i--) {
 		if (map_table[i] == row) {
-			d(g_print("b) Found %d from %d\n", i, etss->last_access));
+			d (g_print ("b) Found %d from %d\n", i, etss->last_access));
 			etss->last_access = i;
 			return i;
 		}
@@ -100,7 +100,7 @@ etss_get_view_row (ETableSubset *etss,
 
 	for (i = 0; i < n; i++) {
 		if (map_table[i] == row) {
-			d(g_print("c) Found %d from %d\n", i, etss->last_access));
+			d (g_print ("c) Found %d from %d\n", i, etss->last_access));
 			etss->last_access = i;
 			return i;
 		}
@@ -179,7 +179,7 @@ etss_value_at (ETableModel *etm,
 	g_return_val_if_fail (VALID_ROW (etss, row), NULL);
 
 	etss->last_access = row;
-	d(g_print("g) Setting last_access to %d\n", row));
+	d (g_print ("g) Setting last_access to %d\n", row));
 	return e_table_model_value_at (etss->source, col, MAP_ROW (etss, row));
 }
 
@@ -194,7 +194,7 @@ etss_set_value_at (ETableModel *etm,
 	g_return_if_fail (VALID_ROW (etss, row));
 
 	etss->last_access = row;
-	d(g_print("h) Setting last_access to %d\n", row));
+	d (g_print ("h) Setting last_access to %d\n", row));
 	e_table_model_set_value_at (etss->source, col, MAP_ROW (etss, row), val);
 }
 
@@ -227,7 +227,7 @@ etss_get_save_id (ETableModel *etm,
 	if (e_table_model_has_save_id (etss->source))
 		return e_table_model_get_save_id (etss->source, MAP_ROW (etss, row));
 	else
-		return g_strdup_printf ("%d", MAP_ROW(etss, row));
+		return g_strdup_printf ("%d", MAP_ROW (etss, row));
 }
 
 static void
@@ -557,6 +557,6 @@ e_table_subset_print_debugging (ETableSubset *table_model)
 {
 	gint i;
 	for (i = 0; i < table_model->n_map; i++) {
-		g_print("%8d\n", table_model->map_table[i]);
+		g_print ("%8d\n", table_model->map_table[i]);
 	}
 }
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index da886295b6..8b10837b3f 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -51,7 +51,7 @@ e_table_state_to_header (GtkWidget *widget,
 	nh = e_table_header_new ();
 	g_value_init (val, G_TYPE_DOUBLE);
 	g_value_set_double (val, e_table_header_width_extras (widget));
-	g_object_set_property (G_OBJECT(nh), "width_extras", val);
+	g_object_set_property (G_OBJECT (nh), "width_extras", val);
 	g_free (val);
 
 	for (column = 0; column < state->col_count; column++) {
@@ -128,7 +128,7 @@ et_col_spec_to_col (ETableColumnSpecification *col_spec,
 		}
 
 		col->search = search;
-		if (col_spec->sortable && !strcmp(col_spec->sortable, "false"))
+		if (col_spec->sortable && !strcmp (col_spec->sortable, "false"))
 			col->sortable = FALSE;
 		else
 			col->sortable = TRUE;
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index aab26439af..a555353193 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -720,7 +720,7 @@ e_table_setup_header (ETable *e_table)
 
 	gtk_widget_show (GTK_WIDGET (e_table->header_canvas));
 
-	pointer = g_strdup_printf("%p", (gpointer) e_table);
+	pointer = g_strdup_printf ("%p", (gpointer) e_table);
 
 	e_table->header_item = gnome_canvas_item_new (
 		gnome_canvas_root (e_table->header_canvas),
@@ -1787,7 +1787,7 @@ et_real_construct (ETable *e_table,
 		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_object_set_property (G_OBJECT (e_table->header), "sort_info", val);
 	g_free (val);
 
 	e_table->sorter = e_table_sorter_new (
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 3ba402d1f7..9280f3c302 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -962,12 +962,12 @@ e_tree_model_value_to_string (ETreeModel *etree,
                               gint col,
                               gconstpointer value)
 {
-	g_return_val_if_fail(etree != NULL, g_strdup(""));
+	g_return_val_if_fail (etree != NULL, g_strdup (""));
 
 	if (ETM_CLASS (etree)->value_to_string)
 		return ETM_CLASS (etree)->value_to_string (etree, col, value);
 	else
-		return g_strdup("");
+		return g_strdup ("");
 }
 
 /**
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index ecc278b0bb..e88deb469b 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -180,7 +180,7 @@ check_last_access (ETreeSorted *ets,
 		return NULL;
 
 	if (ets->priv->last_access == corresponding) {
-		d(g_print("Found last access %p at %p.", ets->priv->last_access, ets->priv->last_access));
+		d (g_print ("Found last access %p at %p.", ets->priv->last_access, ets->priv->last_access));
 		return ets->priv->last_access;
 	}
 
@@ -195,14 +195,14 @@ check_last_access (ETreeSorted *ets,
 
 		for (i = initial; i < end; i++) {
 			if (parent->children[i] && parent->children[i]->corresponding == corresponding) {
-				d(g_print("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
+				d (g_print ("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
 				return parent->children[i];
 			}
 		}
 
 		for (i = initial - 1; i >= start; i--) {
 			if (parent->children[i] && parent->children[i]->corresponding == corresponding) {
-				d(g_print("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
+				d (g_print ("Found last access %p at %p.", ets->priv->last_access, parent->children[i]));
 				return parent->children[i];
 			}
 		}
@@ -226,7 +226,7 @@ find_path (ETreeSorted *ets,
 
 	check_last = check_last_access (ets, corresponding);
 	if (check_last) {
-		d(g_print(" (find_path)\n"));
+		d (g_print (" (find_path)\n"));
 		return check_last;
 	}
 
@@ -263,7 +263,7 @@ find_path (ETreeSorted *ets,
 	}
 	g_free (sequence);
 
-	d(g_print("Didn't find last access %p.  Setting to %p. (find_path)\n", ets->priv->last_access, path));
+	d (g_print ("Didn't find last access %p.  Setting to %p. (find_path)\n", ets->priv->last_access, path));
 	ets->priv->last_access = path;
 
 	return path;
@@ -305,7 +305,7 @@ find_or_create_path (ETreeSorted *ets,
 
 	check_last = check_last_access (ets, corresponding);
 	if (check_last) {
-		d(g_print(" (find_or_create_path)\n"));
+		d (g_print (" (find_or_create_path)\n"));
 		return check_last;
 	}
 
@@ -341,7 +341,7 @@ find_or_create_path (ETreeSorted *ets,
 	}
 	g_free (sequence);
 
-	d(g_print("Didn't find last access %p.  Setting to %p. (find_or_create_path)\n", ets->priv->last_access, path));
+	d (g_print ("Didn't find last access %p.  Setting to %p. (find_or_create_path)\n", ets->priv->last_access, path));
 	ets->priv->last_access = path;
 
 	return path;
@@ -508,20 +508,20 @@ resort_node (ETreeSorted *ets,
 				e_tree_model_pre_change (E_TREE_MODEL (ets));
 			if (needs_resort) {
 				gint i;
-				d(g_print("Start sort of node %p\n", path));
+				d (g_print ("Start sort of node %p\n", path));
 				if (needs_regen)
 					regenerate_children (ets, path);
-				d(g_print("Regened sort of node %p\n", path));
+				d (g_print ("Regened sort of node %p\n", path));
 				e_table_sorting_utils_tree_sort (E_TREE_MODEL (ets),
 								 ets->priv->sort_info,
 								 ets->priv->full_header,
 								 (ETreePath *) path->children,
 								 path->num_children);
-				d(g_print("Renumbering sort of node %p\n", path));
+				d (g_print ("Renumbering sort of node %p\n", path));
 				for (i = 0; i < path->num_children; i++) {
 					path->children[i]->position = i;
 				}
-				d(g_print("End sort of node %p\n", path));
+				d (g_print ("End sort of node %p\n", path));
 			}
 			if (path->resort_all_children)
 				resort_all_children = TRUE;
@@ -871,7 +871,7 @@ ets_get_save_id (ETreeModel *etm,
 	if (e_tree_model_has_save_id (ets->priv->source))
 		return e_tree_model_get_save_id (ets->priv->source, path->corresponding);
 	else
-		return g_strdup_printf("%p", path->corresponding);
+		return g_strdup_printf ("%p", path->corresponding);
 }
 
 static gboolean
@@ -1007,7 +1007,7 @@ ets_proxy_node_changed (ETreeModel *etm,
                         ETreeSorted *ets)
 {
 	ets->priv->last_access = NULL;
-	d(g_print("Setting last access %p. (ets_proxy_node_changed)\n", ets->priv->last_access));
+	d (g_print ("Setting last access %p. (ets_proxy_node_changed)\n", ets->priv->last_access));
 
 	if (e_tree_model_node_is_root (ets->priv->source, node)) {
 		ets_stop_sort_idle (ets);
@@ -1156,7 +1156,7 @@ ets_proxy_node_removed (ETreeModel *etm,
 	else
 		path = find_path (ets, child);
 
-	d(g_print("Setting last access %p. (ets_proxy_node_removed)\n ", ets->priv->last_access));
+	d (g_print ("Setting last access %p. (ets_proxy_node_removed)\n ", ets->priv->last_access));
 	ets->priv->last_access = NULL;
 
 	if (path && parent_path && parent_path->num_children != -1) {
@@ -1352,7 +1352,7 @@ e_tree_sorted_view_to_model_path (ETreeSorted *ets,
 	ETreeSortedPath *path = view_path;
 	if (path) {
 		ets->priv->last_access = path;
-		d(g_print("Setting last access %p. (e_tree_sorted_view_to_model_path)\n", ets->priv->last_access));
+		d (g_print ("Setting last access %p. (e_tree_sorted_view_to_model_path)\n", ets->priv->last_access));
 		return path->corresponding;
 	} else
 		return NULL;
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 47209c4cdf..4a668d1ba3 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -1027,7 +1027,7 @@ save_expanded_state_func (gpointer keyp,
 	if (node->expanded != tar->expanded_default) {
 		gchar *save_id = e_tree_model_get_save_id (tar->model, path);
 		xmlnode = xmlNewChild (tar->root, NULL, (const guchar *)"node", NULL);
-		e_xml_set_string_prop_by_name(xmlnode, (const guchar *)"id", save_id);
+		e_xml_set_string_prop_by_name (xmlnode, (const guchar *)"id", save_id);
 		g_free (save_id);
 	}
 }
@@ -1098,7 +1098,7 @@ open_file (ETreeTableAdapter *etta,
 		return NULL;
 
 	root = xmlDocGetRootElement (doc);
-	if (root == NULL || strcmp ((gchar *)root->name, "expanded_state")) {
+	if (root == NULL || strcmp ((gchar *) root->name, "expanded_state")) {
 		xmlFreeDoc (doc);
 		return NULL;
 	}
@@ -1145,7 +1145,7 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta,
 
 	model_default = e_tree_model_get_expanded_default (etta->priv->source);
 
-	if (!strcmp ((gchar *)root->name, "expanded_state")) {
+	if (!strcmp ((gchar *) root->name, "expanded_state")) {
 		gchar *state;
 
 		state = e_xml_get_string_prop_by_name_with_default (root, (const guchar *)"default", "");
@@ -1169,14 +1169,14 @@ e_tree_table_adapter_load_expanded_state_xml (ETreeTableAdapter *etta,
 		gchar *id;
 		ETreePath path;
 
-		if (strcmp ((gchar *)child->name, "node")) {
-			d(g_warning ("unknown node '%s' in %s", child->name, filename));
+		if (strcmp ((gchar *) child->name, "node")) {
+			d (g_warning ("unknown node '%s' in %s", child->name, filename));
 			continue;
 		}
 
 		id = e_xml_get_string_prop_by_name_with_default (child, (const guchar *)"id", "");
 
-		if (!strcmp(id, "")) {
+		if (!strcmp (id, "")) {
 			g_free (id);
 			continue;
 		}
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 4465dcbb29..d0922cf4d2 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -391,7 +391,7 @@ connect_header (ETree *e_tree,
 
 	g_value_init (val, G_TYPE_OBJECT);
 	g_value_set_object (val, e_tree->priv->sort_info);
-	g_object_set_property (G_OBJECT(e_tree->priv->header), "sort_info", val);
+	g_object_set_property (G_OBJECT (e_tree->priv->header), "sort_info", val);
 	g_free (val);
 }
 
@@ -734,7 +734,7 @@ e_tree_setup_header (ETree *e_tree)
 	e_tree->priv->header_canvas = GNOME_CANVAS (widget);
 	gtk_widget_show (widget);
 
-	pointer = g_strdup_printf("%p", (gpointer) e_tree);
+	pointer = g_strdup_printf ("%p", (gpointer) e_tree);
 
 	e_tree->priv->header_item = gnome_canvas_item_new (
 		gnome_canvas_root (e_tree->priv->header_canvas),
diff --git a/widgets/table/gal-a11y-e-cell-tree.c b/widgets/table/gal-a11y-e-cell-tree.c
index 68aef2b227..32085fbfba 100644
--- a/widgets/table/gal-a11y-e-cell-tree.c
+++ b/widgets/table/gal-a11y-e-cell-tree.c
@@ -80,7 +80,7 @@ kill_view_cb (ECellView *subcell_view,
 	    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));
+		d (fprintf (stderr, "subcell_view %p deleted before the a11y object %p\n", subcell_view, subcell));
 		subcell->cell_view = NULL;
 	    }
 	}
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 7520c344b0..1806011875 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -207,7 +207,7 @@ eti_a11y_reset_focus_object (GalA11yETableItem *a11y,
 	if (view_col == -1)
 		view_col = 0;
 
-	old_cell = (AtkObject *)g_object_get_data (G_OBJECT (a11y), "gail-focus-object");
+	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);
@@ -909,7 +909,7 @@ eti_header_structure_changed (ETableHeader *eth,
 
 	/* Emit signals */
 	if (reorder_found)
-		g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered");
+		g_signal_emit_by_name (G_OBJECT (a11y_item), "column_reordered");
 
 	if (removed_found) {
 		for (i = 0; i < prev_n_cols; i ++ ) {
@@ -1184,10 +1184,10 @@ gal_a11y_e_table_item_ref_selection (GalA11yETableItem *a11y,
 
 	priv = GET_PRIVATE (a11y);
 	priv->selection_change_id = g_signal_connect (
-	    G_OBJECT(selection), "selection_changed",
+	    G_OBJECT (selection), "selection_changed",
 	    G_CALLBACK (eti_a11y_selection_changed_cb), a11y);
 	priv->cursor_change_id = g_signal_connect (
-	    G_OBJECT(selection), "cursor_changed",
+	    G_OBJECT (selection), "cursor_changed",
 	    G_CALLBACK (eti_a11y_cursor_changed_cb), a11y);
 
 	priv->selection = selection;