Fix excessive whitespace.

63 files changed, 4 insertions, 183 deletions

diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 960c844aa4..2168d324cc 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -45,7 +45,6 @@ e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
 	relative_uri = e_source_peek_relative_uri (source);
 	g_free (uri_text);
 
-
 	if (relative_uri && *relative_uri) {
 		return NULL;
 	}
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index e0b85f5b89..0ff48d3f69 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -62,7 +62,6 @@ typedef struct {
 	GtkListStore *store;
 } UIData;
 
-
 enum {
 	CLUE_KEYWORD_COLUMN,
 	CLUE_N_COLUMNS
@@ -157,7 +156,6 @@ check_for_attachment_clues (gchar *msg)
 
 	gconf = gconf_client_get_default ();
 
-
 	/* Get the list from gconf */
 	clue_list = gconf_client_get_list ( gconf, GCONF_KEY_ATTACH_REMINDER_CLUES, GCONF_VALUE_STRING, NULL );
 
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index c6a7b94db1..9de5512e0f 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -62,7 +62,6 @@ org_gnome_audio_inline_pobject_free (EMFormatHTMLPObject *o)
 
 	d(printf ("audio inline formatter: pobject free\n"));
 
-
 	if (po->play_button) {
 		g_object_unref (po->play_button);
 		po->play_button = NULL;
@@ -246,7 +245,6 @@ org_gnome_audio_inline_play_clicked (GtkWidget *button, EMFormatHTMLPObject *pob
 		gst_element_set_state (po->playbin, GST_STATE_READY);
 	}
 
-
 	if (po->playbin) {
 		/* start playing */
 		gst_element_set_state (po->playbin, GST_STATE_PLAYING);
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index b4f0d98011..860a70a3d5 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -55,18 +55,18 @@ static void
 backup (const gchar *filename, gboolean restart)
 {
 	if (restart)
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (char *)NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", "--restart", filename, (gchar *)NULL);
 	else
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (char *)NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--backup", filename, (gchar *)NULL);
 }
 
 static void
 restore (const gchar *filename, gboolean restart)
 {
 	if (restart)
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (char *)NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", "--restart", filename, (gchar *)NULL);
 	else
-		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (char *)NULL);
+		execl (EVOLUTION_TOOLSDIR "/evolution-backup", "evolution-backup", "--gui", "--restore", filename, (gchar *)NULL);
 }
 
 static gboolean
@@ -162,7 +162,6 @@ org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
 		dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg));
 		gtk_widget_destroy (dlg);
 
-
 		if (epbr_perform_pre_backup_checks (dir)) {
 
 			mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL);
@@ -310,7 +309,6 @@ backup_restore_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data)
 	gtk_box_pack_start ((GtkBox *)box, hbox, FALSE, FALSE, 0);
 	gtk_widget_set_sensitive (hbox, FALSE);
 
-
 	gtk_container_add ((GtkContainer *) GNOME_DRUID_PAGE_STANDARD (page)->vbox, box);
 	gtk_widget_show_all (box);
 	gnome_druid_append_page (GNOME_DRUID (hook_data->parent), GNOME_DRUID_PAGE (page));
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 1ca9a52dc2..f28593836e 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -80,7 +80,6 @@ static GOptionEntry options[] = {
 
 static gboolean check (const gchar *filename);
 
-
 static GString *
 replace_string (const gchar *text, const gchar *find, const gchar *replace)
 {
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index bb11ab9c6d..81bad245fe 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -448,8 +448,6 @@ add_email_to_contact (EContact *contact, const gchar *email)
 	e_contact_set (contact, E_CONTACT_EMAIL, (gpointer) emails);
 }
 
-
-
 /* Code to implement the configuration user interface follows */
 
 static void
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index 994aab0385..9b35d85c1e 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.h
@@ -31,7 +31,6 @@
 #define GAIM_ADDRESSBOOK 1
 #define AUTOMATIC_CONTACTS_ADDRESSBOOK 0
 
-
 /* How often to poll the buddy list for changes (every two minutes) */
 #define BBDB_BLIST_CHECK_INTERVAL (2 * 60)
 
@@ -43,5 +42,4 @@ gboolean bbdb_check_gaim_enabled (void);
 void bbdb_sync_buddy_list (void);
 void bbdb_sync_buddy_list_check (void);
 
-
 #endif /* __BBDB_H__ */
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 98eb3d05e4..292f5d9fc0 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -174,7 +174,6 @@ bbdb_sync_buddy_list (void)
 
 	}
 
-
 	/* Update the last-sync'd time */
 	{
 		GConfClient *gconf;
@@ -407,7 +406,6 @@ get_buddy_icon_from_setting (xmlNodePtr setting)
 		icon = path;
 	}
 
-
 	return icon;
 }
 
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 7da5584db4..3de8c30955 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -52,7 +52,6 @@
 #include <camel/camel-debug.h>
 #include <gconf/gconf-client.h>
 
-
 #ifndef BOGOFILTER_BINARY
 #define BOGOFILTER_BINARY "/usr/bin/bogofilter"
 #endif
@@ -61,7 +60,6 @@
 
 #define EM_JUNK_BF_GCONF_DIR "/apps/evolution/mail/junk/bogofilter"
 
-
 #define d(x) (camel_debug("junk")?(x):0)
 
 static gboolean enabled = FALSE;
@@ -84,7 +82,6 @@ gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
 
 #define EM_JUNK_BF_GCONF_DIR_LENGTH (G_N_ELEMENTS (em_junk_bf_gconf_dir) - 1)
 
-
 static gboolean em_junk_bf_unicode = TRUE;
 
 static void
@@ -380,4 +377,3 @@ org_gnome_bogo_convert_unicode (struct _EPlugin *epl, struct _EConfigHookItemFac
 	return (GtkWidget *)check;
 }
 
-
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index d28f24a8d4..3407353574 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -462,4 +462,3 @@ oge_caldav  (EPlugin                    *epl,
 	return widget;
 }
 
