Fix excessive whitespace.

47 files changed, 0 insertions, 112 deletions

diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 4bba2a3ddc..d7b97233e3 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -133,7 +133,6 @@ struct _EAddrLocalRecord {
 	struct Address *addr;
 };
 
-
 static void
 addrconduit_destroy_record (EAddrLocalRecord *local)
 {
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index 521551e66b..9bf63376fb 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -433,7 +433,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -496,7 +495,6 @@ addressbook_component_init (AddressbookComponent *component)
 	}
 }
 
-
 /* Public API.  */
 
 AddressbookComponent *
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
index 4208994117..e5119295b3 100644
--- a/addressbook/gui/component/addressbook-component.h
+++ b/addressbook/gui/component/addressbook-component.h
@@ -36,7 +36,6 @@
 #define ADDRESSBOOK_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADDRESSBOOK_TYPE_COMPONENT))
 #define ADDRESSBOOK_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), ADDRESSBOOK_TYPE_COMPONENT))
 
-
 typedef struct _AddressbookComponent        AddressbookComponent;
 typedef struct _AddressbookComponentPrivate AddressbookComponentPrivate;
 typedef struct _AddressbookComponentClass   AddressbookComponentClass;
@@ -53,7 +52,6 @@ struct _AddressbookComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType addressbook_component_get_type (void);
 
 AddressbookComponent *addressbook_component_peek (void);
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index c2f8bcbc48..850a9c6f06 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -632,7 +632,6 @@ eabc_general_name(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *
 	return w;
 }
 
-
 static GtkWidget *
 eabc_general_offline(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
@@ -723,7 +722,6 @@ ssl_combobox_changed_cb(GtkWidget *w, AddressbookSourceDialog *sdialog)
 	gtk_widget_set_tooltip_text (sdialog->ssl_combobox, ldap_get_ssl_tooltip (sdialog->ssl));
 }
 
-
 static GtkWidget *
 eabc_general_host(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
@@ -1246,7 +1244,6 @@ addressbook_config_edit_source (GtkWidget *parent, ESource *source)
 	else
 		sdialog->window = e_config_create_window((EConfig *)ec, NULL, _("New Address Book"));
 
-
 	/* forces initial validation */
 	if (!sdialog->original_source)
 		e_config_target_changed((EConfig *)ec, E_CONFIG_TARGET_CHANGED_STATE);
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index c4272742cc..424a39c730 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -205,7 +205,6 @@ get_source_name (ESourceGroup *group, const gchar *path)
 
 		conflict = check_for_conflict (group, s->str);
 
-
 		/* if there was a conflict back up 2 levels (skipping the /subfolder/ element) */
 		if (conflict)
 			starting_index -= 2;
@@ -1208,7 +1207,6 @@ addressbook_migrate (AddressbookComponent *component, gint major, gint minor, gi
 	if (personal_source)
 		g_object_unref (personal_source);
 
-
 	migration_context_free (context);
 
 	return TRUE;
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index e70225ba31..a048479ea8 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -1333,7 +1333,6 @@ book_open_cb (EBook *book, EBookStatus status, gpointer closure)
 		eab_load_error_dialog (NULL /* XXX */, source, status);
 	}
 
-
 	g_object_unref (source);
 }
 
diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h
index bdb37e021a..38554b7acf 100644
--- a/addressbook/gui/component/addressbook-view.h
+++ b/addressbook/gui/component/addressbook-view.h
@@ -32,7 +32,6 @@
 #define ADDRESSBOOK_IS_VIEW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADDRESSBOOK_TYPE_VIEW))
 #define ADDRESSBOOK_IS_VIEW_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), ADDRESSBOOK_TYPE_VIEW))
 
-
 typedef struct _AddressbookView        AddressbookView;
 typedef struct _AddressbookViewPrivate AddressbookViewPrivate;
 typedef struct _AddressbookViewClass   AddressbookViewClass;
@@ -47,7 +46,6 @@ struct _AddressbookViewClass {
 	GObjectClass parent_class;
 };
 
-
 GType addressbook_view_get_type (void);
 
 AddressbookView   *addressbook_view_new                   (void);
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 45790e15c0..7caa545059 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -241,8 +241,6 @@ addressbook_authenticate (EBook *book, gboolean previous_failure, ESource *sourc
 	g_free (uri);
 }
 
