Coding style and whitespace cleanup.

4 files changed, 168 insertions, 103 deletions

diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h
index e4579cbc4e..0ba2c9b6f4 100644
--- a/addressbook/importers/evolution-addressbook-importers.h
+++ b/addressbook/importers/evolution-addressbook-importers.h
@@ -18,6 +18,8 @@
  *
  */
 
+#include <gtk/gtk.h>
+
 struct _EImportImporter *evolution_ldif_importer_peek (void);
 struct _EImportImporter *evolution_vcard_importer_peek (void);
 struct _EImportImporter *evolution_csv_outlook_importer_peek (void);
@@ -25,4 +27,4 @@ struct _EImportImporter *evolution_csv_mozilla_importer_peek (void);
 struct _EImportImporter *evolution_csv_evolution_importer_peek (void);
 
 /* private utility function for importers only */
-struct _GtkWidget *evolution_contact_importer_get_preview_widget (const GSList *contacts);
+GtkWidget *evolution_contact_importer_get_preview_widget (const GSList *contacts);
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 43e9339a81..f41a806940 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -270,7 +270,9 @@ static import_fields csv_fields_evolution[] = {
 };
 
 static void
-add_to_notes (EContact *contact, const gchar *field_text, gchar *val)
+add_to_notes (EContact *contact,
+              const gchar *field_text,
+              gchar *val)
 {
 	GString *new_text;
 
@@ -289,32 +291,32 @@ add_to_notes (EContact *contact, const gchar *field_text, gchar *val)
 }
 
 /* @str: a date string in the format MM-DD-YYYY or MMDDYYYY */