-
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index 3f2c4635d5..198d2f2671 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -56,7 +56,6 @@ commit_default_book (EPlugin *epl, EConfigTarget *target)
 	if (e_source_get_property (source, "default"))
 		e_book_set_default_source (source, NULL);
 
-
 }
 
 static void
@@ -69,7 +68,6 @@ default_source_changed (GtkWidget *check_box,  ESource *source)
 		e_source_set_property (source, "default", NULL);
 }
 
-
 GtkWidget *
 org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index 026a4dc5e1..5a76df3f08 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -38,7 +38,6 @@
 #include "e-util/e-util.h"
 #include "email-custom-header.h"
 
-
 #define d(x)
 #define GCONF_KEY_CUSTOM_HEADER "/apps/evolution/eplugin/email_custom_header/customHeader"
 
diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h
index 9bba66d655..ac2b8f1204 100644
--- a/plugins/email-custom-header/email-custom-header.h
+++ b/plugins/email-custom-header/email-custom-header.h
@@ -58,7 +58,6 @@ typedef struct {
         GtkWidget *header_value_combo_box;
 } HeaderValueComboBox;
 
-
 struct _CustomHeaderOptionsDialogClass {
 	GObjectClass parent_class;
 	void (* emch_response) (CustomHeaderOptionsDialog *esd, gint status);
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 46f4101bb9..296e44282c 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -80,7 +80,6 @@ CamelServiceAuthType camel_exchange_password_authtype = {
 	TRUE
 };
 
-
 typedef struct {
 	gboolean state;
 	gchar *message;
@@ -297,14 +296,12 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 	}
 	g_signal_connect (radio_oof, "toggled", G_CALLBACK (toggled_state), NULL);
 
-
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (lbl_status), 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_iof), 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
 	gtk_table_attach (tbl_oof_status, GTK_WIDGET (radio_oof), 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
 
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (tbl_oof_status), FALSE, FALSE, 0);
 
-
 	scrwnd_oof = (GtkScrolledWindow*) g_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, "vscrollbar-policy", GTK_POLICY_AUTOMATIC, "shadow-type", GTK_SHADOW_IN, NULL);
 	gtk_box_pack_start (GTK_BOX (vbox_oof), GTK_WIDGET (scrwnd_oof), FALSE, FALSE, 0);
 	txtview_oof = (GtkTextView*) g_object_new (GTK_TYPE_TEXT_VIEW, "justification", GTK_JUSTIFY_LEFT, "wrap-mode", GTK_WRAP_WORD, "editable", TRUE, NULL);
@@ -510,7 +507,6 @@ owa_authenticate_user(GtkWidget *button, EConfig *config)
 
 	camel_url_set_host (url, valid ? exchange_params->host : "");
 
-
 	if (valid)
 		camel_url_set_param (url, "save-passwd", remember_password? "true" : "false");
 
@@ -964,7 +960,6 @@ exchange_authtype_changed (GtkComboBox *dropdown, EConfig *config)
 	camel_url_free(url_transport);
 }
 
-
 GtkWidget *
 org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 4e10acabdd..a45d9bc309 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -177,7 +177,6 @@ finalize (GObject *object)
 
 E2K_MAKE_TYPE (exchange_config_listener, ExchangeConfigListener, class_init, init, PARENT_TYPE)
 
-
 #define EVOLUTION_URI_PREFIX     "evolution:/"
 #define EVOLUTION_URI_PREFIX_LEN (sizeof (EVOLUTION_URI_PREFIX) - 1)
 
@@ -251,7 +250,6 @@ add_defaults_for_account (ExchangeConfigListener *config_listener,
 	}
 }
 