-
-
 static void
 auth_required_cb (EBook *book, gpointer data)
 {
@@ -253,8 +251,6 @@ auth_required_cb (EBook *book, gpointer data)
 	addressbook_authenticate (book, FALSE, load_source_data->source,
 				  load_source_auth_cb, load_source_data);
 
-
-
 }
 static void
 load_source_cb (EBook *book, EBookStatus status, gpointer closure)
diff --git a/addressbook/gui/component/openldap-extract.h b/addressbook/gui/component/openldap-extract.h
index 996bf370a8..2d8c34b242 100644
--- a/addressbook/gui/component/openldap-extract.h
+++ b/addressbook/gui/component/openldap-extract.h
@@ -97,7 +97,6 @@ typedef struct ldap_objectclass {
 	gchar **oc_at_oids_may;	/* OPTIONAL */
 } LDAPObjectClass;
 
-
 static void
 vfree(gpointer *vec)
 {
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 6ccd89ed9e..7741b208fb 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -44,7 +44,6 @@ G_BEGIN_DECLS
 #define E_IS_CONTACT_EDITOR_FULLNAME(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
 #define E_IS_CONTACT_EDITOR_FULLNAME_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR_FULLNAME))
 
-
 typedef struct _EContactEditorFullname       EContactEditorFullname;
 typedef struct _EContactEditorFullnameClass  EContactEditorFullnameClass;
 
@@ -65,7 +64,6 @@ struct _EContactEditorFullnameClass
 	GtkDialogClass parent_class;
 };
 
-
 GtkWidget *e_contact_editor_fullname_new(const EContactName *name);
 GType      e_contact_editor_fullname_get_type (void);
 
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index e2468ee6dd..205f30b26b 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -75,7 +75,6 @@ enum {
 	NUM_IM_COLUMNS
 };
 
-
 static void e_contact_editor_init		(EContactEditor		 *editor);
 static void e_contact_editor_class_init	(EContactEditorClass	 *klass);
 static void e_contact_editor_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
@@ -2675,7 +2674,6 @@ full_name_clicked (GtkWidget *button, EContactEditor *editor)
 	editor->fullname_dialog = GTK_WIDGET (dialog);
 }
 
-
 static void
 categories_response (GtkDialog *dialog, gint response, EContactEditor *editor)
 {
@@ -3005,7 +3003,6 @@ save_contact (EContactEditor *ce, gboolean should_close)
 	if (!ce->target_book)
 		return;
 
-
 	if (ce->target_editable && !e_book_is_writable (ce->source_book)) {
 		if (e_error_run (GTK_WINDOW (ce->app), "addressbook:prompt-move", NULL) == GTK_RESPONSE_NO)
 			return;
@@ -3082,7 +3079,6 @@ static const EContactField  non_string_fields [] = {
 	E_CONTACT_BIRTH_DATE,
 	E_CONTACT_ANNIVERSARY
 
-
 };
 
 static gboolean
@@ -3097,7 +3093,6 @@ is_non_string_field (EContactField id)
 
 }
 
-
 /* insert checks here (date format, for instance, etc.) */
 static gboolean
 e_contact_editor_is_valid (EABEditor *editor)
@@ -3150,11 +3145,9 @@ e_contact_editor_is_valid (EABEditor *editor)
 				break;
 			}
 
-
 		}
 	}
 
-
 	if (validation_error) {
 		g_string_append (errmsg, ".");
 		e_error_run (GTK_WINDOW (ce->app), "addressbook:generic-error",
@@ -3490,10 +3483,8 @@ required_fields_cb (EBook *book, EBookStatus status,
 		      "required_fields", fields,
 		      NULL);
 
-
 }
 
-
 static void
 contact_editor_destroy_notify (gpointer data,
 			       GObject *where_the_object_was)
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index c5940d96d0..cdd9c2e8da 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -50,7 +50,6 @@ G_BEGIN_DECLS
 #define E_IS_CONTACT_EDITOR(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
 #define E_IS_CONTACT_EDITOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_CONTACT_EDITOR))
 
-
 typedef struct _EContactEditor       EContactEditor;
 typedef struct _EContactEditorClass  EContactEditorClass;
 
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 17ef4fb16d..0f6552ba18 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -151,7 +151,6 @@ quick_add_merge_contact (QuickAdd *qa)
 	addressbook_load (qa->book, merge_cb, qa);
 }
 
