Coding style and whitespace cleanups.

9 files changed, 88 insertions, 88 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 12431e4633..85558a2530 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -117,7 +117,7 @@ static struct {
 	const gchar *type_1;
 	const gchar *type_2;
 }
-phones [] = {
+phones[] = {
 	{ E_CONTACT_PHONE_ASSISTANT,    EVC_X_ASSISTANT,       NULL    },
 	{ E_CONTACT_PHONE_BUSINESS,     "WORK",                "VOICE" },
 	{ E_CONTACT_PHONE_BUSINESS_FAX, "WORK",                "FAX"   },
@@ -138,21 +138,21 @@ phones [] = {
 };
 
 /* Defaults from the table above */
-static const gint phones_default [] = { 1, 6, 9, 2, 7, 12, 10, 10 };
+static const gint phones_default[] = { 1, 6, 9, 2, 7, 12, 10, 10 };
 
-static EContactField addresses [] = {
+static EContactField addresses[] = {
 	E_CONTACT_ADDRESS_WORK,
 	E_CONTACT_ADDRESS_HOME,
 	E_CONTACT_ADDRESS_OTHER
 };
 
-static EContactField address_labels [] = {
+static EContactField address_labels[] = {
 	E_CONTACT_ADDRESS_LABEL_WORK,
 	E_CONTACT_ADDRESS_LABEL_HOME,
 	E_CONTACT_ADDRESS_LABEL_OTHER
 };
 
-static const gchar *address_name [] = {
+static const gchar *address_name[] = {
 	"work",
 	"home",
 	"other"
@@ -162,7 +162,7 @@ static struct {
 	EContactField field;
 	const gchar *pretty_name;
 }
-im_service [] =
+im_service[] =
 {
 	{ E_CONTACT_IM_AIM,       N_ ("AIM")       },
 	{ E_CONTACT_IM_JABBER,    N_ ("Jabber")    },
@@ -175,13 +175,13 @@ im_service [] =
 };
 
 /* Defaults from the table above */
-static const gint im_service_default [] = { 0, 2, 4, 5 };
+static const gint im_service_default[] = { 0, 2, 4, 5 };
 
 static struct {
 	const gchar *name;
 	const gchar *pretty_name;
 }
-common_location [] =
+common_location[] =
 {
 	{ "WORK",  N_ ("Work")  },
 	{ "HOME",  N_ ("Home")  },
@@ -189,7 +189,7 @@ common_location [] =
 };
 
 /* Default from the table above */
-static const gint email_default [] = { 0, 1, 2, 2 };
+static const gint email_default[] = { 0, 1, 2, 2 };
 
 #define STRING_IS_EMPTY(x)      (!(x) || !(*(x)))
 #define STRING_MAKE_NON_NULL(x) ((x) ? (x) : "")
@@ -731,7 +731,7 @@ init_email_record_location (EContactEditor *editor, gint record)
 	gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (location_combo_box)));
 
 	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		gtk_combo_box_append_text (location_combo_box, _(common_location [i].pretty_name));
+		gtk_combo_box_append_text (location_combo_box, _(common_location[i].pretty_name));
 	}
 
 	g_signal_connect_swapped (location_combo_box, "changed", G_CALLBACK (gtk_widget_grab_focus), email_entry);
@@ -756,7 +756,7 @@ fill_in_email_record (EContactEditor *editor, gint record, const gchar *address,
 	g_free (widget_name);
 
 	set_combo_box_active (editor, GTK_COMBO_BOX (location_combo_box),
-				 location >= 0 ? location : email_default [2]);
+				 location >= 0 ? location : email_default[2]);
 	set_entry_text (editor, GTK_ENTRY (email_entry), address ? address : "");
 }
 
@@ -784,13 +784,13 @@ extract_email_record (EContactEditor *editor, gint record, gchar **address, gint
 static const gchar *
 email_index_to_location (gint index)
 {
-	return common_location [index].name;
+	return common_location[index].name;
 }
 
 static const gchar *
 im_index_to_location (gint index)
 {
-	return common_location [index].name;
+	return common_location[index].name;
 }
 
 static void
@@ -806,7 +806,7 @@ get_email_location (EVCardAttribute *attr)
 	gint i;
 
 	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
+		if (e_vcard_attribute_has_type (attr, common_location[i].name))
 			return i;
 	}
 
@@ -819,7 +819,7 @@ get_im_location (EVCardAttribute *attr)
 	gint i;
 
 	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
+		if (e_vcard_attribute_has_type (attr, common_location[i].name))
 			return i;
 	}
 
@@ -832,8 +832,8 @@ get_phone_type (EVCardAttribute *attr)
 	gint i;
 
 	for (i = 0; i < G_N_ELEMENTS (phones); i++) {
-		if (e_vcard_attribute_has_type (attr, phones [i].type_1) &&
-		    (phones [i].type_2 == NULL || e_vcard_attribute_has_type (attr, phones [i].type_2)))
+		if (e_vcard_attribute_has_type (attr, phones[i].type_1) &&
+		    (phones[i].type_2 == NULL || e_vcard_attribute_has_type (attr, phones[i].type_2)))
 			return i;
 	}
 
@@ -959,7 +959,7 @@ fill_in_email (EContactEditor *editor)
 	/* Clear */
 
 	for (record_n = 1; record_n <= EMAIL_SLOTS; record_n++) {
-		fill_in_email_record (editor, record_n, NULL, email_default [record_n - 1]);
+		fill_in_email_record (editor, record_n, NULL, email_default[record_n - 1]);
 	}
 
 	/* Fill in */
@@ -1242,7 +1242,7 @@ fill_in_phone_record (EContactEditor *editor, gint record, const gchar *phone, g
 
 	set_combo_box_active (editor, GTK_COMBO_BOX (phone_type_combo_box),
 				 phone_type >= 0 ? phone_type :
-				 phones_default [record - 1]);
+				 phones_default[record - 1]);
 	set_entry_text (editor, GTK_ENTRY (phone_entry), phone ? phone : "");
 
 	if (phone && *phone && record >= 5)
@@ -1389,7 +1389,7 @@ init_phone_record_type (EContactEditor *editor, gint record)
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (
 			store, &iter,
-			0, e_contact_pretty_name (phones [i].field_id),
+			0, e_contact_pretty_name (phones[i].field_id),
 			1, TRUE,
 			-1);
 	}