-
 static gboolean
 is_active_exchange_account (EAccount *account)
 {
@@ -355,7 +353,6 @@ add_account_esources (ExchangeAccount *account,
 			g_object_unref (source);
 			g_free (relative_uri);
 
-
 		}
 		else if (folder->type == EXCHANGE_TASKS_FOLDER){
 			relative_uri = g_strdup (folder->uri +
@@ -1281,7 +1278,6 @@ exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *ac
 }
 #endif
 
-
 /**
  * exchange_camel_urls_is_equal
  *
@@ -1331,7 +1327,6 @@ exchange_camel_urls_is_equal (const gchar *url1, const gchar *url2)
 	return TRUE;
 }
 
-
 /**
  * remove_selected_non_offline_esources
  *
@@ -1356,7 +1351,6 @@ remove_selected_non_offline_esources (ExchangeAccount *account, const gchar *gco
 	const gchar *offline_mode=NULL;
 	gchar *selected_gconf_key;
 
-
 	if (gconf_key && !strcmp (gconf_key, CONF_KEY_CAL)) {
 		selected_gconf_key = g_strdup (CONF_KEY_SELECTED_CAL_SOURCES);
 	} else if (gconf_key && !strcmp (gconf_key, CONF_KEY_TASKS)) {
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index aec27f3f69..7fb9f858b6 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -51,7 +51,6 @@ enum {
 gboolean contacts_src_exists = FALSE;
 gchar *contacts_old_src_uri = NULL;
 
-
 static GPtrArray *e_exchange_contacts_get_contacts (void);
 void e_exchange_contacts_pcontacts_on_change (GtkTreeView *treeview, ESource *source);
 GtkWidget *e_exchange_contacts_pcontacts (EPlugin *epl, EConfigHookItemFactoryData *data);
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 085bce398b..bc8cb1e357 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -48,7 +48,6 @@
 
 #include <string.h>
 
-
 #define EXCHANGE_DELEGATES_USER_CUSTOM    -3
 /* Can't use E2K_PERMISSIONS_ROLE_CUSTOM, because it's -1, which
  * means "end of list" to e_dialog_combo_box_get/set
@@ -80,7 +79,6 @@ static const gchar *widget_names[] = {
 	"calendar_perms_combobox", "task_perms_combobox", "inbox_perms_combobox", "contact_perms_combobox",
 };
 
-
 enum {
 	EDITED,
 	LAST_SIGNAL
@@ -193,7 +191,6 @@ em_utils_delegates_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessag
 	mail_send ();
 }
 
-
 /**
  * exchange_delegates_user_edit:
  * @user: a delegate
@@ -281,7 +278,6 @@ exchange_delegates_user_edit (ExchangeAccount *account,
 		}
 	}
 
-
 	/* The following piece of code is used to construct a mail message to be sent to a Delegate
 	   summarizing all the permissions set for him on the user's various folders.
 	*/
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index deb5b04152..3d886d7262 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -76,8 +76,6 @@ ExchangeDelegatesUser *exchange_delegates_user_new_from_gc (E2kGlobalCatalog
 gboolean  exchange_delegates_user_edit (ExchangeAccount  *account, ExchangeDelegatesUser *user,
 					GtkWidget *parent_window);
 
-
-
 G_END_DECLS
 
 #endif /* __EXCHANGE_DELEGATES_USER_H__ */
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index 5ecc02e0b1..7b466ead07 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -280,7 +280,6 @@ get_folder_security (ExchangeDelegates *delegates)
 	return TRUE;
 }
 
-
 static const gchar *delegation_props[] = {
 	PR_DELEGATES_DISPLAY_NAMES,
 	PR_DELEGATES_ENTRYIDS,
@@ -603,7 +602,6 @@ remove_button_clicked_cb (GtkWidget *widget, gpointer data)
 	g_object_unref (user);
 }
 
-
 static gboolean
 proppatch_sd (E2kContext *ctx, ExchangeDelegatesFolder *folder)
 {
@@ -887,7 +885,6 @@ delegates_destroy (ExchangeDelegates *delegates)
 	g_free (delegates);
 }
 
-
 static void
 dialog_response (GtkDialog *dialog, gint response, gpointer user_data)
 {
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index f8772373cb..043d5797e4 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -25,7 +25,6 @@
 #include "config.h"
 #endif
 
-
 #include <glade/glade-xml.h>
 #include <gtk/gtk.h>
 #include <e-util/e-error.h>
@@ -57,7 +56,6 @@ user_clicked (GtkWidget *button, ENameSelector *name_selector)
 	gtk_widget_show (GTK_WIDGET (name_selector_dialog));
 }
 
-
 static GtkWidget *
 setup_name_selector (GladeXML *glade_xml, ENameSelector **name_selector_ret)
 {
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 959bdec8e5..7c9f1bff41 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 #include <gconf/gconf-client.h>
@@ -62,7 +61,6 @@ static void exchange_get_folder (gchar *uri, CamelFolder *folder, gpointer data)
 
 #define CONF_KEY_SELECTED_CAL_SOURCES "/apps/evolution/calendar/display/selected_calendars"
 
-
 static EPopupItem popup_inbox_items[] = {
 	{ E_POPUP_ITEM, (gchar *) "29.inbox_unsubscribe", (gchar *) N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, (gchar *) "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }
 };
@@ -143,7 +141,6 @@ org_gnome_exchange_folder_inbox_unsubscribe (EPopup *ep, EPopupItem *p, gpointer
 	/* To get the CamelStore/Folder */
 	mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push);
 
-
 }
 
 static CamelFolderInfo *
@@ -539,7 +536,6 @@ org_gnome_exchange_folder_unsubscribe (EPopup *ep, EPopupItem *p, gpointer data)
 	unsubscribe_dialog_response (GTK_DIALOG (dialog), response, data);
 }
 
-
 void
 org_gnome_exchange_folder_subscription (EPlugin *ep, EMMenuTargetSelect *target, const gchar *fname)
 {
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 87f851a8c8..4cc582f25f 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -113,7 +113,6 @@ append_to_header (ExchangeSendOptionsDialog *dialog, gint state, gpointer data)
 							dialog->options->delegate_address);
 		}
 
-
 		else {
 			e_msg_composer_remove_header (composer, "Sender");
 			e_msg_composer_add_header (composer, "From", sender_id);
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index 9456754377..d8182a6fe1 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -122,8 +122,6 @@ init (GObject *object)
 
 E2K_MAKE_TYPE (exchange_permissions_dialog, ExchangePermissionsDialog, class_init, init, PARENT_TYPE)
 
-
-
 static void get_widgets         (ExchangePermissionsDialog *dialog,
 				 GladeXML *xml);
 static void setup_user_list     (ExchangePermissionsDialog *dialog);
@@ -300,7 +298,6 @@ dialog_response (ExchangePermissionsDialog *dialog, gint response,
 		gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
-
 static void
 set_permissions (ExchangePermissionsDialog *dialog, guint32 perms)
 {
@@ -313,7 +310,6 @@ set_permissions (ExchangePermissionsDialog *dialog, guint32 perms)
 	dialog->priv->changed = TRUE;
 }
 
-
 /* User list functions */
 
 static void
@@ -518,7 +514,6 @@ setup_user_list (ExchangePermissionsDialog *dialog)
 	g_list_free (sids);
 }
 
-
 /* Role option menu functions */
 
 static void
@@ -577,8 +572,6 @@ display_role (ExchangePermissionsDialog *dialog)
 	gtk_combo_box_set_active (GTK_COMBO_BOX (dialog->priv->role_optionmenu), role);
 }
 
-
-
 /* Toggle buttons */
 static void
 check_toggled (GtkToggleButton *toggle, gpointer user_data)
@@ -691,8 +684,6 @@ display_permissions (ExchangePermissionsDialog *dialog)
 	dialog->priv->frozen = FALSE;
 }
 
