Coding style and whitespace cleanup.

16 files changed, 186 insertions, 187 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index e7d1390716..8dc2621787 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -233,11 +233,11 @@ e_contact_editor_fullname_init (EContactEditorFullname *e_contact_editor_fullnam
 
 	e_contact_editor_fullname->builder = builder;
 
-	widget = e_builder_get_widget(builder, "dialog-checkfullname");
+	widget = e_builder_get_widget (builder, "dialog-checkfullname");
 	title = gtk_window_get_title (GTK_WINDOW (widget));
 	gtk_window_set_title (GTK_WINDOW (e_contact_editor_fullname), title);
 
-	widget = e_builder_get_widget(builder, "table-checkfullname");
+	widget = e_builder_get_widget (builder, "table-checkfullname");
 	parent = gtk_widget_get_parent (widget);
 	g_object_ref (widget);
 	gtk_container_remove (GTK_CONTAINER (parent), widget);
@@ -276,7 +276,7 @@ fill_in_field (EContactEditorFullname *editor,
 		if (string)
 			gtk_entry_set_text (entry, string);
 		else
-			gtk_entry_set_text(entry, "");
+			gtk_entry_set_text (entry, "");
 	}
 }
 
@@ -285,11 +285,11 @@ fill_in_info (EContactEditorFullname *editor)
 {
 	EContactName *name = editor->name;
 	if (name) {
-		fill_in_field(editor, "comboentry-title",  name->prefixes);
-		fill_in_field(editor, "entry-first",  name->given);
-		fill_in_field(editor, "entry-middle", name->additional);
-		fill_in_field(editor, "entry-last",   name->family);
-		fill_in_field(editor, "comboentry-suffix", name->suffixes);
+		fill_in_field (editor, "comboentry-title",  name->prefixes);
+		fill_in_field (editor, "entry-first",  name->given);
+		fill_in_field (editor, "entry-middle", name->additional);
+		fill_in_field (editor, "entry-last",   name->family);
+		fill_in_field (editor, "comboentry-suffix", name->suffixes);
 	}
 }
 
@@ -320,9 +320,9 @@ extract_info (EContactEditorFullname *editor)
 		editor->name = name;
 	}
 
-	name->prefixes   = extract_field(editor, "comboentry-title" );
-	name->given      = extract_field(editor, "entry-first" );
-	name->additional = extract_field(editor, "entry-middle");
-	name->family     = extract_field(editor, "entry-last"  );
-	name->suffixes   = extract_field(editor, "comboentry-suffix");
+	name->prefixes   = extract_field (editor, "comboentry-title" );
+	name->given      = extract_field (editor, "entry-first" );
+	name->additional = extract_field (editor, "entry-middle");
+	name->family     = extract_field (editor, "entry-last"  );
+	name->suffixes   = extract_field (editor, "comboentry-suffix");
 }
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 44fd081fe4..ca4b1cb86c 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -445,7 +445,7 @@ name_to_style (const EContactName *name,
 				*(stringptr++) = name->given;
 		}
 		*stringptr = NULL;
-		string = g_strjoinv(", ", strings);
+		string = g_strjoinv (", ", strings);
 		break;
 	case 1:
 		stringptr = strings;
@@ -456,7 +456,7 @@ name_to_style (const EContactName *name,
 				*(stringptr++) = name->family;
 		}
 		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
+		string = g_strjoinv (" ", strings);
 		break;
 	case 2:
 		midstrptr = midstring;
@@ -474,7 +474,7 @@ name_to_style (const EContactName *name,
 				*(stringptr++) = name->additional;
 		}
 		*stringptr = NULL;
-		string = g_strjoinv(" ", strings);
+		string = g_strjoinv (" ", strings);
 		break;
 	case 3:
 		string = g_strdup (company);
@@ -489,17 +489,17 @@ name_to_style (const EContactName *name,
 				*(stringptr++) = name->given;
 		}
 		*stringptr = NULL;
-		substring = g_strjoinv(", ", strings);
+		substring = g_strjoinv (", ", strings);
 		if (!(company && *company))
 			company = "";
 		if (style == 4)
-			string = g_strdup_printf("%s (%s)", substring, company);
+			string = g_strdup_printf ("%s (%s)", substring, company);
 		else
-			string = g_strdup_printf("%s (%s)", company, substring);
+			string = g_strdup_printf ("%s (%s)", company, substring);
 		g_free (substring);
 		break;
 	default:
-		string = g_strdup("");
+		string = g_strdup ("");
 	}
 	return string;
 }
@@ -509,7 +509,7 @@ file_as_get_style (EContactEditor *editor)
 {
 	GtkEntry *file_as = GTK_ENTRY (
 		gtk_bin_get_child (GTK_BIN (
-		e_builder_get_widget(editor->builder, "combo-file-as"))));
+		e_builder_get_widget (editor->builder, "combo-file-as"))));
 	GtkEntry *company_w = GTK_ENTRY (
 		e_builder_get_widget (editor->builder, "entry-company"));
 	gchar *filestring;