@@ -1430,7 +1430,7 @@ sensitize_phone_types (EContactEditor *editor, GtkWidget *combo_box)
 
 		gtk_list_store_set (
 			GTK_LIST_STORE (model), &iter,
-			1, is_field_supported (editor, phones [i].field_id),
+			1, is_field_supported (editor, phones[i].field_id),
 			-1);
 
 		valid = gtk_tree_model_iter_next (model, &iter);
@@ -1496,7 +1496,7 @@ init_im_record_location (EContactEditor *editor, gint record)
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (
 			store, &iter,
-			0, _(common_location [i].pretty_name),
+			0, _(common_location[i].pretty_name),
 			1, TRUE,
 			-1);
 	}
@@ -1536,7 +1536,7 @@ init_im_record_service (EContactEditor *editor, gint record)
 		gtk_list_store_append (store, &iter);
 		gtk_list_store_set (
 			store, &iter,
-			0, im_service [i].pretty_name,
+			0, im_service[i].pretty_name,
 			1, TRUE,
 			-1);
 	}
@@ -1587,7 +1587,7 @@ fill_in_im_record (EContactEditor *editor, gint record, gint service, const gcha
 				 location >= 0 ? location : 0);
 #endif
 	set_combo_box_active (editor, GTK_COMBO_BOX (service_combo_box),
-				 service >= 0 ? service : im_service_default [record - 1]);
+				 service >= 0 ? service : im_service_default[record - 1]);
 	set_entry_text (editor, GTK_ENTRY (name_entry), name ? name : "");
 }
 
