Coding style and whitespace cleanup.

7 files changed, 27 insertions, 16 deletions

diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index a872afb7d9..4f1df719ca 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -217,7 +217,7 @@ e_contact_editor_fullname_set_property (GObject *object, guint prop_id,
 			NULL
 		};
 		e_contact_editor_fullname->editable = g_value_get_boolean (value) ? TRUE : FALSE;
-		for (i = 0; widget_names[i] != NULL; i ++) {
+		for (i = 0; widget_names[i] != NULL; i++) {
 			GtkWidget *w = e_builder_get_widget(e_contact_editor_fullname->builder, widget_names[i]);
 			if (GTK_IS_ENTRY (w)) {
 				gtk_editable_set_editable (GTK_EDITABLE (w),
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index f167075886..d5ac8c68d4 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -170,7 +170,7 @@ addressbook_height (EReflowModel *erm, gint i, GnomeCanvasGroup *parent)
 			this_height += 3;
 
 			height += this_height;
-			count ++;
+			count++;
 		}
 		g_free (string);
 	}
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 187b08b290..db9917f37f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -66,13 +66,17 @@
 
 #define d(x)
 
-static void status_message     (EAddressbookView *view, const gchar *status);
-static void search_result      (EAddressbookView *view, EBookViewStatus status, const gchar *error_msg);
-static void folder_bar_message (EAddressbookView *view, const gchar *status);
-static void stop_state_changed (GtkObject *object, EAddressbookView *view);
-static void backend_died       (EAddressbookView *view);
-
-static void command_state_change (EAddressbookView *view);
+static void	status_message			(EAddressbookView *view,
+						 const gchar *status);
+static void	search_result			(EAddressbookView *view,
+						 EBookViewStatus status,
+						 const gchar *error_msg);
+static void	folder_bar_message		(EAddressbookView *view,
+						 const gchar *status);
+static void	stop_state_changed		(GtkObject *object,
+						 EAddressbookView *view);
+static void	backend_died			(EAddressbookView *view);
+static void	command_state_change		(EAddressbookView *view);
 
 struct _EAddressbookViewPrivate {
 	gpointer shell_view;  /* weak pointer */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 92a415b88f..654858a21d 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -734,7 +734,7 @@ e_minicard_resize_children( EMinicard *e_minicard )
 					    e_minicard->width - e_minicard->list_icon_size - 3,
 					    3);
 	}
-	for ( list = e_minicard->fields; list; list = g_list_next( list ) ) {
+	for (list = e_minicard->fields; list; list = g_list_next( list )) {
 		gnome_canvas_item_set( E_MINICARD_FIELD( list->data )->label,
 				       "width", (double) e_minicard->width - 4.0,
 				       NULL );
@@ -973,7 +973,7 @@ remodel( EMinicard *e_minicard )
 					g_object_set(minicard_field->label,
 						     "field", string,
 						     NULL);
-					count ++;
+					count++;
 				} else {
 					e_minicard_field_destroy(minicard_field);
 				}
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 8c0e37fccc..939ed77a59 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -495,7 +495,7 @@ render_contact (GString *buffer,
 						mail,
 						name ? ">" : "",
 						attr_str ? attr_str : "");
-		email_num ++;
+		email_num++;
 		nl = "<br>";
 
 		g_free (html);
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index 7b9707e0af..fde3bc6d76 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -52,9 +52,16 @@ typedef struct _EABContactDisplay EABContactDisplay;
 typedef struct _EABContactDisplayClass EABContactDisplayClass;
 typedef struct _EABContactDisplayPrivate EABContactDisplayPrivate;
 
+/**
+ * EABContactDisplayMode:
+ * @EAB_CONTACT_DISPLAY_RENDER_NORMAL:
+ *   For use in the preview pane.
+ * @EAB_CONTACT_DISPLAY_RENDER_COMPACT:
+ *   For use with embedded vcards.
+ **/
 typedef enum {
-	EAB_CONTACT_DISPLAY_RENDER_NORMAL,  /* for use in the preview pane */
-	EAB_CONTACT_DISPLAY_RENDER_COMPACT  /* for use with embedded vcards (e.g, the EABVCardControl) */
+	EAB_CONTACT_DISPLAY_RENDER_NORMAL,
+	EAB_CONTACT_DISPLAY_RENDER_COMPACT
 } EABContactDisplayMode;
 
 struct _EABContactDisplay {
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index a7642625e3..8e3a6a4e38 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -329,7 +329,7 @@ delete_contacts (ContactCopyProcess *process)
 static void
 process_unref (ContactCopyProcess *process)
 {
-	process->count --;
+	process->count--;
 	if (process->count == 0) {
 		if (process->done_cb)
 			process->done_cb (process);
@@ -374,7 +374,7 @@ do_copy (gpointer data, gpointer user_data)
 
 	book = process->destination;
 
-	process->count ++;
+	process->count++;
 	eab_merging_book_add_contact(book, contact, contact_added_cb, process);
 }