Fix excessive whitespace.

21 files changed, 3 insertions, 89 deletions

diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 6497a7bdd1..1b36d14512 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -99,7 +99,6 @@ component_info_compare_func (EComponentInfo *a,
 	return strcmp (a->button_label, b->button_label);
 }
 
-
 /* Utility methods.  */
 
 static void
@@ -219,7 +218,6 @@ query_components (EComponentRegistry *registry)
 					      (GCompareFunc) component_info_compare_func);
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -237,7 +235,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_component_registry_parent_class)->finalize) (object);
 }
 
-
 static void
 e_component_registry_class_init (EComponentRegistryClass *klass)
 {
@@ -247,21 +244,18 @@ e_component_registry_class_init (EComponentRegistryClass *klass)
 	object_class->finalize = impl_finalize;
 }
 
-
 static void
 e_component_registry_init (EComponentRegistry *registry)
 {
 	registry->priv = g_new0 (EComponentRegistryPrivate, 1);
 }
 
-
 EComponentRegistry *
 e_component_registry_new (void)
 {
 	return g_object_new (e_component_registry_get_type (), NULL);
 }
 
-
 GSList *
 e_component_registry_peek_list (EComponentRegistry *registry)
 {
@@ -272,7 +266,6 @@ e_component_registry_peek_list (EComponentRegistry *registry)
 	return registry->priv->infos;
 }
 
-
 EComponentInfo *
 e_component_registry_peek_info (EComponentRegistry *registry,
 				enum _EComponentRegistryField field,
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index 1b4dd978bb..373912db03 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -22,23 +22,19 @@
 #ifndef __E_COMPONENT_REGISTRY_H__
 #define __E_COMPONENT_REGISTRY_H__
 
-
 #include "Evolution.h"
 
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-
 G_BEGIN_DECLS
 
-
 #define E_TYPE_COMPONENT_REGISTRY		(e_component_registry_get_type ())
 #define E_COMPONENT_REGISTRY(obj)		(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_COMPONENT_REGISTRY, EComponentRegistry))
 #define E_COMPONENT_REGISTRY_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_COMPONENT_REGISTRY, EComponentRegistryClass))
 #define E_IS_COMPONENT_REGISTRY(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_COMPONENT_REGISTRY))
 #define E_IS_COMPONENT_REGISTRY_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_COMPONENT_REGISTRY))
 
-
 typedef struct _EComponentRegistry        EComponentRegistry;
 typedef struct _EComponentRegistryPrivate EComponentRegistryPrivate;
 typedef struct _EComponentRegistryClass   EComponentRegistryClass;
@@ -80,7 +76,6 @@ struct _EComponentInfo {
 };
 typedef struct _EComponentInfo EComponentInfo;
 
-
 GType               e_component_registry_get_type  (void);
 EComponentRegistry *e_component_registry_new       (void);
 
@@ -93,7 +88,6 @@ GNOME_Evolution_Component  e_component_registry_activate  (EComponentRegistry *r
 							   const gchar         *id,
 							   CORBA_Environment  *ev);
 
-
 G_END_DECLS
 
 #endif /* __E_COMPONENT_REGISTRY_H__ */
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c
index f0fc89298c..02f8a631d3 100644
--- a/shell/e-corba-config-page.c
+++ b/shell/e-corba-config-page.c
@@ -35,7 +35,6 @@
 #include <bonobo/bonobo-object.h>
 #include <bonobo/bonobo-listener.h>
 
-
 struct _ECorbaConfigPagePrivate {
 	GNOME_Evolution_ConfigControl config_control_interface;
 };
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index 57ed2495b5..9ad741afe4 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -160,7 +160,6 @@ create_help (const gchar *name)
 	if (i >= num_info)
 		g_warning ("i > num_info\n");
 
-
 	label = gtk_label_new(i < num_info ? _(info[i].text): NULL);
 	gtk_widget_show (label);
 	gtk_label_set_line_wrap((GtkLabel *)label, TRUE);
@@ -755,7 +754,6 @@ e_shell_importer_start_import (EShellWindow *shell_window)
 
 	gtk_box_pack_start (GTK_BOX (GNOME_DRUID_PAGE_STANDARD (data->intelligent)->vbox), data->importerpage->vbox, TRUE, TRUE, 0);
 
-
 	/* File selection and file type page */
 	data->filedialog = glade_xml_get_widget (data->wizard, "page2-file");
 	gnome_druid_page_standard_set_logo (GNOME_DRUID_PAGE_STANDARD (data->filedialog), icon);
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index 12f446b536..6a56d0f71b 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -123,7 +123,7 @@ check_initial_state (EShell *shell)
 	}
 
 	/* update the state only in the absence of network connection else let the old state prevail */