-
-
 static void
 get_widgets (ExchangePermissionsDialog *dialog, GladeXML *xml)
 {
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index f41ac85371..131fee0954 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -26,8 +26,6 @@
 
 #include <gtk/gtk.h>
 
-
-
 #define EXCHANGE_TYPE_SENDOPTIONS_DIALOG       (exchange_sendoptions_dialog_get_type ())
 #define EXCHANGE_SENDOPTIONS_DIALOG(obj)       (G_TYPE_CHECK_INSTANCE_CAST ((obj), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialog))
 #define EXCHANGE_SENDOPTIONS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), EXCHANGE_TYPE_SENDOPTIONS_DIALOG, ExchangeSendOptionsDialogClass))
@@ -73,7 +71,6 @@ struct _ExchangeSendOptionsDialog {
 	ExchangeSendOptionsDialogPrivate *priv;
 };
 
-
 struct _ExchangeSendOptionsDialogClass {
 	GObjectClass parent_class;
 	void (* esod_response) (ExchangeSendOptionsDialog *esd, gint status);
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index 3b7602f6e4..6cb20e682d 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -91,8 +91,6 @@ init (E2kUserDialog *dialog)
 
 E2K_MAKE_TYPE (e2k_user_dialog, E2kUserDialog, class_init, init, PARENT_TYPE)
 
-
-
 static void
 parent_window_destroyed (gpointer user_data, GObject *where_parent_window_was)
 {
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index a7f06b62bf..dcd81650f5 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -205,7 +205,6 @@ run_error_dialog (gchar *text)
 	return FALSE;
 }
 
-
 void
 async_external_editor (EMsgComposer *composer)
 {
diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c
index 7005ac7feb..d1b8957fb0 100644
--- a/plugins/folder-unsubscribe/folder-unsubscribe.c
+++ b/plugins/folder-unsubscribe/folder-unsubscribe.c
@@ -38,11 +38,8 @@
 #include "mail/mail-mt.h"
 #include "mail/mail-ops.h"
 
-
 void org_gnome_mail_folder_unsubscribe (EPlugin *plug, EMPopupTargetFolder *target);
 
-
-
 struct _folder_unsub_t {
 	MailMsg base;
 
@@ -94,7 +91,6 @@ static MailMsgInfo unsubscribe_info = {
 	(MailMsgFreeFunc) folder_unsubscribe_free
 };
 
-
 void
 org_gnome_mail_folder_unsubscribe (EPlugin *plug, EMPopupTargetFolder *target)
 {
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index 2253d8a7a0..43f4f14c3f 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -360,4 +360,3 @@ plugin_google_contacts (EPlugin                    *epl,
     return NULL;
 }
 
-
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index 45d21ba762..e0655ce6aa 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -66,8 +66,6 @@ GtkWidget *      plugin_google               (EPlugin                    *epl,
 /*****************************************************************************/
 /* plugin intialization */
 
-
-
 static void
 ensure_google_source_group (void)
 {
@@ -97,7 +95,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 	return 0;
 }
 
-
 /********************************************************************************************************************/
 
 static gboolean
@@ -655,7 +652,6 @@ plugin_google  (EPlugin                    *epl,
 			  row + 2, row + 3,
 			 GTK_EXPAND | GTK_FILL, 0, 0, 0);
 
-
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_widget_show (hbox);
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index a86eeaae9e..957b9da1c8 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -64,7 +64,6 @@ static GObjectClass *parent_class = NULL;
 static void dispose (GObject *object);
 static void finalize (GObject *object);
 
-
 static void
 camel_gw_listener_class_init (CamelGwListenerClass *class)
 {
@@ -197,7 +196,6 @@ add_esource (const gchar *conf_key, GwAccountInfo *info,  const gchar *source_na
 
 	use_ssl = camel_url_get_param (url, "use_ssl");
 
-
 	offline_sync = camel_url_get_param (url, "offline_sync");
 
 	client = gconf_client_get_default();
@@ -210,7 +208,6 @@ add_esource (const gchar *conf_key, GwAccountInfo *info,  const gchar *source_na
 	if (!can_create)
 		e_source_group_set_property (group, "create_source", "no");
 
-
 	relative_uri = g_strdup_printf ("%s@%s/", url->user, poa_address);
 	source = e_source_new (source_name, relative_uri);
 	e_source_set_property (source, "auth", "1");
@@ -327,7 +324,6 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 
 		}
 
-
 	}
 
 	g_object_unref (list);
@@ -410,7 +406,6 @@ modify_esource (const gchar * conf_key, GwAccountInfo *old_account_info, EAccoun
 	camel_url_free (url);
 	g_free (old_relative_uri);
 
-
 }
 /* add sources for calendar and tasks if the account added is groupwise account
    adds the new account info to  groupwise_accounts list */
@@ -427,7 +422,6 @@ add_calendar_tasks_sources (GwAccountInfo *info)
 
 	camel_url_free (url);
 
-
 }
 
 /* removes calendar and tasks sources if the account removed is groupwise account
@@ -682,7 +676,6 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 	GConfClient *client;
 	const gchar *poa_address;
 
-
 	url = camel_url_new (existing_account_info->source_url, NULL);
 	if (url == NULL) {
 		return;
@@ -747,7 +740,6 @@ modify_addressbook_sources ( EAccount *account, GwAccountInfo *existing_account_
 	camel_url_free (url);
 	g_object_unref (client);
 
-
 }
 
 static void
@@ -798,7 +790,6 @@ remove_addressbook_sources (GwAccountInfo *existing_account_info)
 	g_free (base_uri);
 	camel_url_free (url);
 
-
 }
 
 static void
@@ -857,7 +848,6 @@ account_removed (EAccountList *account_listener, EAccount *account)
         g_free (info);
 }
 
-
 static void
 account_changed (EAccountList *account_listener, EAccount *account)
 {
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index 8899b17653..6375446d7e 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -124,7 +124,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 	return 0;
 }
 
-
 GtkWidget * org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
 
 GtkWidget *
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index 4ee5af017e..a5568d3bba 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -64,6 +64,5 @@ GtkWidget *
 e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data)
 {
 
-
 	return NULL;
 }
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index 67b1b5bdee..ef664b48ef 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -108,7 +108,6 @@ install_folder_response (EMFolderSelector *emfs, gint response, gpointer *data)
 
 			if(e_gw_connection_accept_shared_folder (cnc, folder_name, container_id, (gchar *)item_id, NULL) == E_GW_CONNECTION_STATUS_OK) {
 
-
 				folder = camel_store_get_folder (store, "Mailbox", 0, NULL);
 				/*changes = camel_folder_change_info_new ();
 				camel_folder_change_info_remove_uid (changes, (gchar *) item_id);
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 23c3820130..5c8c76928e 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -355,7 +355,6 @@ remove_clicked(GtkButton *button, JunkSettings *js)
 	gtk_list_store_remove (GTK_LIST_STORE (js->model), &(js->iter));
 }
 
-
 static void
 user_selected(GtkTreeSelection *selection, JunkSettings *js)
 {
@@ -438,4 +437,3 @@ junk_settings_new (EGwConnection *ccnc)
 	return (JunkSettings *) new;
 }
 
-
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 9e2920d6ab..9eccc698ec 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -35,7 +35,6 @@
 
 void org_gnome_retract_message (EPlugin *ep, EMPopupTargetSelect *t);
 
-
 static void retract_mail_settings (EPopup *ep, EPopupItem *item, gpointer data)
 {
 	EGwConnection *cnc;
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 05d22bedce..4faaf9bbc6 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -171,4 +171,3 @@ org_gnome_composer_send_options (EPlugin *ep, EMEventTargetComposer *t)
 				  G_CALLBACK (send_options_commit), dialog);
 }
 
-
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 5a8a991288..299b19e3b6 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -34,7 +34,6 @@
 #include <e-util/e-error.h>
 #include <libecal/e-cal.h>
 
-
 typedef struct {
 	ECal *ecal;
 	icalcomponent *icalcomp;
@@ -122,7 +121,6 @@ receive_objects (gpointer data)
 	GError *error = NULL;
 	ReceiveData *r_data = data;
 
-
 	icalcomponent_set_method (r_data->icalcomp, ICAL_METHOD_REQUEST);
 
 	if (!e_cal_receive_objects (r_data->ecal, r_data->icalcomp, &error)) {
@@ -311,7 +309,6 @@ is_meeting_owner (ECalComponent *comp, ECal *client)
 	return ret_val;
 }
 
-
 typedef struct {
 	ECal *client;
 	ECalComponent *comp;
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index d48afaa452..00d851f449 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -272,7 +272,6 @@ proxy_login_get_cnc (EAccount *account, GtkWindow *password_dlg_parrent)
 	return cnc;
 }
 
-
 static void
 proxy_login_cb (GtkDialog *dialog, gint state)
 {
@@ -372,7 +371,6 @@ proxy_soap_login (gchar *email)
 	g_free (password);
 }
 
-
 static void
 proxy_login_add_new_store (gchar *uri, CamelStore *store, gpointer user_data)
 {
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index 7f526f8389..637a13cb2d 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -366,7 +366,6 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 								return 0;
 							}
 
-
 							e_error_run (NULL, "org.gnome.evolution.proxy:user-is-proxy",email ,NULL);
 							return -1;
 						}
@@ -417,7 +416,6 @@ proxy_dialog_store_widgets_data (EAccount *account, gint32 dialog)
 	return 0;
 }
 
-
 static gboolean
 proxy_dialog_initialize_widgets (EAccount *account)
 {
@@ -754,7 +752,6 @@ proxy_page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, E
 			if (e_gw_connection_get_proxy_access_list(prd->cnc, &priv->proxy_list)!= E_GW_CONNECTION_STATUS_OK)
 				return FALSE;
 
-
 			list_iter = priv->proxy_list;
 
 			for (;list_iter; list_iter = g_list_next(list_iter)) {
@@ -787,7 +784,6 @@ proxy_cancel(GtkWidget *button, EAccount *account)
 	g_object_unref (priv->xml);
 }
 
-
 static void
 proxy_add_ok (GtkWidget *button, EAccount *account)
 {
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index ca1b651f2c..0661239e59 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -49,7 +49,6 @@ struct _proxyDialogClass {
 	GObjectClass parent_class;
 };
 
-
 GType proxy_dialog_get_type (void);
 proxyDialog *proxy_dialog_new (void);
 GtkWidget * org_gnome_proxy (EPlugin *epl, EConfigHookItemFactoryData *data);
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index b75d9abebb..16c639b38e 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -103,7 +103,6 @@ get_cnc (GtkWindow *parent_window)
 	return cnc;
 }
 
-
 static void
 e_send_options_load_general_opts (ESendOptionsGeneral *gopts, EGwSendOptionsGeneral *ggopts)
 {
@@ -364,7 +363,6 @@ get_source (ESourceList *list)
 	gchar **temp = g_strsplit (account->source->url, ";", -1);
 	gchar *uri = temp [0];
 
-
 	l = e_source_list_peek_groups (list);
 
 	for (p = l; p != NULL; p = p->next) {
@@ -559,4 +557,3 @@ send_options_abort (EPlugin *epl, EConfigHookItemFactoryData *data)
 	send_options_finalize ();
 }
 
-
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 50bb6fccf3..debb1acaa5 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -353,7 +353,6 @@ org_gnome_create_option(EPlugin *ep, EMPopupTargetFolder *t)
 	gint i = 0;
 	static gint first = 0;
 
-
 	if (! g_strrstr (t->uri, "groupwise://"))
 		return;
 
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index 87404db6bc..29ff8acc8a 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -182,7 +182,6 @@ free_all (ShareFolder *sf)
 	/* e_gw_connection_free_container_list (sf->container_list); */
 }
 
-
 static void
 display_container (EGwContainer *container , ShareFolder *sf)
 {
@@ -297,7 +296,6 @@ get_container_list (ShareFolder *sf)
 	}
 }
 
-
 static void
 shared_clicked (GtkRadioButton *button, ShareFolder *sf)
 {
@@ -349,7 +347,6 @@ add_clicked(GtkButton *button, ShareFolder *sf)
 				return;
 			}
 
-
 			/*check whether already exists*/
 			if (sf->users_list && email){
 				new_user = find_node (sf->users_list, (gchar *)email);
@@ -448,7 +445,6 @@ share_folder (ShareFolder *sf)
 				g_warning("Container is Null");
 			}
 
-
 		} else {
 			if (new_list) {
 				if (e_gw_connection_share_folder (sf->cnc, sf->container_id, new_list, sf->sub, sf->mesg, 0) == E_GW_CONNECTION_STATUS_OK) {
@@ -505,7 +501,6 @@ not_cancel_clicked(GtkButton *button, GtkWidget *window)
 	gtk_widget_destroy(window);
 }
 
-
 static void
 notification_clicked(GtkButton *button, ShareFolder *sf)
 {
@@ -789,4 +784,3 @@ share_folder_new (EGwConnection *ccnc, gchar *id)
 	return (ShareFolder *) new;
 }
 
-
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index d9173e09e2..d1f8fabb34 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -42,7 +42,6 @@
 #include <e-gw-connection.h>
 #include "share-folder.h"
 
-
 void org_gnome_track_status (gpointer ep, EMPopupTargetSelect *t);
 
 static gchar *
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index 04fa4605d2..5bed477a49 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -31,7 +31,6 @@
 #include <libedataserver/e-account.h>
 #include "camel-hula-listener.h"
 
-
 static	GList *hula_accounts = NULL;
 
 struct _CamelHulaListenerPrivate {
@@ -59,7 +58,6 @@ static GObjectClass *parent_class = NULL;
 static void dispose (GObject *object);
 static void finalize (GObject *object);
 
-
 static void
 camel_hula_listener_class_init (CamelHulaListenerClass *class)
 {
@@ -235,7 +233,6 @@ add_esource (const gchar *conf_key, const gchar *group_name,  const gchar *sourc
 	g_free (relative_uri);
 }
 
-
 static void
 remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_name, const gchar * relative_uri)
 {
@@ -294,7 +291,6 @@ remove_esource (const gchar *conf_key, const gchar *group_name, gchar * source_n
 
 		}
 
-
 	}
 
 	g_object_unref (list);
@@ -363,7 +359,6 @@ modify_esource (const gchar * conf_key, HulaAccountInfo *old_account_info, const
 	camel_url_free (url);
 	g_free (old_relative_uri);
 
-
 }
 /* add sources for calendar if the account added is HULA account
    adds the new account info to  HULA accounts list */
@@ -378,7 +373,6 @@ add_calendar_sources (HulaAccountInfo *info)
 
 	camel_url_free (url);
 
-
 }
 
 /* removes calendar  sources if the account removed is HULA account
@@ -457,7 +451,6 @@ account_removed (EAccountList *account_listener, EAccount *account)
         g_free (info);
 }
 
-
 static void
 account_changed (EAccountList *account_listener, EAccount *account)
 {
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index c334019d71..3f5898b724 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -47,7 +47,6 @@ e_plugin_lib_enable (EPluginLib *ep, gint enable)
 	return 0;
 }
 
-
 GtkWidget *
 org_gnome_evolution_hula_account_setup (struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
 {
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index a60bd2dfd3..a381e2a80b 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -69,7 +69,6 @@ ipod_check_status (gboolean silent)
 	if (!libhal_ctx_init(ctx, NULL))
 		return FALSE;
 
-
 	mount_point = find_ipod_mount_point (ctx);
 
 	if (mount_point == NULL) {
diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h
index 8760c43ceb..656cf266f1 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.h
+++ b/plugins/ipod-sync/evolution-ipod-sync.h
@@ -35,4 +35,3 @@ gboolean try_umount (gchar *device);
 gchar *find_ipod_mount_point (LibHalContext *ctx);
 gchar *ipod_get_mount (void);
 
-
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index 7615d6e7cb..f5672ef1d0 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.c
@@ -54,7 +54,6 @@ void org_gnome_sync_tasks (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_sync_addressbook (EPlugin *ep, EABPopupTargetSource *target);
 
-
 static void
 display_error_message (GtkWidget *parent, const gchar *message)
 {
@@ -113,8 +112,6 @@ open_for_writing (GtkWindow *parent, const gchar *uri, GError **error)
 	return NULL;
 }
 
-
-
 static void
 destination_save_addressbook  (EPlugin *ep, EABPopupTargetSource *target)
 {
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index 8c930eb82b..91e99c02e1 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -308,7 +308,6 @@ uri_list_to_vcal_string (GSList *uris, ECalSourceType type)
 			continue;
 		}
 
-
 		e_cal_get_object_list (cal, "#t", &objects, NULL);
 
 		for (o = objects; o != NULL; o = o->next)
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index 558d514f86..c824760409 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -139,7 +139,6 @@ struct _itip_puri {
 
 };
 
-
 void format_itip (EPlugin *ep, EMFormatHookTarget *target);
 GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
 static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri);
@@ -464,7 +463,6 @@ set_buttons_sensitive (struct _itip_puri *pitip)
 	itip_view_set_buttons_sensitive (ITIP_VIEW (pitip->view), pitip->current_ecal != NULL && !read_only);
 }
 
-
 static void
 cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 {
@@ -1493,7 +1491,6 @@ extract_itip_data (struct _itip_puri *pitip, GtkContainer *container, gboolean *
 	ECalComponent *comp;
 	gchar *my_address;
 
-
 	if (!pitip->vcalendar) {
 		set_itip_error (pitip, container,
 				_("The calendar attached is not valid"),
@@ -1921,7 +1918,6 @@ view_response_cb (GtkWidget *widget, ItipViewResponse response, gpointer data)
 		camel_folder_delete_message (pitip->folder, pitip->uid);
 	}
 
-
         if (itip_view_get_rsvp (ITIP_VIEW (pitip->view)) && status) {
                 ECalComponent *comp = NULL;
                 icalcomponent *ical_comp;
@@ -2366,7 +2362,6 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	return TRUE;
 }
 
-
 static void
 puri_free (EMFormatPURI *puri)
 {
@@ -2421,7 +2416,6 @@ puri_free (EMFormatPURI *puri)
 	g_free (pitip->uid);
 }
 
-
 void
 format_itip (EPlugin *ep, EMFormatHookTarget *target)
 {
@@ -2465,7 +2459,6 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 		puri->vcalendar = g_strndup ((gchar *)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
 	camel_object_unref (mem);
 
-
 	camel_stream_printf (target->stream, "<table border=0 width=\"100%%\" cellpadding=3><tr>");
 	camel_stream_printf (target->stream, "<td valign=top><object classid=\"%s\"></object></td><td width=100%% valign=top>", classid);
 	camel_stream_printf (target->stream, "</td></tr></table>");
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 5007bf6541..a5505597a0 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -562,7 +562,6 @@ set_journal_sender_text (ItipView *view)
 	g_free (sender);
 }
 
-
 static void
 set_sender_text (ItipView *view)
 {
@@ -1568,7 +1567,6 @@ itip_view_get_comment (ItipView *view)
 	return priv->comment;
 }
 
-
 void
 itip_view_set_description (ItipView *view, const gchar *description)
 {
@@ -1600,7 +1598,6 @@ itip_view_get_description (ItipView *view)
 	return priv->description;
 }
 
-
 void
 itip_view_set_start (ItipView *view, struct tm *start)
 {
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index a893895949..46b434b65f 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -857,7 +857,6 @@ void org_gnome_mail_read_notify (EPlugin *ep, EMEventTargetMessage *t);
 gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
 GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *epl);
 
-
 void
 org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 {
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 445b5f80bd..39973ba60f 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -97,7 +97,6 @@ void org_credativ_evolution_readpst_import (EImport *ei, EImportTarget *target,
 void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target, EImportImporter *im);
 gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
 
-
 /* em-folder-selection-button.h is private, even though other internal evo plugins use it!
    so declare the functions here
    TODO: sort out whether this should really be private
@@ -211,7 +210,6 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target)
 	target->uri_dest = g_strdup (em_folder_selection_button_get_selection (button));
 }
 
-
 /**
  * Suggest a folder to import data into
  * @param target
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index e1818d7bac..4f618a9438 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -818,7 +818,6 @@ e_plugin_lib_enable (EPlugin *ep, gint enable)
 		GThread *thread = NULL;
 		GError *error = NULL;
 
-
 		client = gconf_client_get_default ();
 		uris = gconf_client_get_list (client, "/apps/evolution/calendar/publish/uris", GCONF_VALUE_STRING, NULL);
 		thread = g_thread_create ((GThreadFunc) publish_uris_set_timeout, uris, FALSE, &error);
diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h
index 4f31ddd5a7..66bd8d5ba2 100644
--- a/plugins/python/python-plugin-loader.h
+++ b/plugins/python/python-plugin-loader.h
@@ -44,5 +44,4 @@ struct _EPluginPythonClass {
 
 gpointer org_gnome_evolution_python_get_type(gpointer a, gpointer b);
 
-
 #endif /* ! _ORG_GNOME_EVOLUTION_PYTHON_H */
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 5736786725..66f5a92f74 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -70,7 +70,6 @@ static void em_junk_sa_init (void);
 static void em_junk_sa_finalize (void);
 static void em_junk_sa_kill_spamd (void);
 
-
 static gboolean em_junk_sa_tested = FALSE;
 static gboolean em_junk_sa_spamd_tested = FALSE;
 static gboolean em_junk_sa_use_spamc = FALSE;
@@ -111,7 +110,6 @@ pipe_to_sa_full (CamelMimeMessage *msg, const gchar *in, const gchar **argv, gin
 	gchar *program;
 	pid_t pid;
 
-
 	if (camel_debug_start ("junk")) {
 		gint i;
 
@@ -298,7 +296,6 @@ em_junk_sa_test_spamd_running (const gchar *binary, gboolean system)
 	return rv;
 }
 
-
 /*
   One time test to see if spamd is running with --allow-tell.  The call
   to spamc should return 0 if it is.  (Thanks to Karsten Bräckelmann
@@ -670,7 +667,6 @@ get_spamassassin_version ()
 			}
 		}
 
-
 		if(out)
 			g_byte_array_free (out, TRUE);
 	}
@@ -928,4 +924,3 @@ org_gnome_sa_use_remote_tests (struct _EPlugin *epl, struct _EConfigHookItemFact
 	return (GtkWidget *)vbox;
 }
 
-
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 4e59b80edd..b296bb9736 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -66,15 +66,12 @@ display_error_message (GtkWidget *parent, GError *error)
 	gtk_widget_destroy (dialog);
 }
 
-
 enum { /* CSV helper enum */
 	ECALCOMPONENTTEXT,
 	ECALCOMPONENTATTENDEE,
 	CONSTCHAR
 };
 
-
-
 /* Some helpers for the csv stuff */
 static GString *
 add_list_to_csv (GString *line, GSList *list_in, CsvConfig *config, gint type)
@@ -202,7 +199,6 @@ string_needsquotes (const gchar *value, CsvConfig *config)
 			needquotes = strstr (value, config->quote) ? TRUE:FALSE;
 	}
 
-
 	/*
 	 * If the special-char is char+onespace (so like {, } {" }, {\n }) and it occurs
 	 * the value that is going to be written
@@ -218,7 +214,6 @@ string_needsquotes (const gchar *value, CsvConfig *config)
 	 * first character of {, } and didn't trust the user).
 	 */
 
-
 	if (!needquotes) {
 		gint len = strlen (config->delimiter);
 		if ((len == 2) && (config->delimiter[1] == ' ')) {
@@ -521,10 +516,6 @@ do_save_calendar_csv (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 	return;
 }
 
-
-
-
-
 static GtkWidget *
 create_options_widget (FormatHandler *handler)
 {
@@ -570,7 +561,6 @@ create_options_widget (FormatHandler *handler)
 
 	gtk_container_add (GTK_CONTAINER (csv_options), vbox);
 
-
 	return csv_options;
 }
 
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index 685fbdd6e5..ff68dfcfe4 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -161,7 +161,6 @@ add_time_to_rdf (xmlNodePtr node, const gchar *tag, icaltimetype *time)
 	}
 }
 
-
 static void
 add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value)
 {
@@ -172,9 +171,6 @@ add_string_to_rdf (xmlNodePtr node, const gchar *tag, const gchar *value)
 	}
 }
 
-
-
-
 static void
 do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource *target, ECalSourceType type, gchar *dest_uri)
 {
@@ -332,7 +328,6 @@ do_save_calendar_rdf (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSource
 			e_cal_component_get_last_modified (comp, &temp_time);
 			add_time_to_rdf (node, "lastModified",temp_time);
 
-
 			/* Important note!
 			 * The documentation is not requiring this!
 			 *
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 6042de7d6f..119009f69e 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -50,7 +50,6 @@ void org_gnome_save_calendar (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_save_tasks (EPlugin *ep, ECalPopupTargetSource *target);
 void org_gnome_save_memos (EPlugin *ep, ECalPopupTargetSource *target);
 
-
 static void
 extra_widget_foreach_hide (GtkWidget *widget, gpointer data)
 {
@@ -74,7 +73,6 @@ on_type_combobox_changed (GtkComboBox *combobox, gpointer data)
 	gtk_tree_model_get (model, &iter,
 		DEST_HANDLER, &handler, -1);
 
-
 	if (handler->options_widget)
 	{
 		gtk_widget_show (handler->options_widget);
@@ -154,7 +152,6 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 		format_handlers = g_list_next (format_handlers);
 	}
 
-
 	g_signal_connect (G_OBJECT(combo), "changed",
 		G_CALLBACK (on_type_combobox_changed), extra_widget);
 
@@ -171,7 +168,6 @@ ask_destination_and_save (EPlugin *ep, ECalPopupTargetSource *target, ECalSource
 	gtk_widget_show (GTK_WIDGET(combo));
 	gtk_widget_show (extra_widget);
 
-
 	if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK) {
 		gchar *tmp = NULL;
 
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 53669ba347..4e03245e54 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -90,7 +90,6 @@ GtkWidget *e_plugin_lib_get_configure_widget	(EPlugin *epl);
 
 gboolean e_plugin_ui_init	(GtkUIManager *ui_manager, EMsgComposer *composer);
 
-
 /* Thanks to attachment reminder plugin for this*/
 static void commit_changes (UIData *ui);
 
@@ -541,7 +540,6 @@ reply_with_template (EPopup *ep, EPopupItem *item, gpointer data)
 	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO,
 			camel_mime_message_get_from (reply_to));
 
-
 	/* Copy the CC and BCC from the template.*/
 	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC,
 			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC));
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index 7bd911646f..597570ed17 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -75,8 +75,6 @@ guchar getRruleCount(guchar a, guchar b);
 guchar getRruleMonthNum(guchar a, guchar b);
 gchar * getRruleDayname(guchar a);
 