-
 /*
  * Raise a contact editor with all fields editable, and hook up all signals accordingly.
  */
@@ -506,7 +505,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g
 			in_quote = !in_quote;
 	}
 
-
 	if (last_at == NULL) {
 		/* No at sign, so we treat it all as the name */
 		name = g_strdup (text);
@@ -539,8 +537,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g
 	if (name == NULL && email == NULL)
 		name = g_strdup (text);
 
-
-
 	/* Clean up email, remove bracketing <>s */
 	if (email && *email) {
 		gboolean changed = FALSE;
@@ -557,7 +553,6 @@ e_contact_quick_add_free_form (const gchar *text, EContactQuickAddCallback cb, g
 			g_strstrip (email);
 	}
 
-
 	e_contact_quick_add (name, email, cb, closure);
 	g_free (name);
 	g_free (email);
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index 6257e3972b..19c3d9c7e3 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -354,7 +354,6 @@ eab_editor_confirm_delete (GtkWindow *parent, gboolean plural, gboolean is_list,
 	return (result == GTK_RESPONSE_ACCEPT);
 }
 
-
 void
 eab_editor_contact_added (EABEditor *editor, EBookStatus status, EContact *contact)
 {
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
index c658b1070b..6d70107643 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -50,7 +50,6 @@ G_BEGIN_DECLS
 #define EAB_IS_EDITOR_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EAB_TYPE_EDITOR))
 #define EAB_EDITOR_GET_CLASS(o)         (G_TYPE_INSTANCE_GET_CLASS ((o), EAB_EDITOR_TYPE, EABEditorClass))
 
-
 typedef struct _EABEditor       EABEditor;
 typedef struct _EABEditorClass  EABEditorClass;
 
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 6c343be46b..1e219f0ceb 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -39,7 +39,6 @@ combine_comparisons (EABContactMatchType prev,
 	return (EABContactMatchType) MAX ((gint) prev, (gint) new_info);
 }
 
-
 /*** Name comparisons ***/
 
 /* This *so* doesn't belong here... at least not implemented in a
@@ -352,7 +351,6 @@ eab_contact_compare_name (EContact *contact1, EContact *contact2)
 	return EAB_CONTACT_MATCH_NONE;
 }
 
-
 /*** Nickname Comparisons ***/
 
 EABContactMatchType
@@ -364,8 +362,6 @@ eab_contact_compare_nickname (EContact *contact1, EContact *contact2)
 	return EAB_CONTACT_MATCH_NOT_APPLICABLE;
 }
 
-
-
 /*** E-mail Comparisons ***/
 
 static gboolean
@@ -692,7 +688,6 @@ use_common_book_cb (EBook *book, gpointer closure)
 		g_list_free (contact_email);
 	}
 
-
 	/* Build up our full query from the parts. */
 	query_parts[p] = NULL;
 	qj = g_strjoinv (" ", query_parts);
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index d08461940b..4fc8ed1569 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -66,7 +66,5 @@ EABContactMatchType eab_contact_compare           (EContact *contact1, EContact
 void                eab_contact_locate_match      (EContact *contact, EABContactMatchQueryCallback cb, gpointer closure);
 void                eab_contact_locate_match_full (EBook *book, EContact *contact, GList *avoid, EABContactMatchQueryCallback cb, gpointer closure);
 
-
-
 #endif /* __E_CONTACT_COMPARE_H__ */
 
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 6e6224835c..2b62299b65 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -64,7 +64,6 @@ static void match_query_callback (EContact *contact, EContact *match, EABContact
 static GList *merging_queue = NULL;
 static gint running_merge_requests = 0;
 
-
 static void
 add_lookup (EContactMergingLookup *lookup)
 {
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 7389cdc8c6..965beb7e27 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -42,7 +42,6 @@ static GObjectClass *parent_class;
 static void eab_model_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void eab_model_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 
-
 enum {
 	PROP_0,
 	PROP_BOOK,
@@ -549,7 +548,6 @@ get_view_idle (EABModel *model)
 	return FALSE;
 }
 
-
 EContact *
 eab_model_get_contact(EABModel *model,
 		      gint       row)
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index f8b448a6be..1383da4b19 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -59,7 +59,6 @@ struct _EABModel {
 	guint first_get_view : 1;
 };
 
-
 struct _EABModelClass {
 	GObjectClass parent_class;
 
@@ -79,7 +78,6 @@ struct _EABModelClass {
 	void (*backend_died)       (EABModel *model);
 };
 
-
 GType              eab_model_get_type                  (void);
 EABModel          *eab_model_new                       (void);
 
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index 56f64e158b..4a85b69fa4 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -30,7 +30,6 @@
 #include <misc/e-gui-utils.h>
 #include "addressbook/printing/e-contact-print.h"
 
-
 struct _EAddressbookReflowAdapterPrivate {
 	EABModel *model;
 
@@ -97,7 +96,6 @@ unlink_model(EAddressbookReflowAdapter *adapter)
 	priv->model = NULL;
 }
 
-
 static gint
 text_height (PangoLayout *layout, const gchar *text)
 {
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index 14803e945c..0f8eb4102c 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -41,7 +41,6 @@ struct _EAddressbookReflowAdapter {
 	EAddressbookReflowAdapterPrivate *priv;
 };
 
-
 struct _EAddressbookReflowAdapterClass {
 	EReflowModelClass parent_class;
 
@@ -51,7 +50,6 @@ struct _EAddressbookReflowAdapterClass {
 	gint (* drag_begin) (EAddressbookReflowAdapter *adapter, GdkEvent *event);
 };
 
-
 GType         e_addressbook_reflow_adapter_get_type          (void);
 void          e_addressbook_reflow_adapter_construct         (EAddressbookReflowAdapter *adapter,
 							      EABModel         *model);
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index f285d76493..a081ebb34d 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -302,7 +302,6 @@ eab_table_adapter_init (GObject *object)
 	priv->model_changed_id = 0;
 }
 
-
 static void
 create_contact (EABModel *model,
 		gint index, gint count,
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
index edfb1adf00..27bfe0e3f4 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h
@@ -41,12 +41,10 @@ struct _EAddressbookTableAdapter {
 	EAddressbookTableAdapterPrivate *priv;
 };
 
-
 struct _EAddressbookTableAdapterClass {
 	ETableModelClass parent_class;
 };
 
-
 GType        eab_table_adapter_get_type (void);
 void         eab_table_adapter_construct (EAddressbookTableAdapter *adapter,
 					  EABModel *model);
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 53cd6aadec..7805cb19f8 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -907,7 +907,6 @@ open_contact (EPopup *ep, EPopupItem *pitem, gpointer data)
 	eab_view_view (contact_and_book->view);
 }
 
-
 static void
 new_card (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
@@ -1226,7 +1225,6 @@ contacts_removed (EABModel *model, gpointer data, EABView *eav)
 
 	for (i = 0; i < count; i ++) {
 
-
 		if (eav->displayed_contact == g_array_index (indices, gint, i)) {
 
 			/* if the contact that's presently displayed is changed, clear the display */
@@ -2105,7 +2103,6 @@ eab_view_move_to_folder (EABView *view, gboolean all)
 	view_transfer_contacts (view, TRUE, all);
 }
 
-
 static gboolean
 eab_view_selection_nonempty (EABView  *view)
 {
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index d8e0b2b5e1..03bdcb5a1a 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -56,7 +56,6 @@ typedef enum {
 	EAB_VIEW_TABLE
 } EABViewType;
 
-
 typedef struct _EABView       EABView;
 typedef struct _EABViewClass  EABViewClass;
 
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 52110bb169..414b760e1e 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -471,7 +471,6 @@ e_minicard_label_reflow(GnomeCanvasItem *item, gint flags)
 
 	e_minicard_label->height = text_height;
 
-
 	g_object_get(e_minicard_label->field,
 		     "text_height", &text_height,
 		     NULL);
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index df68210473..6031b803f3 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -46,7 +46,6 @@ G_BEGIN_DECLS
 #define E_IS_MINICARD_LABEL(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_LABEL))
 #define E_IS_MINICARD_LABEL_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_LABEL))
 
-
 typedef struct _EMinicardLabel       EMinicardLabel;
 typedef struct _EMinicardLabelClass  EMinicardLabelClass;
 
@@ -73,12 +72,10 @@ struct _EMinicardLabelClass
 	void (* style_set) (EMinicardLabel *label, GtkStyle *previous_style);
 };
 
-
 GType      e_minicard_label_get_type (void);
 GnomeCanvasItem *e_minicard_label_new(GnomeCanvasGroup *parent);
 void e_minicard_label_construct (GnomeCanvasItem *item);
 
 G_END_DECLS
 
-
 #endif /* __E_MINICARD_LABEL_H__ */
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index a48e45ca52..7a95d5ecb5 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -339,7 +339,6 @@ e_minicard_view_widget_style_set (GtkWidget *widget, GtkStyle *previous_style)
 		GTK_WIDGET_CLASS(parent_class)->style_set (widget, previous_style);
 }
 
-
 static void
 e_minicard_view_widget_realize (GtkWidget *widget)
 {
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 37bef22900..2b01dce65e 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
 #define E_IS_MINICARD_VIEW_WIDGET(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
 #define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW_WIDGET))
 
-
 typedef struct _EMinicardViewWidget       EMinicardViewWidget;
 typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;
 
@@ -63,7 +62,6 @@ struct _EMinicardViewWidgetClass
 	guint        (*right_click)          (EMinicardViewWidget *emvw);
 };
 
-
 GType            e_minicard_view_widget_get_type             (void);
 GtkWidget       *e_minicard_view_widget_new                  (EAddressbookReflowAdapter *adapter);
 
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 9461dca3ae..cf0e511aeb 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -54,7 +54,6 @@ enum {
 	PROP_EDITABLE
 };
 
-
 enum {
 	RIGHT_CLICK,
 	LAST_SIGNAL
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index a548c9bf11..82b8cbb63a 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -58,7 +58,6 @@ G_BEGIN_DECLS
 #define E_IS_MINICARD_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD_VIEW))
 #define E_IS_MINICARD_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD_VIEW))
 
-
 typedef struct _EMinicardView       EMinicardView;
 typedef struct _EMinicardViewClass  EMinicardViewClass;
 
@@ -92,7 +91,6 @@ void     e_minicard_view_jump_to_letter    (EMinicardView *view,
 					    gunichar       letter);
 GList   *e_minicard_view_get_card_list     (EMinicardView *view);
 
-
 G_END_DECLS
 
 #endif /* __E_MINICARD_VIEW_H__ */
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 1a021bea04..41c6ac6809 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -292,7 +292,6 @@ set_has_cursor (EMinicard *minicard, gboolean has_cursor)
 	minicard->has_cursor = has_cursor;
 }
 
-
 static void
 e_minicard_set_property  (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
@@ -428,8 +427,6 @@ e_minicard_dispose (GObject *object)
 		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
-
-
 static void
 e_minicard_finalize (GObject *object)
 {
@@ -796,7 +793,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
 					"width", e_minicard->width - 4.0,
 					NULL );
 
-
 #ifdef notyet
 	g_object_set(E_MINICARD_LABEL(new_item)->field,
 		     "allow_newlines", e_card_simple_get_allow_newlines (e_minicard->contact, field),
@@ -816,7 +812,6 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
 	g_free(string);
 }
 
-
 static const gchar *
 get_email_location (EVCardAttribute *attr)
 {
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 64fa90bbac..033e981636 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -47,7 +47,6 @@ G_BEGIN_DECLS
 #define E_IS_MINICARD(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MINICARD))
 #define E_IS_MINICARD_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MINICARD))
 
-
 typedef struct _EMinicard       EMinicard;
 typedef struct _EMinicardClass  EMinicardClass;
 typedef enum _EMinicardFocusType EMinicardFocusType;
@@ -126,5 +125,4 @@ gboolean    e_minicard_activate_editor	(EMinicard *minicard);
 
 G_END_DECLS
 
-
 #endif /* __E_MINICARD_H__ */
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 40e75523cc..c7d80b4d51 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -172,7 +172,6 @@ static EPopupItem eab_uri_popups[] = {
 	{ E_POPUP_ITEM, (gchar *) "20.copy", (gchar *) N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, (gchar *) "edit-copy", EAB_POPUP_URI_MAILTO},
         };
 
-
 static void
 eab_uri_popup_free(EPopup *ep, GSList *list, gpointer data)
 {
@@ -380,7 +379,6 @@ accum_address (GString *gstr, EContact *contact, const gchar *html_label, EConta
 		else
 			g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\"></td><td valign=\"top\" width=\"100\"><font color=" HEADER_COLOR ">%s:</font><br><a href=\"http://www.mapquest.com/\">%s</a></td><td valign=\"top\">", html_label, _("map"));
 
-
 		if (adr->po && *adr->po) g_string_append_printf (gstr, "%s<br>", adr->po);
 		if (adr->ext && *adr->ext) g_string_append_printf (gstr, "%s<br>", adr->ext);
 		if (adr->street && *adr->street) g_string_append_printf (gstr, "%s<br>", adr->street);
@@ -420,7 +418,6 @@ accum_name_value (GString *gstr, const gchar *label, const gchar *str, const gch
 	g_free (value);
 }
 
-
 static void
 accum_attribute (GString *gstr, EContact *contact, const gchar *html_label, EContactField field, const gchar *icon, guint html_flags)
 {
@@ -712,7 +709,6 @@ eab_contact_display_render_normal (EABContactDisplay *display, EContact *contact
 			g_free (html);
 		}
 
-
 		if (e_contact_get (contact, E_CONTACT_IS_LIST))
 			render_contact_list (html_stream, contact);
 		else
@@ -929,7 +925,6 @@ eab_html_press_event (GtkWidget *widget, GdkEvent *event,EABContactDisplay *disp
 	gchar *uri;
 	gboolean res = FALSE;
 
-
 	if (event->button.button!= 3 )
 		return FALSE;
 
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 77481ad2c8..87601d7271 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -334,7 +334,6 @@ eab_show_multiple_contacts (EBook *book,
 	}
 }
 
-
 static gint
 file_exists(GtkWindow *window, const gchar *filename)
 {
@@ -373,7 +372,6 @@ save_it(GtkWidget *widget, SaveAsInfo *info)
 	gchar *uri;
 	gint response = 0;
 
-
 	filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (info->filesel));
 	uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (info->filesel));
 
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index f29f2292f8..cc7b127aaf 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -77,7 +77,6 @@ void                eab_send_contact_list         (GList          *contacts,
 
 GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);
 
-
 ESource            *eab_select_source             (const gchar *title, const gchar *message,
 						   const gchar *select_uid, GtkWindow *parent);
 
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index 78b99cf6a4..28aa819e73 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -43,7 +43,6 @@ static GtkObjectClass *parent_class;
 static void eab_popup_control_dispose (GObject *);
 static void eab_popup_control_query   (EABPopupControl *);
 
-
 static void
 eab_popup_control_class_init (EABPopupControlClass *klass)
 {
@@ -297,7 +296,6 @@ eab_popup_control_construct (EABPopupControl *pop)
 	pop->contact_display = eab_contact_display_new ();
 	gtk_box_pack_start (GTK_BOX (pop->main_vbox), pop->contact_display, TRUE, TRUE, 0);
 
-
 	/* Final assembly */
 
 	gtk_container_add (GTK_CONTAINER (pop), pop->main_vbox);
diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
index 2957c483a6..30ab08f837 100644
--- a/addressbook/gui/widgets/eab-popup.c
+++ b/addressbook/gui/widgets/eab-popup.c
@@ -136,7 +136,6 @@ EABPopup *eab_popup_new(const gchar *menuid)
  * Return value:
  **/
 
-
 EABPopupTargetURI *
 eab_popup_target_new_uri(EABPopup *emp, const gchar *uri)
 {
@@ -158,9 +157,6 @@ eab_popup_target_new_uri(EABPopup *emp, const gchar *uri)
 	return t;
 }
 
-
-
-
 EABPopupTargetSelect *
 eab_popup_target_new_select(EABPopup *eabp, struct _EBook *book, gint readonly, GPtrArray *cards)
 {
diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h
index d1d0ed3225..31d0310829 100644
--- a/addressbook/gui/widgets/eab-popup.h
+++ b/addressbook/gui/widgets/eab-popup.h
@@ -108,7 +108,6 @@ struct _EABPopupTargetSelect {
 	GPtrArray *cards;
 };
 
-
 struct _EABPopupTargetURI {
 	EPopupTarget target;
 	gchar *uri;
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index 2e9accaeac..ee61207855 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -94,4 +94,3 @@ gal_view_factory_minicard_construct  (GalViewFactoryMinicard *factory)
 	return GAL_VIEW_FACTORY(factory);
 }
 
-
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index 9cce21d548..6f88bb9cbd 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -221,7 +221,6 @@ static import_fields csv_fields_mozilla[] = {
 	{"Custom 4", NOMAP},
 	{"Notes", NOMAP},
 
-
 };
 
 static import_fields csv_fields_evolution[] = {
@@ -829,7 +828,6 @@ csv_cancel(EImport *ei, EImportTarget *target, EImportImporter *im) {
 		gci->state = 1;
 }
 
-
 static EImportImporter csv_outlook_importer = {
 	E_IMPORT_TARGET_URI,
 	0,
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 8aaad1ba33..2c8b24cac5 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -71,7 +71,6 @@ typedef struct {
 
 static void ldif_import_done(LDIFImporter *gci);
 
-
 static struct {
 	const gchar *ldif_attribute;
 	EContactField contact_field;
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index ff6b205afa..b3b965ffa0 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -273,7 +273,6 @@ fix_utf16_endianness (gunichar2 *utf16)
 {
 	gunichar2 *it;
 
-
 	if ((utf16 == NULL) || (*utf16 == '\0')) {
 		return;
 	}
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index 556931462a..ea3eb7a40e 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -246,7 +246,6 @@ gint output_n_cards_file (FILE * outputfile, GList *contacts, gint size, gint be
 static void fork_to_background (void);
 void set_pre_defined_field (GSList ** pre_defined_fields);
 
-
 /* function declarations*/
 gint
 e_contact_csv_get_contact_field (EContactFieldCSV csv_field)
@@ -279,7 +278,6 @@ e_contact_csv_get_name (EContactFieldCSV csv_field)
 	return quoted_name;
 }
 
-
 gchar *
 e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field)
 {
@@ -398,7 +396,6 @@ e_contact_csv_get (EContact * contact, EContactFieldCSV csv_field)
 	return quoted_field_value;
 }
 
-
 gchar *
 e_contact_csv_get_header_line (GSList * csv_all_fields)
 {
@@ -429,7 +426,6 @@ e_contact_csv_get_header_line (GSList * csv_all_fields)
 
 }
 
-
 gchar *
 e_contact_to_csv (EContact * contact, GSList * csv_all_fields)
 {
@@ -459,7 +455,6 @@ e_contact_to_csv (EContact * contact, GSList * csv_all_fields)
 
 }
 
-
 gchar *
 e_contact_get_csv (EContact * contact, GSList * csv_all_fields)
 {
@@ -469,7 +464,6 @@ e_contact_get_csv (EContact * contact, GSList * csv_all_fields)
 	return aline;
 }
 
-
 gchar *
 check_null_pointer (gchar * orig)
 {
@@ -620,9 +614,6 @@ fork_to_background (void)
 #endif
 }
 
-
-
-
 static void
 action_list_cards (GList *contacts, ActionContext * p_actctx)
 {
@@ -642,7 +633,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
 		exit (-1);
 	}
 
-
 	if (p_actctx->action_list_cards.async_mode == FALSE) {	/* normal mode */
 
 		if (p_actctx->action_list_cards.output_file == NULL) {
@@ -667,7 +657,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
 		}
 	}
 
-
 	/*async mode */
 	else {
 
@@ -690,7 +679,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
 				exit (-1);
 			}
 
-
 			if (p_actctx->action_list_cards.IsVCard == TRUE)
 				format = CARD_FORMAT_VCARD;
 			else
@@ -706,7 +694,6 @@ action_list_cards (GList *contacts, ActionContext * p_actctx)
 				IsFirstOne = FALSE;
 			}
 
-
 		}
 		while (series_no * size < length);
 		g_free (file_series_name);
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
index 1d150b3f2a..804bd50780 100644
--- a/addressbook/tools/evolution-addressbook-export.h
+++ b/addressbook/tools/evolution-addressbook-export.h
@@ -64,7 +64,6 @@ union _ActionContext
 
 typedef union _ActionContext ActionContext;
 
-
 /* action_list_folders */
 guint action_list_folders_init (ActionContext * p_actctx);
 
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 599486cfda..54e95e4950 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -187,7 +187,6 @@ eab_strstrcase (const gchar *haystack, const gchar *needle)
 	return NULL;
 }
 
-
 GList*
 eab_contact_list_from_string (const gchar *str)
 {