-	if (state == NM_STATE_DISCONNECTED)	
+	if (state == NM_STATE_DISCONNECTED)
 		e_shell_set_line_status (shell, GNOME_Evolution_FORCED_OFFLINE);
 
 	dbus_message_unref (message);
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 6e3cf1175d..9c7c32d1d5 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -257,7 +257,6 @@ load_pages (EShellSettingsDialog *dialog)
 			}
 		}
 
-
 		page_free (page);
 	}
 
@@ -354,4 +353,3 @@ e_shell_settings_dialog_show_type (EShellSettingsDialog *dialog, const gchar *ty
 	e_multi_config_dialog_show_page (E_MULTI_CONFIG_DIALOG (dialog), page);
 }
 
-
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index 3f9c4b0f26..191ca5b994 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -80,7 +80,6 @@ launch_pilot_settings (void)
 	}
 }
 
-
 /* Command callbacks.  */
 
 static void
@@ -1011,7 +1010,6 @@ command_quick_reference (BonoboUIComponent *uih,
 	}
 }
 
-
 static void
 command_work_offline (BonoboUIComponent *uih,
 		      EShellWindow *window,
@@ -1044,7 +1042,6 @@ command_open_new_window (BonoboUIComponent *uih,
 			       window);
 }
 
-
 /* Actions menu.  */
 
 static void
@@ -1082,7 +1079,6 @@ command_pilot_settings (BonoboUIComponent *uih,
 	launch_pilot_settings ();
 }
 
-
 static BonoboUIVerb file_verbs [] = {
 	BONOBO_UI_VERB ("FileImporter", (BonoboUIVerbFn) command_import),
 	BONOBO_UI_VERB ("FilePageSetup", (BonoboUIVerbFn) command_page_setup),
@@ -1149,7 +1145,6 @@ static EPixmap online_pixmaps [] = {
 	E_PIXMAP_END
 };
 
-
 /* The Work Online / Work Offline menu item.  */
 
 static void
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 685b5a822f..18d390d570 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -75,7 +75,6 @@ struct _ComponentView {
 };
 typedef struct _ComponentView ComponentView;
 
-
 struct _EShellWindowPrivate {
 	union {
 		EShell *eshell;
@@ -117,7 +116,6 @@ struct _EShellWindowPrivate {
 	gboolean destroyed;
 };
 
-
 enum {
 	COMPONENT_CHANGED,
 	LAST_SIGNAL
@@ -352,7 +350,6 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	g_signal_emit (window, signals[COMPONENT_CHANGED], 0);
 }
 
-
 /* Functions to update the sensitivity of buttons and menu items depending on the status.  */
 
 static void
@@ -419,7 +416,6 @@ update_send_receive_sensitivity (EShellWindow *window)
 					      "sensitive", "1", NULL);
 }
 
-
 /* Callbacks.  */
 
 static ComponentView *
@@ -518,7 +514,6 @@ ui_engine_remove_hint_callback (BonoboUIEngine *engine,
 	gtk_widget_show (window->priv->statusbar_notebook);
 }
 
-
 /* Widgetry.  */
 
 static void
@@ -821,7 +816,6 @@ setup_widgets (EShellWindow *window)
 	g_object_unref (gconf_client);
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -978,7 +972,6 @@ e_shell_window_init (EShellWindow *shell_window)
 
 }
 
-
 /* Instantiation.  */
 
 GtkWidget *