-static EContactDate*
+static EContactDate *
 date_from_string (const gchar *str)
 {
-	EContactDate* date;
+	EContactDate * date;
 	gint i = 0;
 
 	g_return_val_if_fail (str != NULL, NULL);
 
 	date = e_contact_date_new ();
 
-	if (g_ascii_isdigit (str[i]) && g_ascii_isdigit (str[i+1])) {
-		date->month = str[i] * 10 + str[i+1] - '0' * 11;
-		i = i+3;
+	if (g_ascii_isdigit (str[i]) && g_ascii_isdigit (str[i + 1])) {
+		date->month = str[i] * 10 + str[i + 1] - '0' * 11;
+		i = i + 3;
 	}
 	else {
 		date->month = str[i] - '0' * 1;
-		i = i+2;
+		i = i + 2;
 	}
 
-	if (g_ascii_isdigit (str[i]) && g_ascii_isdigit (str[i+1])) {
-		date->day = str[i] * 10 + str[i+1] - '0' * 11;
-		i = i+3;
+	if (g_ascii_isdigit (str[i]) && g_ascii_isdigit (str[i + 1])) {
+		date->day = str[i] * 10 + str[i + 1] - '0' * 11;
+		i = i + 3;
 	}
 	else {
 		date->day = str[i] - '0' * 1;
-		i = i+2;
+		i = i + 2;
 	}
 	date->year = str[i] * 1000 + str[i + 1] * 100 +
 		str[i + 2] * 10 + str[i + 3] - '0' * 1111;
@@ -364,7 +366,8 @@ parseNextValue (const gchar **pptr)
 }
 
 static GHashTable *
-map_fields (const gchar *header_line, gint pimporter)
+map_fields (const gchar *header_line,
+            gint pimporter)
 {
 	import_fields *fields_array = NULL;
 	gint n_fields = -1, idx, j;
@@ -417,8 +420,10 @@ map_fields (const gchar *header_line, gint pimporter)
 }
 
 static gboolean
-parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
-
+parseLine (CSVImporter *gci,
+           EContact *contact,
+           gchar *buf)
+{
 	const gchar *pptr = buf, *field_text;
 	gchar *do_free = NULL;
 	GString *value;
@@ -501,69 +506,69 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 			else {
 				switch (flags) {
 
-				case FLAG_HOME_ADDRESS|FLAG_STREET:
+				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, value->str);
 					break;
-				case FLAG_HOME_ADDRESS|FLAG_CITY:
+				case FLAG_HOME_ADDRESS | FLAG_CITY:
 					home_address->locality = g_strdup (value->str);
 					break;
-				case FLAG_HOME_ADDRESS|FLAG_STATE:
+				case FLAG_HOME_ADDRESS | FLAG_STATE:
 					home_address->region = g_strdup (value->str);
 					break;
-				case FLAG_HOME_ADDRESS|FLAG_POSTAL_CODE:
+				case FLAG_HOME_ADDRESS | FLAG_POSTAL_CODE:
 					home_address->code = g_strdup (value->str);
 					break;
-				case FLAG_HOME_ADDRESS|FLAG_POBOX:
+				case FLAG_HOME_ADDRESS | FLAG_POBOX:
 					home_address->po = g_strdup (value->str);
 					break;
-				case FLAG_HOME_ADDRESS|FLAG_COUNTRY:
+				case FLAG_HOME_ADDRESS | FLAG_COUNTRY:
 					home_address->country = g_strdup (value->str);
 					break;
 
-				case FLAG_WORK_ADDRESS|FLAG_STREET:
+				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, value->str);
 					break;
-				case FLAG_WORK_ADDRESS|FLAG_CITY:
+				case FLAG_WORK_ADDRESS | FLAG_CITY:
 					work_address->locality = g_strdup (value->str);
 					break;
-				case FLAG_WORK_ADDRESS|FLAG_STATE:
+				case FLAG_WORK_ADDRESS | FLAG_STATE:
 					work_address->region = g_strdup (value->str);
 					break;
-				case FLAG_WORK_ADDRESS|FLAG_POSTAL_CODE:
+				case FLAG_WORK_ADDRESS | FLAG_POSTAL_CODE:
 					work_address->code = g_strdup (value->str);
 					break;
-				case FLAG_WORK_ADDRESS|FLAG_POBOX:
+				case FLAG_WORK_ADDRESS | FLAG_POBOX:
 					work_address->po = g_strdup (value->str);
 					break;
-				case FLAG_WORK_ADDRESS|FLAG_COUNTRY:
+				case FLAG_WORK_ADDRESS | FLAG_COUNTRY:
 					work_address->country = g_strdup (value->str);
 					break;
 
-				case FLAG_OTHER_ADDRESS|FLAG_STREET:
+				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, value->str);
 					break;
-				case FLAG_OTHER_ADDRESS|FLAG_CITY:
+				case FLAG_OTHER_ADDRESS | FLAG_CITY:
 					other_address->locality = g_strdup (value->str);
 					break;
-				case FLAG_OTHER_ADDRESS|FLAG_STATE:
+				case FLAG_OTHER_ADDRESS | FLAG_STATE:
 					other_address->region = g_strdup (value->str);
 					break;
-				case FLAG_OTHER_ADDRESS|FLAG_POSTAL_CODE:
+				case FLAG_OTHER_ADDRESS | FLAG_POSTAL_CODE:
 					other_address->code = g_strdup (value->str);
 					break;
-				case FLAG_OTHER_ADDRESS|FLAG_POBOX:
+				case FLAG_OTHER_ADDRESS | FLAG_POBOX:
 					other_address->po = g_strdup (value->str);
 					break;
-				case FLAG_OTHER_ADDRESS|FLAG_COUNTRY:
+				case FLAG_OTHER_ADDRESS | FLAG_COUNTRY:
 					other_address->country = g_strdup (value->str);
 					break;
 
@@ -634,7 +639,9 @@ parseLine (CSVImporter *gci, EContact *contact, gchar *buf) {
 }
 
 static EContact *
-getNextCSVEntry (CSVImporter *gci, FILE *f) {
+getNextCSVEntry (CSVImporter *gci,
+                 FILE *f)
+{
 	EContact *contact = NULL;
 	GString  *line;
 	GString *str;
@@ -745,15 +752,19 @@ csv_import_contacts (gpointer d)
 }
 
 static void
-primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
+primary_selection_changed_cb (ESourceSelector *selector,
+                              EImportTarget *target)
 {
-	g_datalist_set_data_full(&target->data, "csv-source",
-				 g_object_ref (e_source_selector_get_primary_selection (selector)),
-				 g_object_unref);
+	g_datalist_set_data_full (
+		&target->data, "csv-source",
+		g_object_ref (e_source_selector_get_primary_selection (selector)),
+		g_object_unref);
 }
 
 static GtkWidget *
-csv_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
+csv_getwidget (EImport *ei,
+               EImportTarget *target,
+               EImportImporter *im)
 {
 	GtkWidget *vbox, *selector;
 	ESource *primary;
@@ -792,7 +803,9 @@ static const gchar *supported_extensions[4] = {
 };
 
 static gboolean
-csv_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
+csv_supported (EImport *ei,
+               EImportTarget *target,
+               EImportImporter *im)
 {
 	gchar *ext;
 	gint i;
@@ -868,7 +881,9 @@ book_loaded_cb (GObject *source_object,
 }
 
 static void
-csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+csv_import (EImport *ei,
+            EImportTarget *target,
+            EImportImporter *im)
 {
 	CSVImporter *gci;
 	ESource *source;
@@ -909,28 +924,37 @@ csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static void
-outlook_csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+outlook_csv_import (EImport *ei,
+                    EImportTarget *target,
+                    EImportImporter *im)
 {
 	importer = OUTLOOK_IMPORTER;
 	csv_import (ei, target, im);
 }
 
 static void
-mozilla_csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+mozilla_csv_import (EImport *ei,
+                    EImportTarget *target,
+                    EImportImporter *im)
 {
 	importer = MOZILLA_IMPORTER;
 	csv_import (ei, target, im);
 }
 
 static void
-evolution_csv_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+evolution_csv_import (EImport *ei,
+                      EImportTarget *target,
+                      EImportImporter *im)
 {
 	importer = EVOLUTION_IMPORTER;
 	csv_import (ei, target, im);
 }
 
 static void
-csv_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) {
+csv_cancel (EImport *ei,
+            EImportTarget *target,
+            EImportImporter *im)
+{
 	CSVImporter *gci = g_datalist_get_data(&target->data, "csv-data");
 
 	if (gci)
@@ -938,7 +962,9 @@ csv_cancel (EImport *ei, EImportTarget *target, EImportImporter *im) {
 }
 
 static GtkWidget *
-csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+csv_get_preview (EImport *ei,
+                 EImportTarget *target,
+                 EImportImporter *im)
 {
 	GtkWidget *preview;
 	GSList *contacts = NULL;
@@ -984,21 +1010,27 @@ csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static GtkWidget *
-outlook_csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+outlook_csv_get_preview (EImport *ei,
+                         EImportTarget *target,
+                         EImportImporter *im)
 {
 	importer = OUTLOOK_IMPORTER;
 	return csv_get_preview (ei, target, im);
 }
 
 static GtkWidget *
-mozilla_csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+mozilla_csv_get_preview (EImport *ei,
+                         EImportTarget *target,
+                         EImportImporter *im)
 {
 	importer = MOZILLA_IMPORTER;
 	return csv_get_preview (ei, target, im);
 }
 
 static GtkWidget *
-evolution_csv_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+evolution_csv_get_preview (EImport *ei,
+                           EImportTarget *target,
+                           EImportImporter *im)
 {
 	importer = EVOLUTION_IMPORTER;
 	return csv_get_preview (ei, target, im);
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 72776bf2a5..8eb0c57192 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 )
+getValue (gchar **src)
 {
 	GString *dest = g_string_new("");
 	gchar *s = *src;
@@ -166,7 +166,9 @@ getValue ( gchar **src )
 }
 
 static void
-populate_contact_address (EContactAddress *address, gchar *attr, gchar *value)
+populate_contact_address (EContactAddress *address,
+                          gchar *attr,
+                          gchar *value)
 {
 	if (!g_ascii_strcasecmp (attr, "locality") ||
 	    !g_ascii_strcasecmp (attr, "l") ||
@@ -222,9 +224,11 @@ populate_contact_address (EContactAddress *address, gchar *attr, gchar *value)
 }
 
 static gboolean
-parseLine (GHashTable *dn_contact_hash, EContact *contact,
-	   EContactAddress *work_address, EContactAddress *home_address,
-	   gchar **buf)
+parseLine (GHashTable *dn_contact_hash,
+           EContact *contact,
+           EContactAddress *work_address,
+           EContactAddress *home_address,
+           gchar **buf)
 {
 	gchar *ptr;
 	gchar *colon, *value;
@@ -352,7 +356,8 @@ parseLine (GHashTable *dn_contact_hash, EContact *contact,
 }
 
 static EContact *
-getNextLDIFEntry (GHashTable *dn_contact_hash, FILE *f )
+getNextLDIFEntry (GHashTable *dn_contact_hash,
+                  FILE *f)
 {
 	EContact *contact;
 	EContactAddress *work_address, *home_address;
@@ -410,14 +415,15 @@ getNextLDIFEntry (GHashTable *dn_contact_hash, FILE *f )
 }
 
 static void
-resolve_list_card (LDIFImporter *gci, EContact *contact)
+resolve_list_card (LDIFImporter *gci,
+                   EContact *contact)
 {
 	GList *email, *l;
 	GList *email_attrs = NULL;
 	gchar *full_name;
 
 	/* set file_as to full_name so we don't later try and figure
-	   out a first/last name for the list. */
+	 * out a first/last name for the list. */
 	full_name = e_contact_get (contact, E_CONTACT_FULL_NAME);
 	if (full_name)
 		e_contact_set (contact, E_CONTACT_FILE_AS, full_name);
@@ -456,7 +462,8 @@ resolve_list_card (LDIFImporter *gci, EContact *contact)
 }
 
 static void
-add_to_notes (EContact *contact, EContactField field)
+add_to_notes (EContact *contact,
+              EContactField field)
 {
 	const gchar *old_text;
 	const gchar *field_text;
@@ -488,7 +495,7 @@ ldif_import_contacts (gpointer d)
 	gint count = 0;
 
 	/* We process all normal cards immediately and keep the list
-	   ones till the end */
+	 * ones till the end */
 
 	if (gci->state == 0) {
 		while (count < 50 && (contact = getNextLDIFEntry (
@@ -516,7 +523,7 @@ ldif_import_contacts (gpointer d)
 		}
 	}
 	if (gci->state == 1) {
-		for (iter = gci->list_iterator;count < 50 && iter;iter=iter->next) {
+		for (iter = gci->list_iterator; count < 50 && iter; iter = iter->next) {
 			gchar *uid = NULL;
 
 			contact = iter->data;
@@ -543,15 +550,19 @@ ldif_import_contacts (gpointer d)
 }
 
 static void
-primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
+primary_selection_changed_cb (ESourceSelector *selector,
+                              EImportTarget *target)
 {
-	g_datalist_set_data_full(&target->data, "ldif-source",
-				 g_object_ref (e_source_selector_get_primary_selection (selector)),
-				 g_object_unref);
+	g_datalist_set_data_full (
+		&target->data, "ldif-source",
+		g_object_ref (e_source_selector_get_primary_selection (selector)),
+		g_object_unref);
 }
 
 static GtkWidget *
-ldif_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
+ldif_getwidget (EImport *ei,
+                EImportTarget *target,
+                EImportImporter *im)
 {
 	GtkWidget *vbox, *selector;
 	ESource *primary;
@@ -593,7 +604,9 @@ static const gchar *supported_extensions[3] = {
 };
 
 static gboolean
-ldif_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
+ldif_supported (EImport *ei,
+                EImportTarget *target,
+                EImportImporter *im)
 {
 	gchar *ext;
 	gint i;
@@ -662,7 +675,9 @@ book_loaded_cb (GObject *source_object,
 }
 
 static void
-ldif_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+ldif_import (EImport *ei,
+             EImportTarget *target,
+             EImportImporter *im)
 {
 	LDIFImporter *gci;
 	ESource *source;
@@ -702,7 +717,9 @@ ldif_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static void
-ldif_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
+ldif_cancel (EImport *ei,
+             EImportTarget *target,
+             EImportImporter *im)
 {
 	LDIFImporter *gci = g_datalist_get_data(&target->data, "ldif-data");
 
@@ -711,7 +728,9 @@ ldif_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static GtkWidget *
-ldif_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+ldif_get_preview (EImport *ei,
+                  EImportTarget *target,
+                  EImportImporter *im)
 {
 	GtkWidget *preview;
 	GSList *contacts = NULL;
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index 59168d883b..cf3a429337 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -81,7 +81,8 @@ typedef struct {
 static void vcard_import_done (VCardImporter *gci);
 
 static void
-add_to_notes (EContact *contact, EContactField field)
+add_to_notes (EContact *contact,
+              EContactField field)
 {
 	const gchar *old_text;
 	const gchar *field_text;
@@ -105,19 +106,20 @@ add_to_notes (EContact *contact, EContactField field)
 }
 
 static void
-vcard_import_contact (VCardImporter *gci, EContact *contact)
+vcard_import_contact (VCardImporter *gci,
+                      EContact *contact)
 {
 	EContactPhoto *photo;
 	GList *attrs, *attr;
 	gchar *uid = NULL;
 
 	/* Apple's addressbook.app exports PHOTO's without a TYPE
-	   param, so let's figure out the format here if there's a
-	   PHOTO attribute missing a TYPE param.
-
-	   this is sort of a hack, as EContact sets the type for us if
-	   we use the setter.  so let's e_contact_get + e_contact_set
-	   on E_CONTACT_PHOTO.
+	 * param, so let's figure out the format here if there's a
+	 * PHOTO attribute missing a TYPE param.
+	 *
+	 * this is sort of a hack, as EContact sets the type for us if
+	 * we use the setter.  so let's e_contact_get + e_contact_set
+	 * on E_CONTACT_PHOTO.
 	*/
 	photo = e_contact_get (contact, E_CONTACT_PHOTO);
 	if (photo) {
@@ -144,12 +146,11 @@ vcard_import_contact (VCardImporter *gci, EContact *contact)
 	}
 	e_contact_set_attributes (contact, E_CONTACT_EMAIL, attrs);
 
-	/*
-	  Deal with TEL attributes that don't conform to what we need.
-
-	  1. if there's no location (HOME/WORK/OTHER), default to OTHER.
-	  2. if there's *only* a location specified, default to VOICE.
-	*/
+	/* Deal with TEL attributes that don't conform to what we need.
+	 *
+	 * 1. if there's no location (HOME/WORK/OTHER), default to OTHER.
+	 * 2. if there's *only* a location specified, default to VOICE.
+	 */
 	attrs = e_vcard_get_attributes (E_VCARD (contact));
 	for (attr = attrs; attr; attr = attr->next) {
 		EVCardAttribute *a = attr->data;
@@ -188,7 +189,7 @@ vcard_import_contact (VCardImporter *gci, EContact *contact)
 
 		if (is_work_home) {
 			/* only WORK and HOME phone numbers require locations,
-			   the rest should be kept as is */
+			 * the rest should be kept as is */
 			if (location_only) {
 				/* add VOICE */
 				e_vcard_attribute_add_param_with_value (a,
@@ -204,11 +205,8 @@ vcard_import_contact (VCardImporter *gci, EContact *contact)
 		}
 	}
 
-	/*
-	  Deal with ADR and EMAIL attributes that don't conform to what we need.
-
-	  if HOME or WORK isn't specified, add TYPE=OTHER.
-	*/
+	/* Deal with ADR and EMAIL attributes that don't conform to what
+	 * we need.  If HOME or WORK isn't specified, add TYPE=OTHER. */
 	attrs = e_vcard_get_attributes (E_VCARD (contact));
 	for (attr = attrs; attr; attr = attr->next) {
 		EVCardAttribute *a = attr->data;
@@ -361,8 +359,8 @@ guess_vcard_encoding (const gchar *filename)
 	}
 	fclose (handle);
 
-	if (has_bom ((gunichar2*) line)) {
-		gunichar2 *utf16 = (gunichar2*) line;
+	if (has_bom ((gunichar2 *) line)) {
+		gunichar2 *utf16 = (gunichar2 *) line;
 		/* Check for a BOM to try to detect UTF-16 encoded vcards
 		 * (MacOSX address book creates such vcards for example)
 		 */
@@ -391,15 +389,19 @@ guess_vcard_encoding (const gchar *filename)
 }
 
 static void
-primary_selection_changed_cb (ESourceSelector *selector, EImportTarget *target)
+primary_selection_changed_cb (ESourceSelector *selector,
+                              EImportTarget *target)
 {
-	g_datalist_set_data_full(&target->data, "vcard-source",
-				 g_object_ref (e_source_selector_get_primary_selection (selector)),
-				 g_object_unref);
+	g_datalist_set_data_full (
+		&target->data, "vcard-source",
+		g_object_ref (e_source_selector_get_primary_selection (selector)),
+		g_object_unref);
 }
 
 static GtkWidget *
-vcard_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
+vcard_getwidget (EImport *ei,
+                 EImportTarget *target,
+                 EImportImporter *im)
 {
 	GtkWidget *vbox, *selector;
 	ESource *primary;
@@ -437,7 +439,9 @@ vcard_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static gboolean
-vcard_supported (EImport *ei, EImportTarget *target, EImportImporter *im)
+vcard_supported (EImport *ei,
+                 EImportTarget *target,
+                 EImportImporter *im)
 {
 	EImportTargetURI *s;
 	gchar *filename;
@@ -498,7 +502,7 @@ book_loaded_cb (GObject *source_object,
 	if (gci->encoding == VCARD_ENCODING_UTF16) {
 		gchar *tmp;
 
-		gunichar2 *contents_utf16 = (gunichar2*) gci->contents;
+		gunichar2 *contents_utf16 = (gunichar2 *) gci->contents;
 		tmp = utf16_to_utf8 (contents_utf16);
 		g_free (gci->contents);
 		gci->contents = tmp;
@@ -523,7 +527,9 @@ book_loaded_cb (GObject *source_object,
 }
 
 static void
-vcard_import (EImport *ei, EImportTarget *target, EImportImporter *im)
+vcard_import (EImport *ei,
+              EImportTarget *target,
+              EImportImporter *im)
 {
 	VCardImporter *gci;
 	ESource *source;
@@ -570,7 +576,9 @@ vcard_import (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static void
-vcard_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
+vcard_cancel (EImport *ei,
+              EImportTarget *target,
+              EImportImporter *im)
 {
 	VCardImporter *gci = g_datalist_get_data(&target->data, "vcard-data");
 
@@ -579,7 +587,9 @@ vcard_cancel (EImport *ei, EImportTarget *target, EImportImporter *im)
 }
 
 static GtkWidget *
-vcard_get_preview (EImport *ei, EImportTarget *target, EImportImporter *im)
+vcard_get_preview (EImport *ei,
+                   EImportTarget *target,
+                   EImportImporter *im)
 {
 	GtkWidget *preview;
 	GSList *contacts;
@@ -653,7 +663,8 @@ evolution_vcard_importer_peek (void)
 
 /* utility functions shared between all contact importers */
 static void
-preview_contact (EWebViewPreview *preview, EContact *contact)
+preview_contact (EWebViewPreview *preview,
+                 EContact *contact)
 {
 	gint idx;
 	gboolean had_value = FALSE;
@@ -888,7 +899,8 @@ preview_contact (EWebViewPreview *preview, EContact *contact)
 }
 
 static void
-preview_selection_changed_cb (GtkTreeSelection *selection, EWebViewPreview *preview)
+preview_selection_changed_cb (GtkTreeSelection *selection,
+                              EWebViewPreview *preview)
 {
 	GtkTreeIter iter;
 	GtkTreeModel *model = NULL;