-
-
 void
 org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 {
@@ -194,7 +192,6 @@ org_gnome_format_tnef(gpointer ep, EMFormatHookTarget *t)
 	g_free(tmpdir);
 }
 
-
 gint e_plugin_lib_enable(EPluginLib *ep, gint enable);
 
 gint
@@ -477,7 +474,6 @@ void saveVCard(TNEFStruct *tnef) {
             fprintf(fptr,"\n");
         }
 
-
         /* Business Address */
         boolean = 0;
         if ((pobox = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_POST_OFFICE_BOX))) != MAPI_UNDEFINED) {
@@ -632,7 +628,6 @@ void saveVCard(TNEFStruct *tnef) {
             fprintf(fptr,"\n");
         }
 
-
         fprintProperty(tnef, fptr, PT_STRING8, PR_CALLBACK_TELEPHONE_NUMBER, "TEL;X-EVOLUTION-CALLBACK:%s\n");
         fprintProperty(tnef, fptr, PT_STRING8, PR_PRIMARY_TELEPHONE_NUMBER, "TEL;PREF:%s\n");
         fprintProperty(tnef, fptr, PT_STRING8, PR_MOBILE_TELEPHONE_NUMBER, "TEL;CELL:%s\n");
@@ -653,7 +648,6 @@ void saveVCard(TNEFStruct *tnef) {
         fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_FAX_NUMBER, "TEL;WORK;FAX:%s\n");
         fprintProperty(tnef, fptr, PT_STRING8, PR_HOME_FAX_NUMBER, "TEL;HOME;FAX:%s\n");
 
-
         /* Email addresses */
         if ((vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8083))) == MAPI_UNDEFINED) {
             vl=MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x8084));