@@ -2027,7 +2027,7 @@ init_address_textview (EContactEditor *editor,
 	GtkTextBuffer *text_buffer;
 
 	textview_name = g_strdup_printf (
-		"textview-%s-address", address_name [record]);
+		"textview-%s-address", address_name[record]);
 	textview = e_builder_get_widget (editor->builder, textview_name);
 	g_free (textview_name);
 
@@ -2047,7 +2047,7 @@ init_address_field (EContactEditor *editor,
 	GtkWidget *entry;
 
 	entry_name = g_strdup_printf (
-		"entry-%s-%s", address_name [record], widget_field_name);
+		"entry-%s-%s", address_name[record], widget_field_name);
 	entry = e_builder_get_widget (editor->builder, entry_name);
 	g_free (entry_name);
 
@@ -2095,7 +2095,7 @@ fill_in_address_textview (EContactEditor *editor,
 	GtkTextBuffer *text_buffer;
 	GtkTextIter    iter_end, iter_start;
 
-	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
+	textview_name = g_strdup_printf ("textview-%s-address", address_name[record]);
 	textview = e_builder_get_widget (editor->builder, textview_name);
 	g_free (textview_name);
 
@@ -2123,7 +2123,7 @@ fill_in_address_label_textview (EContactEditor *editor,
 	GtkTextBuffer *text_buffer;
 
 	textview_name = g_strdup_printf (
-		"textview-%s-address", address_name [record]);
+		"textview-%s-address", address_name[record]);
 	textview = e_builder_get_widget (editor->builder, textview_name);
 	g_free (textview_name);
 
@@ -2141,7 +2141,7 @@ fill_in_address_field (EContactEditor *editor,
 	GtkWidget *entry;
 
 	entry_name = g_strdup_printf (
-		"entry-%s-%s", address_name [record], widget_field_name);
+		"entry-%s-%s", address_name[record], widget_field_name);
 	entry = e_builder_get_widget (editor->builder, entry_name);
 	g_free (entry_name);
 
@@ -2200,7 +2200,7 @@ extract_address_textview (EContactEditor *editor,
 	GtkTextBuffer *text_buffer;
 	GtkTextIter    iter_1, iter_2;
 
-	textview_name = g_strdup_printf ("textview-%s-address", address_name [record]);
+	textview_name = g_strdup_printf ("textview-%s-address", address_name[record]);
 	textview = e_builder_get_widget (editor->builder, textview_name);
 	g_free (textview_name);
 
@@ -2242,7 +2242,7 @@ extract_address_field (EContactEditor *editor,
 	GtkWidget *entry;
 
 	entry_name = g_strdup_printf (
-		"entry-%s-%s", address_name [record], widget_field_name);
+		"entry-%s-%s", address_name[record], widget_field_name);
 	entry = e_builder_get_widget (editor->builder, entry_name);
 	g_free (entry_name);
 
@@ -2366,11 +2366,11 @@ sensitize_address_textview (EContactEditor *editor,
 	GtkWidget     *textview;
 	GtkWidget     *label;
 
-	widget_name = g_strdup_printf ("textview-%s-address", address_name [record]);
+	widget_name = g_strdup_printf ("textview-%s-address", address_name[record]);
 	textview = e_builder_get_widget (editor->builder, widget_name);
 	g_free (widget_name);
 
-	widget_name = g_strdup_printf ("label-%s-address", address_name [record]);
+	widget_name = g_strdup_printf ("label-%s-address", address_name[record]);
 	label = e_builder_get_widget (editor->builder, widget_name);
 	g_free (widget_name);
 
@@ -2389,12 +2389,12 @@ sensitize_address_field (EContactEditor *editor,
 	GtkWidget *label;
 
 	widget_name = g_strdup_printf (
-		"entry-%s-%s", address_name [record], widget_field_name);
+		"entry-%s-%s", address_name[record], widget_field_name);
 	entry = e_builder_get_widget (editor->builder, widget_name);
 	g_free (widget_name);
 
 	widget_name = g_strdup_printf (
-		"label-%s-%s", address_name [record], widget_field_name);
+		"label-%s-%s", address_name[record], widget_field_name);
 	label = e_builder_get_widget (editor->builder, widget_name);
 	g_free (widget_name);
 
@@ -3266,7 +3266,7 @@ categories_clicked (GtkWidget *button,
 {
 	gchar *categories = NULL;
 	GtkDialog *dialog;
-	GtkWidget *entry = e_builder_get_widget(editor->builder, "entry-categories");
+	GtkWidget *entry = e_builder_get_widget (editor->builder, "entry-categories");
 
 	if (entry && GTK_IS_ENTRY (entry))
 		categories = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
@@ -3898,24 +3898,24 @@ setup_tab_order (GtkBuilder *builder)
 	GtkWidget *container;
 	GList *list = NULL;
 /*
-	container = e_builder_get_widget(builder, "table-contact-editor-general");
+	container = e_builder_get_widget (builder, "table-contact-editor-general");
  *
 	if (container) {
-		list = add_to_tab_order(list, builder, "entry-fullname");
-		list = add_to_tab_order(list, builder, "entry-jobtitle");
-		list = add_to_tab_order(list, builder, "entry-company");
-		list = add_to_tab_order(list, builder, "combo-file-as");
-		list = add_to_tab_order(list, builder, "entry-phone-1");
-		list = add_to_tab_order(list, builder, "entry-phone-2");
-		list = add_to_tab_order(list, builder, "entry-phone-3");
-		list = add_to_tab_order(list, builder, "entry-phone-4");
+		list = add_to_tab_order (list, builder, "entry-fullname");
+		list = add_to_tab_order (list, builder, "entry-jobtitle");
+		list = add_to_tab_order (list, builder, "entry-company");
+		list = add_to_tab_order (list, builder, "combo-file-as");
+		list = add_to_tab_order (list, builder, "entry-phone-1");
+		list = add_to_tab_order (list, builder, "entry-phone-2");
+		list = add_to_tab_order (list, builder, "entry-phone-3");
+		list = add_to_tab_order (list, builder, "entry-phone-4");
  *
-		list = add_to_tab_order(list, builder, "entry-email1");
-		list = add_to_tab_order(list, builder, "alignment-htmlmail");
-		list = add_to_tab_order(list, builder, "entry-web");
-		list = add_to_tab_order(list, builder, "entry-homepage");
-		list = add_to_tab_order(list, builder, "button-fulladdr");
-		list = add_to_tab_order(list, builder, "text-address");
+		list = add_to_tab_order (list, builder, "entry-email1");
+		list = add_to_tab_order (list, builder, "alignment-htmlmail");
+		list = add_to_tab_order (list, builder, "entry-web");
+		list = add_to_tab_order (list, builder, "entry-homepage");
+		list = add_to_tab_order (list, builder, "button-fulladdr");
+		list = add_to_tab_order (list, builder, "text-address");
 		list = g_list_reverse (list);
 		e_container_change_tab_order (GTK_CONTAINER (container), list);
 		g_list_free (list);
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 5ea618bc32..fd4c8edb82 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -558,7 +558,7 @@ e_contact_quick_add (ESourceRegistry *registry,
 		g_strstrip (name);
 		len = strlen (name);
 		if ((name[0] == '\'' && name[len - 1] == '\'') ||
-			(name[0] == '"' && name[len-1] == '"')) {
+			(name[0] == '"' && name[len - 1] == '"')) {
 			name[0] = ' ';
 			name[len - 1] = ' ';
 		}
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 9a55ffb134..7c7f096e90 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -693,7 +693,7 @@ use_common_book_client (EBookClient *book_client,
 
 	contact_file_as = e_contact_get (contact, E_CONTACT_FILE_AS);
 	if (contact_file_as) {
-		query_parts [p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
+		query_parts[p++] = g_strdup_printf ("(contains \"file_as\" \"%s\")", contact_file_as);
 		g_free (contact_file_as);
 	}
 
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index cbcb376734..cb2f6055ae 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -273,7 +273,7 @@ dropdown_changed (GtkWidget *dropdown,
 	gchar *str;
 	str = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (dropdown));
 
-	if (g_ascii_strcasecmp(str, ""))
+	if (g_ascii_strcasecmp (str, ""))
 		e_contact_set (data->match, data->field, str);
 	else
 		e_contact_set (data->match, data->field, NULL);
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index c6775d4e5a..51886cf186 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -268,7 +268,7 @@ static gpointer
 addressbook_initialize_value (ETableModel *etc,
                               gint col)
 {
-	return g_strdup("");
+	return g_strdup ("");
 }
 
 static gboolean
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 7eefdf8fc0..584ed9fe98 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -193,13 +193,13 @@ e_minicard_label_set_property (GObject *object,
 			e_canvas_item_grab_focus (e_minicard_label->field, FALSE);
 		break;
 	case PROP_FIELD:
-		gnome_canvas_item_set( e_minicard_label->field, "text", g_value_get_string (value), NULL );
+		gnome_canvas_item_set ( e_minicard_label->field, "text", g_value_get_string (value), NULL );
 		break;
 	case PROP_FIELDNAME:
-		gnome_canvas_item_set( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
+		gnome_canvas_item_set ( e_minicard_label->fieldname, "text", g_value_get_string (value), NULL );
 		break;
 	case PROP_TEXT_MODEL:
-		gnome_canvas_item_set( e_minicard_label->field, "model", g_value_get_object (value), NULL);
+		gnome_canvas_item_set ( e_minicard_label->field, "model", g_value_get_object (value), NULL);
 		break;
 	case PROP_MAX_FIELD_NAME_WIDTH:
 		e_minicard_label->max_field_name_length = g_value_get_double (value);
@@ -345,7 +345,7 @@ e_minicard_label_event (GnomeCanvasItem *item,
 	case GDK_ENTER_NOTIFY:
 	case GDK_LEAVE_NOTIFY: {
 		gboolean return_val;
-		g_signal_emit_by_name(e_minicard_label->field, "event", event, &return_val);
+		g_signal_emit_by_name (e_minicard_label->field, "event", event, &return_val);
 		return return_val;
 	}
 	default:
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 690fe7796f..01899e8a57 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -397,7 +397,7 @@ e_minicard_view_event (GnomeCanvasItem *item,
 		if (((GdkEventButton *) event)->button == 1) {
 			gboolean editable;
 
-			g_object_get(view->adapter, "editable", &editable, NULL);
+			g_object_get (view->adapter, "editable", &editable, NULL);
 
 			if (editable)
 				e_minicard_view_create_contact (view);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 652851877b..d0af5117b0 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -330,7 +330,7 @@ e_minicard_set_property (GObject *object,
 		}
 		break;
 	case PROP_HAS_CURSOR:
-		d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
+		d (g_print ("%s: PROP_HAS_CURSOR\n", G_STRFUNC));
 		if (e_minicard->has_cursor != g_value_get_boolean (value))
 			set_has_cursor (e_minicard, g_value_get_boolean (value));
 		break;
@@ -490,7 +490,7 @@ e_minicard_realize (GnomeCanvasItem *item)
 	e_minicard->header_text =
 	  gnome_canvas_item_new ( group,
 				 e_text_get_type (),
-				 "width", (double) MAX( e_minicard->width - 12, 0 ),
+				 "width", (double) MAX ( e_minicard->width - 12, 0 ),
 				 "clip", TRUE,
 				 "use_ellipsis", TRUE,
 				 "fill_color_gdk", &style->fg[GTK_STATE_NORMAL],
@@ -531,7 +531,7 @@ e_minicard_event (GnomeCanvasItem *item,
 	case GDK_FOCUS_CHANGE:
 		{
 			GdkEventFocus *focus_event = (GdkEventFocus *) event;
-			d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
+			d (g_print ("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out"));
 			if (focus_event->in) {
 				/* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it.  */
 				e_minicard->has_focus = TRUE;
@@ -721,7 +721,7 @@ add_field (EMinicard *e_minicard,
 
 	group = GNOME_CANVAS_GROUP ( e_minicard );
 
-	name = g_strdup_printf("%s:", e_contact_pretty_name (field));
+	name = g_strdup_printf ("%s:", e_contact_pretty_name (field));
 	string = e_contact_get (e_minicard->contact, field);
 
 	new_item = e_minicard_label_new (group);
@@ -871,7 +871,7 @@ get_left_width (EMinicard *e_minicard,
 		if (field == E_CONTACT_FAMILY_NAME || field == E_CONTACT_GIVEN_NAME)
 			continue;
 
-		name = g_strdup_printf("%s:", e_contact_pretty_name (field));
+		name = g_strdup_printf ("%s:", e_contact_pretty_name (field));
 		pango_layout_set_text (layout, name, -1);
 		pango_layout_get_pixel_size (layout, &this_width, NULL);
 		if (width < this_width)
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 6501bccc24..d6c4238e2f 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -517,7 +517,7 @@ eab_contact_display_class_init (EABContactDisplayClass *class)
 			EAB_CONTACT_DISPLAY_RENDER_NORMAL,
 			G_PARAM_READWRITE));
 
-	g_object_class_install_property	(
+	g_object_class_install_property (
 		object_class,
 		PROP_SHOW_MAPS,
 		g_param_spec_boolean (
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 5b3021cc6c..d04cc07f04 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -1171,18 +1171,18 @@ eab_contact_formatter_class_init (EABContactFormatterClass *class)
 		PROP_STYLE,
 		g_param_spec_object (
 			"style",
-		        NULL,
-		        NULL,
-		        GTK_TYPE_STYLE,
-		        G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+			NULL,
+			NULL,
+			GTK_TYPE_STYLE,
+			G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
 	g_object_class_install_property (
 		object_class,
 		PROP_STATE,
 		g_param_spec_uint (
 			"state",
-		        NULL,
-		        NULL,
+			NULL,
+			NULL,
 			0,
 			G_MAXUINT,
 			0,
@@ -1201,7 +1201,7 @@ eab_contact_formatter_init (EABContactFormatter *formatter)
 
 EABContactFormatter *
 eab_contact_formatter_new (EABContactDisplayMode mode,
-			   gboolean render_maps)
+                           gboolean render_maps)
 {
 	return g_object_new (EAB_TYPE_CONTACT_FORMATTER,
 			     "display-mode", mode,
@@ -1209,7 +1209,6 @@ eab_contact_formatter_new (EABContactDisplayMode mode,
 			     NULL);
 }
 
-
 void
 eab_contact_formatter_set_display_mode (EABContactFormatter *formatter,
                                         EABContactDisplayMode mode)
@@ -1257,7 +1256,7 @@ eab_contact_formatter_get_render_maps (EABContactFormatter *formatter)
 
 void
 eab_contact_formatter_set_style (EABContactFormatter *formatter,
-				 GtkStyle *style)
+                                 GtkStyle *style)
 {
 	g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
 
@@ -1284,7 +1283,7 @@ eab_contact_formatter_get_style (EABContactFormatter *formatter)
 
 void
 eab_contact_formatter_set_state (EABContactFormatter *formatter,
-				 GtkStateType state)
+                                 GtkStateType state)
 {
 	g_return_if_fail (EAB_IS_CONTACT_FORMATTER (formatter));
 
diff --git a/addressbook/gui/widgets/eab-contact-formatter.h b/addressbook/gui/widgets/eab-contact-formatter.h
index 4773a7bb24..31104b1f9a 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.h
+++ b/addressbook/gui/widgets/eab-contact-formatter.h
@@ -58,14 +58,14 @@ struct _EABContactFormatterClass {
 
 GType           eab_contact_formatter_get_type  ();
 
-EABContactFormatter*
+EABContactFormatter *
 		eab_contact_formatter_new	(EABContactDisplayMode mode,
 						 gboolean render_maps);
 
 void		eab_contact_formatter_set_style
 						(EABContactFormatter *formatter,
 						 GtkStyle *context);
-GtkStyle*
+GtkStyle *
 		eab_contact_formatter_get_style
 						(EABContactFormatter *formatter);
 
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 9d693e1300..7594ab1cf3 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -103,27 +103,27 @@ static import_fields csv_fields_outlook[] = {
 	{"Company", E_CONTACT_ORG},
 	{"Department", E_CONTACT_ORG_UNIT},
 	{"Job Title", E_CONTACT_TITLE},
-	{"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
-	{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
-	{"Business Street 3", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET},
-	{"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
-	{"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
-	{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
-	{"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
-	{"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
-	{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
-	{"Home Street 3", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
-	{"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
-	{"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
-	{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
-	{"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
-	{"Other Street", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
-	{"Other Street 2", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
-	{"Other Street 3", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STREET},
-	{"Other City", NOMAP, FLAG_OTHER_ADDRESS|FLAG_CITY},
-	{"Other State", NOMAP, FLAG_OTHER_ADDRESS|FLAG_STATE},
-	{"Other Postal Code", NOMAP, FLAG_OTHER_ADDRESS|FLAG_POSTAL_CODE},
-	{"Other Country", NOMAP, FLAG_OTHER_ADDRESS|FLAG_COUNTRY},
+	{"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+	{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+	{"Business Street 3", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET},
+	{"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
+	{"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
+	{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
+	{"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
+	{"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+	{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+	{"Home Street 3", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+	{"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
+	{"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
+	{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
+	{"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
+	{"Other Street", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
+	{"Other Street 2", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
+	{"Other Street 3", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STREET},
+	{"Other City", NOMAP, FLAG_OTHER_ADDRESS | FLAG_CITY},
+	{"Other State", NOMAP, FLAG_OTHER_ADDRESS | FLAG_STATE},
+	{"Other Postal Code", NOMAP, FLAG_OTHER_ADDRESS | FLAG_POSTAL_CODE},
+	{"Other Country", NOMAP, FLAG_OTHER_ADDRESS | FLAG_COUNTRY},
 	{"Assistant's Phone", E_CONTACT_PHONE_ASSISTANT},
 	{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
 	{"Business Phone", E_CONTACT_PHONE_BUSINESS},
@@ -148,7 +148,7 @@ static import_fields csv_fields_outlook[] = {
 	{"Assistant's Name", E_CONTACT_ASSISTANT},
 	{"Billing Information", NOMAP},
 	{"Birthday", NOMAP, FLAG_DATE_BDAY},
-	{"Business Address PO Box", NOMAP, FLAG_WORK_ADDRESS|FLAG_POBOX},
+	{"Business Address PO Box", NOMAP, FLAG_WORK_ADDRESS | FLAG_POBOX},
 	{"Categories", E_CONTACT_CATEGORIES},
 	{"Children", NOMAP},
 	{"Directory Server", NOMAP},
@@ -164,7 +164,7 @@ static import_fields csv_fields_outlook[] = {
 	{"Gender", NOMAP},
 	{"Government ID Number", NOMAP},
 	{"Hobby", NOMAP},
-	{"Home Address PO Box", NOMAP, FLAG_HOME_ADDRESS|FLAG_POBOX},
+	{"Home Address PO Box", NOMAP, FLAG_HOME_ADDRESS | FLAG_POBOX},
 	{"Initials", NOMAP},
 	{"Internet FREE/BUSY", E_CONTACT_FREEBUSY_URL},
 	{"Keywords", NOMAP},
@@ -175,7 +175,7 @@ static import_fields csv_fields_outlook[] = {
 	{"Notes", NOMAP},
 	{"Office Location", NOMAP},
 	{"Organizational ID Number", NOMAP},
-	{"Other Address PO Box", NOMAP, FLAG_OTHER_ADDRESS|FLAG_POBOX},
+	{"Other Address PO Box", NOMAP, FLAG_OTHER_ADDRESS | FLAG_POBOX},
 	{"Priority", NOMAP},
 	{"Private", NOMAP},
 	{"Profession", NOMAP},
@@ -201,18 +201,18 @@ static import_fields csv_fields_mozilla[] = {
 	{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
 	{"Pager", E_CONTACT_PHONE_PAGER},
 	{"Mobile Phone", E_CONTACT_PHONE_MOBILE},
-	{"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
-	{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
-	{"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
-	{"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
-	{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
-	{"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
-	{"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
-	{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
-	{"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
-	{"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
-	{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
-	{"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
+	{"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+	{"Home Street 2", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
+	{"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
+	{"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
+	{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
+	{"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
+	{"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+	{"Business Street 2", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
+	{"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
+	{"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
+	{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
+	{"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
 	{"Job Title", E_CONTACT_TITLE},
 	{"Department", E_CONTACT_ORG_UNIT},
 	{"Company", E_CONTACT_ORG},
@@ -244,18 +244,18 @@ static import_fields csv_fields_evolution[] = {
 	{"Business Fax", E_CONTACT_PHONE_BUSINESS_FAX},
 	{"Pager", E_CONTACT_PHONE_PAGER},
 	{"Mobile Phone", E_CONTACT_PHONE_MOBILE},
-	{"Home Street", NOMAP, FLAG_HOME_ADDRESS|FLAG_STREET},
+	{"Home Street", NOMAP, FLAG_HOME_ADDRESS | FLAG_STREET},
 	{"Home Street 2", NOMAP, FLAG_INVALID},
-	{"Home City", NOMAP, FLAG_HOME_ADDRESS|FLAG_CITY},
-	{"Home State", NOMAP, FLAG_HOME_ADDRESS|FLAG_STATE},
-	{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE},
-	{"Home Country", NOMAP, FLAG_HOME_ADDRESS|FLAG_COUNTRY},
-	{"Business Street", NOMAP, FLAG_WORK_ADDRESS|FLAG_STREET },
+	{"Home City", NOMAP, FLAG_HOME_ADDRESS | FLAG_CITY},
+	{"Home State", NOMAP, FLAG_HOME_ADDRESS | FLAG_STATE},
+	{"Home Postal Code", NOMAP,FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE},
+	{"Home Country", NOMAP, FLAG_HOME_ADDRESS | FLAG_COUNTRY},
+	{"Business Street", NOMAP, FLAG_WORK_ADDRESS | FLAG_STREET },
 	{"Business Street 2", NOMAP, FLAG_INVALID },
-	{"Business City", NOMAP, FLAG_WORK_ADDRESS|FLAG_CITY},
-	{"Business State", NOMAP, FLAG_WORK_ADDRESS|FLAG_STATE},
-	{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE},
-	{"Business Country", NOMAP, FLAG_WORK_ADDRESS|FLAG_COUNTRY},
+	{"Business City", NOMAP, FLAG_WORK_ADDRESS | FLAG_CITY},
+	{"Business State", NOMAP, FLAG_WORK_ADDRESS | FLAG_STATE},
+	{"Business Postal Code", NOMAP, FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE},
+	{"Business Country", NOMAP, FLAG_WORK_ADDRESS | FLAG_COUNTRY},
 	{"Job Title", E_CONTACT_TITLE},
 	{"Office", E_CONTACT_OFFICE},
 	{"Company", E_CONTACT_ORG},
@@ -431,9 +431,9 @@ parseLine (CSVImporter *gci,
 	EContactAddress *home_address = NULL, *work_address = NULL, *other_address = NULL;
 	EContactDate *bday = NULL;
 	GString *home_street, *work_street, *other_street;
-	home_street = g_string_new("");
-	work_street = g_string_new("");
-	other_street = g_string_new("");
+	home_street = g_string_new ("");
+	work_street = g_string_new ("");
+	other_street = g_string_new ("");
 	home_address = g_new0 (EContactAddress, 1);
 	work_address = g_new0 (EContactAddress, 1);
 	other_address = g_new0 (EContactAddress, 1);
@@ -506,7 +506,7 @@ parseLine (CSVImporter *gci,
 
 				case FLAG_HOME_ADDRESS | FLAG_STREET:
 					if (strlen (home_street->str) != 0) {
-						home_street = g_string_append(home_street, ",\n");
+						home_street = g_string_append (home_street, ",\n");
 					}
 					home_street = g_string_append (home_street, value->str);
 					break;
@@ -528,7 +528,7 @@ parseLine (CSVImporter *gci,
 
 				case FLAG_WORK_ADDRESS | FLAG_STREET:
 					if (strlen (work_street->str) != 0) {
-						work_street = g_string_append(work_street, ",\n");
+						work_street = g_string_append (work_street, ",\n");
 					}
 					work_street = g_string_append (work_street, value->str);
 					break;
@@ -550,7 +550,7 @@ parseLine (CSVImporter *gci,
 
 				case FLAG_OTHER_ADDRESS | FLAG_STREET:
 					if (strlen (other_street->str) != 0) {
-						other_street = g_string_append(other_street, ",\n");
+						other_street = g_string_append (other_street, ",\n");
 					}
 					other_street = g_string_append (other_street, value->str);
 					break;
@@ -646,7 +646,7 @@ getNextCSVEntry (CSVImporter *gci,
 	gchar *buf;
 	gchar c;
 
-	line = g_string_new("");
+	line = g_string_new ("");
 	while (1) {
 		c = fgetc (f);
 		if (c == EOF)
@@ -671,7 +671,7 @@ getNextCSVEntry (CSVImporter *gci,
 	if (gci->count == 0 && importer != MOZILLA_IMPORTER) {
 		gci->fields_map = map_fields (line->str, importer);
 		g_string_free (line, TRUE);
-		line = g_string_new("");
+		line = g_string_new ("");
 		while (1) {
 			c = fgetc (f);
 			if (c == EOF)
@@ -695,7 +695,7 @@ getNextCSVEntry (CSVImporter *gci,
 		gci->count++;
 	}
 
-	str = g_string_new("");
+	str = g_string_new ("");
 	str = g_string_append (str, line->str);
 
 	g_string_free (line, TRUE);
@@ -784,7 +784,7 @@ csv_getwidget (EImport *ei,
 		E_SOURCE_SELECTOR (selector), FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
 
-	primary = g_datalist_get_data(&target->data, "csv-source");
+	primary = g_datalist_get_data (&target->data, "csv-source");
 	if (primary == NULL) {
 		GList *list;
 
@@ -830,7 +830,7 @@ csv_supported (EImport *ei,
 	if (s->uri_src == NULL)
 		return TRUE;
 
-	if (strncmp(s->uri_src, "file:///", 8) != 0)
+	if (strncmp (s->uri_src, "file:///", 8) != 0)
 		return FALSE;
 
 	ext = strrchr (s->uri_src, '.');
@@ -912,13 +912,13 @@ csv_import (EImport *ei,
 	file = g_fopen (filename, "r");
 	g_free (filename);
 	if (file == NULL) {
-		g_message("Can't open .csv file");
+		g_message ("Can't open .csv file");
 		e_import_complete (ei, target);
 		return;
 	}
 
 	gci = g_malloc0 (sizeof (*gci));
-	g_datalist_set_data(&target->data, "csv-data", gci);
+	g_datalist_set_data (&target->data, "csv-data", gci);
 	gci->import = g_object_ref (ei);
 	gci->target = target;
 	gci->file = file;
@@ -967,7 +967,7 @@ csv_cancel (EImport *ei,
             EImportTarget *target,
             EImportImporter *im)
 {
-	CSVImporter *gci = g_datalist_get_data(&target->data, "csv-data");
+	CSVImporter *gci = g_datalist_get_data (&target->data, "csv-data");
 
 	if (gci)
 		gci->state = 1;
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index bf1c15793c..3adf2afe4f 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -130,7 +130,7 @@ ldif_fields[] = {
 static GString *
 getValue (gchar **src)
 {
-	GString *dest = g_string_new("");
+	GString *dest = g_string_new ("");
 	gchar *s = *src;
 	gboolean need_base64 = (*s == ':');
 
@@ -582,7 +582,7 @@ ldif_getwidget (EImport *ei,
 		E_SOURCE_SELECTOR (selector), FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
 
-	primary = g_datalist_get_data(&target->data, "ldif-source");
+	primary = g_datalist_get_data (&target->data, "ldif-source");
 	if (primary == NULL) {
 		GList *list;
 
@@ -628,7 +628,7 @@ ldif_supported (EImport *ei,
 	if (s->uri_src == NULL)
 		return TRUE;
 
-	if (strncmp(s->uri_src, "file:///", 8) != 0)
+	if (strncmp (s->uri_src, "file:///", 8) != 0)
 		return FALSE;
 
 	ext = strrchr (s->uri_src, '.');
@@ -696,17 +696,17 @@ ldif_import (EImport *ei,
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
 	if (filename != NULL) {
-		file = g_fopen(filename, "r");
+		file = g_fopen (filename, "r");
 		g_free (filename);
 	}
 	if (file == NULL) {
-		g_message(G_STRLOC ":Can't open .ldif file");
+		g_message (G_STRLOC ":Can't open .ldif file");
 		e_import_complete (ei, target);
 		return;
 	}
 
 	gci = g_malloc0 (sizeof (*gci));
-	g_datalist_set_data(&target->data, "ldif-data", gci);
+	g_datalist_set_data (&target->data, "ldif-data", gci);
 	gci->import = g_object_ref (ei);
 	gci->target = target;
 	gci->file = file;
@@ -730,7 +730,7 @@ ldif_cancel (EImport *ei,
              EImportTarget *target,
              EImportImporter *im)
 {
-	LDIFImporter *gci = g_datalist_get_data(&target->data, "ldif-data");
+	LDIFImporter *gci = g_datalist_get_data (&target->data, "ldif-data");
 
 	if (gci)
 		gci->state = 2;
@@ -755,7 +755,7 @@ ldif_get_preview (EImport *ei,
 		return NULL;
 	}
 
-	file = g_fopen(filename, "r");
+	file = g_fopen (filename, "r");
 	g_free (filename);
 
 	if (file == NULL) {
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index b20bdd18de..2e452c24ad 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -133,7 +133,7 @@ vcard_import_contact (VCardImporter *gci,
 		GList *v = e_vcard_attribute_get_values (a);
 
 		if (v && v->data) {
-			if (!strncmp ((gchar *)v->data, "<?xml", 5)) {
+			if (!strncmp ((gchar *) v->data, "<?xml", 5)) {
 				EDestination *dest = e_destination_import ((gchar *) v->data);
 
 				e_destination_export_to_vcard_attribute (dest, a);
@@ -174,12 +174,12 @@ vcard_import_contact (VCardImporter *gci,
 			vs = e_vcard_attribute_param_get_values (p);
 			for (v = vs; v; v = v->next) {
 				is_work_home = is_work_home ||
-					!g_ascii_strcasecmp ((gchar *)v->data, "WORK") ||
-					!g_ascii_strcasecmp ((gchar *)v->data, "HOME");
+					!g_ascii_strcasecmp ((gchar *) v->data, "WORK") ||
+					!g_ascii_strcasecmp ((gchar *) v->data, "HOME");
 
-				if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") ||
-				    !g_ascii_strcasecmp ((gchar *)v->data, "HOME") ||
-				    !g_ascii_strcasecmp ((gchar *)v->data, "OTHER"))
+				if (!g_ascii_strcasecmp ((gchar *) v->data, "WORK") ||
+				    !g_ascii_strcasecmp ((gchar *) v->data, "HOME") ||
+				    !g_ascii_strcasecmp ((gchar *) v->data, "OTHER"))
 					no_location = FALSE;
 				else
 					location_only = FALSE;
@@ -227,8 +227,8 @@ vcard_import_contact (VCardImporter *gci,
 
 			vs = e_vcard_attribute_param_get_values (p);
 			for (v = vs; v; v = v->next) {
-				if (!g_ascii_strcasecmp ((gchar *)v->data, "WORK") ||
-				    !g_ascii_strcasecmp ((gchar *)v->data, "HOME"))
+				if (!g_ascii_strcasecmp ((gchar *) v->data, "WORK") ||
+				    !g_ascii_strcasecmp ((gchar *) v->data, "HOME"))
 					no_location = FALSE;
 			}
 		}
@@ -421,7 +421,7 @@ vcard_getwidget (EImport *ei,
 		E_SOURCE_SELECTOR (selector), FALSE);
 	gtk_box_pack_start (GTK_BOX (vbox), selector, FALSE, TRUE, 6);
 
-	primary = g_datalist_get_data(&target->data, "vcard-source");
+	primary = g_datalist_get_data (&target->data, "vcard-source");
 	if (primary == NULL) {
 		GList *list;
 
@@ -463,7 +463,7 @@ vcard_supported (EImport *ei,
 	if (s->uri_src == NULL)
 		return TRUE;
 
-	if (strncmp(s->uri_src, "file:///", 8) != 0)
+	if (strncmp (s->uri_src, "file:///", 8) != 0)
 		return FALSE;
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
@@ -549,7 +549,7 @@ vcard_import (EImport *ei,
 
 	filename = g_filename_from_uri (s->uri_src, NULL, NULL);
 	if (filename == NULL) {
-		g_message(G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
+		g_message (G_STRLOC ": Couldn't get filename from URI '%s'", s->uri_src);
 		e_import_complete (ei, target);
 		return;
 	}
@@ -571,7 +571,7 @@ vcard_import (EImport *ei,
 
 	g_free (filename);
 	gci = g_malloc0 (sizeof (*gci));
-	g_datalist_set_data(&target->data, "vcard-data", gci);
+	g_datalist_set_data (&target->data, "vcard-data", gci);
 	gci->import = g_object_ref (ei);
 	gci->target = target;
 	gci->encoding = encoding;
@@ -589,7 +589,7 @@ vcard_cancel (EImport *ei,
               EImportTarget *target,
               EImportImporter *im)
 {
-	VCardImporter *gci = g_datalist_get_data(&target->data, "vcard-data");
+	VCardImporter *gci = g_datalist_get_data (&target->data, "vcard-data");
 
 	if (gci)
 		gci->state = 1;
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 72ee6886c8..c535be4914 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -468,7 +468,7 @@ e_contact_build_style (EContactPrintStyle *style)
 	xmlDocPtr styledoc;
 	gchar *filename;
 
-	style->title = g_strdup("");
+	style->title = g_strdup ("");
 	style->type = E_CONTACT_PRINT_TYPE_CARDS;
 	style->sections_start_new_page = TRUE;
 	style->num_columns = 2;
@@ -502,9 +502,9 @@ e_contact_build_style (EContactPrintStyle *style)
 
 	style->header_font = pango_font_description_copy (style->body_font);
 
-	style->left_header = g_strdup("");
-	style->center_header = g_strdup("");
-	style->right_header = g_strdup("");
+	style->left_header = g_strdup ("");
+	style->center_header = g_strdup ("");
+	style->right_header = g_strdup ("");
 
 	style->footer_font = pango_font_description_copy (style->body_font);
 
@@ -522,69 +522,69 @@ 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" )) {
+			} 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)