@@ -1061,7 +1054,6 @@ e_shell_window_new (EShell *shell,
 	return GTK_WIDGET (window);
 }
 
-
 void
 e_shell_window_switch_to_component (EShellWindow *window, const gchar *component_id)
 {
@@ -1092,7 +1084,6 @@ e_shell_window_switch_to_component (EShellWindow *window, const gchar *component
 	e_sidebar_select_button (E_SIDEBAR (priv->sidebar), view->button_id);
 }
 
-
 const gchar *
 e_shell_window_peek_current_component_id (EShellWindow *window)
 {
@@ -1104,7 +1095,6 @@ e_shell_window_peek_current_component_id (EShellWindow *window)
 	return window->priv->current_view->component_id;
 }
 
-
 EShell *
 e_shell_window_peek_shell (EShellWindow *window)
 {
@@ -1113,7 +1103,6 @@ e_shell_window_peek_shell (EShellWindow *window)
 	return window->priv->shell.eshell;
 }
 
-
 BonoboUIComponent *
 e_shell_window_peek_bonobo_ui_component (EShellWindow *window)
 {
@@ -1196,7 +1185,6 @@ e_shell_window_save_defaults (EShellWindow *window)
 		g_free (prop);
 	}
 
-
 	g_object_unref (client);
 }
 
diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index d3abe1f201..7c404fadc8 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -34,7 +34,6 @@
 #define E_IS_SHELL_WINDOW(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL_WINDOW))
 #define E_IS_SHELL_WINDOW_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL_WINDOW))
 
-
 typedef struct _EShellWindow        EShellWindow;
 typedef struct _EShellWindowPrivate EShellWindowPrivate;
 typedef struct _EShellWindowClass   EShellWindowClass;
@@ -51,10 +50,8 @@ struct _EShellWindowClass {
 	void (* component_changed) (EShellWindow *window);
 };
 
-
 #include "e-shell.h"
 
-
 GType  e_shell_window_get_type  (void);
 
 GtkWidget *e_shell_window_new  (EShell     *shell,
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 3eb063928b..e4224f3207 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -120,7 +120,6 @@ struct _EShellPrivate {
 	guint crash_recovery : 1;
 };
 
-
 /* Signals.  */
 
 enum {
@@ -132,7 +131,6 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 /* Utility functions.  */
 
 static gboolean
@@ -150,7 +148,6 @@ get_config_start_offline (void)
 	return value;
 }
 
-
 /* Interactivity handling.  */
 
 static void
@@ -200,7 +197,6 @@ set_interactive (EShell *shell,
 	}
 }
 
-
 /* CORBA interface implementation.  */
 
 static gboolean
@@ -485,7 +481,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -996,7 +991,6 @@ e_shell_peek_uri_schema_registry (EShell *shell)
 }
 #endif
 
-
 /**
  * e_shell_peek_component_registry:
  * @shell:
@@ -1013,7 +1007,6 @@ e_shell_peek_component_registry (EShell *shell)
 	return shell->priv->component_registry;
 }
 
-
 /**
  * e_shell_save_settings:
  * @shell:
@@ -1084,7 +1077,6 @@ e_shell_get_line_status (EShell *shell)
 	return shell->priv->line_status;
 }
 
-
 /* Offline/online handling.  */
 
 static void
@@ -1222,7 +1214,6 @@ e_shell_send_receive (EShell *shell)
 	}
 }
 