@@ -680,8 +674,6 @@ void saveVCard(TNEFStruct *tnef) {
         fprintProperty(tnef, fptr, PT_STRING8, PR_BUSINESS_HOME_PAGE, "URL:%s\n");
         fprintUserProp(tnef, fptr, PT_STRING8, 0x80d8, "FBURL:%s\n");
 
-
-
         /* Birthday */
         if ((vl=MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_SYSTIME, PR_BIRTHDAY))) != MAPI_UNDEFINED) {
             fprintf(fptr, "BDAY:");
@@ -1187,7 +1179,6 @@ void saveVTask(TNEFStruct *tnef) {
             fprintf(fptr, "ORGANIZER:%s\n", filename->data);
         }
 
-
         if ((filename = MAPIFindProperty(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, PR_DISPLAY_TO))) != MAPI_UNDEFINED) {
             filename = MAPIFindUserProp(&(tnef->MapiProperties), PROP_TAG(PT_STRING8, 0x811f));
         }
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index c4f7ef9f58..b6d4443d4d 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -286,7 +286,6 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 	gtk_misc_set_alignment(GTK_MISC(section), 0.0, 0.0);
 	gtk_box_pack_start(GTK_BOX(vbox2), section, FALSE, FALSE, 0);
 
-
 	hbox = GTK_BOX(gtk_hbox_new(FALSE, 10));
 	gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0);
 
@@ -311,7 +310,6 @@ plugin_webdav_contacts(EPlugin *epl, EConfigHookItemFactoryData *data)
 	uidata->username_entry = GTK_ENTRY(gtk_entry_new());
 	gtk_box_pack_start(hbox, GTK_WIDGET(uidata->username_entry), TRUE, TRUE, 0);
 
-
 	hbox = GTK_BOX(gtk_hbox_new(FALSE, 10));
 	gtk_box_pack_start(GTK_BOX(vbox2), GTK_WIDGET(hbox), TRUE, TRUE, 0);