[evolution] Fix excessive whitespace.



commit 0274669179600ac77475eed9870d2eab52c2cf14
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Jul 12 23:33:07 2009 -0400

    Fix excessive whitespace.

 a11y/addressbook/ea-addressbook-view.h             |    2 -
 a11y/addressbook/ea-minicard-view.c                |    1 -
 a11y/addressbook/ea-minicard-view.h                |    3 -
 a11y/addressbook/ea-minicard.h                     |    2 -
 a11y/calendar/ea-cal-view-event.c                  |    5 -
 a11y/calendar/ea-cal-view-event.h                  |    1 -
 a11y/calendar/ea-calendar.c                        |    1 -
 a11y/calendar/ea-day-view-cell.c                   |    1 -
 a11y/calendar/ea-day-view-main-item.c              |    1 -
 a11y/calendar/ea-gnome-calendar.h                  |    1 -
 a11y/calendar/ea-jump-button.c                     |    1 -
 a11y/calendar/ea-jump-button.h                     |    1 -
 a11y/calendar/ea-week-view-cell.c                  |    1 -
 a11y/calendar/ea-week-view-main-item.c             |    1 -
 a11y/calendar/ea-week-view.h                       |    1 -
 a11y/e-table/gal-a11y-e-cell-popup.h               |    1 -
 a11y/e-table/gal-a11y-e-cell-registry.c            |    1 -
 a11y/e-table/gal-a11y-e-cell-registry.h            |    1 -
 a11y/e-table/gal-a11y-e-cell-text.c                |   12 --
 a11y/e-table/gal-a11y-e-cell-text.h                |    1 -
 a11y/e-table/gal-a11y-e-cell-toggle.c              |    3 -
 a11y/e-table/gal-a11y-e-cell-toggle.h              |    1 -
 a11y/e-table/gal-a11y-e-cell-tree.h                |    1 -
 a11y/e-table/gal-a11y-e-cell.c                     |    5 -
 a11y/e-table/gal-a11y-e-cell.h                     |    4 -
 .../gal-a11y-e-table-click-to-add-factory.h        |    1 -
 a11y/e-table/gal-a11y-e-table-click-to-add.c       |    6 -
 a11y/e-table/gal-a11y-e-table-column-header.h      |    2 -
 a11y/e-table/gal-a11y-e-table-factory.h            |    1 -
 a11y/e-table/gal-a11y-e-table-item-factory.h       |    1 -
 a11y/e-table/gal-a11y-e-table-item.c               |    7 --
 a11y/e-table/gal-a11y-e-table-item.h               |    1 -
 a11y/e-table/gal-a11y-e-table.h                    |    1 -
 a11y/e-table/gal-a11y-e-tree-factory.h             |    1 -
 a11y/e-table/gal-a11y-e-tree.h                     |    1 -
 a11y/e-text/gal-a11y-e-text-factory.h              |    1 -
 a11y/e-text/gal-a11y-e-text.c                      |   12 --
 a11y/e-text/gal-a11y-e-text.h                      |    1 -
 a11y/widgets/ea-calendar-cell.c                    |    1 -
 a11y/widgets/ea-calendar-item.h                    |    1 -
 a11y/widgets/ea-combo-button.h                     |    1 -
 addressbook/conduit/address-conduit.c              |    1 -
 addressbook/gui/component/addressbook-component.c  |    2 -
 addressbook/gui/component/addressbook-component.h  |    2 -
 addressbook/gui/component/addressbook-config.c     |    3 -
 addressbook/gui/component/addressbook-migrate.c    |    2 -
 addressbook/gui/component/addressbook-view.c       |    1 -
 addressbook/gui/component/addressbook-view.h       |    2 -
 addressbook/gui/component/addressbook.c            |    4 -
 addressbook/gui/component/openldap-extract.h       |    1 -
 .../gui/contact-editor/e-contact-editor-fullname.h |    2 -
 addressbook/gui/contact-editor/e-contact-editor.c  |    9 --
 addressbook/gui/contact-editor/e-contact-editor.h  |    1 -
 .../gui/contact-editor/e-contact-quick-add.c       |    5 -
 addressbook/gui/contact-editor/eab-editor.c        |    1 -
 addressbook/gui/contact-editor/eab-editor.h        |    1 -
 addressbook/gui/merging/eab-contact-compare.c      |    5 -
 addressbook/gui/merging/eab-contact-compare.h      |    2 -
 addressbook/gui/merging/eab-contact-merging.c      |    1 -
 addressbook/gui/widgets/e-addressbook-model.c      |    2 -
 addressbook/gui/widgets/e-addressbook-model.h      |    2 -
 .../gui/widgets/e-addressbook-reflow-adapter.c     |    2 -
 .../gui/widgets/e-addressbook-reflow-adapter.h     |    2 -
 .../gui/widgets/e-addressbook-table-adapter.c      |    1 -
 .../gui/widgets/e-addressbook-table-adapter.h      |    2 -
 addressbook/gui/widgets/e-addressbook-view.c       |    3 -
 addressbook/gui/widgets/e-addressbook-view.h       |    1 -
 addressbook/gui/widgets/e-minicard-label.c         |    1 -
 addressbook/gui/widgets/e-minicard-label.h         |    3 -
 addressbook/gui/widgets/e-minicard-view-widget.c   |    1 -
 addressbook/gui/widgets/e-minicard-view-widget.h   |    2 -
 addressbook/gui/widgets/e-minicard-view.c          |    1 -
 addressbook/gui/widgets/e-minicard-view.h          |    2 -
 addressbook/gui/widgets/e-minicard.c               |    5 -
 addressbook/gui/widgets/e-minicard.h               |    2 -
 addressbook/gui/widgets/eab-contact-display.c      |    5 -
 addressbook/gui/widgets/eab-gui-util.c             |    2 -
 addressbook/gui/widgets/eab-gui-util.h             |    1 -
 addressbook/gui/widgets/eab-popup-control.c        |    2 -
 addressbook/gui/widgets/eab-popup.c                |    4 -
 addressbook/gui/widgets/eab-popup.h                |    1 -
 .../gui/widgets/gal-view-factory-minicard.c        |    1 -
 addressbook/importers/evolution-csv-importer.c     |    2 -
 addressbook/importers/evolution-ldif-importer.c    |    1 -
 addressbook/importers/evolution-vcard-importer.c   |    1 -
 .../evolution-addressbook-export-list-cards.c      |   13 ---
 addressbook/tools/evolution-addressbook-export.h   |    1 -
 addressbook/util/eab-book-util.c                   |    1 -
 calendar/common/authentication.c                   |    1 -
 calendar/conduits/calendar/calendar-conduit.c      |    3 -
 .../conduits/common/libecalendar-common-conduit.h  |    1 -
 calendar/conduits/memo/memo-conduit.c              |    4 -
 calendar/conduits/todo/todo-conduit.c              |    3 -
 calendar/gui/alarm-notify/alarm-notify-dialog.c    |    6 -
 calendar/gui/alarm-notify/alarm-notify.c           |    1 -
 calendar/gui/alarm-notify/alarm-queue.c            |    7 --
 calendar/gui/alarm-notify/alarm-queue.h            |    2 -
 calendar/gui/cal-search-bar.c                      |    4 -
 calendar/gui/calendar-commands.c                   |    3 -
 calendar/gui/calendar-commands.h                   |    1 -
 calendar/gui/calendar-component.c                  |    6 -
 calendar/gui/calendar-component.h                  |    4 -
 calendar/gui/calendar-config-keys.h                |    1 -
 calendar/gui/calendar-config.c                     |   30 ------
 calendar/gui/calendar-config.h                     |    4 -
 calendar/gui/comp-editor-factory.c                 |    2 -
 calendar/gui/comp-util.c                           |    2 -
 calendar/gui/comp-util.h                           |    1 -
 calendar/gui/dialogs/cal-attachment-select-file.c  |    1 -
 calendar/gui/dialogs/cal-prefs-dialog.c            |    5 -
 calendar/gui/dialogs/comp-editor-util.c            |    5 -
 calendar/gui/dialogs/comp-editor-util.h            |    1 -
 calendar/gui/dialogs/comp-editor.c                 |    5 -
 calendar/gui/dialogs/comp-editor.h                 |    1 -
 calendar/gui/dialogs/e-delegate-dialog.c           |    2 -
 calendar/gui/dialogs/e-delegate-dialog.h           |    2 -
 calendar/gui/dialogs/e-send-options-utils.c        |    1 -
 calendar/gui/dialogs/event-page.c                  |    9 --
 calendar/gui/dialogs/memo-page.c                   |    1 -
 calendar/gui/dialogs/recur-comp.c                  |    1 -
 calendar/gui/dialogs/recurrence-page.c             |    1 -
 calendar/gui/dialogs/schedule-page.c               |    1 -
 calendar/gui/dialogs/schedule-page.h               |    1 -
 calendar/gui/dialogs/task-details-page.c           |    2 -
 calendar/gui/dialogs/task-editor.c                 |    1 -
 calendar/gui/dialogs/task-page.c                   |    4 -
 calendar/gui/e-cal-component-memo-preview.c        |    3 -
 calendar/gui/e-cal-component-memo-preview.h        |    1 -
 calendar/gui/e-cal-component-preview.c             |    2 -
 calendar/gui/e-cal-component-preview.h             |    1 -
 calendar/gui/e-cal-list-view.c                     |    1 -
 calendar/gui/e-cal-list-view.h                     |    3 -
 calendar/gui/e-cal-model-memos.c                   |    1 -
 calendar/gui/e-cal-model-tasks.c                   |    2 -
 calendar/gui/e-cal-model.c                         |    4 -
 calendar/gui/e-cal-popup.c                         |    2 -
 calendar/gui/e-calendar-table.c                    |    8 --
 calendar/gui/e-calendar-table.h                    |    4 -
 calendar/gui/e-calendar-view.c                     |    9 --
 calendar/gui/e-cell-date-edit-text.c               |    8 --
 calendar/gui/e-cell-date-edit-text.h               |    1 -
 calendar/gui/e-comp-editor-registry.h              |    2 -
 calendar/gui/e-day-view-config.c                   |    1 -
 calendar/gui/e-day-view-layout.c                   |    8 --
 calendar/gui/e-day-view-layout.h                   |    1 -
 calendar/gui/e-day-view-main-item.c                |   13 ---
 calendar/gui/e-day-view-main-item.h                |    2 -
 calendar/gui/e-day-view-time-item.c                |   10 --
 calendar/gui/e-day-view-time-item.h                |    3 -
 calendar/gui/e-day-view-top-item.c                 |    7 --
 calendar/gui/e-day-view-top-item.h                 |    2 -
 calendar/gui/e-day-view.c                          |  107 --------------------
 calendar/gui/e-day-view.h                          |    6 -
 calendar/gui/e-itip-control.c                      |    6 -
 calendar/gui/e-meeting-attendee.c                  |    2 -
 calendar/gui/e-meeting-list-view.c                 |    7 --
 calendar/gui/e-meeting-list-view.h                 |    1 -
 calendar/gui/e-meeting-store.c                     |    8 --
 calendar/gui/e-meeting-time-sel-item.c             |   23 ----
 calendar/gui/e-meeting-time-sel-item.h             |    4 -
 calendar/gui/e-meeting-time-sel.c                  |   60 -----------
 calendar/gui/e-meeting-time-sel.h                  |   10 --
 calendar/gui/e-meeting-utils.h                     |    1 -
 calendar/gui/e-memo-table.c                        |   10 --
 calendar/gui/e-memo-table.h                        |    4 -
 calendar/gui/e-memos.c                             |    9 --
 calendar/gui/e-memos.h                             |    2 -
 calendar/gui/e-select-names-renderer.c             |    1 -
 calendar/gui/e-tasks.c                             |   10 --
 calendar/gui/e-tasks.h                             |    1 -
 calendar/gui/e-timezone-entry.c                    |   11 --
 calendar/gui/e-timezone-entry.h                    |    2 -
 calendar/gui/e-week-view-event-item.c              |   11 --
 calendar/gui/e-week-view-event-item.h              |    3 -
 calendar/gui/e-week-view-layout.c                  |    6 -
 calendar/gui/e-week-view-main-item.c               |    5 -
 calendar/gui/e-week-view-main-item.h               |    3 -
 calendar/gui/e-week-view-titles-item.c             |    6 -
 calendar/gui/e-week-view-titles-item.h             |    3 -
 calendar/gui/e-week-view.c                         |   52 ----------
 calendar/gui/e-week-view.h                         |    3 -
 calendar/gui/gnome-cal.c                           |   17 ---
 calendar/gui/gnome-cal.h                           |    2 -
 calendar/gui/itip-bonobo-control.c                 |    1 -
 calendar/gui/itip-utils.c                          |    7 --
 calendar/gui/main.c                                |    3 -
 calendar/gui/memos-component.c                     |    2 -
 calendar/gui/memos-component.h                     |    3 -
 calendar/gui/memos-control.c                       |    3 -
 calendar/gui/migration.c                           |    2 -
 calendar/gui/print.c                               |   24 -----
 calendar/gui/tasks-component.c                     |    1 -
 calendar/gui/tasks-component.h                     |    3 -
 calendar/gui/tasks-control.c                       |    4 -
 calendar/gui/weekday-picker.c                      |    1 -
 composer/e-composer-header.c                       |    2 +-
 composer/e-msg-composer.c                          |    1 -
 e-util/e-bconf-map.c                               |    7 --
 e-util/e-bconf-map.h                               |    2 -
 e-util/e-binding.h                                 |    1 -
 e-util/e-bit-array.c                               |    1 -
 e-util/e-bit-array.h                               |    2 -
 e-util/e-dialog-utils.c                            |    1 -
 e-util/e-dialog-utils.h                            |    1 -
 e-util/e-error.c                                   |    1 -
 e-util/e-html-utils.c                              |    1 -
 e-util/e-icon-factory.c                            |    3 -
 e-util/e-import.h                                  |    1 -
 e-util/e-mktemp.c                                  |    2 -
 e-util/e-mktemp.h                                  |    1 -
 e-util/e-pilot-map.c                               |    1 -
 e-util/e-pilot-util.h                              |    1 -
 e-util/e-plugin.h                                  |    2 -
 e-util/e-signature-list.c                          |    8 --
 e-util/e-signature-list.h                          |    1 -
 e-util/e-signature.c                               |    9 --
 e-util/e-signature.h                               |    1 -
 e-util/e-sorter-array.c                            |    1 -
 e-util/e-sorter.c                                  |    5 -
 e-util/e-text-event-processor-emacs-like.h         |    3 -
 e-util/e-text-event-processor.h                    |    2 -
 e-util/e-util-labels.c                             |    1 -
 e-util/e-util.c                                    |    1 -
 e-util/e-xml-utils.h                               |    4 -
 filter/filter-code.c                               |    3 -
 filter/filter-colour.c                             |    1 -
 filter/filter-colour.h                             |    1 -
 filter/filter-datespec.c                           |    1 -
 filter/filter-file.c                               |    3 -
 filter/filter-file.h                               |    1 -
 filter/filter-input.c                              |    2 -
 filter/filter-int.c                                |    2 -
 filter/filter-option.c                             |    2 -
 filter/filter-part.c                               |    4 -
 filter/filter-rule.h                               |    2 -
 filter/rule-context.c                              |    1 -
 filter/rule-editor.c                               |    1 -
 mail/e-searching-tokenizer.c                       |    2 -
 mail/e-searching-tokenizer.h                       |    1 -
 mail/em-account-prefs.c                            |    6 -
 mail/em-account-prefs.h                            |    2 -
 mail/em-composer-utils.c                           |    4 -
 mail/em-config.c                                   |    1 -
 mail/em-event.h                                    |    1 -
 mail/em-filter-editor.c                            |    2 -
 mail/em-filter-source-element.c                    |    4 -
 mail/em-folder-browser.c                           |    6 -
 mail/em-folder-selection-button.h                  |    1 -
 mail/em-folder-selector.c                          |    6 -
 mail/em-folder-tree-model.c                        |   14 ---
 mail/em-folder-tree-model.h                        |    4 -
 mail/em-folder-tree.c                              |    6 -
 mail/em-folder-utils.c                             |    1 -
 mail/em-folder-view.c                              |    4 -
 mail/em-format-hook.c                              |    1 -
 mail/em-format-html-display.c                      |    1 -
 mail/em-format-html.c                              |    3 -
 mail/em-format.h                                   |    1 -
 mail/em-html-stream.h                              |    1 -
 mail/em-inline-filter.c                            |    1 -
 mail/em-mailer-prefs.c                             |    6 -
 mail/em-migrate.c                                  |    3 -
 mail/em-network-prefs.c                            |    2 -
 mail/em-network-prefs.h                            |    1 -
 mail/em-popup.c                                    |    1 -
 mail/em-stripsig-filter.c                          |    5 -
 mail/em-stripsig-filter.h                          |    1 -
 mail/em-subscribe-editor.c                         |    1 -
 mail/em-utils.c                                    |    5 -
 mail/em-vfolder-editor.c                           |    1 -
 mail/em-vfolder-rule.c                             |    1 -
 mail/importers/mail-importer.h                     |    1 -
 mail/mail-autofilter.c                             |    1 -
 mail/mail-component.c                              |    1 -
 mail/mail-config.c                                 |    2 -
 mail/mail-config.h                                 |    2 -
 mail/mail-folder-cache.c                           |    1 -
 mail/mail-mt.c                                     |    2 -
 mail/mail-ops.c                                    |    3 -
 mail/mail-session.c                                |    1 -
 mail/mail-types.h                                  |    1 -
 mail/mail-vfolder.c                                |    2 -
 mail/message-list.c                                |    8 --
 mail/message-tag-editor.c                          |    3 -
 mail/message-tag-editor.h                          |    1 -
 mail/message-tag-followup.c                        |    5 -
 mail/message-tag-followup.h                        |    1 -
 plugins/addressbook-file/addressbook-file.c        |    1 -
 plugins/attachment-reminder/attachment-reminder.c  |    2 -
 plugins/audio-inline/audio-inline.c                |    2 -
 plugins/backup-restore/backup-restore.c            |   10 +-
 plugins/backup-restore/backup.c                    |    1 -
 plugins/bbdb/bbdb.c                                |    2 -
 plugins/bbdb/bbdb.h                                |    2 -
 plugins/bbdb/gaimbuddies.c                         |    2 -
 plugins/bogo-junk-plugin/bf-junk-filter.c          |    4 -
 plugins/caldav/caldav-source.c                     |    1 -
 plugins/default-source/default-source.c            |    2 -
 plugins/email-custom-header/email-custom-header.c  |    1 -
 plugins/email-custom-header/email-custom-header.h  |    1 -
 .../exchange-operations/exchange-account-setup.c   |    5 -
 .../exchange-operations/exchange-config-listener.c |    6 -
 plugins/exchange-operations/exchange-contacts.c    |    1 -
 .../exchange-operations/exchange-delegates-user.c  |    4 -
 .../exchange-operations/exchange-delegates-user.h  |    2 -
 plugins/exchange-operations/exchange-delegates.c   |    3 -
 .../exchange-folder-subscription.c                 |    2 -
 plugins/exchange-operations/exchange-folder.c      |    4 -
 .../exchange-mail-send-options.c                   |    1 -
 .../exchange-permissions-dialog.c                  |    9 --
 .../exchange-operations/exchange-send-options.h    |    3 -
 plugins/exchange-operations/exchange-user-dialog.c |    2 -
 plugins/external-editor/external-editor.c          |    1 -
 plugins/folder-unsubscribe/folder-unsubscribe.c    |    4 -
 .../google-account-setup/google-contacts-source.c  |    1 -
 plugins/google-account-setup/google-source.c       |    4 -
 .../groupwise-account-setup/camel-gw-listener.c    |   10 --
 .../groupwise-account-setup.c                      |    1 -
 plugins/groupwise-features/addressbook-groupwise.c |    1 -
 plugins/groupwise-features/install-shared.c        |    1 -
 plugins/groupwise-features/junk-settings.c         |    2 -
 plugins/groupwise-features/mail-retract.c          |    1 -
 plugins/groupwise-features/mail-send-options.c     |    1 -
 plugins/groupwise-features/process-meeting.c       |    3 -
 plugins/groupwise-features/proxy-login.c           |    2 -
 plugins/groupwise-features/proxy.c                 |    4 -
 plugins/groupwise-features/proxy.h                 |    1 -
 plugins/groupwise-features/send-options.c          |    3 -
 plugins/groupwise-features/share-folder-common.c   |    1 -
 plugins/groupwise-features/share-folder.c          |    6 -
 plugins/groupwise-features/status-track.c          |    1 -
 plugins/hula-account-setup/camel-hula-listener.c   |    7 --
 plugins/hula-account-setup/hula-account-setup.c    |    1 -
 plugins/ipod-sync/evolution-ipod-sync.c            |    1 -
 plugins/ipod-sync/evolution-ipod-sync.h            |    1 -
 plugins/ipod-sync/ipod-sync.c                      |    3 -
 plugins/ipod-sync/sync.c                           |    1 -
 plugins/itip-formatter/itip-formatter.c            |    7 --
 plugins/itip-formatter/itip-view.c                 |    3 -
 plugins/mail-notification/mail-notification.c      |    1 -
 plugins/pst-import/pst-importer.c                  |    2 -
 plugins/publish-calendar/publish-calendar.c        |    1 -
 plugins/python/python-plugin-loader.h              |    1 -
 plugins/sa-junk-plugin/em-junk-filter.c            |    5 -
 plugins/save-calendar/csv-format.c                 |   10 --
 plugins/save-calendar/rdf-format.c                 |    5 -
 plugins/save-calendar/save-calendar.c              |    4 -
 plugins/templates/templates.c                      |    2 -
 plugins/tnef-attachments/tnef-plugin.c             |    9 --
 .../webdav-account-setup/webdav-contacts-source.c  |    2 -
 shell/e-component-registry.c                       |    7 --
 shell/e-component-registry.h                       |    6 -
 shell/e-corba-config-page.c                        |    1 -
 shell/e-shell-importer.c                           |    2 -
 shell/e-shell-nm.c                                 |    2 +-
 shell/e-shell-settings-dialog.c                    |    2 -
 shell/e-shell-window-commands.c                    |    5 -
 shell/e-shell-window.c                             |   12 --
 shell/e-shell-window.h                             |    3 -
 shell/e-shell.c                                    |   10 --
 shell/e-shell.h                                    |    5 -
 shell/e-sidebar.c                                  |   10 --
 shell/e-sidebar.h                                  |    3 -
 shell/e-user-creatable-items-handler.c             |    8 --
 shell/e-user-creatable-items-handler.h             |    2 -
 shell/es-menu.c                                    |    1 -
 shell/evolution-shell-component-utils.c            |    1 -
 shell/importer/evolution-importer.h                |    1 -
 shell/main.c                                       |    6 +-
 shell/test/evolution-test-component.c              |    2 -
 shell/test/evolution-test-component.h              |    3 -
 smime/gui/cert-trust-dialog.c                      |    1 -
 smime/gui/certificate-manager.c                    |    2 -
 smime/lib/e-asn1-object.c                          |    1 -
 smime/lib/e-cert-db.c                              |    1 -
 smime/lib/e-cert-db.h                              |    1 -
 smime/lib/e-cert.c                                 |    3 -
 smime/lib/e-pkcs12.h                               |    1 -
 widgets/e-timezone-dialog/e-timezone-dialog.c      |   13 ---
 widgets/e-timezone-dialog/e-timezone-dialog.h      |    2 -
 widgets/menus/gal-define-views-dialog.h            |    1 -
 widgets/menus/gal-define-views-model.h             |    2 -
 widgets/menus/gal-view-collection.c                |    1 -
 widgets/menus/gal-view-collection.h                |    3 -
 widgets/menus/gal-view-etable.h                    |    1 -
 widgets/menus/gal-view-factory.h                   |    1 -
 widgets/menus/gal-view-instance-save-as-dialog.c   |    2 -
 widgets/menus/gal-view-instance-save-as-dialog.h   |    1 -
 widgets/menus/gal-view-instance.c                  |    1 -
 widgets/menus/gal-view-instance.h                  |    1 -
 widgets/menus/gal-view-menus.c                     |    3 -
 widgets/menus/gal-view-new-dialog.c                |    1 -
 widgets/menus/gal-view-new-dialog.h                |    1 -
 widgets/menus/gal-view.c                           |    1 -
 widgets/menus/gal-view.h                           |    1 -
 widgets/misc/e-activity-handler.c                  |    6 -
 widgets/misc/e-activity-handler.h                  |    2 -
 widgets/misc/e-calendar-item.c                     |   55 ----------
 widgets/misc/e-calendar-item.h                     |    4 -
 widgets/misc/e-calendar.c                          |   18 ----
 widgets/misc/e-calendar.h                          |    2 -
 widgets/misc/e-canvas-background.h                 |    2 -
 widgets/misc/e-canvas-utils.c                      |    2 -
 widgets/misc/e-canvas-vbox.c                       |    1 -
 widgets/misc/e-canvas-vbox.h                       |    2 -
 widgets/misc/e-canvas.c                            |    6 -
 widgets/misc/e-canvas.h                            |    3 -
 widgets/misc/e-cell-date-edit.c                    |   28 -----
 widgets/misc/e-cell-date-edit.h                    |    5 -
 widgets/misc/e-cell-percent.c                      |    1 -
 widgets/misc/e-config-page.c                       |    1 -
 widgets/misc/e-cursors.c                           |    2 -
 widgets/misc/e-dateedit.c                          |   60 -----------
 widgets/misc/e-dropdown-button.c                   |    1 -
 widgets/misc/e-filter-bar.c                        |    7 --
 widgets/misc/e-filter-bar.h                        |    2 -
 widgets/misc/e-gui-utils.c                         |    1 -
 widgets/misc/e-hsv-utils.c                         |    1 -
 widgets/misc/e-icon-entry.c                        |    1 -
 widgets/misc/e-image-chooser.c                     |    3 -
 widgets/misc/e-image-chooser.h                     |    1 -
 widgets/misc/e-map.c                               |   65 ------------
 widgets/misc/e-map.h                               |    1 -
 widgets/misc/e-multi-config-dialog.c               |    6 -
 widgets/misc/e-pilot-settings.c                    |    3 -
 widgets/misc/e-popup-menu.c                        |    1 -
 widgets/misc/e-popup-menu.h                        |    3 -
 widgets/misc/e-printable.c                         |    1 -
 widgets/misc/e-reflow-model.c                      |    2 -
 widgets/misc/e-reflow.c                            |    3 -
 widgets/misc/e-reflow.h                            |    1 -
 widgets/misc/e-search-bar.c                        |    3 -
 widgets/misc/e-search-bar.h                        |    1 -
 widgets/misc/e-selection-model-array.c             |    1 -
 widgets/misc/e-selection-model-array.h             |    1 -
 widgets/misc/e-selection-model.h                   |    3 -
 widgets/misc/e-send-options.c                      |    4 -
 widgets/misc/e-spinner.c                           |    1 -
 widgets/misc/e-task-widget.c                       |    1 -
 widgets/misc/e-unicode.h                           |    1 -
 widgets/misc/e-url-entry.c                         |    3 -
 widgets/misc/test-calendar.c                       |    5 -
 widgets/misc/test-dateedit.c                       |    6 -
 widgets/table/e-cell-combo.c                       |   15 ---
 widgets/table/e-cell-combo.h                       |    2 -
 widgets/table/e-cell-hbox.h                        |    1 -
 widgets/table/e-cell-popup.c                       |   23 ----
 widgets/table/e-cell-popup.h                       |    3 -
 widgets/table/e-cell-text.c                        |   14 ---
 widgets/table/e-cell-text.h                        |    1 -
 widgets/table/e-cell-toggle.c                      |    1 -
 widgets/table/e-cell-toggle.h                      |    1 -
 widgets/table/e-cell-tree.c                        |    3 -
 widgets/table/e-cell-tree.h                        |    2 -
 widgets/table/e-cell-vbox.c                        |    3 -
 widgets/table/e-cell-vbox.h                        |    1 -
 widgets/table/e-table-click-to-add.c               |    1 -
 widgets/table/e-table-config.c                     |    4 -
 widgets/table/e-table-config.h                     |    1 -
 widgets/table/e-table-defines.h                    |    1 -
 widgets/table/e-table-example-2.c                  |    2 -
 widgets/table/e-table-field-chooser-dialog.h       |    3 -
 widgets/table/e-table-field-chooser.h              |    2 -
 widgets/table/e-table-group-container.c            |    6 -
 widgets/table/e-table-group-container.h            |    1 -
 widgets/table/e-table-group-leaf.h                 |    1 -
 widgets/table/e-table-header-item.c                |    2 -
 widgets/table/e-table-header-utils.c               |    1 -
 widgets/table/e-table-item.c                       |    9 --
 widgets/table/e-table-item.h                       |    1 -
 widgets/table/e-table-memory-store.c               |    2 -
 widgets/table/e-table-memory.h                     |    1 -
 widgets/table/e-table-model.c                      |    4 -
 widgets/table/e-table-model.h                      |    2 -
 widgets/table/e-table-one.c                        |    1 -
 widgets/table/e-table-selection-model.h            |    1 -
 widgets/table/e-table-simple.h                     |    1 -
 widgets/table/e-table-sort-info.c                  |    2 -
 widgets/table/e-table-sorted-variable.c            |    1 -
 widgets/table/e-table-sorter.c                     |    3 -
 widgets/table/e-table-sorting-utils.c              |    4 -
 widgets/table/e-table-sorting-utils.h              |    4 -
 widgets/table/e-table-state.c                      |    1 -
 widgets/table/e-table-without.h                    |    1 -
 widgets/table/e-table.c                            |    8 --
 widgets/table/e-tree-memory-callbacks.c            |    2 -
 widgets/table/e-tree-memory-callbacks.h            |    1 -
 widgets/table/e-tree-memory.h                      |    1 -
 widgets/table/e-tree-model.c                       |    1 -
 widgets/table/e-tree-model.h                       |    4 -
 widgets/table/e-tree-selection-model.c             |    3 -
 widgets/table/e-tree-selection-model.h             |    2 -
 widgets/table/e-tree-simple.h                      |    1 -
 widgets/table/e-tree-sorted-variable.c             |    3 -
 widgets/table/e-tree-sorted.c                      |    4 -
 widgets/table/e-tree-sorted.h                      |    1 -
 widgets/table/e-tree-table-adapter.c               |    2 -
 widgets/table/e-tree.c                             |    3 -
 widgets/text/e-text-model-repos.h                  |    4 -
 widgets/text/e-text-model.c                        |    1 -
 widgets/text/e-text-model.h                        |    2 -
 widgets/text/e-text.c                              |   18 ----
 widgets/text/e-text.h                              |    3 -
 503 files changed, 8 insertions(+), 1956 deletions(-)
---
diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h
index 4607746..6179b67 100644
--- a/a11y/addressbook/ea-addressbook-view.h
+++ b/a11y/addressbook/ea-addressbook-view.h
@@ -42,7 +42,6 @@ struct _EaABView
 	GtkAccessible parent;
 };
 
-
 struct _EaABViewClass
 {
 	GtkAccessibleClass parent_class;
@@ -53,5 +52,4 @@ AtkObject* ea_ab_view_new(GObject *obj);
 
 G_END_DECLS
 
-
 #endif /* __EA_ADDRESSBOOK_VIEW_H__ */
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index 7e6fea5..865e855 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -34,7 +34,6 @@ static const gchar * action_name[] = {
 	N_("New Contact List")
 };
 
-
 static G_CONST_RETURN gchar * ea_minicard_view_get_name (AtkObject *accessible);
 static G_CONST_RETURN gchar * ea_minicard_view_get_description (AtkObject *accessible);
 
diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h
index c564dac..cc8eaec 100644
--- a/a11y/addressbook/ea-minicard-view.h
+++ b/a11y/addressbook/ea-minicard-view.h
@@ -34,7 +34,6 @@ G_BEGIN_DECLS
 #define EA_IS_MINICARD_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
 #define EA_IS_MINICARD_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), EA_TYPE_MINICARD_VIEW))
 
-
 typedef struct _EaMinicardView       EaMinicardView;
 typedef struct _EaMinicardViewClass  EaMinicardViewClass;
 
@@ -43,7 +42,6 @@ struct _EaMinicardView
 	AtkGObjectAccessible parent;
 };
 
-
 struct _EaMinicardViewClass
 {
 	AtkGObjectAccessibleClass parent_class;
@@ -55,5 +53,4 @@ AtkObject* ea_minicard_view_new(GObject *obj);
 
 G_END_DECLS
 
-
 #endif /* __EA_MINICARD_VIEW_H__ */
diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h
index 879463b..8b49ab6 100644
--- a/a11y/addressbook/ea-minicard.h
+++ b/a11y/addressbook/ea-minicard.h
@@ -43,7 +43,6 @@ struct _EaMinicard
 	AtkGObjectAccessible parent;
 };
 
-
 struct _EaMinicardClass
 {
 	AtkGObjectAccessibleClass parent_class;
@@ -54,5 +53,4 @@ AtkObject* ea_minicard_new(GObject *obj);
 
 G_END_DECLS
 
-
 #endif /* __EA_MINICARD_H__ */
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 5da1643..5f0af90 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -48,7 +48,6 @@ static gboolean ea_cal_view_event_do_action (AtkAction *action, gint i);
 static gint ea_cal_view_event_get_n_actions (AtkAction *action);
 static G_CONST_RETURN gchar * ea_cal_view_event_action_get_name (AtkAction *action, gint i);
 
-
 #ifdef ACC_DEBUG
 static gint n_ea_cal_view_event_created = 0, n_ea_cal_view_event_destroyed = 0;
 static void ea_cal_view_finalize (GObject *object);
@@ -64,7 +63,6 @@ ea_cal_view_event_get_type (void)
 	GTypeQuery query;
 	GType derived_atk_type;
 
-
 	if (!type) {
 		static GTypeInfo tinfo = {
 			sizeof (EaCalViewEventClass),
@@ -91,7 +89,6 @@ ea_cal_view_event_get_type (void)
                         NULL
                 };
 
-
 		/*
 		 * Figure out the size of the class and instance
 		 * we are run-time deriving from (atk object for E_TEXT, in this case)
@@ -113,7 +110,6 @@ ea_cal_view_event_get_type (void)
                 g_type_add_interface_static (type, ATK_TYPE_ACTION,
                                              &atk_action_info);
 
-
 	}
 
 	return type;
@@ -253,7 +249,6 @@ ea_cal_view_event_get_name (AtkObject *accessible)
 	gchar *summary_string;
         const gchar *summary;
 
-
 	g_return_val_if_fail (EA_IS_CAL_VIEW_EVENT (accessible), NULL);
 
 	atk_gobj = ATK_GOBJECT_ACCESSIBLE (accessible);
diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h
index 548e42b..b4b193d 100644
--- a/a11y/calendar/ea-cal-view-event.h
+++ b/a11y/calendar/ea-cal-view-event.h
@@ -54,5 +54,4 @@ AtkObject *ea_cal_view_event_new (GObject *obj);
 
 G_END_DECLS
 
-
 #endif /* __EA_CAL_VIEW_EVENT_H__ */
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
index fb8d523..0dfb5e5 100644
--- a/a11y/calendar/ea-calendar.c
+++ b/a11y/calendar/ea-calendar.c
@@ -34,7 +34,6 @@
 #include "calendar/ea-week-view-main-item.h"
 #include "calendar/ea-gnome-calendar.h"
 
-
 EA_FACTORY (EA_TYPE_CAL_VIEW, ea_cal_view, ea_cal_view_new)
 EA_FACTORY (EA_TYPE_DAY_VIEW, ea_day_view, ea_day_view_new)
 EA_FACTORY_GOBJECT (EA_TYPE_DAY_VIEW_MAIN_ITEM, ea_day_view_main_item, ea_day_view_main_item_new)
diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c
index bbc92a1..ffc059b 100644
--- a/a11y/calendar/ea-day-view-cell.c
+++ b/a11y/calendar/ea-day-view-cell.c
@@ -258,7 +258,6 @@ ea_day_view_cell_ref_state_set (AtkObject *obj)
   atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y,
 			     &parent_width, &parent_height, ATK_XY_WINDOW);
 
-
   if (x + width < parent_x || x > parent_x + parent_width ||
       y + height < parent_y || y > parent_y + parent_height)
 	  /* the cell is out of the main canvas */
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
index 3bfd56f..89b6f1a 100644
--- a/a11y/calendar/ea-day-view-main-item.c
+++ b/a11y/calendar/ea-day-view-main-item.c
@@ -181,7 +181,6 @@ ea_day_view_main_item_get_type (void)
 			NULL
 		};
 
-
 		/*
 		 * Figure out the size of the class and instance
 		 * we are run-time deriving from (GailCanvasItem, in this case)
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
index b0d2cf7..db9acdb 100644
--- a/a11y/calendar/ea-gnome-calendar.h
+++ b/a11y/calendar/ea-gnome-calendar.h
@@ -56,5 +56,4 @@ const gchar *	ea_gnome_calendar_get_label_description (GnomeCalendar *gcal);
 
 G_END_DECLS
 
-
 #endif /* __EA_GNOME_CALENDAR_H__ */
diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c
index eb24bea..a6775ad 100644
--- a/a11y/calendar/ea-jump-button.c
+++ b/a11y/calendar/ea-jump-button.c
@@ -51,7 +51,6 @@ ea_jump_button_get_type (void)
 	GTypeQuery query;
 	GType derived_atk_type;
 
-
 	if (!type) {
 		static GTypeInfo tinfo = {
 			sizeof (EaJumpButtonClass),
diff --git a/a11y/calendar/ea-jump-button.h b/a11y/calendar/ea-jump-button.h
index cd3b6e2..be0a357 100644
--- a/a11y/calendar/ea-jump-button.h
+++ b/a11y/calendar/ea-jump-button.h
@@ -54,5 +54,4 @@ AtkObject *ea_jump_button_new (GObject *obj);
 
 G_END_DECLS
 
-
 #endif /* __EA_JUMP_BUTTON_H__ */
diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c
index a7248c0..b391ba0 100644
--- a/a11y/calendar/ea-week-view-cell.c
+++ b/a11y/calendar/ea-week-view-cell.c
@@ -270,7 +270,6 @@ ea_week_view_cell_ref_state_set (AtkObject *obj)
   atk_component_get_extents (ATK_COMPONENT (parent), &parent_x, &parent_y,
 			     &parent_width, &parent_height, ATK_XY_WINDOW);
 
-
   if (x + width < parent_x || x > parent_x + parent_width ||
       y + height < parent_y || y > parent_y + parent_height)
 	  /* the cell is out of the main canvas */
diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c
index 74f4695..3d0bd9e 100644
--- a/a11y/calendar/ea-week-view-main-item.c
+++ b/a11y/calendar/ea-week-view-main-item.c
@@ -181,7 +181,6 @@ ea_week_view_main_item_get_type (void)
 			NULL
 		};
 
-
 		/*
 		 * Figure out the size of the class and instance
 		 * we are run-time deriving from (GailCanvasItem, in this case)
diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h
index bb71c17..09409ec 100644
--- a/a11y/calendar/ea-week-view.h
+++ b/a11y/calendar/ea-week-view.h
@@ -55,5 +55,4 @@ AtkObject*     ea_week_view_new         (GtkWidget       *widget);
 
 G_END_DECLS
 
-
 #endif /* __EA_WEEK_VIEW_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
index 7fef5cf..5e056a0 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ b/a11y/e-table/gal-a11y-e-cell-popup.h
@@ -49,7 +49,6 @@ struct _GalA11yECellPopupClass {
 	GalA11yECellClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_cell_popup_get_type   (void);
 AtkObject *gal_a11y_e_cell_popup_new        (ETableItem *item,
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
index 9dc9598..5c741e1 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ b/a11y/e-table/gal-a11y-e-cell-registry.c
@@ -105,7 +105,6 @@ init_default_registry (void)
 	}
 }
 
-
 AtkObject *
 gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
 					 ETableItem               *item,
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
index 0620fd1..85afdad 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ b/a11y/e-table/gal-a11y-e-cell-registry.h
@@ -55,7 +55,6 @@ struct _GalA11yECellRegistryClass {
 	GObjectClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_cell_registry_get_type       (void);
 AtkObject *gal_a11y_e_cell_registry_get_object     (GalA11yECellRegistry     *registry,
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index 77823b0..26fffcb 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -179,7 +179,6 @@ ect_get_character_at_offset (AtkText *text,
 	return ret_val;
 }
 
-
 static gchar *
 ect_get_text_before_offset (AtkText *text,
 			    gint offset,
@@ -191,7 +190,6 @@ ect_get_text_before_offset (AtkText *text,
 	return NULL;
 }
 
-
 static gint
 ect_get_caret_offset (AtkText *text)
 {
@@ -224,7 +222,6 @@ ect_get_run_attributes (AtkText *text,
 	return NULL;
 }
 
-
 static AtkAttributeSet*
 ect_get_default_attributes (AtkText *text)
 {
@@ -232,7 +229,6 @@ ect_get_default_attributes (AtkText *text)
 	return NULL;
 }
 
-
 static void
 ect_get_character_extents (AtkText *text,
 			   gint offset,
@@ -245,7 +241,6 @@ ect_get_character_extents (AtkText *text,
 	/* Unimplemented */
 }
 
-
 static gint
 ect_get_character_count (AtkText *text)
 {
@@ -263,7 +258,6 @@ ect_get_character_count (AtkText *text)
 	return ret_val;
 }
 
-
 static gint
 ect_get_offset_at_point (AtkText *text,
 			 gint x,
@@ -274,7 +268,6 @@ ect_get_offset_at_point (AtkText *text,
 	return 0;
 }
 
-
 static gint
 ect_get_n_selections (AtkText *text)
 {
@@ -293,7 +286,6 @@ ect_get_n_selections (AtkText *text)
 	return 0;
 }
 
-
 static gchar *
 ect_get_selection (AtkText *text,
 		   gint selection_num,
@@ -339,7 +331,6 @@ ect_get_selection (AtkText *text,
 	return ret_val;
 }
 
-
 static gboolean
 ect_add_selection (AtkText *text,
 		   gint start_offset,
@@ -377,7 +368,6 @@ ect_add_selection (AtkText *text,
 	return FALSE;
 }
 
-
 static gboolean
 ect_remove_selection (AtkText *text,
 		      gint selection_num)
@@ -401,7 +391,6 @@ ect_remove_selection (AtkText *text,
 		return FALSE;
 }
 
-
 static gboolean
 ect_set_selection (AtkText *text,
 		   gint selection_num,
@@ -416,7 +405,6 @@ ect_set_selection (AtkText *text,
 		return FALSE;
 }
 
-
 static gboolean
 ect_set_caret_offset (AtkText *text,
 		      gint offset)
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
index 2e469d7..8ccb9c7 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ b/a11y/e-table/gal-a11y-e-cell-text.h
@@ -51,7 +51,6 @@ struct _GalA11yECellTextClass {
 	GalA11yECellClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_cell_text_get_type   (void);
 AtkObject *gal_a11y_e_cell_text_new        (ETableItem *item,
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index df687f4..fa23f6c 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -69,7 +69,6 @@ gal_a11y_e_cell_toggle_get_type (void)
         NULL /* value table */
       };
 
-
       type = g_type_register_static (GAL_A11Y_TYPE_E_CELL,
                                      "GalA11yECellToggle", &tinfo, 0);
       gal_a11y_e_cell_type_add_action_interface (type);
@@ -78,7 +77,6 @@ gal_a11y_e_cell_toggle_get_type (void)
   return type;
 }
 
-
 static void
 gal_a11y_e_cell_toggle_class_init (GalA11yECellToggleClass *klass)
 {
@@ -138,7 +136,6 @@ model_change_cb (ETableModel *etm,
 	}
 }
 
-
 AtkObject*
 gal_a11y_e_cell_toggle_new (ETableItem *item,
 			    ECellView  *cell_view,
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h
index 8e9b4de..3c29d77 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.h
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.h
@@ -60,5 +60,4 @@ AtkObject *gal_a11y_e_cell_toggle_new  (ETableItem *item,
 
 G_END_DECLS
 
-
 #endif /* __GAL_A11Y_E_CELL_TOGGLE_H__ */
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
index 497590b..fa48c14 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ b/a11y/e-table/gal-a11y-e-cell-tree.h
@@ -51,7 +51,6 @@ struct _GalA11yECellTreeClass {
 	GalA11yECellClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_cell_tree_get_type   (void);
 AtkObject *gal_a11y_e_cell_tree_new	   (ETableItem *item,
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index e09b545..211afa4 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -39,7 +39,6 @@
 static GObjectClass *parent_class;
 #define PARENT_TYPE (atk_object_get_type ())
 
-
 #if 0
 static void
 unref_item (gpointer user_data, GObject *obj_loc)
@@ -151,7 +150,6 @@ gal_a11y_e_cell_get_index_in_parent (AtkObject *accessible)
 	return (a11y->row + 1) * a11y->item->cols + a11y->view_col;
 }
 
-
 /* Component IFace */
 static void
 gal_a11y_e_cell_get_extents (AtkComponent *component,
@@ -264,7 +262,6 @@ gal_a11y_e_cell_init (GalA11yECell *a11y)
 	atk_state_set_add_state (a11y->state_set, ATK_STATE_VISIBLE);
 }
 
-
 static ActionInfo *
 _gal_a11y_e_cell_get_action_info (GalA11yECell *cell,
                             gint     index)
@@ -293,7 +290,6 @@ _gal_a11y_e_cell_destroy_action_info (gpointer action_info,
 	g_free (info);
 }
 
-
 gboolean
 gal_a11y_e_cell_add_action ( GalA11yECell * cell,
 			     const gchar *action_name,
@@ -639,6 +635,5 @@ gal_a11y_e_cell_construct (AtkObject  *object,
 	if (cell_view)
 		g_object_ref (G_OBJECT (cell_view));
 
-
 #endif
 }
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
index c61e5e2..4f2e536 100644
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ b/a11y/e-table/gal-a11y-e-cell.h
@@ -39,7 +39,6 @@ typedef struct _GalA11yECellPrivate GalA11yECellPrivate;
 typedef struct _ActionInfo ActionInfo;
 typedef void (*ACTION_FUNC) (GalA11yECell *cell);
 
-
 /* This struct should actually be larger as this isn't what we derive from.
  * The GalA11yECellPrivate comes right after the parent class structure.
  **/
@@ -69,8 +68,6 @@ struct _ActionInfo {
 	ACTION_FUNC do_action_func;
 };
 
-
-
 /* Standard Glib function */
 GType      gal_a11y_e_cell_get_type   (void);
 AtkObject *gal_a11y_e_cell_new        (ETableItem *item,
@@ -109,5 +106,4 @@ gboolean gal_a11y_e_cell_remove_state  (GalA11yECell *cell,
 					AtkStateType state_type,
 					gboolean     emit_signal);
 
-
 #endif /* ! __GAL_A11Y_E_CELL_H__ */
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
index 9f249f0..5321ccd 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.h
@@ -43,7 +43,6 @@ struct _GalA11yETableClickToAddFactoryClass {
 	AtkObjectClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType              gal_a11y_e_table_click_to_add_factory_get_type (void);
 
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.c b/a11y/e-table/gal-a11y-e-table-click-to-add.c
index 8a8fe56..225f24c 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.c
@@ -44,7 +44,6 @@ struct _GalA11yETableClickToAddPrivate {
 	gpointer row;
 };
 
-
 static gint
 etcta_get_n_actions (AtkAction *action)
 {
@@ -70,7 +69,6 @@ etcta_action_get_name (AtkAction *action, gint      i)
 	return NULL;
 }
 
-
 static gboolean
 idle_do_action (gpointer data)
 {
@@ -119,7 +117,6 @@ atk_action_interface_init (AtkActionIface *iface)
 	iface->get_name = etcta_action_get_name;
 }
 
-
 static G_CONST_RETURN gchar *
 etcta_get_name (AtkObject *obj)
 {
@@ -274,7 +271,6 @@ etcta_event (GnomeCanvasItem *item, GdkEvent *e, gpointer data)
 		g_signal_emit_by_name (a11y, "children_changed::add", 0, NULL, NULL);
 	}
 
-
 	priv->rect = etcta->rect;
 	priv->row = etcta->row;
 
@@ -316,13 +312,11 @@ gal_a11y_e_table_click_to_add_new (GObject *widget)
 
 	etcta = E_TABLE_CLICK_TO_ADD(widget);
 
-
 	atk_object_initialize (ATK_OBJECT (a11y), etcta);
 
 	priv->rect = etcta->rect;
 	priv->row = etcta->row;
 
-
 	g_signal_connect_after (G_OBJECT(widget), "event",
 				G_CALLBACK (etcta_event), a11y);
 
diff --git a/a11y/e-table/gal-a11y-e-table-column-header.h b/a11y/e-table/gal-a11y-e-table-column-header.h
index d0b1ff5..0cf0695 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.h
+++ b/a11y/e-table/gal-a11y-e-table-column-header.h
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifndef __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__
 #define __GAL_A11Y_E_TABLE_COLUMN_HEADER_H__
 
@@ -46,7 +45,6 @@ struct _GalA11yETableColumnHeaderClass {
 	AtkGObjectAccessibleClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_table_column_header_get_type  (void);
 AtkObject *gal_a11y_e_table_column_header_new       (ETableCol *etc, ETableItem *item);
diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h
index 3439cf0..f0a1cec 100644
--- a/a11y/e-table/gal-a11y-e-table-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-factory.h
@@ -44,7 +44,6 @@ struct _GalA11yETableFactoryClass {
 	AtkObjectClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType              gal_a11y_e_table_factory_get_type         (void);
 
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.h b/a11y/e-table/gal-a11y-e-table-item-factory.h
index f27c491..5fdf7ce 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.h
@@ -43,7 +43,6 @@ struct _GalA11yETableItemFactoryClass {
 	AtkObjectClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType              gal_a11y_e_table_item_factory_get_type         (void);
 
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index 561b9a8..37f55f6 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -315,7 +315,6 @@ eti_ref_accessible_at_point (AtkComponent *component,
 	}
 }
 
-
 static void
 cell_destroyed (gpointer data)
 {
@@ -344,7 +343,6 @@ eti_ref_at (AtkTable *table, gint row, gint column)
 	if (atk_state_set_contains_state (priv->state_set, ATK_STATE_DEFUNCT))
 		return NULL;
 
-
 	item = E_TABLE_ITEM (eti_a11y_get_gobject (ATK_OBJECT (table)));
 	if (!item)
 		return NULL;
@@ -842,7 +840,6 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 	if (reorder_found)
 		g_signal_emit_by_name (G_OBJECT(a11y_item), "column_reordered");
 
-
 	if (removed_found) {
 		for (i = 0; i < prev_n_cols; i ++ ) {
 			if (prev_state[i] == ETI_HEADER_REMOVED) {
@@ -873,7 +870,6 @@ eti_header_structure_changed (ETableHeader *eth, AtkObject *a11y)
 	priv->columns = cols;
 }
 
-
 static void
 eti_real_initialize (AtkObject *obj,
 		     gpointer data)
@@ -999,7 +995,6 @@ gal_a11y_e_table_item_get_type (void)
 			NULL
 		};
 
-
 		factory = atk_registry_get_factory (atk_get_default_registry (), GNOME_TYPE_CANVAS_ITEM);
 		parent_type = atk_object_factory_get_accessible_type (factory);
 
@@ -1036,7 +1031,6 @@ gal_a11y_e_table_item_new (ETableItem *item)
 	atk_state_set_add_state (GET_PRIVATE(a11y)->state_set, ATK_STATE_SHOWING);
 	atk_state_set_add_state (GET_PRIVATE(a11y)->state_set, ATK_STATE_VISIBLE);
 
-
 	accessible  = ATK_OBJECT(a11y);
 
 	/* Initialize cell data. */
@@ -1122,7 +1116,6 @@ gal_a11y_e_table_item_unref_selection (GalA11yETableItem *a11y)
 	g_return_val_if_fail (priv->selection_change_id != 0, FALSE);
 	g_return_val_if_fail (priv->cursor_change_id != 0, FALSE);
 
-
 	g_signal_handler_disconnect (priv->selection,
 				     priv->selection_change_id);
 	g_signal_handler_disconnect (priv->selection,
diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h
index 27d6a82..87773aa 100644
--- a/a11y/e-table/gal-a11y-e-table-item.h
+++ b/a11y/e-table/gal-a11y-e-table-item.h
@@ -49,7 +49,6 @@ struct _GalA11yETableItemClass {
 	AtkGObjectAccessibleClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_table_item_get_type  (void);
 AtkObject *gal_a11y_e_table_item_new       (ETableItem *item);
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
index d8f972d..ba7c8ad 100644
--- a/a11y/e-table/gal-a11y-e-table.h
+++ b/a11y/e-table/gal-a11y-e-table.h
@@ -49,7 +49,6 @@ struct _GalA11yETableClass {
 	GtkAccessibleClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_table_get_type  (void);
 AtkObject *gal_a11y_e_table_new       (GObject *table);
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h
index 3d97c7a..36b4a61 100644
--- a/a11y/e-table/gal-a11y-e-tree-factory.h
+++ b/a11y/e-table/gal-a11y-e-tree-factory.h
@@ -43,7 +43,6 @@ struct _GalA11yETreeFactoryClass {
 	AtkObjectClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType              gal_a11y_e_tree_factory_get_type         (void);
 
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
index d2aa8a0..ef15dad 100644
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ b/a11y/e-table/gal-a11y-e-tree.h
@@ -48,7 +48,6 @@ struct _GalA11yETreeClass {
 	GtkAccessibleClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_tree_get_type  (void);
 AtkObject *gal_a11y_e_tree_new       (GObject *tree);
diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h
index df7638f..7e7f8e9 100644
--- a/a11y/e-text/gal-a11y-e-text-factory.h
+++ b/a11y/e-text/gal-a11y-e-text-factory.h
@@ -43,7 +43,6 @@ struct _GalA11yETextFactoryClass {
 	AtkObjectFactoryClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType              gal_a11y_e_text_factory_get_type         (void);
 
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
index 99fb4e8..113c503 100644
--- a/a11y/e-text/gal-a11y-e-text.c
+++ b/a11y/e-text/gal-a11y-e-text.c
@@ -419,7 +419,6 @@ et_get_character_at_offset (AtkText *text,
 	return g_utf8_get_char_validated (at_offset, -1);
 }
 
-
 static gchar *
 et_get_text_before_offset (AtkText *text,
 			   gint offset,
@@ -492,7 +491,6 @@ et_get_caret_offset (AtkText *text)
 	return offset;
 }
 
-
 static AtkAttributeSet*
 et_get_run_attributes (AtkText *text,
 		       gint offset,
@@ -503,7 +501,6 @@ et_get_run_attributes (AtkText *text,
 	return NULL;
 }
 
-
 static AtkAttributeSet*
 et_get_default_attributes (AtkText *text)
 {
@@ -511,7 +508,6 @@ et_get_default_attributes (AtkText *text)
 	return NULL;
 }
 
-
 static void
 et_get_character_extents (AtkText *text,
 			  gint offset,
@@ -584,7 +580,6 @@ et_get_character_extents (AtkText *text,
 	}
 }
 
-
 static gint
 et_get_character_count (AtkText *text)
 {
@@ -593,7 +588,6 @@ et_get_character_count (AtkText *text)
 	return g_utf8_strlen (full_text, -1);
 }
 
-
 static gint
 et_get_offset_at_point (AtkText *text,
 			gint x,
@@ -658,7 +652,6 @@ et_get_offset_at_point (AtkText *text,
         return g_utf8_pointer_to_offset (etext->text, etext->text + index + trailing);
 }
 
-
 static gint
 et_get_n_selections (AtkText *text)
 {
@@ -669,7 +662,6 @@ et_get_n_selections (AtkText *text)
 	return 0;
 }
 
-
 static gchar *
 et_get_selection (AtkText *text,
 		  gint selection_num,
@@ -702,7 +694,6 @@ et_get_selection (AtkText *text,
 	return NULL;
 }
 
-
 static gboolean
 et_add_selection (AtkText *text,
 		  gint start_offset,
@@ -741,7 +732,6 @@ et_add_selection (AtkText *text,
 	return FALSE;
 }
 
-
 static gboolean
 et_remove_selection (AtkText *text,
 		     gint selection_num)
@@ -766,7 +756,6 @@ et_remove_selection (AtkText *text,
 	return FALSE;
 }
 
-
 static gboolean
 et_set_selection (AtkText *text,
 		  gint selection_num,
@@ -785,7 +774,6 @@ et_set_selection (AtkText *text,
         return FALSE;
 }
 
-
 static gboolean
 et_set_caret_offset (AtkText *text,
 		     gint offset)
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
index 6a5bb80..ff55bda 100644
--- a/a11y/e-text/gal-a11y-e-text.h
+++ b/a11y/e-text/gal-a11y-e-text.h
@@ -48,7 +48,6 @@ struct _GalA11yETextClass {
 	AtkObject parent_class;
 };
 
-
 /* Standard Glib function */
 GType      gal_a11y_e_text_get_type  (void);
 
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
index ab103bf..4b2f3d2 100644
--- a/a11y/widgets/ea-calendar-cell.c
+++ b/a11y/widgets/ea-calendar-cell.c
@@ -328,7 +328,6 @@ component_interface_get_extents (AtkComponent *component,
 
 	g_return_if_fail (EA_IS_CALENDAR_CELL (component));
 
-
 	g_obj = atk_gobject_accessible_get_object (ATK_GOBJECT_ACCESSIBLE(component));
 	if (!g_obj)
 		/* defunct object*/
diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h
index 36cc671..b5271a9 100644
--- a/a11y/widgets/ea-calendar-item.h
+++ b/a11y/widgets/ea-calendar-item.h
@@ -64,5 +64,4 @@ gint e_calendar_item_get_n_days_from_week_start (ECalendarItem *calitem,
 
 G_END_DECLS
 
-
 #endif /* __EA_CALENDAR_ITEM_H__ */
diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h
index 2b5d0aa..e1482fb 100644
--- a/a11y/widgets/ea-combo-button.h
+++ b/a11y/widgets/ea-combo-button.h
@@ -44,7 +44,6 @@ struct _EaComboButtonClass {
 	GtkAccessibleClass parent_class;
 };
 
-
 /* Standard Glib function */
 GType      ea_combo_button_get_type  (void);
 AtkObject *ea_combo_button_new       (GtkWidget *combo_button);
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index 4bba2a3..d7b9723 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 521551e..9bf6337 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 4208994..e511929 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 c2f8bcb..850a9c6 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 c427274..424a39c 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 e70225b..a048479 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 bdb37e0..38554b7 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 45790e1..7caa545 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 996bf37..2d8c34b 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 6ccd89e..7741b20 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 e2468ee..205f30b 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 c5940d9..cdd9c2e 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 17ef4fb..0f6552b 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 6257e39..19c3d9c 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 c658b10..6d70107 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 6c343be..1e219f0 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 d084619..4fc8ed1 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 6e62248..2b62299 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 7389cdc..965beb7 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 f8b448a..1383da4 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 56f64e1..4a85b69 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 14803e9..0f8eb41 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 f285d76..a081ebb 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 edfb1ad..27bfe0e 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 53cd6aa..7805cb1 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 d8e0b2b..03bdcb5 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 52110bb..414b760 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 df68210..6031b80 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 a48e45c..7a95d5e 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 37bef22..2b01dce 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 9461dca..cf0e511 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 a548c9b..82b8cbb 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 1a021be..41c6ac6 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 64fa90b..033e981 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 40e7552..c7d80b4 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 77481ad..87601d7 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 f29f229..cc7b127 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 78b99cf..28aa819 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 2957c48..30ab08f 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 d1d0ed3..31d0310 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 2e9acca..ee61207 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 9cce21d..6f88bb9 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 8aaad1b..2c8b24c 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 ff6b205..b3b965f 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 5569314..ea3eb7a 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 1d150b3..804bd50 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 599486c..54e95e4 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)
 {
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index a9e2b95..7b0b2e7 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -102,7 +102,6 @@ auth_new_cal_from_default (ECalSourceType type)
 	if (!e_cal_open_default (&ecal, type, auth_func_cb, NULL, NULL))
 		return NULL;
 
-
 	return ecal;
 }
 
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index 668fbe9..2f752e0 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -528,7 +528,6 @@ get_default_timezone (void)
 	key = "/apps/evolution/calendar/display/timezone";
 	location = gconf_client_get_string (client, key, NULL);
 
-
 	if (location == NULL || *location == '\0') {
 		g_free (location);
 		location = g_strdup ("UTC");
@@ -542,7 +541,6 @@ get_default_timezone (void)
 	return timezone;
 }
 
-
 static gchar *
 map_name (ECalConduitContext *ctxt)
 {
@@ -1363,7 +1361,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 							      e_cal_resolve_tzid_cb, client,
 							      timezone);
 
-
 				if (last == elast) {
 					recur.until = icaltime_null_time ();
 					recur.count = erecur->count;
diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h
index 8110fc5..2eeb8b2 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.h
+++ b/calendar/conduits/common/libecalendar-common-conduit.h
@@ -24,7 +24,6 @@
 
 #define PILOT_MAX_CATEGORIES 16
 
-
 gint e_pilot_add_category_if_possible(gchar *cat_to_add, struct CategoryAppInfo *category);
 void e_pilot_local_category_to_remote(gint * pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
 void e_pilot_remote_category_to_local(gint   pilotCategory, ECalComponent *comp, struct CategoryAppInfo *category);
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 48a8f59..ae45e82 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -117,7 +117,6 @@ memoconduit_load_configuration (guint32 pilot_id)
 	GnomePilotConduitConfig *config;
 	gchar prefix[256];
 
-
 	g_snprintf (prefix, 255, "e-memo-conduit/Pilot_%u", pilot_id);
 
 	c = g_new0 (EMemoConduitCfg,1);
@@ -637,7 +636,6 @@ local_record_from_uid (EMemoLocalRecord *local,
 	g_clear_error (&error);
 }
 
-
 static ECalComponent *
 comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 			 GnomePilotRecord *remote,
@@ -737,7 +735,6 @@ comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 		free(txt3);
 	}
 
-
 	e_cal_component_set_transparency (comp, E_CAL_COMPONENT_TRANSP_NONE);
 
 	if (remote->secret)
@@ -955,7 +952,6 @@ post_sync (GnomePilotConduit *conduit,
 		return -1;
 	}
 
-
 	LOG (g_message ( "post_sync: Memo Conduit v.%s", CONDUIT_VERSION ));
 
 	g_free (ctxt->cfg->last_uri);
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index d72e85f..42e79d7 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -119,7 +119,6 @@ todoconduit_load_configuration (guint32 pilot_id)
 	GnomePilotConduitConfig *config;
 	gchar prefix[256];
 
-
 	g_snprintf (prefix, 255, "e-todo-conduit/Pilot_%u", pilot_id);
 
 	c = g_new0 (EToDoConduitCfg,1);
@@ -806,7 +805,6 @@ local_record_from_uid (EToDoLocalRecord *local,
 	g_clear_error (&error);
 }
 
-
 static ECalComponent *
 comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,
 			 GnomePilotRecord *remote,
@@ -1142,7 +1140,6 @@ post_sync (GnomePilotConduit *conduit,
 		return -1;
 	}
 
-
 	LOG (g_message ( "post_sync: ToDo Conduit v.%s", CONDUIT_VERSION ));
 
 	g_free (ctxt->cfg->last_uri);
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 9e9aa00..e499e43 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -34,8 +34,6 @@
 #include "util.h"
 #include "e-util/e-util-private.h"
 
-
-
 enum {
 	ALARM_DISPLAY_COLUMN,
 	ALARM_SUMMARY_COLUMN,
@@ -331,7 +329,6 @@ notified_alarms_dialog_new (void)
 	g_signal_connect (G_OBJECT (an->snooze_time_hrs), "value_changed",
 			G_CALLBACK (an_update_hrs_label), an);
 
-
 	na = g_new0 (AlarmNotificationsDialog, 1);
 
 	na->treeview = an->treeview;
@@ -340,7 +337,6 @@ notified_alarms_dialog_new (void)
 	return na;
 }
 
-
 /**
  * add_alarm_to_notified_alarms_dialog:
  * @na: Pointer to the dialog-info
@@ -438,8 +434,6 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer user_data)
 	}
 }
 
-
-
 static void
 fill_in_labels (AlarmNotify *an, const gchar *summary, const gchar *description,
 		const gchar *location, time_t occur_start, time_t occur_end)
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index e05c6e6..62679bb 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -53,7 +53,6 @@ static void alarm_notify_class_init (AlarmNotifyClass *klass);
 static void alarm_notify_init (AlarmNotify *an, AlarmNotifyClass *klass);
 static void alarm_notify_finalize (GObject *object);
 
-
 static BonoboObjectClass *parent_class;
 
 
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 180542e..e06b75b 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -39,7 +39,6 @@
 #include <libecal/e-cal-time-util.h>
 #include <libecal/e-cal-component.h>
 
-
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
@@ -1345,8 +1344,6 @@ tray_icon_clicked_cb (GtkWidget *widget, GdkEventButton *event, gpointer user_da
 				g_source_remove (tray_blink_id);
 			tray_blink_id = -1;
 
-
-
 			gtk_status_icon_set_visible (tray_icon, FALSE);
 			g_object_unref (tray_icon);
 			tray_icon = NULL;
@@ -1407,7 +1404,6 @@ tray_icon_blink_cb (gpointer data)
 	return tray_blink_countdown > 0;
 }
 
-
 /* Add a new data to tray list */
 
 static void
@@ -1580,7 +1576,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	e_cal_component_get_summary (comp, &text);
 	e_cal_component_get_organizer (comp, &organiser);
 
-
 	if (text.value)
 		summary = text.value;
 	else
@@ -1623,7 +1618,6 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 	g_free (time_str);
 	g_free (str);
 
-
 }
 #endif
 
@@ -2057,7 +2051,6 @@ remove_comp_by_id (gpointer key, gpointer value, gpointer userdata) {
 	return TRUE;
 }
 
-
 /* Removes all the alarms queued for a particular calendar client */
 static void
 remove_client_alarms (ClientAlarms *ca)
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
index 9a2e11c..c594e12 100644
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ b/calendar/gui/alarm-notify/alarm-queue.h
@@ -28,12 +28,10 @@
 
 #include <libecal/e-cal.h>
 
-
 void alarm_queue_init (gpointer);
 void alarm_queue_done (void);
 
 void alarm_queue_add_client (ECal *client);
 void alarm_queue_remove_client (ECal *client, gboolean immediately);
 
-
 #endif
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 424db0d..918338b 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -57,7 +57,6 @@ static ESearchBarItem calendar_search_items[] = {
 	{NULL, -1, 0}
 };
 
-
 /* IDs and option items for the ESearchBar */
 enum {
 	SEARCH_SUMMARY_CONTAINS,
@@ -134,7 +133,6 @@ enum {
 
 static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };
 
-
 G_DEFINE_TYPE (CalSearchBar, cal_search_bar, E_FILTER_BAR_TYPE)
 
 /* Class initialization function for the calendar search bar */
@@ -280,7 +278,6 @@ get_current_category (CalSearchBar *cal_search)
 		return NULL;
 }
 
-
 /* Returns a sexp for the selected category in the drop-down menu.  The "All"
  * option is returned as (const gchar *) 1, and the "Unfiled" option is returned
  * as NULL.
@@ -605,7 +602,6 @@ setup_category_options (CalSearchBar *cal_search, CALSearchBarItem *subitems, gi
 	subitems[index].image = NULL;
 }
 
-
 /* Creates the suboptions menu for the ESearchBar with the list of categories */
 static void
 make_suboptions (CalSearchBar *cal_search)
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 9b665ce..7edf38d 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -76,7 +76,6 @@ file_open_event_cb (BonoboUIComponent *uic, gpointer data, const gchar *path)
 	e_calendar_view_open_event (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)));
 }
 
-
 /* Prints the calendar at its current view and time range */
 void
 calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action)
@@ -225,7 +224,6 @@ show_month_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *pat
 	gnome_calendar_set_view (gcal, GNOME_CAL_MONTH_VIEW);
 }
 
-
 static void
 show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
@@ -236,7 +234,6 @@ show_list_view_clicked (BonoboUIComponent *uic, gpointer data, const gchar *path
 	gnome_calendar_set_view (gcal, GNOME_CAL_LIST_VIEW);
 }
 
-
 static void
 cut_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 {
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
index b1c093f..6052303 100644
--- a/calendar/gui/calendar-commands.h
+++ b/calendar/gui/calendar-commands.h
@@ -41,5 +41,4 @@ void calendar_goto_today (GnomeCalendar *gcal);
 
 void calendar_command_print (GnomeCalendar *gcal, GtkPrintOperationAction action);
 
-
 #endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 5fbf031..625321a 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -307,7 +307,6 @@ ensure_sources (CalendarComponent *component)
 	g_free (base_uri);
 }
 
-
 /* Utility functions.  */
 
 static gboolean
@@ -844,7 +843,6 @@ config_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en
 	update_task_memo_selection (data, E_CAL_SOURCE_TYPE_TODO);
 }
 
-
 static void
 config_primary_tasks_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -857,7 +855,6 @@ config_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *en
 	update_task_memo_selection (data, E_CAL_SOURCE_TYPE_JOURNAL);
 }
 
-
 static void
 config_primary_memos_selection_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -1025,7 +1022,6 @@ control_activate_cb (BonoboControl *control, gboolean activate, gpointer data)
 	}
 }
 
-
 static void
 config_create_ecal_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpointer data)
 {
@@ -1421,7 +1417,6 @@ impl_createView (PortableServer_Servant servant,
 	return BONOBO_OBJREF(ecv);
 }
 
-
 static GNOME_Evolution_CreatableItemTypeList *
 impl__get_userCreatableItems (PortableServer_Servant servant,
 			      CORBA_Environment *ev)
@@ -1614,7 +1609,6 @@ calendar_component_init (CalendarComponent *component)
 	e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL);
 }
 
-
 /* Public API.  */
 
 CalendarComponent *
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index 851c4c3..480b0c4 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -23,20 +23,17 @@
 #ifndef _CALENDAR_COMPONENT_H_
 #define _CALENDAR_COMPONENT_H_
 
-
 #include <bonobo/bonobo-object.h>
 #include <libedataserver/e-source-list.h>
 #include <widgets/misc/e-activity-handler.h>
 #include "Evolution.h"
 
-
 #define CALENDAR_TYPE_COMPONENT			(calendar_component_get_type ())
 #define CALENDAR_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), CALENDAR_TYPE_COMPONENT, CalendarComponent))
 #define CALENDAR_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), CALENDAR_TYPE_COMPONENT, CalendarComponentClass))
 #define CALENDAR_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
 #define CALENDAR_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), CALENDAR_TYPE_COMPONENT))
 
-
 typedef struct _CalendarComponent        CalendarComponent;
 typedef struct _CalendarComponentPrivate CalendarComponentPrivate;
 typedef struct _CalendarComponentClass   CalendarComponentClass;
@@ -53,7 +50,6 @@ struct _CalendarComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType calendar_component_get_type  (void);
 
 CalendarComponent *calendar_component_peek  (void);
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 37724a5..9b2bd1c 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -82,7 +82,6 @@ G_BEGIN_DECLS
 #define CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS CALENDAR_CONFIG_PREFIX "/memos/selected_memos"
 #define CALENDAR_CONFIG_PRIMARY_MEMOS CALENDAR_CONFIG_PREFIX "/memos/primary_memos"
 
-
 /* Prompt settings */
 #define CALENDAR_CONFIG_PROMPT_DELETE CALENDAR_CONFIG_PREFIX "/prompts/confirm_delete"
 #define CALENDAR_CONFIG_PROMPT_PURGE CALENDAR_CONFIG_PREFIX "/prompts/confirm_purge"
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 02b051a..f1730d5 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -167,7 +167,6 @@ calendar_config_set_primary_calendar (const gchar *primary_uid)
 	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_CALENDAR, primary_uid, NULL);
 }
 
-
 guint
 calendar_config_add_notification_primary_calendar (GConfClientNotifyFunc func, gpointer data)
 {
@@ -288,7 +287,6 @@ calendar_config_get_24_hour_format	(void)
 	return TRUE;
 }
 
-
 void
 calendar_config_set_24_hour_format	(gboolean     use_24_hour)
 {
@@ -409,7 +407,6 @@ calendar_config_set_show_categories (gboolean	status)
 	gconf_client_set_bool (config, CALENDAR_CONFIG_SHOW_CATEGORIES, status, NULL);
 }
 
-
 /* The start day of the week (0 = Sun to 6 = Mon). */
 gint
 calendar_config_get_week_start_day	(void)
@@ -419,7 +416,6 @@ calendar_config_get_week_start_day	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_WEEK_START, NULL);
 }
 
-
 void
 calendar_config_set_week_start_day	(gint	      week_start_day)
 {
@@ -449,7 +445,6 @@ calendar_config_get_day_start_hour	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_HOUR, NULL);
 }
 
-
 void
 calendar_config_set_day_start_hour	(gint	      day_start_hour)
 {
@@ -478,7 +473,6 @@ calendar_config_get_day_start_minute	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_START_MINUTE, NULL);
 }
 
-
 void
 calendar_config_set_day_start_minute	(gint	      day_start_min)
 {
@@ -507,7 +501,6 @@ calendar_config_get_day_end_hour	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_HOUR, NULL);
 }
 
-
 void
 calendar_config_set_day_end_hour	(gint	      day_end_hour)
 {
@@ -536,7 +529,6 @@ calendar_config_get_day_end_minute	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_DAY_END_MINUTE, NULL);
 }
 
-
 void
 calendar_config_set_day_end_minute	(gint	      day_end_min)
 {
@@ -566,7 +558,6 @@ calendar_config_get_time_divisions	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_TIME_DIVISIONS, NULL);
 }
 
-
 void
 calendar_config_set_time_divisions	(gint	      divisions)
 {
@@ -637,7 +628,6 @@ calendar_config_get_marcus_bains (gboolean *show_line, const gchar **dayview_col
 	*timebar_color = tcolor;
 }
 
-
 void
 calendar_config_add_notification_marcus_bains (GConfClientNotifyFunc func, gpointer data, gint *not_show, gint *not_dcolor, gint *not_tcolor)
 {
@@ -657,7 +647,6 @@ calendar_config_get_dview_show_week_no (void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_DV_WEEK_NUMBER, NULL);
 }
 
-
 void
 calendar_config_set_dview_show_week_no (gboolean show_week_no)
 {
@@ -687,7 +676,6 @@ calendar_config_get_dnav_show_week_no	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_DN_SHOW_WEEK_NUMBERS, NULL);
 }
 
-
 void
 calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)
 {
@@ -717,7 +705,6 @@ calendar_config_get_hpane_pos		(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_HPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_hpane_pos		(gint	      hpane_pos)
 {
@@ -726,7 +713,6 @@ calendar_config_set_hpane_pos		(gint	      hpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_HPANE_POS, hpane_pos, NULL);
 }
 
-
 gint
 calendar_config_get_vpane_pos		(void)
 {
@@ -735,7 +721,6 @@ calendar_config_get_vpane_pos		(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_vpane_pos		(gint	      vpane_pos)
 {
@@ -752,7 +737,6 @@ calendar_config_get_preview_state		(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASK_PREVIEW, NULL);
 }
 
-
 void
 calendar_config_set_preview_state		(gboolean state)
 {
@@ -781,7 +765,6 @@ calendar_config_get_month_hpane_pos	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
 {
@@ -790,7 +773,6 @@ calendar_config_set_month_hpane_pos	(gint	      hpane_pos)
 	gconf_client_set_int (config, CALENDAR_CONFIG_MONTH_HPANE_POS, hpane_pos, NULL);
 }
 
-
 gint
 calendar_config_get_month_vpane_pos	(void)
 {
@@ -799,7 +781,6 @@ calendar_config_get_month_vpane_pos	(void)
 	return  gconf_client_get_int (config, CALENDAR_CONFIG_MONTH_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_month_vpane_pos	(gint	      vpane_pos)
 {
@@ -816,7 +797,6 @@ calendar_config_get_tag_vpane_pos	(void)
 	return  gconf_client_get_float (config, CALENDAR_CONFIG_TAG_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_tag_vpane_pos	(gfloat	      vpane_pos)
 {
@@ -871,7 +851,6 @@ calendar_config_set_primary_tasks (const gchar *primary_uid)
 	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_TASKS, primary_uid, NULL);
 }
 
-
 guint
 calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc func, gpointer data)
 {
@@ -892,7 +871,6 @@ calendar_config_get_task_vpane_pos	(void)
 	return  gconf_client_get_int (config, CALENDAR_CONFIG_TASK_VPANE_POS, NULL);
 }
 
-
 void
 calendar_config_set_task_vpane_pos	(gint	      vpane_pos)
 {
@@ -949,7 +927,6 @@ calendar_config_set_primary_memos (const gchar *primary_uid)
 	gconf_client_set_string (config, CALENDAR_CONFIG_PRIMARY_MEMOS, primary_uid, NULL);
 }
 
-
 guint
 calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data)
 {
@@ -972,7 +949,6 @@ calendar_config_get_compress_weekend	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_COMPRESS_WEEKEND, NULL);
 }
 
-
 void
 calendar_config_set_compress_weekend	(gboolean     compress)
 {
@@ -1002,7 +978,6 @@ calendar_config_get_show_event_end	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_SHOW_EVENT_END, NULL);
 }
 
-
 void
 calendar_config_set_show_event_end	(gboolean     show_end)
 {
@@ -1032,7 +1007,6 @@ calendar_config_get_working_days	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_WORKING_DAYS, NULL);
 }
 
-
 void
 calendar_config_set_working_days	(CalWeekdays  days)
 {
@@ -1062,7 +1036,6 @@ calendar_config_get_hide_completed_tasks	(void)
 	return gconf_client_get_bool (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED, NULL);
 }
 
-
 void
 calendar_config_set_hide_completed_tasks	(gboolean	hide)
 {
@@ -1105,7 +1078,6 @@ calendar_config_get_hide_completed_tasks_units	(void)
 	return cu;
 }
 
-
 void
 calendar_config_set_hide_completed_tasks_units	(CalUnits	cu)
 {
@@ -1149,7 +1121,6 @@ calendar_config_get_hide_completed_tasks_value	(void)
 	return gconf_client_get_int (config, CALENDAR_CONFIG_TASKS_HIDE_COMPLETED_VALUE, NULL);
 }
 
-
 void
 calendar_config_set_hide_completed_tasks_value	(gint		value)
 {
@@ -1232,7 +1203,6 @@ calendar_config_set_confirm_purge (gboolean confirm)
 	gconf_client_set_bool (config, CALENDAR_CONFIG_PROMPT_PURGE, confirm, NULL);
 }
 
-
 /**
  * calendar_config_get_tasks_due_today_color:
  * @color: the location to store the color
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index c7f0556..a009ed7 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -47,7 +47,6 @@ typedef enum
 	CAL_SATURDAY	= 1 << 6
 } CalWeekdays;
 
-
 /* Units for settings. */
 typedef enum
 {
@@ -56,7 +55,6 @@ typedef enum
 	CAL_MINUTES
 } CalUnits;
 
-
 void calendar_config_remove_notification (guint id);
 
 /*
@@ -135,7 +133,6 @@ void	  calendar_config_set_show_categories (gboolean	status);
 gboolean calendar_config_get_show_role	(void);
 void calendar_config_set_show_role	(gboolean state);
 
-
 /* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */
 gint	  calendar_config_get_time_divisions	(void);
 void	  calendar_config_set_time_divisions	(gint	      divisions);
@@ -199,7 +196,6 @@ guint	  calendar_config_add_notification_primary_tasks (GConfClientNotifyFunc fu
 gint      calendar_config_get_task_vpane_pos    (void);
 void      calendar_config_set_task_vpane_pos    (gint         vpane_pos);
 
-
 /* The current list of memo lists selected */
 GSList   *calendar_config_get_memos_selected (void);
 void	  calendar_config_set_memos_selected (GSList *selected);
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index 6a1c717..ee80a00 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -263,7 +263,6 @@ edit_existing (OpenClient *oc, const gchar *uid)
 	if (itip_organizer_is_user (comp, oc->client))
 		flags |= COMP_EDITOR_USER_ORG;
 
-
 	switch (vtype) {
 	case E_CAL_COMPONENT_EVENT:
 		if (e_cal_component_has_attendees (comp))
@@ -641,4 +640,3 @@ comp_editor_factory_new (void)
 	return g_object_new (TYPE_COMP_EDITOR_FACTORY, NULL);
 }
 
-
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index cb3cf95..30af43f 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -66,8 +66,6 @@ cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone)
 	e_cal_component_free_exdate_list (list);
 }
 
-
-
 /* Returns TRUE if the TZIDs are equivalent, i.e. both NULL or the same. */
 static gboolean
 e_cal_component_compare_tzid (const gchar *tzid1, const gchar *tzid2)
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index de65956..d46fcb7 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -31,7 +31,6 @@
 
 void cal_comp_util_add_exdate (ECalComponent *comp, time_t t, icaltimezone *zone);
 
-
 /* Returns TRUE if the component uses the given timezone for both DTSTART
    and DTEND, or if the UTC offsets of the start and end times are the same
    as in the given zone. */
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index b33753c..b303a76 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -25,7 +25,6 @@
  * specific to the calendar component have been flagged by some comments
  * fwiw */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index db3a5ae..2c19aca 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -58,8 +58,6 @@ static GtkVBoxClass *parent_class = NULL;
 
 GtkWidget *cal_prefs_dialog_create_time_edit (void);
 
-
-
 static void
 calendar_prefs_dialog_finalize (GObject *obj)
 {
@@ -572,7 +570,6 @@ setup_changes (CalendarPrefsDialog *prefs)
 	g_signal_connect (G_OBJECT (prefs->notify_with_tray), "toggled", G_CALLBACK (notify_with_tray_toggled), prefs);
 	g_signal_connect (G_OBJECT (prefs->alarm_list_widget), "selection_changed", G_CALLBACK (alarms_selection_changed), prefs);
 
-
 	g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs);
 }
 
@@ -712,7 +709,6 @@ show_config (CalendarPrefsDialog *prefs)
 	gtk_widget_set_sensitive (prefs->use_12_hour, sensitive);
 	gtk_widget_set_sensitive (prefs->use_24_hour, sensitive);
 
-
 	/* Time Divisions. */
 	time_divisions = calendar_config_get_time_divisions ();
 	e_dialog_combo_box_set (prefs->time_divisions, time_divisions, time_division_map);
@@ -852,7 +848,6 @@ calendar_prefs_dialog_construct (CalendarPrefsDialog *prefs)
 	prefs->tasks_hide_completed_interval = glade_xml_get_widget (gui, "tasks_hide_completed_interval");
 	prefs->tasks_hide_completed_units = glade_xml_get_widget (gui, "tasks_hide_completed_units");
 
-
 	/* Alarms tab */
 	prefs->notify_with_tray = glade_xml_get_widget (gui, "notify_with_tray");
 	prefs->scrolled_window = glade_xml_get_widget (gui, "calendar-source-scrolled-window");
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index e9661db..e330a7f 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -81,7 +81,6 @@ comp_editor_dates (CompEditorPageDates *dates, ECalComponent *comp)
 	e_cal_component_get_completed (comp, &dates->complete);
 }
 
-
 /* This frees the dates in the CompEditorPageDates struct. But it doesn't free
  * the struct (as that is usually static).
  */
@@ -109,7 +108,6 @@ comp_editor_free_dates (CompEditorPageDates *dates)
 		e_cal_component_free_icaltimetype (dates->complete);
 }
 
-
 /* dtstart is only passed in if tt is the dtend. */
 static void
 write_label_piece (struct icaltimetype *tt,
@@ -249,7 +247,6 @@ comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
 	return GTK_WIDGET (dedit);
 }
 
-
 /* Returns the current time, for EDateEdit widgets and ECalendar items in the
    dialogs.
    FIXME: Should probably use the timezone from somewhere in the component
@@ -278,8 +275,6 @@ comp_editor_get_current_time (GtkObject *object, gpointer data)
 	return tmp_tm;
 }
 
-
-
 /**
  * comp_editor_strip_categories:
  * @categories: A string of category names entered by the user.
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index 3bf8921..c2b5a05 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -38,7 +38,6 @@ GtkWidget *comp_editor_new_date_edit (gboolean show_date, gboolean show_time,
 
 struct tm comp_editor_get_current_time (GtkObject *object, gpointer data);
 
-
 gchar *comp_editor_strip_categories (const gchar *categories);
 
 #endif
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index ba43eaf..e620d54 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -433,7 +433,6 @@ save_comp (CompEditor *editor)
 		if (e_cal_component_has_recurrences (priv->comp) && priv->mod == CALOBJ_MOD_ALL)
 			comp_util_sanitize_recurrence_master (priv->comp, priv->client);
 
-
 		if (priv->mod == CALOBJ_MOD_THIS) {
 			e_cal_component_set_rdate_list (priv->comp, NULL);
 			e_cal_component_set_rrule_list (priv->comp, NULL);
@@ -1740,7 +1739,6 @@ comp_editor_show_help (CompEditor *editor)
 	e_display_help (GTK_WINDOW (editor), class->help_section);
 }
 
-
 /* Closes the dialog box and emits the appropriate signals */
 static void
 close_dialog (CompEditor *editor)
@@ -1948,7 +1946,6 @@ comp_editor_set_flags (CompEditor *editor,
 	g_object_notify (G_OBJECT (editor), "flags");
 }
 
-
 CompEditorFlags
 comp_editor_get_flags (CompEditor *editor)
 {
@@ -2541,7 +2538,6 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 
 }
 
-
 /**
  * comp_editor_edit_comp:
  * @editor: A component editor
@@ -2678,7 +2674,6 @@ comp_editor_close (CompEditor *editor)
 	return close;
 }
 
-
 /* Utility function to get the mime-attachment list from the attachment
  * bar for sending the comp via itip. The list and its contents must
  * be freed by the caller.
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index ec1b991..2106970 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -134,7 +134,6 @@ gboolean	comp_editor_send_comp		(CompEditor *editor,
 GSList *	comp_editor_get_mime_attach_list(CompEditor *editor);
 gboolean	comp_editor_close		(CompEditor *editor);
 
-
 void		comp_editor_sensitize_attachment_bar
 						(CompEditor *editor,
 						 gboolean set);
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 87fb164..284076a 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -114,7 +114,6 @@ e_delegate_dialog_finalize (GObject *object)
 		(* G_OBJECT_CLASS (e_delegate_dialog_parent_class)->finalize) (object);
 }
 
-
 EDelegateDialog *
 e_delegate_dialog_construct (EDelegateDialog *edd, const gchar *name, const gchar *address)
 {
@@ -273,7 +272,6 @@ e_delegate_dialog_get_delegate		(EDelegateDialog  *edd)
 	return g_strdup (priv->address);
 }
 
-
 gchar *
 e_delegate_dialog_get_delegate_name		(EDelegateDialog  *edd)
 {
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 6ff872e..a70488a 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -35,7 +35,6 @@
 #define E_IS_DELEGATE_DIALOG(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_DELEGATE_DIALOG))
 #define E_IS_DELEGATE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_DELEGATE_DIALOG))
 
-
 typedef struct _EDelegateDialog		EDelegateDialog;
 typedef struct _EDelegateDialogClass	EDelegateDialogClass;
 typedef struct _EDelegateDialogPrivate	EDelegateDialogPrivate;
@@ -69,7 +68,6 @@ void             e_delegate_dialog_set_delegate      (EDelegateDialog *etd,
 
 GtkWidget*       e_delegate_dialog_get_toplevel      (EDelegateDialog *etd);
 
-
 
 
 #endif /* __E_DELEGATE_DIALOG_H__ */
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 87f4584..c4ed13f 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -208,7 +208,6 @@ e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-TRACKINFO");
 	icalcomponent_add_property (icalcomp, prop);
 
-
 	prop = icalproperty_new_x ((const gchar *) g_strdup_printf ("%d", sopts->opened));
 	icalproperty_set_x_name (prop, "X-EVOLUTION-OPTIONS-OPENED");
 	icalcomponent_add_property (icalcomp, prop);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index f43dcc1..55989a4 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1269,7 +1269,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 	e_cal_component_set_dtstart (comp, &start_date);
 	e_cal_component_set_dtend (comp, &end_date);
 
-
 	/* Categories */
 
 	cat = e_dialog_editable_get (priv->categories);
@@ -1453,7 +1452,6 @@ event_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 			return FALSE;
 		}
 
-
 		if (flags & COMP_EDITOR_DELEGATE) {
 			GSList *attendee_list, *l;
 			gint i;
@@ -1986,7 +1984,6 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, EventPage *epage)
 	return FALSE;
 }
 
-
 static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage)
 {
@@ -2251,7 +2248,6 @@ get_widgets (EventPage *epage)
 	gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (priv->list_view));
 	gtk_box_pack_start (GTK_BOX (priv->list_box), sw, TRUE, TRUE, 0);
 
-
 	/* Glade's visibility flag doesn't seem to work for custom widgets */
 	priv->start_time = GW ("start-time");
 	gtk_widget_show (priv->start_time);
@@ -2298,7 +2294,6 @@ summary_changed_cb (GtkEditable *editable,
 	g_free (summary);
 }
 
-
 /* Note that this assumes that the start_tt and end_tt passed to it are the
    dates visible to the user. For DATE values, we have to add 1 day to the
    end_tt before emitting the signal. */
@@ -2339,7 +2334,6 @@ notify_dates_changed (EventPage *epage, struct icaltimetype *start_tt,
 					       &dates);
 }
 
-
 static gboolean
 check_start_before_end (struct icaltimetype *start_tt,
 			icaltimezone *start_zone,
@@ -2377,7 +2371,6 @@ check_start_before_end (struct icaltimetype *start_tt,
 	return FALSE;
 }
 
-
 /*
  * This is called whenever the start or end dates or timezones is changed.
  * It makes sure that the start date < end date. It also emits the notification
@@ -2455,7 +2448,6 @@ times_updated (EventPage *epage, gboolean adjust_end_time)
 		}
 	}
 
-
 	if (set_start_date) {
 		g_signal_handlers_block_matched (priv->start_time, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
 		e_date_edit_set_date (E_DATE_EDIT (priv->start_time),
@@ -2836,7 +2828,6 @@ init_widgets (EventPage *epage)
 	g_signal_connect((priv->summary), "changed",
 			    G_CALLBACK (summary_changed_cb), epage);
 
-
 	/* Description */
 	text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->description));
 
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 0b76d78..f110c28 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -389,7 +389,6 @@ get_recipients (ECalComponent *comp)
 	return "";
 }
 
-
 static gboolean
 fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 {
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index 1323755..0d91975 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -68,7 +68,6 @@ recur_component_dialog (ECal *client,
 		return FALSE;
 	}
 
-
 	dialog = gtk_message_dialog_new (parent, 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, "%s", str);
 	g_free (str);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index 5fbf69d..092a44d 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -2387,7 +2387,6 @@ recurrence_page_new (CompEditor *editor)
 	return rpage;
 }
 
-
 GtkWidget *make_exdate_date_edit (void);
 
 GtkWidget *
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index c85ccbb..712d270 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -242,7 +242,6 @@ update_time (SchedulePage *spage, ECalComponentDateTime *start_date, ECalCompone
 
 }
 
-
 /* Fills the widgets with default values */
 static void
 clear_widgets (SchedulePage *spage)
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
index 71eec02..59b97c7 100644
--- a/calendar/gui/dialogs/schedule-page.h
+++ b/calendar/gui/dialogs/schedule-page.h
@@ -64,7 +64,6 @@ struct _SchedulePageClass {
 	CompEditorPageClass parent_class;
 };
 
-
 GType		schedule_page_get_type		(void);
 SchedulePage *	schedule_page_construct		(SchedulePage *mpage,
 						 EMeetingStore *ems);
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 23f4b1f..8c63c4d 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -168,7 +168,6 @@ task_details_page_focus_main_widget (CompEditorPage *page)
 	gtk_widget_grab_focus (priv->status_combo);
 }
 
-
 static TaskEditorPriority
 priority_value_to_index (gint priority_value)
 {
@@ -492,7 +491,6 @@ get_widgets (TaskDetailsPage *tdpage)
 		&& priv->url);
 }
 
-
 static void
 complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
 {
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index 9377e09..1e3afc9 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -434,7 +434,6 @@ task_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 				e_meeting_attendee_set_edit_level (ia, E_MEETING_ATTENDEE_EDIT_NONE);
 		}
 
-
 		comp_editor_set_group_item (editor, TRUE);
 		priv->assignment_shown = TRUE;
 	}
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index faaba68..f1b13df 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -905,7 +905,6 @@ task_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 			return FALSE;
 		}
 
-
 		if (flags & COMP_EDITOR_DELEGATE ) {
 			GSList *attendee_list, *l;
 			gint i;
@@ -977,7 +976,6 @@ static void edit_clicked_cb (GtkButton *btn, TaskPage *tpage)
 	gtk_tree_path_free (path);
 }
 
-
 static gboolean
 existing_attendee (EMeetingAttendee *ia, ECalComponent *comp)
 {
@@ -1296,7 +1294,6 @@ list_view_event (EMeetingListView *list_view, GdkEvent *event, TaskPage *page) {
 	return FALSE;
 }
 
-
 static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page)
 {
@@ -1694,7 +1691,6 @@ times_updated (TaskPage *tpage, gboolean adjust_end_time)
 			set_start_date = TRUE;
 	}
 
-
 	if (set_start_date) {
 		g_signal_handlers_block_matched (priv->start_date, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, tpage);
 		e_date_edit_set_date (E_DATE_EDIT (priv->start_date), start_tt.year, start_tt.month, start_tt.day);
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index 20190a8..f19141b 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -50,7 +50,6 @@ struct _ECalComponentMemoPreviewPrivate {
 
 G_DEFINE_TYPE (ECalComponentMemoPreview, e_cal_component_memo_preview, GTK_TYPE_TABLE)
 
-
 static void
 on_link_clicked (GtkHTML *html, const gchar *url, gpointer data)
 {
@@ -93,7 +92,6 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *def
 		zone = NULL;
 	}
 
-
 	itt = *dt->value;
 	if (zone)
 		icaltimezone_convert_time (&itt, zone, default_zone);
@@ -134,7 +132,6 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 		GSList *node;
 		GString *string = g_string_new (NULL);
 
-
 		gtk_html_stream_printf(stream, "<H3>%s: ", _("Categories"));
 
 		for (node = l; node != NULL; node = node->next) {
diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h
index 2c69723..0f8c21c 100644
--- a/calendar/gui/e-cal-component-memo-preview.h
+++ b/calendar/gui/e-cal-component-memo-preview.h
@@ -53,7 +53,6 @@ struct _ECalComponentMemoPreviewClass {
 	void (* selection_changed) (ECalComponentMemoPreview *preview, gint n_selected);
 };
 
-
 GType      e_cal_component_memo_preview_get_type        (void);
 GtkWidget *e_cal_component_memo_preview_new             (void);
 
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 0cee296..8a33d48 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -133,7 +133,6 @@ timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *def
 		zone = NULL;
 	}
 
-
 	itt = *dt->value;
 	if (zone)
 		icaltimezone_convert_time (&itt, zone, default_zone);
@@ -170,7 +169,6 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 					"<HTML><BODY><H1><I>%s</I></H1>",
 					_("Untitled"));
 
-
 	/* write icons for the categories */
 	e_cal_component_get_categories_list (comp, &l);
 	if (l) {
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index dd355c0..f1d26a7 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -55,7 +55,6 @@ struct _ECalComponentPreviewClass {
 	void (* selection_changed) (ECalComponentPreview *preview, gint n_selected);
 };
 
-
 GType      e_cal_component_preview_get_type        (void);
 GtkWidget *e_cal_component_preview_new             (void);
 
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index f62db91..0081dc1 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -383,7 +383,6 @@ find_meeting (icalcomponent *icalcomp)
 	return prop ? TRUE: FALSE;
 }
 
-
 static gboolean
 e_cal_list_view_on_table_double_click (GtkWidget *table, gint row, gint col, GdkEvent *event,
 				      gpointer data)
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 656a582..df5b3db 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -40,7 +40,6 @@ G_BEGIN_DECLS
 #define E_CAL_LIST_VIEW_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_cal_list_view_get_type (), ECalListViewClass)
 #define E_IS_CAL_LIST_VIEW(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_cal_list_view_get_type ())
 
-
 typedef struct _ECalListView       ECalListView;
 typedef struct _ECalListViewClass  ECalListViewClass;
 
@@ -72,7 +71,6 @@ struct _ECalListViewClass
 	ECalendarViewClass parent_class;
 };
 
-
 GType		   e_cal_list_view_get_type		(void);
 GtkWidget *e_cal_list_view_construct            (ECalListView *cal_list_view);
 
@@ -83,7 +81,6 @@ void e_cal_list_view_save_state (ECalListView *cal_list_view, gchar *filename);
 gboolean   e_cal_list_view_get_range_shown      (ECalListView *cal_list_view, GDate *start_date,
 						 gint *days_shown);
 
-
 G_END_DECLS
 
 #endif /* _E_CAL_LIST_VIEW_H_ */
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 414a069..45d3e14 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -135,7 +135,6 @@ ecmm_value_at (ETableModel *etm, gint col, gint row)
 	return (gpointer) "";
 }
 
-
 static void
 ecmm_set_value_at (ETableModel *etm, gint col, gint row, gconstpointer value)
 {
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 63bc37a..27eae77 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -199,7 +199,6 @@ ensure_task_partially_complete (ECalModelComponent *comp_data)
 		icalcomponent_add_property (comp_data->icalcomp, icalproperty_new_status (ICAL_STATUS_INPROCESS));
 }
 
-
 /* This makes sure a task is marked as incomplete. It clears the
    "Date Completed" property. If the percent is set to 100 it removes it,
    and if the status is "Completed" it sets it to "Needs Action".
@@ -410,7 +409,6 @@ typedef enum {
 	E_CAL_MODEL_TASKS_DUE_COMPLETE
 } ECalModelTasksDueStatus;
 
-
 static ECalModelTasksDueStatus
 get_due_status (ECalModelTasks *model, ECalModelComponent *comp_data)
 {
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index be61d1f..bd1913e 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -257,7 +257,6 @@ e_cal_model_dispose (GObject *object)
 
 			priv->clients = g_list_remove (priv->clients, client_data);
 
-
 			g_object_unref (client_data->client);
 			if (client_data->query)
 				g_object_unref (client_data->query);
@@ -1798,7 +1797,6 @@ cal_opened_cb (ECal *client, ECalendarStatus status, gpointer user_data)
 	update_e_cal_view_for_client (model, client_data);
 }
 
-
 static ECalModelClient *
 add_new_client (ECalModel *model, ECal *client, gboolean do_query)
 {
@@ -2318,7 +2316,6 @@ copy_ecdv (ECellDateEditValue *ecdv)
 	return new_ecdv;
 } */
 
-
 struct _ECalModelComponentPrivate {
 	gchar nouse;
 };
@@ -2340,7 +2337,6 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass)
 	object_class->finalize = e_cal_model_component_finalize;
 }
 
-
 static void
 e_cal_model_component_finalize (GObject *object)
 {
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index d6bf0ed..cdbce07 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -315,8 +315,6 @@ e_cal_popup_target_new_select(ECalPopup *eabp, struct _ECalModel *model, GPtrArr
 	if (!read_only)
 		mask &= ~E_CAL_POPUP_SELECT_EDITABLE;
 
-
-
 	if (!e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_TASK_ASSIGNMENT)
 	    && !e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_NO_CONV_TO_ASSIGN_TASK))
 		mask &= ~E_CAL_POPUP_SELECT_ASSIGNABLE;
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 9eb53d9..180680d 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -521,7 +521,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 
 	e_table_extras_add_cell (extras, "calstring", cell);
 
-
 	/*
 	 * Date fields.
 	 */
@@ -542,7 +541,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 						e_calendar_table_get_current_time,
 						cal_table, NULL);
 
-
 	/*
 	 * Combo fields.
 	 */
@@ -709,7 +707,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (table);
 
-
 	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
 	g_signal_connect (e_table, "double_click", G_CALLBACK (e_calendar_table_on_double_click), cal_table);
 	g_signal_connect (e_table, "right_click", G_CALLBACK (e_calendar_table_on_right_click), cal_table);
@@ -723,7 +720,6 @@ e_calendar_table_init (ECalendarTable *cal_table)
 		atk_object_set_name (a11y, _("Tasks"));
 }
 
-
 /**
  * e_calendar_table_new:
  * @Returns: a new #ECalendarTable.
@@ -740,7 +736,6 @@ e_calendar_table_new (void)
 	return cal_table;
 }
 
-
 /**
  * e_calendar_table_get_model:
  * @cal_table: A calendar table.
@@ -758,7 +753,6 @@ e_calendar_table_get_model (ECalendarTable *cal_table)
 	return cal_table->model;
 }
 
-
 static void
 e_calendar_table_destroy (GtkObject *object)
 {
@@ -1806,7 +1800,6 @@ e_calendar_table_load_state	(ECalendarTable *cal_table,
 	}
 }
 
-
 /* Saves the state of the table (headers shown etc.) to the given file. */
 void
 e_calendar_table_save_state (ECalendarTable	*cal_table,
@@ -1845,7 +1838,6 @@ e_calendar_table_get_current_time (ECellDateEdit *ecde, gpointer data)
 	return tmp_tm;
 }
 
-
 #ifdef TRANSLATORS_ONLY
 
 static gchar *test[] = {
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index e91886b..0abcd4b 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -36,16 +36,13 @@ G_BEGIN_DECLS
  * Used for calendar events and tasks.
  */
 
-
 #define E_CALENDAR_TABLE(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_calendar_table_get_type (), ECalendarTable)
 #define E_CALENDAR_TABLE_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)
 #define E_IS_CALENDAR_TABLE(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_table_get_type ())
 
-
 typedef struct _ECalendarTable       ECalendarTable;
 typedef struct _ECalendarTableClass  ECalendarTableClass;
 
-
 struct _ECalendarTable {
 	GtkTable table;
 
@@ -76,7 +73,6 @@ struct _ECalendarTableClass {
 	void (* user_created) (ECalendarTable *cal_table);
 };
 
-
 GType		   e_calendar_table_get_type (void);
 GtkWidget* e_calendar_table_new	(void);
 
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 8cab14b..7e39f14 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -258,7 +258,6 @@ e_calendar_view_class_init (ECalendarViewClass *klass)
 	e_cal_view_a11y_init ();
 }
 
-
 void
 e_calendar_view_add_event (ECalendarView *cal_view, ECal *client, time_t dtstart,
 		      icaltimezone *default_zone, icalcomponent *icalcomp, gboolean in_top_canvas)
@@ -1194,13 +1193,11 @@ e_calendar_view_delete_selected_occurrence (ECalendarView *cal_view)
 		} else
 			zone = e_calendar_view_get_timezone (cal_view);
 
-
 		if (is_instance)
 			rid = e_cal_component_get_recurid_as_string (comp);
 
 		e_cal_component_free_datetime (&dt);
 
-
 		if ((itip_organizer_is_user (comp, event->comp_data->client) || itip_sentby_is_user (comp, event->comp_data->client))
 				&& cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (GTK_WIDGET (cal_view)),
 					event->comp_data->client,
@@ -1384,7 +1381,6 @@ transfer_item_to (ECalendarViewEvent *event, ECal *dest_client, gboolean remove_
 	if (e_cal_get_object (dest_client, uid, NULL, &orig_icalcomp, NULL)) {
 		icalcomponent_free (orig_icalcomp);
 
-
 		if (!e_cal_modify_object (dest_client, event->comp_data->icalcomp, CALOBJ_MOD_ALL, NULL))
 			return;
 	} else {
@@ -1537,7 +1533,6 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 
 	address = itip_get_comp_attendee (comp, client);
 
-
 	for (prop = icalcomponent_get_first_property (icalcomp, ICAL_ATTENDEE_PROPERTY);
 			prop;
 			prop = icalcomponent_get_next_property (icalcomp, ICAL_ATTENDEE_PROPERTY)) {
@@ -1578,7 +1573,6 @@ set_attendee_status_for_delegate (icalcomponent *icalcomp, ECal *client)
 		g_free (temp);
 	}
 
-
 	g_free (address);
 	g_object_unref (comp);
 }
@@ -1707,7 +1701,6 @@ on_unrecur_appointment (EPopup *ep, EPopupItem *pitem, gpointer data)
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 	id = e_cal_component_get_id (comp);
 
-
 	/* For the unrecurred instance we duplicate the original object,
 	   create a new uid for it, get rid of the recurrence rules, and set
 	   the start & end times to the instances times. */
@@ -2107,7 +2100,6 @@ e_calendar_view_open_event_with_flags (ECalendarView *cal_view, ECal *client, ic
 	const gchar *uid;
 	ECalComponent *comp;
 
-
 	uid = icalcomponent_get_uid (icalcomp);
 
 	ce = e_comp_editor_registry_find (comp_editor_registry, uid);
@@ -2163,7 +2155,6 @@ e_calendar_view_edit_appointment (ECalendarView *cal_view,
 		g_object_unref (comp);
 	}
 
-
 	e_calendar_view_open_event_with_flags (cal_view, client, icalcomp, flags);
 }
 
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index efe251a..64dd48d 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -48,7 +48,6 @@ e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
 	ecd->zone = zone;
 }
 
-
 void
 e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
 					      gboolean use_24_hour)
@@ -58,7 +57,6 @@ e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
 	ecd->use_24_hour_format = use_24_hour;
 }
 
-
 static gchar *
 ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 {
@@ -82,14 +80,12 @@ ecd_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 	return g_strdup (buffer);
 }
 
-
 static void
 ecd_free_text (ECellText *cell, gchar *text)
 {
 	g_free (text);
 }
 
-
 /* FIXME: We need to set the "transient_for" property for the dialog. */
 static void
 show_date_warning (ECellDateEditText *ecd)
@@ -123,7 +119,6 @@ show_date_warning (ECellDateEditText *ecd)
 	gtk_widget_destroy (dialog);
 }
 
-
 static void
 ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
 	       const gchar *text)
@@ -176,7 +171,6 @@ ecd_set_value (ECellText *cell, ETableModel *model, gint col, gint row,
 	e_table_model_set_value_at (model, col, row, value);
 }
 
-
 static void
 e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet)
 {
@@ -187,7 +181,6 @@ e_cell_date_edit_text_class_init (ECellDateEditTextClass *ecdet)
 	ectc->set_value = ecd_set_value;
 }
 
-
 static void
 e_cell_date_edit_text_init (ECellDateEditText *ecd)
 {
@@ -195,7 +188,6 @@ e_cell_date_edit_text_init (ECellDateEditText *ecd)
 	ecd->use_24_hour_format = TRUE;
 }
 
-
 /**
  * e_cell_date_edit_text_new:
  *
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 0f557af..5dc1f0c 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -59,7 +59,6 @@ GType      e_cell_date_edit_text_get_type (void);
 ECell     *e_cell_date_edit_text_new      (const gchar *fontname,
 					   GtkJustification justify);
 
-
 void	   e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
 					       icaltimezone *zone);
 void	   e_cell_date_edit_text_set_use_24_hour_format (ECellDateEditText *ecd,
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
index 0b45a53..3f9d195 100644
--- a/calendar/gui/e-comp-editor-registry.h
+++ b/calendar/gui/e-comp-editor-registry.h
@@ -55,7 +55,6 @@ struct _ECompEditorRegistryClass {
 
 typedef void (* ECompEditorRegistryForeachFn) (CompEditor *editor, gpointer data);
 
-
 
 
 GType     e_comp_editor_registry_get_type  (void);
@@ -71,4 +70,3 @@ G_END_DECLS
 
 #endif /* _E_COMP_EDITOR_REGISTRY_H_ */
 
-
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 942f739..a193e7b 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -281,7 +281,6 @@ day_end_hour_changed_cb (GConfClient *client, guint id, GConfEntry *entry, gpoin
 	set_day_end_hour (priv->view);
 }
 
-
 static void
 set_day_end_minute (EDayView *day_view)
 {
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index ab1f6c0..51ced18 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -52,7 +52,6 @@ static void e_day_view_recalc_cols_per_row (gint           rows,
 					    guint8	  *cols_per_row,
 					    guint16       *group_starts);
 
-
 void
 e_day_view_layout_long_events (GArray	   *events,
 			       gint	   days_shown,
@@ -86,7 +85,6 @@ e_day_view_layout_long_events (GArray	   *events,
 	g_free (grid);
 }
 
-
 static void
 e_day_view_layout_long_event (EDayViewEvent *event,
 			      guint8	   *grid,
@@ -128,7 +126,6 @@ e_day_view_layout_long_event (EDayViewEvent *event,
 	*rows_in_top_display = MAX (*rows_in_top_display, free_row + 1);
 }
 
-
 /* returns maximum number of columns among all rows */
 gint
 e_day_view_layout_day_events (GArray	   *events,
@@ -197,7 +194,6 @@ e_day_view_layout_day_events (GArray	   *events,
 	return res;
 }
 
-
 /* Finds the first free position to place the event in.
    Increments the number of events in each of the rows it covers, and makes
    sure they are all in one group. */
@@ -275,7 +271,6 @@ e_day_view_layout_day_event (EDayViewEvent *event,
 	}
 }
 
-
 /* For each group of rows, find the max number of events in all the
    rows, and set the number of cols in each of the rows to that. */
 static void
@@ -299,7 +294,6 @@ e_day_view_recalc_cols_per_row (gint      rows,
 	}
 }
 
-
 /* Expands the event horizontally to fill any free space. */
 static void
 e_day_view_expand_day_event (EDayViewEvent *event,
@@ -333,7 +327,6 @@ e_day_view_expand_day_event (EDayViewEvent *event,
 	}
 }
 
-
 /* Find the start and end days for the event. */
 gboolean
 e_day_view_find_long_event_days (EDayViewEvent	*event,
@@ -369,4 +362,3 @@ e_day_view_find_long_event_days (EDayViewEvent	*event,
 	return TRUE;
 }
 
-
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 36f2e0c..c169a06 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -36,7 +36,6 @@ void e_day_view_layout_long_events	(GArray	   *events,
 					 time_t	   *day_starts,
 					 gint	   *rows_in_top_display);
 
-
 gint e_day_view_layout_day_events	(GArray	   *events,
 					 gint	    rows,
 					 gint	    mins_per_row,
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index f8b264f..2809140 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -114,14 +114,12 @@ e_day_view_main_item_class_init (EDayViewMainItemClass *class)
 	e_day_view_main_item_a11y_init ();
 }
 
-
 static void
 e_day_view_main_item_init (EDayViewMainItem *dvtitem)
 {
 	dvtitem->day_view = NULL;
 }
 
-
 static void
 e_day_view_main_item_set_property (GObject *object,
                                    guint property_id,
@@ -141,7 +139,6 @@ e_day_view_main_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_day_view_main_item_update (GnomeCanvasItem *item,
 			    double *affine,
@@ -158,7 +155,6 @@ e_day_view_main_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -369,7 +365,6 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
 						      day);
 	}
 
-
 	if (e_day_view_get_show_marcus_bains (day_view)) {
 		icaltimezone *zone;
 		struct icaltimetype time_now, day_start;
@@ -411,7 +406,6 @@ e_day_view_main_item_draw (GnomeCanvasItem *canvas_item, GdkDrawable *drawable,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 					   GdkDrawable *drawable,
@@ -453,7 +447,6 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 				}
 		}
 
-
 		comp = e_cal_component_new ();
 		e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -492,7 +485,6 @@ e_day_view_main_item_draw_events_in_vbars (EDayViewMainItem *dvmitem,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 						GdkDrawable *drawable,
@@ -581,7 +573,6 @@ e_day_view_main_item_draw_long_events_in_vbars (EDayViewMainItem *dvmitem,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_day_view_main_item_draw_day_events (EDayViewMainItem *dvmitem,
 				      GdkDrawable *drawable,
@@ -1011,7 +1002,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	else if (bar_y2 < scroll_flag)
 		event->end_minute -= day_view->mins_per_row;
 
-
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -1172,7 +1162,6 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 				icon_y += icon_y_inc;
 			}
 
-
 			if (draw_meeting_icon && fit_in_event ()) {
 				max_icon_w = item_x + item_w - icon_x
 					- E_DAY_VIEW_EVENT_BORDER_WIDTH;
@@ -1340,7 +1329,6 @@ e_day_view_main_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -1358,4 +1346,3 @@ e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
 	return FALSE;
 }
 
-
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index 3f28bde..5204115 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -51,10 +51,8 @@ typedef struct {
 
 } EDayViewMainItemClass;
 
-
 GType    e_day_view_main_item_get_type      (void);
 
-
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 232534d..36a7b49 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -35,7 +35,6 @@
 #include <widgets/e-timezone-dialog/e-timezone-dialog.h>
 #include <libedataserver/e-data-server-util.h>
 
-
 /* The spacing between items in the time column. GRID_X_PAD is the space down
    either side of the column, i.e. outside the main horizontal grid lines.
    HOUR_L_PAD & HOUR_R_PAD are the spaces on the left & right side of the
@@ -127,7 +126,6 @@ e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_day_view_time_item_init (EDayViewTimeItem *dvtmitem)
 {
@@ -197,7 +195,6 @@ e_day_view_time_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /* Returns the minimum width needed for the column, by adding up all the
    maximum widths of the strings. The string widths are all calculated in
    the style_set handlers of EDayView and EDayViewTimeCanvas. */
@@ -267,7 +264,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
 	return dvtmitem->column_width;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -642,7 +638,6 @@ e_day_view_time_item_increment_time	(gint	*hour,
 	}
 }
 
-
 static double
 e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
 			    gint cx, gint cy,
@@ -652,7 +647,6 @@ e_day_view_time_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_day_view_time_item_event (GnomeCanvasItem *item,
 			    GdkEvent *event)
@@ -823,7 +817,6 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 			event->button.button, event->button.time);
 }
 
-
 static void
 e_day_view_time_item_on_set_divisions (GtkWidget *item,
 				       EDayViewTimeItem *dvtmitem)
@@ -842,7 +835,6 @@ e_day_view_time_item_on_set_divisions (GtkWidget *item,
 	calendar_config_set_time_divisions (divisions);
 }
 
-
 static void
 e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
 				      GdkEvent *event)
@@ -874,7 +866,6 @@ e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,
 	}
 }
 
-
 static void
 e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,
 					GdkEvent *event)
@@ -921,7 +912,6 @@ e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,
 	}
 }
 
-
 /* Returns the row corresponding to the y position, or -1. */
 static gint
 e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index 237b556..802ca50 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -62,13 +62,10 @@ typedef struct {
 
 } EDayViewTimeItemClass;
 
-
 GType    e_day_view_time_item_get_type      (void);
 
-
 gint	 e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem);
 
-
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_TIME_ITEM_H_ */
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 31cce40..180b3ad 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -74,7 +74,6 @@ static double e_day_view_top_item_point		(GnomeCanvasItem *item,
 static gint e_day_view_top_item_event		(GnomeCanvasItem *item,
 						 GdkEvent	 *event);
 
-
 /* The arguments we take */
 enum {
 	PROP_0,
@@ -119,7 +118,6 @@ e_day_view_top_item_class_init (EDayViewTopItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_day_view_top_item_init (EDayViewTopItem *dvtitem)
 {
@@ -127,7 +125,6 @@ e_day_view_top_item_init (EDayViewTopItem *dvtitem)
 	dvtitem->show_dates = FALSE;
 }
 
-
 static void
 e_day_view_top_item_set_property (GObject *object,
                                   guint property_id,
@@ -150,7 +147,6 @@ e_day_view_top_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_day_view_top_item_update (GnomeCanvasItem *item,
 			    double	    *affine,
@@ -167,7 +163,6 @@ e_day_view_top_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -718,7 +713,6 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 	gdk_gc_set_clip_mask (gc, NULL);
 }
 
-
 /* This draws a little triangle to indicate that an event extends past
    the days visible on screen. */
 static void
@@ -807,7 +801,6 @@ e_day_view_top_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index 61dfdce..e163e3e 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -54,12 +54,10 @@ typedef struct {
 
 } EDayViewTopItemClass;
 
-
 GType    e_day_view_top_item_get_type      (void);
 void e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
 					gchar *buffer, gint buffer_len);
 
-
 G_END_DECLS
 
 #endif /* _E_DAY_VIEW_TOP_ITEM_H_ */
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index bcd6d42..5642bc7 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -227,7 +227,6 @@ static void e_day_view_finish_long_event_resize (EDayView *day_view);
 static void e_day_view_finish_resize (EDayView *day_view);
 static void e_day_view_abort_resize (EDayView *day_view);
 
-
 static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,
 						       gint		 event_num,
 						       GdkEventButton	*event,
@@ -266,7 +265,6 @@ static void e_day_view_show_popup_menu (EDayView *day_view,
 					gint day,
 					gint event_num);
 
-
 static void e_day_view_recalc_day_starts (EDayView *day_view,
 					  time_t start_time);
 static void e_day_view_recalc_num_rows	(EDayView	*day_view);
@@ -505,7 +503,6 @@ time_range_changed_cb (ECalModel *model, time_t start_time, time_t end_time, gpo
 		e_day_view_ensure_rows_visible (day_view, day_view->selection_start_row, day_view->selection_start_row);
 }
 
-
 static void
 process_component (EDayView *day_view, ECalModelComponent *comp_data)
 {
@@ -681,7 +678,6 @@ timezone_changed_cb (ECalendarView *cal_view, icaltimezone *old_zone,
 
 	g_return_if_fail (E_IS_DAY_VIEW (day_view));
 
-
 	if (!cal_view->in_focus)
 		return;
 
@@ -778,7 +774,6 @@ e_day_view_init (EDayView *day_view)
 
 	day_view->last_edited_comp_string = NULL;
 
-
 	day_view->selection_start_row = -1;
 	day_view->selection_start_day = -1;
 	day_view->selection_end_row = -1;
@@ -970,7 +965,6 @@ e_day_view_init (EDayView *day_view)
 				       NULL);
 	gnome_canvas_item_hide (day_view->drag_item);
 
-
 	/*
 	 * Times Canvas
 	 */
@@ -992,7 +986,6 @@ e_day_view_init (EDayView *day_view)
 				       "EDayViewTimeItem::day_view", day_view,
 				       NULL);
 
-
 	/*
 	 * Scrollbar.
 	 */
@@ -1028,13 +1021,11 @@ e_day_view_init (EDayView *day_view)
 			   target_table, n_targets,
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_ASK);
 
-
 	/* connect to ECalendarView's signals */
 	g_signal_connect (G_OBJECT (day_view), "timezone_changed",
 			  G_CALLBACK (timezone_changed_cb), NULL);
 }
 
-
 static void
 init_model (EDayView *day_view, ECalModel *model)
 {
@@ -1061,7 +1052,6 @@ e_day_view_on_canvas_realized (GtkWidget *widget,
 				    NULL, FALSE);
 }
 
-
 /**
  * e_day_view_new:
  * @Returns: a new #EDayView.
@@ -1167,7 +1157,6 @@ e_day_view_realize (GtkWidget *widget)
 	day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", GTK_ICON_SIZE_MENU);
 	day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", GTK_ICON_SIZE_MENU);
 
-
 	/* Set the canvas item colors. */
 	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
 			       "fill_color_gdk", &day_view->colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],
@@ -1437,7 +1426,6 @@ e_day_view_style_set (GtkWidget *widget,
 		}
 	}
 
-
 	/* Calculate the widths of all the time strings necessary. */
 	day_view->max_small_hour_width = 0;
 	for (hour = 0; hour < 24; hour++) {
@@ -1624,7 +1612,6 @@ e_day_view_recalc_cell_sizes	(EDayView	*day_view)
 	g_object_unref (layout);
 }
 
-
 static gint
 e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1644,7 +1631,6 @@ e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 	return FALSE;
 }
 
-
 static gint
 e_day_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1701,7 +1687,6 @@ e_day_view_foreach_event		(EDayView	*day_view,
 	}
 }
 
-
 /* This calls a given function for each event instance that matches the given
    uid. If the callback returns FALSE the iteration is stopped.
    Note that it is safe for the callback to remove the event (since we
@@ -1745,7 +1730,6 @@ e_day_view_foreach_event_with_uid (EDayView *day_view,
 	}
 }
 
-
 static gboolean
 e_day_view_remove_event_cb (EDayView *day_view,
 			    gint day,
@@ -1916,7 +1900,6 @@ e_day_view_update_long_event_label (EDayView *day_view,
 		set_text_as_bold (event);
 }
 
-
 /* Finds the day and index of the event with the given canvas item.
    If is is a long event, -1 is returned as the day.
    Returns TRUE if the event was found. */
@@ -1956,7 +1939,6 @@ e_day_view_find_event_from_item (EDayView *day_view,
 	return FALSE;
 }
 
-
 /* Finds the day and index of the event with the given uid.
    If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.
    Returns TRUE if an event with the uid was found.
@@ -2131,7 +2113,6 @@ e_day_view_set_selected_time_range_visible	(EDayView	*day_view,
 	}
 }
 
-
 /* Finds the start of the working week which includes the given time. */
 static time_t
 e_day_view_find_work_week_start		(EDayView	*day_view,
@@ -2176,7 +2157,6 @@ e_day_view_find_work_week_start		(EDayView	*day_view,
 	return icaltime_as_timet_with_zone (tt, e_calendar_view_get_timezone (E_CALENDAR_VIEW (day_view)));
 }
 
-
 /* This sets the selected time range. If the start_time & end_time are not equal
    and are both visible in the view, then the selection is set to those times,
    otherwise it is set to 1 hour from the start of the working day. */
@@ -2354,7 +2334,6 @@ e_day_view_get_work_week_view	(EDayView	*day_view)
 	return day_view->work_week_view;
 }
 
-
 void
 e_day_view_set_work_week_view	(EDayView	*day_view,
 				 gboolean	 work_week_view)
@@ -2370,7 +2349,6 @@ e_day_view_set_work_week_view	(EDayView	*day_view,
 		e_day_view_recalc_work_week (day_view);
 }
 
-
 gint
 e_day_view_get_days_shown	(EDayView	*day_view)
 {
@@ -2379,7 +2357,6 @@ e_day_view_get_days_shown	(EDayView	*day_view)
 	return day_view->days_shown;
 }
 
-
 void
 e_day_view_set_days_shown	(EDayView	*day_view,
 				 gint		 days_shown)
@@ -2403,7 +2380,6 @@ e_day_view_set_days_shown	(EDayView	*day_view,
 	e_day_view_update_query (day_view);
 }
 
-
 gint
 e_day_view_get_mins_per_row	(EDayView	*day_view)
 {
@@ -2412,7 +2388,6 @@ e_day_view_get_mins_per_row	(EDayView	*day_view)
 	return day_view->mins_per_row;
 }
 
-
 void
 e_day_view_set_mins_per_row	(EDayView	*day_view,
 				 gint		 mins_per_row)
@@ -2454,7 +2429,6 @@ e_day_view_set_mins_per_row	(EDayView	*day_view,
 	e_day_view_update_scroll_regions (day_view);
 }
 
-
 /* This specifies the working days in the week. The value is a bitwise
    combination of day flags. Defaults to Mon-Fri. */
 EDayViewDays
@@ -2465,7 +2439,6 @@ e_day_view_get_working_days	(EDayView	*day_view)
 	return day_view->working_days;
 }
 
-
 void
 e_day_view_set_working_days	(EDayView	*day_view,
 				 EDayViewDays	 days)
@@ -2485,7 +2458,6 @@ e_day_view_set_working_days	(EDayView	*day_view,
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)
 {
@@ -2521,7 +2493,6 @@ e_day_view_recalc_work_week_days_shown	(EDayView	*day_view)
 	e_day_view_set_days_shown (day_view, days_shown);
 }
 
-
 /* The start and end time of the working day. This only affects the background
    colors. */
 void
@@ -2539,7 +2510,6 @@ e_day_view_get_working_day		(EDayView	*day_view,
 	*end_minute = day_view->work_day_end_minute;
 }
 
-
 void
 e_day_view_set_working_day		(EDayView	*day_view,
 					 gint		 start_hour,
@@ -2557,7 +2527,6 @@ e_day_view_set_working_day		(EDayView	*day_view,
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 /* Whether we display the Marcus Bains Line in the main canvas and time canvas. */
 gboolean
 e_day_view_get_show_marcus_bains	(EDayView       *day_view)
@@ -2575,7 +2544,6 @@ e_day_view_update_marcus_bains		(EDayView *day_view)
 	gtk_widget_queue_draw (day_view->time_canvas);
 }
 
-
 /* Update the variables controlling the Marcus Bains Line (display toggle, and colors). */
 void
 e_day_view_set_marcus_bains		(EDayView       *day_view,
@@ -2609,7 +2577,6 @@ e_day_view_set_marcus_bains		(EDayView       *day_view,
 	}
 }
 
-
 /* Whether we display event end times in the main canvas. */
 gboolean
 e_day_view_get_show_event_end_times	(EDayView	*day_view)
@@ -2619,7 +2586,6 @@ e_day_view_get_show_event_end_times	(EDayView	*day_view)
 	return day_view->show_event_end_times;
 }
 
-
 void
 e_day_view_set_show_event_end_times	(EDayView	*day_view,
 					 gboolean	 show)
@@ -2647,7 +2613,6 @@ e_day_view_set_show_times_cb		(EDayView	*day_view,
 	return TRUE;
 }
 
-
 /* The first day of the week, 0 (Monday) to 6 (Sunday). */
 gint
 e_day_view_get_week_start_day	(EDayView	*day_view)
@@ -2657,7 +2622,6 @@ e_day_view_get_week_start_day	(EDayView	*day_view)
 	return day_view->week_start_day;
 }
 
-
 void
 e_day_view_set_week_start_day	(EDayView	*day_view,
 				 gint		 week_start_day)
@@ -2703,7 +2667,6 @@ e_day_view_recalc_work_week	(EDayView	*day_view)
 	}
 }
 
-
 static gboolean
 e_day_view_update_scroll_regions (EDayView *day_view)
 {
@@ -2744,7 +2707,6 @@ e_day_view_update_scroll_regions (EDayView *day_view)
 	return need_reshape;
 }
 
-
 /* This recalculates the number of rows to display, based on the time range
    shown and the minutes per row. */
 static void
@@ -2759,7 +2721,6 @@ e_day_view_recalc_num_rows	(EDayView	*day_view)
 	day_view->rows = total_minutes / day_view->mins_per_row;
 }
 
-
 /* Converts an hour and minute to a row in the canvas. Note that if we aren't
    showing all 24 hours of the day, the returned row may be negative or
    greater than day_view->rows. */
@@ -2780,7 +2741,6 @@ e_day_view_convert_time_to_row	(EDayView	*day_view,
 		return offset / day_view->mins_per_row;
 }
 
-
 /* Converts an hour and minute to a y coordinate in the canvas. */
 gint
 e_day_view_convert_time_to_position (EDayView	*day_view,
@@ -2877,7 +2837,6 @@ e_day_view_on_top_canvas_button_press (GtkWidget *widget,
 	return TRUE;
 }
 
-
 static gboolean
 e_day_view_convert_event_coords (EDayView *day_view,
 				 GdkEvent *event,
@@ -2931,7 +2890,6 @@ e_day_view_convert_event_coords (EDayView *day_view,
 	return (event_window == window) ? TRUE : FALSE;
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 					GdkEventButton *event,
@@ -3007,7 +2965,6 @@ e_day_view_on_main_canvas_button_press (GtkWidget *widget,
 		if (!GTK_WIDGET_HAS_FOCUS (day_view))
 			gtk_widget_grab_focus (GTK_WIDGET (day_view));
 
-
 		if ((day < day_view->selection_start_day || day > day_view->selection_end_day)
 		    || (day == day_view->selection_start_day && row < day_view->selection_start_row)
 		    || (day == day_view->selection_end_day && row > day_view->selection_end_row)) {
@@ -3117,7 +3074,6 @@ e_day_view_on_long_event_button_press (EDayView		*day_view,
 	return FALSE;
 }
 
-
 static gboolean
 e_day_view_on_event_button_press (EDayView	  *day_view,
 				  gint		   day,
@@ -3256,7 +3212,6 @@ e_day_view_on_event_click (EDayView *day_view,
 			return;
 		}
 
-
 		/* Grab the keyboard focus, so the event being edited is saved
 		   and we can use the Escape key to abort the resize. */
 		if (!GTK_WIDGET_HAS_FOCUS (day_view))
@@ -3330,7 +3285,6 @@ e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
 	y2 = item_y + item_h - 1;
 }
 
-
 static void
 e_day_view_reshape_resize_rect_item (EDayView *day_view)
 {
@@ -3506,7 +3460,6 @@ e_day_view_on_top_canvas_button_release (GtkWidget *widget,
 	return FALSE;
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_button_release (GtkWidget *widget,
 					  GdkEventButton *event,
@@ -3536,7 +3489,6 @@ e_day_view_on_main_canvas_button_release (GtkWidget *widget,
 	return FALSE;
 }
 
-
 void
 e_day_view_update_calendar_selection_time (EDayView *day_view)
 {
@@ -3653,7 +3605,6 @@ e_day_view_on_top_canvas_motion (GtkWidget *widget,
 	return FALSE;
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_motion (GtkWidget *widget,
 				  GdkEventMotion *mevent,
@@ -3787,7 +3738,6 @@ e_day_view_start_selection (EDayView *day_view,
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 /* Updates the selection during a drag. If day is -1 the selection day is
    unchanged. */
 void
@@ -3833,7 +3783,6 @@ e_day_view_update_selection (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_normalize_selection (EDayView *day_view)
 {
@@ -3856,7 +3805,6 @@ e_day_view_normalize_selection (EDayView *day_view)
 	}
 }
 
-
 void
 e_day_view_finish_selection (EDayView *day_view)
 {
@@ -3904,7 +3852,6 @@ e_day_view_update_long_event_resize (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_update_resize (EDayView *day_view,
 			  gint row)
@@ -3955,7 +3902,6 @@ e_day_view_update_resize (EDayView *day_view,
 	}
 }
 
-
 /* This converts the resize start or end row back to a time and updates the
    event. */
 static void
@@ -4064,7 +4010,6 @@ e_day_view_finish_long_event_resize (EDayView *day_view)
 	g_object_unref (comp);
 }
 
-
 /* This converts the resize start or end row back to a time and updates the
    event. */
 static void
@@ -4126,7 +4071,6 @@ e_day_view_finish_resize (EDayView *day_view)
 
 	day_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
 
-
 	/* Hide the horizontal bars. */
 	day_view->resize_bars_event_day = -1;
 	day_view->resize_bars_event_num = -1;
@@ -4172,7 +4116,6 @@ e_day_view_finish_resize (EDayView *day_view)
 	g_object_unref (comp);
 }
 
-
 static void
 e_day_view_abort_resize (EDayView *day_view)
 {
@@ -4219,14 +4162,12 @@ e_day_view_free_events (EDayView *day_view)
 	day_view->editing_event_num = -1;
 	day_view->popup_event_num = -1;
 
-
 	e_day_view_free_event_array (day_view, day_view->long_events);
 
 	for (day = 0; day < E_DAY_VIEW_MAX_DAYS; day++)
 		e_day_view_free_event_array (day_view, day_view->events[day]);
 }
 
-
 static void
 e_day_view_free_event_array (EDayView *day_view,
 			     GArray *array)
@@ -4245,7 +4186,6 @@ e_day_view_free_event_array (EDayView *day_view,
 	g_array_set_size (array, 0);
 }
 
-
 /* This adds one event to the view, adding it to the appropriate array. */
 static gboolean
 e_day_view_add_event (ECalComponent *comp,
@@ -4415,7 +4355,6 @@ e_day_view_check_layout (EDayView *day_view)
 	}
 }
 
-
 static void
 e_day_view_reshape_long_events (EDayView *day_view)
 {
@@ -4438,7 +4377,6 @@ e_day_view_reshape_long_events (EDayView *day_view)
 	}
 }
 
-
 static void
 e_day_view_reshape_long_event (EDayView *day_view,
 			       gint	 event_num)
@@ -4597,7 +4535,6 @@ e_day_view_reshape_long_event (EDayView *day_view,
 	g_object_unref (comp);
 }
 
-
 /* This creates or updates the sizes of the canvas items for one day of the
    main canvas. */
 static void
@@ -4628,7 +4565,6 @@ e_day_view_reshape_day_events (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_reshape_day_event (EDayView *day_view,
 			      gint	day,
@@ -4732,7 +4668,6 @@ e_day_view_reshape_day_event (EDayView *day_view,
 	}
 }
 
-
 /* This creates or resizes the horizontal bars used to resize events in the
    main canvas. */
 static void
@@ -4799,7 +4734,6 @@ e_day_view_ensure_events_sorted (EDayView *day_view)
 	}
 }
 
-
 gint
 e_day_view_event_sort_func (gconstpointer arg1,
 			    gconstpointer arg2)
@@ -4973,7 +4907,6 @@ e_day_view_do_key_press (GtkWidget *widget, GdkEventKey *event)
 		return TRUE;
 	}
 
-
 	/* Handle the cursor keys for moving & extending the selection. */
 	stop_emission = TRUE;
 	if (event->state & GDK_SHIFT_MASK) {
@@ -5078,7 +5011,6 @@ e_day_view_goto_start_of_work_day (EDayView *day_view)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 /* Select the time that ends a work day*/
 static void
 e_day_view_goto_end_of_work_day (EDayView *day_view)
@@ -5179,7 +5111,6 @@ e_day_view_change_duration_to_end_of_work_day (EDayView *day_view)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)
 {
@@ -5491,7 +5422,6 @@ e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
 {
@@ -5516,7 +5446,6 @@ e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
 {
@@ -5541,7 +5470,6 @@ e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
 {
@@ -5574,7 +5502,6 @@ e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
 {
@@ -5607,7 +5534,6 @@ e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)
 	gtk_widget_queue_draw (day_view->main_canvas);
 }
 
-
 static void
 e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
 {
@@ -5626,7 +5552,6 @@ e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)
 	g_signal_emit_by_name (day_view, "selected_time_changed");
 }
 
-
 static void
 e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
 {
@@ -5645,7 +5570,6 @@ e_day_view_cursor_key_right (EDayView *day_view, GdkEventKey *event)
 	g_signal_emit_by_name (day_view, "selected_time_changed");
 }
 
-
 /* Scrolls the main canvas up or down. The pages_to_scroll argument
    is multiplied with the adjustment's page size and added to the adjustment's
    value, while ensuring we stay within the bounds. A positive value will
@@ -5769,7 +5693,6 @@ e_day_view_start_editing_event (EDayView *day_view,
 	}
 }
 
-
 /* This stops the current edit. If accept is TRUE the event summary is updated,
    else the edit is cancelled. */
 static void
@@ -5787,7 +5710,6 @@ e_day_view_stop_editing_event (EDayView *day_view)
 		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
 }
 
-
 /* Cancels the current edition by resetting the appointment's text to its original value */
 static void
 cancel_editing (EDayView *day_view)
@@ -6205,7 +6127,6 @@ e_day_view_change_event_end_time_up (EDayView *day_view)
 	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
 }
 
-
 static void
 e_day_view_change_event_end_time_down (EDayView *day_view)
 {
@@ -6236,7 +6157,6 @@ e_day_view_change_event_end_time_down (EDayView *day_view)
 	e_day_view_ensure_rows_visible (day_view, resize_start_row, resize_end_row);
 }
 
-
 static void
 e_day_view_on_editing_started (EDayView *day_view,
 			       GnomeCanvasItem *item)
@@ -6492,7 +6412,6 @@ e_day_view_convert_grid_position_to_time (EDayView *day_view,
 	return val;
 }
 
-
 static gboolean
 e_day_view_convert_time_to_grid_position (EDayView *day_view,
 					  time_t time,
@@ -6531,7 +6450,6 @@ e_day_view_convert_time_to_grid_position (EDayView *day_view,
 	return TRUE;
 }
 
-
 /* This starts or stops auto-scrolling when dragging a selection or resizing
    an event. */
 void
@@ -6559,7 +6477,6 @@ e_day_view_check_auto_scroll (EDayView *day_view,
 		e_day_view_stop_auto_scroll (day_view);
 }
 
-
 static void
 e_day_view_start_auto_scroll (EDayView *day_view,
 			      gboolean scroll_up)
@@ -6571,7 +6488,6 @@ e_day_view_start_auto_scroll (EDayView *day_view,
 	day_view->auto_scroll_up = scroll_up;
 }
 
-
 void
 e_day_view_stop_auto_scroll (EDayView *day_view)
 {
@@ -6581,7 +6497,6 @@ e_day_view_stop_auto_scroll (EDayView *day_view)
 	}
 }
 
-
 static gboolean
 e_day_view_auto_scroll_handler (gpointer data)
 {
@@ -6717,7 +6632,6 @@ e_day_view_get_event_position (EDayView *day_view,
 			end_row = day_view->resize_end_row;
 	}
 
-
 	*item_x = day_view->day_offsets[day]
 		+ day_view->day_widths[day] * start_col / cols_in_row;
 	*item_w = day_view->day_widths[day] * num_columns / cols_in_row
@@ -6734,7 +6648,6 @@ e_day_view_get_event_position (EDayView *day_view,
 	return TRUE;
 }
 
-
 gboolean
 e_day_view_get_long_event_position	(EDayView	*day_view,
 					 gint		 event_num,
@@ -6779,7 +6692,6 @@ e_day_view_get_long_event_position	(EDayView	*day_view,
 	return TRUE;
 }
 
-
 /* Converts a position within the entire top canvas to a day & event and
    a place within the event if appropriate. If event_num_return is NULL, it
    simply returns the grid position without trying to find the event. */
@@ -6855,7 +6767,6 @@ e_day_view_convert_position_in_top_canvas (EDayView *day_view,
 	return E_CALENDAR_VIEW_POS_NONE;
 }
 
-
 /* Converts a position within the entire main canvas to a day, row, event and
    a place within the event if appropriate. If event_num_return is NULL, it
    simply returns the grid position without trying to find the event. */
@@ -6956,7 +6867,6 @@ e_day_view_convert_position_in_main_canvas (EDayView *day_view,
 	return E_CALENDAR_VIEW_POS_NONE;
 }
 
-
 static gboolean
 e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
 				      GdkDragContext *context,
@@ -6977,7 +6887,6 @@ e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
 	return TRUE;
 }
 
-
 static void
 e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
 {
@@ -7001,7 +6910,6 @@ e_day_view_reshape_top_canvas_drag_item (EDayView *day_view)
 	e_day_view_update_top_canvas_drag (day_view, day);
 }
 
-
 static void
 e_day_view_update_top_canvas_drag (EDayView *day_view,
 				   gint day)
@@ -7046,14 +6954,12 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 
 	day_view->drag_last_day = day;
 
-
 	item_x = day_view->day_offsets[day] + E_DAY_VIEW_BAR_WIDTH;
 	item_w = day_view->day_offsets[day + num_days] - item_x
 		- E_DAY_VIEW_GAP_WIDTH;
 	item_y = row * day_view->top_row_height;
 	item_h = day_view->top_row_height - E_DAY_VIEW_TOP_CANVAS_Y_GAP;
 
-
 	/* Set the positions of the event & associated items. */
 	gnome_canvas_item_set (day_view->drag_long_event_rect_item,
 			       "x1", item_x,
@@ -7099,7 +7005,6 @@ e_day_view_update_top_canvas_drag (EDayView *day_view,
 	}
 }
 
-
 static gboolean
 e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
 				       GdkDragContext *context,
@@ -7124,7 +7029,6 @@ e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,
 	return TRUE;
 }
 
-
 static void
 e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
 {
@@ -7149,7 +7053,6 @@ e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)
 	e_day_view_update_main_canvas_drag (day_view, row, day);
 }
 
-
 static void
 e_day_view_update_main_canvas_drag (EDayView *day_view,
 				    gint row,
@@ -7261,7 +7164,6 @@ e_day_view_update_main_canvas_drag (EDayView *day_view,
 	}
 }
 
-
 static void
 e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,
 				     GdkDragContext *context,
@@ -7321,7 +7223,6 @@ e_day_view_on_drag_begin (GtkWidget      *widget,
 	gnome_canvas_item_hide (event->canvas_item);
 }
 
-
 static void
 e_day_view_on_drag_end (GtkWidget      *widget,
 			GdkDragContext *context,
@@ -7355,7 +7256,6 @@ e_day_view_on_drag_end (GtkWidget      *widget,
 	day_view->drag_event_num = -1;
 }
 
-
 static void
 e_day_view_on_drag_data_get (GtkWidget          *widget,
 			     GdkDragContext     *context,
@@ -7411,7 +7311,6 @@ e_day_view_on_drag_data_get (GtkWidget          *widget,
 	}
 }
 
-
 static void
 e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 					      GdkDragContext     *context,
@@ -7637,7 +7536,6 @@ error:
 	gtk_drag_finish (context, FALSE, FALSE, time);
 }
 
-
 static void
 e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,
 					       GdkDragContext     *context,
@@ -7843,7 +7741,6 @@ error:
 	gtk_drag_finish (context, FALSE, FALSE, time);
 }
 
-
 /* Converts an hour from 0-23 to the preferred time format, and returns the
    suffix to add and the width of it in the normal font. */
 void
@@ -7875,7 +7772,6 @@ e_day_view_convert_time_to_display	(EDayView	*day_view,
 	}
 }
 
-
 gint
 e_day_view_get_time_string_width	(EDayView	*day_view)
 {
@@ -7899,7 +7795,6 @@ e_day_view_queue_layout (EDayView *day_view)
 	}
 }
 
-
 /* Removes any queued layout. */
 static void
 e_day_view_cancel_layout (EDayView *day_view)
@@ -7910,7 +7805,6 @@ e_day_view_cancel_layout (EDayView *day_view)
 	}
 }
 
-
 static gboolean
 e_day_view_layout_timeout_cb (gpointer data)
 {
@@ -7925,7 +7819,6 @@ e_day_view_layout_timeout_cb (gpointer data)
 	return FALSE;
 }
 
-
 /* Returns the number of selected events (0 or 1 at present). */
 gint
 e_day_view_get_num_events_selected (EDayView *day_view)
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 31b8949..d4f1ca6 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -95,7 +95,6 @@ G_BEGIN_DECLS
 /* The gap between rows in the top canvas. */
 #define E_DAY_VIEW_TOP_CANVAS_Y_GAP	2
 
-
 /* These are used to get/set the working days in the week. The bit-flags are
    combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the
    day values used by localtime etc. */
@@ -110,7 +109,6 @@ typedef enum
 	E_DAY_VIEW_SATURDAY	= 1 << 6
 } EDayViewDays;
 
-
 /* These are used to specify the type of an appointment. They match those
    used in EMeetingTimeSelector. */
 typedef enum
@@ -184,12 +182,10 @@ struct _EDayViewEvent {
 	guint8 num_columns;
 };
 
-
 #define E_DAY_VIEW(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_day_view_get_type (), EDayView)
 #define E_DAY_VIEW_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_day_view_get_type (), EDayViewClass)
 #define E_IS_DAY_VIEW(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_day_view_get_type ())
 
-
 typedef struct _EDayView       EDayView;
 typedef struct _EDayViewClass  EDayViewClass;
 
@@ -486,7 +482,6 @@ struct _EDayViewClass
 	ECalendarViewClass parent_class;
 };
 
-
 GType		   e_day_view_get_type			(void);
 GtkWidget* e_day_view_new			(ECalModel *model);
 
@@ -600,7 +595,6 @@ void	   e_day_view_convert_time_to_display	(EDayView	*day_view,
 						 gint		*suffix_width);
 gint	   e_day_view_get_time_string_width	(EDayView	*day_view);
 
-
 gint	   e_day_view_event_sort_func		(const void	*arg1,
 						 const void	*arg2);
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index d3928d6..ca99bb5 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -972,7 +972,6 @@ set_message (GtkHTML *html, GtkHTMLStream *html_stream, const gchar *message, gb
 	if (message == NULL)
 		return;
 
-
 	if (err) {
 		gtk_html_stream_printf (html_stream, "<b><font color=\"#ff0000\">%s</font></b><br><br>", message);
 	} else {
@@ -1236,7 +1235,6 @@ write_html (EItipControl *itip, const gchar *itip_desc, const gchar *itip_title,
 	gtk_html_end (GTK_HTML (priv->html), html_stream, GTK_HTML_STREAM_OK);
 }
 
-
 static gchar *
 get_publish_options (void)
 {
@@ -1284,7 +1282,6 @@ get_cancel_options (gboolean found, icalcomponent_kind kind)
 	return g_strdup_printf ("<object classid=\"itip:cancel_options\"></object>");
 }
 
-
 static ECalComponent *
 get_real_item (EItipControl *itip)
 {
@@ -1807,7 +1804,6 @@ e_itip_control_get_view_only (EItipControl *itip)
 	return priv->view_only;
 }
 
-
 void
 e_itip_control_set_delegator_address (EItipControl *itip, const gchar *address)
 {
@@ -1831,7 +1827,6 @@ e_itip_control_get_delegator_address (EItipControl *itip)
 	return priv->delegator_address;
 }
 
-
 void
 e_itip_control_set_delegator_name (EItipControl *itip, const gchar *name)
 {
@@ -1878,7 +1873,6 @@ e_itip_control_get_calendar_uid (EItipControl *itip)
 	return priv->calendar_uid;
 }
 
-
 static gboolean
 change_status (icalcomponent *ical_comp, const gchar *address, icalparameter_partstat status)
 {
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 52d5860..fea2697 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -615,7 +615,6 @@ e_meeting_attendee_get_atype (EMeetingAttendee *ia)
 	return E_MEETING_ATTENDEE_OPTIONAL_PERSON;
 }
 
-
 EMeetingAttendeeEditLevel
 e_meeting_attendee_get_edit_level (EMeetingAttendee *ia)
 {
@@ -642,7 +641,6 @@ e_meeting_attendee_set_edit_level (EMeetingAttendee *ia, EMeetingAttendeeEditLev
 	priv->edit_level = level;
 }
 
-
 static gint
 compare_times (EMeetingTime *time1,
 	       EMeetingTime *time2)
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 924ab67..55e3af8 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -120,7 +120,6 @@ e_meeting_list_view_class_init (EMeetingListViewClass *klass)
 			      G_TYPE_POINTER);
 }
 
-
 static void
 add_section (ENameSelector *name_selector, const gchar *name)
 {
@@ -281,7 +280,6 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 		const gchar *attendee = NULL;
 		EDestination *des = l->data;
 
-
 		if (e_destination_is_evolution_list (des)) {
 			GList *l, *dl;
 
@@ -473,7 +471,6 @@ attendee_editing_canceled_cb (GtkCellRenderer *renderer, GtkTreeView *view)
 	gtk_tree_path_free (path);
 }
 
-
 static void
 type_edited_cb (GtkCellRenderer *renderer, const gchar *path, const gchar *text, GtkTreeView *view)
 {
@@ -661,7 +658,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 
        priv = view->priv;
 
-
        if (!(paths = gtk_tree_selection_get_selected_rows (selection, &model)))
                return;
        if (g_list_length (paths) > 1)
@@ -694,7 +690,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 
 }
 
-
 EMeetingListView *
 e_meeting_list_view_new (EMeetingStore *store)
 {
@@ -863,7 +858,6 @@ process_section (EMeetingListView *view, GList *destinations, icalparameter_role
 			if (contact)
 				fburi = e_contact_get (contact, E_CONTACT_FREEBUSY_URL);
 
-
 			if (e_meeting_store_find_attendee (priv->store, attendee, NULL) == NULL) {
 				EMeetingAttendee *ia = e_meeting_store_add_attendee_with_defaults (priv->store);
 
@@ -1003,4 +997,3 @@ e_meeting_list_view_set_name_selector (EMeetingListView *lview, ENameSelector *n
 	priv->name_selector = g_object_ref (name_selector);
 }
 
-
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
index 50aad0c..6a2dc55 100644
--- a/calendar/gui/e-meeting-list-view.h
+++ b/calendar/gui/e-meeting-list-view.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define E_IS_MEETING_LIST_VIEW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW))
 #define E_IS_MEETING_LIST_VIEW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_MEETING_LIST_VIEW))
 
-
 typedef struct _EMeetingListView        EMeetingListView;
 typedef struct _EMeetingListViewPrivate EMeetingListViewPrivate;
 typedef struct _EMeetingListViewClass   EMeetingListViewClass;
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index da60b19..20bc638 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -76,7 +76,6 @@ struct _EMeetingStoreQueueData {
 	GPtrArray *data;
 };
 
-
 static GObjectClass *parent_class = NULL;
 
 static icalparameter_cutype
@@ -565,7 +564,6 @@ ems_class_init (GObjectClass *klass)
 	klass->finalize = ems_finalize;
 }
 
-
 static void
 ems_init (EMeetingStore *store)
 {
@@ -629,7 +627,6 @@ e_meeting_store_new (void)
 	return g_object_new (E_TYPE_MEETING_STORE, NULL);
 }
 
-
 ECal *
 e_meeting_store_get_e_cal (EMeetingStore *store)
 {
@@ -1203,7 +1200,6 @@ freebusy_async (gpointer data)
 #undef USER_SUB
 #undef DOMAIN_SUB
 
-
 static gboolean
 refresh_busy_periods (gpointer data)
 {
@@ -1278,8 +1274,6 @@ refresh_busy_periods (gpointer data)
 
 	}
 
-
-
 	g_mutex_lock (store->priv->mutex);
 	store->priv->num_threads++;
 	g_mutex_unlock (store->priv->mutex);
@@ -1292,7 +1286,6 @@ refresh_busy_periods (gpointer data)
 		g_free (fbd->email);
 		priv->refresh_idle_id = 0;
 
-
 		g_mutex_lock (store->priv->mutex);
 		store->priv->num_threads--;
 		g_mutex_unlock (store->priv->mutex);
@@ -1360,7 +1353,6 @@ refresh_queue_add (EMeetingStore *store, gint row,
 	}
 	g_mutex_unlock (priv->mutex);
 
-
 	g_object_ref (attendee);
 	g_ptr_array_add (priv->refresh_queue, attendee);
 
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 00efabe..90a12b5 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -126,7 +126,6 @@ e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
 {
@@ -149,7 +148,6 @@ e_meeting_time_selector_item_init (EMeetingTimeSelectorItem *mts_item)
 	item->y2 = 0;
 }
 
-
 static void
 e_meeting_time_selector_item_dispose (GObject *object)
 {
@@ -173,7 +171,6 @@ e_meeting_time_selector_item_dispose (GObject *object)
 	G_OBJECT_CLASS (e_meeting_time_selector_item_parent_class)->dispose (object);
 }
 
-
 static void
 e_meeting_time_selector_item_set_property (GObject *object,
                                            guint property_id,
@@ -193,7 +190,6 @@ e_meeting_time_selector_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
 {
@@ -213,7 +209,6 @@ e_meeting_time_selector_item_realize (GnomeCanvasItem *item)
 	mts_item->stipple_gc = gdk_gc_new (window);
 }
 
-
 static void
 e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
 {
@@ -230,7 +225,6 @@ e_meeting_time_selector_item_unrealize (GnomeCanvasItem *item)
 		(*GNOME_CANVAS_ITEM_CLASS (e_meeting_time_selector_item_parent_class)->unrealize)(item);
 }
 
-
 static void
 e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtSVP *clip_path, gint flags)
 {
@@ -244,7 +238,6 @@ e_meeting_time_selector_item_update (GnomeCanvasItem *item, double *affine, ArtS
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -381,7 +374,6 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	else
 		e_meeting_time_selector_item_paint_busy_periods (mts_item, drawable, &date, x, y, width, height);
 
-
 	/* Draw the currently-selected meeting time vertical bars. */
 	if (show_meeting_time) {
 		if (is_display_top) {
@@ -414,7 +406,6 @@ e_meeting_time_selector_item_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 	cairo_destroy (cr);
 }
 
-
 static void
 e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
 					    GdkDrawable *drawable, GDate *date,
@@ -510,7 +501,6 @@ e_meeting_time_selector_item_paint_day_top (EMeetingTimeSelectorItem *mts_item,
 	g_object_unref (layout);
 }
 
-
 /* This paints the colored bars representing busy periods for the combined
    list of attendees. For now we just paint the bars for each attendee of
    each other. If we want to speed it up we could optimise it later. */
@@ -561,7 +551,6 @@ e_meeting_time_selector_item_paint_all_attendees_busy_periods (EMeetingTimeSelec
 	cairo_destroy (cr);
 }
 
-
 static void
 e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 					GdkDrawable *drawable, GDate *date,
@@ -632,10 +621,8 @@ e_meeting_time_selector_item_paint_day (EMeetingTimeSelectorItem *mts_item,
 				    2, height - unused_y);
 	}
 
-
 }
 
-
 /* This paints the colored bars representing busy periods for the individual
    attendees. */
 static void
@@ -685,7 +672,6 @@ e_meeting_time_selector_item_paint_busy_periods (EMeetingTimeSelectorItem *mts_i
 	cairo_destroy (cr);
 }
 
-
 /* This subtracts the attendees longest_period_in_days from the given date,
    and does a binary search of the attendee's busy periods array to find the
    first one which could possible end on the given day or later.
@@ -717,7 +703,6 @@ e_meeting_time_selector_item_find_first_busy_period (EMeetingTimeSelectorItem *m
 	return period_num;
 }
 
-
 /* This paints the visible busy periods for one attendee which are of a certain
    busy type, e.g out of office. It is passed the index of the first visible
    busy period of the attendee and continues until it runs off the screen. */
@@ -789,7 +774,6 @@ e_meeting_time_selector_item_paint_attendee_busy_periods (EMeetingTimeSelectorIt
 	}
 }
 
-
 /*
  * CANVAS ITEM ROUTINES - functions to be a GnomeCanvasItem.
  */
@@ -806,7 +790,6 @@ e_meeting_time_selector_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -831,7 +814,6 @@ e_meeting_time_selector_item_event (GnomeCanvasItem *item, GdkEvent *event)
 	return FALSE;
 }
 
-
 /* This handles all button press events for the item. If the cursor is over
    one of the meeting time vertical bars we start a drag. If not we set the
    meeting time to the nearest half-hour interval.
@@ -940,11 +922,9 @@ e_meeting_time_selector_item_button_press (EMeetingTimeSelectorItem *mts_item,
 						  end_time.hour,
 						  end_time.minute);
 
-
 	return FALSE;
 }
 
-
 /* This handles all button release events for the item. If we were dragging,
    we finish the drag. */
 static gint
@@ -966,7 +946,6 @@ e_meeting_time_selector_item_button_release (EMeetingTimeSelectorItem *mts_item,
 	return FALSE;
 }
 
-
 /* This handles all motion notify events for the item. If button1 is pressed
    we check if a drag is in progress. If not, we set the cursor if we are over
    the meeting time vertical bars. Note that GnomeCanvas doesn't use motion
@@ -1010,7 +989,6 @@ e_meeting_time_selector_item_motion_notify (EMeetingTimeSelectorItem *mts_item,
 	return FALSE;
 }
 
-
 static EMeetingTimeSelectorPosition
 e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_item,
 						gint x, gint y)
@@ -1038,7 +1016,6 @@ e_meeting_time_selector_item_get_drag_position (EMeetingTimeSelectorItem *mts_it
 	return E_MEETING_TIME_SELECTOR_POS_NONE;
 }
 
-
 static gboolean
 e_meeting_time_selector_item_calculate_busy_range (EMeetingTimeSelector *mts,
 						   gint row,
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index e9daa3d..547f01a 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -35,12 +35,10 @@
 
 G_BEGIN_DECLS
 
-
 #define E_MEETING_TIME_SELECTOR_ITEM(obj)          (G_TYPE_CHECK_INSTANCE_CAST((obj), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItem))
 #define E_MEETING_TIME_SELECTOR_ITEM_CLASS(k)      (G_TYPE_CHECK_CLASS_CAST ((k), e_meeting_time_selector_item_get_type (), EMeetingTimeSelectorItemClass))
 #define IS_E_MEETING_TIME_SELECTOR_ITEM(o)         (G_TYPE_CHECK_INSTANCE_TYPE((o), e_meeting_time_selector_item_get_type ()))
 
-
 typedef struct _EMeetingTimeSelectorItem       EMeetingTimeSelectorItem;
 typedef struct _EMeetingTimeSelectorItemClass  EMeetingTimeSelectorItemClass;
 
@@ -65,7 +63,6 @@ struct _EMeetingTimeSelectorItem
 	GdkCursor *last_cursor_set;
 };
 
-
 struct _EMeetingTimeSelectorItemClass
 {
 	GnomeCanvasItemClass parent_class;
@@ -74,5 +71,4 @@ struct _EMeetingTimeSelectorItemClass
 GType e_meeting_time_selector_item_get_type (void);
 void e_meeting_time_selector_item_set_normal_cursor (EMeetingTimeSelectorItem *mts_item);
 
-
 #endif /* _E_MEETING_TIME_SELECTOR_ITEM_H_ */
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 1ea1c90..1f4f953 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -82,7 +82,6 @@ enum {
 	LAST_SIGNAL
 };
 
-
 static gint mts_signals [LAST_SIGNAL] = { 0 };
 
 static void e_meeting_time_selector_destroy (GtkObject *object);
@@ -163,7 +162,6 @@ static EMeetingFreeBusyPeriod* e_meeting_time_selector_find_time_clash (EMeeting
 									EMeetingTime *start_time,
 									EMeetingTime *end_time);
 
-
 static void e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts);
 static void e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
@@ -221,7 +219,6 @@ e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
 	widget_class->expose_event = e_meeting_time_selector_expose_event;
 }
 
-
 static void
 e_meeting_time_selector_init (EMeetingTimeSelector * mts)
 {
@@ -248,7 +245,6 @@ e_meeting_time_selector_init (EMeetingTimeSelector * mts)
 	mts->style_change_idle_id = 0;
 }
 
-
 void
 e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems)
 {
@@ -299,7 +295,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	gtk_box_pack_start (GTK_BOX (vbox), mts->attendees_vbox, TRUE, TRUE, 0);
 	gtk_widget_show (mts->attendees_vbox);
 
-
 	/* build the etable */
 	mts->model = ems;
 
@@ -318,7 +313,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 
 	gtk_widget_show (GTK_WIDGET (mts->list_view));
 
-
 	sw = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN);
@@ -676,7 +670,6 @@ e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *em
 	g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This adds a color to the color key beneath the main display. If color is
    NULL, it displays the No Info stipple instead. */
 static void
@@ -740,7 +733,6 @@ e_meeting_time_selector_expose_key_color (GtkWidget *darea,
 	return TRUE;
 }
 
-
 static void
 e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
 					   const gchar *name, GdkColor *c)
@@ -756,7 +748,6 @@ e_meeting_time_selector_alloc_named_color (EMeetingTimeSelector * mts,
 		g_warning ("Failed to allocate color: %s\n", name);
 }
 
-
 static void
 e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
 					       GtkMenu   *menu)
@@ -772,7 +763,6 @@ e_meeting_time_selector_options_menu_detacher (GtkWidget *widget,
 	mts->options_menu = NULL;
 }
 
-
 static void
 e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
 						GtkMenu   *menu)
@@ -788,7 +778,6 @@ e_meeting_time_selector_autopick_menu_detacher (GtkWidget *widget,
 	mts->autopick_menu = NULL;
 }
 
-
 GtkWidget *
 e_meeting_time_selector_new (EMeetingStore *ems)
 {
@@ -801,7 +790,6 @@ e_meeting_time_selector_new (EMeetingStore *ems)
 	return mts;
 }
 
-
 static void
 e_meeting_time_selector_destroy (GtkObject *object)
 {
@@ -843,7 +831,6 @@ e_meeting_time_selector_destroy (GtkObject *object)
 		(*GTK_OBJECT_CLASS (e_meeting_time_selector_parent_class)->destroy)(object);
 }
 
-
 static void
 e_meeting_time_selector_realize (GtkWidget *widget)
 {
@@ -857,7 +844,6 @@ e_meeting_time_selector_realize (GtkWidget *widget)
 	mts->color_key_gc = gdk_gc_new (widget->window);
 }
 
-
 static void
 e_meeting_time_selector_unrealize (GtkWidget *widget)
 {
@@ -1002,7 +988,6 @@ e_meeting_time_selector_draw_shadow (EMeetingTimeSelector *mts)
 			  GTK_SHADOW_IN, NULL, NULL, NULL, x, y, w, h);
 }
 
-
 /* When the main canvas scrolls, we scroll the other canvases. */
 static void
 e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
@@ -1017,7 +1002,6 @@ e_meeting_time_selector_hadjustment_changed (GtkAdjustment *adjustment,
 	}
 }
 
-
 static void
 e_meeting_time_selector_vadjustment_changed (GtkAdjustment *adjustment,
 					     EMeetingTimeSelector *mts)
@@ -1057,7 +1041,6 @@ e_meeting_time_selector_get_meeting_time (EMeetingTimeSelector *mts,
 	*end_minute = mts->meeting_end_time.minute;
 }
 
-
 gboolean
 e_meeting_time_selector_set_meeting_time (EMeetingTimeSelector *mts,
 					  gint start_year,
@@ -1127,7 +1110,6 @@ e_meeting_time_selector_set_all_day (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_update_date_popup_menus (mts);
 }
 
-
 void
 e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
 						gboolean working_hours_only)
@@ -1150,7 +1132,6 @@ e_meeting_time_selector_set_working_hours_only (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_update_date_popup_menus (mts);
 }
 
-
 void
 e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
 					   gint day_start_hour,
@@ -1189,7 +1170,6 @@ e_meeting_time_selector_set_working_hours (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_update_date_popup_menus (mts);
 }
 
-
 void
 e_meeting_time_selector_set_zoomed_out (EMeetingTimeSelector *mts,
 					gboolean zoomed_out)
@@ -1286,7 +1266,6 @@ e_meeting_time_selector_get_autopick_option (EMeetingTimeSelector *mts)
 	return E_MEETING_TIME_SELECTOR_REQUIRED_PEOPLE_AND_ONE_RESOURCE;
 }
 
-
 void
 e_meeting_time_selector_set_autopick_option (EMeetingTimeSelector *mts,
 					     EMeetingTimeSelectorAutopickOption autopick_option)
@@ -1392,7 +1371,6 @@ e_meeting_time_selector_dump (EMeetingTimeSelector *mts)
 
 }
 
-
 /* This formats a EMeetingTimein a string and returns it.
    Note that it uses a static buffer. */
 gchar *
@@ -1412,7 +1390,6 @@ e_meeting_time_selector_dump_time (EMeetingTime*mtstime)
 	return buffer;
 }
 
-
 /* This formats a GDate in a string and returns it.
    Note that it uses a static buffer. */
 gchar *
@@ -1434,7 +1411,6 @@ e_meeting_time_selector_on_invite_others_button_clicked (GtkWidget *button,
 	e_meeting_list_view_invite_others_dialog (mts->list_view);
 }
 
-
 static void
 e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
 						   EMeetingTimeSelector *mts)
@@ -1444,7 +1420,6 @@ e_meeting_time_selector_on_options_button_clicked (GtkWidget *button,
 			mts, 1, GDK_CURRENT_TIME);
 }
 
-
 static void
 e_meeting_time_selector_options_menu_position_callback (GtkMenu *menu,
 							gint *x,
@@ -1483,7 +1458,6 @@ e_meeting_time_selector_on_update_free_busy (GtkWidget *button,
 	e_meeting_time_selector_refresh_free_busy (mts, 0, TRUE);
 }
 
-
 static void
 e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
 						    EMeetingTimeSelector *mts)
@@ -1493,7 +1467,6 @@ e_meeting_time_selector_on_autopick_button_clicked (GtkWidget *button,
 			mts, 1, GDK_CURRENT_TIME);
 }
 
-
 static void
 e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
 							 gint *x,
@@ -1520,7 +1493,6 @@ e_meeting_time_selector_autopick_menu_position_callback (GtkMenu *menu,
 	*y = CLAMP (*y, 0, max_y);
 }
 
-
 static void
 e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
 						    EMeetingTimeSelector *mts)
@@ -1531,7 +1503,6 @@ e_meeting_time_selector_on_autopick_option_toggled (GtkWidget *button,
 		gtk_menu_popdown (GTK_MENU (mts->autopick_menu));
 }
 
-
 static void
 e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
 						EMeetingTimeSelector *mts)
@@ -1539,7 +1510,6 @@ e_meeting_time_selector_on_prev_button_clicked (GtkWidget *button,
 	e_meeting_time_selector_autopick (mts, FALSE);
 }
 
-
 static void
 e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
 						EMeetingTimeSelector *mts)
@@ -1547,7 +1517,6 @@ e_meeting_time_selector_on_next_button_clicked (GtkWidget *button,
 	e_meeting_time_selector_autopick (mts, TRUE);
 }
 
-
 /* This tries to find the previous or next meeting time for which all
    attendees will be available. */
 static void
@@ -1672,7 +1641,6 @@ e_meeting_time_selector_autopick (EMeetingTimeSelector *mts,
 	}
 }
 
-
 static void
 e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
 						   EMeetingTime*end,
@@ -1693,7 +1661,6 @@ e_meeting_time_selector_calculate_time_difference (EMeetingTime*start,
 	}
 }
 
-
 /* This moves the given time forward to the next suitable start of a meeting.
    If zoomed_out is set, this means every hour. If not every half-hour. */
 static void
@@ -1770,7 +1737,6 @@ e_meeting_time_selector_find_nearest_interval (EMeetingTimeSelector *mts,
 	}
 }
 
-
 /* This moves the given time backward to the next suitable start of a meeting.
    If zoomed_out is set, this means every hour. If not every half-hour. */
 static void
@@ -1855,7 +1821,6 @@ e_meeting_time_selector_find_nearest_interval_backward (EMeetingTimeSelector *mt
 	}
 }
 
-
 /* This adds on the given days, hours & minutes to a EMeetingTimeSelectorTime.
    It is used to calculate the end of a period given a start & duration.
    Days, hours & minutes can be negative, to move backwards, but they should
@@ -1887,7 +1852,6 @@ e_meeting_time_selector_adjust_time (EMeetingTime*mtstime,
 	e_meeting_time_selector_fix_time_overflows (mtstime);
 }
 
-
 /* This looks for any busy period of the given attendee which clashes with
    the start and end time. It uses a binary search. */
 static EMeetingFreeBusyPeriod *
@@ -1942,7 +1906,6 @@ e_meeting_time_selector_on_zoomed_out_toggled (GtkWidget *menuitem,
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
-
 static void
 e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
 						  EMeetingTimeSelector *mts)
@@ -1956,7 +1919,6 @@ e_meeting_time_selector_on_working_hours_toggled (GtkWidget *menuitem,
 	e_meeting_time_selector_ensure_meeting_time_shown (mts);
 }
 
-
 /* This recalculates day_width, first_hour_shown and last_hour_shown. */
 static void
 e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
@@ -1995,7 +1957,6 @@ e_meeting_time_selector_recalc_grid (EMeetingTimeSelector *mts)
 	mts->meeting_positions_valid = FALSE;
 }
 
-
 /* This saves the first visible time in the given EMeetingTimeSelectorTime. */
 static void
 e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
@@ -2008,7 +1969,6 @@ e_meeting_time_selector_save_position (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_calculate_time (mts, scroll_x, mtstime);
 }
 
-
 /* This restores a saved position. */
 static void
 e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
@@ -2024,7 +1984,6 @@ e_meeting_time_selector_restore_position (EMeetingTimeSelector *mts,
 				new_scroll_x, scroll_y);
 }
 
-
 /* This returns the x pixel coords of the meeting time in the entire scroll
    region. It recalculates them if they have been marked as invalid.
    If it returns FALSE then no meeting time is set or the meeting time is
@@ -2060,7 +2019,6 @@ e_meeting_time_selector_get_meeting_time_positions (EMeetingTimeSelector *mts,
 	return TRUE;
 }
 
-
 /* This recalculates the date format to used, by computing the width of the
    longest date strings in the widget's font and seeing if they fit. */
 static void
@@ -2170,7 +2128,6 @@ e_meeting_time_selector_recalc_date_format (EMeetingTimeSelector *mts)
 	g_object_unref (layout);
 }
 
-
 /* Turn off the background of the canvas windows. This reduces flicker
    considerably when scrolling. (Why isn't it in GnomeCanvas?). */
 static void
@@ -2181,7 +2138,6 @@ e_meeting_time_selector_on_canvas_realized (GtkWidget *widget,
 				    NULL, FALSE);
 }
 
-
 /* This is called when the meeting start time GnomeDateEdit is changed,
    either via the "date_changed". "time_changed" or "activate" signals on one
    of the GtkEntry widgets. So don't use the widget parameter since it may be
@@ -2228,7 +2184,6 @@ e_meeting_time_selector_on_start_time_changed (GtkWidget *widget,
 	g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This is called when the meeting end time GnomeDateEdit is changed,
    either via the "date_changed", "time_changed" or "activate" signals on one
    of the GtkEntry widgets. So don't use the widget parameter since it may be
@@ -2278,7 +2233,6 @@ e_meeting_time_selector_on_end_time_changed (GtkWidget *widget,
 	g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This updates the ranges shown in the GnomeDateEdit popup menus, according
    to working_hours_only etc. */
 static void
@@ -2302,7 +2256,6 @@ e_meeting_time_selector_update_date_popup_menus (EMeetingTimeSelector *mts)
 	e_date_edit_set_time_popup_range (end_edit, low_hour, high_hour);
 }
 
-
 static void
 e_meeting_time_selector_on_canvas_size_allocate (GtkWidget *widget,
 						 GtkAllocation *allocation,
@@ -2343,7 +2296,6 @@ e_meeting_time_selector_update_main_canvas_scroll_region (EMeetingTimeSelector *
 					height);
 }
 
-
 /* This changes the meeting time based on the given x coordinate and whether
    we are dragging the start or end bar. It returns the new position, which
    will be swapped if the start bar is dragged past the end bar or vice versa.
@@ -2473,7 +2425,6 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
 		set_both_times = TRUE;
 	}
 
-
 	/* Mark the calculated positions as invalid. */
 	mts->meeting_positions_valid = FALSE;
 
@@ -2496,7 +2447,6 @@ e_meeting_time_selector_drag_meeting_time (EMeetingTimeSelector *mts,
 		g_signal_emit (mts, mts_signals [CHANGED], 0);
 }
 
-
 /* This is the timeout function which handles auto-scrolling when the user is
    dragging one of the meeting time vertical bars outside the left or right
    edge of the canvas. */
@@ -2649,7 +2599,6 @@ e_meeting_time_selector_timeout_handler (gpointer data)
 	return TRUE;
 }
 
-
 /* This removes our auto-scroll timeout function, if we have one installed. */
 void
 e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
@@ -2660,7 +2609,6 @@ e_meeting_time_selector_remove_timeout (EMeetingTimeSelector *mts)
 	}
 }
 
-
 /* This updates the GnomeDateEdit widget displaying the meeting start time. */
 static void
 e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
@@ -2673,7 +2621,6 @@ e_meeting_time_selector_update_start_date_edit (EMeetingTimeSelector *mts)
 					      mts->meeting_start_time.minute);
 }
 
-
 /* This updates the GnomeDateEdit widget displaying the meeting end time. */
 static void
 e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
@@ -2692,7 +2639,6 @@ e_meeting_time_selector_update_end_date_edit (EMeetingTimeSelector *mts)
 					      mts->meeting_end_time.minute);
 }
 
-
 /* This ensures that the meeting time is shown on screen, by scrolling the
    canvas and possibly by changing the range of dates shown in the canvas. */
 static void
@@ -2732,7 +2678,6 @@ e_meeting_time_selector_ensure_meeting_time_shown (EMeetingTimeSelector *mts)
 				new_scroll_x, scroll_y);
 }
 
-
 /* This updates the range of dates shown in the canvas, to make sure that the
    currently selected meeting time is in the range. */
 static void
@@ -2747,7 +2692,6 @@ e_meeting_time_selector_update_dates_shown (EMeetingTimeSelector *mts)
 			 E_MEETING_TIME_SELECTOR_DAYS_SHOWN - 1);
 }
 
-
 /* This checks if the time's hour is over 24 or its minute is over 60 and if
    so it updates the day/hour appropriately. Note that hours and minutes are
    stored in guint8's so they can't overflow by much. */
@@ -2803,7 +2747,6 @@ e_meeting_time_selector_calculate_day_and_position (EMeetingTimeSelector *mts,
 	}
 }
 
-
 /* This takes an x pixel coordinate within a day, and converts it to hours
    and minutes, depending on working_hours_only and zoomed_out. */
 void
@@ -2820,7 +2763,6 @@ e_meeting_time_selector_convert_day_position_to_hours_and_mins (EMeetingTimeSele
 	*hours += mts->first_hour_shown;
 }
 
-
 /* This takes an x pixel coordinate within the entire canvas scroll region and
    returns the time in which it falls. Note that it won't be extremely
    accurate since hours may only be a few pixels wide in the display.
@@ -2846,7 +2788,6 @@ e_meeting_time_selector_calculate_time (EMeetingTimeSelector *mts,
 	e_meeting_time_selector_convert_day_position_to_hours_and_mins (mts, day_position, &time->hour, &time->minute);
 }
 
-
 /* This takes a EMeetingTime and calculates the x pixel coordinate
    within the entire canvas scroll region. It is used to draw the selected
    meeting time and all the busy periods. */
@@ -2916,7 +2857,6 @@ row_deleted_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
 	gtk_widget_queue_draw (mts->display_main);
 }
 
-
 #define REFRESH_PAUSE 5
 
 static gboolean
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index 97be769..b38dd98 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -48,7 +48,6 @@ G_BEGIN_DECLS
 #define E_MEETING_TIME_SELECTOR_TEXT_Y_PAD		3
 #define E_MEETING_TIME_SELECTOR_TEXT_X_PAD		2
 
-
 /* This is used to specify the format used when displaying the dates.
    The full format is like 'Sunday, September 12, 1999'. The abbreviated format
    is like 'Sun 12/9/99'. The short format is like '12/9/99'. The actual
@@ -61,7 +60,6 @@ typedef enum
 	E_MEETING_TIME_SELECTOR_DATE_SHORT
 } EMeetingTimeSelectorDateFormat;
 
-
 /* This is used to specify a position regarding the vertical bars around the
    current meeting time, so we know which one is being dragged. */
 typedef enum
@@ -71,7 +69,6 @@ typedef enum
 	E_MEETING_TIME_SELECTOR_POS_END
 } EMeetingTimeSelectorPosition;
 
-
 /* This is used to specify the autopick option, which determines how we choose
    the previous/next appropriate meeting time. */
 typedef enum
@@ -87,12 +84,10 @@ extern const gchar *EMeetingTimeSelectorHours[24];
 /* An array of hour strings for 12 hour time, "12:00am" .. "11:00pm". */
 extern const gchar *EMeetingTimeSelectorHours12[24];
 
-
 #define E_MEETING_TIME_SELECTOR(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_meeting_time_selector_get_type (), EMeetingTimeSelector)
 #define E_MEETING_TIME_SELECTOR_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_meeting_time_selector_get_type (), EMeetingTimeSelectorClass)
 #define IS_E_MEETING_TIME_SELECTOR(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_meeting_time_selector_get_type ())
 
-
 typedef struct _EMeetingTimeSelector       EMeetingTimeSelector;
 typedef struct _EMeetingTimeSelectorClass  EMeetingTimeSelectorClass;
 
@@ -200,7 +195,6 @@ struct _EMeetingTimeSelector
 	   than every hour. Defaults to FALSE. */
 	gboolean zoomed_out;
 
-
 	/*
 	 * Internal Data.
 	 */
@@ -263,7 +257,6 @@ struct _EMeetingTimeSelector
 	guint style_change_idle_id;
 };
 
-
 struct _EMeetingTimeSelectorClass
 {
 	GtkTableClass parent_class;
@@ -271,7 +264,6 @@ struct _EMeetingTimeSelectorClass
 	void (* changed) (EMeetingTimeSelector *mts);
 };
 
-
 /*
  * PUBLIC INTERFACE - note that this interface will probably change, when I
  * know where the data is coming from. This is mainly just for testing for now.
@@ -351,8 +343,6 @@ gboolean e_meeting_time_selector_attendee_add_busy_period (EMeetingTimeSelector
 							   gint end_minute,
 							   EMeetingFreeBusyType busy_type);
 
-
-
 /*
  * INTERNAL ROUTINES - functions to communicate with the canvas items within
  *		       the EMeetingTimeSelector.
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index cd2e76d..1777d2c 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -42,4 +42,3 @@ G_END_DECLS
 
 #endif /* _E_MEETING_UTILS_H_ */
 
-
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index ea03097..553f239 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -70,7 +70,6 @@ static GtkTargetEntry target_types[] = {
 
 static guint n_target_types = G_N_ELEMENTS (target_types);
 
-
 extern ECompEditorRegistry *comp_editor_registry;
 
 static void e_memo_table_destroy		(GtkObject	*object);
@@ -121,7 +120,6 @@ static GdkAtom clipboard_atom = GDK_NONE;
 
 G_DEFINE_TYPE (EMemoTable, e_memo_table, GTK_TYPE_TABLE)
 
-
 static void
 e_memo_table_class_init (EMemoTableClass *klass)
 {
@@ -277,7 +275,6 @@ e_memo_table_init (EMemoTable *memo_table)
 			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
 	gtk_widget_show (table);
 
-
 	e_table = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
 	g_signal_connect (e_table, "double_click", G_CALLBACK (e_memo_table_on_double_click), memo_table);
 	g_signal_connect (e_table, "right_click", G_CALLBACK (e_memo_table_on_right_click), memo_table);
@@ -291,7 +288,6 @@ e_memo_table_init (EMemoTable *memo_table)
 		atk_object_set_name (a11y, _("Memos"));
 }
 
-
 /**
  * e_memo_table_new:
  * @Returns: a new #EMemoTable.
@@ -308,7 +304,6 @@ e_memo_table_new (void)
 	return memo_table;
 }
 
-
 /**
  * e_memo_table_get_model:
  * @memo_table: A calendar table.
@@ -326,7 +321,6 @@ e_memo_table_get_model (EMemoTable *memo_table)
 	return memo_table->model;
 }
 
-
 static void
 e_memo_table_destroy (GtkObject *object)
 {
@@ -741,7 +735,6 @@ e_memo_table_paste_clipboard (EMemoTable *memo_table)
 	GtkClipboard *clipboard;
 	g_return_if_fail (E_IS_MEMO_TABLE (memo_table));
 
-
 	clipboard = gtk_widget_get_clipboard (GTK_WIDGET (memo_table), clipboard_atom);
 	g_object_ref (memo_table);
 
@@ -804,7 +797,6 @@ e_memo_table_on_double_click (ETable *table,
 	open_memo_by_row (memo_table, row);
 }
 
-
 static void
 e_memo_table_on_open_memo (EPopup *ep, EPopupItem *pitem, gpointer data)
 {
@@ -1058,7 +1050,6 @@ e_memo_table_load_state	(EMemoTable *memo_table,
 	}
 }
 
-
 /* Saves the state of the table (headers shown etc.) to the given file. */
 void
 e_memo_table_save_state (EMemoTable	*memo_table,
@@ -1097,7 +1088,6 @@ e_memo_table_get_current_time (ECellDateEdit *ecde, gpointer data)
 	return tmp_tm;
 }
 
-
 #ifdef TRANSLATORS_ONLY
 
 static gchar *test[] = {
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index b593b94..7fbb7d0 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -38,16 +38,13 @@ G_BEGIN_DECLS
  * Used for memo events and tasks.
  */
 
-
 #define E_MEMO_TABLE(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_memo_table_get_type (), EMemoTable)
 #define E_MEMO_TABLE_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_memo_table_get_type (), EMemoTableClass)
 #define E_IS_MEMO_TABLE(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_memo_table_get_type ())
 
-
 typedef struct _EMemoTable       EMemoTable;
 typedef struct _EMemoTableClass  EMemoTableClass;
 
-
 struct _EMemoTable {
 	GtkTable table;
 
@@ -78,7 +75,6 @@ struct _EMemoTableClass {
 	void (* user_created) (EMemoTable *memo_table);
 };
 
-
 GType		   e_memo_table_get_type (void);
 GtkWidget* e_memo_table_new	(void);
 
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 4b8d234..82f6d91 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -55,7 +55,6 @@
 #include "e-memos.h"
 #include "common/authentication.h"
 
-
 /* Private part of the GnomeCalendar structure */
 struct _EMemosPrivate {
 	/* The memo lists for display */
@@ -522,7 +521,6 @@ setup_widgets (EMemos *memos)
 	gtk_paned_add1 (GTK_PANED (priv->paned), priv->memos_view);
 	gtk_widget_show (priv->memos_view);
 
-
 	e_table_drag_source_set (etable, GDK_BUTTON1_MASK,
 				 list_drag_types, num_list_drag_types,
 				 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK);
@@ -593,7 +591,6 @@ e_memos_class_init (EMemosClass *klass)
 	klass->source_removed = NULL;
 }
 
-
 static void
 categories_changed_cb (gpointer object, gpointer user_data)
 {
@@ -651,7 +648,6 @@ e_memos_new (void)
 	return GTK_WIDGET (memos);
 }
 
-
 void
 e_memos_set_ui_component (EMemos *memos,
 			  BonoboUIComponent *ui_component)
@@ -662,7 +658,6 @@ e_memos_set_ui_component (EMemos *memos,
 	e_search_bar_set_ui_component (E_SEARCH_BAR (memos->priv->search_bar), ui_component);
 }
 
-
 static void
 e_memos_destroy (GtkObject *object)
 {
@@ -993,7 +988,6 @@ e_memos_remove_memo_source (EMemos *memos, ESource *source)
 	if (!client)
 		return TRUE;
 
-
 	priv->clients_list = g_list_remove (priv->clients_list, client);
 	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA,
 					      0, 0, NULL, NULL, memos);
@@ -1003,7 +997,6 @@ e_memos_remove_memo_source (EMemos *memos, ESource *source)
 
 	g_hash_table_remove (priv->clients, uid);
 
-
 	g_signal_emit (memos, e_memos_signals[SOURCE_REMOVED], 0, source);
 
 	return TRUE;
@@ -1052,7 +1045,6 @@ e_memos_get_default_client (EMemos *memos)
 	return e_cal_model_get_default_client (e_memo_table_get_model (E_MEMO_TABLE (priv->memos_view)));
 }
 
-
 /**
  * e_memos_delete_selected:
  * @memos: A memos control widget.
@@ -1078,7 +1070,6 @@ e_memos_delete_selected (EMemos *memos)
 	e_cal_component_memo_preview_clear (E_CAL_COMPONENT_MEMO_PREVIEW (priv->preview));
 }
 
-
 /* Callback used from the view collection when we need to display a new view */
 static void
 display_view_cb (GalViewInstance *instance, GalView *view, gpointer data)
diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h
index 12aeea8..a03541c 100644
--- a/calendar/gui/e-memos.h
+++ b/calendar/gui/e-memos.h
@@ -58,7 +58,6 @@ struct _EMemosClass {
         void (* source_removed)    (EMemos *memos, ESource *source);
 };
 
-
 GType      e_memos_get_type        (void);
 GtkWidget *e_memos_construct       (EMemos *memos);
 
@@ -77,7 +76,6 @@ void       e_memos_new_memo          (EMemos            *memos);
 void       e_memos_complete_selected (EMemos            *memos);
 void       e_memos_delete_selected   (EMemos            *memos);
 
-
 void e_memos_setup_view_menus (EMemos *memos, BonoboUIComponent *uic);
 void e_memos_discard_view_menus (EMemos *memos);
 
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index f1aa1ec..0f82c32 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -27,7 +27,6 @@
 #include "e-select-names-editable.h"
 #include "e-select-names-renderer.h"
 
-
 struct _ESelectNamesRendererPriv {
 	ESelectNamesEditable *editable;
 	gchar *path;
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 5acdcc0..bf40059 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -56,7 +56,6 @@
 #include "e-cal-menu.h"
 #include "e-cal-model-tasks.h"
 
-
 /* Private part of the GnomeCalendar structure */
 struct _ETasksPrivate {
 	/* The task lists for display */
@@ -171,7 +170,6 @@ e_tasks_get_tasks_menu (ETasks *tasks)
         return tasks->priv->tasks_menu;
 }
 
-
 /* Callback used when the selection changes in the table. */
 static void
 table_selection_change_cb (ETable *etable, gpointer data)
@@ -557,7 +555,6 @@ table_drag_begin (ETable         *table,
 
 }
 
-
 static void
 table_drag_end (ETable         *table,
 		gint             row,
@@ -643,7 +640,6 @@ setup_widgets (ETasks *tasks)
 	gtk_paned_add1 (GTK_PANED (priv->paned), priv->tasks_view);
 	gtk_widget_show (priv->tasks_view);
 
-
 	e_table_drag_source_set (etable, GDK_BUTTON1_MASK,
 				 list_drag_types, num_list_drag_types,
 				 GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK);
@@ -737,7 +733,6 @@ e_tasks_class_init (ETasksClass *class)
 	class->source_removed = NULL;
 }
 
-
 static void
 categories_changed_cb (gpointer object, gpointer user_data)
 {
@@ -796,7 +791,6 @@ e_tasks_new (void)
 	return GTK_WIDGET (tasks);
 }
 
-
 void
 e_tasks_set_ui_component (ETasks *tasks,
 			  BonoboUIComponent *ui_component)
@@ -807,7 +801,6 @@ e_tasks_set_ui_component (ETasks *tasks,
 	e_search_bar_set_ui_component (E_SEARCH_BAR (tasks->priv->search_bar), ui_component);
 }
 
-
 static void
 e_tasks_destroy (GtkObject *object)
 {
@@ -1056,7 +1049,6 @@ open_ecal (ETasks *tasks, ECal *cal, gboolean only_if_exists, open_func of)
 	zone = calendar_config_get_icaltimezone ();
 	e_cal_set_default_timezone (cal, zone, NULL);
 
-
 	set_status_message (tasks, _("Opening tasks at %s"), e_cal_get_uri (cal));
 
 	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), tasks);
@@ -1224,7 +1216,6 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source)
 	if (!client)
 		return TRUE;
 
-
 	priv->clients_list = g_list_remove (priv->clients_list, client);
 	g_signal_handlers_disconnect_matched (client, G_SIGNAL_MATCH_DATA,
 					      0, 0, NULL, NULL, tasks);
@@ -1234,7 +1225,6 @@ e_tasks_remove_todo_source (ETasks *tasks, ESource *source)
 
 	g_hash_table_remove (priv->clients, uid);
 
-
 	g_signal_emit (tasks, e_tasks_signals[SOURCE_REMOVED], 0, source);
 
 	return TRUE;
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 47e38c8..f9eacb7 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -57,7 +57,6 @@ struct _ETasksClass {
         void (* source_removed)    (ETasks *tasks, ESource *source);
 };
 
-
 GType      e_tasks_get_type        (void);
 GtkWidget *e_tasks_construct       (ETasks *tasks);
 
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 28660fd..f3e239a 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -49,7 +49,6 @@ struct _ETimezoneEntryPrivate {
 	GtkWidget *button;
 };
 
-
 enum {
   CHANGED,
   LAST_SIGNAL
@@ -70,7 +69,6 @@ static void add_relation		(ETimezoneEntry *tentry,
 
 static void e_timezone_entry_set_entry  (ETimezoneEntry *tentry);
 
-
 static guint timezone_entry_signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ETimezoneEntry, e_timezone_entry, GTK_TYPE_HBOX)
@@ -99,7 +97,6 @@ e_timezone_entry_class_init		(ETimezoneEntryClass	*class)
 	class->changed = NULL;
 }
 
-
 static void
 e_timezone_entry_init		(ETimezoneEntry	*tentry)
 {
@@ -128,7 +125,6 @@ e_timezone_entry_init		(ETimezoneEntry	*tentry)
 	}
 }
 
-
 /**
  * e_timezone_entry_new:
  *
@@ -149,7 +145,6 @@ e_timezone_entry_new			(void)
 	return GTK_WIDGET (tentry);
 }
 
-
 static void
 e_timezone_entry_destroy		(GtkObject	*object)
 {
@@ -166,7 +161,6 @@ e_timezone_entry_destroy		(GtkObject	*object)
 		(* GTK_OBJECT_CLASS (e_timezone_entry_parent_class)->destroy) (object);
 }
 
-
 /* The arrow button beside the date field has been clicked, so we show the
    popup with the ECalendar in. */
 static void
@@ -193,7 +187,6 @@ on_button_clicked		(GtkWidget	*widget,
 	g_object_unref (timezone_dialog);
 }
 
-
 static void
 on_entry_changed			(GtkEntry	*entry,
 					 ETimezoneEntry *tentry)
@@ -201,7 +194,6 @@ on_entry_changed			(GtkEntry	*entry,
 	g_signal_emit (GTK_OBJECT (tentry), timezone_entry_signals[CHANGED], 0);
 }
 
-
 icaltimezone*
 e_timezone_entry_get_timezone		(ETimezoneEntry	*tentry)
 {
@@ -272,7 +264,6 @@ e_timezone_entry_set_timezone		(ETimezoneEntry	*tentry,
 	add_relation (tentry, priv->entry);
 }
 
-
 /* Sets the default timezone. If the current timezone matches this, then the
    entry field is hidden. This is useful since most people do not use timezones
    so it makes the user interface simpler. */
@@ -291,7 +282,6 @@ e_timezone_entry_set_default_timezone	(ETimezoneEntry	*tentry,
 	e_timezone_entry_set_entry (tentry);
 }
 
-
 static void
 e_timezone_entry_set_entry (ETimezoneEntry *tentry)
 {
@@ -325,7 +315,6 @@ e_timezone_entry_set_entry (ETimezoneEntry *tentry)
 	g_free (name_buffer);
 }
 
-
 static gboolean
 e_timezone_entry_mnemonic_activate (GtkWidget *widget,
                                     gboolean   group_cycling)
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index 6c63fb8..c1bf482 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -37,14 +37,12 @@
 
 G_BEGIN_DECLS
 
-
 #define E_TYPE_TIMEZONE_ENTRY            (e_timezone_entry_get_type ())
 #define E_TIMEZONE_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntry))
 #define E_TIMEZONE_ENTRY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_TYPE_TIMEZONE_ENTRY, ETimezoneEntryClass))
 #define E_IS_TIMEZONE_ENTRY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_ENTRY))
 #define E_IS_TIMEZONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_ENTRY))
 
-
 typedef struct _ETimezoneEntry        ETimezoneEntry;
 typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate;
 typedef struct _ETimezoneEntryClass   ETimezoneEntryClass;
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 6ab551e..8ad8b60 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -89,7 +89,6 @@ static ECalendarViewPosition e_week_view_event_item_get_position (EWeekViewEvent
 							      gdouble x,
 							      gdouble y);
 
-
 /* The arguments we take */
 enum {
 	PROP_0,
@@ -139,7 +138,6 @@ e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_week_view_event_item_init (EWeekViewEventItem *wveitem)
 {
@@ -147,7 +145,6 @@ e_week_view_event_item_init (EWeekViewEventItem *wveitem)
 	wveitem->span_num = -1;
 }
 
-
 static void
 e_week_view_event_item_set_property (GObject *object,
                                      guint property_id,
@@ -174,7 +171,6 @@ e_week_view_event_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_week_view_event_item_update (GnomeCanvasItem *item,
 			       double	       *affine,
@@ -720,7 +716,6 @@ e_week_view_draw_time	(EWeekView	*week_view,
 	g_object_unref (layout);
 }
 
-
 static void
 e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
 				   GdkDrawable        *drawable,
@@ -859,7 +854,6 @@ e_week_view_event_item_draw_icons (EWeekViewEventItem *wveitem,
 	gdk_gc_set_clip_mask (gc, NULL);
 }
 
-
 /* This draws a little triangle to indicate that an event extends past
    the days visible on screen. */
 static void
@@ -922,7 +916,6 @@ e_week_view_event_item_draw_triangle (EWeekViewEventItem *wveitem,
 	cairo_save (cr);
 	gdk_cairo_set_source_color (cr, &week_view->colors[E_WEEK_VIEW_COLOR_EVENT_BORDER]);
 
-
 	/* If the height is odd we can use the same central point for both
 	   lines. If it is even we use different end-points. */
 	c1 = c2 = y + (h / 2);
@@ -951,7 +944,6 @@ e_week_view_event_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
 static gint
 e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -975,7 +967,6 @@ e_week_view_event_item_event (GnomeCanvasItem *item, GdkEvent *event)
 	return FALSE;
 }
 
-
 static gboolean
 e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
 				     GdkEvent		*bevent)
@@ -1045,7 +1036,6 @@ e_week_view_event_item_button_press (EWeekViewEventItem *wveitem,
 	return FALSE;
 }
 
-
 static gboolean
 e_week_view_event_item_button_release (EWeekViewEventItem *wveitem,
 				       GdkEvent		  *event)
@@ -1109,7 +1099,6 @@ e_week_view_event_item_double_click (EWeekViewEventItem *wveitem,
 	return TRUE;
 }
 
-
 static ECalendarViewPosition
 e_week_view_event_item_get_position (EWeekViewEventItem *wveitem,
 				     gdouble x,
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index ebc5d07..6c07774 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -56,11 +56,8 @@ typedef struct {
 
 } EWeekViewEventItemClass;
 
-
 GType    e_week_view_event_item_get_type      (void);
 
-
-
 G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_EVENT_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 8f0cb5e..f28f77a 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -45,7 +45,6 @@ static gint e_week_view_find_span_end	(gboolean	 multi_week_view,
 					 gint		 display_start_day,
 					 gint		 day);
 
-
 GArray*
 e_week_view_layout_events	(GArray		*events,
 				 GArray		*old_spans,
@@ -108,7 +107,6 @@ e_week_view_layout_events	(GArray		*events,
 	return spans;
 }
 
-
 static void
 e_week_view_layout_event	(EWeekViewEvent	*event,
 				 guint8		*grid,
@@ -211,7 +209,6 @@ e_week_view_layout_event	(EWeekViewEvent	*event,
 	event->num_spans = num_spans;
 }
 
-
 /* Finds the day containing the given time.
    If include_midnight_in_prev_day is TRUE then if the time exactly
    matches the start of a day the previous day is returned. This is useful
@@ -241,7 +238,6 @@ e_week_view_find_day		(time_t		 time_to_find,
 	g_return_val_if_reached (days_shown);
 }
 
-
 /* This returns the last possible day in the same span as the given day.
    A span is all the days which are displayed next to each other from left to
    right. In the week view all spans are only 1 day, since Tuesday is below
@@ -279,7 +275,6 @@ e_week_view_find_span_end	(gboolean	 multi_week_view,
 	}
 }
 
-
 void
 e_week_view_layout_get_day_position	(gint		 day,
 					 gboolean	 multi_week_view,
@@ -403,7 +398,6 @@ e_week_view_layout_get_day_position	(gint		 day,
 	}
 }
 
-
 /* Returns TRUE if the event span is visible or FALSE if it isn't.
    It also returns the number of days of the span that are visible.
    Usually this can easily be determined by the start & end days and row of
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index 47804cb..21db0a8 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -96,14 +96,12 @@ e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
 	e_week_view_main_item_a11y_init ();
 }
 
-
 static void
 e_week_view_main_item_init (EWeekViewMainItem *wvmitem)
 {
 	wvmitem->week_view = NULL;
 }
 
-
 static void
 e_week_view_main_item_set_property (GObject *object,
                                     guint property_id,
@@ -123,7 +121,6 @@ e_week_view_main_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_week_view_main_item_update (GnomeCanvasItem *item,
 			      double	      *affine,
@@ -140,7 +137,6 @@ e_week_view_main_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -453,4 +449,3 @@ e_week_view_main_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 135a25e..3be9bbe 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -52,11 +52,8 @@ typedef struct {
 
 } EWeekViewMainItemClass;
 
-
 GType    e_week_view_main_item_get_type      (void);
 
-
-
 G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_MAIN_ITEM_H_ */
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index e9ff467..69108f4 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -82,14 +82,12 @@ e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
 			G_PARAM_WRITABLE));
 }
 
-
 static void
 e_week_view_titles_item_init (EWeekViewTitlesItem *wvtitem)
 {
 	wvtitem->week_view = NULL;
 }
 
-
 static void
 e_week_view_titles_item_set_property (GObject *object,
                                       guint property_id,
@@ -109,7 +107,6 @@ e_week_view_titles_item_set_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_week_view_titles_item_update (GnomeCanvasItem *item,
 				double	    *affine,
@@ -126,7 +123,6 @@ e_week_view_titles_item_update (GnomeCanvasItem *item,
 	item->y2 = INT_MAX;
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -263,7 +259,6 @@ e_week_view_titles_item_draw (GnomeCanvasItem  *canvas_item,
 	g_object_unref (layout);
 }
 
-
 /* This is supposed to return the nearest item the the point and the distance.
    Since we are the only item we just return ourself and 0 for the distance.
    This is needed so that we get button/motion events. */
@@ -276,4 +271,3 @@ e_week_view_titles_item_point (GnomeCanvasItem *item, double x, double y,
 	return 0.0;
 }
 
-
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 6ee6cda..3b27034 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -52,11 +52,8 @@ typedef struct {
 
 } EWeekViewTitlesItemClass;
 
-
 GType    e_week_view_titles_item_get_type      (void);
 
-
-
 G_END_DECLS
 
 #endif /* _E_WEEK_VIEW_TITLES_ITEM_H_ */
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index bcede69..5ff63a3 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -372,7 +372,6 @@ model_row_changed_cb (ETableModel *etm, gint row, gpointer user_data)
 		return;
 	}
 
-
 	update_row (week_view, row);
 }
 
@@ -663,7 +662,6 @@ e_week_view_new (ECalModel *model)
 	return week_view;
 }
 
-
 static void
 e_week_view_destroy (GtkObject *object)
 {
@@ -712,7 +710,6 @@ e_week_view_destroy (GtkObject *object)
 	GTK_OBJECT_CLASS (e_week_view_parent_class)->destroy (object);
 }
 
-
 static void
 e_week_view_realize (GtkWidget *widget)
 {
@@ -988,7 +985,6 @@ e_week_view_style_set (GtkWidget *widget,
 	pango_font_metrics_unref (font_metrics);
 }
 
-
 /* This recalculates the sizes of each column. */
 static void
 e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
@@ -1011,7 +1007,6 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view->titles_canvas),
 						0, 0, new_x2, new_y2);
 
-
 	/* Set the scroll region of the main canvas to its allocated width,
 	   but with the height depending on the number of rows needed. */
 	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view->main_canvas),
@@ -1029,7 +1024,6 @@ e_week_view_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	}
 }
 
-
 static void
 e_week_view_recalc_cell_sizes (EWeekView *week_view)
 {
@@ -1084,7 +1078,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 			- week_view->row_offsets[row];
 	}
 
-
 	/* If the font hasn't been set yet just return. */
 	widget = GTK_WIDGET (week_view);
 	style = gtk_widget_get_style (widget);
@@ -1098,7 +1091,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 	font_metrics = pango_context_get_metrics (pango_context, font_desc,
 						  pango_context_get_language (pango_context));
 
-
 	/* Calculate the number of rows of events in each cell, for the large
 	   cells and the compressed weekend cells. */
 	if (week_view->multi_week_view) {
@@ -1150,7 +1142,6 @@ e_week_view_recalc_cell_sizes (EWeekView *week_view)
 	pango_font_metrics_unref (font_metrics);
 }
 
-
 static gint
 e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1169,7 +1160,6 @@ e_week_view_focus_in (GtkWidget *widget, GdkEventFocus *event)
 	return FALSE;
 }
 
-
 static gint
 e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 {
@@ -1188,7 +1178,6 @@ e_week_view_focus_out (GtkWidget *widget, GdkEventFocus *event)
 	return FALSE;
 }
 
-
 /* This draws a shadow around the top display and main display. */
 static gint
 e_week_view_expose_event (GtkWidget *widget,
@@ -1506,7 +1495,6 @@ e_week_view_set_selected_time_range_visible	(EWeekView	*week_view,
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
 
-
 /* Returns the selected time range. */
 static gboolean
 e_week_view_get_selected_time_range	(ECalendarView	*cal_view,
@@ -1553,7 +1541,6 @@ e_week_view_get_visible_time_range	(ECalendarView	*cal_view,
 	return TRUE;
 }
 
-
 /* Note that the returned date may be invalid if no date has been set yet. */
 void
 e_week_view_get_first_day_shown		(EWeekView	*week_view,
@@ -1562,7 +1549,6 @@ e_week_view_get_first_day_shown		(EWeekView	*week_view,
 	*date = week_view->first_day_shown;
 }
 
-
 /* This sets the first day shown in the view. It will be rounded down to the
    nearest week. */
 void
@@ -1652,7 +1638,6 @@ e_week_view_set_first_day_shown		(EWeekView	*week_view,
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
 
-
 /* Recalculates the time_t corresponding to the start of each day. */
 static void
 e_week_view_recalc_day_starts (EWeekView *week_view,
@@ -1694,7 +1679,6 @@ e_week_view_get_multi_week_view	(EWeekView	*week_view)
 	return week_view->multi_week_view;
 }
 
-
 void
 e_week_view_set_multi_week_view	(EWeekView	*week_view,
 				 gboolean	 multi_week_view)
@@ -1753,7 +1737,6 @@ e_week_view_get_update_base_date (EWeekView *week_view)
 	return week_view->update_base_date;
 }
 
-
 void
 e_week_view_set_update_base_date (EWeekView *week_view, gboolean update_base_date)
 {
@@ -1770,7 +1753,6 @@ e_week_view_get_weeks_shown	(EWeekView	*week_view)
 	return week_view->weeks_shown;
 }
 
-
 void
 e_week_view_set_weeks_shown	(EWeekView	*week_view,
 				 gint		 weeks_shown)
@@ -1810,7 +1792,6 @@ e_week_view_set_weeks_shown	(EWeekView	*week_view,
 	}
 }
 
-
 gboolean
 e_week_view_get_compress_weekend	(EWeekView	*week_view)
 {
@@ -1819,7 +1800,6 @@ e_week_view_get_compress_weekend	(EWeekView	*week_view)
 	return week_view->compress_weekend;
 }
 
-
 void
 e_week_view_set_compress_weekend	(EWeekView	*week_view,
 					 gboolean	 compress)
@@ -1866,7 +1846,6 @@ e_week_view_get_show_event_end_times	(EWeekView	*week_view)
 	return week_view->show_event_end_times;
 }
 
-
 void
 e_week_view_set_show_event_end_times	(EWeekView	*week_view,
 					 gboolean	 show)
@@ -1881,7 +1860,6 @@ e_week_view_set_show_event_end_times	(EWeekView	*week_view,
 	}
 }
 
-
 /* The first day of the week, 0 (Monday) to 6 (Sunday). */
 gint
 e_week_view_get_week_start_day	(EWeekView	*week_view)
@@ -1891,7 +1869,6 @@ e_week_view_get_week_start_day	(EWeekView	*week_view)
 	return week_view->week_start_day;
 }
 
-
 void
 e_week_view_set_week_start_day	(EWeekView	*week_view,
 				 gint		 week_start_day)
@@ -2000,7 +1977,6 @@ e_week_view_foreach_event_with_uid (EWeekView *week_view,
 	}
 }
 
-
 static gboolean
 e_week_view_remove_event_cb (EWeekView *week_view,
 			     gint event_num,
@@ -2062,7 +2038,6 @@ e_week_view_remove_event_cb (EWeekView *week_view,
 	return TRUE;
 }
 
-
 void
 e_week_view_get_day_position	(EWeekView	*week_view,
 				 gint		 day,
@@ -2093,7 +2068,6 @@ e_week_view_get_day_position	(EWeekView	*week_view,
 	}
 }
 
-
 /* Returns the bounding box for a span of an event. Usually this can easily
    be determined by the start & end days and row of the span, which are set in
    e_week_view_layout_event(). Though we need a special case for the weekends
@@ -2155,8 +2129,6 @@ e_week_view_get_span_position	(EWeekView	*week_view,
 	return TRUE;
 }
 
-
-
 static gboolean
 e_week_view_on_button_press (GtkWidget *widget,
 			     GdkEventButton *event,
@@ -2233,7 +2205,6 @@ e_week_view_on_button_press (GtkWidget *widget,
 	return TRUE;
 }
 
-
 static gboolean
 e_week_view_on_button_release (GtkWidget *widget,
 			       GdkEventButton *event,
@@ -2289,7 +2260,6 @@ e_week_view_on_scroll (GtkWidget *widget,
 	return TRUE;
 }
 
-
 static gboolean
 e_week_view_on_motion (GtkWidget *widget,
 		       GdkEventMotion *mevent,
@@ -2316,7 +2286,6 @@ e_week_view_on_motion (GtkWidget *widget,
 	return FALSE;
 }
 
-
 /* Converts a position in the canvas window to a day offset from the first
    day displayed. Returns -1 if the position is outside the grid. */
 static gint
@@ -2376,7 +2345,6 @@ e_week_view_convert_position_to_day (EWeekView *week_view,
 	return week * 7 + day;
 }
 
-
 static void
 e_week_view_update_selection (EWeekView *week_view,
 			      gint day)
@@ -2417,7 +2385,6 @@ e_week_view_update_selection (EWeekView *week_view,
 	}
 }
 
-
 static void
 e_week_view_free_events (EWeekView *week_view)
 {
@@ -2467,7 +2434,6 @@ e_week_view_free_events (EWeekView *week_view)
 	}
 }
 
-
 /* This adds one event to the view, adding it to the appropriate array. */
 static gboolean
 e_week_view_add_event (ECalComponent *comp,
@@ -2542,7 +2508,6 @@ e_week_view_add_event (ECalComponent *comp,
 	return TRUE;
 }
 
-
 /* This lays out the events, or reshapes them, as necessary. */
 static void
 e_week_view_check_layout (EWeekView *week_view)
@@ -2571,7 +2536,6 @@ e_week_view_check_layout (EWeekView *week_view)
 	week_view->events_need_reshape = FALSE;
 }
 
-
 static void
 e_week_view_ensure_events_sorted (EWeekView *week_view)
 {
@@ -2584,7 +2548,6 @@ e_week_view_ensure_events_sorted (EWeekView *week_view)
 	}
 }
 
-
 gint
 e_week_view_event_sort_func (gconstpointer arg1,
 			     gconstpointer arg2)
@@ -2607,7 +2570,6 @@ e_week_view_event_sort_func (gconstpointer arg1,
 	return 0;
 }
 
-
 static void
 e_week_view_reshape_events (EWeekView *week_view)
 {
@@ -2896,7 +2858,6 @@ e_week_view_reshape_event_span (EWeekView *week_view,
 	   the icons in the middle, but making sure we don't go over the times.
 	*/
 
-
 	/* Calculate the space necessary to display a time, e.g. "13:00". */
 	time_width = e_week_view_get_time_string_width (week_view);
 
@@ -3108,7 +3069,6 @@ e_week_view_start_editing_event (EWeekView *week_view,
 	return TRUE;
 }
 
-
 /* This stops any current edit. */
 void
 e_week_view_stop_editing_event (EWeekView *week_view)
@@ -3125,7 +3085,6 @@ e_week_view_stop_editing_event (EWeekView *week_view)
 		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);
 }
 
-
 /* Cancels the current edition by resetting the appointment's text to its original value */
 static void
 cancel_editing (EWeekView *week_view)
@@ -3300,7 +3259,6 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 						       &nspan))
 			return FALSE;
 
-
 		g_object_set_data ((GObject *)item, "event-num", GINT_TO_POINTER (nevent));
 
 		pevent = tooltip_get_view_event (week_view, -1, nevent);
@@ -3506,7 +3464,6 @@ e_week_view_change_event_time (EWeekView *week_view, time_t start_dt, time_t end
 
 	week_view->last_edited_comp_string = e_cal_component_get_as_string (comp);
 
-
 	if (e_cal_component_has_recurrences (comp)) {
 		if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
 			gtk_widget_queue_draw (week_view->main_canvas);
@@ -3561,7 +3518,6 @@ e_week_view_on_editing_started (EWeekView *week_view,
 	g_signal_emit_by_name (week_view, "selection_changed");
 }
 
-
 static void
 e_week_view_on_editing_stopped (EWeekView *week_view,
 				GnomeCanvasItem *item)
@@ -3719,7 +3675,6 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 	g_signal_emit_by_name (week_view, "selection_changed");
 }
 
-
 gboolean
 e_week_view_find_event_from_item (EWeekView	  *week_view,
 				  GnomeCanvasItem *item,
@@ -3749,7 +3704,6 @@ e_week_view_find_event_from_item (EWeekView	  *week_view,
 	return FALSE;
 }
 
-
 /* Finds the index of the event with the given uid.
    Returns TRUE if an event with the uid was found.
    Note that for recurring events there may be several EWeekViewEvents, one
@@ -3802,7 +3756,6 @@ e_week_view_find_event_from_uid (EWeekView	  *week_view,
 	return FALSE;
 }
 
-
 gboolean
 e_week_view_is_one_day_event	(EWeekView	*week_view,
 				 gint		 event_num)
@@ -4394,7 +4347,6 @@ e_week_view_on_jump_button_event (GnomeCanvasItem *item,
 	return FALSE;
 }
 
-
 /* Converts an hour from 0-23 to the preferred time format, and returns the
    suffix to add and the width of it in the normal font. */
 void
@@ -4426,7 +4378,6 @@ e_week_view_convert_time_to_display	(EWeekView	*week_view,
 	}
 }
 
-
 gint
 e_week_view_get_time_string_width	(EWeekView	*week_view)
 {
@@ -4455,7 +4406,6 @@ e_week_view_queue_layout (EWeekView *week_view)
 	}
 }
 
-
 /* Removes any queued layout. */
 static void
 e_week_view_cancel_layout (EWeekView *week_view)
@@ -4466,7 +4416,6 @@ e_week_view_cancel_layout (EWeekView *week_view)
 	}
 }
 
-
 static gboolean
 e_week_view_layout_timeout_cb (gpointer data)
 {
@@ -4479,7 +4428,6 @@ e_week_view_layout_timeout_cb (gpointer data)
 	return FALSE;
 }
 
-
 /* Returns the number of selected events (0 or 1 at present). */
 gint
 e_week_view_get_num_events_selected (EWeekView *week_view)
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index eff5466..b536e5d 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -147,12 +147,10 @@ struct _EWeekViewEvent {
 	guint8 num_spans;
 };
 
-
 #define E_WEEK_VIEW(obj)          G_TYPE_CHECK_INSTANCE_CAST (obj, e_week_view_get_type (), EWeekView)
 #define E_WEEK_VIEW_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_week_view_get_type (), EWeekViewClass)
 #define E_IS_WEEK_VIEW(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_week_view_get_type ())
 
-
 typedef struct _EWeekView       EWeekView;
 typedef struct _EWeekViewClass  EWeekViewClass;
 
@@ -349,7 +347,6 @@ struct _EWeekViewClass
 	ECalendarViewClass parent_class;
 };
 
-
 GType		   e_week_view_get_type			(void);
 GtkWidget* e_week_view_new			(ECalModel *model);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index e2fbd0f..43f131f 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -223,7 +223,6 @@ typedef enum {
 
 static guint gnome_calendar_signals[LAST_SIGNAL];
 
-
 
 
 static void gnome_calendar_destroy (GtkObject *object);
@@ -335,7 +334,6 @@ gnome_calendar_class_init (GnomeCalendarClass *class)
 				g_cclosure_marshal_VOID__VOID,
 				G_TYPE_NONE, 0);
 
-
 	gnome_calendar_signals[CALENDAR_FOCUS_CHANGE] =
 		g_signal_new ("calendar_focus_change",
 				G_TYPE_FROM_CLASS (object_class),
@@ -1080,7 +1078,6 @@ view_selection_changed_cb (GtkWidget *view, GnomeCalendar *gcal)
 	g_signal_emit (gcal, gnome_calendar_signals[CALENDAR_SELECTION_CHANGED], 0);
 }
 
-
 /**
  * gnome_calendar_emit_user_created_signal
  * Emits "user_created" signal on a gcal and use calendar as a store where was event created.
@@ -1121,7 +1118,6 @@ user_created_cb (GtkWidget *view, GnomeCalendar *gcal)
 	gnome_calendar_add_source (gcal, E_CAL_SOURCE_TYPE_EVENT, e_cal_get_source (ecal));
 }
 
-
 /* Callback used when the taskpad receives a focus event.  We emit the
  * corresponding signal so that parents can change the menus as appropriate.
  */
@@ -1590,7 +1586,6 @@ categories_changed_cb (gpointer object, gpointer user_data)
 	g_ptr_array_free (cat_array, TRUE);
 }
 
-
 static void
 view_progress_cb (ECalModel *model, const gchar *message, gint percent, ECalSourceType type, GnomeCalendar *gcal)
 {
@@ -2203,7 +2198,6 @@ gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
 	}
 }
 
-
 static void
 update_view_times (GnomeCalendar *gcal, time_t start_time)
 {
@@ -2370,7 +2364,6 @@ set_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean range_s
 	focus_current_view (gcal);
 }
 
-
 /**
  * gnome_calendar_set_view:
  * @gcal: A calendar.
@@ -2503,7 +2496,6 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
 		return;
 	}
 
-
 	display_view (gcal, view_type, TRUE);
 
 	if (!priv->base_view_time)
@@ -3453,7 +3445,6 @@ gnome_calendar_set_default_source (GnomeCalendar *gcal, ECalSourceType source_ty
 			return FALSE;
 	}
 
-
 	open_ecal (gcal, priv->default_client[source_type], FALSE, default_client_cal_opened_cb);
 
 	return TRUE;
@@ -3557,7 +3548,6 @@ gnome_calendar_new_task		(GnomeCalendar *gcal, time_t *dtstart, time_t *dtend)
 	gtk_window_present (GTK_WINDOW (editor));
 }
 
-
 /* Returns the selected time range for the current view. Note that this may be
    different from the fields in the GnomeCalendar, since the view may clip
    this or choose a more appropriate time. */
@@ -3570,7 +3560,6 @@ gnome_calendar_get_current_time_range (GnomeCalendar *gcal,
 					    start_time, end_time);
 }
 
-
 /* Gets the visible time range for the current view. Returns FALSE if no
    time range has been set yet. */
 gboolean
@@ -3779,7 +3768,6 @@ gnome_calendar_hpane_resized (GtkWidget *w, GdkEventButton *e, GnomeCalendar *gc
 	else
 		gtk_widget_set_size_request (E_DAY_VIEW (priv->day_view)->time_canvas, priv->hpane_pos - 20, -1);
 
-
 	return FALSE;
 }
 static void
@@ -3868,7 +3856,6 @@ gnome_calendar_paste_clipboard (GnomeCalendar *gcal)
 		e_memo_table_paste_clipboard (E_MEMO_TABLE (priv->memo));
 }
 
-
 /* Get the current timezone. */
 icaltimezone*
 gnome_calendar_get_timezone	(GnomeCalendar	*gcal)
@@ -3879,7 +3866,6 @@ gnome_calendar_get_timezone	(GnomeCalendar	*gcal)
 	return gcal->priv->zone;
 }
 
-
 static void
 gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)
 {
@@ -3908,7 +3894,6 @@ gnome_calendar_notify_dates_shown_changed (GnomeCalendar *gcal)
 	update_memo_view (gcal);
 }
 
-
 /* Returns the number of selected events (0 or 1 at present). */
 gint
 gnome_calendar_get_num_events_selected (GnomeCalendar *gcal)
@@ -3951,7 +3936,6 @@ gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal)
 	return e_table_selected_count (etable);
 }
 
-
 void
 gnome_calendar_delete_selection		(GnomeCalendar  *gcal)
 {
@@ -4141,7 +4125,6 @@ ECalMenu *gnome_calendar_get_memopad_menu (GnomeCalendar *gcal)
 	return gcal->priv->memopad_menu;
 }
 
-
 void
 gnome_calendar_edit_appointment (GnomeCalendar *gcal,
 				 const gchar * src_uid,
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 978bad4..2a5e2f8 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -103,7 +103,6 @@ struct _GnomeCalendarClass {
         void (* goto_date)              (GnomeCalendar *gcal, GnomeCalendarGotoDateType date);
 };
 
-
 GType      gnome_calendar_get_type		(void);
 GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);
 
@@ -180,7 +179,6 @@ gint       gnome_calendar_get_num_tasks_selected (GnomeCalendar *gcal);
 /* Get the current timezone. */
 icaltimezone *gnome_calendar_get_timezone	(GnomeCalendar	*gcal);
 
-
 /* Clipboard operations */
 void       gnome_calendar_cut_clipboard         (GnomeCalendar  *gcal);
 void       gnome_calendar_copy_clipboard        (GnomeCalendar  *gcal);
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index ab107ad..10599f2 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -223,7 +223,6 @@ set_prop ( BonoboPropertyBag *bag,
 	}
 }
 
-
 BonoboControl *
 itip_bonobo_control_new (void)
 {
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index cc290b2..860edd7 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -301,7 +301,6 @@ typedef struct {
 	icalcomponent *zones;
 } ItipUtilTZData;
 
-
 static void
 foreach_tzid_callback (icalparameter *param, gpointer data)
 {
@@ -412,7 +411,6 @@ comp_from (ECalComponentItipMethod method, ECalComponent *comp)
 		}
 		return g_strdup (itip_strip_mailto (organizer.value));
 
-
 	default:
 		if (!e_cal_component_has_attendees (comp))
 			return NULL;
@@ -1399,22 +1397,18 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 
 		e_cal_component_free_text_list (text_list);
 
-
 		e_cal_component_get_summary (comp, &text);
 		if (text.value)
 			subject = g_strdup (text.value);
 
-
 		e_cal_component_get_organizer (comp, &organizer);
 		if (organizer.value)
 			orig_from = g_strdup (itip_strip_mailto (organizer.value));
 
-
 		e_cal_component_get_location (comp, &location);
 		if (!location)
 			location = "Unspecified";
 
-
 		e_cal_component_get_dtstart (comp, &dtstart);
 		if (dtstart.value) {
 			start_zone = icaltimezone_get_builtin_timezone_from_tzid (dtstart.tzid);
@@ -1430,7 +1424,6 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 			time = g_strdup (ctime (&start));
 		}
 
-
 		body = g_string_new ("<br><br><hr><br><b>______ Original Appointment ______ </b><br><br><table>");
 
 		if (orig_from && *orig_from)
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index a3a3a33..9924538 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -67,7 +67,6 @@ ECompEditorRegistry *comp_editor_registry = NULL;
 /* The component editor factory */
 static CompEditorFactory *comp_editor_factory = NULL;
 
-
 /* Factory function for the calendar component factory; just creates and
  * references a singleton service object.
  */
@@ -84,7 +83,6 @@ comp_editor_factory_fn (void)
 	return BONOBO_OBJECT (comp_editor_factory);
 }
 
-
 /* Does a simple activation and unreffing of the alarm notification service so
  * that the daemon will be launched if it is not running yet.
  */
@@ -138,7 +136,6 @@ initialize (void)
 
 	launch_alarm_daemon ();
 
-
 	/* Initialize plugin system */
 	e_plugin_hook_register_type (e_cal_popup_hook_get_type());
 	e_plugin_hook_register_type (e_cal_menu_hook_get_type());
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 1efc7e6..f4e3200 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -79,7 +79,6 @@ static BonoboObjectClass *parent_class = NULL;
 /* Memos should have their own registry */
 extern ECompEditorRegistry *comp_editor_registry;
 
-
 typedef struct _MemosComponentView
 {
 	ESourceList *source_list;
@@ -366,7 +365,6 @@ update_primary_selection (MemosComponentView *component_view)
 
 }
 
-
 /* Callbacks.  */
 /* TODO: doesn't work! */
 static void
diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h
index bba81a4..54f522b 100644
--- a/calendar/gui/memos-component.h
+++ b/calendar/gui/memos-component.h
@@ -29,14 +29,12 @@
 #include <widgets/misc/e-activity-handler.h>
 #include "Evolution.h"
 
-
 #define MEMOS_TYPE_COMPONENT			(memos_component_get_type ())
 #define MEMOS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), MEMOS_TYPE_COMPONENT, MemosComponent))
 #define MEMOS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), MEMOS_TYPE_COMPONENT, MemosComponentClass))
 #define MEMOS_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MEMOS_TYPE_COMPONENT))
 #define MEMOS_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), MEMOS_TYPE_COMPONENT))
 
-
 typedef struct _MemosComponent        MemosComponent;
 typedef struct _MemosComponentPrivate MemosComponentPrivate;
 typedef struct _MemosComponentClass   MemosComponentClass;
@@ -53,7 +51,6 @@ struct _MemosComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType             memos_component_get_type  (void);
 MemosComponent   *memos_component_peek  (void);
 
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 46719a5..a798377 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -47,7 +47,6 @@
 
 #define FIXED_MARGIN                            .05
 
-
 static void memos_control_activate_cb		(BonoboControl		*control,
 						 gboolean		 activate,
 						 gpointer		 user_data);
@@ -116,7 +115,6 @@ memos_control_new (void)
 	return control;
 }
 
-
 static void
 memos_control_activate_cb		(BonoboControl		*control,
 					 gboolean		 activate,
@@ -275,7 +273,6 @@ memos_control_activate (BonoboControl *control, EMemos *memos)
 	bonobo_ui_component_thaw (uic, NULL);
 }
 
-
 void
 memos_control_deactivate (BonoboControl *control, EMemos *memos)
 {
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 6ebf17f..1597b96 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -261,7 +261,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;
@@ -1148,7 +1147,6 @@ add_gw_esource (ESourceList *source_list, const gchar *group_name,  const gchar
 	const gchar *poa_address;
 	const gchar *offline_sync;
 
-
 	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
 		return;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index eced381..48be727 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -164,7 +164,6 @@ static const gint sept_1752[42] = {
 #define SEPT_1752_START 2		/* Start day within month */
 #define SEPT_1752_END 20		/* End day within month */
 
-
 struct pdinfo
 {
 	gint days_shown;
@@ -227,7 +226,6 @@ convert_timet_to_struct_tm (time_t time, icaltimezone *zone)
 	return &my_tm;
 }
 
-
 /* Fills the 42-element days array with the day numbers for the specified month.  Slots outside the
  * bounds of the month are filled with zeros.  The starting and ending indexes of the days are
  * returned in the start and end arguments.
@@ -362,7 +360,6 @@ print_border_with_triangles (GtkPrintContext *pc,
 	cairo_restore (cr);
 }
 
-
 /* Prints a rectangle, with or without a border, and filled or outline.
    width      = width of border, -ve means no border.
    fillcolor = shade of fill,   -ve means no fill. */
@@ -761,7 +758,6 @@ bound_text (GtkPrintContext *context,
 	return y1 + pango_units_to_double (layout_height);
 }
 
-
 /* Draw the borders, lines, and times down the left of the day view. */
 static void
 print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
@@ -865,7 +861,6 @@ print_day_background (GtkPrintContext *context, GnomeCalendar *gcal,
 	pango_font_description_free (font_minute);
 }
 
-
 /* This adds one event to the view, adding it to the appropriate array. */
 static gint
 print_day_add_event (ECalModelComponent *comp_data,
@@ -940,7 +935,6 @@ print_day_add_event (ECalModelComponent *comp_data,
 	return E_DAY_VIEW_LONG_EVENT;
 }
 
-
 static gboolean
 print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend,
 		      gpointer data)
@@ -955,7 +949,6 @@ print_day_details_cb (ECalComponent *comp, time_t istart, time_t iend,
 	return TRUE;
 }
 
-
 static void
 free_event_array (GArray *array)
 {
@@ -1164,7 +1157,6 @@ print_day_long_event (GtkPrintContext *context, PangoFontDescription *font,
 	g_free (text);
 }
 
-
 static void
 print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		 double left, double right, double top, double bottom,
@@ -1243,7 +1235,6 @@ print_day_event (GtkPrintContext *context, PangoFontDescription *font,
 	g_free (text);
 }
 
-
 static void
 print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 		   double left, double right, double top, double bottom)
@@ -1341,7 +1332,6 @@ print_day_details (GtkPrintContext *context, GnomeCalendar *gcal, time_t whence,
 	/* Now adjust to get rid of the time column. */
 	left += DAY_VIEW_TIME_COLUMN_WIDTH;
 
-
 	/* lay out the short events, within the day. */
 	e_day_view_layout_day_events (pdi.events[0], DAY_VIEW_ROWS,
 				      DAY_VIEW_MINS_PER_ROW, pdi.cols_per_row, -1);
@@ -1386,7 +1376,6 @@ print_is_one_day_week_event (EWeekViewEvent *event,
 	return FALSE;
 }
 
-
 static void
 print_week_long_event (GtkPrintContext *context, PangoFontDescription *font,
 		       struct psinfo *psi,
@@ -1453,7 +1442,6 @@ print_week_long_event (GtkPrintContext *context, PangoFontDescription *font,
 	print_text_size (context, text, PANGO_ALIGN_CENTER, x1, x2, y1, y2);
 }
 
-
 static void
 print_week_day_event (GtkPrintContext *context, PangoFontDescription *font,
 		      struct psinfo *psi,
@@ -1492,7 +1480,6 @@ print_week_day_event (GtkPrintContext *context, PangoFontDescription *font,
 	print_text_size (context, text, PANGO_ALIGN_LEFT, x1, x2, y1, y2 + 3);
 }
 
-
 static void
 print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 		  struct psinfo *psi,
@@ -1553,7 +1540,6 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 				 + span->row * psi->row_height;
 			y2 = y1 + psi->row_height * 0.5;
 
-
 			red = .9;
 			green = .9;
 			blue = .9;
@@ -1618,7 +1604,6 @@ print_week_event (GtkPrintContext *context, PangoFontDescription *font,
 	g_free (text);
 }
 
-
 static void
 print_week_view_background (GtkPrintContext *context,
                             PangoFontDescription *font,
@@ -1802,7 +1787,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 		cell_height = (bottom - top) / 6;
 	}
 
-
 	/* Calculate the row height, using the normal font and with room for
 	   space or a rectangle around it. */
 	psi.row_height = font_size * 1.2;
@@ -1836,7 +1820,6 @@ print_week_summary (GtkPrintContext *context, GnomeCalendar *gcal,
 	g_array_free (spans, TRUE);
 }
 
-
 /* XXX Evolution doesn't have a "year" view. */
 #if 0
 static void
@@ -1959,7 +1942,6 @@ print_month_summary (GtkPrintContext *context, GnomeCalendar *gcal, time_t whenc
 			    left, right, top, bottom);
 }
 
-
 static void
 print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		    time_t start, time_t end,
@@ -2042,7 +2024,6 @@ print_todo_details (GtkPrintContext *context, GnomeCalendar *gcal,
 		y = bound_text (context, font_summary, summary.value, -1,
 				x + 14, y + 4, xend, yend, FALSE, NULL, NULL);
 
-
 		y += get_font_size (font_summary)-5;
 		cr = gtk_print_context_get_cairo_context (context);
 		cairo_move_to (cr, x, y);
@@ -2098,14 +2079,12 @@ print_day_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 				   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4,
 				   DATE_MONTH | DATE_YEAR, date, date, FALSE);
 
-
 		l += SMALL_MONTH_SPACING + SMALL_MONTH_WIDTH;
 		print_month_small (context, gcal,
 				   time_add_month_with_zone (date, 1, zone),
 				   l, 4, l + SMALL_MONTH_WIDTH, HEADER_HEIGHT + 4,
 				   DATE_MONTH | DATE_YEAR, 0, 0, FALSE);
 
-
 		/* Print the date, e.g. '8th May, 2001'. */
 		format_date (date, DATE_DAY | DATE_MONTH | DATE_YEAR,
 			     buf, 100);
@@ -2161,7 +2140,6 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 			    0.0, width,
 			    HEADER_HEIGHT + 20, height);
 
-
 	/* Print the border around the main view. */
 	print_border (context, 0.0, width, HEADER_HEIGHT ,
 		      height, 1.0, -1.0);
@@ -2199,7 +2177,6 @@ print_week_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 			      24 + 3, 24 + 3 + 24);
 }
 
-
 static void
 print_month_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 {
@@ -2612,7 +2589,6 @@ print_comp_draw_real (GtkPrintOperation *operation,
 			top += get_font_size (font) - 6;
 		}
 
-
 		/* URL */
 		e_cal_component_get_url (comp, &url);
 		if (url && url[0]) {
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 7d98e7c..f793474 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -78,7 +78,6 @@ static BonoboObjectClass *parent_class = NULL;
 /* Tasks should have their own registry */
 extern ECompEditorRegistry *comp_editor_registry;
 
-
 typedef struct
 {
 	ESourceList *source_list;
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index 2a48209..9824797 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -28,14 +28,12 @@
 #include <misc/e-activity-handler.h>
 #include "Evolution.h"
 
-
 #define TASKS_TYPE_COMPONENT			(tasks_component_get_type ())
 #define TASKS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_CAST ((obj), TASKS_TYPE_COMPONENT, TasksComponent))
 #define TASKS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST ((klass), TASKS_TYPE_COMPONENT, TasksComponentClass))
 #define TASKS_IS_COMPONENT(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), TASKS_TYPE_COMPONENT))
 #define TASKS_IS_COMPONENT_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), TASKS_TYPE_COMPONENT))
 
-
 typedef struct _TasksComponent        TasksComponent;
 typedef struct _TasksComponentPrivate TasksComponentPrivate;
 typedef struct _TasksComponentClass   TasksComponentClass;
@@ -52,7 +50,6 @@ struct _TasksComponentClass {
 	POA_GNOME_Evolution_Component__epv epv;
 };
 
-
 GType             tasks_component_get_type  (void);
 TasksComponent   *tasks_component_peek  (void);
 
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index e5109da..a7134e9 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -49,7 +49,6 @@
 
 #define FIXED_MARGIN                            .05
 
-
 static void tasks_control_activate_cb		(BonoboControl		*control,
 						 gboolean		 activate,
 						 gpointer		 user_data);
@@ -137,7 +136,6 @@ tasks_control_new (void)
 	return control;
 }
 
-
 static void
 tasks_control_activate_cb		(BonoboControl		*control,
 					 gboolean		 activate,
@@ -355,7 +353,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 	bonobo_ui_component_set_prop(uic, "/commands/ViewPreview", "state", state?"1":"0", NULL);
 }
 
-
 void
 tasks_control_deactivate (BonoboControl *control, ETasks *tasks)
 {
@@ -420,7 +417,6 @@ tasks_control_copy_cmd                  (BonoboUIComponent      *uic,
 
 	tasks = E_TASKS (data);
 
-
 	preview = e_cal_component_preview_get_html (E_CAL_COMPONENT_PREVIEW (e_tasks_get_preview (tasks)));
 	if (preview && GTK_WIDGET_VISIBLE (preview) && GTK_WIDGET_HAS_FOCUS (preview)) {
 		/* copy selected text in a preview when that's shown and focused */
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 913144d..12c09b4 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -201,7 +201,6 @@ day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 	return TRUE;
 }
 
-
 /* Creates the canvas items for the weekday picker.  The items are empty until
  * they are configured elsewhere.
  */
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index 980e11c..c5b7108 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -432,7 +432,7 @@ e_composer_header_set_visible (EComposerHeader *header,
 		if (!visible)
 			gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "show"));
 		else
-			gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));	
+			gtk_label_set_markup ((GtkLabel *)header->priv->action_label, g_object_get_data ((GObject *)header->priv->action_label, "hide"));
 	}
 	g_object_notify (G_OBJECT (header), "visible");
 }
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index a7a2dfa..d7d9c03 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -2287,7 +2287,6 @@ e_msg_composer_new (void)
 	return g_object_new (E_TYPE_MSG_COMPOSER, NULL);
 }
 
-
 void
 e_msg_composer_set_lite (void)
 {
diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
index 3e44526..6b6f16d 100644
--- a/e-util/e-bconf-map.c
+++ b/e-util/e-bconf-map.c
@@ -37,10 +37,8 @@
 
 #include "e-bconf-map.h"
 
-
 #define d(x)
 
-
 static gchar hexnib[256] = {
 	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
 	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
@@ -88,7 +86,6 @@ e_bconf_url_decode (const gchar *val)
 	return res;
 }
 
-
 xmlNodePtr
 e_bconf_get_path (xmlDocPtr doc, const gchar *path)
 {
@@ -194,7 +191,6 @@ e_bconf_get_string (xmlNodePtr root, const gchar *name)
 	return res;
 }
 
-
 /* lookup functions */
 typedef gchar * (* bconf_lookup_func) (xmlNodePtr root, const gchar *name, e_bconf_map_t *nap);
 
@@ -235,7 +231,6 @@ bconf_lookup_enum (xmlNodePtr root, const gchar *name, e_bconf_map_t *map)
 	return NULL;
 }
 
-
 static bconf_lookup_func lookup_table[] = {
 	bconf_lookup_bool, bconf_lookup_long, bconf_lookup_string, bconf_lookup_enum
 };
@@ -298,7 +293,6 @@ build_xml (xmlNodePtr root, e_bconf_map_t *map, gint index, xmlNodePtr source)
 	}
 }
 
-
 gint
 e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map_t *map,
 			 const gchar *bconf_path, const gchar *gconf_path,
@@ -360,7 +354,6 @@ e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bconf_map
 	return 0;
 }
 
-
 static gint gconf_type[] = { GCONF_VALUE_BOOL, GCONF_VALUE_BOOL, GCONF_VALUE_INT, GCONF_VALUE_STRING, GCONF_VALUE_STRING };
 
 gint
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index 4e72f5e..181533d 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -48,7 +48,6 @@ typedef struct _e_bconf_map {
 	struct _e_bconf_map *child;
 } e_bconf_map_t;
 
-
 gchar *e_bconf_hex_decode (const gchar *val);
 gchar *e_bconf_url_decode (const gchar *val);
 
@@ -64,7 +63,6 @@ gint e_bconf_import_xml_blob (GConfClient *gconf, xmlDocPtr config_xmldb, e_bcon
 			     const gchar *bconf_path, const gchar *gconf_path,
 			     const gchar *name, const gchar *idparam);
 
-
 enum {
 	E_GCONF_MAP_BOOL,
 	E_GCONF_MAP_BOOLNOT,
diff --git a/e-util/e-binding.h b/e-util/e-binding.h
index 12f4db8..a36c94e 100644
--- a/e-util/e-binding.h
+++ b/e-util/e-binding.h
@@ -102,7 +102,6 @@ EMutualBinding *e_mutual_binding_new_with_negation
 						 const gchar *property2);
 void		e_mutual_binding_unbind		(EMutualBinding *binding);
 
-
 /* Useful transformation functions */
 gboolean	e_binding_transform_color_to_string
 						(const GValue *src_value,
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index 551ffe2..898a193 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -396,7 +396,6 @@ e_bit_array_toggle_single_row (EBitArray *eba, gint row)
 		eba->data[BOX(row)] |= BITMASK(row);
 }
 
-
 static void
 e_bit_array_init (EBitArray *eba)
 {
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index 6f021c5..52439c7 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -51,7 +51,6 @@ typedef struct {
 	GObjectClass parent_class;
 } EBitArrayClass;
 
-
 GType      e_bit_array_get_type            (void);
 EBitArray *e_bit_array_new                 (gint           count);
 
@@ -95,5 +94,4 @@ gboolean   e_bit_array_cross_or            (EBitArray    *esm);
 
 G_END_DECLS
 
-
 #endif /* _E_BIT_ARRAY_H_ */
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 3558af4..18949d1 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -242,7 +242,6 @@ e_dialog_set_transient_for_xid (GtkWindow *dialog,
 	gdk_window_set_transient_for (gtk_widget_get_window (GTK_WIDGET (dialog)), parent);
 }
 
-
 
 static void
 save_ok (GtkWidget *widget, gpointer data)
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index 153c018..71c801c 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -48,5 +48,4 @@ GtkWidget * e_file_get_save_filesel (GtkWidget *parent, const gchar *title, cons
 gboolean e_file_can_save(GtkWindow *parent, const gchar *uri);
 gboolean e_file_check_local(const gchar *name);
 
-
 #endif
diff --git a/e-util/e-error.c b/e-util/e-error.c
index c780834..0671bde 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -518,7 +518,6 @@ e_error_newv(GtkWindow *parent, const gchar *tag, const gchar *arg0, va_list ap)
 	} else
 		gtk_window_set_title((GtkWindow *)dialog, dgettext(table->translation_domain, type_map[e->type].title));
 
-
 	if (e->primary) {
 		g_string_append(out, "<span weight=\"bold\" size=\"larger\">");
 		ee_build_label(out, e->primary, args, TRUE);
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 619cb65..b80ee17 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -435,7 +435,6 @@ e_text_to_html (const gchar *input, guint flags)
 	return e_text_to_html_full (input, flags, 0);
 }
 
-
 #ifdef E_HTML_UTILS_TEST
 
 struct {
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index dddd4fa..85985ef 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -55,7 +55,6 @@ static GHashTable *name_to_icon = NULL;
 static GtkIconTheme *icon_theme = NULL;
 static GStaticMutex mutex = G_STATIC_MUTEX_INIT;
 
-
 /* Note: takes ownership of the pixbufs (eg. does not ref them) */
 static Icon *
 icon_new (const gchar *name, GdkPixbuf *pixbuf)
@@ -225,7 +224,6 @@ e_icon_factory_shutdown (void)
 	name_to_icon = NULL;
 }
 
-
 /**
  * e_icon_factory_get_icon_filename:
  * @icon_name: name of the icon
@@ -262,7 +260,6 @@ e_icon_factory_get_icon_filename (const gchar *icon_name,
 	return filename;
 }
 
-
 /**
  * e_icon_factory_get_icon:
  * @icon_name: name of the icon
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 84c5061..5a3165e 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -258,7 +258,6 @@ GType e_import_hook_get_type(void);
 /* for implementors */
 void e_import_hook_class_add_target_map(EImportHookClass *klass, const EImportHookTargetMap *);
 
-
 G_END_DECLS
 
 #endif /* __E_IMPORT_H__ */
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 0e4cc6c..509b312 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -185,7 +185,6 @@ e_mktemp (const gchar *template)
 	return ret;
 }
 
-
 gint
 e_mkstemp (const gchar *template)
 {
@@ -208,7 +207,6 @@ e_mkstemp (const gchar *template)
 	return fd;
 }
 
-
 gchar *
 e_mkdtemp (const gchar *template)
 {
diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h
index c9b1d55..08f75ea 100644
--- a/e-util/e-mktemp.h
+++ b/e-util/e-mktemp.h
@@ -20,7 +20,6 @@
  *
  */
 
-
 #ifndef __E_MKTEMP_H__
 #define __E_MKTEMP_H__
 
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 80eb361..660bded 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -268,7 +268,6 @@ e_pilot_map_remove_by_uid (EPilotMap *map, const gchar *uid)
 	g_hash_table_remove (map->uid_map, uid);
 }
 
-
 guint32
 e_pilot_map_lookup_pid (EPilotMap *map, const gchar *uid, gboolean touch)
 {
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
index 476320c..6b9b0ad 100644
--- a/e-util/e-pilot-util.h
+++ b/e-util/e-pilot-util.h
@@ -35,5 +35,4 @@ gchar *e_pilot_utf8_from_pchar (const gchar *string);
 ESource *e_pilot_get_sync_source (ESourceList *source_list);
 void e_pilot_set_sync_source (ESourceList *source_list, ESource *source);
 
-
 #endif /* E_PILOT_UTIL_H */
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 64f4ccd..18949bf 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -375,7 +375,6 @@ struct _EPluginTypeHookClass {
 
 GType e_plugin_type_hook_get_type(void);
 
-
 /* README: Currently there is only one flag.
    But we may need more in the future and hence makes
    sense to keep as an enum */
@@ -384,6 +383,5 @@ typedef enum _EPluginFlags {
 	E_PLUGIN_FLAGS_SYSTEM_PLUGIN = 1 << 0
 } EPluginFlags;
 
-
 #endif /* ! _E_PLUGIN_H */
 
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index 1480f37..094d478 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -51,10 +51,8 @@ static void e_signature_list_init (ESignatureList *list, ESignatureListClass *kl
 static void e_signature_list_finalize (GObject *object);
 static void e_signature_list_dispose (GObject *object);
 
-
 static EListClass *parent_class = NULL;
 
-
 GType
 e_signature_list_get_type (void)
 {
@@ -77,7 +75,6 @@ e_signature_list_get_type (void)
 	return type;
 }
 
-
 static void
 e_signature_list_class_init (ESignatureListClass *klass)
 {
@@ -325,7 +322,6 @@ e_signature_list_construct (ESignatureList *signature_list, GConfClient *gconf)
 	}
 }
 
-
 /**
  * e_signature_list_save:
  * @signature_list: an #ESignatureList
@@ -363,7 +359,6 @@ e_signature_list_save (ESignatureList *signature_list)
 	gconf_client_suggest_sync (signature_list->priv->gconf, NULL);
 }
 
-
 /**
  * e_signature_list_add:
  * @signatures: signature list
@@ -379,7 +374,6 @@ e_signature_list_add (ESignatureList *signatures, ESignature *signature)
 	g_signal_emit (signatures, signals[SIGNATURE_ADDED], 0, signature);
 }
 
-
 /**
  * e_signature_list_change:
  * @signatures: signature list
@@ -394,7 +388,6 @@ e_signature_list_change (ESignatureList *signatures, ESignature *signature)
 	g_signal_emit (signatures, signals[SIGNATURE_CHANGED], 0, signature);
 }
 
-
 /**
  * e_signature_list_remove:
  * @signatures: signature list
@@ -414,7 +407,6 @@ e_signature_list_remove (ESignatureList *signatures, ESignature *signature)
 	g_object_unref (signature);
 }
 
-
 /**
  * e_signature_list_find:
  * @signatures: signature list
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index 1c27a12..b662272 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -59,7 +59,6 @@ struct _ESignatureListClass {
 	void (* signature_removed) (ESignatureList *, ESignature *);
 };
 
-
 GType e_signature_list_get_type (void);
 
 ESignatureList *e_signature_list_new (GConfClient *gconf);
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 60659f8..86e29fe 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -37,15 +37,12 @@
 
 #include "e-signature.h"
 
-
 static void e_signature_class_init (ESignatureClass *klass);
 static void e_signature_init (ESignature *sig, ESignatureClass *klass);
 static void e_signature_finalize (GObject *object);
 
-
 static GObjectClass *parent_class = NULL;
 
-
 GType
 e_signature_get_type (void)
 {
@@ -97,7 +94,6 @@ e_signature_finalize (GObject *object)
 	G_OBJECT_CLASS (parent_class)->finalize (object);
 }
 
-
 /**
  * e_signature_new:
  *
@@ -115,7 +111,6 @@ e_signature_new (void)
 	return signature;
 }
 
-
 /**
  * e_signature_new_from_xml:
  * @xml: an XML signature description
@@ -137,7 +132,6 @@ e_signature_new_from_xml (const gchar *xml)
 	return signature;
 }
 
-
 static gboolean
 xml_set_bool (xmlNodePtr node, const gchar *name, gboolean *val)
 {
@@ -201,7 +195,6 @@ xml_set_content (xmlNodePtr node, gchar **val)
 	}
 }
 
-
 /**
  * e_signature_uid_from_xml:
  * @xml: an XML signature description
@@ -232,7 +225,6 @@ e_signature_uid_from_xml (const gchar *xml)
 	return uid;
 }
 
-
 /**
  * e_signature_set_from_xml:
  * @signature: an #ESignature
@@ -314,7 +306,6 @@ e_signature_set_from_xml (ESignature *signature, const gchar *xml)
 	return changed;
 }
 
-
 /**
  * e_signature_to_xml:
  * @signature: an #ESignature
diff --git a/e-util/e-signature.h b/e-util/e-signature.h
index a58a429..3dced19 100644
--- a/e-util/e-signature.h
+++ b/e-util/e-signature.h
@@ -54,7 +54,6 @@ struct _ESignatureClass {
 
 };
 
-
 GType e_signature_get_type (void);
 
 ESignature *e_signature_new (void);
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index b3b4c4a..39f3e61 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -106,7 +106,6 @@ esa_backsort(ESorterArray *esa)
 	}
 }
 
-
 static gint
 esa_model_to_sorted (ESorter *es, gint row)
 {
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 602b189..14b469b 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -63,7 +63,6 @@ e_sorter_new (void)
 	return es;
 }
 
-
 static gint
 es_model_to_sorted (ESorter *es, gint row)
 {
@@ -76,7 +75,6 @@ es_sorted_to_model (ESorter *es, gint row)
 	return row;
 }
 
-
 static void
 es_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
 {
@@ -87,7 +85,6 @@ es_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
 {
 }
 
-
 static gboolean
 es_needs_sorting(ESorter *es)
 {
@@ -118,7 +115,6 @@ e_sorter_sorted_to_model (ESorter *es, gint row)
 		return -1;
 }
 
-
 void
 e_sorter_get_model_to_sorted_array (ESorter *es, gint **array, gint *count)
 {
@@ -137,7 +133,6 @@ e_sorter_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
 		E_SORTER_GET_CLASS(es)->get_sorted_to_model_array (es, array, count);
 }
 
-
 gboolean
 e_sorter_needs_sorting(ESorter *es)
 {
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index a93db0f..0b9c6c1 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -38,7 +38,6 @@ G_BEGIN_DECLS
 #define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
 #define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))
 
-
 typedef struct _ETextEventProcessorEmacsLike       ETextEventProcessorEmacsLike;
 typedef struct _ETextEventProcessorEmacsLikeClass  ETextEventProcessorEmacsLikeClass;
 
@@ -55,11 +54,9 @@ struct _ETextEventProcessorEmacsLikeClass
 	ETextEventProcessorClass parent_class;
 };
 
-
 GType      e_text_event_processor_emacs_like_get_type (void);
 ETextEventProcessor *e_text_event_processor_emacs_like_new (void);
 
 G_END_DECLS
 
-
 #endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 1f313bd..9e02cb0 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -60,11 +60,9 @@ struct _ETextEventProcessorClass
 	gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
 };
 
-
 GType      e_text_event_processor_get_type (void);
 gint       e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);
 
 G_END_DECLS
 
-
 #endif /* __E_TEXT_EVENT_PROCESSOR_H__ */
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index b78b46f..c4b4edd 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -226,7 +226,6 @@ find_label (GSList *labels, const gchar *tag)
 	return NULL;
 }
 
-
 static gchar *
 tag_from_name (const gchar *name)
 {
diff --git a/e-util/e-util.c b/e-util/e-util.c
index 1635484..806960e 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -1048,7 +1048,6 @@ e_ascii_dtostr (gchar *buffer, gint buf_len, const gchar *format, gdouble d)
 	      format_char == 'g' || format_char == 'G'))
 		return NULL;
 
-
 	g_snprintf (buffer, buf_len, format, d);
 
 	locale_data = localeconv ();
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index c327d61..fa123a1 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -40,7 +40,6 @@ xmlNode *e_xml_get_child_by_name_by_lang_list        (const xmlNode *parent,
 xmlNode *e_xml_get_child_by_name_no_lang             (const xmlNode *parent,
                                                       const gchar   *name);
 
-
 gint     e_xml_get_integer_prop_by_name              (const xmlNode *parent,
                                                       const xmlChar *prop_name);
 gint     e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent,
@@ -50,7 +49,6 @@ void     e_xml_set_integer_prop_by_name              (xmlNode       *parent,
                                                       const xmlChar *prop_name,
                                                       gint           value);
 
-
 guint    e_xml_get_uint_prop_by_name                 (const xmlNode *parent,
                                                       const xmlChar *prop_name);
 guint    e_xml_get_uint_prop_by_name_with_default    (const xmlNode *parent,
@@ -60,7 +58,6 @@ void     e_xml_set_uint_prop_by_name                 (xmlNode       *parent,
                                                       const xmlChar *prop_name,
                                                       guint          value);
 
-
 gboolean e_xml_get_bool_prop_by_name                 (const xmlNode *parent,
                                                       const xmlChar *prop_name);
 gboolean e_xml_get_bool_prop_by_name_with_default    (const xmlNode *parent,
@@ -79,7 +76,6 @@ void      e_xml_set_double_prop_by_name              ( xmlNode       *parent,
                                                       const xmlChar *prop_name,
                                                       gdouble        value);
 
-
 gchar    *e_xml_get_string_prop_by_name              (const xmlNode *parent,
                                                       const xmlChar *prop_name);
 gchar    *e_xml_get_string_prop_by_name_with_default (const xmlNode *parent,
diff --git a/filter/filter-code.c b/filter/filter-code.c
index c0f0420..9c7eb15 100644
--- a/filter/filter-code.c
+++ b/filter/filter-code.c
@@ -34,10 +34,8 @@ static void filter_code_class_init (FilterCodeClass *class);
 static void filter_code_init (FilterCode *fc);
 static void filter_code_finalise (GObject *obj);
 
-
 static FilterInputClass *parent_class;
 
-
 GType
 filter_code_get_type (void)
 {
@@ -89,7 +87,6 @@ filter_code_finalise (GObject *obj)
         G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
-
 /**
  * filter_code_new:
  *
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index 7672a77..f466f63 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -44,7 +44,6 @@ static void filter_colour_class_init (FilterColourClass *klass);
 static void filter_colour_init (FilterColour *fc);
 static void filter_colour_finalise (GObject *obj);
 
-
 static FilterElementClass *parent_class;
 
 GType
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
index ff19d66..cfd10d1 100644
--- a/filter/filter-colour.h
+++ b/filter/filter-colour.h
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifndef _FILTER_COLOUR_H
 #define _FILTER_COLOUR_H
 
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index 000e64d..7a20070 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -406,7 +406,6 @@ set_values (FilterDatespec *fds)
 	gtk_combo_box_set_active (GTK_COMBO_BOX (p->combobox_type), note_type);
 }
 
-
 static void
 set_combobox_type (GtkComboBox *combobox, FilterDatespec *fds)
 {
diff --git a/filter/filter-file.c b/filter/filter-file.c
index ea14fad..72d7bac 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -50,10 +50,8 @@ static void filter_file_class_init (FilterFileClass *klass);
 static void filter_file_init (FilterFile *ff);
 static void filter_file_finalise (GObject *obj);
 
-
 static FilterElementClass *parent_class = NULL;
 
-
 GType
 filter_file_get_type (void)
 {
@@ -129,7 +127,6 @@ filter_file_new (void)
 	return (FilterFile *) g_object_new (FILTER_TYPE_FILE, NULL, NULL);
 }
 
-
 FilterFile *
 filter_file_new_type_name (const gchar *type)
 {
diff --git a/filter/filter-file.h b/filter/filter-file.h
index 2b4af5f..af8d05f 100644
--- a/filter/filter-file.h
+++ b/filter/filter-file.h
@@ -53,7 +53,6 @@ struct _FilterFileClass {
 	/* signals */
 };
 
-
 GType filter_file_get_type (void);
 
 FilterFile *filter_file_new (void);
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 690ccd6..ad22dd6 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -51,10 +51,8 @@ static void filter_input_class_init (FilterInputClass *klass);
 static void filter_input_init (FilterInput *fi);
 static void filter_input_finalise (GObject *obj);
 
-
 static FilterElementClass *parent_class = NULL;
 
-
 GType
 filter_input_get_type (void)
 {
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 9d72fdf..ab8208e 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -45,10 +45,8 @@ static void filter_int_class_init (FilterIntClass *klass);
 static void filter_int_init (FilterInt *fi);
 static void filter_int_finalise (GObject *obj);
 
-
 static FilterElementClass *parent_class;
 
-
 GType
 filter_int_get_type (void)
 {
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 07e7ee9..14bb796 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -51,10 +51,8 @@ static void filter_option_class_init (FilterOptionClass *klass);
 static void filter_option_init (FilterOption *fo);
 static void filter_option_finalise (GObject *obj);
 
-
 static FilterElementClass *parent_class;
 
-
 GType
 filter_option_get_type (void)
 {
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 79b9da9..2e74f9c 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -41,10 +41,8 @@ static void filter_part_class_init (FilterPartClass *klass);
 static void filter_part_init (FilterPart *fp);
 static void filter_part_finalise (GObject *obj);
 
-
 static GObjectClass *parent_class = NULL;
 
-
 GType
 filter_part_get_type (void)
 {
@@ -234,7 +232,6 @@ filter_part_xml_encode (FilterPart *fp)
 	return part;
 }
 
-
 gint
 filter_part_xml_decode (FilterPart *fp, xmlNodePtr node)
 {
@@ -333,7 +330,6 @@ filter_part_find_element (FilterPart *ff, const gchar *name)
 	return NULL;
 }
 
-
 GtkWidget *
 filter_part_get_widget (FilterPart *ff)
 {
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index 9009fd1..94e8069 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -97,7 +97,6 @@ struct _FilterRuleClass {
 	void (*changed) (FilterRule *fr);
 };
 
-
 GType       filter_rule_get_type     (void);
 FilterRule *filter_rule_new          (void);
 
@@ -132,5 +131,4 @@ void        filter_rule_emit_changed (FilterRule *fr);
 FilterRule *filter_rule_next_list    (GList *l, FilterRule *last, const gchar *source);
 FilterRule *filter_rule_find_list    (GList *l, const gchar *name, const gchar *source);
 
-
 #endif /* ! _FILTER_RULE_H */
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 5f00adf..84cf2e4 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -82,7 +82,6 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-
 GType
 rule_context_get_type(void)
 {
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 2927938..59006f7 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -72,7 +72,6 @@ struct _RuleEditorPrivate {
 
 static GtkDialogClass *parent_class = NULL;
 
-
 GType
 rule_editor_get_type (void)
 {
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c
index e06885a..32a2d6c 100644
--- a/mail/e-searching-tokenizer.c
+++ b/mail/e-searching-tokenizer.c
@@ -73,7 +73,6 @@ struct _SharedState {
 
 /* ********************************************************************** */
 
-
 #if 0
 static SharedState *
 shared_state_new (void)
@@ -150,7 +149,6 @@ loop:
 	return v;
 }
 
-
 /* note: our tags of interest are 7 bit ascii, only, no need to do any fancy utf8 stuff */
 /* tags should be upper case
    if this list gets longer than 10 entries, consider binary search */
diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h
index e9b1a94..ddb47d7 100644
--- a/mail/e-searching-tokenizer.h
+++ b/mail/e-searching-tokenizer.h
@@ -64,7 +64,6 @@ void e_searching_tokenizer_set_secondary_search_string    (ESearchingTokenizer *
 void e_searching_tokenizer_add_secondary_search_string (ESearchingTokenizer *st, const gchar *search_str);
 void e_searching_tokenizer_set_secondary_case_sensitivity (ESearchingTokenizer *, gboolean is_case_sensitive);
 
-
 gint e_searching_tokenizer_match_count          (ESearchingTokenizer *);
 
 #endif /* __E_SEARCHING_TOKENIZER_H__ */
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index be431db..535fbd2 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -48,13 +48,10 @@ static void em_account_prefs_destroy    (GtkObject *object);
 
 static void mail_accounts_load (EMAccountPrefs *prefs);
 
-
 static GtkVBoxClass *parent_class = NULL;
 
-
 #define PREFS_WINDOW(prefs) GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (prefs), GTK_TYPE_WINDOW))
 
-
 GType
 em_account_prefs_get_type (void)
 {
@@ -455,8 +452,6 @@ mail_accounts_load (EMAccountPrefs *prefs)
 	g_object_unref (node);
 }
 
-
-
 GtkWidget *em_account_prefs_treeview_new (gchar *widget_name, gchar *string1, gchar *string2,
 					  gint int1, gint int2);
 
@@ -494,7 +489,6 @@ em_account_prefs_treeview_new (gchar *widget_name, gchar *string1, gchar *string
 	gtk_tree_view_set_headers_visible ((GtkTreeView *) table, TRUE);
 	atk_object_set_name (gtk_widget_get_accessible (table), _("Mail Accounts"));
 
-
 	/* FIXME: column auto-resize? */
 	/* Is this needed?
 	   gtk_tree_view_column_set_alignment (gtk_tree_view_get_column (prefs->table, 0), 1.0);*/
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index 9539661..2415e13 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -35,7 +35,6 @@
 
 G_BEGIN_DECLS
 
-
 #define EM_ACCOUNT_PREFS_TYPE        (em_account_prefs_get_type ())
 #define EM_ACCOUNT_PREFS(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefs))
 #define EM_ACCOUNT_PREFS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EM_ACCOUNT_PREFS_TYPE, EMAccountPrefsClass))
@@ -73,7 +72,6 @@ struct _EMAccountPrefsClass {
 
 };
 
-
 GType em_account_prefs_get_type (void);
 
 GtkWidget *em_account_prefs_new (GNOME_Evolution_Shell shell);
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 9341950..402a6d2 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1041,7 +1041,6 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 
 	e_msg_composer_attach (composer, part);
 
-
 	if (uids)
 		setup_forward_attached_callbacks (composer, folder, uids);
 
@@ -1395,7 +1394,6 @@ em_utils_receipt_done (CamelFolder *folder, CamelMimeMessage *msg, CamelMessageI
 	mail_send ();
 }
 
-
 void
 em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 {
@@ -2007,7 +2005,6 @@ em_utils_get_reply_all (CamelMimeMessage *message, CamelInternetAddress *to, Cam
 	get_reply_all (message, to, cc, postto);
 }
 
-
 enum {
 	ATTRIB_UNKNOWN,
 	ATTRIB_CUSTOM,
@@ -2279,7 +2276,6 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source)
 	return text;
 }
 
-
 static void
 reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessage *message, gpointer user_data)
 {
diff --git a/mail/em-config.c b/mail/em-config.c
index a44554b..357e885 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -224,7 +224,6 @@ em_config_target_new_account(EMConfig *emp, struct _EAccount *account)
 	return t;
 }
 
-
 /* ********************************************************************** */
 
 /* Popup menu plugin handler */
diff --git a/mail/em-event.h b/mail/em-event.h
index 770daa7..e2235a1 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -110,7 +110,6 @@ struct _EMEventTargetFolderBrowser {
 	EMFolderBrowser *emfb;
 };
 
-
 typedef struct _EMEventTargetSendReceive EMEventTargetSendReceive;
 
 struct _EMEventTargetSendReceive {
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 378192a..8d72074 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -41,10 +41,8 @@ static void em_filter_editor_class_init (EMFilterEditorClass *klass);
 static void em_filter_editor_init (EMFilterEditor *fe);
 static void em_filter_editor_finalise (GObject *obj);
 
-
 static RuleEditorClass *parent_class = NULL;
 
-
 GType
 em_filter_editor_get_type (void)
 {
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 1fd5a51..40af002 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -34,7 +34,6 @@
 #include <libedataserver/e-account-list.h>
 #include <camel/camel-url.h>
 
-
 static void em_filter_source_element_class_init(EMFilterSourceElementClass *klass);
 static void em_filter_source_element_init(EMFilterSourceElement *fs);
 static void em_filter_source_element_finalize(GObject *obj);
@@ -64,10 +63,8 @@ struct _EMFilterSourceElementPrivate {
 	gchar *current_url;
 };
 
-
 static FilterElementClass *parent_class = NULL;
 
-
 GType
 em_filter_source_element_get_type(void)
 {
@@ -319,7 +316,6 @@ format_sexp(FilterElement *fe, GString *out)
 	e_sexp_encode_string(out, fs->priv->current_url);
 }
 
-
 static void
 em_filter_source_element_add_source(EMFilterSourceElement *fs, const gchar *account_name, const gchar *name,
 			  const gchar *addr, const gchar *url)
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 085521f..c6c90ca 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -676,7 +676,6 @@ emfb_class_init(GObjectClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-
 	((GtkObjectClass *)klass)->destroy = emfb_destroy;
 	((EMFolderViewClass *)klass)->set_folder = emfb_set_folder;
 	((EMFolderViewClass *)klass)->activate = emfb_activate;
@@ -1007,7 +1006,6 @@ get_view_query (ESearchBar *esb, CamelFolder *folder, const gchar *folder_uri)
 	return view_sexp;
 }
 
-
 struct _setup_msg {
 	MailMsg base;
 
@@ -1604,7 +1602,6 @@ emfb_folder_refresh(BonoboUIComponent *uid, gpointer data, const gchar *path)
 	}
 }
 
-
 static void
 emfb_folder_rename(BonoboUIComponent *uid, gpointer data, const gchar *path)
 {
@@ -1807,7 +1804,6 @@ static EPixmap emfb_pixmaps[] = {
 	E_PIXMAP_END
 };
 
-
 static void
 emfb_hide_deleted(BonoboUIComponent *uic, const gchar *path, Bonobo_UIComponent_EventType type, const gchar *state, gpointer data)
 {
@@ -1969,7 +1965,6 @@ emfb_etree_unfreeze (GtkWidget *widget, GdkEvent *event, EMFolderView *emfv)
 	g_object_set_data (G_OBJECT (((GnomeCanvasItem *) item)->canvas), "freeze-cursor", 0);
 }
 
-
 /* TODO: This should probably be handled by message-list, by storing/queueing
    up the select operation if its busy rebuilding the message-list */
 static void
@@ -2051,7 +2046,6 @@ emfb_set_search_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri
 	message_list_thaw(emfv->list);
 }
 
-
 static void
 emfb_set_folder(EMFolderView *emfv, CamelFolder *folder, const gchar *uri)
 {
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index c047473..d308674 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -51,7 +51,6 @@ struct _EMFolderSelectionButtonClass {
 	void  (* selected)  (EMFolderSelectionButton *button);
 };
 
-
 GType    em_folder_selection_button_get_type (void);
 
 GtkWidget *em_folder_selection_button_new (const gchar *title, const gchar *caption);
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 7a4f389..95339ff 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -42,19 +42,15 @@
 
 #define d(x)
 
-
 extern CamelSession *session;
 
-
 static void em_folder_selector_class_init (EMFolderSelectorClass *klass);
 static void em_folder_selector_init (EMFolderSelector *emfs);
 static void em_folder_selector_destroy (GtkObject *obj);
 static void em_folder_selector_finalize (GObject *obj);
 
-
 static GtkDialogClass *parent_class = NULL;
 
-
 GType
 em_folder_selector_get_type (void)
 {
@@ -223,7 +219,6 @@ em_folder_selector_new (EMFolderTree *emft, guint32 flags, const gchar *title, c
 	return (GtkWidget *) emfs;
 }
 
-
 static void
 emfs_create_name_activate (GtkEntry *entry, EMFolderSelector *emfs)
 {
@@ -271,7 +266,6 @@ em_folder_selector_create_new (EMFolderTree *emft, guint32 flags, const gchar *t
 	return (GtkWidget *) emfs;
 }
 
-
 void
 em_folder_selector_set_selected (EMFolderSelector *emfs, const gchar *uri)
 {
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index e9c5b35..c6e3e5f 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -128,7 +128,6 @@ em_folder_tree_model_get_type (void)
 	return type;
 }
 
-
 static void
 em_folder_tree_model_class_init (EMFolderTreeModelClass *klass)
 {
@@ -309,7 +308,6 @@ em_folder_tree_model_finalize (GObject *obj)
 	G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
-
 static void
 tree_model_iface_init (GtkTreeModelIface *iface)
 {
@@ -322,7 +320,6 @@ tree_sortable_iface_init (GtkTreeSortableIface *iface)
 	;
 }
 
-
 static void
 em_folder_tree_model_load_state (EMFolderTreeModel *model, const gchar *filename)
 {
@@ -354,7 +351,6 @@ em_folder_tree_model_load_state (EMFolderTreeModel *model, const gchar *filename
 	xmlSetProp (node, (const guchar *)"expand", (const guchar *)"true");
 }
 
-
 EMFolderTreeModel *
 em_folder_tree_model_new (const gchar *evolution_dir)
 {
@@ -388,7 +384,6 @@ em_folder_tree_model_new (const gchar *evolution_dir)
 	return model;
 }
 
-
 static void
 account_changed (EAccountList *accounts, EAccount *account, gpointer user_data)
 {
@@ -625,7 +620,6 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *ite
 	}
 }
 
-
 static void
 folder_subscribed (CamelStore *store, CamelFolderInfo *fi, EMFolderTreeModel *model)
 {
@@ -925,7 +919,6 @@ em_folder_tree_model_remove_uri (EMFolderTreeModel *model, const gchar *uri)
 	g_hash_table_remove (model->uri_hash, uri);
 }
 
-
 static void
 em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *store)
 {
@@ -942,7 +935,6 @@ em_folder_tree_model_remove_store_info (EMFolderTreeModel *model, CamelStore *st
 	g_hash_table_remove (model->store_hash, si->store);
 }
 
-
 void
 em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderTreeModelStoreInfo *si, GtkTreeIter *toplevel)
 {
@@ -979,7 +971,6 @@ em_folder_tree_model_remove_folders (EMFolderTreeModel *model, struct _EMFolderT
 	g_free (uri);
 }
 
-
 void
 em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store)
 {
@@ -1001,7 +992,6 @@ em_folder_tree_model_remove_store (EMFolderTreeModel *model, CamelStore *store)
 	em_folder_tree_model_remove_folders (model, si, &iter);
 }
 
-
 static xmlNodePtr
 find_xml_node (xmlNodePtr root, const gchar *name)
 {
@@ -1068,7 +1058,6 @@ em_folder_tree_model_get_expanded (EMFolderTreeModel *model, const gchar *key)
 	return FALSE;
 }
 
-
 void
 em_folder_tree_model_set_expanded (EMFolderTreeModel *model, const gchar *key, gboolean expanded)
 {
@@ -1226,7 +1215,6 @@ em_folder_tree_model_save_state (EMFolderTreeModel *model)
 	e_xml_save_file (model->filename, model->state);
 }
 
-
 static void
 expand_foreach_r (EMFolderTreeModel *model, xmlNodePtr parent, const gchar *dirname, EMFTModelExpandFunc func, gpointer user_data)
 {
@@ -1403,7 +1391,6 @@ em_folder_tree_model_set_unread_count (EMFolderTreeModel *model, CamelStore *sto
 	emft_model_unread_count_changed (GTK_TREE_MODEL (model), &iter);
 }
 
-
 gchar *
 em_folder_tree_model_get_selected (EMFolderTreeModel *model)
 {
@@ -1435,7 +1422,6 @@ em_folder_tree_model_get_selected (EMFolderTreeModel *model)
 	return uri;
 }
 
-
 void
 em_folder_tree_model_set_selected (EMFolderTreeModel *model, const gchar *uri)
 {
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index 2c2274f..f0bf091 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -62,7 +62,6 @@ enum {
 	NUM_COLUMNS
 };
 
-
 struct _EMFolderTreeModelStoreInfo {
 	CamelStore *store;
 	GtkTreeRowReference *row;
@@ -113,13 +112,10 @@ struct _EMFolderTreeModelClass {
 					 const gchar *uri);
 };
 
-
 GType em_folder_tree_model_get_type (void);
 
-
 EMFolderTreeModel *em_folder_tree_model_new (const gchar *evolution_dir);
 
-
 void em_folder_tree_model_set_folder_info (EMFolderTreeModel *model, GtkTreeIter *iter,
 					   struct _EMFolderTreeModelStoreInfo *si,
 					   CamelFolderInfo *fi, gint fully_loaded);
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index 1702713..cf9fb8a 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -1340,7 +1340,6 @@ tree_drag_leave (GtkWidget *widget, GdkDragContext *context, guint time, EMFolde
 	gtk_tree_view_set_drag_dest_row(emft->priv->treeview, NULL, GTK_TREE_VIEW_DROP_BEFORE);
 }
 
-
 #define SCROLL_EDGE_SIZE 15
 
 static gboolean
@@ -1652,7 +1651,6 @@ em_folder_tree_set_selected_list (EMFolderTree *emft, GList *list, gboolean expa
 	}
 }
 
-
 #if 0
 static void
 dump_fi (CamelFolderInfo *fi, gint depth)
@@ -2117,7 +2115,6 @@ static EPopupItem emft_popup_items[] = {
 	{ E_POPUP_ITEM, (gchar *) "30.emc.03", (gchar *) N_("Re_fresh"), emft_popup_refresh_folder, NULL, (gchar *) "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT},
 	{ E_POPUP_ITEM, (gchar *) "30.emc.04", (gchar *) N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, (gchar *) "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 },
 
-
 	{ E_POPUP_BAR, (gchar *) "99.emc" },
 	{ E_POPUP_ITEM, (gchar *) "99.emc.00", (gchar *) N_("_Properties"), emft_popup_properties, NULL, (gchar *) "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT }
 };
@@ -2355,7 +2352,6 @@ em_folder_tree_set_selected (EMFolderTree *emft, const gchar *uri, gboolean expa
 	g_list_free(l);
 }
 
-
 void
 em_folder_tree_select_next_path (EMFolderTree *emft, gboolean skip_read_folders)
 {
@@ -2496,7 +2492,6 @@ em_folder_tree_select_prev_path (EMFolderTree *emft, gboolean skip_read_folders)
 	return;
 }
 
-
 gchar *
 em_folder_tree_get_selected_uri (EMFolderTree *emft)
 {
@@ -2634,7 +2629,6 @@ emft_save_state (EMFolderTree *emft)
 	return FALSE;
 }
 
-
 static void
 emft_queue_save_state (EMFolderTree *emft)
 {
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index f537868..7a23cb5 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -573,7 +573,6 @@ static MailMsgInfo create_folder_info = {
 	(MailMsgFreeFunc) emfu_create_folder__free
 };
 
-
 static gint
 emfu_create_folder_real (CamelStore *store, const gchar *full_name, void (* done) (CamelFolderInfo *fi, gpointer user_data), gpointer user_data)
 {
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index f762e2e..3025031 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -145,7 +145,6 @@ static void emfv_set_seen (EMFolderView *emfv, const gchar *uid);
 static gboolean emfv_on_html_button_released_cb (GtkHTML *html, GdkEventButton *button, EMFolderView *emfv);
 static gboolean emfv_popup_menu (GtkWidget *widget);
 
-
 /* this is added to emfv->enable_map in :init() */
 static const EMFolderViewEnable emfv_enable_map[] = {
 	{ "EditCut",                  EM_POPUP_SELECT_MANY },
@@ -1949,7 +1948,6 @@ emp_uri_popup_vfolder_sender(EPopup *ep, EPopupItem *pitem, gpointer data)
 
 }
 
-
 static void
 emp_uri_popup_vfolder_recipient(EPopup *ep, EPopupItem *pitem, gpointer data)
 {
@@ -2134,7 +2132,6 @@ static EPixmap emfv_message_pixmaps[] = {
 	E_PIXMAP_END
 };
 
-
 static void
 emfv_enable_menus(EMFolderView *emfv)
 {
@@ -2504,7 +2501,6 @@ emfv_list_done_message_selected(CamelFolder *folder, const gchar *uid, CamelMime
 	g_object_unref (emfv);
 }
 
-
 static gboolean
 emfv_message_selected_timeout(gpointer data)
 {
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index dd61fd6..31aa123 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -33,7 +33,6 @@
 
 #include <glib/gi18n.h>
 
-
 /* class name -> klass map for EMFormat and subclasses */
 static GHashTable *emfh_types;
 
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 3a75bfb..4859558 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -140,7 +140,6 @@ struct _attach_puri {
         camel_cipher_validity_encrypt_t encrypt;
 };
 
-
 static void efhd_iframe_created(GtkHTML *html, GtkHTML *iframe, EMFormatHTMLDisplay *efh);
 /*static void efhd_url_requested(GtkHTML *html, const gchar *url, GtkHTMLStream *handle, EMFormatHTMLDisplay *efh);
   static gboolean efhd_object_requested(GtkHTML *html, GtkHTMLEmbedded *eb, EMFormatHTMLDisplay *efh);*/
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index 76ab642..d769127 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -207,7 +207,6 @@ efh_insert_cache(EMFormatHTML *efh, const gchar *partid)
 	return efhc;
 }
 
-
 static void
 efh_finalise(GObject *o)
 {
@@ -484,7 +483,6 @@ static void emfh_gethttp(struct _EMFormatHTMLJob *job, gint cancelled)
 	if (instream == NULL) {
 		gchar *proxy;
 
-
 		if (!(job->format->load_http_now
 		      || job->format->load_http == MAIL_CONFIG_HTTP_ALWAYS
 		      || (job->format->load_http == MAIL_CONFIG_HTTP_SOMETIMES
@@ -1647,7 +1645,6 @@ efh_format_address (EMFormatHTML *efh, GString *out, struct _camel_header_addres
 
 	if (limit > 0 && i>(limit)) {
 
-
 		if (!strcmp (field, _("To"))) {
 			str = g_strdup_printf ("<a href=\"##TO##\"><img src=\"%s/minus.png\" /></a>  ", EVOLUTION_ICONSDIR);
 		}
diff --git a/mail/em-format.h b/mail/em-format.h
index 35569a4..b3af1e8 100644
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@ -106,7 +106,6 @@ enum _em_format_handler_t {
 	EM_FORMAT_HANDLER_INLINE_DISPOSITION = 1<<1
 };
 
-
 typedef struct _EMFormatPURI EMFormatPURI;
 typedef void (*EMFormatPURIFunc)(EMFormat *md, CamelStream *stream, EMFormatPURI *puri);
 
diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h
index 20b7818..abd12e1 100644
--- a/mail/em-html-stream.h
+++ b/mail/em-html-stream.h
@@ -47,7 +47,6 @@ typedef struct {
 
 } EMHTMLStreamClass;
 
-
 CamelType    em_html_stream_get_type (void);
 
 /* the html_stream is closed when we are finalised (with an error), or closed (ok) */
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index bf18aab..7ff92fa 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -82,7 +82,6 @@ em_inline_filter_init (CamelObject *object)
 	emif->data = g_byte_array_new();
 }
 
-
 static void
 em_inline_filter_finalize (CamelObject *object)
 {
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index a76af74..057b2d9 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -157,7 +157,6 @@ em_mailer_prefs_dispose (GObject *obj)
         ((GObjectClass *)(parent_class))->dispose (obj);
 }
 
-
 static void
 color_button_set_color (GtkColorButton *color_button, const gchar *spec)
 {
@@ -297,7 +296,6 @@ label_tree_refill (GConfClient *client, guint cnxn_id, GConfEntry *entry, gpoint
 	e_util_labels_free (labels);
 }
 
-
 static void
 jh_tree_refill (EMMailerPrefs *prefs)
 {
@@ -421,7 +419,6 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data)
 	}
 }
 
-
 static gboolean
 init_junk_tree (GtkTreeView *jh_tree, EMMailerPrefs *prefs)
 {
@@ -839,7 +836,6 @@ custom_junk_button_toggled (GtkToggleButton *toggle, EMMailerPrefs *prefs)
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->junk_header_remove, FALSE);
 	}
 
-
 }
 
 static void
@@ -1009,7 +1005,6 @@ http_images_changed (GtkWidget *widget, EMMailerPrefs *prefs)
 	gconf_client_set_int (prefs->gconf, "/apps/evolution/mail/display/load_http_images", when, NULL);
 }
 
-
 static GtkWidget *
 emmp_widget_glade(EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *old, gpointer data)
 {
@@ -1513,7 +1508,6 @@ em_mailer_prefs_new (void)
 	return (GtkWidget *) new;
 }
 
-
 static struct _EMMailerPrefsHeader *
 emmp_header_from_xmldoc (xmlDocPtr doc)
 {
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 1428013..fd59baf 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -1092,7 +1092,6 @@ em_migrate_session_new (const gchar *path)
 	return session;
 }
 
-
 #endif	/* !G_OS_WIN32 */
 
 static GtkWidget *window;
@@ -2942,7 +2941,6 @@ migrate_to_db()
 		em_migrate_close_progress_dialog ();
 }
 
-
 gint
 em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, CamelException *ex)
 {
@@ -3036,7 +3034,6 @@ em_migrate (const gchar *evolution_dir, gint major, gint minor, gint revision, C
 #endif
 	}
 
-
 	if (major < 2 || (major == 2 && minor < 22))
 		em_update_message_notify_settings_2_21 ();
 
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index 235994a..d8b576f 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -68,10 +68,8 @@ static void em_network_prefs_init       (EMNetworkPrefs *dialog);
 static void em_network_prefs_destroy    (GtkObject *obj);
 static void em_network_prefs_finalise   (GObject *obj);
 
-
 static GtkVBoxClass *parent_class = NULL;
 
-
 GType
 em_network_prefs_get_type (void)
 {
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h
index 71031fb..0b6cd5f 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -45,7 +45,6 @@ typedef enum {
 	NETWORK_PROXY_AUTOCONFIG
 } NetworkConfigProxyType;
 
-
 struct _EMNetworkPrefs {
 	GtkVBox parent_object;
 
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 4f6b7ed..4fc912b 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -625,7 +625,6 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, gpointer data)
 	CamelDataWrapper *content;
 	CamelStreamMem *mem;
 
-
 	part = ((EMPopupTargetPart *) target)->part;
 
 	if (!part)
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index 39e6d02..42d8247 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -30,7 +30,6 @@
 
 #include "em-stripsig-filter.h"
 
-
 static void em_stripsig_filter_class_init (EMStripSigFilterClass *klass);
 static void em_stripsig_filter_init (EMStripSigFilter *filter, EMStripSigFilterClass *klass);
 
@@ -40,10 +39,8 @@ static void filter_complete (CamelMimeFilter *filter, const gchar *in, gsize len
 			     gchar **out, gsize *outlen, gsize *outprespace);
 static void filter_reset (CamelMimeFilter *filter);
 
-
 static CamelMimeFilterClass *parent_class = NULL;
 
-
 CamelType
 em_stripsig_filter_get_type (void)
 {
@@ -63,7 +60,6 @@ em_stripsig_filter_get_type (void)
 	return type;
 }
 
-
 static void
 em_stripsig_filter_class_init (EMStripSigFilterClass *klass)
 {
@@ -154,7 +150,6 @@ filter_reset (CamelMimeFilter *filter)
 	stripsig->midline = FALSE;
 }
 
-
 /**
  * em_stripsig_filter_new:
  *
diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h
index 9a09d1a..39493e5 100644
--- a/mail/em-stripsig-filter.h
+++ b/mail/em-stripsig-filter.h
@@ -48,7 +48,6 @@ struct _EMStripSigFilterClass {
 
 };
 
-
 CamelType em_stripsig_filter_get_type (void);
 
 CamelMimeFilter *em_stripsig_filter_new (void);
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index eaac3b4..4d20b31 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -800,7 +800,6 @@ static void sub_editor_busy(EMSubscribeEditor *se, gint dir)
 	}
 }
 
-
 #define DEFAULT_WIDTH  600
 #define DEFAULT_HEIGHT 400
 
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 1e285bc..b1cc782 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -73,7 +73,6 @@
 #include "e-util/e-dialog-utils.h"
 #include "e-util/e-error.h"
 
-
 #include "em-utils.h"
 #include "em-composer-utils.h"
 #include "em-folder-view.h"
@@ -354,7 +353,6 @@ em_filename_make_safe (gchar *string)
 	}
 }
 
-
 /* Saving messages... */
 
 static const gchar *
@@ -543,7 +541,6 @@ exit:
 	gtk_widget_destroy (file_chooser);
 }
 
-
 /**
  * em_utils_save_part_to_file:
  * @parent: parent window
@@ -2353,7 +2350,6 @@ em_utils_snoop_type(CamelMimePart *part)
 	} else
 		res = name_type;
 
-
 	if (res != name_type)
 		g_free (name_type);
 
@@ -2404,7 +2400,6 @@ em_utils_clear_get_password_canceled_accounts_flag (void)
 	}
 }
 
-
 static void error_response(GtkObject *o, gint button, gpointer data)
 {
 	gtk_widget_destroy((GtkWidget *)o);
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index 3fd822f..13a41c1 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -41,7 +41,6 @@ static FilterRule *create_rule (RuleEditor *re);
 
 static RuleEditorClass *parent_class = NULL;
 
-
 static void
 em_vfolder_editor_finalise (GObject *obj)
 {
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index dea8b3a..f2cc7cb 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -567,7 +567,6 @@ source_remove(GtkWidget *widget, struct _source_data *data)
 	set_sensitive(data);
 }
 
-
 GtkWidget *em_vfolder_editor_sourcelist_new(gchar *widget_name, gchar *string1, gchar *string2,
 					  gint int1, gint int2);
 
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index 7759a4e..6c5878e 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -73,7 +73,6 @@ BonoboObject *outlook_importer_new(void);
 
 BonoboObject *mail_importer_factory_cb(BonoboGenericFactory *factory, const gchar *iid, gpointer data);
 
-
 /* Defines copied from nsMsgMessageFlags.h in Mozilla source. */
 /* Evolution only cares about these headers I think */
 #define MSG_FLAG_READ 0x0001
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index ef5e878..2efa02e 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -75,7 +75,6 @@ rule_match_recipients (RuleContext *context, FilterRule *rule, CamelInternetAddr
 	}
 }
 
-
 /* remove 're' part of a subject */
 static const gchar *
 strip_re (const gchar *subject)
diff --git a/mail/mail-component.c b/mail/mail-component.c
index c54a76a..70da7b7 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -802,7 +802,6 @@ impl_createView (PortableServer_Servant servant,
 			       e_user_creatable_items_handler_new("mail", create_local_item_cb, tree_widget),
 			       (GDestroyNotify)g_object_unref);
 
-
 	g_signal_connect (component_view->view_control, "activate", G_CALLBACK (view_control_activate_cb), view_widget);
 	g_signal_connect (tree_widget, "folder-selected", G_CALLBACK (folder_selected_cb), view_widget);
 	g_signal_connect (tree_widget, "hidden-key-event", G_CALLBACK (tree_hidden_key_event_cb), view_widget);
diff --git a/mail/mail-config.c b/mail/mail-config.c
index d414f75..316957b 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -563,7 +563,6 @@ mail_config_clear (void)
 	config_clear_mime_types ();
 }
 
-
 void
 mail_config_write (void)
 {
@@ -1152,7 +1151,6 @@ get_new_signature_filename (void)
 	return NULL;
 }
 
-
 ESignature *
 mail_config_signature_new (const gchar *filename, gboolean script, gboolean html)
 {
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 0b43153..80a82a2 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -41,7 +41,6 @@ typedef struct _MailConfigSignature {
 	gboolean html;
 } MailConfigSignature;
 
-
 typedef enum {
 	MAIL_CONFIG_HTTP_NEVER,
 	MAIL_CONFIG_HTTP_SOMETIMES,
@@ -131,7 +130,6 @@ void mail_config_save_signatures (void);
 
 gchar *mail_config_signature_run_script (const gchar *script);
 
-
 /* uri's got changed by the store, etc */
 void mail_config_uri_renamed (GCompareFunc uri_cmp, const gchar *old, const gchar *new);
 void mail_config_uri_deleted (GCompareFunc uri_cmp, const gchar *uri);
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index 6ab9187..50167b7 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -819,7 +819,6 @@ update_folders(CamelStore *store, CamelFolderInfo *fi, gpointer data)
 	return res;
 }
 
-
 struct _ping_store_msg {
 	MailMsg base;
 
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 61e7c78..9ad326f 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -156,7 +156,6 @@ end_event_callback (CamelObject *o, gpointer event_data, gpointer error)
 	}
 }
 
-
 #ifdef MALLOC_CHECK
 #include <mcheck.h>
 
@@ -349,7 +348,6 @@ void mail_msg_cancel(guint msgid)
 	MAIL_MT_UNLOCK(mail_msg_lock);
 }
 
-
 /* waits for a message to be finished processing (freed)
    the messageid is from MailMsg->seq */
 void mail_msg_wait(guint msgid)
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index 2ffecb5..118de48 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -583,8 +583,6 @@ mail_send_message(CamelFolder *queue, const gchar *uid, const gchar *destination
 			camel_object_ref(folder);
 		}
 
-
-
 		camel_folder_append_message (folder, message, info, NULL, ex);
 		if (camel_exception_is_set (ex)) {
 			CamelFolder *sent_folder;
@@ -2256,7 +2254,6 @@ mail_save_part (CamelMimePart *part, const gchar *path,
 	return id;
 }
 
-
 /* ** PREPARE OFFLINE ***************************************************** */
 
 struct _prep_offline_msg {
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 96b4edf..7cc1a7e 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -149,7 +149,6 @@ mail_session_get_type (void)
 	return mail_session_type;
 }
 
-
 static gchar *
 make_key (CamelService *service, const gchar *item)
 {
diff --git a/mail/mail-types.h b/mail/mail-types.h
index c5c737e..5d2ef80 100644
--- a/mail/mail-types.h
+++ b/mail/mail-types.h
@@ -23,7 +23,6 @@
 
 G_BEGIN_DECLS
 
-
 typedef struct  _FolderBrowser     FolderBrowser;
 typedef struct  _MessageBrowser    MessageBrowser;
 typedef struct  _SubscribeDialog   SubscribeDialog;
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index ac18f2d..0f49f32 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -298,7 +298,6 @@ static MailMsgInfo vfolder_adduri_info = {
 	(MailMsgFreeFunc) vfolder_adduri_free
 };
 
-
 /* uri should be a camel uri */
 static gint
 vfolder_adduri(const gchar *uri, GList *folders, gint remove)
@@ -1111,7 +1110,6 @@ new_rule_clicked(GtkWidget *w, gint button, gpointer data)
 			return;
 		}
 
-
 		g_object_ref(rule);
 		rule_context_add_rule((RuleContext *)context, rule);
 		user = g_strdup_printf("%s/vfolders.xml", mail_component_peek_base_directory (mail_component_peek ()));
diff --git a/mail/message-list.c b/mail/message-list.c
index 2d5b34a..b222de4 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -705,7 +705,6 @@ message_list_select_all (MessageList *message_list)
 	e_selection_model_select_all (etsm);
 }
 
-
 typedef struct thread_select_info {
 	MessageList *ml;
 	GPtrArray *paths;
@@ -1067,7 +1066,6 @@ static const gchar *score_map[] = {
 	N_("Highest"),
 };
 
-
 static gchar *
 ml_value_to_string (ETreeModel *etm, gint col, gconstpointer value, gpointer data)
 {
@@ -2535,7 +2533,6 @@ message_list_construct (MessageList *message_list)
 	g_signal_connect((message_list->tree), "selection_change",
 			 G_CALLBACK (on_selection_changed_cmd), message_list);
 
-
 	e_tree_drag_source_set(message_list->tree, GDK_BUTTON1_MASK,
 			       ml_drag_types, sizeof(ml_drag_types)/sizeof(ml_drag_types[0]),
 			       GDK_ACTION_MOVE|GDK_ACTION_COPY|GDK_ACTION_ASK);
@@ -2667,7 +2664,6 @@ is_node_selectable (MessageList *ml, CamelMessageInfo *info)
 	return FALSE;
 }
 
-
 /* We try and find something that is selectable in our tree.  There is
  * actually no assurance that we'll find something that will still be
  * there next time, but its probably going to work most of the time. */
@@ -3206,7 +3202,6 @@ build_flat_diff(MessageList *ml, CamelFolderChangeInfo *changes)
 }
 #endif /* ! BROKEN_ETREE */
 
-
 static void
 mail_folder_hide_by_flag (CamelFolder *folder, MessageList *ml, CamelFolderChangeInfo **changes, gint flag)
 {
@@ -4216,7 +4211,6 @@ regen_list_done (struct _regen_list_msg *m)
 	if (m->ml->priv->destroyed)
 		return;
 
-
 	if (!m->complete)
 		return;
 
@@ -4481,14 +4475,12 @@ mail_regen_list (MessageList *ml, const gchar *search, const gchar *hideexpr, Ca
 	}
 }
 
-
 gdouble
 message_list_get_scrollbar_position (MessageList *ml)
 {
 	return gtk_range_get_value ((GtkRange *) ((GtkScrolledWindow *) ml)->vscrollbar);
 }
 
-
 void
 message_list_set_scrollbar_position (MessageList *ml, double pos)
 {
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
index d3a1d15..1936cd8 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -21,7 +21,6 @@
  *
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -86,7 +85,6 @@ message_tag_editor_init (MessageTagEditor *editor)
 	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
 }
 
-
 static void
 message_tag_editor_finalise (GObject *obj)
 {
@@ -109,7 +107,6 @@ message_tag_editor_get_tag_list (MessageTagEditor *editor)
 	return MESSAGE_TAG_EDITOR_GET_CLASS (editor)->get_tag_list (editor);
 }
 
-
 static void
 set_tag_list (MessageTagEditor *editor, CamelTag *tags)
 {
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 3b097c1..0187f81 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -55,7 +55,6 @@ struct _MessageTagEditorClass {
 	/* signals */
 };
 
-
 GType message_tag_editor_get_type (void);
 
 /* methods */
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index bf596c1..9293205 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -49,7 +49,6 @@ static void message_tag_followup_finalise (GObject *obj);
 static CamelTag *get_tag_list (MessageTagEditor *editor);
 static void set_tag_list (MessageTagEditor *editor, CamelTag *tags);
 
-
 #define DEFAULT_FLAG  2  /* Follow-Up */
 static const gchar *available_flags[] = {
 	N_("Call"),
@@ -67,10 +66,8 @@ static const gchar *available_flags[] = {
 
 static gint num_available_flags = sizeof (available_flags) / sizeof (available_flags[0]);
 
-
 static MessageTagEditorClass *parent_class = NULL;
 
-
 GType
 message_tag_followup_get_type (void)
 {
@@ -119,7 +116,6 @@ message_tag_followup_init (MessageTagFollowUp *editor)
 	editor->completed_date = 0;
 }
 
-
 static void
 message_tag_followup_finalise (GObject *obj)
 {
@@ -130,7 +126,6 @@ message_tag_followup_finalise (GObject *obj)
         G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
 
-
 static CamelTag *
 get_tag_list (MessageTagEditor *editor)
 {
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index c7ed55c..87dde76 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -60,7 +60,6 @@ struct _MessageTagFollowUpClass {
 	/* signals */
 };
 
-
 GType message_tag_followup_get_type (void);
 
 MessageTagEditor *message_tag_followup_new (void);
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 960c844..2168d32 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 e0b85f5..0ff48d3 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 c6a7b94..9de5512 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 b4f0d98..860a70a 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 1ca9a52..f285938 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 bb11ab9..81bad24 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 994aab0..9b35d85 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 98eb3d0..292f5d9 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 7da5584..3de8c30 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 d28f24a..3407353 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 3f2c463..198d2f2 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 026a4dc..5a76df3 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 9bba66d..ac2b8f1 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 46f4101..296e442 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 4e10aca..a45d9bc 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 aec27f3..7fb9f85 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 085bce3..bc8cb1e 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 deb5b04..3d886d7 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 5ecc02e..7b466ea 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 f877237..043d579 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 959bdec..7c9f1bf 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 87f851a..4cc582f 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 9456754..d8182a6 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 f41ac85..131fee0 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 3b7602f..6cb20e6 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 a7f06b6..dcd8165 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 7005ac7..d1b8957 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 2253d8a..43f4f14 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 45d21ba..e0655ce 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 a86eeaa..957b9da 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 8899b17..6375446 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 4ee5af0..a5568d3 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 67b1b5b..ef664b4 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 23c3820..5c8c769 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 9e2920d..9eccc69 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 05d22be..4faaf9b 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 5a8a991..299b19e 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 d48afaa..00d851f 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 7f526f8..637a13c 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 ca1b651..0661239 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 b75d9ab..16c639b 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 50bb6fc..debb1ac 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 87404db..29ff8ac 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 d9173e0..d1f8fab 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 04fa460..5bed477 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 c334019..3f5898b 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 a60bd2d..a381e2a 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 8760c43..656cf26 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 7615d6e..f5672ef 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 8c930eb..91e99c0 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 558d514..c824760 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 5007bf6..a550559 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 a893895..46b434b 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 445b5f8..39973ba 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 e1818d7..4f618a9 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 4f31ddd..66bd8d5 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 5736786..66f5a92 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 4e59b80..b296bb9 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 685fbdd..ff68dfc 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 6042de7..119009f 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 53669ba..4e03245 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 7bd9116..597570e 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 c4f7ef9..b6d4443 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);
 
diff --git a/shell/e-component-registry.c b/shell/e-component-registry.c
index 6497a7b..1b36d14 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 1b4dd97..373912d 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 f0fc892..02f8a63 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 57ed249..9ad741a 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 12f446b..6a56d0f 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 6e3cf11..9c7c32d 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 3f9c4b0..191ca5b 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 685b5a8..18d390d 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 d3abe1f..7c404fa 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 3eb0639..e4224f3 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 c5ae461..00f4266 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 8d51529..3942de7 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 9a06e5a..9e450f8 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 ce2afa3..417ac02 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 922c7f7..cb978bd 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 93fa3b3..d272d61 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 bcbe610..7301a37 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 5c7560d..05eae39 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 54d118a..21cc278 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 25df4d5..aaca133 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 18dd40c..5809348 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_ */
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index b32a7c5..c22c7e6 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -144,7 +144,6 @@ cert_trust_dialog_show (ECert *cert)
 	else
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON (ctd_data->notrust_button), TRUE);
 
-
 	icert = e_cert_get_internal_cert(ctd_data->cacert);
 	if (e_cert_trust_has_trusted_ca(icert->trust, FALSE, TRUE, FALSE))
 		gtk_label_set_text((GtkLabel *)ctd_data->label,
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index e0663f0..8026ba1 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -845,7 +845,6 @@ add_ca_cert (CertificateManagerData *cfm, ECert *cert)
 		}
 	}
 
-
 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, parent_iter);
 
 	if (e_cert_get_cn (cert))
@@ -941,7 +940,6 @@ unload_certs (CertificateManagerData *cfm,
 		cfm->authoritycerts_root_hash = g_hash_table_new_full (g_str_hash, g_str_equal,
 								       destroy_key, destroy_value);
 
-
 		break;
 	case E_CERT_UNKNOWN:
 		/* nothing to do here */
diff --git a/smime/lib/e-asn1-object.c b/smime/lib/e-asn1-object.c
index e0d6443..e8c51b6 100644
--- a/smime/lib/e-asn1-object.c
+++ b/smime/lib/e-asn1-object.c
@@ -306,7 +306,6 @@ e_asn1_object_new (void)
 	return E_ASN1_OBJECT (g_object_new (E_TYPE_ASN1_OBJECT, NULL));
 }
 
-
 void
 e_asn1_object_set_valid_container (EASN1Object *obj, gboolean flag)
 {
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index d0528f7..e043475 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -407,7 +407,6 @@ e_cert_db_find_cert_by_nickname (ECertDB *certdb,
 		cert = CERT_FindCertByNickname(CERT_GetDefaultCertDB(), (gchar *)nickname);
 	}
 
-
 	if (cert) {
 		/*    PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("got it\n"));*/
 		ECert *ecert = e_cert_new (cert);
diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h
index 30d2044..0e19e00 100644
--- a/smime/lib/e-cert-db.h
+++ b/smime/lib/e-cert-db.h
@@ -81,7 +81,6 @@ GList*               e_cert_db_get_cert_nicknames    (ECertDB *certdb,
 						      ECertType cert_type,
 						      GError **error);
 
-
 ECert*               e_cert_db_find_email_encryption_cert (ECertDB *certdb,
 							   const gchar *nickname,
 							   GError **error);
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 8367b7b..0cea3c5 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -278,7 +278,6 @@ e_cert_new_from_der (gchar *data, guint32 len)
 	return e_cert_new (cert);
 }
 
-
 
 
 CERTCertificate*
@@ -676,7 +675,6 @@ get_oid_text (SECItem *oid, gchar **text)
 	return TRUE;
 }
 
-
 static gboolean
 process_raw_bytes (SECItem *data, gchar **text)
 {
@@ -1069,7 +1067,6 @@ create_tbs_certificate_asn1_struct (ECert *cert, EASN1Object **seq)
 	e_asn1_object_append_child (sequence, subitem);
 	g_object_unref (subitem);
 
-
 	if (!process_sec_algorithm_id (&cert->priv->cert->signature, &subitem))
 		return FALSE;
 	e_asn1_object_set_display_name (subitem, _("Certificate Signature Algorithm"));
diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h
index 444afca..6e98fdb 100644
--- a/smime/lib/e-pkcs12.h
+++ b/smime/lib/e-pkcs12.h
@@ -55,7 +55,6 @@ GType                e_pkcs12_get_type     (void);
 
 EPKCS12*             e_pkcs12_new (void);
 
-
 #if 0
 /* XXX we're not going to support additional slots in the initial ssl
    stuff, so we just always default to the internal token (and thus
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index ea30c17..4625a63 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -186,7 +186,6 @@ e_timezone_dialog_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_timezone_dialog_parent_class)->finalize) (object);
 }
 
-
 static void
 e_timezone_dialog_add_timezones (ETimezoneDialog *etd)
 {
@@ -256,7 +255,6 @@ e_timezone_dialog_add_timezones (ETimezoneDialog *etd)
 	g_list_free (list_items);
 }
 
-
 ETimezoneDialog *
 e_timezone_dialog_construct (ETimezoneDialog *etd)
 {
@@ -377,7 +375,6 @@ get_widgets (ETimezoneDialog *etd)
 		&& priv->preview_label);
 }
 
-
 /**
  * e_timezone_dialog_new:
  *
@@ -428,7 +425,6 @@ format_utc_offset			(gint		 utc_offset,
 	  sprintf (buffer, "%s %s%02i:%02i:%02i", _("UTC"), sign, hours, minutes, seconds);
 }
 
-
 static gchar *
 zone_display_name_with_offset (icaltimezone *zone)
 {
@@ -488,7 +484,6 @@ on_map_timeout (gpointer data)
 	return TRUE;
 }
 
-
 static gboolean
 on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
 {
@@ -525,7 +520,6 @@ on_map_motion (GtkWidget *widget, GdkEventMotion *event, gpointer data)
 	return TRUE;
 }
 
-
 static gboolean
 on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
 {
@@ -554,7 +548,6 @@ on_map_leave (GtkWidget *widget, GdkEventCrossing *event, gpointer data)
 	return FALSE;
 }
 
-
 static gboolean
 on_map_visibility_changed (GtkWidget *w, GdkEventVisibility *event,
 			   gpointer data)
@@ -581,7 +574,6 @@ on_map_visibility_changed (GtkWidget *w, GdkEventVisibility *event,
 	return FALSE;
 }
 
-
 static gboolean
 on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data)
 {
@@ -616,7 +608,6 @@ on_map_button_pressed (GtkWidget *w, GdkEventButton *event, gpointer data)
 	return TRUE;
 }
 
-
 /* Returns the translated timezone location of the given EMapPoint,
    e.g. "Europe/London". */
 static icaltimezone *
@@ -655,7 +646,6 @@ get_zone_from_point (ETimezoneDialog *etd,
 	g_return_val_if_reached(NULL);
 }
 
-
 /**
  * e_timezone_dialog_get_timezone:
  * @etd: the timezone dialog
@@ -716,7 +706,6 @@ e_timezone_dialog_set_timezone (ETimezoneDialog *etd,
 	g_free (display);
 }
 
-
 GtkWidget *
 e_timezone_dialog_get_toplevel	(ETimezoneDialog  *etd)
 {
@@ -730,7 +719,6 @@ e_timezone_dialog_get_toplevel	(ETimezoneDialog  *etd)
 	return priv->app;
 }
 
-
 static void
 set_map_timezone (ETimezoneDialog *etd, icaltimezone *zone)
 {
@@ -757,7 +745,6 @@ set_map_timezone (ETimezoneDialog *etd, icaltimezone *zone)
 	priv->point_selected = point;
 }
 
-
 static void
 on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd)
 {
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h
index 8992d40..fb4ae52 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.h
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.h
@@ -37,7 +37,6 @@
 #define E_IS_TIMEZONE_DIALOG(obj)    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TIMEZONE_DIALOG))
 #define E_IS_TIMEZONE_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TIMEZONE_DIALOG))
 
-
 typedef struct _ETimezoneDialog		ETimezoneDialog;
 typedef struct _ETimezoneDialogClass	ETimezoneDialogClass;
 typedef struct _ETimezoneDialogPrivate	ETimezoneDialogPrivate;
@@ -53,7 +52,6 @@ struct _ETimezoneDialogClass {
 	GObjectClass parent_class;
 };
 
-
 GType            e_timezone_dialog_get_type     (void);
 ETimezoneDialog *e_timezone_dialog_construct    (ETimezoneDialog  *etd);
 
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index ab499d4..a510679 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -69,5 +69,4 @@ GType                    gal_define_views_dialog_get_type     (void);
 
 G_END_DECLS
 
-
 #endif /* __GAL_DEFINE_VIEWS_DIALOG_H__ */
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
index c408fea..cc7b7a5 100644
--- a/widgets/menus/gal-define-views-model.h
+++ b/widgets/menus/gal-define-views-model.h
@@ -45,12 +45,10 @@ typedef struct {
 	guint editable : 1;
 } GalDefineViewsModel;
 
-
 typedef struct {
 	ETableModelClass parent_class;
 } GalDefineViewsModelClass;
 
-
 GType        gal_define_views_model_get_type     (void);
 ETableModel *gal_define_views_model_new          (void);
 
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 9587593..801a941 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -636,7 +636,6 @@ gal_view_collection_get_view_id_by_index (GalViewCollection *collection, gint n)
 	return g_strdup (collection->view_data[n]->id);
 }
 
-
 void
 gal_view_collection_append                   (GalViewCollection *collection,
 					      GalView           *view)
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
index d443aa9..5667b3d 100644
--- a/widgets/menus/gal-view-collection.h
+++ b/widgets/menus/gal-view-collection.h
@@ -100,7 +100,6 @@ void                   gal_view_collection_add_factory              (GalViewColl
 void                   gal_view_collection_display_view             (GalViewCollection *collection,
 								     GalView           *view);
 
-
 /* Query the view collection. */
 gint                   gal_view_collection_get_count                (GalViewCollection *collection);
 GalView               *gal_view_collection_get_view                 (GalViewCollection *collection,
@@ -143,8 +142,6 @@ const gchar            *gal_view_collection_get_default_view         (GalViewCol
 void                   gal_view_collection_set_default_view         (GalViewCollection *collection,
 								     const gchar        *id);
 
-
 G_END_DECLS
 
-
 #endif /* _GAL_VIEW_COLLECTION_H_ */
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index 201c157..0cbebba 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -72,7 +72,6 @@ void     gal_view_etable_attach_tree   (GalViewEtable       *view,
 					ETree               *tree);
 void     gal_view_etable_detach        (GalViewEtable       *view);
 
-
 G_END_DECLS
 
 #endif /* _GAL_VIEW_ETABLE_H_ */
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index 41b7564..f874399 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -71,5 +71,4 @@ GalView    *gal_view_factory_new_view       (GalViewFactory *factory,
 
 G_END_DECLS
 
-
 #endif /* _GAL_VIEW_FACTORY_H_ */
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 610c03a..7687159 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -108,7 +108,6 @@ gvisad_setup_validate_button (GalViewInstanceSaveAsDialog *dialog)
 	}
 }
 
-
 static void
 gvisad_setup_radio_buttons (GalViewInstanceSaveAsDialog *dialog)
 {
@@ -155,7 +154,6 @@ gvisad_entry_changed (GtkWidget *widget, GalViewInstanceSaveAsDialog *dialog)
 	gvisad_setup_validate_button (dialog);
 }
 
-
 /* Method override implementations */
 static void
 gal_view_instance_save_as_dialog_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h
index 600aa67..64e97af 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.h
+++ b/widgets/menus/gal-view-instance-save-as-dialog.h
@@ -82,5 +82,4 @@ void       gal_view_instance_save_as_dialog_save      (GalViewInstanceSaveAsDial
 
 G_END_DECLS
 
-
 #endif /* __GAL_VIEW_INSTANCE_SAVE_AS_DIALOG_H__ */
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 6ed7f9a..b539965 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -49,7 +49,6 @@ G_DEFINE_TYPE (GalViewInstance, gal_view_instance, G_TYPE_OBJECT)
 static const EPopupMenu separator = E_POPUP_SEPARATOR;
 static const EPopupMenu terminator = E_POPUP_TERMINATOR;
 
-
 #define d(x)
 
 enum {
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index a7ce277..65aea4b 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -91,7 +91,6 @@ GalView         *gal_view_instance_get_current_view     (GalViewInstance   *inst
 void             gal_view_instance_set_custom_view      (GalViewInstance   *instance,
 							 GalView           *view);
 
-
 /* Returns true if this instance has ever been used before. */
 gboolean         gal_view_instance_exists               (GalViewInstance   *instance);
 
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index c1b75ae..de51da4 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -305,7 +305,6 @@ build_menus(GalViewMenus *menus)
 
 	id = gal_view_instance_get_current_view_id (instance);
 
-
 	length = gal_view_collection_get_count(collection);
 
         menus->priv->listenerClosures = e_list_new (closure_copy, closure_free, menus);
@@ -357,7 +356,6 @@ build_menus(GalViewMenus *menus)
 			bonobo_ui_node_set_attr(menuitem, "name", "GalView:first_sep");
 			bonobo_ui_node_set_attr(menuitem, "f", "");
 
-
 			menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
 			bonobo_ui_node_set_attr(menuitem, "name", "custom_view");
 			bonobo_ui_node_set_attr(menuitem, "id", "custom_view");
@@ -371,7 +369,6 @@ build_menus(GalViewMenus *menus)
 			bonobo_ui_node_set_attr(command, "group", "GalViewMenus");
 			bonobo_ui_node_set_attr(command, "_tip", N_("Current view is a customized view"));
 
-
 			menuitem = bonobo_ui_node_new_child(submenu, "menuitem");
 			bonobo_ui_node_set_attr(menuitem, "name", "SaveCurrentView");
 			bonobo_ui_node_set_attr(menuitem, "_label", N_("Save Custom View..."));
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index ab819a4..7fc263d 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -254,7 +254,6 @@ gal_view_new_dialog_set_property (GObject *object, guint prop_id, const GValue *
 	}
 }
 
-
 static void
 gal_view_new_dialog_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
 {
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
index 06bcb96..364e1ae 100644
--- a/widgets/menus/gal-view-new-dialog.h
+++ b/widgets/menus/gal-view-new-dialog.h
@@ -75,5 +75,4 @@ GtkWidget *gal_view_new_dialog_construct  (GalViewNewDialog  *dialog,
 
 G_END_DECLS
 
-
 #endif /* __GAL_VIEW_NEW_DIALOG_H__ */
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index 7b52d74..b410d8e 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -33,7 +33,6 @@ G_DEFINE_TYPE (GalView, gal_view, G_TYPE_OBJECT)
 
 d(static gint depth = 0;)
 
-
 enum {
 	CHANGED,
 	LAST_SIGNAL
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index 8973733..099a927 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -88,7 +88,6 @@ GalView    *gal_view_clone          (GalView    *view);
 /* Changed signal */
 void        gal_view_changed        (GalView    *view);
 
-
 G_END_DECLS
 
 #endif /* _GAL_VIEW_H_ */
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index d397f14..ed5db04 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -34,7 +34,6 @@
 
 #define ICON_SIZE 16
 
-
 struct _ActivityInfo {
 	gchar *component_id;
 	gint error_type;
@@ -101,7 +100,6 @@ lookup_activity (GList *list,
 	return NULL;
 }
 
-
 /* ETaskWidget actions.  */
 
 static gint
@@ -122,7 +120,6 @@ task_widget_button_press_event_callback (GtkWidget *widget,
 	return TRUE;
 }
 
-
 /* Creating and destroying ActivityInfos.  */
 
 static ActivityInfo *
@@ -180,7 +177,6 @@ task_widget_new_from_activity_info (ActivityInfo *activity_info)
 	return E_TASK_WIDGET (widget);
 }
 
-
 /* Task Bar handling.  */
 
 static void
@@ -227,7 +223,6 @@ task_bar_destroy_notify (gpointer data,
 	priv->task_bars = g_slist_remove (priv->task_bars, task_bar_instance);
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -296,7 +291,6 @@ e_activity_handler_init (EActivityHandler *activity_handler)
 	activity_handler->priv = priv;
 }
 
-
 EActivityHandler *
 e_activity_handler_new (void)
 {
diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h
index 8809728..3fd5c64 100644
--- a/widgets/misc/e-activity-handler.h
+++ b/widgets/misc/e-activity-handler.h
@@ -35,7 +35,6 @@ G_BEGIN_DECLS
 #define E_IS_ACTIVITY_HANDLER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER))
 #define E_IS_ACTIVITY_HANDLER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TYPE_ACTIVITY_HANDLER))
 
-
 typedef struct _EActivityHandler        EActivityHandler;
 typedef struct _EActivityHandlerPrivate EActivityHandlerPrivate;
 typedef struct _EActivityHandlerClass   EActivityHandlerClass;
@@ -53,7 +52,6 @@ struct _EActivityHandlerClass {
 	GObjectClass parent_class;
 };
 
-
 GType    e_activity_handler_get_type  (void);
 
 EActivityHandler *e_activity_handler_new  (void);
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 9c54894..41b5eea 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -44,7 +44,6 @@ static const gint e_calendar_item_days_in_month[12] = {
   e_calendar_item_days_in_month[month] + (((month) == 1 \
   && ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0)
 
-
 static void e_calendar_item_dispose	(GObject	 *object);
 static void e_calendar_item_get_property(GObject	 *object,
 					 guint		  property_id,
@@ -227,12 +226,10 @@ enum {
   LAST_SIGNAL
 };
 
-
 static guint e_calendar_item_signals[LAST_SIGNAL] = { 0 };
 
 G_DEFINE_TYPE (ECalendarItem, e_calendar_item, GNOME_TYPE_CANVAS_ITEM)
 
-
 static void
 e_calendar_item_class_init (ECalendarItemClass *class)
 {
@@ -526,7 +523,6 @@ e_calendar_item_class_init (ECalendarItemClass *class)
 	e_calendar_item_a11y_init ();
 }
 
-
 static void
 e_calendar_item_init (ECalendarItem *calitem)
 {
@@ -582,7 +578,6 @@ e_calendar_item_init (ECalendarItem *calitem)
 	calitem->signal_emission_idle_id = 0;
 }
 
-
 static void
 e_calendar_item_dispose		(GObject *object)
 {
@@ -619,7 +614,6 @@ e_calendar_item_dispose		(GObject *object)
 	G_OBJECT_CLASS (e_calendar_item_parent_class)->dispose (object);
 }
 
-
 static void
 e_calendar_item_get_property (GObject *object,
                               guint property_id,
@@ -701,7 +695,6 @@ e_calendar_item_get_property (GObject *object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_calendar_item_set_property (GObject *object,
                               guint property_id,
@@ -853,7 +846,6 @@ e_calendar_item_realize		(GnomeCanvasItem *item)
 	e_calendar_item_style_set (GTK_WIDGET(item->canvas), calitem);
 }
 
-
 static void
 e_calendar_item_unrealize	(GnomeCanvasItem *item)
 {
@@ -870,7 +862,6 @@ e_calendar_item_unrealize	(GnomeCanvasItem *item)
 		(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unrealize) (item);
 }
 
-
 static void
 e_calendar_item_unmap		(GnomeCanvasItem *item)
 {
@@ -887,7 +878,6 @@ e_calendar_item_unmap		(GnomeCanvasItem *item)
 		(* GNOME_CANVAS_ITEM_CLASS (e_calendar_item_parent_class)->unmap) (item);
 }
 
-
 static void
 e_calendar_item_update		(GnomeCanvasItem *item,
 				 double		 *affine,
@@ -1018,7 +1008,6 @@ e_calendar_item_update		(GnomeCanvasItem *item,
 	pango_font_metrics_unref (font_metrics);
 }
 
-
 /*
  * DRAWING ROUTINES - functions to paint the canvas item.
  */
@@ -1068,7 +1057,6 @@ e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 	bg = style->bg[GTK_STATE_NORMAL];
 	cr = gdk_cairo_create (drawable);
 
-
 	/* Clear the entire background. */
 	cairo_save (cr);
 	gdk_cairo_set_source_color (cr, &base);
@@ -1111,7 +1099,6 @@ e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 				  - xthickness * 2,
 				  bar_height);
 
-
 		for (col = 0; col < calitem->cols; col++) {
 			if (col != 0) {
 				col_x = calitem->x1 + calitem->x_offset
@@ -1126,7 +1113,6 @@ e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 						 col_x - 1 - x);
 			}
 
-
 			e_calendar_item_draw_month (calitem, drawable, x, y,
 						    width, height, row, col);
 		}
@@ -1138,7 +1124,6 @@ e_calendar_item_draw		(GnomeCanvasItem *canvas_item,
 	cairo_destroy (cr);
 }
 
-
 static void
 layout_set_day_text (ECalendarItem *calitem, PangoLayout *layout, gint day_index)
 {
@@ -1764,8 +1749,6 @@ e_calendar_item_get_week_number	(ECalendarItem *calitem,
 	return week_num + 1;
 }
 
-
-
 /* This is supposed to return the nearest item the the point and the distance.
    Since we are the only item we just return ourself and 0 for the distance.
    This is needed so that we get button/motion events. */
@@ -1978,7 +1961,6 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 						  pango_context_get_language (pango_context));
 	layout = pango_layout_new (pango_context);
 
-
 	char_height =
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics)) +
 		PANGO_PIXELS (pango_font_metrics_get_descent (font_metrics));
@@ -2052,7 +2034,6 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 	pango_font_metrics_unref (font_metrics);
 }
 
-
 static void
 e_calendar_item_get_day_style		(ECalendarItem	*calitem,
 					 gint		 year,
@@ -2100,8 +2081,6 @@ e_calendar_item_get_day_style		(ECalendarItem	*calitem,
 	}
 }
 
-
-
 static gboolean
 e_calendar_item_button_press	(ECalendarItem	*calitem,
 				 GdkEvent	*event)
@@ -2192,7 +2171,6 @@ e_calendar_item_button_release	(ECalendarItem	*calitem,
 	return FALSE;
 }
 
-
 static gboolean
 e_calendar_item_motion		(ECalendarItem	*calitem,
 				 GdkEvent	*event)
@@ -2272,7 +2250,6 @@ e_calendar_item_motion		(ECalendarItem	*calitem,
 		e_calendar_item_round_down_selection (calitem, &start_month,
 						      &start_day);
 
-
 	/* Check we don't go over the maximum number of days to select. */
 	if (calitem->selection_dragging_end) {
 		e_calendar_item_check_selection_end (calitem,
@@ -2304,7 +2281,6 @@ e_calendar_item_motion		(ECalendarItem	*calitem,
 	return TRUE;
 }
 
-
 static void
 e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
 					 gint		 start_month,
@@ -2345,7 +2321,6 @@ e_calendar_item_check_selection_end	(ECalendarItem	*calitem,
 	}
 }
 
-
 static void
 e_calendar_item_check_selection_start	(ECalendarItem	*calitem,
 					 gint		*start_month,
@@ -2384,7 +2359,6 @@ e_calendar_item_check_selection_start	(ECalendarItem	*calitem,
 	}
 }
 
-
 /* Converts a position within the item to a month & day.
    The month returned is 0 for the top-left month displayed.
    If the position is over the month heading -1 is returned for the day.
@@ -2529,7 +2503,6 @@ e_calendar_item_convert_position_to_day	(ECalendarItem	*calitem,
 	return TRUE;
 }
 
-
 static void
 e_calendar_item_get_month_info	(ECalendarItem	*calitem,
 				 gint		 row,
@@ -2568,7 +2541,6 @@ e_calendar_item_get_month_info	(ECalendarItem	*calitem,
 		*first_day_offset = first_day_of_month;
 }
 
-
 void
 e_calendar_item_get_first_month(ECalendarItem	*calitem,
 				gint		*year,
@@ -2578,7 +2550,6 @@ e_calendar_item_get_first_month(ECalendarItem	*calitem,
 	*month = calitem->month;
 }
 
-
 static void
 e_calendar_item_preserve_day_selection	(ECalendarItem	*calitem,
 					 gint            selected_day,
@@ -2710,7 +2681,6 @@ e_calendar_item_get_max_days_sel       (ECalendarItem	*calitem)
 	return calitem->max_days_selected;
 }
 
-
 /* Set the maximum number of days selectable */
 void
 e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
@@ -2720,7 +2690,6 @@ e_calendar_item_set_max_days_sel       (ECalendarItem	*calitem,
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
 }
 
-
 /* Get the maximum number of days before whole weeks are selected */
 gint
 e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem)
@@ -2728,7 +2697,6 @@ e_calendar_item_get_days_start_week_sel(ECalendarItem	*calitem)
 	return calitem->days_to_start_week_selection;
 }
 
-
 /* Set the maximum number of days before whole weeks are selected */
 void
 e_calendar_item_set_days_start_week_sel(ECalendarItem	*calitem,
@@ -2743,7 +2711,6 @@ e_calendar_item_get_display_popup      (ECalendarItem	*calitem)
 	return calitem->display_popup;
 }
 
-
 void
 e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
 					gboolean        display)
@@ -2751,7 +2718,6 @@ e_calendar_item_set_display_popup      (ECalendarItem	*calitem,
 	calitem->display_popup = display;
 }
 
-
 /* This will make sure that the given year & month are valid, i.e. if month
    is < 0 or > 11 the year and month will be updated accordingly. */
 void
@@ -2770,7 +2736,6 @@ e_calendar_item_normalize_date	(ECalendarItem	*calitem,
 	}
 }
 
-
 /* Adds or subtracts days from the selection. It is used when we switch months
    and the selection extends past the end of a month but we want to keep the
    number of days selected the same. days should not be more than 30. */
@@ -2799,7 +2764,6 @@ e_calendar_item_add_days_to_selection	(ECalendarItem	*calitem,
 	}
 }
 
-
 /* Gets the range of dates actually shown. Months are 0 to 11.
    This also includes the last days of the previous month and the first days
    of the following month, which are normally shown in gray.
@@ -2830,7 +2794,6 @@ e_calendar_item_get_date_range	(ECalendarItem	*calitem,
 	}
 	*start_day = days_in_prev_month + 1 - first_day_offset;
 
-
 	/* Calculate the last day shown. This will be one of the greyed-out
 	   days after the last full month ends. */
 	e_calendar_item_get_month_info (calitem, calitem->rows - 1,
@@ -2845,7 +2808,6 @@ e_calendar_item_get_date_range	(ECalendarItem	*calitem,
 	return TRUE;
 }
 
-
 /* Simple way to mark days so they appear bold.
    A more flexible interface may be added later. */
 void
@@ -2862,7 +2824,6 @@ e_calendar_item_clear_marks	(ECalendarItem	*calitem)
 				     item->x2, item->y2);
 }
 
-
 /* add_day_style - whether bit-or with the actual style or change the style fully */
 void
 e_calendar_item_mark_day	(ECalendarItem	*calitem,
@@ -2886,7 +2847,6 @@ e_calendar_item_mark_day	(ECalendarItem	*calitem,
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
 }
 
-
 void
 e_calendar_item_mark_days	(ECalendarItem	*calitem,
 				 gint		 start_year,
@@ -2951,7 +2911,6 @@ e_calendar_item_mark_days	(ECalendarItem	*calitem,
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM (calitem));
 }
 
-
 /* Rounds up the given day to the end of the week. */
 static void
 e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
@@ -2985,7 +2944,6 @@ e_calendar_item_round_up_selection	(ECalendarItem	*calitem,
 	}
 }
 
-
 /* Rounds down the given day to the start of the week. */
 static void
 e_calendar_item_round_down_selection	(ECalendarItem	*calitem,
@@ -3024,7 +2982,6 @@ e_calendar_item_round_down_selection	(ECalendarItem	*calitem,
 	}
 }
 
-
 static gint
 e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
 					 gint		 start_month_offset,
@@ -3056,7 +3013,6 @@ e_calendar_item_get_inclusive_days	(ECalendarItem	*calitem,
 	return days;
 }
 
-
 /* If the day is off the end of the month it is set to the last day of the
    month. */
 static void
@@ -3075,7 +3031,6 @@ e_calendar_item_ensure_valid_day	(ECalendarItem	*calitem,
 		*day = days_in_month;
 }
 
-
 gboolean
 e_calendar_item_get_selection		(ECalendarItem	*calitem,
 					 GDate		*start_date,
@@ -3106,7 +3061,6 @@ e_calendar_item_get_selection		(ECalendarItem	*calitem,
 	return TRUE;
 }
 
-
 static void
 e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
 					   GDate		*start_date,
@@ -3161,7 +3115,6 @@ e_calendar_item_set_selection_if_emission (ECalendarItem	*calitem,
 		+ end_month - calitem->month;
 	new_end_day = end_day;
 
-
 	if (!calitem->selection_set
 	    || calitem->selection_start_month_offset != new_start_month_offset
 	    || calitem->selection_start_day != new_start_day
@@ -3312,7 +3265,6 @@ e_calendar_item_ensure_days_visible	(ECalendarItem	*calitem,
 	return need_update;
 }
 
-
 static void
 e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
 					 GdkEventButton	*event,
@@ -3371,7 +3323,6 @@ e_calendar_item_show_popup_menu		(ECalendarItem	*calitem,
 	gtk_widget_destroy (menu);
 }
 
-
 static void
 e_calendar_item_on_menu_item_activate	(GtkWidget	*menuitem,
 					 ECalendarItem	*calitem)
@@ -3387,7 +3338,6 @@ e_calendar_item_on_menu_item_activate	(GtkWidget	*menuitem,
 	e_calendar_item_set_first_month (calitem, year, month);
 }
 
-
 static void
 e_calendar_item_position_menu	(GtkMenu            *menu,
 				 gint               *x,
@@ -3412,7 +3362,6 @@ e_calendar_item_position_menu	(GtkMenu            *menu,
 	*y = CLAMP (*y, 0, screen_height - requisition.height);
 }
 
-
 /* Sets the function to call to get the colors to use for a particular day. */
 void
 e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
@@ -3430,7 +3379,6 @@ e_calendar_item_set_style_callback	(ECalendarItem	*calitem,
 	calitem->style_callback_destroy = destroy;
 }
 
-
 static void
 e_calendar_item_date_range_changed	(ECalendarItem	*calitem)
 {
@@ -3440,7 +3388,6 @@ e_calendar_item_date_range_changed	(ECalendarItem	*calitem)
 	e_calendar_item_queue_signal_emission (calitem);
 }
 
-
 static void
 e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem)
 {
@@ -3449,7 +3396,6 @@ e_calendar_item_queue_signal_emission	(ECalendarItem	*calitem)
 	}
 }
 
-
 static gboolean
 e_calendar_item_signal_emission_idle_cb	(gpointer data)
 {
@@ -3483,7 +3429,6 @@ e_calendar_item_signal_emission_idle_cb	(gpointer data)
 	return FALSE;
 }
 
-
 /* Sets a callback to use to get the current time. This is useful if the
    application needs to use its own timezone data rather than rely on the
    Unix timezone. */
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 936e86e..0ab34b3 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -70,7 +70,6 @@ G_BEGIN_DECLS
 #define	E_CALENDAR_ITEM_XPAD_BEFORE_CELLS		1
 #define	E_CALENDAR_ITEM_XPAD_AFTER_CELLS		4
 
-
 /* These index our colors array. */
 typedef enum
 {
@@ -110,7 +109,6 @@ typedef void (*ECalendarItemStyleCallback)   (ECalendarItem	*calitem,
 typedef struct tm (*ECalendarItemGetTimeCallback) (ECalendarItem *calitem,
 						   gpointer	  data);
 
-
 #define E_CALENDAR_ITEM(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
         e_calendar_item_get_type (), ECalendarItem))
 #define E_CALENDAR_ITEM_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k),\
@@ -265,7 +263,6 @@ struct _ECalendarItemClass
 	void (* selection_preview_changed)	(ECalendarItem *calitem);
 };
 
-
 GType    e_calendar_item_get_type		(void);
 
 /* FIXME: months are 0-11 throughout, but 1-12 may be better. */
@@ -368,7 +365,6 @@ gint e_calendar_item_get_week_number	(ECalendarItem *calitem,
 					 gint		year);
 void e_calendar_item_style_set (GtkWidget *widget, ECalendarItem *calitem);
 
-
 G_END_DECLS
 
 #endif /* _E_CALENDAR_ITEM_H_ */
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index a0adf46..fd17c67 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -99,7 +99,6 @@ static void e_calendar_stop_auto_move	(ECalendar	*cal);
 
 G_DEFINE_TYPE (ECalendar, e_calendar, E_CANVAS_TYPE)
 
-
 static void
 e_calendar_class_init (ECalendarClass *class)
 {
@@ -120,7 +119,6 @@ e_calendar_class_init (ECalendarClass *class)
 	widget_class->focus                = e_calendar_focus;
 }
 
-
 static void
 e_calendar_init (ECalendar *cal)
 {
@@ -202,7 +200,6 @@ e_calendar_init (ECalendar *cal)
 	cal->timeout_id = 0;
 }
 
-
 /**
  * e_calendar_new:
  * @Returns: a new #ECalendar.
@@ -222,7 +219,6 @@ e_calendar_new			(void)
 	return cal;
 }
 
-
 static void
 e_calendar_destroy		(GtkObject *object)
 {
@@ -242,7 +238,6 @@ e_calendar_destroy		(GtkObject *object)
 		(* GTK_OBJECT_CLASS (e_calendar_parent_class)->destroy) (object);
 }
 
-
 static void
 e_calendar_realize (GtkWidget *widget)
 {
@@ -254,7 +249,6 @@ e_calendar_realize (GtkWidget *widget)
 				   &widget->style->bg[GTK_STATE_NORMAL]);
 }
 
-
 static void
 e_calendar_style_set		(GtkWidget	*widget,
 				 GtkStyle	*previous_style)
@@ -274,7 +268,6 @@ e_calendar_style_set		(GtkWidget	*widget,
 	e_calendar_item_style_set (widget, e_calendar->calitem);
 }
 
-
 static void
 e_calendar_size_request		(GtkWidget      *widget,
 				 GtkRequisition *requisition)
@@ -298,7 +291,6 @@ e_calendar_size_request		(GtkWidget      *widget,
 	requisition->height = height + style->ythickness * 2;
 }
 
-
 static void
 e_calendar_size_allocate	(GtkWidget	*widget,
 				 GtkAllocation	*allocation)
@@ -339,7 +331,6 @@ e_calendar_size_allocate	(GtkWidget	*widget,
 			       "y2", new_y2,
 			       NULL);
 
-
 	/* Position the arrow buttons. */
 	arrow_button_size =
 		PANGO_PIXELS (pango_font_metrics_get_ascent (font_metrics))
@@ -391,7 +382,6 @@ e_calendar_set_minimum_size	(ECalendar	*cal,
 	gtk_widget_queue_resize (GTK_WIDGET (cal));
 }
 
-
 void
 e_calendar_set_maximum_size	(ECalendar	*cal,
 				 gint		 rows,
@@ -410,7 +400,6 @@ e_calendar_set_maximum_size	(ECalendar	*cal,
 	gtk_widget_queue_resize (GTK_WIDGET (cal));
 }
 
-
 /* Returns the border size on each side of the month displays. */
 void
 e_calendar_get_border_size	(ECalendar	*cal,
@@ -435,7 +424,6 @@ e_calendar_get_border_size	(ECalendar	*cal,
 	}
 }
 
-
 static void
 e_calendar_on_prev_pressed	(ECalendar	*cal)
 {
@@ -462,7 +450,6 @@ e_calendar_start_auto_move	(ECalendar	*cal,
 
 }
 
-
 static gboolean
 e_calendar_auto_move_handler	(gpointer	 data)
 {
@@ -489,21 +476,18 @@ e_calendar_auto_move_handler	(gpointer	 data)
 	return TRUE;
 }
 
-
 static void
 e_calendar_on_prev_released	(ECalendar	*cal)
 {
 	e_calendar_stop_auto_move (cal);
 }
 
-
 static void
 e_calendar_on_next_released	(ECalendar	*cal)
 {
 	e_calendar_stop_auto_move (cal);
 }
 
-
 static void
 e_calendar_stop_auto_move	(ECalendar	*cal)
 {
@@ -527,7 +511,6 @@ e_calendar_on_next_clicked      (ECalendar      *cal)
 		cal->calitem->month + 1);
 }
 
-
 static gint
 e_calendar_drag_motion (GtkWidget      *widget,
 			GdkDragContext *context,
@@ -542,7 +525,6 @@ e_calendar_drag_motion (GtkWidget      *widget,
 	return FALSE;
 }
 
-
 static void
 e_calendar_drag_leave (GtkWidget      *widget,
 		       GdkDragContext *context,
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index 911e9ee..2ee0028 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -41,7 +41,6 @@ G_BEGIN_DECLS
 #define E_CALENDAR_CLASS(klass)  G_TYPE_CHECK_CLASS_CAST (klass, e_calendar_get_type (), ECalendarClass)
 #define E_IS_CALENDAR(obj)       G_TYPE_CHECK_INSTANCE_TYPE (obj, e_calendar_get_type ())
 
-
 typedef struct _ECalendar       ECalendar;
 typedef struct _ECalendarClass  ECalendarClass;
 
@@ -73,7 +72,6 @@ struct _ECalendarClass
 	ECanvasClass parent_class;
 };
 
-
 GType		   e_calendar_get_type		(void);
 GtkWidget* e_calendar_new		(void);
 
diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h
index 562987e..7e3ac19 100644
--- a/widgets/misc/e-canvas-background.h
+++ b/widgets/misc/e-canvas-background.h
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
  * y2                   double		RW              If you need the rectangle to have negative coordinates, use an affine.
  */
 
-
 #define E_CANVAS_BACKGROUND_TYPE            (e_canvas_background_get_type ())
 #define E_CANVAS_BACKGROUND(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), E_CANVAS_BACKGROUND_TYPE, ECanvasBackground))
 #define E_CANVAS_BACKGROUND_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), E_CANVAS_BACKGROUND_TYPE, ECanvasBackgroundClass))
@@ -64,7 +63,6 @@ struct _ECanvasBackgroundClass {
 	void        (*style_set)        (ECanvasBackground *eti, GtkStyle *previous_style);
 };
 
-
 /* Standard Gtk function */
 GType e_canvas_background_get_type (void);
 
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index cae41d8..e69bb9c 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -63,7 +63,6 @@ compute_offset(gint top, gint bottom, gint page_top, gint page_bottom)
 	return offset;
 }
 
-
 static void
 e_canvas_show_area (GnomeCanvas *canvas, double x1, double y1, double x2, double y2)
 {
@@ -96,7 +95,6 @@ e_canvas_item_show_area (GnomeCanvasItem *item, double x1, double y1, double x2,
 	e_canvas_show_area(item->canvas, x1, y1, x2, y2);
 }
 
-
 static gboolean
 e_canvas_area_shown (GnomeCanvas *canvas, double x1, double y1, double x2, double y2)
 {
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index bb0bd77..a7e8191 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -264,7 +264,6 @@ e_canvas_vbox_real_add_item(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
 	}
 }
 
-
 static void
 e_canvas_vbox_real_add_item_start(ECanvasVbox *e_canvas_vbox, GnomeCanvasItem *item)
 {
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
index fb049c3..b41b8f8 100644
--- a/widgets/misc/e-canvas-vbox.h
+++ b/widgets/misc/e-canvas-vbox.h
@@ -45,7 +45,6 @@ G_BEGIN_DECLS
 #define E_IS_CANVAS_VBOX(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_CANVAS_VBOX_TYPE))
 #define E_IS_CANVAS_VBOX_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_CANVAS_VBOX_TYPE))
 
-
 typedef struct _ECanvasVbox       ECanvasVbox;
 typedef struct _ECanvasVboxClass  ECanvasVboxClass;
 
@@ -83,5 +82,4 @@ GType      e_canvas_vbox_get_type (void);
 
 G_END_DECLS
 
-
 #endif /* __E_CANVAS_VBOX_H__ */
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 53e3eaf..aeb2634 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -143,7 +143,6 @@ e_canvas_new (void)
 	return GTK_WIDGET (g_object_new (E_CANVAS_TYPE, NULL));
 }
 
-
 /* Emits an event for an item in the canvas, be it the current item, grabbed
  * item, or focused item, as appropriate.
  */
@@ -279,7 +278,6 @@ e_canvas_key (GtkWidget *widget, GdkEventKey *event)
 	return emit_event (canvas, &full_event);
 }
 
-
 /* This routine invokes the point method of the item.  The argument x, y should
  * be in the parent's item-relative coordinate system.  This routine applies the
  * inverse of the item's transform, maintaining the affine invariant.
@@ -546,7 +544,6 @@ e_canvas_visibility (GtkWidget *widget, GdkEventVisibility *event, ECanvas *canv
 	return FALSE;
 }
 
-
 /**
  * e_canvas_item_grab_focus:
  * @item: A canvas item.
@@ -664,7 +661,6 @@ e_canvas_style_set (GtkWidget *widget, GtkStyle *previous_style)
 	ec_style_set_recursive (GNOME_CANVAS_ITEM (gnome_canvas_root (GNOME_CANVAS (widget))), previous_style);
 }
 
-
 static void
 e_canvas_realize (GtkWidget *widget)
 {
@@ -797,7 +793,6 @@ e_canvas_item_set_reflow_callback (GnomeCanvasItem *item, ECanvasItemReflowFunc
 	g_object_set_data(G_OBJECT(item), "ECanvasItem::reflow_callback", (gpointer) func);
 }
 
-
 void
 e_canvas_item_set_selection_callback (GnomeCanvasItem *item, ECanvasItemSelectionFunc func)
 {
@@ -1004,7 +999,6 @@ void e_canvas_hide_tooltip  (ECanvas *canvas)
 	}
 }
 
-
 static gboolean
 grab_cancelled_check (gpointer data)
 {
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index 58994d6..a78824e 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -50,7 +50,6 @@ typedef gint            (*ECanvasItemSelectionCompareFunc)      (GnomeCanvasItem
 								 gpointer         data2,
 								 gint             flags);
 
-
 typedef struct _ECanvas       ECanvas;
 typedef struct _ECanvasClass  ECanvasClass;
 
@@ -101,7 +100,6 @@ struct _ECanvasClass
 	void (* reflow) (ECanvas *canvas);
 };
 
-
 GType      e_canvas_get_type                             (void);
 GtkWidget *e_canvas_new                                  (void);
 
@@ -147,5 +145,4 @@ void       e_canvas_hide_tooltip                         (ECanvas
 
 G_END_DECLS
 
-
 #endif /* __E_CANVAS_H__ */
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 38aaf59..dfbe183 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -25,7 +25,6 @@
  * window to edit it.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -99,7 +98,6 @@ static void e_cell_date_edit_update_cell	(ECellDateEdit	*ecde,
 static void e_cell_date_edit_on_time_selected	(GtkTreeSelection *selection, ECellDateEdit *ecde);
 static void e_cell_date_edit_hide_popup		(ECellDateEdit	*ecde);
 
-
 /* Our arguments. */
 enum {
 	PROP_0,
@@ -114,7 +112,6 @@ enum {
 
 G_DEFINE_TYPE (ECellDateEdit, e_cell_date_edit, E_CELL_POPUP_TYPE)
 
-
 static void
 e_cell_date_edit_class_init (ECellDateEditClass *class)
 {
@@ -207,7 +204,6 @@ e_cell_date_edit_class_init (ECellDateEditClass *class)
 			G_PARAM_READWRITE));
 }
 
-
 static void
 e_cell_date_edit_init (ECellDateEdit *ecde)
 {
@@ -328,7 +324,6 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 			    G_CALLBACK (e_cell_date_edit_on_ok_clicked),
 			    ecde);
 
-
 	g_signal_connect((ecde->popup_window),
 			    "key_press_event",
 			    G_CALLBACK (e_cell_date_edit_key_press),
@@ -339,7 +334,6 @@ e_cell_date_edit_init (ECellDateEdit *ecde)
 			    ecde);
 }
 
-
 /**
  * e_cell_date_edit_new:
  *
@@ -353,7 +347,6 @@ e_cell_date_edit_new			(void)
 	return g_object_new (e_cell_date_edit_get_type (), NULL);
 }
 
-
 /*
  * GtkObject::destroy method
  */
@@ -370,7 +363,6 @@ e_cell_date_edit_destroy		(GtkObject *object)
 	GTK_OBJECT_CLASS (e_cell_date_edit_parent_class)->destroy (object);
 }
 
-
 static void
 e_cell_date_edit_get_property		(GObject	*object,
 					 guint		 property_id,
@@ -408,7 +400,6 @@ e_cell_date_edit_get_property		(GObject	*object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static void
 e_cell_date_edit_set_property		(GObject	*object,
 					 guint		 property_id,
@@ -481,7 +472,6 @@ e_cell_date_edit_set_property		(GObject	*object,
 	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 }
 
-
 static gint
 e_cell_date_edit_do_popup		(ECellPopup	*ecp,
 					 GdkEvent	*event,
@@ -502,7 +492,6 @@ e_cell_date_edit_do_popup		(ECellPopup	*ecp,
 	return TRUE;
 }
 
-
 static void
 e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
 {
@@ -562,7 +551,6 @@ e_cell_date_edit_set_popup_values	(ECellDateEdit	*ecde)
 	e_cell_text_free_text (ecell_text, cell_text);
 }
 
-
 static void
 e_cell_date_edit_select_matching_time	(ECellDateEdit	*ecde,
 					 gchar		*time)
@@ -602,7 +590,6 @@ e_cell_date_edit_select_matching_time	(ECellDateEdit	*ecde,
 	}
 }
 
-
 static void
 e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
 					 gint             row,
@@ -626,7 +613,6 @@ e_cell_date_edit_show_popup		(ECellDateEdit	*ecde,
 	e_cell_popup_set_shown (E_CELL_POPUP (ecde), TRUE);
 }
 
-
 /* Calculates the size and position of the popup window (like GtkCombo). */
 static void
 e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
@@ -710,7 +696,6 @@ e_cell_date_edit_get_popup_pos		(ECellDateEdit	*ecde,
 	*height = popup_requisition.height;
 }
 
-
 /* This handles key press events in the popup window. If the Escape key is
    pressed we hide the popup, and do not change the cell contents. */
 static gint
@@ -727,7 +712,6 @@ e_cell_date_edit_key_press		(GtkWidget	*popup_window,
 	return TRUE;
 }
 
-
 /* This handles button press events in the popup window. If the button is
    pressed outside the popup, we hide it and do not change the cell contents.
 */
@@ -746,7 +730,6 @@ e_cell_date_edit_button_press		(GtkWidget	*popup_window,
 	return TRUE;
 }
 
-
 /* Clears the time list and rebuilds it using the lower_hour, upper_hour
    and use_24_hour_format settings. */
 static void
@@ -792,7 +775,6 @@ e_cell_date_edit_rebuild_time_list		(ECellDateEdit	*ecde)
 	ecde->need_time_list_rebuild = FALSE;
 }
 
-
 static void
 e_cell_date_edit_on_ok_clicked		(GtkWidget	*button,
 					 ECellDateEdit	*ecde)
@@ -837,7 +819,6 @@ e_cell_date_edit_on_ok_clicked		(GtkWidget	*button,
 	e_cell_date_edit_hide_popup (ecde);
 }
 
-
 static void
 e_cell_date_edit_show_time_invalid_warning	(ECellDateEdit	*ecde)
 {
@@ -868,7 +849,6 @@ e_cell_date_edit_show_time_invalid_warning	(ECellDateEdit	*ecde)
 	gtk_widget_destroy (dialog);
 }
 
-
 static void
 e_cell_date_edit_on_now_clicked		(GtkWidget	*button,
 					 ECellDateEdit	*ecde)
@@ -892,7 +872,6 @@ e_cell_date_edit_on_now_clicked		(GtkWidget	*button,
 	e_cell_date_edit_hide_popup (ecde);
 }
 
-
 static void
 e_cell_date_edit_on_none_clicked	(GtkWidget	*button,
 					 ECellDateEdit	*ecde)
@@ -901,7 +880,6 @@ e_cell_date_edit_on_none_clicked	(GtkWidget	*button,
 	e_cell_date_edit_hide_popup (ecde);
 }
 
-
 static void
 e_cell_date_edit_on_today_clicked	(GtkWidget	*button,
 					 ECellDateEdit	*ecde)
@@ -929,7 +907,6 @@ e_cell_date_edit_on_today_clicked	(GtkWidget	*button,
 	e_cell_date_edit_hide_popup (ecde);
 }
 
-
 static void
 e_cell_date_edit_update_cell		(ECellDateEdit	*ecde,
 					 const gchar	*text)
@@ -957,7 +934,6 @@ e_cell_date_edit_update_cell		(ECellDateEdit	*ecde,
 	e_cell_text_free_text (ecell_text, old_text);
 }
 
-
 static void
 e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *ecde)
 {
@@ -977,7 +953,6 @@ e_cell_date_edit_on_time_selected (GtkTreeSelection *selection, ECellDateEdit *e
 	g_free (list_item_text);
 }
 
-
 static void
 e_cell_date_edit_hide_popup		(ECellDateEdit	*ecde)
 {
@@ -986,7 +961,6 @@ e_cell_date_edit_hide_popup		(ECellDateEdit	*ecde)
 	e_cell_popup_set_shown (E_CELL_POPUP (ecde), FALSE);
 }
 
-
 /* These freeze and thaw the rebuilding of the time list. They are useful when
    setting several properties which result in rebuilds of the list, e.g. the
    lower_hour, upper_hour and use_24_hour_format properties. */
@@ -998,7 +972,6 @@ e_cell_date_edit_freeze			(ECellDateEdit	*ecde)
 	ecde->freeze_count++;
 }
 
-
 void
 e_cell_date_edit_thaw			(ECellDateEdit	*ecde)
 {
@@ -1012,7 +985,6 @@ e_cell_date_edit_thaw			(ECellDateEdit	*ecde)
 	}
 }
 
-
 /* Sets a callback to use to get the current time. This is useful if the
    application needs to use its own timezone data rather than rely on the
    Unix timezone. */
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
index 2e125fe..72fe952 100644
--- a/widgets/misc/e-cell-date-edit.h
+++ b/widgets/misc/e-cell-date-edit.h
@@ -38,7 +38,6 @@
 #define E_IS_CELL_DATE_EDIT(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_DATE_EDIT_TYPE))
 #define E_IS_CELL_DATE_EDIT_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_DATE_EDIT_TYPE))
 
-
 typedef struct _ECellDateEdit ECellDateEdit;
 typedef struct _ECellDateEditClass ECellDateEditClass;
 
@@ -82,18 +81,15 @@ struct _ECellDateEditClass {
 	ECellPopupClass parent_class;
 };
 
-
 GType      e_cell_date_edit_get_type		(void);
 ECell     *e_cell_date_edit_new			(void);
 
-
 /* These freeze and thaw the rebuilding of the time list. They are useful when
    setting several properties which result in rebuilds of the list, e.g. the
    lower_hour, upper_hour and use_24_hour_format properties. */
 void	   e_cell_date_edit_freeze		(ECellDateEdit	*ecde);
 void	   e_cell_date_edit_thaw		(ECellDateEdit	*ecde);
 
-
 /* Sets a callback to use to get the current time. This is useful if the
    application needs to use its own timezone data rather than rely on the
    Unix timezone. */
@@ -102,5 +98,4 @@ void	   e_cell_date_edit_set_get_time_callback(ECellDateEdit	*ecde,
 						  gpointer	 data,
 						  GDestroyNotify destroy);
 
-
 #endif /* _E_CELL_DATE_EDIT_H_ */
diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c
index 35dbb61..3ed9954 100644
--- a/widgets/misc/e-cell-percent.c
+++ b/widgets/misc/e-cell-percent.c
@@ -40,7 +40,6 @@
 
 G_DEFINE_TYPE (ECellPercent, e_cell_percent, E_CELL_TEXT_TYPE)
 
-
 static gchar *
 ecp_get_text (ECellText *cell, ETableModel *model, gint col, gint row)
 {
diff --git a/widgets/misc/e-config-page.c b/widgets/misc/e-config-page.c
index 00fb991..922a269 100644
--- a/widgets/misc/e-config-page.c
+++ b/widgets/misc/e-config-page.c
@@ -46,4 +46,3 @@ e_config_page_new (void)
 	return g_object_new (e_config_page_get_type (), NULL);
 }
 
-
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index ddf5f1a..e8f4221 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -61,7 +61,6 @@ static CursorDef cursors [] = {
 	{ NULL, 0,    0,  NULL }
 };
 
-
 static void
 create_bitmap_and_mask_from_xpm (GdkBitmap **bitmap, GdkBitmap **mask, const gchar **xpm)
 {
@@ -150,7 +149,6 @@ e_cursors_shutdown (void)
 		gdk_cursor_unref (cursors [i].cursor);
 }
 
-
 /* Returns a cursor given its type */
 GdkCursor *
 e_cursor_get (ECursorType type)
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 1d69016..e7b1a05 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -23,7 +23,6 @@
  * time field with popups for entering a date.
  */
 
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -113,10 +112,8 @@ enum {
 	LAST_SIGNAL
 };
 
-
 static gint date_edit_signals [LAST_SIGNAL] = { 0 };
 
-
 static void e_date_edit_class_init		(EDateEditClass	*class);
 static void e_date_edit_init			(EDateEdit	*dedit);
 static void create_children			(EDateEdit	*dedit);
@@ -191,7 +188,6 @@ static gboolean e_date_edit_set_time_internal	(EDateEdit	*dedit,
 						 gint		 hour,
 						 gint		 minute);
 
-
 static GtkHBoxClass *parent_class;
 
 /**
@@ -223,7 +219,6 @@ e_date_edit_get_type		(void)
 	return date_edit_type;
 }
 
-
 static void
 e_date_edit_class_init		(EDateEditClass	*class)
 {
@@ -249,7 +244,6 @@ e_date_edit_class_init		(EDateEditClass	*class)
 	class->changed = NULL;
 }
 
-
 static void
 e_date_edit_init		(EDateEdit	*dedit)
 {
@@ -282,7 +276,6 @@ e_date_edit_init		(EDateEdit	*dedit)
 	e_date_edit_set_time (dedit, 0);
 }
 
-
 /**
  * e_date_edit_new:
  *
@@ -304,7 +297,6 @@ e_date_edit_new			(void)
 	return GTK_WIDGET (dedit);
 }
 
-
 static void
 create_children			(EDateEdit	*dedit)
 {
@@ -480,7 +472,6 @@ create_children			(EDateEdit	*dedit)
 			  G_CALLBACK (on_date_popup_none_button_clicked), dedit);
 }
 
-
 static void
 e_date_edit_dispose		(GObject	*object)
 {
@@ -504,7 +495,6 @@ e_date_edit_dispose		(GObject	*object)
 		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
-
 /* GtkWidget::mnemonic_activate() handler for the EDateEdit */
 static gboolean
 e_date_edit_mnemonic_activate (GtkWidget *widget, gboolean group_cycling)
@@ -530,7 +520,6 @@ e_date_edit_grab_focus		(GtkWidget	*widget)
 		gtk_widget_grab_focus (GTK_BIN (dedit->priv->time_combo)->child);
 }
 
-
 /**
  * e_date_edit_set_editable:
  * @dedit: an #EDateEdit widget.
@@ -553,7 +542,6 @@ e_date_edit_set_editable (EDateEdit *dedit, gboolean editable)
 	gtk_widget_set_sensitive (priv->date_button, editable);
 }
 
-
 /**
  * e_date_edit_get_time:
  * @dedit: an #EDateEdit widget.
@@ -600,7 +588,6 @@ e_date_edit_get_time		(EDateEdit	*dedit)
 	return mktime (&tmp_tm);
 }
 
-
 /**
  * e_date_edit_set_time:
  * @dedit: the EDateEdit widget
@@ -664,7 +651,6 @@ e_date_edit_set_time		(EDateEdit	*dedit,
 			       date_edit_signals [CHANGED], 0);
 }
 
-
 /**
  * e_date_edit_get_date:
  * @dedit: an #EDateEdit widget.
@@ -701,7 +687,6 @@ e_date_edit_get_date		(EDateEdit	*dedit,
 	return TRUE;
 }
 
-
 /**
  * e_date_edit_set_date:
  * @dedit: an #EDateEdit widget.
@@ -734,7 +719,6 @@ e_date_edit_set_date		(EDateEdit	*dedit,
 			       date_edit_signals [CHANGED], 0);
 }
 
-
 /**
  * e_date_edit_get_time_of_day:
  * @dedit: an #EDateEdit widget.
@@ -769,7 +753,6 @@ e_date_edit_get_time_of_day		(EDateEdit	*dedit,
 	}
 }
 
-
 /**
  * e_date_edit_set_time_of_day:
  * @dedit: an #EDateEdit widget.
@@ -854,7 +837,6 @@ e_date_edit_get_show_date		(EDateEdit	*dedit)
 	return dedit->priv->show_date;
 }
 
-
 /**
  * e_date_edit_set_show_date:
  * @dedit: an #EDateEdit widget.
@@ -895,7 +877,6 @@ e_date_edit_set_show_date		(EDateEdit	*dedit,
 		gtk_widget_hide (priv->space);
 }
 
-
 /**
  * e_date_edit_get_show_time:
  * @dedit: an #EDateEdit widget
@@ -911,7 +892,6 @@ e_date_edit_get_show_time		(EDateEdit	*dedit)
 	return dedit->priv->show_time;
 }
 
-
 /**
  * e_date_edit_set_show_time:
  * @dedit: an #EDateEdit widget
@@ -938,7 +918,6 @@ e_date_edit_set_show_time		(EDateEdit	*dedit,
 	e_date_edit_update_time_combo_state (dedit);
 }
 
-
 /**
  * e_date_edit_get_make_time_insensitive:
  * @dedit: an #EDateEdit widget
@@ -956,7 +935,6 @@ e_date_edit_get_make_time_insensitive	(EDateEdit	*dedit)
 	return dedit->priv->make_time_insensitive;
 }
 
-
 /**
  * e_date_edit_set_make_time_insensitive:
  * @dedit: an #EDateEdit widget
@@ -988,7 +966,6 @@ e_date_edit_set_make_time_insensitive	(EDateEdit	*dedit,
 	e_date_edit_update_time_combo_state (dedit);
 }
 
-
 /**
  * e_date_edit_get_week_start_day:
  * @dedit: an #EDateEdit widget
@@ -1011,7 +988,6 @@ e_date_edit_get_week_start_day		(EDateEdit	*dedit)
 	return week_start_day;
 }
 
-
 /**
  * e_date_edit_set_week_start_day:
  * @dedit: an #EDateEdit widget
@@ -1030,7 +1006,6 @@ e_date_edit_set_week_start_day		(EDateEdit	*dedit,
 			NULL);
 }
 
-
 /* Whether we show week numbers in the date popup. */
 gboolean
 e_date_edit_get_show_week_numbers	(EDateEdit	*dedit)
@@ -1046,7 +1021,6 @@ e_date_edit_get_show_week_numbers	(EDateEdit	*dedit)
 	return show_week_numbers;
 }
 
-
 void
 e_date_edit_set_show_week_numbers	(EDateEdit	*dedit,
 					 gboolean	 show_week_numbers)
@@ -1058,7 +1032,6 @@ e_date_edit_set_show_week_numbers	(EDateEdit	*dedit,
 			NULL);
 }
 
-
 /* Whether we use 24 hour format in the time field & popup. */
 gboolean
 e_date_edit_get_use_24_hour_format	(EDateEdit	*dedit)
@@ -1068,7 +1041,6 @@ e_date_edit_get_use_24_hour_format	(EDateEdit	*dedit)
 	return dedit->priv->use_24_hour_format;
 }
 
-
 void
 e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
 					 gboolean	 use_24_hour_format)
@@ -1085,7 +1057,6 @@ e_date_edit_set_use_24_hour_format	(EDateEdit	*dedit,
 	e_date_edit_update_time_entry (dedit);
 }
 
-
 /* Whether we allow the date to be set to 'None'. e_date_edit_get_time() will
    return (time_t) -1 in this case. */
 gboolean
@@ -1096,7 +1067,6 @@ e_date_edit_get_allow_no_date_set	(EDateEdit	*dedit)
 	return GTK_WIDGET_VISIBLE (dedit->priv->none_button);
 }
 
-
 void
 e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
 					 gboolean	 allow_no_date_set)
@@ -1121,7 +1091,6 @@ e_date_edit_set_allow_no_date_set	(EDateEdit	*dedit,
 	}
 }
 
-
 /* The range of time to show in the time combo popup. */
 void
 e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
@@ -1134,7 +1103,6 @@ e_date_edit_get_time_popup_range	(EDateEdit	*dedit,
 	*upper_hour = dedit->priv->upper_hour;
 }
 
-
 void
 e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
 					 gint		 lower_hour,
@@ -1161,7 +1129,6 @@ e_date_edit_set_time_popup_range	(EDateEdit	*dedit,
 	e_date_edit_update_time_entry (dedit);
 }
 
-
 /* The arrow button beside the date field has been clicked, so we show the
    popup with the ECalendar in. */
 static void
@@ -1171,7 +1138,6 @@ on_date_button_clicked		(GtkWidget	*widget,
 	e_date_edit_show_date_popup (dedit);
 }
 
-
 static void
 e_date_edit_show_date_popup	(EDateEdit	*dedit)
 {
@@ -1217,7 +1183,6 @@ e_date_edit_show_date_popup	(EDateEdit	*dedit)
 	gdk_window_focus (priv->cal_popup->window, GDK_CURRENT_TIME);
 }
 
-
 /* This positions the date popup below and to the left of the arrow button,
    just before it is shown. */
 static void
@@ -1256,7 +1221,6 @@ position_date_popup		(EDateEdit	*dedit)
 	gtk_window_move (GTK_WINDOW (dedit->priv->cal_popup), x, y);
 }
 
-
 /* A date has been selected in the date popup, so we set the date field
    and hide the popup. */
 static void
@@ -1275,7 +1239,6 @@ on_date_popup_date_selected	(ECalendarItem	*calitem,
 			      g_date_get_day (&start_date));
 }
 
-
 static void
 on_date_popup_now_button_clicked	(GtkWidget	*button,
 					 EDateEdit	*dedit)
@@ -1284,7 +1247,6 @@ on_date_popup_now_button_clicked	(GtkWidget	*button,
 	e_date_edit_set_time (dedit, 0);
 }
 
-
 static void
 on_date_popup_today_button_clicked	(GtkWidget	*button,
 					 EDateEdit	*dedit)
@@ -1308,7 +1270,6 @@ on_date_popup_today_button_clicked	(GtkWidget	*button,
 			      tmp_tm.tm_mon + 1, tmp_tm.tm_mday);
 }
 
-
 static void
 on_date_popup_none_button_clicked	(GtkWidget	*button,
 					 EDateEdit	*dedit)
@@ -1317,7 +1278,6 @@ on_date_popup_none_button_clicked	(GtkWidget	*button,
 	e_date_edit_set_time (dedit, -1);
 }
 
-
 /* A key has been pressed while the date popup is showing. If it is the Escape
    key we hide the popup. */
 static gint
@@ -1336,7 +1296,6 @@ on_date_popup_key_press			(GtkWidget	*widget,
 	return TRUE;
 }
 
-
 /* A mouse button has been pressed while the date popup is showing.
    Any button press events used to select days etc. in the popup will have
    have been handled elsewhere, so here we just hide the popup.
@@ -1373,7 +1332,6 @@ on_date_popup_button_press	(GtkWidget	*widget,
 	return TRUE;
 }
 
-
 /* A delete event has been received for the date popup, so we hide it and
    return TRUE so it doesn't get destroyed. */
 static gint
@@ -1384,7 +1342,6 @@ on_date_popup_delete_event	(GtkWidget	*widget,
 	return TRUE;
 }
 
-
 /* Hides the date popup, removing any grabs. */
 static void
 hide_date_popup			(EDateEdit	*dedit)
@@ -1395,7 +1352,6 @@ hide_date_popup			(EDateEdit	*dedit)
 	gdk_keyboard_ungrab (GDK_CURRENT_TIME);
 }
 
-
 /* Clears the time popup and rebuilds it using the lower_hour, upper_hour
    and use_24_hour_format settings. */
 static void
@@ -1451,7 +1407,6 @@ rebuild_time_popup			(EDateEdit	*dedit)
 	}
 }
 
-
 static gboolean
 e_date_edit_parse_date (EDateEdit *dedit,
 			const gchar *date_text,
@@ -1475,7 +1430,6 @@ e_date_edit_parse_date (EDateEdit *dedit,
 	return TRUE;
 }
 
-
 static gboolean
 e_date_edit_parse_time	(EDateEdit	*dedit,
 			 const gchar	*time_text,
@@ -1493,7 +1447,6 @@ e_date_edit_parse_time	(EDateEdit	*dedit,
 	return TRUE;
 }
 
-
 /* Returns TRUE if the string is empty or is "None" in the current locale.
    It ignores whitespace. */
 static gboolean
@@ -1514,7 +1467,6 @@ field_set_to_none (const gchar *text)
 	return FALSE;
 }
 
-
 static void
 on_date_edit_time_selected	(GtkComboBox	*combo,
 				 EDateEdit	*dedit)
@@ -1530,7 +1482,6 @@ on_date_edit_time_selected	(GtkComboBox	*combo,
 	e_date_edit_check_time_changed (dedit);
 }
 
-
 static gint
 on_date_entry_key_press			(GtkWidget	*widget,
 					 GdkEventKey	*event,
@@ -1555,7 +1506,6 @@ on_date_entry_key_press			(GtkWidget	*widget,
 	return FALSE;
 }
 
-
 static gint
 on_time_entry_key_press			(GtkWidget	*widget,
 					 GdkEventKey	*event,
@@ -1611,7 +1561,6 @@ on_time_entry_key_release		(GtkWidget	*widget,
 	return FALSE;
 }
 
-
 static gint
 on_date_entry_focus_out			(GtkEntry	*entry,
 					 GdkEventFocus  *event,
@@ -1647,7 +1596,6 @@ on_date_entry_focus_out			(GtkEntry	*entry,
 	return FALSE;
 }
 
-
 static gint
 on_time_entry_focus_out			(GtkEntry	*entry,
 					 GdkEventFocus  *event,
@@ -1750,7 +1698,6 @@ e_date_edit_update_date_entry		(EDateEdit	*dedit)
 	add_relation (dedit, priv->date_button);
 }
 
-
 /* This sets the text in the time entry according to the current settings. */
 static void
 e_date_edit_update_time_entry		(EDateEdit	*dedit)
@@ -1827,7 +1774,6 @@ e_date_edit_update_time_entry		(EDateEdit	*dedit)
 	add_relation (dedit, priv->time_combo);
 }
 
-
 static void
 e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
 {
@@ -1882,7 +1828,6 @@ e_date_edit_update_time_combo_state	(EDateEdit	*dedit)
 		gtk_widget_hide (priv->space);
 }
 
-
 /* Parses the date, and if it is different from the current settings it
    updates the settings and emits a "date_changed" signal. */
 static void
@@ -1909,7 +1854,6 @@ e_date_edit_check_date_changed		(EDateEdit	*dedit)
 		tmp_tm.tm_mday = 0;
 	}
 
-
 	date_changed = e_date_edit_set_date_internal (dedit, valid, none,
 						      tmp_tm.tm_year,
 						      tmp_tm.tm_mon,
@@ -1920,7 +1864,6 @@ e_date_edit_check_date_changed		(EDateEdit	*dedit)
 			       date_edit_signals [CHANGED], 0);
 }
 
-
 /* Parses the time, and if it is different from the current settings it
    updates the settings and emits a "time_changed" signal. */
 static void
@@ -1953,7 +1896,6 @@ e_date_edit_check_time_changed		(EDateEdit	*dedit)
 	}
 }
 
-
 /**
  * e_date_edit_date_is_valid:
  * @dedit: an #EDateEdit widget.
@@ -1981,7 +1923,6 @@ e_date_edit_date_is_valid	(EDateEdit	*dedit)
 	return TRUE;
 }
 
-
 /**
  * e_date_edit_time_is_valid:
  * @dedit: an #EDateEdit widget.
@@ -2072,7 +2013,6 @@ e_date_edit_set_date_internal	(EDateEdit	*dedit,
 	return date_changed;
 }
 
-
 static gboolean
 e_date_edit_set_time_internal	(EDateEdit	*dedit,
 				 gboolean	 valid,
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
index 98c64f4..0ff0c99 100644
--- a/widgets/misc/e-dropdown-button.c
+++ b/widgets/misc/e-dropdown-button.c
@@ -141,7 +141,6 @@ e_dropdown_button_class_init (EDropdownButtonClass *klass)
 	toggle_class->toggled = impl_toggled;
 }
 
-
 static void
 e_dropdown_button_init (EDropdownButton *dropdown_button)
 {
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 87725cd..42fc038 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -52,12 +52,10 @@ enum {
 	PROP_STATE
 };
 
-
 /* Callbacks.  */
 
 static void rule_changed (FilterRule *rule, gpointer user_data);
 
-
 /* rule editor thingy */
 static void
 rule_editor_destroyed (EFilterBar *efb, GObject *deadbeef)
@@ -498,7 +496,6 @@ free_items (ESearchBarItem *items)
 	for (i = 0; items[i].id != -1; i++)
 		g_free (items[i].text);
 
-
 	g_free (items);
 }
 
@@ -705,7 +702,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe
 				if (!strcmp ((gchar *)node->name, "filter-bar")) {
 					FilterRule *rule = NULL;
 
-
 					view_id = xml_get_prop_int (node, "view_id");
 					scope = xml_get_prop_int (node, "searchscope");
 					item_id = xml_get_prop_int (node, "item_id");
@@ -736,7 +732,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe
 						}
 					}
 
-
 					if (rule_set) {
 						esb->block_search = TRUE;
 						e_search_bar_set_text (esb, _("Advanced Search"));
@@ -765,7 +760,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe
 
 					/* set the text first (it doesn't emit a signal) */
 
-
 					/* now set the item_id and subitem_id */
 					item_id = xml_get_prop_int (node, "item_id");
 					subitem_id = xml_get_prop_int (node, "subitem_id");
@@ -804,7 +798,6 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe
 
 					xmlFree (text);
 
-
 					break;
 				}
 
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index f25a66f..8659f0a 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -113,7 +113,6 @@ const gchar * strings[] = {
 };
 #endif
 
-
 GType       e_filter_bar_get_type (void);
 
 EFilterBar *e_filter_bar_new      (RuleContext *context,
@@ -136,5 +135,4 @@ e_filter_bar_new_construct	  (RuleContext *context,
 
 G_END_DECLS
 
-
 #endif /* __E_FILTER_BAR_H__ */
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index 9110e14..6cd4958 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -94,7 +94,6 @@ e_container_change_tab_order_destroy_notify(gpointer data)
 	g_list_free(list);
 }
 
-
 static gint
 e_container_change_tab_order_callback(GtkContainer *container,
 				      GtkDirectionType direction,
diff --git a/widgets/misc/e-hsv-utils.c b/widgets/misc/e-hsv-utils.c
index b42271f..3a2e450 100644
--- a/widgets/misc/e-hsv-utils.c
+++ b/widgets/misc/e-hsv-utils.c
@@ -175,4 +175,3 @@ e_rgb_to_hsv (gdouble r, gdouble g, gdouble b,
     }
 }
 
-
diff --git a/widgets/misc/e-icon-entry.c b/widgets/misc/e-icon-entry.c
index 0fb4540..2ed50e2 100644
--- a/widgets/misc/e-icon-entry.c
+++ b/widgets/misc/e-icon-entry.c
@@ -353,7 +353,6 @@ set_cursor (GtkWidget *widget, GdkEventCrossing *event, gpointer dummy)
     else
 	gdk_window_set_cursor (widget->window, gdk_cursor_new (GDK_LEFT_PTR));
 
-
 }
 
 GtkWidget *
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 3c83cb1..2893cae 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -50,7 +50,6 @@ enum {
 	LAST_SIGNAL
 };
 
-
 static gint image_chooser_signals [LAST_SIGNAL] = { 0 };
 
 static void e_image_chooser_init	 (EImageChooser		 *chooser);
@@ -119,7 +118,6 @@ e_image_chooser_get_type (void)
 	return eic_type;
 }
 
-
 static void
 e_image_chooser_class_init (EImageChooserClass *klass)
 {
@@ -219,7 +217,6 @@ e_image_chooser_dispose (GObject *object)
 		(* G_OBJECT_CLASS (parent_class)->dispose) (object);
 }
 
-
 static gboolean
 set_image_from_data (EImageChooser *chooser,
 		     gchar *data, gint length)
diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index be2d427..ece1419 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -52,7 +52,6 @@ struct _EImageChooserClass
 	/* signals */
 	void (*changed) (EImageChooser *chooser);
 
-
 };
 
 GtkWidget *e_image_chooser_new      (void);
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 82ce1c1..d9114a5 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -37,13 +37,11 @@
 
 #define SCROLL_STEP_SIZE 32
 
-
 /* */
 
 #define E_MAP_GET_WIDTH(map) gdk_pixbuf_get_width(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf)
 #define E_MAP_GET_HEIGHT(map) gdk_pixbuf_get_height(((EMapPrivate *) E_MAP(map)->priv)->map_render_pixbuf)
 
-
 /* Zoom state - keeps track of animation hacks */
 
 typedef enum
@@ -55,7 +53,6 @@ typedef enum
 }
 EMapZoomState;
 
-
 /* Private part of the EMap structure */
 
 typedef struct
@@ -82,7 +79,6 @@ typedef struct
 }
 EMapPrivate;
 
-
 /* Internal prototypes */
 
 static void e_map_class_init (EMapClass *class);
@@ -116,12 +112,10 @@ static void repaint_point (EMap *map, EMapPoint *point);
 
 static GtkWidgetClass *parent_class;
 
-
 /* ----------------- *
  * Widget management *
  * ----------------- */
 
-
 /**
  * e_map_get_type:
  * @void:
@@ -200,7 +194,6 @@ e_map_class_init (EMapClass *class)
 	widget_class->key_press_event = e_map_key_press;
 }
 
-
 /* Object initialization function for the map view */
 
 static void
@@ -223,7 +216,6 @@ e_map_init (EMap *view)
 	GTK_WIDGET_UNSET_FLAGS (view, GTK_NO_WINDOW);
 }
 
-
 /* Destroy handler for the map view */
 
 static void
@@ -245,7 +237,6 @@ e_map_destroy (GtkObject *object)
 		(*GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
-
 /* Finalize handler for the map view */
 
 static void
@@ -285,7 +276,6 @@ e_map_finalize (GObject *object)
 		(*G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
 
-
 /* Unmap handler for the map view */
 
 static void
@@ -298,7 +288,6 @@ e_map_unmap (GtkWidget *widget)
 		(*GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
 }
 
-
 /* Realize handler for the map view */
 
 static void
@@ -335,7 +324,6 @@ e_map_realize (GtkWidget *widget)
 	update_render_pixbuf (E_MAP (widget), GDK_INTERP_BILINEAR, TRUE);
 }
 
-
 /* Unrealize handler for the map view */
 
 static void
@@ -348,7 +336,6 @@ e_map_unrealize (GtkWidget *widget)
 		(*GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
-
 /* Size_request handler for the map view */
 
 static void
@@ -370,7 +357,6 @@ e_map_size_request (GtkWidget *widget, GtkRequisition *requisition)
 	requisition->height = gdk_pixbuf_get_height (priv->map_pixbuf);
 }
 
-
 /* Size_allocate handler for the map view */
 
 static void
@@ -403,7 +389,6 @@ e_map_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 	update_render_pixbuf (view, GDK_INTERP_BILINEAR, TRUE);
 }
 
-
 /* Button press handler for the map view */
 
 static gint
@@ -413,7 +398,6 @@ e_map_button_press (GtkWidget *widget, GdkEventButton *event)
 	return TRUE;
 }
 
-
 /* Button release handler for the map view */
 
 static gint
@@ -425,7 +409,6 @@ e_map_button_release (GtkWidget *widget, GdkEventButton *event)
 	return TRUE;
 }
 
-
 /* Motion handler for the map view */
 
 static gint
@@ -446,7 +429,6 @@ e_map_motion (GtkWidget *widget, GdkEventMotion *event)
  */
 }
 
-
 /* Expose handler for the map view */
 
 static gint
@@ -464,7 +446,6 @@ e_map_expose (GtkWidget *widget, GdkEventExpose *event)
 	return TRUE;
 }
 
-
 /* Set_scroll_adjustments handler for the map view */
 
 static void
@@ -529,7 +510,6 @@ e_map_set_scroll_adjustments (GtkWidget *widget, GtkAdjustment *hadj, GtkAdjustm
 	if (need_adjust) adjustment_changed_cb (NULL, view);
 }
 
-
 /* Key press handler for the map view */
 
 static gint
@@ -601,12 +581,10 @@ e_map_key_press (GtkWidget *widget, GdkEventKey *event)
 	return TRUE;
 }
 
-
 /* ---------------- *
  * Widget interface *
  * ---------------- */
 
-
 /**
  * e_map_new:
  * @void:
@@ -630,10 +608,8 @@ e_map_new (void)
 	return (E_MAP (widget));
 }
 
-
 /* --- Coordinate translation --- */
 
-
 /* These functions translate coordinates between longitude/latitude and
  * the image x/y offsets, using the equidistant cylindrical projection.
  *
@@ -660,7 +636,6 @@ e_map_window_to_world (EMap *map, double win_x, double win_y, double *world_long
 		((double) height / 2.0) * 90.0;
 }
 
-
 void
 e_map_world_to_window (EMap *map, double world_longitude, double world_latitude, double *win_x, double *win_y)
 {
@@ -685,10 +660,8 @@ e_map_world_to_window (EMap *map, double world_longitude, double world_latitude,
 #endif
 }
 
-
 /* --- Zoom --- */
 
-
 gdouble
 e_map_get_magnification (EMap *map)
 {
@@ -699,7 +672,6 @@ e_map_get_magnification (EMap *map)
 	else return 1.0;
 }
 
-
 void
 e_map_zoom_to_location (EMap *map, double longitude, double latitude)
 {
@@ -720,7 +692,6 @@ e_map_zoom_to_location (EMap *map, double longitude, double latitude)
 	zoom_do (map);
 }
 
-
 void
 e_map_zoom_out (EMap *map)
 {
@@ -738,28 +709,24 @@ e_map_zoom_out (EMap *map)
 	priv->zoom_state = E_MAP_ZOOMED_OUT;
 }
 
-
 void
 e_map_set_smooth_zoom (EMap *map, gboolean state)
 {
 	((EMapPrivate *) map->priv)->smooth_zoom = state;
 }
 
-
 gboolean
 e_map_get_smooth_zoom (EMap *map)
 {
 	return (((EMapPrivate *) map->priv)->smooth_zoom);
 }
 
-
 void
 e_map_freeze (EMap *map)
 {
 	((EMapPrivate *) map->priv)->frozen = TRUE;
 }
 
-
 void
 e_map_thaw (EMap *map)
 {
@@ -767,10 +734,8 @@ e_map_thaw (EMap *map)
 	update_and_paint (map);
 }
 
-
 /* --- Point manipulation --- */
 
-
 EMapPoint *
 e_map_add_point (EMap *map, gchar *name, double longitude, double latitude, guint32 color_rgba)
 {
@@ -796,7 +761,6 @@ e_map_add_point (EMap *map, gchar *name, double longitude, double latitude, guin
 	return point;
 }
 
-
 void
 e_map_remove_point (EMap *map, EMapPoint *point)
 {
@@ -817,7 +781,6 @@ e_map_remove_point (EMap *map, EMapPoint *point)
 	g_free (point);
 }
 
-
 void
 e_map_point_get_location (EMapPoint *point, double *longitude, double *latitude)
 {
@@ -825,21 +788,18 @@ e_map_point_get_location (EMapPoint *point, double *longitude, double *latitude)
 	*latitude = point->latitude;
 }
 
-
 gchar *
 e_map_point_get_name (EMapPoint *point)
 {
 	return point->name;
 }
 
-
 guint32
 e_map_point_get_color_rgba (EMapPoint *point)
 {
 	return point->rgba;
 }
 
-
 void
 e_map_point_set_color_rgba (EMap *map, EMapPoint *point, guint32 color_rgba)
 {
@@ -854,21 +814,18 @@ e_map_point_set_color_rgba (EMap *map, EMapPoint *point, guint32 color_rgba)
 	}
 }
 
-
 void
 e_map_point_set_data (EMapPoint *point, gpointer data)
 {
 	point->user_data = data;
 }
 
-
 gpointer
 e_map_point_get_data (EMapPoint *point)
 {
 	return point->user_data;
 }
 
-
 gboolean
 e_map_point_is_in_view (EMap *map, EMapPoint *point)
 {
@@ -887,7 +844,6 @@ e_map_point_is_in_view (EMap *map, EMapPoint *point)
 	return FALSE;
 }
 
-
 EMapPoint *
 e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean in_view)
 {
@@ -918,12 +874,10 @@ e_map_get_closest_point (EMap *map, double longitude, double latitude, gboolean
 	return point_chosen;
 }
 
-
 /* ------------------ *
  * Internal functions *
  * ------------------ */
 
-
 static void
 repaint_visible (EMap *map)
 {
@@ -937,7 +891,6 @@ repaint_visible (EMap *map)
 	request_paint_area (map, &area);
 }
 
-
 static void
 update_and_paint (EMap *map)
 {
@@ -945,7 +898,6 @@ update_and_paint (EMap *map)
 	repaint_visible (map);
 }
 
-
 static gint
 load_map_background (EMap *view, gchar *name)
 {
@@ -965,7 +917,6 @@ load_map_background (EMap *view, gchar *name)
 	return TRUE;
 }
 
-
 static void
 update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays)
 {
@@ -1032,7 +983,6 @@ update_render_pixbuf (EMap *map, GdkInterpType interp, gboolean render_overlays)
 	set_scroll_area (map);
 }
 
-
 /* Queues a repaint of the specified area in window coordinates */
 
 static void
@@ -1106,7 +1056,6 @@ put_pixel_with_clipping (GdkPixbuf *pixbuf, gint x, gint y, guint rgba)
 	}
 }
 
-
 /* Redraw point in client pixbuf */
 
 static void
@@ -1140,7 +1089,6 @@ update_render_point (EMap *map, EMapPoint *point)
 	put_pixel_with_clipping (pb, px + 1, py + 1, 0x000000ff);
 }
 
-
 /* Repaint point on X server */
 
 static void
@@ -1160,7 +1108,6 @@ repaint_point (EMap *map, EMapPoint *point)
 	request_paint_area (map, &area);
 }
 
-
 static void
 center_at (EMap *map, gint x, gint y, gboolean scroll)
 {
@@ -1187,7 +1134,6 @@ center_at (EMap *map, gint x, gint y, gboolean scroll)
 	}
 }
 
-
 static void
 smooth_center_at (EMap *map, gint x, gint y)
 {
@@ -1218,7 +1164,6 @@ smooth_center_at (EMap *map, gint x, gint y)
 	}
 }
 
-
 /* Scrolls the view to the specified offsets.  Does not perform range checking!  */
 
 static void
@@ -1321,7 +1266,6 @@ scroll_to (EMap *view, gint x, gint y)
 	}
 }
 
-
 static gint divide_seq[] =
 {
 	/* Dividends for divisor of 2 */
@@ -1397,7 +1341,6 @@ static gint divide_seq[] =
 	0
 };
 
-
 typedef enum
 {
 	AXIS_X,
@@ -1405,7 +1348,6 @@ typedef enum
 }
 AxisType;
 
-
 static void
 blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x, gint target_y, gint total_width, gint total_height, gfloat zoom_factor)
 {
@@ -1419,7 +1361,6 @@ blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x,
 	gint i, j;
 	gint line;
 
-
 	/* Set up the GC we'll be using */
 
 	gc = gdk_gc_new (window);
@@ -1541,7 +1482,6 @@ blowup_window_area (GdkWindow *window, gint area_x, gint area_y, gint target_x,
 	g_object_unref (gc);
 }
 
-
 static void
 zoom_in_smooth (EMap *map)
 {
@@ -1598,7 +1538,6 @@ zoom_in_smooth (EMap *map)
 	request_paint_area (map, &area);
 }
 
-
 static void
 zoom_in (EMap *map)
 {
@@ -1624,7 +1563,6 @@ zoom_in (EMap *map)
 	request_paint_area (map, &area);
 }
 
-
 static void
 zoom_out (EMap *map)
 {
@@ -1654,7 +1592,6 @@ zoom_out (EMap *map)
 	repaint_visible (map);
 }
 
-
 static void
 zoom_do (EMap *map)
 {
@@ -1681,7 +1618,6 @@ zoom_do (EMap *map)
 	set_scroll_area(map);
 }
 
-
 /* Callback used when an adjustment is changed */
 
 static void
@@ -1696,7 +1632,6 @@ adjustment_changed_cb (GtkAdjustment *adj, gpointer data)
 	scroll_to (view, priv->hadj->value, priv->vadj->value);
 }
 
-
 static void
 set_scroll_area (EMap *view)
 {
diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h
index df3f70a..6c0e44e 100644
--- a/widgets/misc/e-map.h
+++ b/widgets/misc/e-map.h
@@ -67,7 +67,6 @@ struct _EMapPoint
 	gpointer user_data;
 };
 
-
 /* --- Widget --- */
 
 GType e_map_get_type (void);
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index eaf843d..1f31ff8 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -111,7 +111,6 @@ set_page_timeout_callback (gpointer data)
 	return FALSE;
 }
 
-
 /* Button handling.  */
 
 static void
@@ -120,7 +119,6 @@ do_close (EMultiConfigDialog *dialog)
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
-
 /* ETable signals.  */
 
 static void
@@ -142,7 +140,6 @@ table_cursor_change_callback (ETable *etable,
 	priv->set_page_timeout_page = row;
 }
 
-
 /* GObject methods.  */
 
 static void
@@ -164,7 +161,6 @@ impl_finalize (GObject *object)
 	(* G_OBJECT_CLASS (e_multi_config_dialog_parent_class)->finalize) (object);
 }
 
-
 /* GtkDialog methods.  */
 
 static void
@@ -210,7 +206,6 @@ canvas_realize (GtkWidget *widget, EMultiConfigDialog *dialog)
 {
 }
 
-
 static ETableMemoryStoreColumnInfo columns[] = {
 	E_TABLE_MEMORY_STORE_STRING,
 	E_TABLE_MEMORY_STORE_PIXBUF,
@@ -312,7 +307,6 @@ e_multi_config_dialog_new (void)
 	return g_object_new (e_multi_config_dialog_get_type (), NULL);
 }
 
-
 void
 e_multi_config_dialog_add_page (EMultiConfigDialog *dialog,
 				const gchar *title,
diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c
index 1bed863..0327ca8 100644
--- a/widgets/misc/e-pilot-settings.c
+++ b/widgets/misc/e-pilot-settings.c
@@ -37,13 +37,11 @@ struct _EPilotSettingsPrivate
 	GtkWidget *cat_btn;
 };
 
-
 static void class_init (EPilotSettingsClass *klass);
 static void init (EPilotSettings *ps);
 
 static GObjectClass *parent_class = NULL;
 
-
 GType
 e_pilot_settings_get_type (void)
 {
@@ -86,7 +84,6 @@ init (EPilotSettings *ps)
 	ps->priv = priv;
 }
 
-
 static void
 build_ui (EPilotSettings *ps, ESourceList *source_list)
 {
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 20b570d..129a52e 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -72,7 +72,6 @@ e_popup_menu_create (EPopupMenu *menu_list,
 						NULL);
 }
 
-
 GtkMenu *
 e_popup_menu_create_with_domain (EPopupMenu *menu_list,
 				 guint32 disable_mask,
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index 75246eb..627ed61 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -32,7 +32,6 @@ G_BEGIN_DECLS
 #define E_POPUP_SEPARATOR  { (gchar *) "", NULL, (NULL), NULL, 0 }
 #define E_POPUP_TERMINATOR { NULL, NULL, (NULL), NULL, 0 }
 
-
 /* In the following, CC = custom closure */
 
 #define E_POPUP_ITEM(name,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 0, 0, 0, 0 }
@@ -47,7 +46,6 @@ G_BEGIN_DECLS
 #define E_POPUP_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 0, 0, 1 }
 #define E_POPUP_PIXMAP_WIDGET_SUBMENU(name,pixmap_widget,submenu,disable_mask) { (gchar *) (name), NULL, NULL, (submenu), (disable_mask), (pixmap_widget), NULL, 0, 0, 0, 0 }
 
-
 #define E_POPUP_TOGGLE_ITEM(name,fn,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, NULL, 1, 0, value, 0 }
 #define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 }
 #define E_POPUP_TOGGLE_ITEM_CC(name,fn,closure,disable_mask,value) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), NULL, (closure), 1, 0, value, 1 }
@@ -67,7 +65,6 @@ G_BEGIN_DECLS
 #define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM(name,pixmap_widget,fn,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), NULL, 0, 1, value, 0 }
 #define E_POPUP_RADIO_PIXMAP_WIDGET_ITEM_CC(name,pixmap_widget,fn,closure,disable_mask) { (gchar *) (name), NULL, (fn), NULL, (disable_mask), (pixmap_widget), (closure), 0, 1, value, 1 }
 
-
 typedef struct _EPopupMenu EPopupMenu;
 
 struct _EPopupMenu {
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 05a219f..b420808 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -28,7 +28,6 @@
 
 #include "e-printable.h"
 
-
 #define EP_CLASS(e) ((EPrintableClass *)((GtkObject *)e)->klass)
 
 G_DEFINE_TYPE (EPrintable, e_printable, GTK_TYPE_OBJECT)
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 2bf5e49..1eaccda 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -32,7 +32,6 @@ G_DEFINE_TYPE (EReflowModel, e_reflow_model, G_TYPE_OBJECT)
 
 d(static gint depth = 0;)
 
-
 enum {
 	MODEL_CHANGED,
 	COMPARISON_CHANGED,
@@ -322,7 +321,6 @@ e_reflow_model_item_removed    (EReflowModel     *e_reflow_model,
 	d(depth--);
 }
 
-
 /**
  * e_reflow_model_item_changed:
  * @e_reflow_model: the reflow model to notify of the change
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index c20edfc..63e92db 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -229,7 +229,6 @@ cursor_changed (ESelectionModel *selection, gint row, gint col, EReflow *reflow)
 
 }
 
-
 static void
 incarnate (EReflow *reflow)
 {
@@ -699,7 +698,6 @@ column_width_changed (EReflow *reflow)
 	g_signal_emit (reflow, signals[COLUMN_WIDTH_CHANGED], 0, reflow->column_width);
 }
 
-
 
 
 /* Virtual functions */
@@ -1425,7 +1423,6 @@ e_reflow_class_init (EReflowClass *klass)
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
-
 	g_object_class_install_property (object_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
 							      _( "Height" ),
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index 19e6d4a..ab27051 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -47,7 +47,6 @@ G_BEGIN_DECLS
 #define E_IS_REFLOW(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_REFLOW_TYPE))
 #define E_IS_REFLOW_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_REFLOW_TYPE))
 
-
 typedef struct EReflowPriv    EReflowPriv;
 
 typedef struct _EReflow       EReflow;
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index b2f1a31..1783ebf 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -328,7 +328,6 @@ paint_search_text (GtkWidget *widget, ESearchBar *esb)
 	else /* no query in search entry .. so set the current option */
 		text = get_selected_item_label (menu_widget);
 
-
 	if (text && *text) {
 		gchar *t;
 
@@ -1000,7 +999,6 @@ e_search_bar_construct (ESearchBar *search_bar,
 	else
 		gtk_box_pack_start (GTK_BOX(search_bar->entry_box), search_bar->icon_entry, TRUE, TRUE, 0);
 
-
 	gtk_widget_show_all (search_bar->entry_box);
 	gtk_widget_set_sensitive (search_bar->clear_button, FALSE);
 
@@ -1465,7 +1463,6 @@ e_search_bar_set_search_scope (ESearchBar *search_bar, gint id)
 		emit_query_changed (search_bar);
 }
 
-
 /**
  * e_search_bar_get_item_id:
  * @search_bar: A search bar.
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index 336c276..82bc1ba 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -190,5 +190,4 @@ gchar *e_search_bar_get_text  (ESearchBar *search_bar);
 void e_search_bar_scope_enable (ESearchBar *search_bar, gint did, gboolean state);
 G_END_DECLS
 
-
 #endif /* __E_SEARCH_BAR_H__ */
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index 90922b5..84a18eb 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -542,7 +542,6 @@ e_selection_model_array_get_row_count (ESelectionModelArray *esma)
 		return 0;
 }
 
-
 static void
 e_selection_model_array_init (ESelectionModelArray *esma)
 {
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index 3f69fca..2f7687b 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -89,5 +89,4 @@ gint     e_selection_model_array_get_row_count      (ESelectionModelArray *esm);
 
 G_END_DECLS
 
-
 #endif /* _E_SELECTION_MODEL_ARRAY_H_ */
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index c87ccf9..fb62b1f 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -94,7 +94,6 @@ typedef struct {
 
 } ESelectionModelClass;
 
-
 GType     e_selection_model_get_type               (void);
 void      e_selection_model_do_something           (ESelectionModel *esm,
 						    guint            row,
@@ -128,7 +127,6 @@ void      e_selection_model_select_all             (ESelectionModel *esm);
 void      e_selection_model_invert_selection       (ESelectionModel *esm);
 gint       e_selection_model_row_count              (ESelectionModel *esm);
 
-
 /* Private virtual Functions */
 void      e_selection_model_change_one_row         (ESelectionModel *esm,
 						    gint              row,
@@ -160,6 +158,5 @@ void      e_selection_model_selection_changed      (ESelectionModel *selection);
 
 G_END_DECLS
 
-
 #endif /* _E_SELECTION_MODEL_H_ */
 
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index fa84e86..eff7954 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -37,7 +37,6 @@
 #include "e-dateedit.h"
 #include "e-send-options.h"
 
-
 struct _ESendOptionsDialogPrivate {
 	/* Glade XML data */
 	GladeXML *xml;
@@ -380,7 +379,6 @@ page_changed_cb (GtkNotebook *notebook, GtkNotebookPage *page, gint num, gpointe
 	e_send_options_fill_widgets_with_data (sod);
 }
 
-
 static void
 init_widgets (ESendOptionsDialog *sod)
 {
@@ -399,7 +397,6 @@ init_widgets (ESendOptionsDialog *sod)
 	if (priv->global)
 		g_signal_connect (priv->notebook, "switch-page", G_CALLBACK (page_changed_cb), sod);
 
-
 }
 
 static gboolean
@@ -733,7 +730,6 @@ e_sendoptions_dialog_init (GObject *object)
 	ESendOptionsDialogPrivate *priv;
 	ESendOptionsData *new;
 
-
 	sod = E_SENDOPTIONS_DIALOG (object);
 	new = g_new0 (ESendOptionsData, 1);
 	new->gopts = g_new0 (ESendOptionsGeneral, 1);
diff --git a/widgets/misc/e-spinner.c b/widgets/misc/e-spinner.c
index bf71e4e..3e7b732 100644
--- a/widgets/misc/e-spinner.c
+++ b/widgets/misc/e-spinner.c
@@ -800,7 +800,6 @@ e_spinner_stop (ESpinner *spinner)
 	}
 }
 
-
 /*
  * e_spinner_set_timeout:
  * @spinner: a #ESpinner
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index bf3cefc..7d583c3 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -29,7 +29,6 @@
 
 #include <glib/gi18n.h>
 
-
 #define SPACING 2
 
 struct _ETaskWidgetPrivate {
diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h
index 77d1a35..737c508 100644
--- a/widgets/misc/e-unicode.h
+++ b/widgets/misc/e-unicode.h
@@ -109,4 +109,3 @@ G_END_DECLS
 
 #endif
 
-
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index 2dd47eb..6900bd1 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -45,7 +45,6 @@ static gboolean mnemonic_activate (GtkWidget *widget, gboolean group_cycling);
 
 static gpointer parent_class = NULL;
 
-
 GType
 e_url_entry_get_type (void)
 {
@@ -87,7 +86,6 @@ class_init (EUrlEntryClass *class)
 	widget_class->mnemonic_activate = mnemonic_activate;
 }
 
-
 static void
 init (EUrlEntry *url_entry)
 {
@@ -151,7 +149,6 @@ e_url_entry_new (void)
 	return g_object_new (E_TYPE_URL_ENTRY, NULL);
 }
 
-
 GtkWidget *
 e_url_entry_get_entry (EUrlEntry *url_entry)
 {
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index 20b8773..c9cc8e7 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -43,7 +43,6 @@ static GtkTargetEntry target_table[] = {
 
 static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
 
-
 static void on_date_range_changed	(ECalendarItem *calitem);
 static void on_selection_changed	(ECalendarItem *calitem);
 
@@ -84,13 +83,11 @@ main (gint argc, gchar **argv)
 	g_signal_connect (calitem, "selection_changed",
 			  G_CALLBACK (on_selection_changed), NULL);
 
-
 	gtk_drag_dest_set (cal,
 			   GTK_DEST_DEFAULT_ALL,
 			   target_table, n_targets,
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE);
 
-
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (vbox), cal, TRUE, TRUE, 0);
 	gtk_widget_show (vbox);
@@ -103,7 +100,6 @@ main (gint argc, gchar **argv)
 	return 0;
 }
 
-
 static void
 on_date_range_changed (ECalendarItem *calitem)
 {
@@ -125,7 +121,6 @@ on_date_range_changed (ECalendarItem *calitem)
 				  E_CALENDAR_ITEM_MARK_BOLD, FALSE);
 }
 
-
 static void
 on_selection_changed (ECalendarItem *calitem)
 {
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index 745c982..c7b9739 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -167,7 +167,6 @@ main (gint argc, gchar **argv)
 	return 0;
 }
 
-
 static void
 delete_event_cb		(GtkWidget	*widget,
 			 GdkEventAny	*event,
@@ -178,7 +177,6 @@ delete_event_cb		(GtkWidget	*widget,
 	gtk_main_quit ();
 }
 
-
 static void
 on_get_date_clicked	(GtkWidget	*button,
 			 EDateEdit	*dedit)
@@ -198,7 +196,6 @@ on_get_date_clicked	(GtkWidget	*button,
 		g_print ("  Time invalid\n");
 }
 
-
 static void
 on_toggle_24_hour_clicked	(GtkWidget	*button,
 				 EDateEdit	*dedit)
@@ -206,7 +203,6 @@ on_toggle_24_hour_clicked	(GtkWidget	*button,
 	e_date_edit_set_use_24_hour_format (dedit, !e_date_edit_get_use_24_hour_format (dedit));
 }
 
-
 #if 0
 static void
 on_date_changed		(EDateEdit	*dedit,
@@ -226,7 +222,6 @@ on_date_changed		(EDateEdit	*dedit,
 	}
 }
 
-
 static void
 on_time_changed		(EDateEdit	*dedit,
 			 gchar		*name)
@@ -246,7 +241,6 @@ on_time_changed		(EDateEdit	*dedit,
 }
 #endif
 
-
 static void
 on_changed		(EDateEdit	*dedit,
 			 gchar		*name)
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index ef1bb5b..988ba8e 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -70,7 +70,6 @@
 
 #define d(x)
 
-
 /* The height to make the popup list if there aren't any items in it. */
 #define	E_CELL_COMBO_LIST_EMPTY_HEIGHT	15
 
@@ -120,7 +119,6 @@ e_cell_combo_class_init			(ECellComboClass	*klass)
 	ecpc->popup = e_cell_combo_do_popup;
 }
 
-
 static void
 e_cell_combo_init			(ECellCombo	*ecc)
 {
@@ -191,7 +189,6 @@ e_cell_combo_init			(ECellCombo	*ecc)
 			  G_CALLBACK (e_cell_combo_key_press), ecc);
 }
 
-
 /**
  * e_cell_combo_new:
  *
@@ -207,7 +204,6 @@ e_cell_combo_new			(void)
 	return (ECell*) ecc;
 }
 
-
 /*
  * GObject::dispose method
  */
@@ -223,8 +219,6 @@ e_cell_combo_dispose			(GObject *object)
 	G_OBJECT_CLASS (e_cell_combo_parent_class)->dispose (object);
 }
 
-
-
 void
 e_cell_combo_set_popdown_strings	(ECellCombo	*ecc,
 					 GList		*strings)
@@ -247,7 +241,6 @@ e_cell_combo_set_popdown_strings	(ECellCombo	*ecc,
 	}
 }
 
-
 static gint
 e_cell_combo_do_popup			(ECellPopup	*ecp,
 					 GdkEvent	*event,
@@ -287,7 +280,6 @@ e_cell_combo_do_popup			(ECellPopup	*ecp,
 	return TRUE;
 }
 
-
 static void
 e_cell_combo_select_matching_item	(ECellCombo	*ecc)
 {
@@ -362,7 +354,6 @@ e_cell_combo_show_popup			(ECellCombo	*ecc, gint row, gint view_col)
 	d(g_print("%s: popup_shown = TRUE\n", __FUNCTION__));
 }
 
-
 /* Calculates the size and position of the popup window (like GtkCombo). */
 static void
 e_cell_combo_get_popup_pos		(ECellCombo	*ecc,
@@ -555,7 +546,6 @@ e_cell_combo_button_press		(GtkWidget	*popup_window,
 	return TRUE;
 }
 
-
 /* This handles button release events in the popup window. If the button is
    released inside the list, we want to hide the popup window and update the
    cell with the new selection. */
@@ -592,7 +582,6 @@ e_cell_combo_button_release		(GtkWidget	*popup_window,
 	return TRUE;
 }
 
-
 /* This handles key press events in the popup window. If the Escape key is
    pressed we hide the popup, and do not change the cell contents. */
 static gint
@@ -627,7 +616,6 @@ e_cell_combo_key_press			(GtkWidget	*popup_window,
 	return TRUE;
 }
 
-
 static void
 e_cell_combo_update_cell		(ECellCombo	*ecc)
 {
@@ -665,7 +653,6 @@ e_cell_combo_update_cell		(ECellCombo	*ecc)
 	g_free (text);
 }
 
-
 static void
 e_cell_combo_restart_edit		(ECellCombo	*ecc)
 {
@@ -678,5 +665,3 @@ e_cell_combo_restart_edit		(ECellCombo	*ecc)
 #endif
 }
 
-
-
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
index fafda30..728adde 100644
--- a/widgets/table/e-cell-combo.h
+++ b/widgets/table/e-cell-combo.h
@@ -39,7 +39,6 @@
 #define E_IS_CELL_COMBO(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_COMBO_TYPE))
 #define E_IS_CELL_COMBO_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_COMBO_TYPE))
 
-
 typedef struct {
 	ECellPopup parent;
 
@@ -52,7 +51,6 @@ typedef struct {
 	ECellPopupClass parent_class;
 } ECellComboClass;
 
-
 GType      e_cell_combo_get_type		(void);
 ECell     *e_cell_combo_new			(void);
 
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index def14d8..fda96de 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -63,7 +63,6 @@ void     e_cell_hbox_append    (ECellHbox *vbox,
 				gint model_col,
 				gint size);
 
-
 G_END_DECLS
 
 #endif /* _E_CELL_HBOX_H_ */
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index 8dff449..b427a0c 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -45,10 +45,8 @@
 #define E_CELL_POPUP_ARROW_XPAD		3
 #define E_CELL_POPUP_ARROW_YPAD		3
 
-
 static void	e_cell_popup_dispose	(GObject	*object);
 
-
 static ECellView* ecp_new_view		(ECell		*ecell,
 					 ETableModel	*table_model,
 					 void		*e_table_item_view);
@@ -143,7 +141,6 @@ e_cell_popup_class_init		(ECellPopupClass	*klass)
                                                 gal_a11y_e_cell_popup_new);
 }
 
-
 static void
 e_cell_popup_init		(ECellPopup	*ecp)
 {
@@ -151,7 +148,6 @@ e_cell_popup_init		(ECellPopup	*ecp)
 	ecp->popup_model = NULL;
 }
 
-
 /**
  * e_cell_popup_new:
  *
@@ -167,7 +163,6 @@ e_cell_popup_new		(void)
 	return (ECell*) ecp;
 }
 
-
 /*
  * GtkObject::destroy method
  */
@@ -183,8 +178,6 @@ e_cell_popup_dispose (GObject *object)
 	G_OBJECT_CLASS (e_cell_popup_parent_class)->dispose (object);
 }
 
-
-
 /*
  * ECell::new_view method
  */
@@ -211,7 +204,6 @@ ecp_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	return (ECellView*) ecp_view;
 }
 
-
 /*
  * ECell::kill_view method
  */
@@ -231,7 +223,6 @@ ecp_kill_view (ECellView *ecv)
 	g_free (ecp_view);
 }
 
-
 /*
  * ECell::realize method
  */
@@ -246,7 +237,6 @@ ecp_realize (ECellView *ecv)
 		(* E_CELL_CLASS (e_cell_popup_parent_class)->realize) (ecv);
 }
 
-
 /*
  * ECell::unrealize method
  */
@@ -261,7 +251,6 @@ ecp_unrealize (ECellView *ecv)
 		(* E_CELL_CLASS (e_cell_popup_parent_class)->unrealize) (ecv);
 }
 
-
 /*
  * ECell::draw method
  */
@@ -321,7 +310,6 @@ ecp_draw (ECellView *ecv, GdkDrawable *drawable,
 	}
 }
 
-
 /*
  * ECell::event method
  */
@@ -364,7 +352,6 @@ ecp_event (ECellView *ecv, GdkEvent *event, gint model_col, gint view_col,
 			     row, flags, actions);
 }
 
-
 /*
  * ECell::height method
  */
@@ -376,7 +363,6 @@ ecp_height (ECellView *ecv, gint model_col, gint view_col, gint row)
 	return e_cell_height (ecp_view->child_view, model_col, view_col, row);
 }
 
-
 /*
  * ECellView::enter_edit method
  */
@@ -388,7 +374,6 @@ ecp_enter_edit (ECellView *ecv, gint model_col, gint view_col, gint row)
 	return e_cell_enter_edit (ecp_view->child_view, model_col, view_col, row);
 }
 
-
 /*
  * ECellView::leave_edit method
  */
@@ -402,7 +387,6 @@ ecp_leave_edit (ECellView *ecv, gint model_col, gint view_col, gint row,
 			   edit_context);
 }
 
-
 static void
 ecp_print (ECellView *ecv, GtkPrintContext *context,
 	   gint model_col, gint view_col, gint row, double width, double height)
@@ -413,7 +397,6 @@ ecp_print (ECellView *ecv, GtkPrintContext *context,
 		      width, height);
 }
 
-
 static gdouble
 ecp_print_height (ECellView *ecv, GtkPrintContext *context,
 		  gint model_col, gint view_col, gint row,
@@ -425,7 +408,6 @@ ecp_print_height (ECellView *ecv, GtkPrintContext *context,
 				    view_col, row, width);
 }
 
-
 static gint
 ecp_max_width (ECellView *ecv,
 	       gint model_col,
@@ -436,7 +418,6 @@ ecp_max_width (ECellView *ecv,
 	return e_cell_max_width (ecp_view->child_view, model_col, view_col);
 }
 
-
 static void
 ecp_show_tooltip (ECellView *ecv,
 		  gint model_col,
@@ -459,8 +440,6 @@ ecp_get_bg_color (ECellView *ecell_view, gint row)
 	return e_cell_get_bg_color (ecp_view->child_view, row);
 }
 
-
-
 ECell*
 e_cell_popup_get_child			(ECellPopup	*ecp)
 {
@@ -469,7 +448,6 @@ e_cell_popup_get_child			(ECellPopup	*ecp)
 	return ecp->child;
 }
 
-
 void
 e_cell_popup_set_child			(ECellPopup	*ecp,
 					 ECell		*child)
@@ -483,7 +461,6 @@ e_cell_popup_set_child			(ECellPopup	*ecp,
 	g_object_ref (child);
 }
 
-
 static gint
 e_cell_popup_do_popup			(ECellPopupView	*ecp_view,
 					 GdkEvent	*event,
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index a8ce08f..4ea1127 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -66,7 +66,6 @@ typedef struct {
 	ETableModel	*popup_model;
 } ECellPopup;
 
-
 typedef struct {
 	ECellClass parent_class;
 
@@ -74,14 +73,12 @@ typedef struct {
 	gint	   (*popup)        (ECellPopup *ecp, GdkEvent *event, gint row, gint view_col);
 } ECellPopupClass;
 
-
 struct _ECellPopupView {
 	ECellView	 cell_view;
 
 	ECellView	*child_view;
 };
 
-
 GType    e_cell_popup_get_type           (void);
 ECell   *e_cell_popup_new                (void);
 
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index c62e2d5..e2b0f99 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -91,7 +91,6 @@ enum {
 	PROP_BG_COLOR_COLUMN
 };
 
-
 enum {
 	E_SELECTION_PRIMARY,
 	E_SELECTION_CLIPBOARD
@@ -121,7 +120,6 @@ typedef struct {
 	gint ref_count;
 } ECellTextLineBreaks;
 
-
 typedef struct _CellEdit CellEdit;
 
 typedef struct {
@@ -137,7 +135,6 @@ typedef struct {
 	 */
 	CellEdit    *edit;
 
-
 	gint xofs, yofs;                 /* This gets added to the x
                                            and y for the cell text. */
 	double ellipsis_width[2];      /* The width of the ellipsis. */
@@ -361,13 +358,11 @@ ect_new_view (ECell *ecell, ETableModel *table_model, gpointer e_table_item_view
 	text_view->cell_view.kill_view_cb = NULL;
         text_view->cell_view.kill_view_cb_data = NULL;
 
-
 	text_view->canvas = canvas;
 
 	text_view->xofs = 0.0;
 	text_view->yofs = 0.0;
 
-
 	return (ECellView *)text_view;
 }
 
@@ -454,7 +449,6 @@ ect_free_color (gchar *color_spec, GdkColor *color, GdkColormap *colormap)
 	}
 }
 
-
 static PangoAttrList*
 build_attr_list (ECellTextView *text_view, gint row, gint text_length)
 {
@@ -513,7 +507,6 @@ layout_with_preedit (ECellTextView *text_view, gint row, const gchar *text, gint
 	gint text_length = strlen (text);
 	gint mlen = MIN(edit->selection_start,text_length);
 
-
 	gtk_im_context_get_preedit_string (edit->im_context,
 					&preedit_string,&preedit_attrs,
 					NULL);
@@ -659,7 +652,6 @@ generate_layout (ECellTextView *text_view, gint model_col, gint view_col, gint r
 	return layout;
 }
 
-
 static void
 draw_pango_rectangle (GdkDrawable *drawable, GdkGC *gc, gint x1, gint y1, PangoRectangle rect)
 {
@@ -875,7 +867,6 @@ ect_get_bg_color(ECellView *ecell_view, gint row)
 	return color_spec;
 }
 
-
 /*
  * Selects the entire string
  */
@@ -1344,7 +1335,6 @@ ect_print (ECellView *ecell_view, GtkPrintContext *context,
 	gchar *string;
 	double ty, ly, text_width = 0.0, text_height = 0.0;
 
-
 	cr = gtk_print_context_get_cairo_context (context);
 	string = e_cell_text_get_text(ect, ecell_view->e_table_model, model_col, row);
 
@@ -1793,8 +1783,6 @@ e_cell_text_class_init (ECellTextClass *klass)
 			      G_TYPE_POINTER, G_TYPE_INT, G_TYPE_INT,
 			      G_TYPE_INT, G_TYPE_INT);
 
-
-
 	g_object_class_install_property (object_class, PROP_STRIKEOUT_COLUMN,
 					 g_param_spec_int ("strikeout_column",
 							   _("Strikeout Column"),
@@ -1852,7 +1840,6 @@ e_cell_text_class_init (ECellTextClass *klass)
 	gal_a11y_e_cell_registry_add_cell_type (NULL, E_CELL_TEXT_TYPE, gal_a11y_e_cell_text_new);
 }
 
-
 /* IM Context Callbacks */
 
 static void
@@ -2065,7 +2052,6 @@ e_cell_text_new (const gchar *fontname, GtkJustification justify)
 	return (ECell *) ect;
 }
 
-
 /* fixme: Handle Font attributes */
 /* position is in BYTES */
 
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index f3ecc41..740db82 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -128,4 +128,3 @@ G_END_DECLS
 
 #endif /* _E_CELL_TEXT_H_ */
 
-
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 4057c06..b1748b4 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -139,7 +139,6 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	if (E_TABLE_ITEM (ecell_view->e_table_item_view)->alternating_row_colors && (row % 2) == 0)
 		cache_seq += 3;
 
-
 	image = toggle->images[value];
 
 	if ((x2 - x1) < gdk_pixbuf_get_width (image)){
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
index 96e3d01..09b458f 100644
--- a/widgets/table/e-cell-toggle.h
+++ b/widgets/table/e-cell-toggle.h
@@ -61,4 +61,3 @@ G_END_DECLS
 
 #endif /* _E_CELL_TOGGLE_H_ */
 
-
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 7e73256..27698f8 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -51,10 +51,8 @@
 #include "tree-expanded.xpm"
 #include "tree-unexpanded.xpm"
 
-
 G_DEFINE_TYPE (ECellTree, e_cell_tree, E_CELL_TYPE)
 
-
 typedef struct {
 	ECellView    cell_view;
 	ECellView   *subcell_view;
@@ -887,7 +885,6 @@ e_cell_tree_construct (ECellTree *ect,
 	ect->draw_lines = draw_lines;
 }
 
-
 /**
  * e_cell_tree_new:
  * @open_pixbuf: pixbuf to be used instead of the '-' icon.
diff --git a/widgets/table/e-cell-tree.h b/widgets/table/e-cell-tree.h
index 36d4a85..465af77 100644
--- a/widgets/table/e-cell-tree.h
+++ b/widgets/table/e-cell-tree.h
@@ -42,7 +42,6 @@ G_BEGIN_DECLS
 #define E_IS_CELL_TREE(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_CELL_TREE_TYPE))
 #define E_IS_CELL_TREE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_CELL_TREE_TYPE))
 
-
 typedef struct {
 	ECell parent;
 
@@ -75,4 +74,3 @@ G_END_DECLS
 
 #endif /* _E_CELL_TREE_H_ */
 
-
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index 3d18894..7759203 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -178,7 +178,6 @@ ecv_event (ECellView *ecell_view, GdkEvent *event, gint model_col, gint view_col
 		break;
 	}
 
-
 	for (i = 0; i < vbox_view->subcell_view_count; i++) {
 		gint height = e_cell_height (vbox_view->subcell_views[i], vbox_view->model_cols[i], view_col, row);
 		if (y < subcell_offset + height)
@@ -373,7 +372,6 @@ ecv_print (ECellView *ecell_view, GnomePrintContext *context,
 		width -= subcell_offset;
 	}
 
-
 	e_cell_print (vbox_view->subcell_view, context, model_col, view_col, row, width, height);
 }
 
@@ -454,7 +452,6 @@ e_cell_vbox_init (ECellVbox *ecv)
 	ecv->subcell_count = 0;
 }
 
-
 /**
  * e_cell_vbox_new:
  *
diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h
index 58aa523..7762e62 100644
--- a/widgets/table/e-cell-vbox.h
+++ b/widgets/table/e-cell-vbox.h
@@ -65,7 +65,6 @@ void     e_cell_vbox_append    (ECellVbox *vbox,
 				ECell     *subcell,
 				gint model_col);
 
-
 G_END_DECLS
 
 #endif /* _E_CELL_VBOX_H_ */
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index eceae68..c2024e4 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -172,7 +172,6 @@ etcta_drop_message (ETableClickToAdd *etcta)
 	etcta->message = NULL;
 }
 
-
 static void
 etcta_dispose (GObject *object)
 {
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 3a0ee84..3de22f5 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -504,7 +504,6 @@ do_sort_and_group_config_dialog (ETableConfig *config, gboolean is_sort)
 		? config->sort [0].combo
 		: config->group [0].combo));
 
-
 	if (is_sort)
 		dialog = GTK_DIALOG (config->dialog_sort);
 	else
@@ -592,7 +591,6 @@ do_fields_config_dialog (ETableConfig *config)
 	config_fields_info_update (config);
 }
 
-
 static ETableMemoryStoreColumnInfo store_columns[] = {
 	E_TABLE_MEMORY_STORE_STRING,
 	E_TABLE_MEMORY_STORE_INTEGER,
@@ -974,7 +972,6 @@ configure_group_dialog (ETableConfig *config, GladeXML *gui)
 		config->group [i].e_table_config = config;
 	}
 
-
 	for (l = config->column_names; l; l = l->next){
 		gchar *label = l->data;
 
@@ -1131,7 +1128,6 @@ config_button_down (GtkWidget *widget, ETableConfig *config)
 	if (columns == NULL)
 		return;
 
-
 	new_shown = g_new (int, config->temp_state->col_count);
 	new_expansions = g_new (double, config->temp_state->col_count);
 
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index 72357fb..c3f994a 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -50,7 +50,6 @@ typedef struct {
 	gpointer e_table_config;
 } ETableConfigSortWidgets;
 
-
 typedef struct {
 	GObject parent;
 
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
index de23cb9..d7b2611 100644
--- a/widgets/table/e-table-defines.h
+++ b/widgets/table/e-table-defines.h
@@ -37,5 +37,4 @@ G_BEGIN_DECLS
 
 G_END_DECLS
 
-
 #endif
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index 391873b..f5dc15d 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -331,8 +331,6 @@ create_table ()
 	gtk_widget_show_all (window);
 }
 
-
-
 gint
 main (gint argc, gchar *argv [])
 {
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 8d12eb3..e2d1c2e 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -43,7 +43,6 @@ G_BEGIN_DECLS
 #define E_IS_TABLE_FIELD_CHOOSER_DIALOG(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
 #define E_IS_TABLE_FIELD_CHOOSER_DIALOG_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_DIALOG_TYPE))
 
-
 typedef struct _ETableFieldChooserDialog       ETableFieldChooserDialog;
 typedef struct _ETableFieldChooserDialogClass  ETableFieldChooserDialogClass;
 
@@ -63,11 +62,9 @@ struct _ETableFieldChooserDialogClass
 	GtkDialogClass parent_class;
 };
 
-
 GtkWidget *e_table_field_chooser_dialog_new(void);
 GType      e_table_field_chooser_dialog_get_type (void);
 
 G_END_DECLS
 
-
 #endif /* __E_TABLE_FIELD_CHOOSER_DIALOG_H__ */
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index 71e1724..996ae9f 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -44,7 +44,6 @@ G_BEGIN_DECLS
 #define E_IS_TABLE_FIELD_CHOOSER(obj)		(G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
 #define E_IS_TABLE_FIELD_CHOOSER_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((obj), E_TABLE_FIELD_CHOOSER_TYPE))
 
-
 typedef struct _ETableFieldChooser       ETableFieldChooser;
 typedef struct _ETableFieldChooserClass  ETableFieldChooserClass;
 
@@ -70,7 +69,6 @@ struct _ETableFieldChooserClass
 	GtkVBoxClass parent_class;
 };
 
-
 GtkWidget *e_table_field_chooser_new(void);
 GType      e_table_field_chooser_get_type (void);
 
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index 1ba845e..6ec62e5 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -64,7 +64,6 @@ enum {
 static EPrintable *
 etgc_get_printable (ETableGroup *etg);
 
-
 static void
 e_table_group_container_child_node_free (ETableGroupContainer          *etgc,
 					ETableGroupContainerChildNode *child_node)
@@ -197,7 +196,6 @@ e_table_group_container_new (GnomeCanvasGroup *parent, ETableHeader *full_header
 	return E_TABLE_GROUP (etgc);
 }
 
-
 static gint
 etgc_event (GnomeCanvasItem *item, GdkEvent *event)
 {
@@ -1019,7 +1017,6 @@ etgc_reflow (GnomeCanvasItem *item, gint flags)
 	if (frozen)
 		return;
 
-
 	if (GTK_OBJECT_FLAGS(etgc)& GNOME_CANVAS_ITEM_REALIZED){
 		gdouble running_height = 0;
 		gdouble running_width = 0;
@@ -1139,15 +1136,12 @@ e_table_group_apply_to_leafs (ETableGroup *etg, ETableGroupLeafFn fn, gpointer c
 	}
 }
 
-
 typedef struct {
 	ETableGroupContainer *etgc;
 	GList *child;
 	EPrintable *child_printable;
 } ETGCPrintContext;
 
-
-
 #define CHECK(x) if((x) == -1) return -1;
 
 #if 0
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index 168b2f8..911b7f3 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -93,7 +93,6 @@ typedef struct {
         gint count;
 } ETableGroupContainerChildNode;
 
-
 ETableGroup *e_table_group_container_new       (GnomeCanvasGroup *parent, ETableHeader *full_header, ETableHeader     *header,
 						ETableModel *model, ETableSortInfo *sort_info, gint n);
 void         e_table_group_container_construct (GnomeCanvasGroup *parent, ETableGroupContainer *etgc,
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 8d05874..d34f034 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -83,7 +83,6 @@ ETableGroup *e_table_group_leaf_new       (GnomeCanvasGroup *parent,
 					   ETableSortInfo *sort_info);
 GType        e_table_group_leaf_get_type  (void);
 
-
 G_END_DECLS
 
 #endif /* _E_TABLE_GROUP_LEAF_H_ */
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 67695e8..cc6886f 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -874,7 +874,6 @@ ethi_realize (GnomeCanvasItem *item)
 		{ (gchar *) TARGET_ETABLE_COL_TYPE, 0, TARGET_ETABLE_COL_HEADER },
 	};
 
-
 	if (GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)-> realize)
 		(*GNOME_CANVAS_ITEM_CLASS (ethi_parent_class)->realize)(item);
 
@@ -944,7 +943,6 @@ ethi_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint wi
 	gint col;
 	GHashTable *arrows = g_hash_table_new (NULL, NULL);
 
-
 	if (ethi->sort_info) {
 		gint length = e_table_sort_info_grouping_get_count(ethi->sort_info);
 		gint i;
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index bfc6768..3e3c7f4 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -276,7 +276,6 @@ e_table_draw_elided_string (GdkDrawable *drawable, GdkGC *gc, GtkWidget *widget,
 		else
 			arrow_width = ARROW_WIDTH;
 
-
 		lines = pango_layout_get_lines (layout);
 		line = lines->data;
 
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index e5eb2f2..8d34e5c 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -107,7 +107,6 @@ enum {
 #define DOUBLE_CLICK_TIME      250
 #define TRIPLE_CLICK_TIME      500
 
-
 static gint eti_get_height (ETableItem *eti);
 static gint eti_row_height (ETableItem *eti, gint row);
 static void e_table_item_focus (ETableItem *eti, gint col, gint row, GdkModifierType state);
@@ -596,7 +595,6 @@ eti_remove_header_model (ETableItem *eti)
 	}
 	g_object_unref (eti->header);
 
-
 	eti->header_structure_change_id = 0;
 	eti->header_dim_change_id = 0;
 	eti->header_request_width_id = 0;
@@ -691,7 +689,6 @@ calculate_height_cache (ETableItem *eti)
 	confirm_height_cache(eti);
 }
 
-
 /*
  * eti_row_height:
  *
@@ -1686,7 +1683,6 @@ eti_realize (GnomeCanvasItem *item)
 	if (GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)
                 (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->realize)(item);
 
-
 	eti->rows = e_table_model_row_count (eti->table_model);
 
 	/*
@@ -1812,8 +1808,6 @@ eti_unrealize (GnomeCanvasItem *item)
                 (*GNOME_CANVAS_ITEM_CLASS (eti_parent_class)->unrealize)(item);
 }
 
-
-
 static void
 eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, gint x, gint y, gint width, gint height)
 {
@@ -2496,7 +2490,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 			}
 #endif
 
-
 			if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1))
 				return TRUE;
 
@@ -2505,7 +2498,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
 				     "cursor_col", &cursor_col,
 				     NULL);
 
-
 			d(g_print("%s: GDK_BUTTON_RELEASE received, button %d, line: %d\n"
 				  "eti_editing: %s, row:%d:%d, col:%d:%d\n", __FUNCTION__, e->button.button, __LINE__,
 				  eti_editing(eti)?"true":"false", cursor_row, view_to_model_row(eti, row), cursor_col, view_to_model_col(eti, col)));
@@ -3348,7 +3340,6 @@ eti_selection_row_change (ESelectionModel *selection, gint row, ETableItem *eti)
 	}
 }
 
-
 /**
  * e_table_item_enter_edit
  * @eti: %ETableItem which will start being edited
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 92e8e0c..cd3bf1d 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -187,7 +187,6 @@ typedef struct {
 } ETableItemClass;
 GType       e_table_item_get_type            (void);
 
-
 /*
  * Focus
  */
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 95ea4be..2775d2d 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -86,7 +86,6 @@ free_value (ETableMemoryStore *etms, gint col, gpointer value)
 	}
 }
 
-
 static gint
 etms_column_count (ETableModel *etm)
 {
@@ -323,7 +322,6 @@ e_table_memory_store_construct (ETableMemoryStore *etms, ETableMemoryStoreColumn
 	return E_TABLE_MODEL (etms);
 }
 
-
 void
 e_table_memory_store_adopt_value_at (ETableMemoryStore *etms, gint col, gint row, gpointer value)
 {
diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
index 07a79b6..8de51b7 100644
--- a/widgets/table/e-table-memory.h
+++ b/widgets/table/e-table-memory.h
@@ -48,7 +48,6 @@ struct ETableMemoryClass {
 	ETableModelClass parent_class;
 };
 
-
 GType         e_table_memory_get_type     (void);
 void          e_table_memory_construct    (ETableMemory *etable);
 ETableMemory *e_table_memory_new          (void);
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index 2badb76..3962550 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -36,7 +36,6 @@
 
 d(static gint depth = 0;)
 
-
 G_DEFINE_TYPE (ETableModel, e_table_model, G_TYPE_OBJECT)
 
 enum {
@@ -68,7 +67,6 @@ e_table_model_column_count (ETableModel *e_table_model)
 	return ETM_CLASS (e_table_model)->column_count (e_table_model);
 }
 
-
 /**
  * e_table_model_row_count:
  * @e_table_model: the e-table-model to operate on
@@ -171,7 +169,6 @@ e_table_model_is_cell_editable (ETableModel *e_table_model, gint col, gint row)
 	return ETM_CLASS (e_table_model)->is_cell_editable (e_table_model, col, row);
 }
 
-
 gpointer
 e_table_model_duplicate_value (ETableModel *e_table_model, gint col, gconstpointer value)
 {
@@ -289,7 +286,6 @@ e_table_model_class_init (ETableModelClass *klass)
 			      g_cclosure_marshal_VOID__VOID,
 			      G_TYPE_NONE, 0);
 
-
 	e_table_model_signals [MODEL_CHANGED] =
 		g_signal_new ("model_changed",
 			      G_TYPE_FROM_CLASS (object_class),
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
index 571c2f8..e319b1f 100644
--- a/widgets/table/e-table-model.h
+++ b/widgets/table/e-table-model.h
@@ -69,7 +69,6 @@ typedef struct {
 	/* Return an allocated string. */
 	gchar       *(*value_to_string)    (ETableModel *etm, gint col, gconstpointer value);
 
-
 	/*
 	 * Signals
 	 */
@@ -124,7 +123,6 @@ gchar       *e_table_model_get_save_id         (ETableModel *etm,
 /**/
 gboolean    e_table_model_has_change_pending  (ETableModel *etm);
 
-
 /**/
 void       *e_table_model_duplicate_value     (ETableModel *e_table_model,
 					       gint          col,
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index a604e7a..07da209 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -144,7 +144,6 @@ one_dispose (GObject *object)
 {
 	ETableOne *one = E_TABLE_ONE (object);
 
-
 	if (one->data) {
 		gint i;
 		gint col_count;
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 380f49c..ab504ac 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -68,5 +68,4 @@ ETableSelectionModel *e_table_selection_model_new                 (void);
 
 G_END_DECLS
 
-
 #endif /* _E_TABLE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
index c93b313..81752a5 100644
--- a/widgets/table/e-table-simple.h
+++ b/widgets/table/e-table-simple.h
@@ -95,7 +95,6 @@ ETableModel *e_table_simple_new                      (ETableSimpleColumnCountFn
 						      ETableSimpleValueToStringFn    value_to_string,
 						      void                          *data);
 
-
 /* Helper functions for if your values are all just strings. */
 void        *e_table_simple_string_duplicate_value   (ETableModel                   *etm,
 						      gint                            col,
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index bed0c5d..e4a3874 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -251,7 +251,6 @@ e_table_sort_info_grouping_set_nth   (ETableSortInfo *info, gint n, ETableSortCo
 	e_table_sort_info_group_info_changed(info);
 }
 
-
 /**
  * e_table_sort_info_get_count:
  * @info: The ETableSortInfo object
@@ -472,4 +471,3 @@ e_table_sort_info_get_can_group       (ETableSortInfo   *info)
 	return info->can_group;
 }
 
-
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index 4676db8..a650462 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -119,7 +119,6 @@ etsv_insert_idle(ETableSortedVariable *etsv)
 	return FALSE;
 }
 
-
 static void
 etsv_add       (ETableSubsetVariable *etssv,
 		gint                  row)
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index 766d94d..2124ea4 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -306,7 +306,6 @@ ets_clean(ETableSorter *ets)
 	ets->needs_sorting = -1;
 }
 
-
 static void
 ets_sort(ETableSorter *ets)
 {
@@ -380,7 +379,6 @@ ets_backsort(ETableSorter *ets)
 	}
 }
 
-
 static gint
 ets_model_to_sorted (ESorter *es, gint row)
 {
@@ -445,7 +443,6 @@ ets_get_sorted_to_model_array (ESorter *es, gint **array, gint *count)
 	}
 }
 
-
 static gboolean
 ets_needs_sorting(ESorter *es)
 {
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index cf1b503..344a7cf 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -176,7 +176,6 @@ e_table_sorting_utils_affects_sort  (ETableSortInfo *sort_info,
 	return FALSE;
 }
 
-
 /* FIXME: This could be done in time log n instead of time n with a binary search. */
 gint
 e_table_sorting_utils_insert(ETableModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, gint *map_table, gint rows, gint row)
@@ -214,9 +213,6 @@ e_table_sorting_utils_check_position (ETableModel *source, ETableSortInfo *sort_
 	return i;
 }
 
-
-
-
 /* This takes source rows. */
 static gint
 etsu_tree_compare(ETreeModel *source, ETableSortInfo *sort_info, ETableHeader *full_header, ETreePath path1, ETreePath path2)
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
index d348d4b..318c331 100644
--- a/widgets/table/e-table-sorting-utils.h
+++ b/widgets/table/e-table-sorting-utils.h
@@ -33,8 +33,6 @@ gboolean  e_table_sorting_utils_affects_sort         (ETableSortInfo *sort_info,
 						      ETableHeader   *full_header,
 						      gint             col);
 
-
-
 void      e_table_sorting_utils_sort                 (ETableModel    *source,
 						      ETableSortInfo *sort_info,
 						      ETableHeader   *full_header,
@@ -53,8 +51,6 @@ gint       e_table_sorting_utils_check_position       (ETableModel    *source,
 						      gint             rows,
 						      gint             view_row);
 
-
-
 void      e_table_sorting_utils_tree_sort            (ETreeModel     *source,
 						      ETableSortInfo *sort_info,
 						      ETableHeader   *full_header,
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 6cbdcba..9f24f30 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -262,7 +262,6 @@ e_table_state_save_to_node      (ETableState *state,
 			e_xml_set_double_prop_by_name(new_node, (const guchar *)"expansion", expansion);
 	}
 
-
 	e_table_sort_info_save_to_node(state->sort_info, node);
 
 	return node;
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index 799c107..ce4745c 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -82,6 +82,5 @@ void         e_table_without_show       (ETableWithout                 *etw,
 void         e_table_without_show_all   (ETableWithout                 *etw);
 G_END_DECLS
 
-
 #endif /* _E_TABLE_WITHOUT_H_ */
 
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 703f645..1193813 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -53,7 +53,6 @@
 #include "e-table-subset.h"
 #include "e-table-utils.h"
 
-
 #define COLUMN_HEADER_HEIGHT 16
 
 G_DEFINE_TYPE (ETable, e_table, GTK_TYPE_TABLE)
@@ -958,7 +957,6 @@ et_build_groups (ETable *et)
 	g_signal_connect (G_OBJECT (et->group), "start_drag",
 			  G_CALLBACK (group_start_drag), et);
 
-
 	if (!(et->is_grouped) && was_grouped)
 		et_disconnect_model (et);
 
@@ -1228,7 +1226,6 @@ e_table_setup_table (ETable *e_table, ETableHeader *full_header, ETableHeader *h
 
 	gtk_widget_show (GTK_WIDGET (e_table->table_canvas));
 
-
 	e_table->white_item = gnome_canvas_item_new(
 		gnome_canvas_root(e_table->table_canvas),
 		e_canvas_background_get_type(),
@@ -1430,7 +1427,6 @@ e_table_get_state_object (ETable *e_table)
 	state->sort_info = e_table->sort_info;
 	g_object_ref(state->sort_info);
 
-
 	state->col_count = e_table_header_count (e_table->header);
 	full_col_count = e_table_header_count (e_table->full_header);
 	state->columns = g_new(int, state->col_count);
@@ -1563,7 +1559,6 @@ et_real_construct (ETable *e_table, ETableModel *etm, ETableExtras *ete,
 		g_signal_connect (G_OBJECT (e_table->sort_info), "sort_info_changed",
 				  G_CALLBACK (sort_info_changed), e_table);
 
-
 	g_value_set_object (val, e_table->sort_info);
 	g_object_set_property (G_OBJECT(e_table->header), "sort_info", val);
 	g_free (val);
@@ -2073,7 +2068,6 @@ e_table_invert_selection (ETable *table)
 	e_selection_model_invert_selection (E_SELECTION_MODEL (table->selection));
 }
 
-
 /**
  * e_table_get_printable:
  * @e_table: #ETable to query
@@ -2914,7 +2908,6 @@ scroll_timeout (gpointer data)
 			       et->last_drop_y,
 			       et->last_drop_time);
 
-
 	return TRUE;
 }
 
@@ -3000,7 +2993,6 @@ et_drag_motion(GtkWidget *widget,
 				  y,
 				  time);
 
-
 	if (y < 20)
 		direction |= ET_SCROLL_UP;
 	if (y > widget->allocation.height - 20)
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index e961a06..dc7c288 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -50,7 +50,6 @@ etmc_column_count (ETreeModel *etm)
 		return 0;
 }
 
-
 static gboolean
 etmc_has_save_id (ETreeModel *etm)
 {
@@ -130,7 +129,6 @@ etmc_is_editable (ETreeModel *etm, ETreePath node, gint col)
 	return etmc->is_editable (etm, node, col, etmc->model_data);
 }
 
-
 /* The default for etmc_duplicate_value is to return the raw value. */
 static gpointer
 etmc_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
index e76c687..e37ef30 100644
--- a/widgets/table/e-tree-memory-callbacks.h
+++ b/widgets/table/e-tree-memory-callbacks.h
@@ -33,7 +33,6 @@ G_BEGIN_DECLS
 #define E_IS_TREE_MEMORY_CALLBACKS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), E_TREE_MEMORY_CALLBACKS_TYPE))
 #define E_IS_TREE_MEMORY_CALLBACKS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_MEMORY_CALLBACKS_TYPE))
 
-
 typedef GdkPixbuf* (*ETreeMemoryCallbacksIconAtFn)             (ETreeModel *etree, ETreePath path, gpointer model_data);
 
 typedef gint       (*ETreeMemoryCallbacksColumnCountFn)        (ETreeModel *etree, gpointer model_data);
diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h
index 0a56c8d..824f0b1 100644
--- a/widgets/table/e-tree-memory.h
+++ b/widgets/table/e-tree-memory.h
@@ -55,7 +55,6 @@ struct ETreeMemoryClass {
 	void (*fill_in_children) (ETreeMemory *model, ETreePath node);
 };
 
-
 GType        e_tree_memory_get_type               (void);
 void         e_tree_memory_construct              (ETreeMemory             *etree);
 ETreeMemory *e_tree_memory_new                    (void);
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index 143ad61..9a06fea 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -504,7 +504,6 @@ e_tree_model_node_get_last_child (ETreeModel *etree, ETreePath node)
 		return NULL;
 }
 
-
 /**
  * e_tree_model_node_get_next:
  * @etree:
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index fdd7f26..c6600dd 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -28,10 +28,8 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <glib-object.h>
 
-
 G_BEGIN_DECLS
 
-
 #define E_TREE_MODEL_TYPE        (e_tree_model_get_type ())
 #define E_TREE_MODEL(o)          (G_TYPE_CHECK_INSTANCE_CAST ((o), E_TREE_MODEL_TYPE, ETreeModel))
 #define E_TREE_MODEL_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST((k), E_TREE_MODEL_TYPE, ETreeModelClass))
@@ -120,7 +118,6 @@ struct ETreeModelClass {
 	void       (*node_request_collapse) (ETreeModel *etm, ETreePath node);
 };
 
-
 GType       e_tree_model_get_type                (void);
 ETreeModel *e_tree_model_new                     (void);
 
@@ -227,7 +224,6 @@ void        e_tree_model_node_deleted            (ETreeModel     *tree_model,
 void        e_tree_model_node_request_collapse   (ETreeModel     *tree_model,
 						  ETreePath       deleted_node);
 
-
 G_END_DECLS
 
 #endif /* _E_TREE_MODEL_H */
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 87140ef..eedb201 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -202,7 +202,6 @@ etsm_node_deleted (ETreeModel *etm, ETreePath child, ETreeSelectionModel *etsm)
 	restore_cursor (etsm, etm);
 }
 
-
 static void
 add_model(ETreeSelectionModel *etsm, ETreeModel *model)
 {
@@ -380,7 +379,6 @@ etsm_is_row_selected (ESelectionModel *selection,
 	return etsm_is_path_selected (etsm, path);
 }
 
-
 typedef struct {
 	ETreeSelectionModel *etsm;
 	EForeachFunc callback;
@@ -741,7 +739,6 @@ e_tree_selection_model_get_cursor (ETreeSelectionModel *etsm)
 	return etsm->priv->cursor_path;
 }
 
-
 static void
 e_tree_selection_model_init (ETreeSelectionModel *etsm)
 {
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index c112c40..e66abf3 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -51,7 +51,6 @@ typedef struct {
 	ESelectionModelClass parent_class;
 } ETreeSelectionModelClass;
 
-
 GType            e_tree_selection_model_get_type            (void);
 ESelectionModel *e_tree_selection_model_new                 (void);
 void             e_tree_selection_model_foreach             (ETreeSelectionModel *etsm,
@@ -69,5 +68,4 @@ ETreePath        e_tree_selection_model_get_cursor          (ETreeSelectionModel
 
 G_END_DECLS
 
-
 #endif /* _E_TREE_SELECTION_MODEL_H_ */
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
index 47a5e6b..8b71bd7 100644
--- a/widgets/table/e-tree-simple.h
+++ b/widgets/table/e-tree-simple.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define E_IS_TREE_SIMPLE_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), E_TREE_SIMPLE_TYPE))
 #define E_TREE_SIMPLE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS((o), E_TREE_SIMPLE_TYPE, ETreeSimpleClass))
 
-
 typedef GdkPixbuf* (*ETreeSimpleIconAtFn)     (ETreeModel *etree, ETreePath *path, gpointer model_data);
 typedef gpointer       (*ETreeSimpleValueAtFn)    (ETreeModel *etree, ETreePath *path, gint col, gpointer model_data);
 typedef void       (*ETreeSimpleSetValueAtFn) (ETreeModel *etree, ETreePath *path, gint col, gconstpointer val, gpointer model_data);
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index 822affe..7c7718d 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -148,7 +148,6 @@ etsv_insert_idle(ETreeSortedVariable *etsv)
 	return FALSE;
 }
 
-
 ETableModel *
 e_tree_sorted_variable_new (ETreeModel *source, ETableHeader *full_header, ETableSortInfo *sort_info)
 {
@@ -242,7 +241,6 @@ etsv_compare(ETreeSortedVariable *etsv, const ETreePath *path1, const ETreePath
 	return comp_val;
 }
 
-
 static ETreeSortedVariable *etsv_closure;
 gint cols_closure;
 gint *ascending_closure;
@@ -409,7 +407,6 @@ etsv_add_node (ETreeSortedVariable *etsv, ETreePath *path, GNode *root)
 
 	etsv_sort_node(etsv, new_node);
 
-
 #if 0
 	g_node_prepend(root, new_node);
 	etsv_sort_node(etsv, root);
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index cd4ef4a..6beaa34 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -824,7 +824,6 @@ ets_column_count (ETreeModel *etm)
 	return e_tree_model_column_count(ets->priv->source);
 }
 
-
 static gboolean
 ets_has_save_id (ETreeModel *etm)
 {
@@ -869,7 +868,6 @@ ets_has_change_pending (ETreeModel *etm)
 	return ets->priv->sort_idle_id != 0;
 }
 
-
 static gpointer
 ets_value_at (ETreeModel *etm, ETreePath node, gint col)
 {
@@ -897,7 +895,6 @@ ets_is_editable (ETreeModel *etm, ETreePath node, gint col)
 	return e_tree_model_node_is_editable (ets->priv->source, path->corresponding, col);
 }
 
-
 /* The default for ets_duplicate_value is to return the raw value. */
 static gpointer
 ets_duplicate_value (ETreeModel *etm, gint col, gconstpointer value)
@@ -1349,7 +1346,6 @@ e_tree_sorted_set_sort_info (ETreeSorted *ets, ETableSortInfo *sort_info)
 
 	g_return_if_fail (ets != NULL);
 
-
 	if (ets->priv->sort_info) {
 		if (ets->priv->sort_info_changed_id != 0)
 			g_signal_handler_disconnect (G_OBJECT (ets->priv->sort_info),
diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h
index 45adbef..74d9a70 100644
--- a/widgets/table/e-tree-sorted.h
+++ b/widgets/table/e-tree-sorted.h
@@ -55,7 +55,6 @@ struct ETreeSortedClass {
 	void       (*node_resorted)         (ETreeSorted *etm, ETreePath node);
 };
 
-
 GType        e_tree_sorted_get_type            (void);
 void         e_tree_sorted_construct           (ETreeSorted    *etree,
 						ETreeModel     *source,
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 783f58c..8d3b9a1 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -598,7 +598,6 @@ etta_has_change_pending (ETableModel *etm)
 	return e_tree_model_has_change_pending (etta->priv->source);
 }
 
-
 static gint
 etta_row_count (ETableModel *etm)
 {
@@ -1161,7 +1160,6 @@ e_tree_table_adapter_node_set_expanded (ETreeTableAdapter *etta, ETreePath path,
 	e_table_model_pre_change (E_TABLE_MODEL(etta));
 	e_table_model_row_changed(E_TABLE_MODEL(etta), row);
 
-
 	if (expanded) {
 		gint num_children = insert_children(etta, gnode);
 		update_child_counts(gnode, num_children);
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 92b79fe..796bec1 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -239,7 +239,6 @@ static void et_drag_data_received(GtkWidget *widget,
 				  guint time,
 				  ETree *et);
 
-
 static void scroll_off (ETree *et);
 static void scroll_on (ETree *et, guint scroll_direction);
 static void hover_off (ETree *et);
@@ -1985,7 +1984,6 @@ e_tree_view_to_model_row        (ETree *e_tree,
 		return view_row;
 }
 
-
 gboolean
 e_tree_node_is_expanded (ETree *et, ETreePath path)
 {
@@ -2775,7 +2773,6 @@ scroll_timeout (gpointer data)
 			       et->priv->last_drop_y,
 			       et->priv->last_drop_time);
 
-
 	return TRUE;
 }
 
diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h
index 6a185da..1c602a8 100644
--- a/widgets/text/e-text-model-repos.h
+++ b/widgets/text/e-text-model-repos.h
@@ -34,7 +34,6 @@ typedef struct {
 
 gint e_repos_shift (gint pos, gpointer data);
 
-
 typedef struct {
 	ETextModel *model;
 	gint pos;  /* Position to move to.  Negative values count from the end buffer.
@@ -43,7 +42,6 @@ typedef struct {
 
 gint e_repos_absolute (gint pos, gpointer data);
 
-
 typedef struct {
 	ETextModel *model;
 	gint pos;  /* Location of first inserted character. */
@@ -52,7 +50,6 @@ typedef struct {
 
 gint e_repos_insert_shift (gint pos, gpointer data);
 
-
 typedef struct {
 	ETextModel *model;
 	gint pos;  /* Location of first deleted character. */
@@ -61,7 +58,6 @@ typedef struct {
 
 gint e_repos_delete_shift (gint pos, gpointer data);
 
-
 /* For e_repos_clamp, data is a pointer to an ETextModel.  The only repositioning
    that occurs is to avoid buffer overruns. */
 
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index e1a0fca..e4ab873 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -398,7 +398,6 @@ e_text_model_insert_length (ETextModel *model, gint position, const gchar *text,
 	g_return_if_fail (E_IS_TEXT_MODEL (model));
 	g_return_if_fail (length >= 0);
 
-
 	if (text == NULL || length == 0)
 		return;
 
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 0a9a738..4b0a447 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -82,7 +82,6 @@ void        e_text_model_cancel_completion (ETextModel *model);
 void        e_text_model_reposition        (ETextModel *model, ETextModelReposFn fn, gpointer repos_data);
 gint        e_text_model_validate_position (ETextModel *model, gint pos);
 
-
 /* Functions for manipulating the underlying text. */
 
 const gchar *e_text_model_get_text        (ETextModel *model);
@@ -94,7 +93,6 @@ void         e_text_model_prepend         (ETextModel *model, const gchar *text)
 void         e_text_model_append          (ETextModel *model, const gchar *text);
 void         e_text_model_delete          (ETextModel *model, gint position, gint length);
 
-
 /* Functions for accessing embedded objects. */
 
 gint         e_text_model_object_count          (ETextModel *model);
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 0b2f84c..88235e0 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -1657,7 +1657,6 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		}
 	}
 
-
 	if (text->clip) {
 		gdk_gc_set_clip_rectangle (main_gc, NULL);
 	}
@@ -2030,8 +2029,6 @@ _do_tooltip (gpointer data)
 					      "justification", text->justification,
 					      NULL);
 
-
-
 	if (text->draw_borders)
 		e_canvas_item_move_absolute(tooltip_text, 1 + BORDER_INDENT, 1 + BORDER_INDENT);
 	else
@@ -2348,11 +2345,9 @@ e_text_event (GnomeCanvasItem *item, GdkEvent *event)
 				g_signal_emit (text, e_text_signals[E_TEXT_KEYPRESS], 0,
 					       e_tep_event.key.keyval, e_tep_event.key.state);
 
-
 			if (e_tep_event.key.string)
 				g_free ((gpointer) e_tep_event.key.string);
 
-
 			return ret;
 		}
 		break;
@@ -2565,7 +2560,6 @@ e_text_select_all (EText *text)
 	e_text_command(text->tep, &command, text);
 }
 
-
 static void
 primary_get_cb (GtkClipboard     *clipboard,
 		GtkSelectionData *selection_data,
@@ -2857,8 +2851,6 @@ find_offset_into_line (EText *text, gint offset_into_text, gchar **start_of_line
 	}
 }
 
-
-
 /* direction = TRUE (move forward), FALSE (move backward)
    Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */
 static gint
@@ -2925,8 +2917,6 @@ _get_updated_position (EText *text, gboolean direction)
 	return new_pos;
 }
 
-
-
 static gint
 _get_position(EText *text, ETextEventProcessorCommand *command)
 {
@@ -3148,7 +3138,6 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
 		else
 			text->selection_start = g_utf8_pointer_to_offset (text->text, p);
 
-
 		text->selection_start = e_text_model_validate_position (text->model, text->selection_start);
 
 		length = g_utf8_strlen (text->text, -1);
@@ -3486,7 +3475,6 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp
 	gnome_canvas_item_request_update (GNOME_CANVAS_ITEM(text));
 }
 
-
 /* Class initialization function for the text item */
 static void
 e_text_class_init (ETextClass *klass)
@@ -3590,7 +3578,6 @@ e_text_class_init (ETextClass *klass)
 							    GTK_TYPE_ANCHOR_TYPE, GTK_ANCHOR_CENTER,
 							    G_PARAM_READWRITE));
 
-
 	g_object_class_install_property (gobject_class, PROP_JUSTIFICATION,
 					 g_param_spec_enum ("justification",
 							    _( "Justification" ),
@@ -3654,7 +3641,6 @@ e_text_class_init (ETextClass *klass)
 							     GDK_TYPE_COLOR,
 							     G_PARAM_READWRITE));
 
-
 	g_object_class_install_property (gobject_class, PROP_FILL_COLOR_RGBA,
 					 g_param_spec_uint ("fill_color_rgba",
 							    _( "GDK fill color" ),
@@ -3683,7 +3669,6 @@ e_text_class_init (ETextClass *klass)
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READABLE));
 
-
 	g_object_class_install_property (gobject_class, PROP_EDITABLE,
 					 g_param_spec_boolean ("editable",
 							       _( "Editable" ),
@@ -3733,7 +3718,6 @@ e_text_class_init (ETextClass *klass)
 							      0.0, G_MAXDOUBLE, 0.0,
 							      G_PARAM_READWRITE));
 
-
 	g_object_class_install_property (gobject_class, PROP_HEIGHT,
 					 g_param_spec_double ("height",
 							      _( "Height" ),
@@ -3887,11 +3871,9 @@ e_text_init (EText *text)
 
 	text->handle_popup            = FALSE;
 
-
 	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(text), e_text_reflow);
 }
 
-
 /* IM Context Callbacks */
 static void
 e_text_commit_cb (GtkIMContext *context,
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index 5f6904b..057ff50 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -46,7 +46,6 @@
 
 G_BEGIN_DECLS
 
-
 /* Text item for the canvas.  Text items are positioned by an anchor point and an anchor direction.
  *
  * A clipping rectangle may be specified for the text.  The rectangle is anchored at the text's anchor
@@ -97,7 +96,6 @@ G_BEGIN_DECLS
 #define E_IS_TEXT(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), E_TYPE_TEXT))
 #define E_IS_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT))
 
-
 typedef struct _EText EText;
 typedef struct _ETextClass ETextClass;
 
@@ -231,7 +229,6 @@ struct _ETextClass {
 	void (* style_set)       (EText *text, GtkStyle *previous_style);
 };
 
-
 /* Standard Gtk function */
 GType    e_text_get_type        (void);
 void     e_text_cancel_editing  (EText *text);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]