-
 void
 e_shell_show_settings (EShell *shell,
 		       const gchar *type,
@@ -1252,7 +1243,6 @@ e_shell_show_settings (EShell *shell,
 	gtk_widget_show (priv->settings_dialog.widget);
 }
 
-
 const gchar *
 e_shell_construct_result_to_string (EShellConstructResult result)
 {
diff --git a/shell/e-shell.h b/shell/e-shell.h
index c5ae461466..00f4266562 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -37,14 +37,12 @@ typedef struct _EShellClass   EShellClass;
 #include "e-component-registry.h"
 #include "e-shell-window.h"
 
-
 #define E_TYPE_SHELL			(e_shell_get_type ())
 #define E_SHELL(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_SHELL, EShell))
 #define E_SHELL_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_SHELL, EShellClass))
 #define E_IS_SHELL(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SHELL))
 #define E_IS_SHELL_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SHELL))
 
-
 enum _EShellLineStatus {
 	E_SHELL_LINE_STATUS_ONLINE,
 	E_SHELL_LINE_STATUS_GOING_OFFLINE, /* NB: really means changing state in either direction */
@@ -76,7 +74,6 @@ struct _EShellClass {
 	void (* new_window_created) (EShell *shell, EShellWindow *window);
 };
 
-
 /* ID for registering the shell in the OAF name service.  */
 #define E_SHELL_OAFIID  "OAFIID:GNOME_Evolution_Shell:" BASE_VERSION
 
@@ -89,7 +86,6 @@ enum _EShellConstructResult {
 };
 typedef enum _EShellConstructResult EShellConstructResult;
 
-
 GType                  e_shell_get_type   (void);
 EShellConstructResult  e_shell_construct  (EShell                *shell,
 					   const gchar            *iid,
@@ -105,7 +101,6 @@ EShellWindow *e_shell_create_window         (EShell       *shell,
 gboolean      e_shell_request_close_window  (EShell       *shell,
 					     EShellWindow *window);
 
-
 #if 0
 EUriSchemaRegistry *e_shell_peek_uri_schema_registry  (EShell *shell);
 #endif
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 8d5152966e..3942de727b 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -53,7 +53,6 @@ struct _ESidebarPrivate {
 	gboolean in_toggle;
 };
 
-
 enum {
 	BUTTON_SELECTED,
 	BUTTON_PRESSED,
@@ -127,7 +126,6 @@ update_buttons (ESidebar *sidebar, gint new_selected_id)
 	sidebar->priv->in_toggle = FALSE;
 }
 
-
 /* Callbacks.  */
 
 static void
@@ -206,7 +204,6 @@ button_query_tooltip (GtkWidget  *widget,
 	return FALSE;
 }
 
-
 /* Layout. */
 
 static gint
@@ -334,7 +331,6 @@ do_layout (ESidebar *sidebar)
 	gtk_widget_size_allocate (sidebar->priv->selection_widget, & child_allocation);
 }
 
-
 /* GtkContainer methods.  */
 
 static void
@@ -379,7 +375,6 @@ impl_remove (GtkContainer *container,
 	}
 }
 
-
 /* GtkWidget methods.  */
 
 static void
@@ -419,7 +414,6 @@ impl_size_allocate (GtkWidget *widget,
 	do_layout (E_SIDEBAR (widget));
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -466,7 +460,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_sidebar_parent_class)->finalize) (object);
 }
 
-
 /* Initialization.  */
 
 static void
@@ -526,7 +519,6 @@ e_sidebar_new (void)
 	return GTK_WIDGET (sidebar);
 }
 
-
 void
 e_sidebar_set_selection_widget (ESidebar *sidebar, GtkWidget *widget)
 {
@@ -541,7 +533,6 @@ e_sidebar_set_selection_widget (ESidebar *sidebar, GtkWidget *widget)
 	gtk_widget_queue_resize (GTK_WIDGET (sidebar));
 }
 
-
 void
 e_sidebar_add_button (ESidebar *sidebar,
 		      const gchar *label,
@@ -652,7 +643,6 @@ e_sidebar_get_mode (ESidebar *sidebar)
 	return sidebar->priv->mode;
 }
 