@@ -1608,7 +1608,7 @@ fill_in_im (EContactEditor *editor)
 	/* Fill in */
 
 	for (record_n = 1, i = 0; i < G_N_ELEMENTS (im_service); i++) {
-		im_attr_list = e_contact_get_attributes (editor->contact, im_service [i].field);
+		im_attr_list = e_contact_get_attributes (editor->contact, im_service[i].field);
 
 		for (l = im_attr_list; l && record_n <= IM_SLOTS; l = g_list_next (l)) {
 			EVCardAttribute *attr = l->data;
@@ -1689,7 +1689,7 @@ extract_im (EContactEditor *editor)
 			e_vcard_attribute_add_value (attr, name);
 			set_ui_slot (attr, i);
 
-			service_attr_list [service] = g_list_append (service_attr_list [service], attr);
+			service_attr_list[service] = g_list_append (service_attr_list[service], attr);
 		}
 
 		g_free (name);
@@ -1703,7 +1703,7 @@ extract_im (EContactEditor *editor)
 
 		/* Splice in the old attributes, minus the filled_in_slots first */
 
-		old_service_attr_list = e_contact_get_attributes (editor->contact, im_service [i].field);
+		old_service_attr_list = e_contact_get_attributes (editor->contact, im_service[i].field);
 		filled_in_slots = MIN (remaining_slots, g_list_length (old_service_attr_list));
 		remaining_slots -= filled_in_slots;
 
@@ -1715,12 +1715,12 @@ extract_im (EContactEditor *editor)
 		}
 
 		old_service_attr_list = l;
-		service_attr_list [i] = g_list_concat (service_attr_list [i], old_service_attr_list);
+		service_attr_list[i] = g_list_concat (service_attr_list[i], old_service_attr_list);
 
-		e_contact_set_attributes (editor->contact, im_service [i].field,
-					  service_attr_list [i]);
+		e_contact_set_attributes (editor->contact, im_service[i].field,
+					  service_attr_list[i]);
 
-		free_attr_list (service_attr_list [i]);
+		free_attr_list (service_attr_list[i]);
 	}
 
 	g_free (service_attr_list);
@@ -1744,7 +1744,7 @@ sensitize_im_types (EContactEditor *editor, GtkWidget *combo_box)
 
 		gtk_list_store_set (
 			GTK_LIST_STORE (model), &iter,
-			1, is_field_supported (editor, im_service [i].field),
+			1, is_field_supported (editor, im_service[i].field),
 			-1);
 
 		valid = gtk_tree_model_iter_next (model, &iter);
@@ -1933,8 +1933,8 @@ fill_in_address_record (EContactEditor *editor, gint record)
 	EContactAddress *address;
 	gchar           *address_label;
 
