Coding style and whitespace cleanup.

114 files changed, 710 insertions, 710 deletions

diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h
index 87a9f15981..d6cf7f4000 100644
--- a/a11y/gal-a11y-util.h
+++ b/a11y/gal-a11y-util.h
@@ -33,4 +33,4 @@ GType  gal_a11y_type_register_static_with_private  (GType        parent_type,
 						    gint          priv_size,
 						    gint        *priv_offset);
 
-#endif /* ! __GAL_A11Y_UTIL_H__ */
+#endif /* __GAL_A11Y_UTIL_H__ */
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 86ed4e9de6..b341d77fc9 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -323,7 +323,7 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2)
 	if (a->family && b->family && *a->family && *b->family) {
 		++possible;
 		/* We don't allow "loose matching" (i.e. John vs. Jon) on family names */
-		if (! e_utf8_casefold_collate (a->family, b->family)) {
+		if (!e_utf8_casefold_collate (a->family, b->family)) {
 			++matches;
 			family_match = TRUE;
 		}
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
index 70cd825626..fe1457f4e7 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/merging/eab-contact-merging.h
@@ -45,4 +45,4 @@ gboolean eab_merging_book_find_contact (EBook                 *book,
 
 G_END_DECLS
 
-#endif /* ! __EAB_CONTACT_MERGING_H__ */
+#endif /* __EAB_CONTACT_MERGING_H__ */
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 396c382d32..d3c122ef19 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -111,7 +111,7 @@ addressbook_value_at (ETableModel *etc, gint col, gint row)
 	EAddressbookTableAdapterPrivate *priv = adapter->priv;
 	const gchar *value;
 
-	if ( col >= COLS || row >= e_addressbook_model_contact_count (priv->model) )
+	if (col >= COLS || row >= e_addressbook_model_contact_count (priv->model))
 		return NULL;
 
 	value = e_contact_get_const((EContact*)e_addressbook_model_contact_at (priv->model, row), col);
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 074bf9f8e3..4107bb9be8 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -347,7 +347,7 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	e_minicard_label = E_MINICARD_LABEL (item);
 
-	switch ( event->type ) {
+	switch (event->type) {
 	case GDK_KEY_PRESS:
 		if (event->key.keyval == GDK_Escape) {
 			GnomeCanvasItem *parent;
@@ -392,9 +392,9 @@ e_minicard_label_event (GnomeCanvasItem *item, GdkEvent *event)
 static void
 e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
 {
-	double left_width;
-	double fieldnamewidth;
-	double fieldwidth;
+	gdouble left_width;
+	gdouble fieldnamewidth;
+	gdouble fieldwidth;
 	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 	if (e_minicard_label->max_field_name_length != -1 && ((e_minicard_label->width / 2) - 4 > e_minicard_label->max_field_name_length))
 		left_width = e_minicard_label->max_field_name_length;
@@ -414,7 +414,7 @@ e_minicard_label_resize_children(EMinicardLabel *e_minicard_label)
 static void
 set_colors (EMinicardLabel *label)
 {
-	if ( (GTK_OBJECT_FLAGS( label ) & GNOME_CANVAS_ITEM_REALIZED) ) {
+	if ((GTK_OBJECT_FLAGS( label ) & GNOME_CANVAS_ITEM_REALIZED)) {
 		GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (label)->canvas);
 		GtkStyle *style = gtk_widget_get_style (canvas);
 		if (label->has_focus) {
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index 6031b803f3..b6101a48ee 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -54,9 +54,9 @@ struct _EMinicardLabel
 	GnomeCanvasGroup parent;
 
 	/* item specific fields */
-	double width;
-	double height;
-	double max_field_name_length;
+	gdouble width;
+	gdouble height;
+	gdouble max_field_name_length;
 	guint editable : 1;
 	GnomeCanvasItem *fieldname;
 	GnomeCanvasItem *field;
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index cb3904728e..7f6788bf4b 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -421,7 +421,7 @@ e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocatio
 		GTK_WIDGET_CLASS(parent_class)->size_allocate (widget, allocation);
 
 	if (GTK_WIDGET_REALIZED(widget)) {
-		double width;
+		gdouble width;
 		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);
 
 		gnome_canvas_item_set( view->emv,
@@ -441,7 +441,7 @@ e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocatio
 static void
 e_minicard_view_widget_reflow(ECanvas *canvas)
 {
-	double width;
+	gdouble width;
 	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);
 
 	if (E_CANVAS_CLASS(parent_class)->reflow)
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index bf9fe8dd4e..ab5bda2881 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -51,7 +51,7 @@ struct _EMinicardViewWidget
 	gchar *query;
 	guint editable : 1;
 
-	double column_width;
+	gdouble column_width;
 };
 
 struct _EMinicardViewWidgetClass
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index c3c6cf1090..ed8954adcd 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -382,7 +382,7 @@ e_minicard_view_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	view = E_MINICARD_VIEW (item);
 
-	switch ( event->type ) {
+	switch (event->type) {
 	case GDK_2BUTTON_PRESS:
 		if (((GdkEventButton *)event)->button == 1) {
 			gboolean editable;
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 04bf9757e4..09a09730f5 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -316,7 +316,7 @@ e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, G
 		if (e_minicard->width != g_value_get_double (value)) {
 			e_minicard->width = g_value_get_double (value);
 			e_minicard_resize_children(e_minicard);
-			if ( GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED )
+			if (GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED)
 				e_canvas_item_request_reflow(item);
 		}
 	  break;
@@ -327,7 +327,7 @@ e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, G
 				gnome_canvas_item_set(E_MINICARD_FIELD(e_minicard->fields->data)->label,
 						      "has_focus", g_value_get_int (value),
 						      NULL);
-			} else if ( g_value_get_int (value) == E_FOCUS_END ) {
+			} else if (g_value_get_int (value) == E_FOCUS_END) {
 				gnome_canvas_item_set(E_MINICARD_FIELD(g_list_last(e_minicard->fields)->data)->label,
 						      "has_focus", g_value_get_int (value),
 						      NULL);
@@ -462,7 +462,7 @@ e_minicard_finalize (GObject *object)
 static void
 e_minicard_style_set (EMinicard *minicard, GtkStyle *previous_style)
 {
-	if ( (GTK_OBJECT_FLAGS( minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
+	if ((GTK_OBJECT_FLAGS( minicard ) & GNOME_CANVAS_ITEM_REALIZED))
 		set_selected (minicard, minicard->selected);
 }
 
@@ -548,7 +548,7 @@ e_minicard_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	e_minicard = E_MINICARD (item);
 
-	switch ( event->type ) {
+	switch (event->type) {
 	case GDK_FOCUS_CHANGE:
 		{
 			GdkEventFocus *focus_event = (GdkEventFocus *) event;
@@ -903,7 +903,7 @@ static void
 remodel( EMinicard *e_minicard )
 {
 	gint count = 0;
-	if ( !(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED) )
+	if (!(GTK_OBJECT_FLAGS( e_minicard ) & GNOME_CANVAS_ITEM_REALIZED))
 		return;
 	if (e_minicard->contact) {
 		EContactField field;
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 4135090763..a973f65112 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -68,7 +68,7 @@ struct _EMinicard
 	GnomeCanvasItem *list_icon;
 
 	GdkPixbuf *list_icon_pixbuf;
-	double list_icon_size;
+	gdouble list_icon_size;
 
 	GList *fields; /* Of type EMinicardField */
 	guint needs_remodeling : 1;
@@ -88,8 +88,8 @@ struct _EMinicard
 	gint button_x;
 	gint button_y;
 
-	double width;
-	double height;
+	gdouble width;
+	gdouble height;
 };
 
 struct _EMinicardClass
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index ffccbfa1d1..d8bd962467 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -217,11 +217,11 @@ static AtkStateSet *ea_minicard_view_ref_state_set (AtkObject *obj)
 	GObject *gobj = NULL;
 
 	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-	if ( !state_set )
+	if (!state_set)
 		state_set = atk_state_set_new ();
 
 	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
-	if ( !gobj )
+	if (!gobj)
 		return state_set;
 
 	atk_state_set_add_state (state_set, ATK_STATE_ENABLED);
@@ -303,7 +303,7 @@ selection_interface_clear_selection (AtkSelection *selection)
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
 	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
 
-	if ( !reflow )
+	if (!reflow)
 		return FALSE;
 
 	e_selection_model_clear (reflow->selection);
@@ -341,7 +341,7 @@ selection_interface_is_child_selected (AtkSelection *selection, gint i)
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (selection);
 	reflow = E_REFLOW(atk_gobject_accessible_get_object (atk_gobj));
 
-	if ( !reflow )
+	if (!reflow)
 		return FALSE;
 
 	return e_selection_model_is_row_selected (reflow->selection, i);
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index 66d9bde67c..7b68bb76cf 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -191,11 +191,11 @@ static AtkStateSet *ea_minicard_ref_state_set (AtkObject *obj)
 	GObject *gobj = NULL;
 
 	state_set = ATK_OBJECT_CLASS (parent_class)->ref_state_set (obj);
-	if ( !state_set )
+	if (!state_set)
 		state_set = atk_state_set_new ();
 
 	gobj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (obj));
-	if ( !gobj )
+	if (!gobj)
 		return state_set;
 
 	atk_state_set_add_state (state_set, ATK_STATE_SELECTABLE);
@@ -235,10 +235,10 @@ static gboolean atk_action_interface_do_action (AtkAction *iface, gint i)
 	minicard = E_MINICARD (
 		atk_gobject_accessible_get_object (
 		ATK_GOBJECT_ACCESSIBLE (iface)));
-	if ( minicard == NULL )
+	if (minicard == NULL)
 		return FALSE;
 
-	if ( i >= G_N_ELEMENTS (action_name) || i < 0 )
+	if (i >= G_N_ELEMENTS (action_name) || i < 0)
 		return FALSE;
 
 	switch (i) {
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
index c506fb1a2b..b360301268 100644
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ b/addressbook/gui/widgets/gal-view-minicard.h
@@ -57,7 +57,7 @@ struct _GalViewMinicard {
 	GalView              parent;
 
 	gchar                *title;
-	double               column_width;
+	gdouble               column_width;
 
 	EMinicardViewWidget *emvw;
 	guint                emvw_column_width_changed_id;
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 5f5c40ee13..41dda05a40 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -136,7 +136,7 @@ getValue( gchar **src )
 	gboolean need_base64 = (*s == ':');
 
  copy_line:
-	while ( *s != 0 && *s != '\n' && *s != '\r' )
+	while (*s != 0 && *s != '\n' && *s != '\r')
 		dest = g_string_append_c (dest, *s++);
 
 	if (*s == '\r') s++;
@@ -249,7 +249,7 @@ parseLine (LDIFImporter *gci, EContact *contact,
 	}
 
 	/* first, check for a 'continuation' line */
-	if ( ptr[0] == ' ' && ptr[1] != '\n' ) {
+	if (ptr[0] == ' ' && ptr[1] != '\n') {
 		g_warning ("unexpected continuation line");
 		return FALSE;
 	}
@@ -260,7 +260,7 @@ parseLine (LDIFImporter *gci, EContact *contact,
 
 		*colon = 0;
 		value = colon + 1;
-		while ( isspace(*value) )
+		while (isspace(*value))
 			value++;
 
 		ldif_value = getValue(&value );
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index fb135baa23..93b76bff20 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -439,72 +439,72 @@ e_contact_build_style (EContactPrintStyle *style)
 		xmlNodePtr node;
 		for (node = stylenode->children; node; node = node->next) {
 			gchar *data = (gchar *)xmlNodeGetContent ( node );
-			if ( !strcmp( (gchar *)node->name, "title" ) ) {
+			if (!strcmp( (gchar *)node->name, "title" )) {
 				get_string(data, &(style->title));
-			} else if ( !strcmp( (gchar *)node->name, "type" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "type" )) {
 				if (g_ascii_strcasecmp (data, "cards") == 0)
 					style->type = E_CONTACT_PRINT_TYPE_CARDS;
 				else if (g_ascii_strcasecmp (data, "memo_style") == 0)
 					style->type = E_CONTACT_PRINT_TYPE_MEMO_STYLE;
 				else if (g_ascii_strcasecmp (data, "phone_list") == 0)
 					style->type = E_CONTACT_PRINT_TYPE_PHONE_LIST;
-			} else if ( !strcmp( (gchar *)node->name, "sections_start_new_page" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "sections_start_new_page" )) {
 				style->sections_start_new_page = get_bool(data);
-			} else if ( !strcmp( (gchar *)node->name, "num_columns" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "num_columns" )) {
 				style->num_columns = get_integer(data);
-			} else if ( !strcmp( (gchar *)node->name, "blank_forms" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "blank_forms" )) {
 				style->blank_forms = get_integer(data);
-			} else if ( !strcmp( (gchar *)node->name, "letter_headings" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "letter_headings" )) {
 				style->letter_headings = get_bool(data);
-			} else if ( !strcmp( (gchar *)node->name, "headings_font" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "headings_font" )) {
 				get_font( data, &(style->headings_font) );
-			} else if ( !strcmp( (gchar *)node->name, "body_font" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "body_font" )) {
 				get_font( data, &(style->body_font) );
-			} else if ( !strcmp( (gchar *)node->name, "print_using_grey" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "print_using_grey" )) {
 				style->print_using_grey = get_bool(data);
-			} else if ( !strcmp( (gchar *)node->name, "paper_width" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "paper_width" )) {
 				style->paper_width = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "paper_height" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "paper_height" )) {
 				style->paper_height = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "top_margin" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "top_margin" )) {
 				style->top_margin = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "left_margin" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "left_margin" )) {
 				style->left_margin = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "bottom_margin" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "bottom_margin" )) {
 				style->bottom_margin = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "right_margin" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "right_margin" )) {
 				style->right_margin = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "page_width" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "page_width" )) {
 				style->page_width = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "page_height" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "page_height" )) {
 				style->page_height = get_float(data);
-			} else if ( !strcmp( (gchar *)node->name, "orientation" ) ) {
-				if ( data ) {
+			} else if (!strcmp( (gchar *)node->name, "orientation" )) {
+				if (data) {
 					style->orientation_portrait =
 						(g_ascii_strcasecmp (data, "landscape") != 0);
 				} else {
 					style->orientation_portrait = TRUE;
 				}
-			} else if ( !strcmp( (gchar *)node->name, "header_font" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "header_font" )) {
 				get_font( data, &(style->header_font) );
-			} else if ( !strcmp( (gchar *)node->name, "left_header" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "left_header" )) {
 				get_string(data, &(style->left_header));
-			} else if ( !strcmp( (gchar *)node->name, "center_header" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "center_header" )) {
 				get_string(data, &(style->center_header));
-			} else if ( !strcmp( (gchar *)node->name, "right_header" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "right_header" )) {
 				get_string(data, &(style->right_header));
-			} else if ( !strcmp( (gchar *)node->name, "footer_font" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "footer_font" )) {
 				get_font( data, &(style->footer_font) );
-			} else if ( !strcmp( (gchar *)node->name, "left_footer" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "left_footer" )) {
 				get_string(data, &(style->left_footer));
-			} else if ( !strcmp( (gchar *)node->name, "center_footer" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "center_footer" )) {
 				get_string(data, &(style->center_footer));
-			} else if ( !strcmp( (gchar *)node->name, "right_footer" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "right_footer" )) {
 				get_string(data, &(style->right_footer));
-			} else if ( !strcmp( (gchar *)node->name, "reverse_on_even_pages" ) ) {
+			} else if (!strcmp( (gchar *)node->name, "reverse_on_even_pages" )) {
 				style->reverse_on_even_pages = get_bool(data);
 			}
-			if ( data )
+			if (data)
 				xmlFree (data);
 		}
 		xmlFreeDoc(styledoc);
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 6975143bd1..40180d4631 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -147,7 +147,7 @@ eab_nickname_query (EBook                 *book,
 	g_return_val_if_fail (nickname != NULL, 0);
 
 	/* The empty-string case shouldn't generate a warning. */
-	if (! *nickname)
+	if (!*nickname)
 		return 0;
 
 	query_string = g_strdup_printf ("(is \"nickname\" \"%s\")", nickname);
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index c07af85a0f..f7d5443da0 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -252,7 +252,7 @@ alarm_to_repeat_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 
 	e_cal_component_alarm_get_repeat (dialog->alarm, &repeat);
 
-	if ( repeat.repetitions ) {
+	if (repeat.repetitions) {
 		gtk_toggle_button_set_active (
 			GTK_TOGGLE_BUTTON (dialog->repeat_toggle), TRUE);
 		gtk_spin_button_set_value (
@@ -261,21 +261,21 @@ alarm_to_repeat_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 	} else
 		return;
 
-	if ( repeat.duration.minutes ) {
+	if (repeat.duration.minutes) {
 		e_dialog_combo_box_set (dialog->repeat_unit_combo, DUR_MINUTES, duration_units_map);
 		gtk_spin_button_set_value (
 			GTK_SPIN_BUTTON (dialog->repeat_value),
 			repeat.duration.minutes);
 	}
 
-	if ( repeat.duration.hours ) {
+	if (repeat.duration.hours) {
 		e_dialog_combo_box_set (dialog->repeat_unit_combo, DUR_HOURS, duration_units_map);
 		gtk_spin_button_set_value (
 			GTK_SPIN_BUTTON (dialog->repeat_value),
 			repeat.duration.hours);
 	}
 
-	if ( repeat.duration.days ) {
+	if (repeat.duration.days) {
 		e_dialog_combo_box_set (dialog->repeat_unit_combo, DUR_DAYS, duration_units_map);
 		gtk_spin_button_set_value (
 			GTK_SPIN_BUTTON (dialog->repeat_value),
@@ -353,7 +353,7 @@ alarm_to_aalarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 	url = icalattach_get_url (attach);
 	icalattach_unref (attach);
 
-	if ( !(url && *url) )
+	if (!(url && *url))
 		return;
 
 	gtk_toggle_button_set_active (
@@ -553,7 +553,7 @@ alarm_to_palarm_widgets (Dialog *dialog, ECalComponentAlarm *alarm)
 	url = icalattach_get_url (attach);
 	icalattach_unref (attach);
 
-	if ( !(url && *url) )
+	if (!(url && *url))
 		return;
 
 	e_dialog_editable_set (dialog->palarm_program, url);
@@ -620,13 +620,13 @@ populate_widgets_from_alarm (Dialog *dialog)
 	e_cal_component_alarm_get_trigger (dialog->alarm, trigger);
 	g_return_if_fail ( trigger != NULL );
 
-	if ( *action == E_CAL_COMPONENT_ALARM_NONE )
+	if (*action == E_CAL_COMPONENT_ALARM_NONE)
 		return;
 
 	gtk_window_set_title (GTK_WINDOW (dialog->toplevel),_("Edit Alarm"));
 
 	/* Alarm Types */
-	switch ( trigger->type ) {
+	switch (trigger->type) {
 	case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START:
 		e_dialog_combo_box_set (dialog->time_combo, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START, time_map);
 		break;
@@ -638,7 +638,7 @@ populate_widgets_from_alarm (Dialog *dialog)
                 g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type);
 	}
 
-	switch ( trigger->u.rel_duration.is_neg ) {
+	switch (trigger->u.rel_duration.is_neg) {
 	case 1:
 		e_dialog_combo_box_set (dialog->relative_combo, BEFORE, relative_map);
 		break;
@@ -648,17 +648,17 @@ populate_widgets_from_alarm (Dialog *dialog)
 		break;
 	}
 
-	if ( trigger->u.rel_duration.days ) {
+	if (trigger->u.rel_duration.days) {
 		e_dialog_combo_box_set (dialog->value_units_combo, DAYS, value_map);
 		gtk_spin_button_set_value (
 			GTK_SPIN_BUTTON (dialog->interval_value),
 			trigger->u.rel_duration.days);
-	} else if ( trigger->u.rel_duration.hours ) {
+	} else if (trigger->u.rel_duration.hours) {
 		e_dialog_combo_box_set (dialog->value_units_combo, HOURS, value_map);
 		gtk_spin_button_set_value (
 			GTK_SPIN_BUTTON (dialog->interval_value),
 			trigger->u.rel_duration.hours);
-	} else if ( trigger->u.rel_duration.minutes ) {
+	} else if (trigger->u.rel_duration.minutes) {
 		e_dialog_combo_box_set (dialog->value_units_combo, MINUTES, value_map);
 		gtk_spin_button_set_value (
 			GTK_SPIN_BUTTON (dialog->interval_value),
@@ -970,9 +970,9 @@ check_custom_sound (Dialog *dialog)
 	str = gtk_file_chooser_get_filename (
 		GTK_FILE_CHOOSER (dialog->aalarm_file_chooser));
 
-	if ( str && *str ) {
+	if (str && *str) {
 		dir = g_path_get_dirname (str);
-		if ( dir && *dir ) {
+		if (dir && *dir) {
 			calendar_config_set_dir_path (dir);
 		}
 	}
@@ -1139,7 +1139,7 @@ action_changed_cb (GtkWidget *action_combo, gpointer data)
 	switch (action) {
 	case E_CAL_COMPONENT_ALARM_AUDIO:
 		dir = calendar_config_get_dir_path ();
-		if ( dir && *dir )
+		if (dir && *dir)
 			gtk_file_chooser_set_current_folder (
 				GTK_FILE_CHOOSER (dialog->aalarm_file_chooser),
 				dir);
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 2e80975e9f..e6fd01e9c9 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -686,7 +686,7 @@ show_geo_warning (void)
 static void
 set_geo (ECalModelComponent *comp_data, const gchar *value)
 {
-	double latitude, longitude;
+	gdouble latitude, longitude;
 	gint matched;
 	struct icalgeotype geo;
 	icalproperty *prop;
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index fd8650edad..42e4c1cd7a 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -2016,10 +2016,10 @@ e_calendar_view_emit_user_created (ECalendarView *cal_view)
 
 void
 draw_curved_rectangle (cairo_t *cr, double x0, double y0,
-			double rect_width, double rect_height,
-			double radius)
+			gdouble rect_width, double rect_height,
+			gdouble radius)
 {
-	double x1, y1;
+	gdouble x1, y1;
 
 	x1 = x0 + rect_width;
 	y1 = y0 + rect_height;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 3c7706d67b..e4b9f01b03 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -194,8 +194,8 @@ struct psinfo
 	gint month;
 	gboolean compress_weekend;
 	gboolean use_24_hour_format;
-	double row_height;
-	double header_row_height;
+	gdouble row_height;
+	gdouble header_row_height;
 };
 
 /* Convenience function to help the transition to timezone functions.
@@ -454,7 +454,7 @@ print_text_size (GtkPrintContext *context, const gchar *text,
                  gdouble y1, gdouble y2)
 {
 	PangoFontDescription *font;
-	double w;
+	gdouble w;
 
 	font = get_font_for_size (ABS (y2 - y1) * 0.5, PANGO_WEIGHT_NORMAL);
 	w = print_text (context, font, text, alignment, x1, x2, y1, y2);
@@ -470,7 +470,7 @@ print_text_size_bold (GtkPrintContext *context, const gchar *text,
                       gdouble y1, gdouble y2)
 {
 	PangoFontDescription *font;
-	double w;
+	gdouble w;
 
 	font = get_font_for_size (ABS (y2 - y1) * 0.5, PANGO_WEIGHT_BOLD);
 	w = print_text (context, font, text, alignment, x1, x2, y1, y2);
@@ -485,7 +485,7 @@ titled_box (GtkPrintContext *context, const gchar *text,
             gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2,
 	    gdouble linewidth)
 {
-	double size;
+	gdouble size;
 
 	size = get_font_size (font);
 	print_border (context, *x1, *x2, *y1, *y1 + size * 1.4, linewidth, 0.9);
@@ -581,9 +581,9 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 	gint day, weekday, week_start_day;
 	gchar buf[100];
 	struct tm tm;
-	double font_size;
-	double header_size, col_width, row_height, text_xpad, w;
-	double cell_top, cell_bottom, cell_left, cell_right, text_right;
+	gdouble font_size;
+	gdouble header_size, col_width, row_height, text_xpad, w;
+	gdouble cell_top, cell_bottom, cell_left, cell_right, text_right;
 
 	/* Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday */
 	const gchar *daynames[] =
@@ -754,14 +754,14 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 		      double left, double right, double top, double bottom)
 {
 	PangoFontDescription *font_hour, *font_minute;
-	double yinc, y;
-	double width = DAY_VIEW_TIME_COLUMN_WIDTH;
-	double font_size, max_font_size, hour_font_size, minute_font_size;
+	gdouble yinc, y;
+	gdouble width = DAY_VIEW_TIME_COLUMN_WIDTH;
+	gdouble font_size, max_font_size, hour_font_size, minute_font_size;
 	gchar buf[20];
 	const gchar *minute;
 	gboolean use_24_hour;
 	gint i, hour, row;
-	double hour_minute_x;
+	gdouble hour_minute_x;
 	cairo_t *cr;
 
 	/* Fill the time column in light-gray. */
@@ -1072,12 +1072,12 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
 		      double row_height, EDayViewEvent *event,
 		      struct pdinfo *pdi, ECalModel *model)
 {
-	double x1, x2, y1, y2;
-	double left_triangle_width = -1.0, right_triangle_width = -1.0;
+	gdouble x1, x2, y1, y2;
+	gdouble left_triangle_width = -1.0, right_triangle_width = -1.0;
 	gchar *text;
 	gchar buffer[32];
 	struct tm date_tm;
-	double red, green, blue;
+	gdouble red, green, blue;
 
 	/* If the event starts before the first day being printed, draw a
 	   triangle. (Note that I am assuming we are just showing 1 day at
@@ -1151,12 +1151,12 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		 double left, double right, double top, double bottom,
 		 EDayViewEvent *event, struct pdinfo *pdi, ECalModel *model)
 {
-	double x1, x2, y1, y2, col_width, row_height;
+	gdouble x1, x2, y1, y2, col_width, row_height;
 	gint start_offset, end_offset, start_row, end_row;
 	gchar *text, start_buffer[32], end_buffer[32];
 	gboolean display_times = FALSE;
 	struct tm date_tm;
-	double red, green, blue;
+	gdouble red, green, blue;
 
 	if ((event->start_minute >= pdi->end_minute_offset)
 	    || (event->end_minute <= pdi->start_minute_offset))
@@ -1234,7 +1234,7 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 	time_t start, end;
 	struct pdinfo pdi;
 	gint rows_in_top_display, i;
-	double font_size, max_font_size;
+	gdouble font_size, max_font_size;
 	cairo_t *cr;
 	GdkPixbuf *pixbuf = NULL;
 #define LONG_DAY_EVENTS_TOP_SPACING 4
@@ -1416,7 +1416,7 @@ print_week_long_event (GtkPrintContext *context, PangoFontDescription *font,
 		       EWeekViewEvent *event, EWeekViewEventSpan *span,
 		       gchar *text, double red, double green, double blue)
 {
-	double left_triangle_width = -1.0, right_triangle_width = -1.0;
+	gdouble left_triangle_width = -1.0, right_triangle_width = -1.0;
 	struct tm date_tm;
 	gchar buffer[32];
 
@@ -1524,8 +1524,8 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 	gint span_num;
 	gchar *text;
 	gint num_days, start_x, start_y, start_h, end_x, end_y, end_h;
-	double x1, x2, y1;
-	double red, green, blue;
+	gdouble x1, x2, y1;
+	gdouble red, green, blue;
 	GdkPixbuf *pixbuf = NULL;
 
 	text = get_summary_with_location (event->comp_data->icalcomp);
@@ -1646,7 +1646,7 @@ print_week_view_background (GtkPrintContext *context,
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	struct tm tm;
 	gint day, day_x, day_y, day_h;
-	double x1, x2, y1, y2, font_size, fillcolor;
+	gdouble x1, x2, y1, y2, font_size, fillcolor;
 	const gchar *format_string;
 	gchar buffer[128];
 	cairo_t *cr;
@@ -1765,7 +1765,7 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7], day, event_num;
 	GArray *spans;
 	PangoFontDescription *font;
-	double cell_width, cell_height;
+	gdouble cell_width, cell_height;
 	ECalModel *model = gnome_calendar_get_model (gcal);
 
 	psi.days_shown = weeks_shown * 7;
@@ -1860,7 +1860,7 @@ print_year_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence
 		    gint morerows)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	double row_height, col_width, l, r, t, b;
+	gdouble row_height, col_width, l, r, t, b;
 	time_t now;
 	gint col, row, rows, cols;
 
@@ -1910,7 +1910,7 @@ print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whenc
 	PangoFontDescription *font;
 	gboolean compress_weekend;
 	gint columns, col, weekday, month;
-	double font_size, cell_width, x1, x2, y1, y2;
+	gdouble font_size, cell_width, x1, x2, y1, y2;
 
 	weekday = calendar_config_get_week_start_day ();
 	compress_weekend = calendar_config_get_compress_weekend ();
@@ -1981,7 +1981,7 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 {
 #if 0  /* KILL-BONOBO */
 	PangoFontDescription *font_summary;
-	double y, yend, x, xend;
+	gdouble y, yend, x, xend;
 	struct icaltimetype *tt;
 	ECalendarTable *task_pad;
 	ETable *table;
@@ -2077,7 +2077,7 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	GtkPageSetup *setup;
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	gint i, days = 1;
-	double todo, l;
+	gdouble todo, l;
 	gchar buf[100];
 	gdouble width, height;
 
@@ -2140,7 +2140,7 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 {
 	GtkPageSetup *setup;
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	double l;
+	gdouble l;
 	gchar buf[100];
 	time_t when;
 	gint week_start_day;
@@ -2215,7 +2215,7 @@ print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	gchar buf[100];
 	gdouble width, height;
-	double l;
+	gdouble l;
 
 	setup = gtk_print_context_get_page_setup (context);
 
@@ -2491,10 +2491,10 @@ print_comp_draw_real (GtkPrintOperation *operation,
 
 	const gchar *title, *categories, *location;
 	gchar *categories_string, *location_string, *summary_string;
-	double header_size;
+	gdouble header_size;
 	cairo_t *cr;
 	gdouble width, height, page_start;
-	double top;
+	gdouble top;
 	gint pages = 1;
 
 	setup = gtk_print_context_get_page_setup (context);
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index 797ba33798..20ab3221ec 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -346,7 +346,7 @@ e_alert_load_tables(void)
 		return;
 	}
 
-	while ( (d = g_dir_read_name(dir)) ) {
+	while ((d = g_dir_read_name(dir))) {
 		gchar *path;
 
 		if (d[0] == '.')
@@ -536,7 +536,7 @@ e_alert_append_text_escaped (GString *out, const gchar *text)
 {
 	gchar c;
 
-	while ( (c=*text++) ) {
+	while ((c=*text++)) {
 		if (c == '<')
 			g_string_append(out, "&lt;");
 		else if (c == '>')
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 25b12355a9..dea0f52284 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -558,7 +558,7 @@ ec_rebuild (EConfig *emp)
 			|| item->type == E_CONFIG_PAGE
 			|| item->type == E_CONFIG_SECTION
 			|| item->type == E_CONFIG_SECTION_TABLE)) {
-			if ( (sectionnode->empty = itemno == 0) ) {
+			if ((sectionnode->empty = itemno == 0)) {
 				gtk_widget_hide(sectionnode->frame);
 				sectionno--;
 			} else
@@ -572,7 +572,7 @@ ec_rebuild (EConfig *emp)
 		    && (item->type == E_CONFIG_PAGE_START
 			|| item->type == E_CONFIG_PAGE_FINISH
 			|| item->type == E_CONFIG_PAGE)) {
-			if ( (pagenode->empty = sectionno == 0) ) {
+			if ((pagenode->empty = sectionno == 0)) {
 				gtk_widget_hide(pagenode->frame);
 				pageno--;
 			} else
@@ -894,7 +894,7 @@ ec_rebuild (EConfig *emp)
 
 	/* If the last section doesn't contain anything, hide it */
 	if (sectionnode != NULL && sectionnode->frame != NULL) {
-		if ( (sectionnode->empty = itemno == 0) ) {
+		if ((sectionnode->empty = itemno == 0)) {
 			gtk_widget_hide(sectionnode->frame);
 			sectionno--;
 		} else
@@ -904,7 +904,7 @@ ec_rebuild (EConfig *emp)
 
 	/* If the last page doesn't contain anything, hide it */
 	if (pagenode != NULL && pagenode->frame != NULL) {
-		if ( (pagenode->empty = sectionno == 0) ) {
+		if ((pagenode->empty = sectionno == 0)) {
 			gtk_widget_hide(pagenode->frame);
 			pageno--;
 		} else
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 15b566877e..e53ea60b69 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -69,7 +69,7 @@ expire_dir_rec(const gchar *base, time_t now)
 	path = g_string_new(base);
 	len = path->len;
 
-	while ( (d = g_dir_read_name(dir)) ) {
+	while ((d = g_dir_read_name(dir))) {
 		g_string_truncate(path, len);
 		g_string_append_printf(path, "/%s", d);
 		d(printf("Checking '%s' for expiry\n", path->str));
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 82437e8bb4..26cf35c126 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -595,7 +595,7 @@ e_plugin_load_plugins(void)
 				continue;
 			}
 
-			while ( (d = g_dir_read_name(dir)) ) {
+			while ((d = g_dir_read_name(dir))) {
 				if (g_str_has_suffix  (d, ".eplug")) {
 					gchar * name = g_build_filename(path, d, NULL);
 
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 8e24436605..a90499bf9c 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -265,5 +265,5 @@ typedef enum _EPluginFlags {
 	E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0
 } EPluginFlags;
 
-#endif /* ! _E_PLUGIN_H */
+#endif /* _E_PLUGIN_H */
 
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 939df9bbe0..9b44510e55 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -2810,7 +2810,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const
 	CamelFolder *folder;
 
 	while (fi) {
-		double progress;
+		gdouble progress;
 		gchar *tmp;
 
 		*nth_folder = *nth_folder + 1;
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index 944f496572..fed6ec9ca8 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -2344,7 +2344,7 @@ static GtkWidget *
 emae_option_checkspin (EMAccountEditorService *service, CamelURL *url, const gchar *name, const gchar *fmt, const gchar *info)
 {
 	GtkWidget *hbox, *check, *spin, *label = NULL;
-	double min, def, max;
+	gdouble min, def, max;
 	gchar *pre, *post;
 	const gchar *val;
 	gchar on;
@@ -3031,7 +3031,7 @@ static ServerData *
 emae_check_servers (const gchar *email)
 {
 	gint len = G_N_ELEMENTS(mail_servers), i;
-	char *server = strchr (email, '@');
+	gchar *server = strchr (email, '@');
 
 	server++;
 
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index d4d47a6410..7728275e8f 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -84,7 +84,7 @@ struct _EMAccountEditor {
 	GtkWidget **pages; /* Pages for Anjal's page type editor */
 
 	guint do_signature:1;	/* allow editing signature */
-	ServerData * (*emae_check_servers) (const char *email);
+	ServerData * (*emae_check_servers) (const gchar *email);
 };
 
 struct _EMAccountEditorClass {
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index d5eda2ab21..201f8ffde7 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -56,4 +56,4 @@ EFilterPart *em_filter_context_find_action (EMFilterContext *fc, const gchar *na
 EFilterPart *em_filter_context_create_action (EMFilterContext *fc, const gchar *name);
 EFilterPart *em_filter_context_next_action (EMFilterContext *fc, EFilterPart *last);
 
-#endif /* ! _EM_FILTER_CONTEXT_H */
+#endif /* _EM_FILTER_CONTEXT_H */
diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h
index 02fb34b09f..2aae15edb1 100644
--- a/mail/em-filter-folder-element.h
+++ b/mail/em-filter-folder-element.h
@@ -53,4 +53,4 @@ EMFilterFolderElement *em_filter_folder_element_new (void);
 /* methods */
 void em_filter_folder_element_set_value (EMFilterFolderElement *ff, const gchar *uri);
 
-#endif /* ! _EM_FILTER_FOLDER_ELEMENT_H */
+#endif /* _EM_FILTER_FOLDER_ELEMENT_H */
diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 4ea49780b9..6e75dc785d 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -56,4 +56,4 @@ void            em_filter_rule_replace_action (EMFilterRule *fr, EFilterPart *fp
 
 void            em_filter_rule_build_action   (EMFilterRule *fr, GString *out);
 
-#endif /* ! _EM_FILTER_RULE_H */
+#endif /* _EM_FILTER_RULE_H */
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 356a544fb7..84ac0fc061 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -2175,7 +2175,7 @@ em_folder_tree_set_selected_list (EMFolderTree *folder_tree, GList *list, gboole
 
 			/* This makes sure all our parents up to the root are expanded */
 			/* FIXME: Why does the expanded state store this made up path rather than the euri? */
-			if ( (account = mail_config_get_account_by_source_url(u->uri)) )
+			if ((account = mail_config_get_account_by_source_url(u->uri)))
 				expand_key = g_strdup_printf ("%s/%s", account->uid, path);
 			else if (CAMEL_IS_VEE_STORE (u->store))
 				expand_key = g_strdup_printf ("vfolder/%s", path);
diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h
index d10d68bbb8..07b6796d8b 100644
--- a/mail/em-subscribe-editor.h
+++ b/mail/em-subscribe-editor.h
@@ -25,4 +25,4 @@
 
 GtkWidget *em_subscribe_editor_new(void);
 
-#endif /* ! _EM_SUBSCRIBE_EDITOR_H */
+#endif /* _EM_SUBSCRIBE_EDITOR_H */
diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h
index baf3f5ff32..59ff08b361 100644
--- a/mail/em-vfolder-context.h
+++ b/mail/em-vfolder-context.h
@@ -49,4 +49,4 @@ GType em_vfolder_context_get_type (void);
 
 EMVFolderContext *em_vfolder_context_new (void);
 
-#endif /* ! _EM_VFOLDER_CONTEXT_H */
+#endif /* _EM_VFOLDER_CONTEXT_H */
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index 6d7d978c06..d151c47f53 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -422,13 +422,13 @@ select_source_with_changed(GtkWidget *widget, struct _source_data *data)
 	GSList *group = NULL;
 	gint i = 0;
 
-	if ( !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)) )
+	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
 		return;
 
 	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (widget));
 
 	for (i=0; i< g_slist_length(group); i++) {
-		if ( g_slist_nth_data (group, with = i) == widget )
+		if (g_slist_nth_data (group, with = i) == widget)
 			break;
 	}
 
diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index a5c80356e7..8e77986e2c 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -65,4 +65,4 @@ void         em_vfolder_rule_remove_source (EMVFolderRule *vr, const gchar *uri)
 const gchar  *em_vfolder_rule_find_source   (EMVFolderRule *vr, const gchar *uri);
 const gchar  *em_vfolder_rule_next_source   (EMVFolderRule *vr, const gchar *last);
 
-#endif /* ! _EM_VFOLDER_RULE_H */
+#endif /* _EM_VFOLDER_RULE_H */
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index e9d552a41c..2e8828c5b2 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -126,4 +126,4 @@ gpointer mail_call_main(mail_call_t type, MailMainFunc func, ...);
 /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */
 extern MailAsyncEvent *mail_async_event;
 
-#endif /* ! _MAIL_MT */
+#endif /* _MAIL_MT */
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 2ba1f01aeb..2155a96191 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -44,4 +44,4 @@ void		mail_autoreceive_init		(EShellBackend *shell_backend,
 
 G_END_DECLS
 
-#endif /* ! MAIL_SEND_RECV_H */
+#endif /* MAIL_SEND_RECV_H */
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index 6301e5ff5e..d418ec7d99 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -701,9 +701,9 @@ mail_vfolder_rename_uri(CamelStore *store, const gchar *cfrom, const gchar *cto)
 
 	/* see if any rules directly reference this removed uri */
 	rule = NULL;
-	while ( (rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL)) ) {
+	while ((rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL))) {
 		source = NULL;
-		while ( (source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source)) ) {
+		while ((source = em_vfolder_rule_next_source((EMVFolderRule *)rule, source))) {
 			gchar *csource = em_uri_to_camel(source);
 
 			/* Remove all sources that match, ignore changed events though
@@ -1057,7 +1057,7 @@ vfolder_load_storage(void)
 
 	/* and setup the rules we have */
 	rule = NULL;
-	while ( (rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL)) ) {
+	while ((rule = e_rule_context_next_rule((ERuleContext *)context, rule, NULL))) {
 		if (rule->name) {
 			d(printf("rule added: %s\n", rule->name));
 			context_rule_added((ERuleContext *)context, rule);
diff --git a/mail/message-list.c b/mail/message-list.c
index bb75cf1370..78709e1449 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -3437,7 +3437,7 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes)
 #endif
 
 }
-#endif /* ! BROKEN_ETREE */
+#endif /* BROKEN_ETREE */
 
 static void
 mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, gint flag)
diff --git a/modules/addressbook/openldap-extract.h b/modules/addressbook/openldap-extract.h
index b33b08156f..1c1fcf3d6b 100644
--- a/modules/addressbook/openldap-extract.h
+++ b/modules/addressbook/openldap-extract.h
@@ -188,12 +188,12 @@ get_token( const gchar ** sp, gchar ** token_val )
 		kind = TK_QDSTRING;
 		(*sp)++;
 		p = *sp;
-		while ( **sp != '\'' && **sp != '\0' )
+		while (**sp != '\'' && **sp != '\0')
 			(*sp)++;
-		if ( **sp == '\'' ) {
+		if (**sp == '\'') {
 			q = *sp;
 			res = LDAP_MALLOC(q-p+1);
-			if ( !res ) {
+			if (!res) {
 				kind = TK_OUTOFMEM;
 			} else {
 				strncpy(res,p,q-p);
@@ -217,7 +217,7 @@ get_token( const gchar ** sp, gchar ** token_val )
 			(*sp)++;
 		q = *sp;
 		res = LDAP_MALLOC(q-p+1);
-		if ( !res ) {
+		if (!res) {
 			kind = TK_OUTOFMEM;
 		} else {
 			strncpy(res,p,q-p);
@@ -250,14 +250,14 @@ ldap_int_parse_numericoid(const gchar **sp, gint *code, const gint flags)
 	gint quoted = 0;
 
 	/* Netscape puts the SYNTAX value in quotes (incorrectly) */
-	if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'' ) {
+	if (flags & LDAP_SCHEMA_ALLOW_QUOTED && **sp == '\'') {
 		quoted = 1;
 		(*sp)++;
 		start++;
 	}
 	/* Each iteration of this loop gets one decimal string */
 	while (**sp) {
-		if ( !LDAP_DIGIT(**sp) ) {
+		if (!LDAP_DIGIT(**sp)) {
 			/*
 			 * Initial gchar is not a digit or gchar after dot is
 			 * not a digit
@@ -266,17 +266,17 @@ ldap_int_parse_numericoid(const gchar **sp, gint *code, const gint flags)
 			return NULL;
 		}
 		(*sp)++;
-		while ( LDAP_DIGIT(**sp) )
+		while (LDAP_DIGIT(**sp))
 			(*sp)++;
-		if ( **sp != '.' )
+		if (**sp != '.')
 			break;
 		/* Otherwise, gobble the dot and loop again */
 		(*sp)++;
 	}
 	/* Now *sp points at the gchar past the numericoid. Perfect. */
 	len = *sp - start;
-	if ( flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted ) {
-		if ( **sp == '\'' ) {
+	if (flags & LDAP_SCHEMA_ALLOW_QUOTED && quoted) {
+		if (**sp == '\'') {
 			(*sp)++;
 		} else {
 			*code = LDAP_SCHERR_UNEXPTOKEN;
@@ -310,11 +310,11 @@ parse_qdescrs(const gchar **sp, gint *code)
 
 	parse_whsp(sp);
 	kind = get_token(sp,&sval);
-	if ( kind == TK_LEFTPAREN ) {
+	if (kind == TK_LEFTPAREN) {
 		/* Let's presume there will be at least 2 entries */
 		size = 3;
 		res = LDAP_CALLOC(3,sizeof(gchar *));
-		if ( !res ) {
+		if (!res) {
 			*code = LDAP_SCHERR_OUTOFMEM;
 			return NULL;
 		}
@@ -322,13 +322,13 @@ parse_qdescrs(const gchar **sp, gint *code)
 		while (1) {
 			parse_whsp(sp);
 			kind = get_token(sp,&sval);
-			if ( kind == TK_RIGHTPAREN )
+			if (kind == TK_RIGHTPAREN)
 				break;
-			if ( kind == TK_QDESCR ) {
-				if ( pos == size-2 ) {
+			if (kind == TK_QDESCR) {
+				if (pos == size-2) {
 					size++;
 					res1 = LDAP_REALLOC(res,size*sizeof(gchar *));
-					if ( !res1 ) {
+					if (!res1) {
 						LDAP_VFREE(res);
 						LDAP_FREE(sval);
 						*code = LDAP_SCHERR_OUTOFMEM;
@@ -348,9 +348,9 @@ parse_qdescrs(const gchar **sp, gint *code)
 		}
 		parse_whsp(sp);
 		return(res);
-	} else if ( kind == TK_QDESCR ) {
+	} else if (kind == TK_QDESCR) {
 		res = LDAP_CALLOC(2,sizeof(gchar *));
-		if ( !res ) {
+		if (!res) {
 			*code = LDAP_SCHERR_OUTOFMEM;
 			return NULL;
 		}
@@ -384,11 +384,11 @@ parse_oids(const gchar **sp, gint *code, const gint allow_quoted)
 	 */
 	parse_whsp(sp);
 	kind = get_token(sp,&sval);
-	if ( kind == TK_LEFTPAREN ) {
+	if (kind == TK_LEFTPAREN) {
 		/* Let's presume there will be at least 2 entries */
 		size = 3;
 		res = LDAP_CALLOC(3,sizeof(gchar *));
-		if ( !res ) {
+		if (!res) {
 			*code = LDAP_SCHERR_OUTOFMEM;
 			return NULL;
 		}
@@ -408,18 +408,18 @@ parse_oids(const gchar **sp, gint *code, const gint allow_quoted)
 		parse_whsp(sp);
 		while (1) {
 			kind = get_token(sp,&sval);
-			if ( kind == TK_RIGHTPAREN )
+			if (kind == TK_RIGHTPAREN)
 				break;
-			if ( kind == TK_DOLLAR ) {
+			if (kind == TK_DOLLAR) {
 				parse_whsp(sp);
 				kind = get_token(sp,&sval);
 				if ( kind == TK_BAREWORD ||
 				     ( allow_quoted &&
 				       kind == TK_QDSTRING ) ) {
-					if ( pos == size-2 ) {
+					if (pos == size-2) {
 						size++;
 						res1 = LDAP_REALLOC(res,size*sizeof(gchar *));
-						if ( !res1 ) {
+						if (!res1) {
 							LDAP_FREE(sval);
 							LDAP_VFREE(res);
 							*code = LDAP_SCHERR_OUTOFMEM;
@@ -448,7 +448,7 @@ parse_oids(const gchar **sp, gint *code, const gint allow_quoted)
 	} else if ( kind == TK_BAREWORD ||
 		    ( allow_quoted && kind == TK_QDSTRING ) ) {
 		res = LDAP_CALLOC(2,sizeof(gchar *));
-		if ( !res ) {
+		if (!res) {
 			LDAP_FREE(sval);
 			*code = LDAP_SCHERR_OUTOFMEM;
 			return NULL;
@@ -496,7 +496,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 	gchar ** ext_vals;
 	const gchar * savepos;
 
-	if ( !s ) {
+	if (!s) {
 		*code = LDAP_SCHERR_EMPTY;
 		*errp = "";
 		return NULL;
@@ -505,14 +505,14 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 	*errp = s;
 	oc = LDAP_CALLOC(1,sizeof(LDAPObjectClass));
 
-	if ( !oc ) {
+	if (!oc) {
 		*code = LDAP_SCHERR_OUTOFMEM;
 		return NULL;
 	}
 	oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
 
 	kind = get_token(&ss,&sval);
-	if ( kind != TK_LEFTPAREN ) {
+	if (kind != TK_LEFTPAREN) {
 		*code = LDAP_SCHERR_NOLEFTPAREN;
 		LDAP_FREE(sval);
 		ldap_objectclass_free(oc);
@@ -529,12 +529,12 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 	parse_whsp(&ss);
 	savepos = ss;
 	oc->oc_oid = ldap_int_parse_numericoid(&ss,code,0);
-	if ( !oc->oc_oid ) {
-		if ( (flags & LDAP_SCHEMA_ALLOW_ALL) && (ss == savepos) ) {
+	if (!oc->oc_oid) {
+		if ((flags & LDAP_SCHEMA_ALLOW_ALL) && (ss == savepos)) {
 			/* Backtracking */
 			ss = savepos;
 			kind = get_token(&ss,&sval);
-			if ( kind == TK_BAREWORD ) {
+			if (kind == TK_BAREWORD) {
 				if ( !strcasecmp(sval, "NAME") ||
 				     !strcasecmp(sval, "DESC") ||
 				     !strcasecmp(sval, "OBSOLETE") ||
@@ -580,9 +580,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 		case TK_RIGHTPAREN:
 			return oc;
 		case TK_BAREWORD:
-			if ( !strcasecmp(sval,"NAME") ) {
+			if (!strcasecmp(sval,"NAME")) {
 				LDAP_FREE(sval);
-				if ( seen_name ) {
+				if (seen_name) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -590,16 +590,16 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				}
 				seen_name = 1;
 				oc->oc_names = parse_qdescrs(&ss,code);
-				if ( !oc->oc_names ) {
-					if ( *code != LDAP_SCHERR_OUTOFMEM )
+				if (!oc->oc_names) {
+					if (*code != LDAP_SCHERR_OUTOFMEM)
 						*code = LDAP_SCHERR_BADNAME;
 					*errp = ss;
 					ldap_objectclass_free(oc);
 					return NULL;
 				}
-			} else if ( !strcasecmp(sval,"DESC") ) {
+			} else if (!strcasecmp(sval,"DESC")) {
 				LDAP_FREE(sval);
-				if ( seen_desc ) {
+				if (seen_desc) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -608,7 +608,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				seen_desc = 1;
 				parse_whsp(&ss);
 				kind = get_token(&ss,&sval);
-				if ( kind != TK_QDSTRING ) {
+				if (kind != TK_QDSTRING) {
 					*code = LDAP_SCHERR_UNEXPTOKEN;
 					*errp = ss;
 					LDAP_FREE(sval);
@@ -617,9 +617,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				}
 				oc->oc_desc = sval;
 				parse_whsp(&ss);
-			} else if ( !strcasecmp(sval,"OBSOLETE") ) {
+			} else if (!strcasecmp(sval,"OBSOLETE")) {
 				LDAP_FREE(sval);
-				if ( seen_obsolete ) {
+				if (seen_obsolete) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -628,9 +628,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				seen_obsolete = 1;
 				oc->oc_obsolete = LDAP_SCHEMA_YES;
 				parse_whsp(&ss);
-			} else if ( !strcasecmp(sval,"SUP") ) {
+			} else if (!strcasecmp(sval,"SUP")) {
 				LDAP_FREE(sval);
-				if ( seen_sup ) {
+				if (seen_sup) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -640,14 +640,14 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				oc->oc_sup_oids = parse_oids(&ss,
 							     code,
 							     flags);
-				if ( !oc->oc_sup_oids ) {
+				if (!oc->oc_sup_oids) {
 					*errp = ss;
 					ldap_objectclass_free(oc);
 					return NULL;
 				}
-			} else if ( !strcasecmp(sval,"ABSTRACT") ) {
+			} else if (!strcasecmp(sval,"ABSTRACT")) {
 				LDAP_FREE(sval);
-				if ( seen_kind ) {
+				if (seen_kind) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -656,9 +656,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				seen_kind = 1;
 				oc->oc_kind = LDAP_SCHEMA_ABSTRACT;
 				parse_whsp(&ss);
-			} else if ( !strcasecmp(sval,"STRUCTURAL") ) {
+			} else if (!strcasecmp(sval,"STRUCTURAL")) {
 				LDAP_FREE(sval);
-				if ( seen_kind ) {
+				if (seen_kind) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -667,9 +667,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				seen_kind = 1;
 				oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
 				parse_whsp(&ss);
-			} else if ( !strcasecmp(sval,"AUXILIARY") ) {
+			} else if (!strcasecmp(sval,"AUXILIARY")) {
 				LDAP_FREE(sval);
-				if ( seen_kind ) {
+				if (seen_kind) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -678,9 +678,9 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				seen_kind = 1;
 				oc->oc_kind = LDAP_SCHEMA_AUXILIARY;
 				parse_whsp(&ss);
-			} else if ( !strcasecmp(sval,"MUST") ) {
+			} else if (!strcasecmp(sval,"MUST")) {
 				LDAP_FREE(sval);
-				if ( seen_must ) {
+				if (seen_must) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -688,15 +688,15 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				}
 				seen_must = 1;
 				oc->oc_at_oids_must = parse_oids(&ss,code,0);
-				if ( !oc->oc_at_oids_must ) {
+				if (!oc->oc_at_oids_must) {
 					*errp = ss;
 					ldap_objectclass_free(oc);
 					return NULL;
 				}
 				parse_whsp(&ss);
-			} else if ( !strcasecmp(sval,"MAY") ) {
+			} else if (!strcasecmp(sval,"MAY")) {
 				LDAP_FREE(sval);
-				if ( seen_may ) {
+				if (seen_may) {
 					*code = LDAP_SCHERR_DUPOPT;
 					*errp = ss;
 					ldap_objectclass_free(oc);
@@ -704,16 +704,16 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 				}
 				seen_may = 1;
 				oc->oc_at_oids_may = parse_oids(&ss,code,0);
-				if ( !oc->oc_at_oids_may ) {
+				if (!oc->oc_at_oids_may) {
 					*errp = ss;
 					ldap_objectclass_free(oc);
 					return NULL;
 				}
 				parse_whsp(&ss);
-			} else if ( sval[0] == 'X' && sval[1] == '-' ) {
+			} else if (sval[0] == 'X' && sval[1] == '-') {
 				/* Should be parse_qdstrings */
 				ext_vals = parse_qdescrs(&ss, code);
-				if ( !ext_vals ) {
+				if (!ext_vals) {
 					*errp = ss;
 					ldap_objectclass_free(oc);
 					return NULL;
@@ -755,7 +755,7 @@ ldap_str2objectclass( LDAP_CONST gchar * s,
 static gchar *ldap_utf8_strchr( const gchar *str, const gchar *chr )
 {
 	for (; *str != '\0'; LDAP_UTF8_INCR(str) ) {
-		if ( ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr ) ) {
+		if (ldap_x_utf8_to_ucs4( str ) == ldap_x_utf8_to_ucs4( chr )) {
 			return (gchar *) str;
 		}
 	}
@@ -770,7 +770,7 @@ static gsize ldap_utf8_strcspn( const gchar *str, const gchar *set )
 
 	for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
 		for ( cset = set; *cset != '\0'; LDAP_UTF8_INCR(cset) ) {
-			if ( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
+			if (ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset )) {
 				return cstr - str;
 			}
 		}
@@ -786,11 +786,11 @@ static gsize ldap_utf8_strspn( const gchar *str, const gchar *set )
 
 	for ( cstr = str; *cstr != '\0'; LDAP_UTF8_INCR(cstr) ) {
 		for ( cset = set; ; LDAP_UTF8_INCR(cset) ) {
-			if ( *cset == '\0' ) {
+			if (*cset == '\0') {
 				return cstr - str;
 			}
 
-			if ( ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset ) ) {
+			if (ldap_x_utf8_to_ucs4( cstr ) == ldap_x_utf8_to_ucs4( cset )) {
 				break;
 			}
 		}
@@ -804,20 +804,20 @@ static gchar *ldap_utf8_strtok(gchar *str, const gchar *sep, gchar **last)
 	gchar *begin;
 	gchar *end;
 
-	if ( last == NULL ) return NULL;
+	if (last == NULL) return NULL;
 
 	begin = str ? str : *last;
 
 	begin += ldap_utf8_strspn( begin, sep );
 
-	if ( *begin == '\0' ) {
+	if (*begin == '\0') {
 		*last = NULL;
 		return NULL;
 	}
 
 	end = &begin[ ldap_utf8_strcspn( begin, sep ) ];
 
-	if ( *end != '\0' ) {
+	if (*end != '\0') {
 		gchar *next = LDAP_UTF8_NEXT( end );
 		*end = '\0';
 		end = next;
@@ -879,14 +879,14 @@ skip_url_prefix(
 	 */
 	const gchar *p;
 
-	if ( url == NULL ) {
+	if (url == NULL) {
 		return( NULL );
 	}
 
 	p = url;
 
 	/* skip leading '<' (if any) */
-	if ( *p == '<' ) {
+	if (*p == '<') {
 		*enclosedp = 1;
 		++p;
 	} else {
@@ -894,12 +894,12 @@ skip_url_prefix(
 	}
 
 	/* skip leading "URL:" (if any) */
-	if ( strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0 ) {
+	if (strncasecmp( p, LDAP_URL_URLCOLON, LDAP_URL_URLCOLON_LEN ) == 0) {
 		p += LDAP_URL_URLCOLON_LEN;
 	}
 
 	/* check for "ldap://" prefix */
-	if ( strncasecmp( p, LDAP_URL_PREFIX, LDAP_URL_PREFIX_LEN ) == 0 ) {
+	if (strncasecmp( p, LDAP_URL_PREFIX, LDAP_URL_PREFIX_LEN ) == 0) {
 		/* skip over "ldap://" prefix and return success */
 		p += LDAP_URL_PREFIX_LEN;
 		*scheme = "ldap";
@@ -907,7 +907,7 @@ skip_url_prefix(
 	}
 
 	/* check for "ldaps://" prefix */
-	if ( strncasecmp( p, LDAPS_URL_PREFIX, LDAPS_URL_PREFIX_LEN ) == 0 ) {
+	if (strncasecmp( p, LDAPS_URL_PREFIX, LDAPS_URL_PREFIX_LEN ) == 0) {
 		/* skip over "ldaps://" prefix and return success */
 		p += LDAPS_URL_PREFIX_LEN;
 		*scheme = "ldaps";
@@ -915,7 +915,7 @@ skip_url_prefix(
 	}
 
 	/* check for "ldapi://" prefix */
-	if ( strncasecmp( p, LDAPI_URL_PREFIX, LDAPI_URL_PREFIX_LEN ) == 0 ) {
+	if (strncasecmp( p, LDAPI_URL_PREFIX, LDAPI_URL_PREFIX_LEN ) == 0) {
 		/* skip over "ldapi://" prefix and return success */
 		p += LDAPI_URL_PREFIX_LEN;
 		*scheme = "ldapi";
@@ -924,7 +924,7 @@ skip_url_prefix(
 
 #ifdef LDAP_CONNECTIONLESS
 	/* check for "cldap://" prefix */
-	if ( strncasecmp( p, LDAPC_URL_PREFIX, LDAPC_URL_PREFIX_LEN ) == 0 ) {
+	if (strncasecmp( p, LDAPC_URL_PREFIX, LDAPC_URL_PREFIX_LEN ) == 0) {
 		/* skip over "cldap://" prefix and return success */
 		p += LDAPC_URL_PREFIX_LEN;
 		*scheme = "cldap";
@@ -937,19 +937,19 @@ skip_url_prefix(
 
 static gint str2scope( const gchar *p )
 {
-	if ( strcasecmp( p, "one" ) == 0 ) {
+	if (strcasecmp( p, "one" ) == 0) {
 		return LDAP_SCOPE_ONELEVEL;
 
-	} else if ( strcasecmp( p, "onelevel" ) == 0 ) {
+	} else if (strcasecmp( p, "onelevel" ) == 0) {
 		return LDAP_SCOPE_ONELEVEL;
 
-	} else if ( strcasecmp( p, "base" ) == 0 ) {
+	} else if (strcasecmp( p, "base" ) == 0) {
 		return LDAP_SCOPE_BASE;
 
-	} else if ( strcasecmp( p, "sub" ) == 0 ) {
+	} else if (strcasecmp( p, "sub" ) == 0) {
 		return LDAP_SCOPE_SUBTREE;
 
-	} else if ( strcasecmp( p, "subtree" ) == 0 ) {
+	} else if (strcasecmp( p, "subtree" ) == 0) {
 		return LDAP_SCOPE_SUBTREE;
 	}
 
@@ -959,31 +959,31 @@ static gint str2scope( const gchar *p )
 static void
 ldap_free_urldesc( LDAPURLDesc *ludp )
 {
-	if ( ludp == NULL ) {
+	if (ludp == NULL) {
 		return;
 	}
 
-	if ( ludp->lud_scheme != NULL ) {
+	if (ludp->lud_scheme != NULL) {
 		LDAP_FREE( ludp->lud_scheme );
 	}
 
-	if ( ludp->lud_host != NULL ) {
+	if (ludp->lud_host != NULL) {
 		LDAP_FREE( ludp->lud_host );
 	}
 
-	if ( ludp->lud_dn != NULL ) {
+	if (ludp->lud_dn != NULL) {
 		LDAP_FREE( ludp->lud_dn );
 	}
 
-	if ( ludp->lud_filter != NULL ) {
+	if (ludp->lud_filter != NULL) {
 		LDAP_FREE( ludp->lud_filter);
 	}
 
-	if ( ludp->lud_attrs != NULL ) {
+	if (ludp->lud_attrs != NULL) {
 		LDAP_VFREE( ludp->lud_attrs );
 	}
 
-	if ( ludp->lud_exts != NULL ) {
+	if (ludp->lud_exts != NULL) {
 		LDAP_VFREE( ludp->lud_exts );
 	}
 
@@ -1008,12 +1008,12 @@ ldap_pvt_hex_unescape( gchar *s )
 	gchar	*p;
 
 	for ( p = s; *s != '\0'; ++s ) {
-		if ( *s == '%' ) {
-			if ( *++s == '\0' ) {
+		if (*s == '%') {
+			if (*++s == '\0') {
 				break;
 			}
 			*p = ldap_int_unhex( *s ) << 4;
-			if ( *++s == '\0' ) {
+			if (*++s == '\0') {
 				break;
 			}
 			*p++ += ldap_int_unhex( *s );
@@ -1035,20 +1035,20 @@ ldap_str2charray( const gchar *str_in, const gchar *brkstr )
 
 	/* protect the input string from strtok */
 	str = LDAP_STRDUP( str_in );
-	if ( str == NULL ) {
+	if (str == NULL) {
 		return NULL;
 	}
 
 	i = 1;
 	for ( s = str; *s; s++ ) {
-		if ( ldap_utf8_strchr( brkstr, s ) != NULL ) {
+		if (ldap_utf8_strchr( brkstr, s ) != NULL) {
 			i++;
 		}
 	}
 
 	res = (gchar **) LDAP_MALLOC( (i + 1) * sizeof(gchar *) );
 
-	if ( res == NULL ) {
+	if (res == NULL) {
 		LDAP_FREE( str );
 		return NULL;
 	}
@@ -1093,7 +1093,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	const gchar *url_tmp;
 	gchar *url;
 
-	if ( url_in == NULL || ludpp == NULL ) {
+	if (url_in == NULL || ludpp == NULL) {
 		return LDAP_URL_ERR_PARAM;
 	}
 
@@ -1101,7 +1101,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 
 	url_tmp = skip_url_prefix( url_in, &enclosed, &scheme );
 
-	if ( url_tmp == NULL ) {
+	if (url_tmp == NULL) {
 		return LDAP_URL_ERR_BADSCHEME;
 	}
 
@@ -1109,14 +1109,14 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 
 	/* make working copy of the remainder of the URL */
 	url = LDAP_STRDUP( url_tmp );
-	if ( url == NULL ) {
+	if (url == NULL) {
 		return LDAP_URL_ERR_MEM;
 	}
 
-	if ( enclosed ) {
+	if (enclosed) {
 		p = &url[strlen(url)-1];
 
-		if ( *p != '>' ) {
+		if (*p != '>') {
 			LDAP_FREE( url );
 			return LDAP_URL_ERR_BADENCLOSURE;
 		}
@@ -1127,7 +1127,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* allocate return struct */
 	ludp = (LDAPURLDesc *)LDAP_CALLOC( 1, sizeof( LDAPURLDesc ));
 
-	if ( ludp == NULL ) {
+	if (ludp == NULL) {
 		LDAP_FREE( url );
 		return LDAP_URL_ERR_MEM;
 	}
@@ -1144,7 +1144,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 
 	ludp->lud_scheme = LDAP_STRDUP( scheme );
 
-	if ( ludp->lud_scheme == NULL ) {
+	if (ludp->lud_scheme == NULL) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_MEM;
@@ -1153,15 +1153,15 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* scan forward for '/' that marks end of hostport and begin. of dn */
 	p = strchr( url, '/' );
 
-	if ( p != NULL ) {
+	if (p != NULL) {
 		/* terminate hostport; point to start of dn */
 		*p++ = '\0';
 	}
 
 	/* IPv6 syntax with [ip address]:port */
-	if ( *url == '[' ) {
+	if (*url == '[') {
 		r = strchr( url, ']' );
-		if ( r == NULL ) {
+		if (r == NULL) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADURL;
@@ -1172,20 +1172,20 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		q = strchr( url, ':' );
 	}
 
-	if ( q != NULL ) {
+	if (q != NULL) {
 		gchar	*next;
 
 		*q++ = '\0';
 		ldap_pvt_hex_unescape( q );
 
-		if ( *q == '\0' ) {
+		if (*q == '\0') {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADURL;
 		}
 
 		ludp->lud_port = strtol( q, &next, 10 );
-		if ( next == NULL || next[0] != '\0' ) {
+		if (next == NULL || next[0] != '\0') {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADURL;
@@ -1197,7 +1197,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* If [ip address]:port syntax, url is [ip and we skip the [ */
 	ludp->lud_host = LDAP_STRDUP( url + ( *url == '[' ) );
 
-	if ( ludp->lud_host == NULL ) {
+	if (ludp->lud_host == NULL) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_MEM;
@@ -1217,7 +1217,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		/* ? immediately followed by question */
 		if ( *q == '?') {
 			q++;
-			if ( *q != '\0' ) {
+			if (*q != '\0') {
 				/* parse dn part */
 				ldap_pvt_hex_unescape( q );
 				ludp->lud_dn = LDAP_STRDUP( q );
@@ -1225,7 +1225,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 				ludp->lud_dn = LDAP_STRDUP( "" );
 			}
 
-			if ( ludp->lud_dn == NULL ) {
+			if (ludp->lud_dn == NULL) {
 				LDAP_FREE( url );
 				ldap_free_urldesc( ludp );
 				return LDAP_URL_ERR_MEM;
@@ -1233,7 +1233,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		}
 	}
 
-	if ( p == NULL ) {
+	if (p == NULL) {
 		LDAP_FREE( url );
 		*ludpp = ludp;
 		return LDAP_URL_SUCCESS;
@@ -1242,12 +1242,12 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* scan forward for '?' that may marks end of dn */
 	q = strchr( p, '?' );
 
-	if ( q != NULL ) {
+	if (q != NULL) {
 		/* terminate dn part */
 		*q++ = '\0';
 	}
 
-	if ( *p != '\0' ) {
+	if (*p != '\0') {
 		/* parse dn part */
 		ldap_pvt_hex_unescape( p );
 		ludp->lud_dn = LDAP_STRDUP( p );
@@ -1255,13 +1255,13 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		ludp->lud_dn = LDAP_STRDUP( "" );
 	}
 
-	if ( ludp->lud_dn == NULL ) {
+	if (ludp->lud_dn == NULL) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_MEM;
 	}
 
-	if ( q == NULL ) {
+	if (q == NULL) {
 		/* no more */
 		LDAP_FREE( url );
 		*ludpp = ludp;
@@ -1272,24 +1272,24 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if ( q != NULL ) {
+	if (q != NULL) {
 		/* terminate attributes part */
 		*q++ = '\0';
 	}
 
-	if ( *p != '\0' ) {
+	if (*p != '\0') {
 		/* parse attributes */
 		ldap_pvt_hex_unescape( p );
 		ludp->lud_attrs = ldap_str2charray( p, "," );
 
-		if ( ludp->lud_attrs == NULL ) {
+		if (ludp->lud_attrs == NULL) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADATTRS;
 		}
 	}
 
-	if ( q == NULL ) {
+	if (q == NULL) {
 		/* no more */
 		LDAP_FREE( url );
 		*ludpp = ludp;
@@ -1300,24 +1300,24 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if ( q != NULL ) {
+	if (q != NULL) {
 		/* terminate the scope part */
 		*q++ = '\0';
 	}
 
-	if ( *p != '\0' ) {
+	if (*p != '\0') {
 		/* parse the scope */
 		ldap_pvt_hex_unescape( p );
 		ludp->lud_scope = str2scope( p );
 
-		if ( ludp->lud_scope == -1 ) {
+		if (ludp->lud_scope == -1) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_BADSCOPE;
 		}
 	}
 
-	if ( q == NULL ) {
+	if (q == NULL) {
 		/* no more */
 		LDAP_FREE( url );
 		*ludpp = ludp;
@@ -1328,16 +1328,16 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if ( q != NULL ) {
+	if (q != NULL) {
 		/* terminate the filter part */
 		*q++ = '\0';
 	}
 
-	if ( *p != '\0' ) {
+	if (*p != '\0') {
 		/* parse the filter */
 		ldap_pvt_hex_unescape( p );
 
-		if ( ! *p ) {
+		if (!*p) {
 			/* missing filter */
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
@@ -1347,14 +1347,14 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 		LDAP_FREE( ludp->lud_filter );
 		ludp->lud_filter = LDAP_STRDUP( p );
 
-		if ( ludp->lud_filter == NULL ) {
+		if (ludp->lud_filter == NULL) {
 			LDAP_FREE( url );
 			ldap_free_urldesc( ludp );
 			return LDAP_URL_ERR_MEM;
 		}
 	}
 
-	if ( q == NULL ) {
+	if (q == NULL) {
 		/* no more */
 		LDAP_FREE( url );
 		*ludpp = ludp;
@@ -1365,7 +1365,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	p = q;
 	q = strchr( p, '?' );
 
-	if ( q != NULL ) {
+	if (q != NULL) {
 		/* extra '?' */
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
@@ -1375,7 +1375,7 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	/* parse the extensions */
 	ludp->lud_exts = ldap_str2charray( p, "," );
 
-	if ( ludp->lud_exts == NULL ) {
+	if (ludp->lud_exts == NULL) {
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
 		return LDAP_URL_ERR_BADEXTS;
@@ -1384,13 +1384,13 @@ ldap_url_parse_ext( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	for ( i=0; ludp->lud_exts[i] != NULL; i++ ) {
 		ldap_pvt_hex_unescape( ludp->lud_exts[i] );
 
-		if ( *ludp->lud_exts[i] == '!' ) {
+		if (*ludp->lud_exts[i] == '!') {
 			/* count the number of critical extensions */
 			ludp->lud_crit_exts++;
 		}
 	}
 
-	if ( i == 0 ) {
+	if (i == 0) {
 		/* must have 1 or more */
 		LDAP_FREE( url );
 		ldap_free_urldesc( ludp );
@@ -1408,7 +1408,7 @@ ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 {
 	gint rc = ldap_url_parse_ext( url_in, ludpp );
 
-	if ( rc != LDAP_URL_SUCCESS ) {
+	if (rc != LDAP_URL_SUCCESS) {
 		return rc;
 	}
 
@@ -1422,13 +1422,13 @@ ldap_url_parse( LDAP_CONST gchar *url_in, LDAPURLDesc **ludpp )
 	}
 
 	if ((*ludpp)->lud_port == 0) {
-		if ( strcmp((*ludpp)->lud_scheme, "ldap") == 0 ) {
+		if (strcmp((*ludpp)->lud_scheme, "ldap") == 0) {
 			(*ludpp)->lud_port = LDAP_PORT;
 #ifdef LDAP_CONNECTIONLESS
-		} else if ( strcmp((*ludpp)->lud_scheme, "cldap") == 0 ) {
+		} else if (strcmp((*ludpp)->lud_scheme, "cldap") == 0) {
 			(*ludpp)->lud_port = LDAP_PORT;
 #endif
-		} else if ( strcmp((*ludpp)->lud_scheme, "ldaps") == 0 ) {
+		} else if (strcmp((*ludpp)->lud_scheme, "ldaps") == 0) {
 			(*ludpp)->lud_port = LDAPS_PORT;
 		}
 	}
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index f4ccaa5277..3c52672063 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -194,7 +194,7 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name,  const gchar
 	e_source_group_add_source (group, source, -1);
 
 	ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, &error);
-	if ( error != NULL ) {
+	if (error != NULL) {
 		g_warning("%s (%s) %s\n", G_STRLOC, G_STRFUNC, error->message);
 		g_error_free(error);
 	}
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index f48745a364..e3666f94de 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -343,7 +343,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 		return;
 
 	/* don't miss the entry if the mail has only e-mail id and no name */
-	if (name == NULL || ! strcmp (name, "")) {
+	if (name == NULL || !strcmp (name, "")) {
 		temp_name = g_strndup (email, delim - email);
 		name = temp_name;
 	}
@@ -400,7 +400,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 
 		contact = (EContact *) contacts->data;
 		add_email_to_contact (contact, email);
-		if (! e_book_commit_contact (book, contact, &error)) {
+		if (!e_book_commit_contact (book, contact, &error)) {
 			g_warning ("bbdb: Could not modify contact: %s\n", error->message);
 			g_error_free (error);
 		}
@@ -419,7 +419,7 @@ bbdb_do_it (EBook *book, const gchar *name, const gchar *email)
 	add_email_to_contact (contact, email);
 	g_free (temp_name);
 
-	if (! e_book_add_contact (book, contact, &error)) {
+	if (!e_book_add_contact (book, contact, &error)) {
 		g_warning ("bbdb: Failed to add new contact: %s\n", error->message);
 		g_error_free (error);
 		return;
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 13744187f9..184c071e39 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -105,7 +105,7 @@ bbdb_sync_buddy_list_check (void)
 	/* Reprocess the buddy list if it's been updated. */
 	gconf = gconf_client_get_default ();
 	last_sync_str = gconf_client_get_string (gconf, GCONF_KEY_GAIM_LAST_SYNC_TIME, NULL);
-	if (last_sync_str == NULL || ! strcmp ((const gchar *)last_sync_str, ""))
+	if (last_sync_str == NULL || !strcmp ((const gchar *)last_sync_str, ""))
 		last_sync_time = (time_t) 0;
 	else
 		last_sync_time = (time_t) g_ascii_strtoull (last_sync_str, NULL, 10);
@@ -237,7 +237,7 @@ bbdb_sync_buddy_list_in_thread (gpointer data)
 			continue;
 		}
 
-		if (! e_book_add_contact (std->book, c, &error)) {
+		if (!e_book_add_contact (std->book, c, &error)) {
 			g_warning ("bbdb: Failed to add new contact: %s\n", error->message);
 			g_error_free (error);
 			goto finish;
@@ -321,7 +321,7 @@ im_list_contains_buddy (GList *ims, GaimBuddy *b)
 	for (l = ims; l != NULL; l = l->next) {
 		gchar *im = (gchar *) l->data;
 
-		if (! strcmp (im, b->account_name))
+		if (!strcmp (im, b->account_name))
 			return TRUE;
 	}
 
@@ -342,7 +342,7 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c)
 	/* Set the IM account */
 	field = proto_to_contact_field (b->proto);
 	ims = e_contact_get (c, field);
-	if (! im_list_contains_buddy (ims, b)) {
+	if (!im_list_contains_buddy (ims, b)) {
 		ims = g_list_append (ims, (gpointer) b->account_name);
 		e_contact_set (c, field, (gpointer) ims);
 		dirty = TRUE;
@@ -388,19 +388,19 @@ bbdb_merge_buddy_to_contact (EBook *book, GaimBuddy *b, EContact *c)
 static EContactField
 proto_to_contact_field (const gchar *proto)
 {
-	if (! strcmp (proto,  "prpl-oscar"))
+	if (!strcmp (proto,  "prpl-oscar"))
 		return E_CONTACT_IM_AIM;
-	if (! strcmp (proto, "prpl-novell"))
+	if (!strcmp (proto, "prpl-novell"))
 		return E_CONTACT_IM_GROUPWISE;
-	if (! strcmp (proto, "prpl-msn"))
+	if (!strcmp (proto, "prpl-msn"))
 		return E_CONTACT_IM_MSN;
-	if (! strcmp (proto, "prpl-icq"))
+	if (!strcmp (proto, "prpl-icq"))
 		return E_CONTACT_IM_ICQ;
-	if (! strcmp (proto, "prpl-yahoo"))
+	if (!strcmp (proto, "prpl-yahoo"))
 		return E_CONTACT_IM_YAHOO;
-	if (! strcmp (proto, "prpl-jabber"))
+	if (!strcmp (proto, "prpl-jabber"))
 		return E_CONTACT_IM_JABBER;
-	if (! strcmp (proto, "prpl-gg"))
+	if (!strcmp (proto, "prpl-gg"))
 		return E_CONTACT_IM_GADUGADU;
 
 	return E_CONTACT_IM_AIM;
@@ -440,7 +440,7 @@ bbdb_get_gaim_buddy_list (void)
 
 	buddy_xml = xmlParseFile (blist_path);
 	g_free (blist_path);
-	if (! buddy_xml) {
+	if (!buddy_xml) {
 		fprintf (stderr, "bbdb: Could not open Pidgin buddy list.\n");
 		return NULL;
 	}
@@ -453,7 +453,7 @@ bbdb_get_gaim_buddy_list (void)
 	}
 
 	for (child = root->children; child != NULL; child = child->next) {
-		if (! strcmp ((const gchar *)child->name, "privacy")) {
+		if (!strcmp ((const gchar *)child->name, "privacy")) {
 			get_all_blocked (child, &blocked);
 			break;
 		}
@@ -461,7 +461,7 @@ bbdb_get_gaim_buddy_list (void)
 
 	blist = NULL;
 	for (child = root->children; child != NULL; child = child->next) {
-		if (! strcmp ((const gchar *)child->name, "blist")) {
+		if (!strcmp ((const gchar *)child->name, "blist")) {
 			blist = child;
 			break;
 		}
@@ -473,7 +473,7 @@ bbdb_get_gaim_buddy_list (void)
 	}
 
 	for (child = blist->children; child != NULL; child = child->next) {
-		if (! strcmp ((const gchar *)child->name, "group"))
+		if (!strcmp ((const gchar *)child->name, "group"))
 			parse_buddy_group (child, &buddies, blocked);
 	}
 
@@ -541,7 +541,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked)
 	gboolean    is_blocked = FALSE;
 
 	for (child = contact->children; child != NULL; child = child->next) {
-		if (! strcmp ((const gchar *)child->name, "buddy")) {
+		if (!strcmp ((const gchar *)child->name, "buddy")) {
 			buddy = child;
 			break;
 		}
@@ -559,20 +559,20 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked)
 	gb->proto = e_xml_get_string_prop_by_name (buddy, (const guchar *)"proto");
 
 	for (child = buddy->children; child != NULL && !is_blocked; child = child->next) {
-		if (! strcmp ((const gchar *)child->name, "setting")) {
+		if (!strcmp ((const gchar *)child->name, "setting")) {
 			gchar *setting_type;
 			setting_type = e_xml_get_string_prop_by_name (child, (const guchar *)"name");
 
-			if (! strcmp ((const gchar *)setting_type, "buddy_icon"))
+			if (!strcmp ((const gchar *)setting_type, "buddy_icon"))
 				gb->icon = get_buddy_icon_from_setting (child);
 
 			g_free (setting_type);
-		} else if (! strcmp ((const gchar *)child->name, "name")) {
+		} else if (!strcmp ((const gchar *)child->name, "name")) {
 			gb->account_name = get_node_text (child);
 			is_blocked = g_slist_find_custom (
 				blocked, gb->account_name,
 				(GCompareFunc) strcmp) != NULL;
-		} else if (! strcmp ((const gchar *)child->name, "alias"))
+		} else if (!strcmp ((const gchar *)child->name, "alias"))
 			gb->alias = get_node_text (child);
 
 	}
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index 5b10072a2d..60d37800f4 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -273,7 +273,7 @@ async_external_editor (EMsgComposer *composer)
 	gconf = gconf_client_get_default ();
 	editor_cmd = gconf_client_get_string (gconf, EDITOR_GCONF_KEY_COMMAND, NULL);
 	if (!editor_cmd) {
-		if (! (editor_cmd = g_strdup (g_getenv ("EDITOR"))) )
+		if (!(editor_cmd = g_strdup (g_getenv ("EDITOR"))) )
 			/* Make gedit the default external editor,
 			   if the default schemas are not installed
 			   and no $EDITOR is set. */
diff --git a/plugins/groupwise-features/camel-gw-listener.c b/plugins/groupwise-features/camel-gw-listener.c
index b65ba9768f..b9385ab390 100644
--- a/plugins/groupwise-features/camel-gw-listener.c
+++ b/plugins/groupwise-features/camel-gw-listener.c
@@ -876,7 +876,7 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		g_free (existing_account_info->source_url);
 		g_free (existing_account_info);
 
-	} else if ( existing_account_info != NULL && is_gw_account ) {
+	} else if (existing_account_info != NULL && is_gw_account) {
 
 		if (!account->enabled) {
 			account_removed (account_listener, account);
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 625789c370..6654844bb7 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -349,7 +349,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 									     email, NULL);
 						return -1;
 					}
-					if (! g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) {
+					if (!g_ascii_strcasecmp(e_gw_connection_get_user_email (prd->cnc), email)) {
 						e_alert_run_dialog_for_args (parent,
 									     "org.gnome.evolution.proxy:invalid-user",
 									     email, NULL);
@@ -361,7 +361,7 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog, GtkWindow *pa
 
 					for (;existing_list; existing_list = g_list_next(existing_list)) {
 						new_proxy = (proxyHandler *) existing_list->data;
-						if ( !g_ascii_strcasecmp (new_proxy->proxy_email, email) ) {
+						if (!g_ascii_strcasecmp (new_proxy->proxy_email, email)) {
 							if (new_proxy->flags & E_GW_PROXY_DELETED) {
 								new_proxy->permissions = proxy_get_permissions_from_dialog (account);
 								if (new_proxy->flags & E_GW_PROXY_NEW)
@@ -621,7 +621,7 @@ proxy_update_tree_view (EAccount *account)
 	for (;list_iter; list_iter = g_list_next(list_iter)) {
 		aclInstance = (proxyHandler *) list_iter->data;
 
-		if (! (aclInstance->flags & E_GW_PROXY_DELETED )) {
+		if (!(aclInstance->flags & E_GW_PROXY_DELETED )) {
 			gtk_tree_store_append (priv->store, &iter, NULL);
 			gtk_tree_store_set (priv->store, &iter, 0, broken_image, 1, g_strconcat(aclInstance->proxy_name,"\n",aclInstance->proxy_email, NULL), -1);
 		}
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index cae99e77d0..7470337995 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -587,7 +587,7 @@ add_right_clicked (GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if (! usr->flag)  /* if user was already existing one change the flag to update*/
+	if (!usr->flag)  /* if user was already existing one change the flag to update*/
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
@@ -620,7 +620,7 @@ edit_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if (! usr->flag)  /* if user was already existing one change the flag to update*/
+	if (!usr->flag)  /* if user was already existing one change the flag to update*/
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 
@@ -654,7 +654,7 @@ delete_right_clicked(GtkCellRenderer *renderer, gchar *arg1, ShareFolder *sf )
 		gtk_tree_path_free (path);
 		return;
 	}
-	if (! usr->flag)  /* if user was already existing one change the flag to update*/
+	if (!usr->flag)  /* if user was already existing one change the flag to update*/
 		usr->flag = usr->flag | 0x2;
 	user = usr->user_node;
 	if (!right) {
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index ca045f0533..3b1c3bfb43 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -482,7 +482,7 @@ account_changed (EAccountList *account_listener, EAccount *account)
 		g_free (existing_account_info->source_url);
 		g_free (existing_account_info);
 
-	} else if ( existing_account_info != NULL && is_hula ) {
+	} else if (existing_account_info != NULL && is_hula) {
 
 		if (!account->enabled) {
 			account_removed (account_listener, account);
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 6ed7bccc08..dd5ad07b24 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -199,7 +199,7 @@ change_dir_modes (const gchar *path)
 {
 	GDir *dir;
 	GError *err = NULL;
-	const char *file = NULL;
+	const gchar *file = NULL;
 
 	dir = g_dir_open (path, 0, &err);
 	if (err) {
@@ -217,18 +217,18 @@ change_dir_modes (const gchar *path)
 		g_free (full_path);
 	}
 
-	g_chmod (path, 0700);	
+	g_chmod (path, 0700);
 	g_dir_close (dir);
 }
 
 static void
-fix_folder_permissions (const char *data_dir)
+fix_folder_permissions (const gchar *data_dir)
 {
 	struct stat sb;
 
 	if (g_stat (data_dir, &sb) == -1) {
 		g_warning ("error stat: %s \n", data_dir);
-		return;	
+		return;
 	}
 
 	if (((guint32) sb.st_mode & 0777) != 0700)
diff --git a/smclient/eggdesktopfile.c b/smclient/eggdesktopfile.c
index 9f18be1dc6..f264a93cdb 100644
--- a/smclient/eggdesktopfile.c
+++ b/smclient/eggdesktopfile.c
@@ -172,7 +172,7 @@ egg_desktop_file_new_from_key_file (GKeyFile    *key_file,
 				  NULL);
   if (version)
     {
-      double version_num;
+      gdouble version_num;
       gchar *end;
 
       version_num = g_ascii_strtod (version, &end);
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 13185db3eb..ce22dc8537 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -105,14 +105,14 @@ collect_certs(gpointer arg, SECItem **certs, gint numcerts)
 	collectArgs->numcerts = numcerts;
 	collectArgs->rawCerts = (SECItem *) PORT_ArenaZAlloc(
 		collectArgs->arena, sizeof (SECItem) * numcerts);
-	if ( collectArgs->rawCerts == NULL )
+	if (collectArgs->rawCerts == NULL)
 		return(SECFailure);
 
 	cert = collectArgs->rawCerts;
 
-	while ( numcerts-- ) {
+	while (numcerts--) {
 		rv = SECITEM_CopyItem(collectArgs->arena, cert, *certs);
-		if ( rv == SECFailure )
+		if (rv == SECFailure)
 			return(SECFailure);
 		cert++;
 		certs++;
@@ -895,7 +895,7 @@ e_cert_db_import_email_cert (ECertDB *certdb,
 	}
 	numcerts = certCollection->numcerts;
 	rawCerts = (SECItem **) PORT_Alloc(sizeof(SECItem *) * numcerts);
-	if ( !rawCerts ) {
+	if (!rawCerts) {
 		/* XXX g_error */
 		rv = FALSE;
 		goto loser;
@@ -908,7 +908,7 @@ e_cert_db_import_email_cert (ECertDB *certdb,
 	srv = CERT_ImportCerts(CERT_GetDefaultCertDB(), certUsageEmailSigner,
 			       numcerts, rawCerts, NULL, PR_TRUE, PR_FALSE,
 			       NULL);
-	if ( srv != SECSuccess ) {
+	if (srv != SECSuccess) {
 		/* XXX g_error */
 		rv = FALSE;
 		goto loser;
@@ -940,17 +940,17 @@ default_nickname (CERTCertificate *cert)
 	CERTCertDBHandle *defaultcertdb = CERT_GetDefaultCertDB();
 
 	username = CERT_GetCommonName(&cert->subject);
-	if ( username == NULL )
+	if (username == NULL)
 		username = PL_strdup("");
 
-	if ( username == NULL )
+	if (username == NULL)
 		goto loser;
 
 	caname = CERT_GetOrgName(&cert->issuer);
-	if ( caname == NULL )
+	if (caname == NULL)
 		caname = PL_strdup("");
 
-	if ( caname == NULL )
+	if (caname == NULL)
 		goto loser;
 
 	count = 1;
@@ -974,12 +974,12 @@ default_nickname (CERTCertificate *cert)
 		tmp = NULL;
 	}
 	tmp = nickname;
-	while ( 1 ) {
-		if ( count > 1 ) {
+	while (1) {
+		if (count > 1) {
 			nickname = PR_smprintf("%s #%d", tmp, count);
 		}
 
-		if ( nickname == NULL )
+		if (nickname == NULL)
 			goto loser;
 
 		if (PK11_IsInternal(slot)) {
@@ -1007,7 +1007,7 @@ default_nickname (CERTCertificate *cert)
 				}
 			}
 		}
-		if ( dummycert == NULL )
+		if (dummycert == NULL)
 			goto done;
 
 		/* found a cert, destroy it and loop */
@@ -1017,15 +1017,15 @@ default_nickname (CERTCertificate *cert)
 	} /* end of while (1) */
 
  loser:
-	if ( nickname ) {
+	if (nickname) {
 		PR_Free(nickname);
 	}
 	nickname = NULL;
  done:
-	if ( caname ) {
+	if (caname) {
 		PR_Free(caname);
 	}
-	if ( username )  {
+	if (username)  {
 		PR_Free(username);
 	}
 	if (slot != NULL) {
@@ -1064,7 +1064,7 @@ e_cert_db_import_user_cert (ECertDB *certdb,
 	CERTCertificate * cert=NULL;
 
 	arena = PORT_NewArena(DER_DEFAULT_CHUNKSIZE);
-	if ( arena == NULL ) {
+	if (arena == NULL) {
 		/* XXX g_error */
 		goto loser;
 	}
@@ -1083,7 +1083,7 @@ e_cert_db_import_user_cert (ECertDB *certdb,
 	}
 
 	slot = PK11_KeyForCertExists(cert, NULL, NULL);
-	if ( slot == NULL ) {
+	if (slot == NULL) {
 		/* XXX g_error */
 		goto loser;
 	}
@@ -1111,7 +1111,7 @@ e_cert_db_import_user_cert (ECertDB *certdb,
 
 	if (numCACerts) {
 		CACerts = collectArgs->rawCerts+1;
-		if ( ! CERT_ImportCAChain(CACerts, numCACerts, certUsageUserCertImport) ) {
+		if (!CERT_ImportCAChain(CACerts, numCACerts, certUsageUserCertImport)) {
 			rv = TRUE;
 		}
 	}
@@ -1120,7 +1120,7 @@ e_cert_db_import_user_cert (ECertDB *certdb,
 	if (arena) {
 		PORT_FreeArena(arena, PR_FALSE);
 	}
-	if ( cert ) {
+	if (cert) {
 		CERT_DestroyCertificate(cert);
 	}
 	return rv;
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index 4110b55313..3dc5f35709 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -504,14 +504,14 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
 	ETimezoneDialog *etd;
 	ETimezoneDialogPrivate *priv;
-	double longitude, latitude;
+	gdouble longitude, latitude;
 	icaltimezone *new_zone;
 	gchar *display=NULL;
 
 	etd = E_TIMEZONE_DIALOG (data);
 	priv = etd->priv;
 
-	e_map_window_to_world (priv->map, (double) event->x, (double) event->y,
+	e_map_window_to_world (priv->map, (gdouble) event->x, (gdouble) event->y,
 			       &longitude, &latitude);
 
 	if (priv->point_hover && priv->point_hover != priv->point_selected)
@@ -594,12 +594,12 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data)
 {
 	ETimezoneDialog *etd;
 	ETimezoneDialogPrivate *priv;
-	double longitude, latitude;
+	gdouble longitude, latitude;
 
 	etd = E_TIMEZONE_DIALOG (data);
 	priv = etd->priv;
 
-	e_map_window_to_world (priv->map, (double) event->x, (double) event->y,
+	e_map_window_to_world (priv->map, (gdouble) event->x, (gdouble) event->y,
 			       &longitude, &latitude);
 
 	if (event->button != 1) {
@@ -630,7 +630,7 @@ get_zone_from_point (ETimezoneDialog *etd,
 		     EMapPoint *point)
 {
 	icalarray *zones;
-	double longitude, latitude;
+	gdouble longitude, latitude;
 	gint i;
 
 	if (point == NULL)
@@ -643,7 +643,7 @@ get_zone_from_point (ETimezoneDialog *etd,
 
 	for (i = 0; i < zones->num_elements; i++) {
 		icaltimezone *zone;
-		double zone_longitude, zone_latitude;
+		gdouble zone_longitude, zone_latitude;
 
 		zone = icalarray_element_at (zones, i);
 		zone_longitude = icaltimezone_get_longitude (zone);
@@ -736,7 +736,7 @@ set_map_timezone (ETimezoneDialog *etd, icaltimezone *zone)
 {
 	ETimezoneDialogPrivate *priv;
 	EMapPoint *point;
-	double zone_longitude, zone_latitude;
+	gdouble zone_longitude, zone_latitude;
 
 	priv = etd->priv;
 
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 9829d81279..84adf6185f 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -57,7 +57,7 @@ static void e_calendar_item_realize	(GnomeCanvasItem *item);
 static void e_calendar_item_unrealize	(GnomeCanvasItem *item);
 static void e_calendar_item_unmap	(GnomeCanvasItem *item);
 static void e_calendar_item_update	(GnomeCanvasItem *item,
-					 double		 *affine,
+					 gdouble		 *affine,
 					 ArtSVP		 *clip_path,
 					 gint		  flags);
 static void e_calendar_item_draw	(GnomeCanvasItem *item,
@@ -85,9 +85,9 @@ static void e_calendar_item_draw_day_numbers (ECalendarItem	*calitem,
 					      gint		 start_weekday,
 					      gint		 cells_x,
 					      gint		 cells_y);
-static double e_calendar_item_point	(GnomeCanvasItem *item,
-					 double		  x,
-					 double		  y,
+static gdouble e_calendar_item_point	(GnomeCanvasItem *item,
+					 gdouble		  x,
+					 gdouble		  y,
 					 gint		  cx,
 					 gint		  cy,
 					 GnomeCanvasItem **actual_item);
@@ -100,8 +100,8 @@ static gint e_calendar_item_key_press_event (ECalendarItem *item,
 					     GdkEvent *event);
 static gint e_calendar_item_event	(GnomeCanvasItem *item,
 					 GdkEvent	 *event);
-static void e_calendar_item_bounds (GnomeCanvasItem *item, double *x1, double *y1,
-				    double *x2, double *y2);
+static void e_calendar_item_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1,
+				    gdouble *x2, gdouble *y2);
 
 static gboolean e_calendar_item_button_press	(ECalendarItem	*calitem,
 						 GdkEvent	*event);
@@ -880,7 +880,7 @@ e_calendar_item_unmap		(GnomeCanvasItem *item)
 
 static void
 e_calendar_item_update		(GnomeCanvasItem *item,
-				 double		 *affine,
+				 gdouble		 *affine,
 				 ArtSVP		 *clip_path,
 				 gint		  flags)
 {
@@ -1749,7 +1749,7 @@ e_calendar_item_get_week_number	(ECalendarItem *calitem,
    Since we are the only item we just return ourself and 0 for the distance.
    This is needed so that we get button/motion events. */
 static double
-e_calendar_item_point (GnomeCanvasItem *item, double x, double y,
+e_calendar_item_point (GnomeCanvasItem *item, gdouble x, gdouble y,
 			   gint cx, gint cy,
 			   GnomeCanvasItem **actual_item)
 {
@@ -1912,8 +1912,8 @@ e_calendar_item_event (GnomeCanvasItem *item, GdkEvent *event)
 }
 
 static void
-e_calendar_item_bounds (GnomeCanvasItem *item, double *x1, double *y1,
-			double *x2, double *y2)
+e_calendar_item_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1,
+			gdouble *x2, gdouble *y2)
 {
 	ECalendarItem *calitem;
 
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index f9879c2614..ab70082e95 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -50,10 +50,10 @@ struct _ECanvasBackgroundPrivate {
 	GdkColor color;		/* Fill color */
 	GdkBitmap *stipple;	/* Stipple for fill */
 	GdkGC *gc;			/* GC for filling */
-	double x1;
-	double x2;
-	double y1;
-	double y2;
+	gdouble x1;
+	gdouble x2;
+	gdouble y1;
+	gdouble y2;
 
 	guint needs_redraw : 1;
 };
@@ -88,9 +88,9 @@ get_color(ECanvasBackground *ecb)
 }
 
 static void
-ecb_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
+ecb_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2)
 {
-	double   i2c [6];
+	gdouble   i2c [6];
 	ArtPoint c1, c2, i1, i2;
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
 
@@ -106,16 +106,16 @@ ecb_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y
 	art_affine_point (&c2, &i2, i2c);
 
 	if (ecb->priv->x1 < 0)
-		c1.x = -(double)UINT_MAX;
+		c1.x = -(gdouble)UINT_MAX;
 
 	if (ecb->priv->y1 < 0)
-		c1.y = -(double)UINT_MAX;
+		c1.y = -(gdouble)UINT_MAX;
 
 	if (ecb->priv->x2 < 0)
-		c2.x = (double)UINT_MAX;
+		c2.x = (gdouble)UINT_MAX;
 
 	if (ecb->priv->y2 < 0)
-		c2.y = (double)UINT_MAX;
+		c2.y = (gdouble)UINT_MAX;
 
 	*x1 = c1.x;
 	*y1 = c1.y;
@@ -127,7 +127,7 @@ ecb_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y
  * GnomeCanvasItem::update method
  */
 static void
-ecb_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
+ecb_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags)
 {
 	ArtPoint o1, o2;
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
@@ -377,7 +377,7 @@ ecb_draw (GnomeCanvasItem *item,
 {
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
 	gint x1, x2, y1, y2;
-	double i2c [6];
+	gdouble i2c [6];
 	ArtPoint upper_left, lower_right, ecb_base_point;
 
 	/*
@@ -410,7 +410,7 @@ ecb_draw (GnomeCanvasItem *item,
 }
 
 static double
-ecb_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy,
+ecb_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy,
 	   GnomeCanvasItem **actual_item)
 {
 	ECanvasBackground *ecb = E_CANVAS_BACKGROUND (item);
diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h
index 7e3ac19a13..e1e24d0663 100644
--- a/widgets/misc/e-canvas-background.h
+++ b/widgets/misc/e-canvas-background.h
@@ -36,10 +36,10 @@ G_BEGIN_DECLS
  *							or NULL pointer for no color (transparent)
  * fill_color_gdk	GdkColor*	RW		Allocated GdkColor for fill
  * fill_stipple		GdkBitmap*	RW		Stipple pattern for fill
- * x1                   double		RW              Coordinates for edges of background rectangle
- * x2                   double		RW              Default is all of them = -1.
- * y1                   double		RW              Which means that the entire space is shown.
- * y2                   double		RW              If you need the rectangle to have negative coordinates, use an affine.
+ * x1                   gdouble		RW              Coordinates for edges of background rectangle
+ * x2                   gdouble		RW              Default is all of them = -1.
+ * y1                   gdouble		RW              Which means that the entire space is shown.
+ * y2                   gdouble		RW              If you need the rectangle to have negative coordinates, use an affine.
  */
 
 #define E_CANVAS_BACKGROUND_TYPE            (e_canvas_background_get_type ())
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index 9e097b02bd..c4163feea1 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -24,9 +24,9 @@
 #include "e-canvas-utils.h"
 
 void
-e_canvas_item_move_absolute (GnomeCanvasItem *item, double dx, double dy)
+e_canvas_item_move_absolute (GnomeCanvasItem *item, gdouble dx, gdouble dy)
 {
-	double translate[6];
+	gdouble translate[6];
 
 	g_return_if_fail (item != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
@@ -64,7 +64,7 @@ compute_offset(gint top, gint bottom, gint page_top, gint page_bottom)
 }
 
 static void
-e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double y2)
+e_canvas_show_area (GnomeCanvas *canvas, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
 {
 	GtkAdjustment *h, *v;
 	gint dx = 0, dy = 0;
@@ -96,7 +96,7 @@ e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double
 }
 
 void
-e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2, double y2)
+e_canvas_item_show_area (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
 {
 	g_return_if_fail (item != NULL);
 	g_return_if_fail (GNOME_IS_CANVAS_ITEM (item));
@@ -108,7 +108,7 @@ e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2,
 }
 
 static gboolean
-e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, double y2)
+e_canvas_area_shown (GnomeCanvas *canvas, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
 {
 	GtkAdjustment *h, *v;
 	gint dx = 0, dy = 0;
@@ -141,7 +141,7 @@ e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, doubl
 }
 
 gboolean
-e_canvas_item_area_shown (GnomeCanvasItem *item, double x1, double y1, double x2, double y2)
+e_canvas_item_area_shown (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble x2, gdouble y2)
 {
 	g_return_val_if_fail (item != NULL, FALSE);
 	g_return_val_if_fail (GNOME_IS_CANVAS_ITEM (item), FALSE);
@@ -153,10 +153,10 @@ e_canvas_item_area_shown (GnomeCanvasItem *item, double x1, double y1, double x2
 }
 
 typedef struct {
-	double x1;
-	double y1;
-	double x2;
-	double y2;
+	gdouble x1;
+	gdouble y1;
+	gdouble x2;
+	gdouble y2;
 	GnomeCanvas *canvas;
 } DoubsAndCanvas;
 
@@ -172,7 +172,7 @@ show_area_timeout (gpointer data)
 }
 
 void
-e_canvas_item_show_area_delayed (GnomeCanvasItem *item, double x1, double y1, double x2, double y2, gint delay)
+e_canvas_item_show_area_delayed (GnomeCanvasItem *item, gdouble x1, gdouble y1, gdouble x2, gdouble y2, gint delay)
 {
 	DoubsAndCanvas *dac;
 
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
index cda34e99b5..8f7600e72d 100644
--- a/widgets/misc/e-canvas-utils.h
+++ b/widgets/misc/e-canvas-utils.h
@@ -28,27 +28,27 @@
 G_BEGIN_DECLS
 
 void      e_canvas_item_move_absolute      (GnomeCanvasItem *item,
-					    double           dx,
-					    double           dy);
+					    gdouble           dx,
+					    gdouble           dy);
 void      e_canvas_item_show_area          (GnomeCanvasItem *item,
-					    double           x1,
-					    double           y1,
-					    double           x2,
-					    double           y2);
+					    gdouble           x1,
+					    gdouble           y1,
+					    gdouble           x2,
+					    gdouble           y2);
 void      e_canvas_item_show_area_delayed  (GnomeCanvasItem *item,
-					    double           x1,
-					    double           y1,
-					    double           x2,
-					    double           y2,
+					    gdouble           x1,
+					    gdouble           y1,
+					    gdouble           x2,
+					    gdouble           y2,
 					    gint             delay);
 /* Returns TRUE if the area is already shown on the screen (including
    spacing.)  This is equivelent to returning FALSE iff show_area
    would do anything. */
 gboolean  e_canvas_item_area_shown         (GnomeCanvasItem *item,
-					    double           x1,
-					    double           y1,
-					    double           x2,
-					    double           y2);
+					    gdouble           x1,
+					    gdouble           y1,
+					    gdouble           x2,
+					    gdouble           y2);
 
 G_END_DECLS
 
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index af159b2000..e9d78f220c 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -256,9 +256,9 @@ e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
 	e_canvas_vbox->items = g_list_append(e_canvas_vbox->items, item);
 	g_object_weak_ref (G_OBJECT (item),
 			   e_canvas_vbox_remove_item, e_canvas_vbox);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
+	if (GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED) {
 		gnome_canvas_item_set(item,
-				      "width", (double) e_canvas_vbox->minimum_width,
+				      "width", (gdouble) e_canvas_vbox->minimum_width,
 				      NULL);
 		e_canvas_item_request_reflow(item);
 	}
@@ -270,9 +270,9 @@ e_canvas_vbox_real_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *i
 	e_canvas_vbox->items = g_list_prepend(e_canvas_vbox->items, item);
 	g_object_weak_ref (G_OBJECT (item),
 			   e_canvas_vbox_remove_item, e_canvas_vbox);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
+	if (GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED) {
 		gnome_canvas_item_set(item,
-				      "width", (double) e_canvas_vbox->minimum_width,
+				      "width", (gdouble) e_canvas_vbox->minimum_width,
 				      NULL);
 		e_canvas_item_request_reflow(item);
 	}
@@ -288,7 +288,7 @@ e_canvas_vbox_resize_children (GnomeCanvasItem *item)
 	for ( list = e_canvas_vbox->items; list; list = list->next ) {
 		GnomeCanvasItem *child = GNOME_CANVAS_ITEM(list->data);
 		gnome_canvas_item_set(child,
-				      "width", (double) e_canvas_vbox->minimum_width,
+				      "width", (gdouble) e_canvas_vbox->minimum_width,
 				      NULL);
 	}
 }
@@ -297,7 +297,7 @@ static void
 e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags )
 {
 	ECanvasVbox *e_canvas_vbox = E_CANVAS_VBOX(item);
-	if ( GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED ) {
+	if (GTK_OBJECT_FLAGS( e_canvas_vbox ) & GNOME_CANVAS_ITEM_REALIZED) {
 
 		gdouble old_height;
 		gdouble running_height;
@@ -322,8 +322,8 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags )
 				      "width", &item_width,
 				      NULL);
 			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-						    (double) 0,
-						    (double) running_height);
+						    (gdouble) 0,
+						    (gdouble) running_height);
 			running_height += item_height;
 			if (max_width < item_width)
 				max_width = item_width;
@@ -338,8 +338,8 @@ e_canvas_vbox_reflow( GnomeCanvasItem *item, gint flags )
 					      NULL);
 
 				e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(list->data),
-							    (double) 0,
-							    (double) running_height);
+							    (gdouble) 0,
+							    (gdouble) running_height);
 
 				running_height += item_height;
 				if (max_width < item_width)
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
index b41b8f80ec..9fb5b8ba34 100644
--- a/widgets/misc/e-canvas-vbox.h
+++ b/widgets/misc/e-canvas-vbox.h
@@ -34,9 +34,9 @@ G_BEGIN_DECLS
  *
  * name		type		read/write	description
  * --------------------------------------------------------------------------------
- * width        double          RW              width of the CanvasVbox
- * height       double          R               height of the CanvasVbox
- * spacing      double          RW              Spacing between items.
+ * width        gdouble          RW              width of the CanvasVbox
+ * height       gdouble          R               height of the CanvasVbox
+ * spacing      gdouble          RW              Spacing between items.
  */
 
 #define E_CANVAS_VBOX_TYPE			(e_canvas_vbox_get_type ())
@@ -55,10 +55,10 @@ struct _ECanvasVbox
 	/* item specific fields */
 	GList *items; /* Of type GnomeCanvasItem */
 
-	double width;
-	double minimum_width;
-	double height;
-	double spacing;
+	gdouble width;
+	gdouble minimum_width;
+	gdouble height;
+	gdouble spacing;
 };
 
 struct _ECanvasVboxClass
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 314837edf1..6d12cae087 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -279,11 +279,11 @@ e_canvas_key (GtkWidget *widget, GdkEventKey *event)
 #define HACKISH_AFFINE
 
 static double
-gnome_canvas_item_invoke_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy,
+gnome_canvas_item_invoke_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy,
 				GnomeCanvasItem **actual_item)
 {
 #ifdef HACKISH_AFFINE
-	double i2w[6], w2c[6], i2c[6], c2i[6];
+	gdouble i2w[6], w2c[6], i2c[6], c2i[6];
 	ArtPoint c, i;
 #endif
 
@@ -312,7 +312,7 @@ static gint
 pick_current_item (GnomeCanvas *canvas, GdkEvent *event)
 {
 	gint button_down;
-	double x, y;
+	gdouble x, y;
 	gint cx, cy;
 	gint retval;
 
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index e6a223a121..f4968432a0 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -71,7 +71,7 @@ struct _EMapPrivate {
 
 	/* Realtime zoom data */
 	EMapZoomState zoom_state;
-	double zoom_target_long, zoom_target_lat;
+	gdouble zoom_target_long, zoom_target_lat;
 
 	/* Dots */
 	GPtrArray *points;
@@ -633,7 +633,7 @@ e_map_new (void)
  * Latitude  E <-90, 90]   */
 
 void
-e_map_window_to_world (EMap *map, double win_x, double win_y, double *world_longitude, double *world_latitude)
+e_map_window_to_world (EMap *map, gdouble win_x, gdouble win_y, gdouble *world_longitude, gdouble *world_latitude)
 {
 	EMapPrivate *priv;
 	gint width, height;
@@ -646,14 +646,14 @@ e_map_window_to_world (EMap *map, double win_x, double win_y, double *world_long
 	width = gdk_pixbuf_get_width (priv->map_render_pixbuf);
 	height = gdk_pixbuf_get_height (priv->map_render_pixbuf);
 
-	*world_longitude = (win_x + priv->xofs - (double) width / 2.0) /
-		((double) width / 2.0) * 180.0;
-	*world_latitude = ((double) height / 2.0 - win_y - priv->yofs) /
-		((double) height / 2.0) * 90.0;
+	*world_longitude = (win_x + priv->xofs - (gdouble) width / 2.0) /
+		((gdouble) width / 2.0) * 180.0;
+	*world_latitude = ((gdouble) height / 2.0 - win_y - priv->yofs) /
+		((gdouble) height / 2.0) * 90.0;
 }
 
 void
-e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, double *win_x, double *win_y)
+e_map_world_to_window (EMap *map, gdouble world_longitude, gdouble world_latitude, gdouble *win_x, gdouble *win_y)
 {
 	EMapPrivate *priv;
 	gint width, height;
@@ -689,7 +689,7 @@ e_map_get_magnification (EMap *map)
 }
 
 void
-e_map_zoom_to_location (EMap *map, double longitude, double latitude)
+e_map_zoom_to_location (EMap *map, gdouble longitude, gdouble latitude)
 {
 	EMapPrivate *priv;
 
@@ -753,7 +753,7 @@ e_map_thaw (EMap *map)
 /* --- Point manipulation --- */
 
 EMapPoint *
-e_map_add_point (EMap *map, gchar *name, double longitude, double latitude, guint32 color_rgba)
+e_map_add_point (EMap *map, gchar *name, gdouble longitude, gdouble latitude, guint32 color_rgba)
 {
 	EMapPrivate *priv;
 	EMapPoint *point;
@@ -798,7 +798,7 @@ e_map_remove_point (EMap *map, EMapPoint *point)
 }
 
 void
-e_map_point_get_location (EMapPoint *point, double *longitude, double *latitude)
+e_map_point_get_location (EMapPoint *point, gdouble *longitude, gdouble *latitude)
 {
 	*longitude = point->longitude;
 	*latitude = point->latitude;
@@ -847,7 +847,7 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point)
 {
 	EMapPrivate *priv;
 	GtkAllocation allocation;
-	double x, y;
+	gdouble x, y;
 
 	priv = map->priv;
 	if (!priv->map_render_pixbuf) return FALSE;
@@ -863,12 +863,12 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point)
 }
 
 EMapPoint *
-e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean in_view)
+e_map_get_closest_point (EMap *map, gdouble longitude, gdouble latitude, gboolean in_view)
 {
 	EMapPrivate *priv;
 	EMapPoint *point_chosen = NULL, *point;
-	double min_dist = 0.0, dist;
-	double dx, dy;
+	gdouble min_dist = 0.0, dist;
+	gdouble dx, dy;
 	gint i;
 
 	priv = map->priv;
@@ -947,7 +947,7 @@ update_render_pixbuf (EMap *map,
 	EMapPoint *point;
 	GtkAllocation allocation;
 	gint width, height, orig_width, orig_height;
-	double zoom;
+	gdouble zoom;
 	gint i;
 
 	if (!GTK_WIDGET_REALIZED (map))
@@ -965,10 +965,10 @@ update_render_pixbuf (EMap *map,
 
 	/* Compute scaled width and height based on the extreme dimension */
 
-	if ((double) width / orig_width > (double) height / orig_height)
-		zoom = (double) width / (double) orig_width;
+	if ((gdouble) width / orig_width > (gdouble) height / orig_height)
+		zoom = (gdouble) width / (gdouble) orig_width;
 	else
-		zoom = (double) height / (double) orig_height;
+		zoom = (gdouble) height / (gdouble) orig_height;
 
 	if (priv->zoom_state == E_MAP_ZOOMED_IN)
 		zoom *= 2.0;
@@ -1097,7 +1097,7 @@ update_render_point (EMap *map, EMapPoint *point)
 {
 	EMapPrivate *priv;
 	GdkPixbuf *pb;
-	double px, py;
+	gdouble px, py;
 
 	priv = map->priv;
 	pb = priv->map_render_pixbuf;
@@ -1129,7 +1129,7 @@ static void
 repaint_point (EMap *map, EMapPoint *point)
 {
 	GdkRectangle area;
-	double px, py;
+	gdouble px, py;
 
 	if (!e_map_point_is_in_view (map, point)) return;
 
@@ -1434,14 +1434,14 @@ blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x,
 	if (area_width > area_height)
 	{
 		strong_axis = AXIS_X;
-		axis_factor = (double) area_height / (double) area_width;
+		axis_factor = (gdouble) area_height / (gdouble) area_width;
 		zoom_chunk = MAX (1, area_width / 250);
 		i = (area_width * (zoom_factor - 1.0)) / zoom_chunk;
 	}
 	else
 	{
 		strong_axis = AXIS_Y;
-		axis_factor = (double) area_width / (double) area_height;
+		axis_factor = (gdouble) area_width / (gdouble) area_height;
 		zoom_chunk = MAX (1, area_height / 250);
 		i = (area_height * (zoom_factor - 1.0)) / zoom_chunk;
 	}
@@ -1537,7 +1537,7 @@ zoom_in_smooth (EMap *map)
 	EMapPrivate *priv;
 	GdkWindow *window;
 	gint width, height;
-	double x, y;
+	gdouble x, y;
 
 	g_return_if_fail (map);
 	g_return_if_fail (GTK_WIDGET_REALIZED (GTK_WIDGET (map)));
@@ -1594,7 +1594,7 @@ zoom_in (EMap *map)
 	GtkAllocation allocation;
 	GdkRectangle area;
 	EMapPrivate *priv;
-	double x, y;
+	gdouble x, y;
 
 	priv = map->priv;
 
@@ -1628,8 +1628,8 @@ zoom_out (EMap *map)
 	GtkAllocation allocation;
 	GdkRectangle area;
 	EMapPrivate *priv;
-	double longitude, latitude;
-	double x, y;
+	gdouble longitude, latitude;
+	gdouble x, y;
 
 	priv = map->priv;
 
diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h
index b3d7997401..4730f7662b 100644
--- a/widgets/misc/e-map.h
+++ b/widgets/misc/e-map.h
@@ -59,7 +59,7 @@ struct _EMapClass {
 struct _EMapPoint
 {
 	gchar *name;  /* Can be NULL */
-	double longitude, latitude;
+	gdouble longitude, latitude;
 	guint32 rgba;
 	gpointer user_data;
 };
@@ -80,15 +80,15 @@ void e_map_thaw (EMap *map);
 
 /* Translates window-relative coords to lat/long */
 void e_map_window_to_world (EMap *map,
-			    double win_x, double win_y,
-			    double *world_longitude, double *world_latitude);
+			    gdouble win_x, gdouble win_y,
+			    gdouble *world_longitude, gdouble *world_latitude);
 
 /* Translates lat/long to window-relative coordinates. Note that the
  * returned coordinates can be negative or greater than the current size
  * of the allocation area */
 void e_map_world_to_window (EMap *map,
-			    double world_longitude, double world_latitude,
-			    double *win_x, double *win_y);
+			    gdouble world_longitude, gdouble world_latitude,
+			    gdouble *win_x, gdouble *win_y);
 
 /* --- Zoom --- */
 
@@ -101,7 +101,7 @@ void e_map_set_smooth_zoom (EMap *map, gboolean state);
 gboolean e_map_get_smooth_zoom (EMap *map);
 
 /* NB: Function definition will change shortly */
-void e_map_zoom_to_location (EMap *map, double longitude, double latitude);
+void e_map_zoom_to_location (EMap *map, gdouble longitude, gdouble latitude);
 
 /* Zoom to mag factor 1.0 */
 void e_map_zoom_out (EMap *map);
@@ -109,13 +109,13 @@ void e_map_zoom_out (EMap *map);
 /* --- Points --- */
 
 EMapPoint *e_map_add_point (EMap *map, gchar *name,
-			    double longitude, double latitude,
+			    gdouble longitude, gdouble latitude,
 			    guint32 color_rgba);
 
 void e_map_remove_point (EMap *map, EMapPoint *point);
 
 void e_map_point_get_location (EMapPoint *point,
-			       double *longitude, double *latitude);
+			       gdouble *longitude, gdouble *latitude);
 
 gchar *e_map_point_get_name (EMapPoint *point);
 
@@ -129,7 +129,7 @@ gpointer e_map_point_get_data (EMapPoint *point);
 
 gboolean e_map_point_is_in_view (EMap *map, EMapPoint *point);
 
-EMapPoint *e_map_get_closest_point (EMap *map, double longitude, double latitude,
+EMapPoint *e_map_get_closest_point (EMap *map, gdouble longitude, gdouble latitude,
 				    gboolean in_view);
 
 #endif
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index b01e6c11bc..9264c37ad4 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -42,7 +42,7 @@ static GdkPixbuf *checks [2];
 static void
 ecc_print (ECellView *ecell_view, GtkPrintContext *context,
 	    gint model_col, gint view_col, gint row,
-	    double width, double height)
+	    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 af79261c64..fe9b90717f 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -373,8 +373,8 @@ e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
 	gboolean show_vscroll = FALSE, show_hscroll = FALSE;
 	gint avail_height, avail_width, min_height, work_height, screen_width;
 	gint column_width, row_height, scrollbar_width;
-	double x1, y1;
-	double wx, wy;
+	gdouble x1, y1;
+	gdouble wx, wy;
 
 	/* This code is practically copied from GtkCombo. */
 	popup  = GTK_SCROLLED_WINDOW (ecc->popup_scrolled_window);
diff --git a/widgets/table/e-cell-date-edit.c b/widgets/table/e-cell-date-edit.c
index f67a03ceed..1d27b292d0 100644
--- a/widgets/table/e-cell-date-edit.c
+++ b/widgets/table/e-cell-date-edit.c
@@ -644,7 +644,7 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	GtkWidget *canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (eti)->canvas);
 	GtkRequisition popup_requisition;
 	gint avail_height, screen_width, column_width, row_height;
-	double x1, y1, wx, wy;
+	gdouble x1, y1, wx, wy;
 
 	gdk_window_get_origin (canvas->window, x, y);
 
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 3f7ee1d378..eb7b1330c3 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -191,7 +191,7 @@ pixbuf_height (ECellView *ecell_view, gint model_col, gint view_col, gint row)
 static void
 pixbuf_print (ECellView *ecell_view, GtkPrintContext *context,
 	      gint model_col, gint view_col, gint row,
-	      double width, double height)
+	      gdouble width, gdouble height)
 {
 	GdkPixbuf *pixbuf;
 	gint scale;
@@ -203,8 +203,8 @@ pixbuf_print (ECellView *ecell_view, GtkPrintContext *context,
 
 	scale = gdk_pixbuf_get_height (pixbuf);
 	cairo_save (cr);
-	cairo_translate (cr, 0, (double)(height - scale) / (double)2);
-	gdk_cairo_set_source_pixbuf (cr, pixbuf, (double)scale, (double)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);
 }
@@ -212,7 +212,7 @@ 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,
-		     double width)
+		     gdouble width)
 {
 	GdkPixbuf *pixbuf;
 
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 62777792b3..6deb4c46a9 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -88,14 +88,14 @@ static void	ecp_print		(ECellView	*ecv,
 					 gint		 model_col,
 					 gint		 view_col,
 					 gint		 row,
-					 double		 width,
-					 double		 height);
+					 gdouble		 width,
+					 gdouble		 height);
 static gdouble	ecp_print_height	(ECellView	*ecv,
 					 GtkPrintContext *context,
 					 gint		 model_col,
 					 gint		 view_col,
 					 gint		 row,
-					 double		 width);
+					 gdouble		 width);
 static gint	ecp_max_width		(ECellView	*ecv,
 					 gint		 model_col,
 					 gint		 view_col);
@@ -388,7 +388,7 @@ 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, double width, double height)
+	   gint model_col, gint view_col, gint row, gdouble width, gdouble height)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
@@ -399,7 +399,7 @@ ecp_print (ECellView *ecv, GtkPrintContext *context,
 static gdouble
 ecp_print_height (ECellView *ecv, GtkPrintContext *context,
 		  gint model_col, gint view_col, gint row,
-		  double width)
+		  gdouble width)
 {
 	ECellPopupView *ecp_view = (ECellPopupView *) ecv;
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index 852f8ec980..57dd88e17d 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -136,7 +136,7 @@ typedef struct {
 
 	gint xofs, yofs;                 /* This gets added to the x
                                            and y for the cell text. */
-	double ellipsis_width[2];      /* The width of the ellipsis. */
+	gdouble ellipsis_width[2];      /* The width of the ellipsis. */
 } ECellTextView;
 
 struct _CellEdit {
@@ -289,7 +289,7 @@ ect_stop_editing (ECellTextView *text_view, gboolean commit)
 	text = edit->text;
 	if (edit->tep)
 		g_object_unref (edit->tep);
-	if (! edit->default_cursor_shown) {
+	if (!edit->default_cursor_shown) {
 		gdk_window_set_cursor (GTK_WIDGET(text_view->canvas)->window, NULL);
 		edit->default_cursor_shown = TRUE;
 	}
@@ -1132,7 +1132,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		text_view->pointer_in = FALSE;
 #endif
 		if (edit_display) {
-			if (! edit->default_cursor_shown) {
+			if (!edit->default_cursor_shown) {
 				gdk_window_set_cursor (canvas->window, NULL);
 				edit->default_cursor_shown = TRUE;
 			}
@@ -1301,7 +1301,7 @@ ect_free_state (ECellView *ecell_view, gint model_col, gint view_col, gint row,
 
 static void
 get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *text,
-		double *width, double *height)
+		gdouble *width, gdouble *height)
 {
 	gint w;
 	gint h;
@@ -1314,14 +1314,14 @@ get_font_size (PangoLayout *layout, PangoFontDescription *font, const gchar *tex
 
 	pango_layout_get_size (layout, &w, &h);
 
-	*width = (double)w/(double)PANGO_SCALE;
-	*height = (double)h/(double)PANGO_SCALE;
+	*width = (gdouble)w/(gdouble)PANGO_SCALE;
+	*height = (gdouble)h/(gdouble)PANGO_SCALE;
 }
 
 static void
 ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	   gint model_col, gint view_col, gint row,
-	   double width, double height)
+	   gdouble width, gdouble height)
 {
 	PangoFontDescription *font_des;
 	PangoLayout *layout;
@@ -1334,7 +1334,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	gboolean strikeout, underline;
 	cairo_t *cr;
 	gchar *string;
-	double ty, ly, text_width = 0.0, text_height = 0.0;
+	gdouble ty, ly, text_width = 0.0, text_height = 0.0;
 
 	cr = gtk_print_context_get_cairo_context (context);
 	string = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row);
@@ -1354,9 +1354,9 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	pango_context = gtk_widget_get_pango_context (canvas);
 	font_metrics = pango_context_get_metrics (pango_context,
 		       canvas->style->font_desc, pango_context_get_language(pango_context));
-	ty =  (double)(text_height
+	ty =  (gdouble)(text_height
 		       - pango_font_metrics_get_ascent (font_metrics)
-		       - pango_font_metrics_get_descent (font_metrics)) / 2.0 /(double)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);
@@ -1366,7 +1366,7 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	dir = pango_find_base_dir (string, strlen(string));
 
 	if (underline) {
-		ly = ty + (double)pango_font_metrics_get_underline_position (font_metrics)/(double)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);
@@ -1376,12 +1376,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, (double)pango_font_metrics_get_underline_thickness (font_metrics)/(double)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 + (double)pango_font_metrics_get_strikethrough_position (font_metrics)/(double)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);
@@ -1391,7 +1391,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,(double)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(double)PANGO_SCALE);
+			cairo_set_line_width (cr,(gdouble)pango_font_metrics_get_strikethrough_thickness (font_metrics)/(gdouble)PANGO_SCALE);
 
 			cairo_stroke (cr);
 	}
@@ -1409,7 +1409,7 @@ 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,
-		  double width)
+		  gdouble width)
 {
 	/*
 	 * Font size is 16 by default. To leave some margin for cell
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index 740db82880..2cc23a36f5 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -56,7 +56,7 @@ typedef struct {
 	GtkJustification  justify;
 	gchar             *font_name;
 
-	double x, y;			/* Position at anchor */
+	gdouble x, y;			/* Position at anchor */
 
 	gulong pixel;			/* Fill color */
 
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index a03eed037e..5f7cc66321 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -328,8 +328,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 = (double)gdk_pixbuf_get_width (image);
-		image_height = (double)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 fac7b9784f..8a8017e2e7 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -674,7 +674,7 @@ 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,
-	   double width, double height)
+	   gdouble width, gdouble height)
 {
 	ECellTreeView *tree_view = (ECellTreeView *) ecell_view;
 	cairo_t *cr = gtk_print_context_get_cairo_context (context);
@@ -769,7 +769,7 @@ 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,
-		  double width)
+		  gdouble width)
 {
 	return 12; /* XXX */
 }
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 4c32c18e77..1c4b64f2c1 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -283,7 +283,7 @@ e_cell_draw (ECellView *ecell_view, GdkDrawable *drawable,
 void
 e_cell_print (ECellView *ecell_view, GtkPrintContext *context,
 	      gint model_col, gint view_col, gint row,
-	      double width, double height)
+	      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);
@@ -297,7 +297,7 @@ e_cell_print (ECellView *ecell_view, GtkPrintContext *context,
 gdouble
 e_cell_print_height (ECellView *ecell_view, GtkPrintContext *context,
 		     gint model_col, gint view_col, gint row,
-		     double width)
+		     gdouble width)
 {
 	if (ECVIEW_EC_CLASS(ecell_view)->print_height)
 		return ECVIEW_EC_CLASS(ecell_view)->print_height
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 181a3143e4..63fa8e2afd 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -151,8 +151,8 @@ void       e_cell_print                         (ECellView         *ecell_view,
 						 gint                model_col,
 						 gint                view_col,
 						 gint                row,
-						 double             width,
-						 double             height);
+						 gdouble             width,
+						 gdouble             height);
 gdouble    e_cell_print_height                  (ECellView         *ecell_view,
 						 GtkPrintContext *context,
 						 gint                model_col,
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index c71e10bde4..e5c35fe93c 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -242,10 +242,10 @@ create_rect_and_text (ETableClickToAdd *etcta)
 	if (!etcta->rect)
 		etcta->rect = gnome_canvas_item_new(GNOME_CANVAS_GROUP(etcta),
 					    gnome_canvas_rect_get_type(),
-					    "x1", (double) 0,
-					    "y1", (double) 0,
-					    "x2", (double) etcta->width - 1,
-					    "y2", (double) etcta->height - 1,
+					    "x1", (gdouble) 0,
+					    "y1", (gdouble) 0,
+					    "x2", (gdouble) etcta->width - 1,
+					    "y2", (gdouble) etcta->height - 1,
 					    "outline_color_gdk", &widget->style->fg[GTK_STATE_NORMAL],
 					    "fill_color_gdk", &widget->style->bg[GTK_STATE_NORMAL],
 					    NULL);
@@ -458,7 +458,7 @@ etcta_reflow (GnomeCanvasItem *item, gint flags)
 {
 	ETableClickToAdd *etcta = E_TABLE_CLICK_TO_ADD (item);
 
-	double old_height = etcta->height;
+	gdouble old_height = etcta->height;
 
 	if (etcta->text) {
 		g_object_get(etcta->text,
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 4e9802d9b8..cd96441b63 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -169,7 +169,7 @@ ETableCol *
 e_table_col_new (gint col_idx,
                  const gchar *text,
                  const gchar *icon_name,
-                 double expansion,
+                 gdouble expansion,
                  gint min_width,
                  ECell *ecell,
                  GCompareDataFunc compare,
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
index 7b7c31db7c..cbe3dc3a80 100644
--- a/widgets/table/e-table-col.h
+++ b/widgets/table/e-table-col.h
@@ -96,7 +96,7 @@ GType		e_table_col_get_type		(void);
 ETableCol *	e_table_col_new			(gint col_idx,
 						 const gchar *text,
 						 const gchar *icon_name,
-						 double expansion,
+						 gdouble expansion,
 						 gint min_width,
 						 ECell *ecell,
 						 GCompareDataFunc compare,
diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h
index 7ea6f23dc4..048decdf54 100644
--- a/widgets/table/e-table-column-specification.h
+++ b/widgets/table/e-table-column-specification.h
@@ -43,7 +43,7 @@ typedef struct {
 	gchar *title;
 	gchar *pixbuf;
 
-	double expansion;
+	gdouble expansion;
 	gint minimum_width;
 	guint resizable : 1;
 	guint disabled : 1;
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 1bbfc6a8b3..f87b316dd0 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -1031,7 +1031,7 @@ config_button_remove (GtkWidget *widget, ETableConfig *config)
 		gint row = GPOINTER_TO_INT (column->data);
 
 		memmove (config->temp_state->columns + row, config->temp_state->columns + row + 1, sizeof (gint) * (config->temp_state->col_count - row - 1));
-		memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (double) * (config->temp_state->col_count - row - 1));
+		memmove (config->temp_state->expansions + row, config->temp_state->expansions + row + 1, sizeof (gdouble) * (config->temp_state->col_count - row - 1));
 		config->temp_state->col_count --;
 	}
 	config->temp_state->columns = g_renew (int, config->temp_state->columns, config->temp_state->col_count);
@@ -1048,9 +1048,9 @@ config_button_up (GtkWidget *widget, ETableConfig *config)
 	GList *columns = NULL;
 	GList *column;
 	gint *new_shown;
-	double *new_expansions;
+	gdouble *new_expansions;
 	gint next_col;
-	double next_expansion;
+	gdouble next_expansion;
 	gint i;
 
 	e_table_selected_row_foreach (config->shown, add_column, &columns);
@@ -1103,9 +1103,9 @@ config_button_down (GtkWidget *widget, ETableConfig *config)
 	GList *columns = NULL;
 	GList *column;
 	gint *new_shown;
-	double *new_expansions;
+	gdouble *new_expansions;
 	gint next_col;
-	double next_expansion;
+	gdouble next_expansion;
 	gint i;
 
 	e_table_selected_row_foreach (config->shown, add_column, &columns);
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 5cd2f9edc2..f38cb3964a 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -90,11 +90,11 @@ etfci_dispose (GObject *object)
 }
 
 static gint
-etfci_find_button (ETableFieldChooserItem *etfci, double loc)
+etfci_find_button (ETableFieldChooserItem *etfci, gdouble loc)
 {
 	gint i;
 	gint count;
-	double height = 0;
+	gdouble height = 0;
 
 	count = e_table_header_count(etfci->combined_header);
 	for (i = 0; i < count; i++) {
@@ -137,7 +137,7 @@ 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);
 	}
 
@@ -148,10 +148,10 @@ static void
 etfci_reflow (GnomeCanvasItem *item, gint flags)
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double old_height;
+	gdouble old_height;
 	gint i;
 	gint count;
-	double height = 0;
+	gdouble height = 0;
 
 	etfci_rebuild_combined (etfci);
 
@@ -176,10 +176,10 @@ etfci_reflow (GnomeCanvasItem *item, gint flags)
 }
 
 static void
-etfci_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
+etfci_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags)
 {
 	ETableFieldChooserItem *etfci = E_TABLE_FIELD_CHOOSER_ITEM (item);
-	double   i2c [6];
+	gdouble   i2c [6];
 	ArtPoint c1, c2, i1, i2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (etfci_parent_class)->update)
@@ -493,7 +493,7 @@ etfci_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint w
 }
 
 static double
-etfci_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy,
+etfci_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy,
 	    GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
@@ -514,7 +514,7 @@ etfci_maybe_start_drag (ETableFieldChooserItem *etfci, gint x, gint y)
 }
 
 static void
-etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, double x, double y)
+etfci_start_drag (ETableFieldChooserItem *etfci, GdkEvent *event, gdouble x, gdouble y)
 {
 	GtkWidget *widget = GTK_WIDGET (GNOME_CANVAS_ITEM (etfci)->canvas);
 	GtkTargetList *list;
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
index d0cbbd9f75..9040d7db39 100644
--- a/widgets/table/e-table-field-chooser-item.h
+++ b/widgets/table/e-table-field-chooser-item.h
@@ -42,7 +42,7 @@ typedef struct {
 	ETableHeader    *header;
 	ETableHeader    *combined_header;
 
-	double           height, width;
+	gdouble           height, width;
 
 	PangoFontDescription *font_desc;
 
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 8d6ddb59e3..3c1d722617 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -101,10 +101,10 @@ ensure_nonzero_step_increments (ETableFieldChooser *etfc)
 
 static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETableFieldChooser *etfc)
 {
-	double height;
+	gdouble height;
 	etfc->last_alloc = *allocation;
 	gnome_canvas_item_set( etfc->item,
-			       "width", (double) allocation->width,
+			       "width", (gdouble) allocation->width,
 			       NULL );
 	g_object_get(etfc->item,
 		     "height", &height,
@@ -112,15 +112,15 @@ static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, ETab
 	height = MAX(height, allocation->height);
 	gnome_canvas_set_scroll_region(GNOME_CANVAS( etfc->canvas ), 0, 0, allocation->width - 1, height - 1);
 	gnome_canvas_item_set( etfc->rect,
-			       "x2", (double) allocation->width,
-			       "y2", (double) height,
+			       "x2", (gdouble) allocation->width,
+			       "y2", (gdouble) height,
 			       NULL );
 	ensure_nonzero_step_increments (etfc);
 }
 
 static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc)
 {
-	double height;
+	gdouble height;
 	g_object_get(etfc->item,
 		     "height", &height,
 		     NULL);
@@ -129,8 +129,8 @@ static void resize(GnomeCanvas *canvas, ETableFieldChooser *etfc)
 
 	gnome_canvas_set_scroll_region (GNOME_CANVAS(etfc->canvas), 0, 0, etfc->last_alloc.width - 1, height - 1);
 	gnome_canvas_item_set( etfc->rect,
-			       "x2", (double) etfc->last_alloc.width,
-			       "y2", (double) height,
+			       "x2", (gdouble) etfc->last_alloc.width,
+			       "y2", (gdouble) height,
 			       NULL );
 	ensure_nonzero_step_increments (etfc);
 }
@@ -187,16 +187,16 @@ e_table_field_chooser_init (ETableFieldChooser *etfc)
 
 	etfc->rect = gnome_canvas_item_new(gnome_canvas_root( GNOME_CANVAS( etfc->canvas ) ),
 					   gnome_canvas_rect_get_type(),
-					   "x1", (double) 0,
-					   "y1", (double) 0,
-					   "x2", (double) 100,
-					   "y2", (double) 100,
+					   "x1", (gdouble) 0,
+					   "y1", (gdouble) 0,
+					   "x2", (gdouble) 100,
+					   "y2", (gdouble) 100,
 					   "fill_color", "white",
 					   NULL );
 
 	etfc->item = gnome_canvas_item_new(gnome_canvas_root(etfc->canvas),
 					   e_table_field_chooser_item_get_type(),
-					   "width", (double) 100,
+					   "width", (gdouble) 100,
 					   "full_header", etfc->full_header,
 					   "header", etfc->header,
 					   "dnd_code", etfc->dnd_code,
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 26124b824a..77d766b16e 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -1084,10 +1084,10 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 							    running_height);
 
 				gnome_canvas_item_set (GNOME_CANVAS_ITEM(child_node->rect),
-						      "x1", (double) 0,
-						      "x2", (double) running_width + GROUP_INDENT,
-						      "y1", (double) running_height - extra_height,
-						      "y2", (double) running_height + item_height,
+						      "x1", (gdouble) 0,
+						      "x2", (gdouble) running_width + GROUP_INDENT,
+						      "y1", (gdouble) running_height - extra_height,
+						      "y2", (gdouble) running_height + item_height,
 						      NULL);
 
 				running_height += item_height + extra_height;
@@ -1154,7 +1154,7 @@ typedef struct {
 
 #if 0
 static gint
-gp_draw_rect (GtkPrintContext *context, double x, double y, double width, double 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);
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 0ea785bc86..b39d86bcd4 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -183,11 +183,11 @@ e_table_header_item_get_height (ETableHeaderItem *ethi)
 }
 
 static void
-ethi_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
+ethi_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags)
 {
 	ETableHeaderItem *ethi = E_TABLE_HEADER_ITEM (item);
 
-	double   i2c [6];
+	gdouble   i2c [6];
 	ArtPoint c1, c2, i1, i2;
 
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->update)
@@ -526,7 +526,7 @@ static gchar gray50_bits [] = {
 static void
 ethi_add_destroy_marker (ETableHeaderItem *ethi)
 {
-	double x1;
+	gdouble x1;
 
 	if (ethi->remove_item)
 		gtk_object_destroy (GTK_OBJECT (ethi->remove_item));
@@ -535,7 +535,7 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		ethi->stipple = gdk_bitmap_create_from_data  (
 			NULL, gray50_bits, gray50_width, gray50_height);
 
-	x1 = (double) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
+	x1 = (gdouble) e_table_header_col_diff (ethi->eth, 0, ethi->drag_col);
 	if (ethi->drag_col > 0)
 		x1 += ethi->group_indent_width;
 
@@ -543,11 +543,11 @@ ethi_add_destroy_marker (ETableHeaderItem *ethi)
 		GNOME_CANVAS_GROUP (GNOME_CANVAS_ITEM (ethi)->canvas->root),
 		gnome_canvas_rect_get_type (),
 		"x1", x1 + 1,
-		"y1", (double) 1,
-		"x2", (double) x1 + e_table_header_col_diff (
+		"y1", (gdouble) 1,
+		"x2", (gdouble) x1 + e_table_header_col_diff (
 			ethi->eth, ethi->drag_col, ethi->drag_col+1) - 2,
 
-		"y2", (double) ethi->height - 2,
+		"y2", (gdouble) ethi->height - 2,
 		"fill_color", "red",
 		"fill_stipple", ethi->stipple,
 		NULL);
@@ -630,7 +630,7 @@ scroll_timeout (gpointer data)
 	ETableHeaderItem *ethi = data;
 	gint dx = 0;
 	GtkAdjustment *h, *v;
-	double value;
+	gdouble value;
 
 	if (ethi->scroll_direction & ET_SCROLL_RIGHT)
 		dx += 20;
@@ -1001,7 +1001,7 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wi
 }
 
 static double
-ethi_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy,
+ethi_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy,
 	    GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
@@ -1626,7 +1626,7 @@ ethi_change_sort_state (ETableHeaderItem *ethi, ETableCol *col)
 		ETableSortColumn 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;
+			ascending = !ascending;
 			column.ascending = ascending;
 			e_table_sort_info_grouping_set_nth(ethi->sort_info, i, column);
 			found = TRUE;
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index e5587ab3e2..3ff4c3472b 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -684,8 +684,8 @@ e_table_header_set_selection (ETableHeader *eth, gboolean allow_selection)
 static void
 eth_set_size (ETableHeader *eth, gint idx, gint size)
 {
-	double expansion;
-	double old_expansion;
+	gdouble expansion;
+	gdouble old_expansion;
 	gint min_width;
 	gint left_width;
 	gint total_extra;
@@ -775,8 +775,8 @@ eth_set_size (ETableHeader *eth, gint idx, gint size)
 	old_expansion -= eth->columns[idx]->expansion;
 	/* Set the new expansion so that it will generate the desired size. */
 	eth->columns[idx]->expansion =
-		expansion * (((double)(size - (eth->columns[idx]->min_width +
-		eth->width_extras))) / ((double)total_extra));
+		expansion * (((gdouble)(size - (eth->columns[idx]->min_width +
+		eth->width_extras))) / ((gdouble)total_extra));
 	/* The expansion left for the columns on the right. */
 	expansion -= eth->columns[idx]->expansion;
 
@@ -845,9 +845,9 @@ eth_calc_widths (ETableHeader *eth)
 {
 	gint i;
 	gint extra;
-	double expansion;
+	gdouble expansion;
 	gint last_position = 0;
-	double next_position = 0;
+	gdouble next_position = 0;
 	gint last_resizable = -1;
 	gint *widths;
 	gboolean changed;
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 006c5c02cf..d6f0a45cf7 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -419,9 +419,9 @@ eti_detach_cell_views (ETableItem *eti)
 }
 
 static void
-eti_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
+eti_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2)
 {
-	double   i2c [6];
+	gdouble   i2c [6];
 	ArtPoint c1, c2, i1, i2;
 	ETableItem *eti = E_TABLE_ITEM (item);
 
@@ -474,7 +474,7 @@ eti_reflow (GnomeCanvasItem *item, gint flags)
  * GnomeCanvasItem::update method
  */
 static void
-eti_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
+eti_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags)
 {
 	ArtPoint o1, o2;
 	ETableItem *eti = E_TABLE_ITEM (item);
@@ -782,7 +782,7 @@ eti_item_region_redraw (ETableItem *eti, gint x0, gint y0, gint x1, gint y1)
 {
 	GnomeCanvasItem *item = GNOME_CANVAS_ITEM (eti);
 	ArtDRect rect;
-	double i2c [6];
+	gdouble i2c [6];
 
 	rect.x0 = x0;
 	rect.y0 = y0;
@@ -1728,7 +1728,7 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wid
 	gint x1, x2;
 	gint f_x1, f_x2, f_y1, f_y2;
 	gboolean f_found;
-	double i2c [6];
+	gdouble i2c [6];
 	ArtPoint eti_base, eti_base_item, lower_right;
 	GtkWidget *canvas = GTK_WIDGET(item->canvas);
 	gint height_extra = eti->horizontal_draw_grid ? 1 : 0;
@@ -2015,7 +2015,7 @@ exit:
 }
 
 static double
-eti_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy,
+eti_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy,
 	   GnomeCanvasItem **actual_item)
 {
 	*actual_item = item;
@@ -2024,7 +2024,7 @@ eti_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy,
 }
 
 static gboolean
-find_cell (ETableItem *eti, double x, double y, gint *view_col_res, gint *view_row_res, double *x1_res, double *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;
@@ -2164,8 +2164,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 
 	switch (e->type) {
 	case GDK_BUTTON_PRESS: {
-		double x1, y1;
-		double realx, realy;
+		gdouble x1, y1;
+		gdouble realx, realy;
 		GdkEventButton button;
 		gint col, row;
 		gint cursor_row, cursor_col;
@@ -2288,7 +2288,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 	}
 
 	case GDK_BUTTON_RELEASE: {
-		double x1, y1;
+		gdouble x1, y1;
 		gint col, row;
 		gint cursor_row, cursor_col;
 
@@ -2367,7 +2367,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 	case GDK_2BUTTON_PRESS: {
 		gint model_col, model_row;
 #if 0
-		double x1, y1;
+		gdouble x1, y1;
 #endif
 
 		d(g_print("%s: GDK_2BUTTON_PRESS received, button %d\n", __FUNCTION__, e->button.button));
@@ -2422,7 +2422,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 	}
 	case GDK_MOTION_NOTIFY: {
 		gint col, row, flags;
-		double x1, y1;
+		gdouble x1, y1;
 		gint cursor_col, cursor_row;
 
 		gnome_canvas_item_w2i (item, &e->motion.x, &e->motion.y);
@@ -3079,7 +3079,7 @@ eti_cursor_change (ESelectionModel *selection, gint row, gint col, ETableItem *e
 		return;
 	}
 
-	if (! e_table_model_has_change_pending (eti->table_model)) {
+	if (!e_table_model_has_change_pending (eti->table_model)) {
 		if (!eti->in_key_press) {
 			eti_maybe_show_cursor(eti, DOUBLE_CLICK_TIME + 10);
 		} else {
@@ -3111,7 +3111,7 @@ eti_cursor_activated (ESelectionModel *selection, gint row, gint col, ETableItem
 	view_col = model_to_view_col(eti, col);
 
 	if (view_row != -1 && view_col != -1) {
-		if (! e_table_model_has_change_pending (eti->table_model)) {
+		if (!e_table_model_has_change_pending (eti->table_model)) {
 			if (!eti->in_key_press) {
 				eti_show_cursor(eti, DOUBLE_CLICK_TIME + 10);
 			} else {
@@ -3254,7 +3254,7 @@ e_table_item_compute_mouse_over (ETableItem        *eti,
 				 gint               *row,
 				 gint               *col)
 {
-	double realx, realy;
+	gdouble realx, realy;
 	/* Save the grabbed row but make sure that we don't get flawed
            results because the cursor is grabbed. */
 	gint grabbed_row = eti->grabbed_row;
@@ -3307,8 +3307,8 @@ static gdouble *
 e_table_item_calculate_print_widths (ETableHeader *eth, gdouble width)
 {
 	gint i;
-	double extra;
-	double expansion;
+	gdouble extra;
+	gdouble expansion;
 	gint last_resizable = -1;
 	gdouble scale = 1.0L;
 	gdouble *widths = g_new(gdouble, e_table_header_count(eth));
@@ -3348,7 +3348,7 @@ 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, double x, double y, double width, double 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);
@@ -3363,8 +3363,8 @@ gp_draw_rect (GtkPrintContext *context, double x, double y, double width, double
 static void
 e_table_item_print_page  (EPrintable *ep,
 			  GtkPrintContext *context,
-			  double width,
-			  double height,
+			  gdouble width,
+			  gdouble height,
 			  gboolean quantize,
 			  ETableItemPrintContext *itemcontext)
 {
@@ -3374,7 +3374,7 @@ e_table_item_print_page  (EPrintable *ep,
 	gdouble max_height;
 	gint rows_printed = itemcontext->rows_printed;
 	gint row, col, next_page = 0;
-	double yd = height;
+	gdouble yd = height;
 	cairo_t *cr;
 	gdouble *widths;
 
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 86694eccac..46d0c355e8 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -145,7 +145,7 @@ e_table_state_load_from_string  (ETableState *state,
 
 typedef struct {
 	gint column;
-	double expansion;
+	gdouble expansion;
 } int_and_double;
 
 void
@@ -255,7 +255,7 @@ e_table_state_save_to_node      (ETableState *state,
 
 	for (i = 0; i < state->col_count; i++) {
 		gint column = state->columns[i];
-		double expansion = state->expansions[i];
+		gdouble expansion = state->expansions[i];
 		xmlNode *new_node;
 
 		new_node = xmlNewChild (
diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h
index da3f11b93c..082bb17ad7 100644
--- a/widgets/table/e-table-state.h
+++ b/widgets/table/e-table-state.h
@@ -42,7 +42,7 @@ typedef struct {
 	ETableSortInfo *sort_info;
 	gint             col_count;
 	gint            *columns;
-	double         *expansions;
+	gdouble         *expansions;
 } ETableState;
 
 typedef struct {
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index e54317ec8b..89affd357d 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -52,7 +52,7 @@ e_table_state_to_header (GtkWidget *widget, ETableHeader *full_header, ETableSta
 
 	for (column = 0; column < state->col_count; column++) {
 		gint col;
-		double expansion;
+		gdouble expansion;
 		ETableCol *table_col;
 
 		col = state->columns[column];
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 2656f7f949..14b3707464 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -593,7 +593,7 @@ et_focus (GtkWidget *container, GtkDirectionType direction)
 static void
 set_header_canvas_width (ETable *e_table)
 {
-	double oldwidth, oldheight, width;
+	gdouble oldwidth, oldheight, width;
 
 	if (!(e_table->header_item && e_table->header_canvas && e_table->table_canvas))
 		return;
@@ -997,7 +997,7 @@ changed_idle (gpointer data)
 			gtk_object_destroy (GTK_OBJECT (et->group));
 		et_build_groups(et);
 		g_object_set (et->canvas_vbox,
-			      "width", (double) GTK_WIDGET (et->table_canvas)->allocation.width,
+			      "width", (gdouble) GTK_WIDGET (et->table_canvas)->allocation.width,
 			      NULL);
 
 		if (GTK_WIDGET_REALIZED(et->table_canvas))
@@ -1308,7 +1308,7 @@ e_table_set_state_object(ETable *e_table, ETableState *state)
 
 	connect_header (e_table, state);
 
-	g_value_set_double (val, (double) (GTK_WIDGET(e_table->table_canvas)->allocation.width));
+	g_value_set_double (val, (gdouble) (GTK_WIDGET(e_table->table_canvas)->allocation.width));
 	g_object_set_property (G_OBJECT (e_table->header), "width", val);
 	g_free (val);
 
@@ -2586,10 +2586,10 @@ e_table_drag_highlight (ETable *table,
 						       NULL);
 		}
 		gnome_canvas_item_set (table->drop_highlight,
-				       "x1", (double) x,
-				       "x2", (double) x + width - 1,
-				       "y1", (double) y,
-				       "y2", (double) y + height - 1,
+				       "x1", (gdouble) x,
+				       "x2", (gdouble) x + width - 1,
+				       "y1", (gdouble) y,
+				       "y2", (gdouble) y + height - 1,
 				       NULL);
 	} else {
 		if (table->drop_highlight) {
@@ -2884,7 +2884,7 @@ scroll_timeout (gpointer data)
 	ETable *et = data;
 	gint dx = 0, dy = 0;
 	GtkAdjustment *h, *v;
-	double hvalue, vvalue;
+	gdouble hvalue, vvalue;
 
 	if (et->scroll_direction & ET_SCROLL_DOWN)
 		dy += 20;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index d612fc93bc..3d5c604faa 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -663,7 +663,7 @@ et_focus (GtkWidget *container, GtkDirectionType direction)
 static void
 set_header_canvas_width (ETree *e_tree)
 {
-	double oldwidth, oldheight, width;
+	gdouble oldwidth, oldheight, width;
 
 	if (!(e_tree->priv->header_item && e_tree->priv->header_canvas && e_tree->priv->table_canvas))
 		return;
@@ -1165,7 +1165,7 @@ e_tree_set_state_object(ETree *e_tree, ETableState *state)
 
 	connect_header (e_tree, state);
 
-	g_value_set_double (val, (double) (GTK_WIDGET(e_tree->priv->table_canvas)->allocation.width));
+	g_value_set_double (val, (gdouble) (GTK_WIDGET(e_tree->priv->table_canvas)->allocation.width));
 	g_object_set_property (G_OBJECT (e_tree->priv->header), "width", val);
 	g_free (val);
 
@@ -2378,10 +2378,10 @@ e_tree_drag_highlight (ETree *tree,
 						       NULL);
 		}
 		gnome_canvas_item_set (tree->priv->drop_highlight,
-				       "x1", (double) x,
-				       "x2", (double) x + width - 1,
-				       "y1", (double) y,
-				       "y2", (double) y + height - 1,
+				       "x1", (gdouble) x,
+				       "x2", (gdouble) x + width - 1,
+				       "y1", (gdouble) y,
+				       "y2", (gdouble) y + height - 1,
 				       NULL);
 	} else {
 		gtk_object_destroy (GTK_OBJECT (tree->priv->drop_highlight));
@@ -2747,7 +2747,7 @@ scroll_timeout (gpointer data)
 	ETree *et = data;
 	gint dx = 0, dy = 0;
 	GtkAdjustment *v, *h;
-	double vvalue, hvalue;
+	gdouble vvalue, hvalue;
 
 	if (et->priv->scroll_direction & ET_SCROLL_DOWN)
 		dy += 20;
@@ -3399,7 +3399,7 @@ e_tree_class_init (ETreeClass *class)
 static void
 tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree)
 {
-	double width;
+	gdouble width;
 
 	g_return_if_fail (tree != NULL);
 	g_return_if_fail (tree->priv != NULL);
@@ -3444,8 +3444,8 @@ e_tree_set_info_message (ETree *tree, const gchar *info_message)
 						"justification", GTK_JUSTIFY_LEFT,
 						"text", info_message,
 						"draw_background", FALSE,
-						"width", (double) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0,
-						"clip_width", (double) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0,
+						"width", (gdouble) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0,
+						"clip_width", (gdouble) GTK_WIDGET (tree->priv->table_canvas)->allocation.width - 60.0,
 						NULL);
 
 		e_canvas_item_move_absolute (tree->priv->info_text, 30, 30);
diff --git a/widgets/table/gal-a11y-e-cell-popup.h b/widgets/table/gal-a11y-e-cell-popup.h
index 9729e13e55..b96aa9392c 100644
--- a/widgets/table/gal-a11y-e-cell-popup.h
+++ b/widgets/table/gal-a11y-e-cell-popup.h
@@ -58,4 +58,4 @@ AtkObject *gal_a11y_e_cell_popup_new        (ETableItem *item,
 					    gint         view_col,
 					    gint         row);
 
-#endif /* ! __GAL_A11Y_E_CELL_POPUP_H__ */
+#endif /* __GAL_A11Y_E_CELL_POPUP_H__ */
diff --git a/widgets/table/gal-a11y-e-cell-registry.h b/widgets/table/gal-a11y-e-cell-registry.h
index 85afdadf4e..189da02b02 100644
--- a/widgets/table/gal-a11y-e-cell-registry.h
+++ b/widgets/table/gal-a11y-e-cell-registry.h
@@ -68,4 +68,4 @@ void       gal_a11y_e_cell_registry_add_cell_type  (GalA11yECellRegistry     *re
 						    GType                     type,
 						    GalA11yECellRegistryFunc  func);
 
-#endif /* ! __GAL_A11Y_E_CELL_REGISTRY_H__ */
+#endif /* __GAL_A11Y_E_CELL_REGISTRY_H__ */
diff --git a/widgets/table/gal-a11y-e-cell-text.h b/widgets/table/gal-a11y-e-cell-text.h
index e5a95accad..c9e0fa8ac4 100644
--- a/widgets/table/gal-a11y-e-cell-text.h
+++ b/widgets/table/gal-a11y-e-cell-text.h
@@ -60,4 +60,4 @@ AtkObject *gal_a11y_e_cell_text_new        (ETableItem *item,
 					    gint         view_col,
 					    gint         row);
 
-#endif /* ! __GAL_A11Y_E_CELL_TEXT_H__ */
+#endif /* __GAL_A11Y_E_CELL_TEXT_H__ */
diff --git a/widgets/table/gal-a11y-e-cell-tree.h b/widgets/table/gal-a11y-e-cell-tree.h
index fa48c1486a..fedd9e5fbd 100644
--- a/widgets/table/gal-a11y-e-cell-tree.h
+++ b/widgets/table/gal-a11y-e-cell-tree.h
@@ -60,4 +60,4 @@ AtkObject *gal_a11y_e_cell_tree_new	   (ETableItem *item,
 					    gint         view_col,
 					    gint         row);
 
-#endif /* ! __GAL_A11Y_E_CELL_TREE_H__ */
+#endif /* __GAL_A11Y_E_CELL_TREE_H__ */
diff --git a/widgets/table/gal-a11y-e-cell.h b/widgets/table/gal-a11y-e-cell.h
index 4f2e536b8d..aa02aff79c 100644
--- a/widgets/table/gal-a11y-e-cell.h
+++ b/widgets/table/gal-a11y-e-cell.h
@@ -106,4 +106,4 @@ gboolean gal_a11y_e_cell_remove_state  (GalA11yECell *cell,
 					AtkStateType state_type,
 					gboolean     emit_signal);
 
-#endif /* ! __GAL_A11Y_E_CELL_H__ */
+#endif /* __GAL_A11Y_E_CELL_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 225f24c685..8d788a458b 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.c
+++ b/widgets/table/gal-a11y-e-table-click-to-add.c
@@ -144,7 +144,7 @@ etcta_ref_child (AtkObject *accessible,
 	AtkObject * atk_obj = NULL;
 	ETableClickToAdd * etcta;
 
-	if ( i != 0 )
+	if (i != 0)
 		return NULL;
 
 	etcta  = E_TABLE_CLICK_TO_ADD(atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (accessible)));
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 17d6940d08..0d1507f79d 100644
--- a/widgets/table/gal-a11y-e-table-click-to-add.h
+++ b/widgets/table/gal-a11y-e-table-click-to-add.h
@@ -52,4 +52,4 @@ GType      gal_a11y_e_table_click_to_add_get_type  (void);
 AtkObject *gal_a11y_e_table_click_to_add_new       (GObject *widget);
 
 void       gal_a11y_e_table_click_to_add_init      (void);
-#endif /* ! __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__ */
+#endif /* __GAL_A11Y_E_TABLE_CLICK_TO_ADD_H__ */
diff --git a/widgets/table/gal-a11y-e-table-column-header.h b/widgets/table/gal-a11y-e-table-column-header.h
index 0cf0695f75..ec9a74b868 100644
--- a/widgets/table/gal-a11y-e-table-column-header.h
+++ b/widgets/table/gal-a11y-e-table-column-header.h
@@ -50,4 +50,4 @@ GType      gal_a11y_e_table_column_header_get_type  (void);
 AtkObject *gal_a11y_e_table_column_header_new       (ETableCol *etc, ETableItem *item);
 void gal_a11y_e_table_column_header_init (void);
 
-#endif /* ! __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__ */
+#endif /* __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__ */
diff --git a/widgets/table/gal-a11y-e-table-factory.h b/widgets/table/gal-a11y-e-table-factory.h
index f0a1cecd0b..6caf3d8beb 100644
--- a/widgets/table/gal-a11y-e-table-factory.h
+++ b/widgets/table/gal-a11y-e-table-factory.h
@@ -47,4 +47,4 @@ struct _GalA11yETableFactoryClass {
 /* Standard Glib function */
 GType              gal_a11y_e_table_factory_get_type         (void);
 
-#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
+#endif /* __GAL_A11Y_E_TABLE_FACTORY_H__ */
diff --git a/widgets/table/gal-a11y-e-table-item-factory.h b/widgets/table/gal-a11y-e-table-item-factory.h
index 5fdf7ce1ef..a08cfeb84b 100644
--- a/widgets/table/gal-a11y-e-table-item-factory.h
+++ b/widgets/table/gal-a11y-e-table-item-factory.h
@@ -46,4 +46,4 @@ struct _GalA11yETableItemFactoryClass {
 /* Standard Glib function */
 GType              gal_a11y_e_table_item_factory_get_type         (void);
 
-#endif /* ! __GAL_A11Y_E_TABLE_FACTORY_H__ */
+#endif /* __GAL_A11Y_E_TABLE_FACTORY_H__ */
diff --git a/widgets/table/gal-a11y-e-table-item.c b/widgets/table/gal-a11y-e-table-item.c
index 37f55f68c1..85c4f9164d 100644
--- a/widgets/table/gal-a11y-e-table-item.c
+++ b/widgets/table/gal-a11y-e-table-item.c
@@ -799,7 +799,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
         /* 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 ) {
+                        if (prev_cols [j] == cols[i] && i != j) {
 
                                 reorder_found = TRUE;
                                 state [i] = ETI_HEADER_REORDERED;
@@ -813,7 +813,7 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
                 }
 
                 /* 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;
                 }
@@ -822,11 +822,11 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
         /* 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] )
+                        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;
                 }
diff --git a/widgets/table/gal-a11y-e-table-item.h b/widgets/table/gal-a11y-e-table-item.h
index 87773aae48..90861a14ec 100644
--- a/widgets/table/gal-a11y-e-table-item.h
+++ b/widgets/table/gal-a11y-e-table-item.h
@@ -55,4 +55,4 @@ AtkObject *gal_a11y_e_table_item_new       (ETableItem *item);
 
 void gal_a11y_e_table_item_init (void);
 
-#endif /* ! __GAL_A11Y_E_TABLE_ITEM_H__ */
+#endif /* __GAL_A11Y_E_TABLE_ITEM_H__ */
diff --git a/widgets/table/gal-a11y-e-table.h b/widgets/table/gal-a11y-e-table.h
index ba7c8adc03..f5dba40c7e 100644
--- a/widgets/table/gal-a11y-e-table.h
+++ b/widgets/table/gal-a11y-e-table.h
@@ -55,4 +55,4 @@ AtkObject *gal_a11y_e_table_new       (GObject *table);
 
 void       gal_a11y_e_table_init (void);
 
-#endif /* ! __GAL_A11Y_E_TABLE_H__ */
+#endif /* __GAL_A11Y_E_TABLE_H__ */
diff --git a/widgets/table/gal-a11y-e-tree-factory.h b/widgets/table/gal-a11y-e-tree-factory.h
index 36b4a61dc2..640261acf2 100644
--- a/widgets/table/gal-a11y-e-tree-factory.h
+++ b/widgets/table/gal-a11y-e-tree-factory.h
@@ -46,4 +46,4 @@ struct _GalA11yETreeFactoryClass {
 /* Standard Glib function */
 GType              gal_a11y_e_tree_factory_get_type         (void);
 
-#endif /* ! __GAL_A11Y_E_TREE_FACTORY_H__ */
+#endif /* __GAL_A11Y_E_TREE_FACTORY_H__ */
diff --git a/widgets/table/gal-a11y-e-tree.h b/widgets/table/gal-a11y-e-tree.h
index ef15dade36..61799e1b93 100644
--- a/widgets/table/gal-a11y-e-tree.h
+++ b/widgets/table/gal-a11y-e-tree.h
@@ -54,4 +54,4 @@ AtkObject *gal_a11y_e_tree_new       (GObject *tree);
 
 void       gal_a11y_e_tree_init      (void);
 
-#endif /* ! __GAL_A11Y_E_TREE_H__ */
+#endif /* __GAL_A11Y_E_TREE_H__ */
diff --git a/widgets/text/e-reflow.c b/widgets/text/e-reflow.c
index 85521aa02b..0ce3302da1 100644
--- a/widgets/text/e-reflow.c
+++ b/widgets/text/e-reflow.c
@@ -42,8 +42,8 @@ static void e_reflow_realize (GnomeCanvasItem *item);
 static void e_reflow_unrealize (GnomeCanvasItem *item);
 static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 				    gint x, gint y, gint width, gint height);
-static void e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags);
-static double e_reflow_point (GnomeCanvasItem *item, double x, double y, gint cx, gint cy, GnomeCanvasItem **actual_item);
+static void e_reflow_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gint flags);
+static gdouble e_reflow_point (GnomeCanvasItem *item, gdouble x, gdouble y, gint cx, gint cy, GnomeCanvasItem **actual_item);
 static void e_reflow_reflow (GnomeCanvasItem *item, gint flags);
 static void set_empty(EReflow *reflow);
 
@@ -82,7 +82,7 @@ er_compare (gint i1, gint i2, gpointer user_data)
 }
 
 static gint
-e_reflow_pick_line (EReflow *reflow, double x)
+e_reflow_pick_line (EReflow *reflow, gdouble x)
 {
 	x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 	x /= reflow->column_width + E_REFLOW_FULL_GUTTER;
@@ -113,7 +113,7 @@ e_reflow_resize_children (GnomeCanvasItem *item)
 	for (i = 0; i < count; i++) {
 		if (reflow->items[i])
 			gnome_canvas_item_set(reflow->items[i],
-					      "width", (double) reflow->column_width,
+					      "width", (gdouble) reflow->column_width,
 					      NULL);
 	}
 }
@@ -129,7 +129,7 @@ e_reflow_update_selection_row (EReflow *reflow, gint row)
 		reflow->items[row] = e_reflow_model_incarnate (reflow->model, row, GNOME_CANVAS_GROUP (reflow));
 		g_object_set (reflow->items[row],
 			      "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), row),
-			      "width", (double) reflow->column_width,
+			      "width", (gdouble) reflow->column_width,
 			      NULL);
 	}
 }
@@ -219,7 +219,7 @@ cursor_changed (ESelectionModel *selection, gint row, gint col, EReflow *reflow)
 			reflow->items[row] = e_reflow_model_incarnate (reflow->model, row, GNOME_CANVAS_GROUP (reflow));
 			g_object_set (reflow->items[row],
 				      "has_cursor", TRUE,
-				      "width", (double) reflow->column_width,
+				      "width", (gdouble) reflow->column_width,
 				      NULL);
 		}
 	}
@@ -266,7 +266,7 @@ incarnate (EReflow *reflow)
 				reflow->items[unsorted] = e_reflow_model_incarnate (reflow->model, unsorted, GNOME_CANVAS_GROUP (reflow));
 				g_object_set (reflow->items[unsorted],
 					      "selected", e_selection_model_is_row_selected(E_SELECTION_MODEL(reflow->selection), unsorted),
-					      "width", (double) reflow->column_width,
+					      "width", (gdouble) reflow->column_width,
 					      NULL);
 			}
 		}
@@ -298,7 +298,7 @@ reflow_columns (EReflow *reflow)
 	gint start;
 	gint i;
 	gint column_count, column_start;
-	double running_height;
+	gdouble running_height;
 
 	if (reflow->reflow_from_column <= 1) {
 		start = 0;
@@ -734,7 +734,7 @@ e_reflow_set_property (GObject *object, guint prop_id, const GValue *value, GPar
 	case PROP_COLUMN_WIDTH:
 		if (reflow->column_width != g_value_get_double (value)) {
 			GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
-			double old_width = reflow->column_width;
+			gdouble old_width = reflow->column_width;
 
 			reflow->column_width = g_value_get_double (value);
 			adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
@@ -899,7 +899,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 
 	reflow = E_REFLOW (item);
 
-	switch ( event->type )
+	switch (event->type)
 		{
 		case GDK_KEY_PRESS:
 			return_val = e_selection_model_key_press(reflow->selection, (GdkEventKey *) event);
@@ -951,12 +951,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 				case 1:
 					{
 						GdkEventButton *button = (GdkEventButton *) event;
-						double n_x;
+						gdouble n_x;
 						n_x = button->x;
 						n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 						n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
-						if ( button->y >= E_REFLOW_BORDER_WIDTH && button->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) {
+						if (button->y >= E_REFLOW_BORDER_WIDTH && button->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER) {
 							/* don't allow to drag the first line*/
 							if (e_reflow_pick_line(reflow, button->x) == 0)
 								return TRUE;
@@ -990,7 +990,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 						GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
 						gdouble new_value = adjustment->value;
 						new_value += adjustment->step_increment;
-						if ( new_value > adjustment->upper - adjustment->page_size )
+						if (new_value > adjustment->upper - adjustment->page_size)
 							new_value = adjustment->upper - adjustment->page_size;
 						gtk_adjustment_set_value(adjustment, new_value);
 					}
@@ -1004,10 +1004,10 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
 				reflow->temp_column_width = reflow->column_width +
 					(button->x - reflow->start_x)/(reflow->which_column_dragged - e_reflow_pick_line(reflow, adjustment->value));
-				if ( reflow->temp_column_width < 50 )
+				if (reflow->temp_column_width < 50)
 					reflow->temp_column_width = 50;
 				reflow->column_drag = FALSE;
-				if ( old_width != reflow->temp_column_width ) {
+				if (old_width != reflow->temp_column_width) {
 					gtk_adjustment_set_value(adjustment, adjustment->value + e_reflow_pick_line(reflow, adjustment->value) * (reflow->temp_column_width - reflow->column_width));
 					reflow->column_width = reflow->temp_column_width;
 					adjustment->step_increment = (reflow->column_width + E_REFLOW_FULL_GUTTER) / 2;
@@ -1026,7 +1026,7 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 			break;
 		case GDK_MOTION_NOTIFY:
 			if (reflow->column_drag) {
-				double old_width = reflow->temp_column_width;
+				gdouble old_width = reflow->temp_column_width;
 				GdkEventMotion *motion = (GdkEventMotion *) event;
 				GtkAdjustment *adjustment = gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas));
 				reflow->temp_column_width = reflow->column_width +
@@ -1040,19 +1040,19 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 				return TRUE;
 			} else {
 				GdkEventMotion *motion = (GdkEventMotion *) event;
-				double n_x;
+				gdouble n_x;
 
 				n_x = motion->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
-				if ( motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) {
-					if ( reflow->default_cursor_shown ) {
+				if (motion->y >= E_REFLOW_BORDER_WIDTH && motion->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER) {
+					if (reflow->default_cursor_shown) {
 						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
 						reflow->default_cursor_shown = FALSE;
 					}
 				} else
-					if ( ! reflow->default_cursor_shown ) {
+					if (!reflow->default_cursor_shown) {
 						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor);
 						reflow->default_cursor_shown = TRUE;
 					}
@@ -1062,13 +1062,13 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 		case GDK_ENTER_NOTIFY:
 			if (!reflow->column_drag) {
 				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x;
+				gdouble n_x;
 				n_x = crossing->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
 
-				if ( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) {
-					if ( reflow->default_cursor_shown ) {
+				if (crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER) {
+					if (reflow->default_cursor_shown) {
 						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->arrow_cursor);
 						reflow->default_cursor_shown = FALSE;
 					}
@@ -1078,12 +1078,12 @@ e_reflow_event (GnomeCanvasItem *item, GdkEvent *event)
 		case GDK_LEAVE_NOTIFY:
 			if (!reflow->column_drag) {
 				GdkEventCrossing *crossing = (GdkEventCrossing *) event;
-				double n_x;
+				gdouble n_x;
 				n_x = crossing->x;
 				n_x += E_REFLOW_BORDER_WIDTH + E_REFLOW_DIVIDER_WIDTH;
 				n_x = fmod(n_x,(reflow->column_width + E_REFLOW_FULL_GUTTER));
-				if ( !( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER ) ) {
-					if ( ! reflow->default_cursor_shown ) {
+				if (!( crossing->y >= E_REFLOW_BORDER_WIDTH && crossing->y <= reflow->height - E_REFLOW_BORDER_WIDTH && n_x < E_REFLOW_FULL_GUTTER )) {
+					if (!reflow->default_cursor_shown) {
 						gdk_window_set_cursor(GTK_WIDGET(item->canvas)->window, reflow->default_cursor);
 						reflow->default_cursor_shown = TRUE;
 					}
@@ -1108,7 +1108,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	gdouble running_width;
 	EReflow *reflow = E_REFLOW(item);
 	gint i;
-	double column_width;
+	gdouble column_width;
 
 	if (GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->draw)
 		GNOME_CANVAS_ITEM_CLASS(e_reflow_parent_class)->draw (item, drawable, x, y, width, height);
@@ -1124,7 +1124,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
 
 	for (; i < reflow->column_count; i++) {
-		if ( running_width > x + width )
+		if (running_width > x + width)
 			break;
 		x_rect = running_width;
 		gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
@@ -1158,7 +1158,7 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		running_width += i * (column_width + E_REFLOW_FULL_GUTTER);
 
 		for (; i < reflow->column_count; i++) {
-			if ( running_width > x + width )
+			if (running_width > x + width)
 				break;
 			x_rect = running_width;
 			gdk_draw_rectangle(drawable,
@@ -1174,10 +1174,10 @@ static void e_reflow_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 }
 
 static void
-e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gint flags)
+e_reflow_update (GnomeCanvasItem *item, gdouble affine[6], ArtSVP *clip_path, gint flags)
 {
 	EReflow *reflow;
-	double x0, x1, y0, y1;
+	gdouble x0, x1, y0, y1;
 
 	reflow = E_REFLOW (item);
 
@@ -1188,9 +1188,9 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin
 	y0 = item->y1;
 	x1 = item->x2;
 	y1 = item->y2;
-	if ( x1 < x0 + reflow->width )
+	if (x1 < x0 + reflow->width)
 		x1 = x0 + reflow->width;
-	if ( y1 < y0 + reflow->height )
+	if (y1 < y0 + reflow->height)
 		y1 = y0 + reflow->height;
 	item->x2 = x1;
 	item->y2 = y1;
@@ -1200,13 +1200,13 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin
 		y0 = item->y1;
 		x1 = item->x2;
 		y1 = item->y2;
-		if ( x0 > 0 )
+		if (x0 > 0)
 			x0 = 0;
-		if ( y0 > 0 )
+		if (y0 > 0)
 			y0 = 0;
-		if ( x1 < E_REFLOW(item)->width )
+		if (x1 < E_REFLOW(item)->width)
 			x1 = E_REFLOW(item)->width;
-		if ( x1 < E_REFLOW(item)->height )
+		if (x1 < E_REFLOW(item)->height)
 			x1 = E_REFLOW(item)->height;
 
 		gnome_canvas_request_redraw(item->canvas, x0, y0, x1, y1);
@@ -1217,9 +1217,9 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin
 						    gtk_layout_get_hadjustment(GTK_LAYOUT(item->canvas))->value);
 		gdouble running_width;
 		gint i;
-		double column_width;
+		gdouble column_width;
 
-		if ( reflow->previous_temp_column_width != -1 ) {
+		if (reflow->previous_temp_column_width != -1) {
 			running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER);
 			column_width = reflow->previous_temp_column_width;
 			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
@@ -1235,7 +1235,7 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin
 			}
 		}
 
-		if ( reflow->temp_column_width != -1 ) {
+		if (reflow->temp_column_width != -1) {
 			running_width = start_line * (reflow->column_width + E_REFLOW_FULL_GUTTER);
 			column_width = reflow->temp_column_width;
 			running_width -= start_line * (column_width + E_REFLOW_FULL_GUTTER);
@@ -1258,10 +1258,10 @@ e_reflow_update (GnomeCanvasItem *item, double affine[6], ArtSVP *clip_path, gin
 
 static double
 e_reflow_point (GnomeCanvasItem *item,
-		double x, double y, gint cx, gint cy,
+		gdouble x, gdouble y, gint cx, gint cy,
 		GnomeCanvasItem **actual_item)
 {
-	double distance = 1;
+	gdouble distance = 1;
 
 	*actual_item = NULL;
 
@@ -1297,7 +1297,7 @@ e_reflow_reflow( GnomeCanvasItem *item, gint flags )
 	gint next_column;
 	gint i;
 
-	if (! (GTK_OBJECT_FLAGS (reflow) & GNOME_CANVAS_ITEM_REALIZED))
+	if (!(GTK_OBJECT_FLAGS (reflow) & GNOME_CANVAS_ITEM_REALIZED))
 		return;
 
 	if (reflow->need_reflow_columns) {
@@ -1321,13 +1321,13 @@ e_reflow_reflow( GnomeCanvasItem *item, gint flags )
 
 		if (unsorted >= 0 && reflow->items[unsorted]) {
 			e_canvas_item_move_absolute(GNOME_CANVAS_ITEM(reflow->items[unsorted]),
-						    (double) running_width,
-						    (double) running_height);
+						    (gdouble) running_width,
+						    (gdouble) running_height);
 			running_height += reflow->heights[unsorted] + E_REFLOW_BORDER_WIDTH;
 		}
 	}
 	reflow->width = running_width + reflow->column_width + E_REFLOW_BORDER_WIDTH;
-	if ( reflow->width < reflow->minimum_width )
+	if (reflow->width < reflow->minimum_width)
 		reflow->width = reflow->minimum_width;
 	if (old_width != reflow->width)
 		e_canvas_item_request_parent_reflow(item);
diff --git a/widgets/text/e-reflow.h b/widgets/text/e-reflow.h
index 1559ad6bc0..d11362bed4 100644
--- a/widgets/text/e-reflow.h
+++ b/widgets/text/e-reflow.h
@@ -36,9 +36,9 @@ G_BEGIN_DECLS
  *
  * name		type		read/write	description
  * --------------------------------------------------------------------------------
- * minimum_width double         RW              minimum width of the reflow.  width >= minimum_width
- * width        double          R               width of the reflow
- * height       double          RW              height of the reflow
+ * minimum_width gdouble         RW              minimum width of the reflow.  width >= minimum_width
+ * width        gdouble          R               width of the reflow
+ * height       gdouble          RW              height of the reflow
  */
 
 #define E_REFLOW_TYPE			(e_reflow_get_type ())
@@ -86,11 +86,11 @@ struct _EReflow
 	GnomeCanvasItem *empty_text;
 	gchar *empty_message;
 
-	double minimum_width;
-	double width;
-	double height;
+	gdouble minimum_width;
+	gdouble width;
+	gdouble height;
 
-	double column_width;
+	gdouble column_width;
 
 	gint incarnate_idle_id;
 	gint do_adjustment_idle_id;
@@ -98,8 +98,8 @@ struct _EReflow
 	/* These are all for when the column is being dragged. */
 	gdouble start_x;
 	gint which_column_dragged;
-	double temp_column_width;
-	double previous_temp_column_width;
+	gdouble temp_column_width;
+	gdouble previous_temp_column_width;
 
 	gint cursor_row;
 
@@ -124,7 +124,7 @@ struct _EReflowClass
 	GnomeCanvasGroupClass parent_class;
 
 	gint (*selection_event) (EReflow *reflow, GnomeCanvasItem *item, GdkEvent *event);
-	void (*column_width_changed) (EReflow *reflow, double width);
+	void (*column_width_changed) (EReflow *reflow, gdouble width);
 };
 
 /*
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index c3f2943b5c..e31b3e519b 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -176,7 +176,7 @@ static GdkAtom clipboard_atom = GDK_NONE;
 static void
 e_text_style_set (EText *text, GtkStyle *previous_style)
 {
-	if ( text->line_wrap ) {
+	if (text->line_wrap) {
 		text->needs_split_into_lines = 1;
 	} else {
 		text->needs_calc_height = 1;
@@ -236,12 +236,12 @@ e_text_dispose (GObject *object)
 		text->timer = NULL;
 	}
 
-	if ( text->dbl_timeout ) {
+	if (text->dbl_timeout) {
 		g_source_remove (text->dbl_timeout);
 		text->dbl_timeout = 0;
 	}
 
-	if ( text->tpl_timeout ) {
+	if (text->tpl_timeout) {
 		g_source_remove (text->tpl_timeout);
 		text->tpl_timeout = 0;
 	}
@@ -492,10 +492,10 @@ e_text_text_model_reposition (ETextModel *model, ETextModelReposFn fn, gpointer
 }
 
 static void
-get_bounds (EText *text, double *px1, double *py1, double *px2, double *py2)
+get_bounds (EText *text, gdouble *px1, gdouble *py1, gdouble *px2, gdouble *py2)
 {
 	GnomeCanvasItem *item;
-	double wx, wy, clip_width, clip_height;
+	gdouble wx, wy, clip_width, clip_height;
 
 	item = GNOME_CANVAS_ITEM (text);
 
@@ -512,7 +512,7 @@ get_bounds (EText *text, double *px1, double *py1, double *px2, double *py2)
 	else
 		clip_width = text->clip_width;
 
-	if ( text->clip_height < 0 )
+	if (text->clip_height < 0)
 		clip_height = text->height;
 	else
 		clip_height = text->clip_height;
@@ -688,11 +688,11 @@ e_text_set_property (GObject *object,
 	switch (prop_id) {
 	case PROP_MODEL:
 
-		if ( text->model_changed_signal_id )
+		if (text->model_changed_signal_id)
 			g_signal_handler_disconnect (text->model,
 					     text->model_changed_signal_id);
 
-		if ( text->model_repos_signal_id )
+		if (text->model_repos_signal_id)
 			g_signal_handler_disconnect (text->model,
 						     text->model_repos_signal_id);
 
@@ -720,10 +720,10 @@ e_text_set_property (GObject *object,
 		break;
 
 	case PROP_EVENT_PROCESSOR:
-		if ( text->tep && text->tep_command_id )
+		if (text->tep && text->tep_command_id)
 			g_signal_handler_disconnect(text->tep,
 						    text->tep_command_id);
-		if ( text->tep ) {
+		if (text->tep) {
 			g_object_unref(text->tep);
 		}
 		text->tep = E_TEXT_EVENT_PROCESSOR(g_value_get_object (value));
@@ -778,7 +778,7 @@ e_text_set_property (GObject *object,
 	case PROP_CLIP_WIDTH:
 		text->clip_width = fabs (g_value_get_double (value));
 		calc_ellipsis (text);
-		if ( text->line_wrap ) {
+		if (text->line_wrap) {
 			if (text->layout)
 				pango_layout_set_width (text->layout, text->clip_width < 0 ? -1 : text->clip_width * PANGO_SCALE);
 			text->needs_split_into_lines = 1;
@@ -802,7 +802,7 @@ e_text_set_property (GObject *object,
 	case PROP_CLIP:
 		text->clip = g_value_get_boolean (value);
 		calc_ellipsis (text);
-		if ( text->line_wrap )
+		if (text->line_wrap)
 			text->needs_split_into_lines = 1;
 		else {
 			text->needs_calc_height = 1;
@@ -897,11 +897,11 @@ e_text_set_property (GObject *object,
 		break;
 
 	case PROP_BREAK_CHARACTERS:
-		if ( text->break_characters ) {
+		if (text->break_characters) {
 			g_free(text->break_characters);
 			text->break_characters = NULL;
 		}
-		if ( g_value_get_string (value) )
+		if (g_value_get_string (value))
 			text->break_characters = g_strdup( g_value_get_string (value) );
 		text->needs_split_into_lines = 1;
 		needs_reflow = 1;
@@ -916,7 +916,7 @@ e_text_set_property (GObject *object,
 	case PROP_WIDTH:
 		text->clip_width = fabs (g_value_get_double (value));
 		calc_ellipsis (text);
-		if ( text->line_wrap ) {
+		if (text->line_wrap) {
 			if (text->layout) {
 				pango_layout_set_width (text->layout, text->width < 0 ? -1 : text->width * PANGO_SCALE);
 			}
@@ -1003,9 +1003,9 @@ e_text_set_property (GObject *object,
 	       needs_update = 1;
 	}
 
-	if ( needs_reflow )
+	if (needs_reflow)
 		e_canvas_item_request_reflow (item);
-	if ( needs_update )
+	if (needs_update)
 		gnome_canvas_item_request_update (item);
 }
 
@@ -1181,7 +1181,7 @@ e_text_reflow (GnomeCanvasItem *item, gint flags)
 		text->needs_calc_height = 1;
 	}
 
-	if ( text->needs_calc_height ) {
+	if (text->needs_calc_height) {
 		calc_height (text);
 		gnome_canvas_item_request_update(item);
 		text->needs_calc_height = 0;
@@ -1191,10 +1191,10 @@ e_text_reflow (GnomeCanvasItem *item, gint flags)
 
 /* Update handler for the text item */
 static void
-e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
+e_text_update (GnomeCanvasItem *item, gdouble *affine, ArtSVP *clip_path, gint flags)
 {
 	EText *text;
-	double x1, y1, x2, y2;
+	gdouble x1, y1, x2, y2;
 
 	text = E_TEXT (item);
 
@@ -1224,7 +1224,7 @@ e_text_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint fl
 		}
 		text->needs_recalc_bounds = 0;
 	}
-	if ( text->needs_redraw ) {
+	if (text->needs_redraw) {
 		gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
 		text->needs_redraw = 0;
 	}
@@ -1678,12 +1678,12 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 
 /* Point handler for the text item */
 static double
-e_text_point (GnomeCanvasItem *item, double x, double y,
+e_text_point (GnomeCanvasItem *item, gdouble x, gdouble y,
 	      gint cx, gint cy, GnomeCanvasItem **actual_item)
 {
 	EText *text;
-	double clip_width;
-	double clip_height;
+	gdouble clip_width;
+	gdouble clip_height;
 
 	text = E_TEXT (item);
 
@@ -1700,7 +1700,7 @@ e_text_point (GnomeCanvasItem *item, double x, double y,
 	else
 		clip_width = text->clip_width;
 
-	if ( text->clip_height < 0 )
+	if (text->clip_height < 0)
 		clip_height = text->height;
 	else
 		clip_height = text->clip_height;
@@ -1728,10 +1728,10 @@ e_text_point (GnomeCanvasItem *item, double x, double y,
 
 /* Bounds handler for the text item */
 static void
-e_text_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double *y2)
+e_text_bounds (GnomeCanvasItem *item, gdouble *x1, gdouble *y1, gdouble *x2, gdouble *y2)
 {
 	EText *text;
-	double width, height;
+	gdouble width, height;
 
 	text = E_TEXT (item);
 
@@ -1744,7 +1744,7 @@ e_text_bounds (GnomeCanvasItem *item, double *x1, double *y1, double *x2, double
 	if (text->clip) {
 		if (text->clip_width >= 0)
 			width = text->clip_width;
-		if ( text->clip_height >= 0 )
+		if (text->clip_height >= 0)
 			height = text->clip_height;
 	}
 
@@ -1945,7 +1945,7 @@ e_text_stop_editing (EText *text)
 	text->revert = NULL;
 
 	text->editing = FALSE;
-	if ( (!text->default_cursor_shown) && (!text->draw_borders) ) {
+	if ((!text->default_cursor_shown) && (!text->draw_borders)) {
 		GdkWindow *window;
 
 		window = gtk_widget_get_window (
@@ -2059,7 +2059,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 					gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
 				}
 			}
-			if ( text->line_wrap )
+			if (text->line_wrap)
 				text->needs_split_into_lines = 1;
 			e_canvas_item_request_reflow (GNOME_CANVAS_ITEM(text));
 		}
@@ -2223,7 +2223,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 	case GDK_ENTER_NOTIFY:
 		text->pointer_in = TRUE;
 		if (text->editing || text->draw_borders) {
-			if ( text->default_cursor_shown ) {
+			if (text->default_cursor_shown) {
 				gdk_window_set_cursor(window, text->i_cursor);
 				text->default_cursor_shown = FALSE;
 			}
@@ -2232,7 +2232,7 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 	case GDK_LEAVE_NOTIFY:
 		text->pointer_in = FALSE;
 		if (text->editing || text->draw_borders) {
-			if ( ! text->default_cursor_shown ) {
+			if (!text->default_cursor_shown) {
 				gdk_window_set_cursor(window, text->default_cursor);
 				text->default_cursor_shown = TRUE;
 			}
@@ -3163,7 +3163,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp
 
 		if (cur_line) {
 			gint xpos, ypos;
-			double clip_width, clip_height;
+			gdouble clip_width, clip_height;
 			/* gboolean trailing = FALSE; */
 			PangoRectangle pango_pos;
 
@@ -3206,7 +3206,7 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp
 				ypos = pango_pos.y + pango_pos.height;
 			}
 
-			if ( text->clip_height < 0 )
+			if (text->clip_height < 0)
 				clip_height = text->height;
 			else
 				clip_height = text->clip_height;
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 057ff507a7..bed5ff95e8 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -67,16 +67,16 @@ G_BEGIN_DECLS
  * fill_color		string			W		X color specification for text
  * fill_color_gdk	GdkColor*		RW		Pointer to an allocated GdkColor
  * fill_stipple		GdkBitmap*		RW		Stipple pattern for filling the text
- * clip_width		double			RW		Width of clip rectangle
- * clip_height		double			RW		Height of clip rectangle
+ * clip_width		gdouble			RW		Width of clip rectangle
+ * clip_height		gdouble			RW		Height of clip rectangle
  * clip			boolean			RW		Use clipping rectangle?
  * fill_clip_rect       boolean                 RW              Whether the text item represents itself as being the size of the clipping rectangle.
- * x_offset		double			RW		Horizontal offset distance from anchor position
- * y_offset		double			RW		Vertical offset distance from anchor position
- * text_width		double			R		Used to query the width of the rendered text
- * text_height		double			R		Used to query the rendered height of the text
- * width                double                  RW              A synonym for clip_width
- * height               double                  R               A synonym for text_height
+ * x_offset		gdouble			RW		Horizontal offset distance from anchor position
+ * y_offset		gdouble			RW		Vertical offset distance from anchor position
+ * text_width		gdouble			R		Used to query the width of the rendered text
+ * text_height		gdouble			R		Used to query the rendered height of the text
+ * width                gdouble                  RW              A synonym for clip_width
+ * height               gdouble                  R               A synonym for text_height
  *
  * These are currently ignored in the AA version:
  * editable             boolean                 RW              Can this item be edited
@@ -117,10 +117,10 @@ struct _EText {
 	GtkAnchorType anchor;		/* Anchor side for text */
 	GtkJustification justification;	/* Justification for text */
 
-	double clip_width;		/* Width of optional clip rectangle */
-	double clip_height;		/* Height of optional clip rectangle */
+	gdouble clip_width;		/* Width of optional clip rectangle */
+	gdouble clip_height;		/* Height of optional clip rectangle */
 
-	double xofs, yofs;		/* Text offset distance from anchor position */
+	gdouble xofs, yofs;		/* Text offset distance from anchor position */
 
 	GdkColor color;		/* Fill color */
 	GdkBitmap *stipple;		/* Stipple for text */
@@ -135,10 +135,10 @@ struct _EText {
 	gint height;			/* Rendered text height in pixels */
 
 	guint32 rgba;			/* RGBA color for text */
-	double affine[6];               /* The item -> canvas affine */
+	gdouble affine[6];               /* The item -> canvas affine */
 
 	gchar *ellipsis;                 /* The ellipsis characters.  NULL = "...". */
-	double ellipsis_width;          /* The width of the ellipsis. */
+	gdouble ellipsis_width;          /* The width of the ellipsis. */
 
 	gint xofs_edit;                  /* Offset because of editing */
 	gint yofs_edit;                  /* Offset because of editing */
diff --git a/widgets/text/gal-a11y-e-text-factory.h b/widgets/text/gal-a11y-e-text-factory.h
index 7e7f8e9f1a..2364eae23e 100644
--- a/widgets/text/gal-a11y-e-text-factory.h
+++ b/widgets/text/gal-a11y-e-text-factory.h
@@ -46,4 +46,4 @@ struct _GalA11yETextFactoryClass {
 /* Standard Glib function */
 GType              gal_a11y_e_text_factory_get_type         (void);
 
-#endif /* ! __GAL_A11Y_E_TEXT_FACTORY_H__ */
+#endif /* __GAL_A11Y_E_TEXT_FACTORY_H__ */
diff --git a/widgets/text/gal-a11y-e-text.c b/widgets/text/gal-a11y-e-text.c
index 113c503da9..6c6724ea6d 100644
--- a/widgets/text/gal-a11y-e-text.c
+++ b/widgets/text/gal-a11y-e-text.c
@@ -64,8 +64,8 @@ et_get_extents (AtkComponent *component,
 		AtkCoordType coord_type)
 {
 	EText *item = E_TEXT (atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE (component)));
-	double real_width;
-	double real_height;
+	gdouble real_width;
+	gdouble real_height;
 	gint fake_width;
 	gint fake_height;
 
@@ -166,7 +166,7 @@ find_word_start (const gchar *text,
 		current = g_utf8_get_char_validated (at_offset, -1);
 		at_offset = g_utf8_offset_to_pointer (text, offset-1);
 		previous = g_utf8_get_char_validated (at_offset, -1);
-		if ((! is_a_seperator (current)) && is_a_seperator (previous))
+		if ((!is_a_seperator (current)) && is_a_seperator (previous))
 			break;
 		offset += step;
 	}
@@ -192,7 +192,7 @@ find_word_end (const gchar *text,
 		current = g_utf8_get_char_validated (at_offset, -1);
 		at_offset = g_utf8_offset_to_pointer (text, offset-1);
 		previous = g_utf8_get_char_validated (at_offset, -1);
-		if (is_a_seperator (current) && (! is_a_seperator (previous)))
+		if (is_a_seperator (current) && (!is_a_seperator (previous)))
 			break;
 		offset += step;
 	}
diff --git a/widgets/text/gal-a11y-e-text.h b/widgets/text/gal-a11y-e-text.h
index ff55bdadc7..b56d43553c 100644
--- a/widgets/text/gal-a11y-e-text.h
+++ b/widgets/text/gal-a11y-e-text.h
@@ -53,4 +53,4 @@ GType      gal_a11y_e_text_get_type  (void);
 
 void       gal_a11y_e_text_init (void);
 
-#endif /* ! __GAL_A11Y_E_TEXT_H__ */
+#endif /* __GAL_A11Y_E_TEXT_H__ */