Coding style and whitespace cleanup.

16 files changed, 65 insertions, 65 deletions

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);