-	address = e_contact_get (editor->contact, addresses [record]);
-	address_label = e_contact_get (editor->contact, address_labels [record]);
+	address = e_contact_get (editor->contact, addresses[record]);
+	address_label = e_contact_get (editor->contact, address_labels[record]);
 
 	if (address &&
 	    (!STRING_IS_EMPTY (address->street)   ||
@@ -2079,12 +2079,12 @@ extract_address_record (EContactEditor *editor, gint record)
 	    !STRING_IS_EMPTY (address->code)     ||
 	    !STRING_IS_EMPTY (address->po)       ||
 	    !STRING_IS_EMPTY (address->country)) {
-		e_contact_set (editor->contact, addresses [record], address);
-		set_address_label (editor->contact, address_labels [record], address);
+		e_contact_set (editor->contact, addresses[record], address);
+		set_address_label (editor->contact, address_labels[record], address);
 	}
 	else {
-		e_contact_set (editor->contact, addresses [record], NULL);
-		set_address_label (editor->contact, address_labels [record], NULL);
+		e_contact_set (editor->contact, addresses[record], NULL);
+		set_address_label (editor->contact, address_labels[record], NULL);
 	}
 
 	g_boxed_free (e_contact_address_get_type (), address);
@@ -2158,7 +2158,7 @@ sensitize_address (EContactEditor *editor)
 		gboolean enabled = TRUE;
 
 		if (!editor->target_editable ||
-		    !(is_field_supported (editor, addresses [i]) ||
+		    !(is_field_supported (editor, addresses[i]) ||
 		      is_field_supported (editor, address_labels[i])))
 			enabled = FALSE;
 
@@ -2181,7 +2181,7 @@ FieldMapping;
  * - Set sensitivity based on backend capabilities.
  * - Set sensitivity based on book writeability. */
 
-static FieldMapping simple_field_map [] = {
+static FieldMapping simple_field_map[] = {
 	{ "entry-homepage",       E_CONTACT_HOMEPAGE_URL, TRUE,  TRUE  },
 	{ "accellabel-homepage",  E_CONTACT_HOMEPAGE_URL, FALSE, TRUE  },
 
@@ -2515,7 +2515,7 @@ init_simple (EContactEditor *editor)
 	gint       i;
 
 	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
-		widget = e_builder_get_widget (editor->builder, simple_field_map [i].widget_name);
+		widget = e_builder_get_widget (editor->builder, simple_field_map[i].widget_name);
 		if (!widget)
 			continue;
 
@@ -2545,15 +2545,15 @@ fill_in_simple (EContactEditor *editor)
 	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
 		GtkWidget *widget;
 
-		if (simple_field_map [i].field_id < 0 ||
-		    !simple_field_map [i].process_data)
+		if (simple_field_map[i].field_id < 0 ||
+		    !simple_field_map[i].process_data)
 			continue;
 
-		widget = e_builder_get_widget (editor->builder, simple_field_map [i].widget_name);
+		widget = e_builder_get_widget (editor->builder, simple_field_map[i].widget_name);
 		if (!widget)
 			continue;
 
-		fill_in_simple_field (editor, widget, simple_field_map [i].field_id);
+		fill_in_simple_field (editor, widget, simple_field_map[i].field_id);
 	}
 
 	/* --- Special cases --- */
@@ -2595,15 +2595,15 @@ extract_simple (EContactEditor *editor)
 	for (i = 0; i < G_N_ELEMENTS (simple_field_map); i++) {
 		GtkWidget *widget;
 
-		if (simple_field_map [i].field_id < 0 ||
-		    !simple_field_map [i].process_data)
+		if (simple_field_map[i].field_id < 0 ||
+		    !simple_field_map[i].process_data)
 			continue;
 
-		widget = e_builder_get_widget (editor->builder, simple_field_map [i].widget_name);
+		widget = e_builder_get_widget (editor->builder, simple_field_map[i].widget_name);
 		if (!widget)
 			continue;
 
-		extract_simple_field (editor, widget, simple_field_map [i].field_id);
+		extract_simple_field (editor, widget, simple_field_map[i].field_id);
 	}
 
 	/* Special cases */
@@ -2620,15 +2620,15 @@ sensitize_simple (EContactEditor *editor)
 		GtkWidget *widget;
 		gboolean   enabled = TRUE;
 
-		widget = e_builder_get_widget (editor->builder, simple_field_map [i].widget_name);
+		widget = e_builder_get_widget (editor->builder, simple_field_map[i].widget_name);
 		if (!widget)
 			continue;
 
-		if (simple_field_map [i].field_id >= 0 &&
-		    !is_field_supported (editor, simple_field_map [i].field_id))
+		if (simple_field_map[i].field_id >= 0 &&
+		    !is_field_supported (editor, simple_field_map[i].field_id))
 			enabled = FALSE;
 
-		if (simple_field_map [i].desensitize_for_read_only &&
+		if (simple_field_map[i].desensitize_for_read_only &&
 		    !editor->target_editable)
 			enabled = FALSE;
 
@@ -3228,7 +3228,7 @@ e_contact_editor_close (EABEditor *editor)
 	}
 }
 
-static const EContactField  non_string_fields [] = {
+static const EContactField  non_string_fields[] = {
 	E_CONTACT_FULL_NAME,
 	E_CONTACT_ADDRESS,
 	E_CONTACT_ADDRESS_HOME,
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 2850f38e11..7a438a85bc 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -85,7 +85,7 @@ gint main( gint argc, gchar *argv[] )
 
 	cardstr = NULL;
 	if (argc == 2)
-		cardstr = read_file (argv [1]);
+		cardstr = read_file (argv[1]);
 
 	if (cardstr == NULL)
 		cardstr = TEST_VCARD;
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index af68ee0c8e..edd8f003b9 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -586,8 +586,8 @@ contact_list_editor_email_entry_key_press_event_cb (GtkWidget *widget,
 
 			text = gtk_entry_get_text (entry);
 
-			for (i = 0; text && text [i] && i < cpos; i++) {
-				if (text [i] == '\"')
+			for (i = 0; text && text[i] && i < cpos; i++) {
+				if (text[i] == '\"')
 					quotes++;
 			}
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index d5ac8c68d4..60ef7d0026 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -56,7 +56,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = {0, };
+static guint signals[LAST_SIGNAL] = {0, };
 
 static void
 unlink_model(EAddressbookReflowAdapter *adapter)
@@ -451,7 +451,7 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class)
 							      E_TYPE_ADDRESSBOOK_MODEL,
 							      G_PARAM_READABLE));
 
-	signals [DRAG_BEGIN] =
+	signals[DRAG_BEGIN] =
 		g_signal_new ("drag_begin",
 			      G_OBJECT_CLASS_TYPE(object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -460,7 +460,7 @@ e_addressbook_reflow_adapter_class_init (GObjectClass *object_class)
 			      e_marshal_INT__POINTER,
 			      G_TYPE_INT, 1, G_TYPE_POINTER);
 
-	signals [OPEN_CONTACT] =
+	signals[OPEN_CONTACT] =
 		g_signal_new ("open-contact",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 5c1eba1f43..3f562a3c47 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -67,7 +67,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint e_minicard_label_signals [LAST_SIGNAL] = {0, };
+static guint e_minicard_label_signals[LAST_SIGNAL] = {0, };
 
 GType
 e_minicard_label_get_type (void)
@@ -166,7 +166,7 @@ e_minicard_label_class_init (EMinicardLabelClass *klass)
 							       FALSE,
 							       G_PARAM_READWRITE));
 
-	e_minicard_label_signals [STYLE_SET] =
+	e_minicard_label_signals[STYLE_SET] =
 		g_signal_new ("style_set",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_FIRST,
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 7a78d83a42..c2741d48d6 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -61,7 +61,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = {0, };
+static guint signals[LAST_SIGNAL] = {0, };
 
 GType
 e_minicard_view_widget_get_type (void)
@@ -142,7 +142,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 							      0.0, G_MAXDOUBLE, 150.0,
 							      G_PARAM_READWRITE));
 
-	signals [CREATE_CONTACT] =
+	signals[CREATE_CONTACT] =
 		g_signal_new ("create-contact",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -151,7 +151,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	signals [CREATE_CONTACT_LIST] =
+	signals[CREATE_CONTACT_LIST] =
 		g_signal_new ("create-contact-list",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -160,7 +160,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	signals [SELECTION_CHANGE] =
+	signals[SELECTION_CHANGE] =
 		g_signal_new ("selection_change",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -169,7 +169,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	signals [COLUMN_WIDTH_CHANGED] =
+	signals[COLUMN_WIDTH_CHANGED] =
 		g_signal_new ("column_width_changed",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -178,7 +178,7 @@ e_minicard_view_widget_class_init (EMinicardViewWidgetClass *class)
 			      g_cclosure_marshal_VOID__DOUBLE,
 			      G_TYPE_NONE, 1, G_TYPE_DOUBLE);
 
-	signals [RIGHT_CLICK] =
+	signals[RIGHT_CLICK] =
 		g_signal_new ("right_click",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -319,7 +319,7 @@ static void
 selection_change (ESelectionModel *esm, EMinicardViewWidget *widget)
 {
 	g_signal_emit (widget,
-		       signals [SELECTION_CHANGE], 0);
+		       signals[SELECTION_CHANGE], 0);
 }
 
 static void
@@ -332,7 +332,7 @@ static void
 column_width_changed (ESelectionModel *esm, double width, EMinicardViewWidget *widget)
 {
 	g_signal_emit (widget,
-		       signals [COLUMN_WIDTH_CHANGED], 0, width);
+		       signals[COLUMN_WIDTH_CHANGED], 0, width);
 }
 
 static void
@@ -352,7 +352,7 @@ right_click (EMinicardView *view, GdkEvent *event, EMinicardViewWidget *widget)
 {
 	guint ret_val;
 	g_signal_emit (widget,
-		       signals [RIGHT_CLICK], 0,
+		       signals[RIGHT_CLICK], 0,
 		       event, &ret_val);
 	return ret_val;
 }
@@ -493,7 +493,7 @@ e_minicard_view_widget_real_focus_in_event(GtkWidget *widget, GdkEventFocus *eve
 			gint unsorted = e_sorter_sorted_to_model (E_SORTER (reflow->sorter), 0);
 
 			if (unsorted != -1)
-				canvas->focused_item = reflow->items [unsorted];
+				canvas->focused_item = reflow->items[unsorted];
 		}
 	}
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 5751cfc38f..18dbc20523 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -62,7 +62,7 @@ enum {
 	LAST_SIGNAL
 };
 
-static guint signals [LAST_SIGNAL] = {0, };
+static guint signals[LAST_SIGNAL] = {0, };
 
 enum DndTargetType {
 	DND_TARGET_TYPE_VCARD_LIST,
@@ -552,7 +552,7 @@ e_minicard_view_class_init (EMinicardViewClass *klass)
 							       FALSE,
 							       G_PARAM_READWRITE));
 
-	signals [CREATE_CONTACT] =
+	signals[CREATE_CONTACT] =
 		g_signal_new ("create-contact",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
@@ -560,7 +560,7 @@ e_minicard_view_class_init (EMinicardViewClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	signals [CREATE_CONTACT_LIST] =
+	signals[CREATE_CONTACT_LIST] =
 		g_signal_new ("create-contact-list",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
@@ -568,7 +568,7 @@ e_minicard_view_class_init (EMinicardViewClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-	signals [RIGHT_CLICK] =
+	signals[RIGHT_CLICK] =
 		g_signal_new ("right_click",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -644,7 +644,7 @@ e_minicard_view_jump_to_letter (EMinicardView *view,
 #if 0
 	gchar uft_str[6 + 1];
 
-	utf_str [g_unichar_to_utf8 (letter, utf_str)] = '\0';
+	utf_str[g_unichar_to_utf8 (letter, utf_str)] = '\0';
 	e_reflow_sorted_jump (E_REFLOW_SORTED (view),
 			      (GCompareFunc) compare_to_utf_str,
 			      utf_str);
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 654858a21d..0f3a27b798 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -94,14 +94,14 @@ static struct {
 	const gchar *name;
 	const gchar *pretty_name;
 }
-common_location [] =
+common_location[] =
 {
 	{ "WORK",  N_ ("Work Email")  },
 	{ "HOME",  N_ ("Home Email")  },
 	{ "OTHER", N_ ("Other Email") }
 };
 
-static guint signals [LAST_SIGNAL] = {0, };
+static guint signals[LAST_SIGNAL] = {0, };
 
 GType
 e_minicard_get_type (void)
@@ -200,7 +200,7 @@ e_minicard_class_init (EMinicardClass *class)
 							      E_TYPE_CONTACT,
 							      G_PARAM_READWRITE));
 
-	signals [SELECTED] =
+	signals[SELECTED] =
 		g_signal_new ("selected",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -209,7 +209,7 @@ e_minicard_class_init (EMinicardClass *class)
 			      e_marshal_INT__POINTER,
 			      G_TYPE_INT, 1, G_TYPE_POINTER);
 
-	signals [DRAG_BEGIN] =
+	signals[DRAG_BEGIN] =
 		g_signal_new ("drag_begin",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -218,7 +218,7 @@ e_minicard_class_init (EMinicardClass *class)
 			      e_marshal_INT__POINTER,
 			      G_TYPE_INT, 1, G_TYPE_POINTER);
 
-	signals [OPEN_CONTACT] =
+	signals[OPEN_CONTACT] =
 		g_signal_new ("open-contact",
 			      G_OBJECT_CLASS_TYPE (object_class),
 			      G_SIGNAL_RUN_LAST,
@@ -228,7 +228,7 @@ e_minicard_class_init (EMinicardClass *class)
 			      G_TYPE_NONE, 1,
 			      E_TYPE_CONTACT);
 
-	signals [STYLE_SET] =
+	signals[STYLE_SET] =
 		g_signal_new ("style_set",
 			      G_TYPE_FROM_CLASS (object_class),
 			      G_SIGNAL_RUN_FIRST,
@@ -800,8 +800,8 @@ get_email_location (EVCardAttribute *attr)
 	gint i;
 
 	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
-			return _(common_location [i].pretty_name);
+		if (e_vcard_attribute_has_type (attr, common_location[i].name))
+			return _(common_location[i].pretty_name);
 	}
 
 	return _("Other Email");
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 939ed77a59..a5a71814d3 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -64,7 +64,7 @@ static struct {
 	const gchar *name;
 	const gchar *pretty_name;
 }
-common_location [] =
+common_location[] =
 {
 	{ "WORK",  N_ ("Work")  },
 	{ "HOME",  N_ ("Home")  },
@@ -453,8 +453,8 @@ get_email_location (EVCardAttribute *attr)
 	gint i;
 
 	for (i = 0; i < G_N_ELEMENTS (common_location); i++) {
-		if (e_vcard_attribute_has_type (attr, common_location [i].name))
-			return _(common_location [i].pretty_name);
+		if (e_vcard_attribute_has_type (attr, common_location[i].name))
+			return _(common_location[i].pretty_name);
 	}
 
 	return _("Other");