-
 static GConfEnumStringPair toolbar_styles[] = {
          { E_SIDEBAR_MODE_TEXT, "text" },
          { E_SIDEBAR_MODE_ICON, "icons" },
diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h
index 9a06e5a377..9e450f8e7b 100644
--- a/shell/e-sidebar.h
+++ b/shell/e-sidebar.h
@@ -32,7 +32,6 @@
 #define E_IS_SIDEBAR(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_SIDEBAR))
 #define E_IS_SIDEBAR_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_SIDEBAR))
 
-
 typedef struct _ESidebar        ESidebar;
 typedef struct _ESidebarPrivate ESidebarPrivate;
 typedef struct _ESidebarClass   ESidebarClass;
@@ -58,7 +57,6 @@ struct _ESidebarClass {
 	void (* button_pressed)  (ESidebar *sidebar, GdkEventButton *event, gint id);
 };
 
-
 GType      e_sidebar_get_type  (void);
 GtkWidget *e_sidebar_new       (void);
 
@@ -84,5 +82,4 @@ void e_sidebar_set_mode (ESidebar *sidebar, ESidebarMode mode);
 void  e_sidebar_set_show_buttons  (ESidebar *sidebar, gboolean show);
 gboolean  e_sidebar_get_show_buttons  (ESidebar *sidebar);
 
-
 #endif /* _E_SIDEBAR_H_ */
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index ce2afa3fb7..417ac0221a 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -193,7 +193,6 @@ get_components_from_bonobo (EUserCreatableItemsHandler *handler)
 	CORBA_free (info_list);
 }
 
-
 /* Helper functions.  */
 
 static gboolean
@@ -339,7 +338,6 @@ get_default_action_for_view (EUserCreatableItemsHandler *handler)
 	return priv->fallback_menu_item;
 }
 
-
 /* Verb handling.  */
 
 static void
@@ -442,7 +440,6 @@ add_verbs (EUserCreatableItemsHandler *handler,
 	}
 }
 
-
 /* Generic menu construction code */
 
 static gint
@@ -609,7 +606,6 @@ create_menu_xml (EUserCreatableItemsHandler *handler)
 	g_string_free (xml, FALSE);
 }
 
-
 /* The GtkMenu for the toolbar button.  */
 
 static void
@@ -760,7 +756,6 @@ setup_toolbar_button (EUserCreatableItemsHandler *handler)
 	g_object_unref (gconf);
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -832,7 +827,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_user_creatable_items_handler_parent_class)->finalize) (object);
 }
 
-
 static void
 e_user_creatable_items_handler_class_init (EUserCreatableItemsHandlerClass *klass)
 {
@@ -864,7 +858,6 @@ e_user_creatable_items_handler_init (EUserCreatableItemsHandler *handler)
 	handler->priv = priv;
 }
 
-
 EUserCreatableItemsHandler *
 e_user_creatable_items_handler_new (const gchar *component_alias,
 				    EUserCreatableItemsHandlerCreate create_local, gpointer data)
@@ -880,7 +873,6 @@ e_user_creatable_items_handler_new (const gchar *component_alias,
 	return handler;
 }
 
-
 /**
  * e_user_creatable_items_handler_activate:
  * @handler: the #EUserCreatableItemsHandler
diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h
index 922c7f70d2..cb978bdb37 100644
--- a/shell/e-user-creatable-items-handler.h
+++ b/shell/e-user-creatable-items-handler.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
 #define E_IS_USER_CREATABLE_ITEMS_HANDLER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
 #define E_IS_USER_CREATABLE_ITEMS_HANDLER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_USER_CREATABLE_ITEMS_HANDLER))
 
-
 typedef struct _EUserCreatableItemsHandler        EUserCreatableItemsHandler;
 typedef struct _EUserCreatableItemsHandlerPrivate EUserCreatableItemsHandlerPrivate;
 typedef struct _EUserCreatableItemsHandlerClass   EUserCreatableItemsHandlerClass;
@@ -52,7 +51,6 @@ struct _EUserCreatableItemsHandlerClass {
 	GObjectClass parent_class;
 };
 
-
 GType                       e_user_creatable_items_handler_get_type   (void);
 EUserCreatableItemsHandler *e_user_creatable_items_handler_new        (const gchar *component_alias,
 								       EUserCreatableItemsHandlerCreate create_local, gpointer data);
diff --git a/shell/es-menu.c b/shell/es-menu.c
index 93fa3b339d..d272d613be 100644
--- a/shell/es-menu.c
+++ b/shell/es-menu.c
@@ -119,7 +119,6 @@ es_menu_target_new_shell(ESMenu *esm, guint32 flags)
 
 /* ********************************************************************** */
 
-
 static gpointer esph_parent_class;
 #define esph ((ESMenuHook *)eph)
 
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index bcbe610e4e..7301a3741b 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -84,7 +84,6 @@ free_pixmaps (void)
 	g_slist_free (inited_arrays);
 }
 
-
 /**
  * e_get_activation_failure_msg:
  * @ev: An exception returned by an oaf_activate call.
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index 5c7560dabd..05eae39b43 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -89,7 +89,6 @@ EvolutionImporter *evolution_importer_new (EvolutionImporterCreateControlFn  cre
 					   EvolutionImporterGetErrorFn       get_error_fn,
 					   void                             *closure);
 
-
 G_END_DECLS
 
 #endif
diff --git a/shell/main.c b/shell/main.c
index 54d118a41d..21cc278c7f 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -125,12 +125,11 @@ no_windows_left_cb (EShell *shell, gpointer data)
 
 static void
 shell_weak_notify (gpointer data,
-		   GObject *where_the_object_was)
+                   GObject *where_the_object_was)
 {
 	bonobo_main_quit ();
 }
 
-
 #ifdef KILL_PROCESS_CMD
 
 static void
@@ -191,7 +190,6 @@ kill_old_dataserver (void)
 }
 #endif
 
-
 #ifdef DEVELOPMENT
 
 /* Warning dialog to scare people off a little bit.  */
@@ -573,7 +571,7 @@ main (gint argc, gchar **argv)
 {
 #ifdef G_OS_WIN32
     if (fileno (stdout) != -1 &&
- 	  _get_osfhandle (fileno (stdout)) != -1)
+	  _get_osfhandle (fileno (stdout)) != -1)
 	{
 	  /* stdout is fine, presumably redirected to a file or pipe */
 	}
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 25df4d547a..aaca1339c7 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -34,7 +34,6 @@
 #include "e-task-bar.h"
 #include "evolution-test-component.h"
 
-
 #define FACTORY_ID "OAFIID:GNOME_Evolution_Test_Factory:" BASE_VERSION
 #define TEST_COMPONENT_ID  "OAFIID:GNOME_Evolution_Test_Component:" BASE_VERSION
 #define CREATE_TEST_ID      "test"
@@ -88,7 +87,6 @@ impl_upgradeFromVersion (PortableServer_Servant servant,
 	g_message ("Upgrading from %d.%d.%d", major, minor, revision);
 }
 
-
 static GNOME_Evolution_CreatableItemTypeList *
 impl__get_userCreatableItems (PortableServer_Servant servant,
 			      CORBA_Environment *ev)
diff --git a/shell/test/evolution-test-component.h b/shell/test/evolution-test-component.h
index 18dd40c7ff..5809348321 100644
--- a/shell/test/evolution-test-component.h
+++ b/shell/test/evolution-test-component.h
@@ -26,14 +26,12 @@
 #include <bonobo/bonobo-object.h>
 #include "Evolution.h"
 
-
 #define EVOLUTION_TEST_TYPE_COMPONENT			(evolution_test_component_get_type ())
 #define EVOLUTION_TEST_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), EVOLUTION_TEST_TYPE_COMPONENT, EvolutionTestComponent))
 #define EVOLUTION_TEST_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), EVOLUTION_TEST_TYPE_COMPONENT, EvolutionTestComponentClass))
 #define EVOLUTION_TEST_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EVOLUTION_TEST_TYPE_COMPONENT))
 #define EVOLUTION_TEST_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), EVOLUTION_TEST_TYPE_COMPONENT))
 
-
 typedef struct _EvolutionTestComponent        EvolutionTestComponent;
 typedef struct _EvolutionTestComponentPrivate EvolutionTestComponentPrivate;
 typedef struct _EvolutionTestComponentClass   EvolutionTestComponentClass;
@@ -50,7 +48,6 @@ struct _EvolutionTestComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType           evolution_test_component_get_type  (void);
 
 #endif /* _EVOLUTION_TEST_COMPONENT_H_ */