[evolution/kill-bonobo: 39/42] Remove trailing whitespace, again.

From: Matthew Barnes <mbarnes src gnome org>
To: svn-commits-list gnome org
Subject: [evolution/kill-bonobo: 39/42] Remove trailing whitespace, again.
Date: Thu, 28 May 2009 00:51:02 -0400 (EDT)
commit e4afd3f9fb962ea1295a0657ec9f83a427829171
Author: Matthew Barnes <mbarnes redhat com>
Date:   Tue May 26 23:21:02 2009 -0400

    Remove trailing whitespace, again.
---
 a11y/addressbook/ea-addressbook-view.c             |    2 +-
 a11y/addressbook/ea-addressbook-view.h             |    2 +-
 a11y/addressbook/ea-addressbook.c                  |    2 +-
 a11y/addressbook/ea-addressbook.h                  |    2 +-
 a11y/addressbook/ea-minicard-view.c                |    2 +-
 a11y/addressbook/ea-minicard-view.h                |    2 +-
 a11y/addressbook/ea-minicard.c                     |    2 +-
 a11y/addressbook/ea-minicard.h                     |    2 +-
 a11y/calendar/ea-cal-view-event.c                  |    4 +-
 a11y/calendar/ea-cal-view-event.h                  |    2 +-
 a11y/calendar/ea-cal-view.c                        |    2 +-
 a11y/calendar/ea-cal-view.h                        |    2 +-
 a11y/calendar/ea-calendar-helpers.c                |    2 +-
 a11y/calendar/ea-calendar-helpers.h                |    2 +-
 a11y/calendar/ea-calendar.c                        |    2 +-
 a11y/calendar/ea-calendar.h                        |    2 +-
 a11y/calendar/ea-day-view-cell.c                   |    2 +-
 a11y/calendar/ea-day-view-cell.h                   |    2 +-
 a11y/calendar/ea-day-view-main-item.c              |    2 +-
 a11y/calendar/ea-day-view-main-item.h              |    2 +-
 a11y/calendar/ea-day-view.c                        |    2 +-
 a11y/calendar/ea-day-view.h                        |    2 +-
 a11y/calendar/ea-gnome-calendar.c                  |    2 +-
 a11y/calendar/ea-gnome-calendar.h                  |    2 +-
 a11y/calendar/ea-jump-button.c                     |    2 +-
 a11y/calendar/ea-jump-button.h                     |    2 +-
 a11y/calendar/ea-week-view-cell.c                  |    2 +-
 a11y/calendar/ea-week-view-cell.h                  |    2 +-
 a11y/calendar/ea-week-view-main-item.c             |    2 +-
 a11y/calendar/ea-week-view-main-item.h             |    2 +-
 a11y/calendar/ea-week-view.c                       |    2 +-
 a11y/calendar/ea-week-view.h                       |    2 +-
 a11y/e-table/gal-a11y-e-cell-popup.c               |    2 +-
 a11y/e-table/gal-a11y-e-cell-popup.h               |    2 +-
 a11y/e-table/gal-a11y-e-cell-registry.c            |    2 +-
 a11y/e-table/gal-a11y-e-cell-registry.h            |    2 +-
 a11y/e-table/gal-a11y-e-cell-text.c                |    2 +-
 a11y/e-table/gal-a11y-e-cell-text.h                |    2 +-
 a11y/e-table/gal-a11y-e-cell-toggle.c              |    2 +-
 a11y/e-table/gal-a11y-e-cell-toggle.h              |    2 +-
 a11y/e-table/gal-a11y-e-cell-tree.c                |    2 +-
 a11y/e-table/gal-a11y-e-cell-tree.h                |    2 +-
 a11y/e-table/gal-a11y-e-cell-vbox.c                |    2 +-
 a11y/e-table/gal-a11y-e-cell-vbox.h                |    2 +-
 a11y/e-table/gal-a11y-e-cell.c                     |    2 +-
 a11y/e-table/gal-a11y-e-cell.h                     |    2 +-
 .../gal-a11y-e-table-click-to-add-factory.c        |    2 +-
 .../gal-a11y-e-table-click-to-add-factory.h        |    2 +-
 a11y/e-table/gal-a11y-e-table-click-to-add.c       |    2 +-
 a11y/e-table/gal-a11y-e-table-click-to-add.h       |    2 +-
 a11y/e-table/gal-a11y-e-table-column-header.c      |    2 +-
 a11y/e-table/gal-a11y-e-table-column-header.h      |    2 +-
 a11y/e-table/gal-a11y-e-table-factory.c            |    2 +-
 a11y/e-table/gal-a11y-e-table-factory.h            |    2 +-
 a11y/e-table/gal-a11y-e-table-item-factory.c       |    2 +-
 a11y/e-table/gal-a11y-e-table-item-factory.h       |    2 +-
 a11y/e-table/gal-a11y-e-table-item.c               |    2 +-
 a11y/e-table/gal-a11y-e-table-item.h               |    2 +-
 a11y/e-table/gal-a11y-e-table.c                    |    2 +-
 a11y/e-table/gal-a11y-e-table.h                    |    2 +-
 a11y/e-table/gal-a11y-e-tree-factory.c             |    2 +-
 a11y/e-table/gal-a11y-e-tree-factory.h             |    2 +-
 a11y/e-table/gal-a11y-e-tree.c                     |    2 +-
 a11y/e-table/gal-a11y-e-tree.h                     |    2 +-
 a11y/e-text/gal-a11y-e-text-factory.c              |    2 +-
 a11y/e-text/gal-a11y-e-text-factory.h              |    2 +-
 a11y/e-text/gal-a11y-e-text.c                      |    2 +-
 a11y/e-text/gal-a11y-e-text.h                      |    2 +-
 a11y/ea-cell-table.c                               |    2 +-
 a11y/ea-cell-table.h                               |    2 +-
 a11y/ea-factory.h                                  |    2 +-
 a11y/gal-a11y-factory.h                            |    2 +-
 a11y/gal-a11y-util.c                               |    2 +-
 a11y/gal-a11y-util.h                               |    2 +-
 a11y/widgets/ea-calendar-cell.c                    |    2 +-
 a11y/widgets/ea-calendar-cell.h                    |    2 +-
 a11y/widgets/ea-calendar-item.c                    |    4 +-
 a11y/widgets/ea-calendar-item.h                    |    2 +-
 a11y/widgets/ea-combo-button.c                     |    2 +-
 a11y/widgets/ea-combo-button.h                     |    2 +-
 a11y/widgets/ea-widgets.c                          |    2 +-
 a11y/widgets/ea-widgets.h                          |    2 +-
 addressbook/conduit/address-conduit.c              |    2 +-
 addressbook/gui/component/addressbook-component.c  |    2 +-
 addressbook/gui/component/addressbook-component.h  |    2 +-
 addressbook/gui/component/addressbook-config.c     |    2 +-
 addressbook/gui/component/addressbook-config.h     |    2 +-
 addressbook/gui/component/addressbook-migrate.c    |    2 +-
 addressbook/gui/component/addressbook-migrate.h    |    2 +-
 addressbook/gui/component/addressbook-view.c       |    2 +-
 addressbook/gui/component/addressbook-view.h       |    2 +-
 addressbook/gui/component/addressbook.c            |    2 +-
 addressbook/gui/component/addressbook.h            |    2 +-
 addressbook/gui/component/autocompletion-config.c  |    2 +-
 addressbook/gui/component/autocompletion-config.h  |    2 +-
 addressbook/gui/component/component-factory.c      |    2 +-
 .../gui/contact-editor/e-contact-editor-fullname.c |    2 +-
 .../gui/contact-editor/e-contact-editor-fullname.h |    2 +-
 addressbook/gui/contact-editor/e-contact-editor.c  |    2 +-
 addressbook/gui/contact-editor/e-contact-editor.h  |    2 +-
 .../gui/contact-editor/e-contact-quick-add.c       |    2 +-
 .../gui/contact-editor/e-contact-quick-add.h       |    2 +-
 addressbook/gui/contact-editor/eab-editor.c        |    2 +-
 addressbook/gui/contact-editor/eab-editor.h        |    2 +-
 addressbook/gui/contact-editor/test-editor.c       |    2 +-
 .../contact-list-editor/e-contact-list-editor.c    |   16 +-
 .../contact-list-editor/e-contact-list-editor.h    |    2 +-
 .../gui/contact-list-editor/e-contact-list-model.c |    2 +-
 .../gui/contact-list-editor/e-contact-list-model.h |    2 +-
 addressbook/gui/merging/eab-contact-compare.c      |    2 +-
 addressbook/gui/merging/eab-contact-compare.h      |    2 +-
 addressbook/gui/merging/eab-contact-merging.c      |    2 +-
 addressbook/gui/merging/eab-contact-merging.h      |    2 +-
 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      |    2 +-
 .../gui/widgets/e-addressbook-table-adapter.h      |    2 +-
 addressbook/gui/widgets/e-addressbook-view.c       |    2 +-
 addressbook/gui/widgets/e-addressbook-view.h       |    2 +-
 addressbook/gui/widgets/e-minicard-label.c         |    2 +-
 addressbook/gui/widgets/e-minicard-label.h         |    2 +-
 addressbook/gui/widgets/e-minicard-view-widget.c   |    2 +-
 addressbook/gui/widgets/e-minicard-view-widget.h   |    2 +-
 addressbook/gui/widgets/e-minicard-view.c          |    2 +-
 addressbook/gui/widgets/e-minicard-view.h          |    2 +-
 addressbook/gui/widgets/e-minicard.c               |    6 +-
 addressbook/gui/widgets/e-minicard.h               |    2 +-
 addressbook/gui/widgets/eab-config.c               |    2 +-
 addressbook/gui/widgets/eab-config.h               |    2 +-
 addressbook/gui/widgets/eab-contact-display.c      |    6 +-
 addressbook/gui/widgets/eab-contact-display.h      |    2 +-
 addressbook/gui/widgets/eab-gui-util.c             |    2 +-
 addressbook/gui/widgets/eab-gui-util.h             |    4 +-
 addressbook/gui/widgets/eab-menu.c                 |    2 +-
 addressbook/gui/widgets/eab-menu.h                 |    2 +-
 addressbook/gui/widgets/eab-popup-control.c        |    2 +-
 addressbook/gui/widgets/eab-popup-control.h        |    2 +-
 addressbook/gui/widgets/eab-popup.c                |    2 +-
 addressbook/gui/widgets/eab-popup.h                |    2 +-
 .../gui/widgets/gal-view-factory-minicard.c        |    2 +-
 .../gui/widgets/gal-view-factory-minicard.h        |    2 +-
 addressbook/gui/widgets/gal-view-minicard.c        |    2 +-
 addressbook/gui/widgets/gal-view-minicard.h        |    2 +-
 .../importers/evolution-addressbook-importers.h    |    2 +-
 addressbook/importers/evolution-csv-importer.c     |    2 +-
 addressbook/importers/evolution-ldif-importer.c    |    2 +-
 addressbook/importers/evolution-vcard-importer.c   |    2 +-
 addressbook/printing/e-contact-print-types.h       |    2 +-
 addressbook/printing/e-contact-print.c             |    2 +-
 addressbook/printing/e-contact-print.h             |    2 +-
 addressbook/printing/test-print.c                  |    2 +-
 .../evolution-addressbook-export-list-cards.c      |    2 +-
 .../evolution-addressbook-export-list-folders.c    |    2 +-
 addressbook/tools/evolution-addressbook-export.c   |    2 +-
 addressbook/tools/evolution-addressbook-export.h   |    2 +-
 addressbook/util/eab-book-util.c                   |    2 +-
 addressbook/util/eab-book-util.h                   |    2 +-
 calendar/common/authentication.c                   |    4 +-
 calendar/common/authentication.h                   |    2 +-
 calendar/conduits/calendar/calendar-conduit.c      |    4 +-
 .../conduits/common/libecalendar-common-conduit.c  |    2 +-
 .../conduits/common/libecalendar-common-conduit.h  |    2 +-
 calendar/conduits/memo/memo-conduit.c              |    2 +-
 calendar/conduits/todo/todo-conduit.c              |    2 +-
 calendar/gui/alarm-notify/alarm-notify-dialog.c    |    2 +-
 calendar/gui/alarm-notify/alarm-notify-dialog.h    |    2 +-
 calendar/gui/alarm-notify/alarm-notify.c           |    4 +-
 calendar/gui/alarm-notify/alarm-notify.h           |    2 +-
 calendar/gui/alarm-notify/alarm-queue.c            |    2 +-
 calendar/gui/alarm-notify/alarm-queue.h            |    2 +-
 calendar/gui/alarm-notify/alarm.c                  |    2 +-
 calendar/gui/alarm-notify/alarm.h                  |    2 +-
 calendar/gui/alarm-notify/config-data.c            |    2 +-
 calendar/gui/alarm-notify/config-data.h            |    2 +-
 calendar/gui/alarm-notify/notify-main.c            |    2 +-
 calendar/gui/alarm-notify/util.c                   |    2 +-
 calendar/gui/alarm-notify/util.h                   |    2 +-
 calendar/gui/cal-search-bar.c                      |    2 +-
 calendar/gui/cal-search-bar.h                      |    2 +-
 calendar/gui/calendar-commands.c                   |    2 +-
 calendar/gui/calendar-commands.h                   |    2 +-
 calendar/gui/calendar-component.c                  |   10 +-
 calendar/gui/calendar-component.h                  |    2 +-
 calendar/gui/calendar-config-keys.h                |    2 +-
 calendar/gui/calendar-config.c                     |    2 +-
 calendar/gui/calendar-config.h                     |    2 +-
 calendar/gui/calendar-view-factory.c               |    2 +-
 calendar/gui/calendar-view-factory.h               |    2 +-
 calendar/gui/calendar-view.c                       |    2 +-
 calendar/gui/calendar-view.h                       |    2 +-
 calendar/gui/comp-editor-factory.c                 |    2 +-
 calendar/gui/comp-editor-factory.h                 |    2 +-
 calendar/gui/comp-util.c                           |    8 +-
 calendar/gui/comp-util.h                           |    2 +-
 calendar/gui/control-factory.c                     |    2 +-
 calendar/gui/control-factory.h                     |    2 +-
 calendar/gui/dialogs/alarm-dialog.c                |    2 +-
 calendar/gui/dialogs/alarm-dialog.h                |    2 +-
 calendar/gui/dialogs/alarm-list-dialog.c           |    2 +-
 calendar/gui/dialogs/alarm-list-dialog.h           |    2 +-
 calendar/gui/dialogs/cal-attachment-select-file.c  |    2 +-
 calendar/gui/dialogs/cal-attachment-select-file.h  |    2 +-
 calendar/gui/dialogs/cal-prefs-dialog.c            |    2 +-
 calendar/gui/dialogs/cal-prefs-dialog.h            |    2 +-
 calendar/gui/dialogs/calendar-setup.c              |    4 +-
 calendar/gui/dialogs/calendar-setup.h              |    2 +-
 calendar/gui/dialogs/cancel-comp.c                 |    2 +-
 calendar/gui/dialogs/cancel-comp.h                 |    2 +-
 calendar/gui/dialogs/changed-comp.c                |    2 +-
 calendar/gui/dialogs/changed-comp.h                |    2 +-
 calendar/gui/dialogs/comp-editor-page.c            |    2 +-
 calendar/gui/dialogs/comp-editor-page.h            |    2 +-
 calendar/gui/dialogs/comp-editor-util.c            |    2 +-
 calendar/gui/dialogs/comp-editor-util.h            |    2 +-
 calendar/gui/dialogs/comp-editor.c                 |   10 +-
 calendar/gui/dialogs/comp-editor.h                 |    2 +-
 calendar/gui/dialogs/copy-source-dialog.c          |    2 +-
 calendar/gui/dialogs/copy-source-dialog.h          |    2 +-
 calendar/gui/dialogs/delete-comp.c                 |    2 +-
 calendar/gui/dialogs/delete-comp.h                 |    2 +-
 calendar/gui/dialogs/delete-error.c                |    2 +-
 calendar/gui/dialogs/delete-error.h                |    2 +-
 calendar/gui/dialogs/e-delegate-dialog.c           |    2 +-
 calendar/gui/dialogs/e-delegate-dialog.h           |    2 +-
 calendar/gui/dialogs/e-send-options-utils.c        |    2 +-
 calendar/gui/dialogs/e-send-options-utils.h        |    2 +-
 calendar/gui/dialogs/event-editor.c                |    2 +-
 calendar/gui/dialogs/event-editor.h                |    4 +-
 calendar/gui/dialogs/event-page.c                  |    6 +-
 calendar/gui/dialogs/event-page.h                  |    2 +-
 calendar/gui/dialogs/memo-editor.c                 |    2 +-
 calendar/gui/dialogs/memo-editor.h                 |    2 +-
 calendar/gui/dialogs/memo-page.c                   |    2 +-
 calendar/gui/dialogs/memo-page.h                   |    2 +-
 calendar/gui/dialogs/recur-comp.c                  |    2 +-
 calendar/gui/dialogs/recur-comp.h                  |    2 +-
 calendar/gui/dialogs/recurrence-page.c             |    2 +-
 calendar/gui/dialogs/recurrence-page.h             |    2 +-
 calendar/gui/dialogs/save-comp.c                   |    2 +-
 calendar/gui/dialogs/save-comp.h                   |    4 +-
 calendar/gui/dialogs/schedule-page.c               |    2 +-
 calendar/gui/dialogs/schedule-page.h               |    2 +-
 calendar/gui/dialogs/select-source-dialog.c        |    2 +-
 calendar/gui/dialogs/select-source-dialog.h        |    2 +-
 calendar/gui/dialogs/send-comp.c                   |    2 +-
 calendar/gui/dialogs/send-comp.h                   |    2 +-
 calendar/gui/dialogs/task-details-page.c           |    2 +-
 calendar/gui/dialogs/task-details-page.h           |    2 +-
 calendar/gui/dialogs/task-editor.c                 |    2 +-
 calendar/gui/dialogs/task-editor.h                 |    2 +-
 calendar/gui/dialogs/task-page.c                   |    4 +-
 calendar/gui/dialogs/task-page.h                   |    2 +-
 calendar/gui/e-alarm-list.c                        |    2 +-
 calendar/gui/e-alarm-list.h                        |    4 +-
 calendar/gui/e-attachment-handler-calendar.c       |    2 +-
 calendar/gui/e-attachment-handler-calendar.h       |    2 +-
 calendar/gui/e-cal-component-memo-preview.c        |    2 +-
 calendar/gui/e-cal-component-memo-preview.h        |    2 +-
 calendar/gui/e-cal-component-preview.c             |    2 +-
 calendar/gui/e-cal-component-preview.h             |    2 +-
 calendar/gui/e-cal-config.c                        |    2 +-
 calendar/gui/e-cal-config.h                        |    2 +-
 calendar/gui/e-cal-event.c                         |    2 +-
 calendar/gui/e-cal-event.h                         |    2 +-
 calendar/gui/e-cal-list-view-config.c              |    2 +-
 calendar/gui/e-cal-list-view-config.h              |    2 +-
 calendar/gui/e-cal-list-view.c                     |    2 +-
 calendar/gui/e-cal-list-view.h                     |    2 +-
 calendar/gui/e-cal-menu.c                          |    2 +-
 calendar/gui/e-cal-menu.h                          |    2 +-
 calendar/gui/e-cal-model-calendar.c                |    2 +-
 calendar/gui/e-cal-model-calendar.h                |    2 +-
 calendar/gui/e-cal-model-memos.c                   |    2 +-
 calendar/gui/e-cal-model-memos.h                   |    2 +-
 calendar/gui/e-cal-model-tasks.c                   |    2 +-
 calendar/gui/e-cal-model-tasks.h                   |    2 +-
 calendar/gui/e-cal-model.c                         |   28 ++--
 calendar/gui/e-cal-model.h                         |    4 +-
 calendar/gui/e-cal-popup.c                         |    2 +-
 calendar/gui/e-cal-popup.h                         |    2 +-
 calendar/gui/e-calendar-table-config.c             |    2 +-
 calendar/gui/e-calendar-table-config.h             |    2 +-
 calendar/gui/e-calendar-table.c                    |    2 +-
 calendar/gui/e-calendar-table.h                    |    2 +-
 calendar/gui/e-calendar-view.c                     |    6 +-
 calendar/gui/e-calendar-view.h                     |    2 +-
 calendar/gui/e-cell-date-edit-config.c             |    2 +-
 calendar/gui/e-cell-date-edit-config.h             |    2 +-
 calendar/gui/e-cell-date-edit-text.c               |    2 +-
 calendar/gui/e-cell-date-edit-text.h               |    2 +-
 calendar/gui/e-comp-editor-registry.c              |    2 +-
 calendar/gui/e-comp-editor-registry.h              |    2 +-
 calendar/gui/e-date-edit-config.c                  |    2 +-
 calendar/gui/e-date-edit-config.h                  |    2 +-
 calendar/gui/e-date-time-list.c                    |    2 +-
 calendar/gui/e-date-time-list.h                    |    2 +-
 calendar/gui/e-day-view-config.c                   |    2 +-
 calendar/gui/e-day-view-config.h                   |    2 +-
 calendar/gui/e-day-view-layout.c                   |    2 +-
 calendar/gui/e-day-view-layout.h                   |    2 +-
 calendar/gui/e-day-view-main-item.c                |    2 +-
 calendar/gui/e-day-view-main-item.h                |    2 +-
 calendar/gui/e-day-view-time-item.c                |    4 +-
 calendar/gui/e-day-view-time-item.h                |    2 +-
 calendar/gui/e-day-view-top-item.c                 |    2 +-
 calendar/gui/e-day-view-top-item.h                 |    2 +-
 calendar/gui/e-day-view.c                          |   28 ++--
 calendar/gui/e-day-view.h                          |    2 +-
 calendar/gui/e-itip-control.c                      |    4 +-
 calendar/gui/e-itip-control.h                      |    2 +-
 calendar/gui/e-meeting-attendee.c                  |    4 +-
 calendar/gui/e-meeting-attendee.h                  |    2 +-
 calendar/gui/e-meeting-list-view.c                 |    2 +-
 calendar/gui/e-meeting-list-view.h                 |    2 +-
 calendar/gui/e-meeting-store.c                     |    2 +-
 calendar/gui/e-meeting-store.h                     |    2 +-
 calendar/gui/e-meeting-time-sel-item.c             |    2 +-
 calendar/gui/e-meeting-time-sel-item.h             |    2 +-
 calendar/gui/e-meeting-time-sel.c                  |    2 +-
 calendar/gui/e-meeting-time-sel.h                  |    2 +-
 calendar/gui/e-meeting-types.h                     |    2 +-
 calendar/gui/e-meeting-utils.c                     |    2 +-
 calendar/gui/e-meeting-utils.h                     |    2 +-
 calendar/gui/e-memo-table-config.c                 |    2 +-
 calendar/gui/e-memo-table-config.h                 |    2 +-
 calendar/gui/e-memo-table.c                        |    2 +-
 calendar/gui/e-memo-table.h                        |    2 +-
 calendar/gui/e-memos.c                             |    2 +-
 calendar/gui/e-memos.h                             |    2 +-
 calendar/gui/e-mini-calendar-config.c              |    2 +-
 calendar/gui/e-mini-calendar-config.h              |    2 +-
 calendar/gui/e-select-names-editable.c             |    8 +-
 calendar/gui/e-select-names-editable.h             |    2 +-
 calendar/gui/e-select-names-renderer.c             |    4 +-
 calendar/gui/e-select-names-renderer.h             |    2 +-
 calendar/gui/e-tasks.c                             |    4 +-
 calendar/gui/e-tasks.h                             |    2 +-
 calendar/gui/e-timezone-entry.c                    |    2 +-
 calendar/gui/e-timezone-entry.h                    |    2 +-
 calendar/gui/e-week-view-config.c                  |    2 +-
 calendar/gui/e-week-view-config.h                  |    2 +-
 calendar/gui/e-week-view-event-item.c              |    2 +-
 calendar/gui/e-week-view-event-item.h              |    2 +-
 calendar/gui/e-week-view-layout.c                  |    2 +-
 calendar/gui/e-week-view-layout.h                  |    2 +-
 calendar/gui/e-week-view-main-item.c               |    2 +-
 calendar/gui/e-week-view-main-item.h               |    2 +-
 calendar/gui/e-week-view-titles-item.c             |    2 +-
 calendar/gui/e-week-view-titles-item.h             |    2 +-
 calendar/gui/e-week-view.c                         |   32 ++--
 calendar/gui/e-week-view.h                         |    2 +-
 calendar/gui/gnome-cal.c                           |   38 ++--
 calendar/gui/gnome-cal.h                           |    2 +-
 calendar/gui/goto.c                                |    2 +-
 calendar/gui/goto.h                                |    2 +-
 calendar/gui/itip-bonobo-control.c                 |    2 +-
 calendar/gui/itip-bonobo-control.h                 |    4 +-
 calendar/gui/itip-utils.c                          |    2 +-
 calendar/gui/itip-utils.h                          |    2 +-
 calendar/gui/main.c                                |    2 +-
 calendar/gui/memos-component.c                     |    8 +-
 calendar/gui/memos-component.h                     |    2 +-
 calendar/gui/memos-control.c                       |    2 +-
 calendar/gui/memos-control.h                       |    2 +-
 calendar/gui/migration.c                           |    2 +-
 calendar/gui/migration.h                           |    2 +-
 calendar/gui/misc.c                                |    2 +-
 calendar/gui/misc.h                                |    2 +-
 calendar/gui/print.c                               |    2 +-
 calendar/gui/print.h                               |    2 +-
 calendar/gui/tag-calendar.c                        |    2 +-
 calendar/gui/tag-calendar.h                        |    2 +-
 calendar/gui/tasks-component.c                     |    8 +-
 calendar/gui/tasks-component.h                     |    2 +-
 calendar/gui/tasks-control.c                       |    4 +-
 calendar/gui/tasks-control.h                       |    2 +-
 calendar/gui/weekday-picker.c                      |    2 +-
 calendar/gui/weekday-picker.h                      |    2 +-
 calendar/importers/evolution-calendar-importer.h   |    2 +-
 calendar/importers/icalendar-importer.c            |    2 +-
 calendar/importers/main.c                          |    2 +-
 calendar/zones.h                                   |    2 +-
 composer/e-composer-actions.c                      |    2 +-
 composer/e-composer-actions.h                      |    2 +-
 composer/e-composer-autosave.c                     |    2 +-
 composer/e-composer-autosave.h                     |    2 +-
 composer/e-composer-common.h                       |    2 +-
 composer/e-composer-from-header.c                  |    2 +-
 composer/e-composer-from-header.h                  |    2 +-
 composer/e-composer-header-table.c                 |    4 +-
 composer/e-composer-header-table.h                 |    2 +-
 composer/e-composer-header.c                       |    2 +-
 composer/e-composer-header.h                       |    4 +-
 composer/e-composer-name-header.c                  |    4 +-
 composer/e-composer-name-header.h                  |    2 +-
 composer/e-composer-post-header.c                  |    2 +-
 composer/e-composer-post-header.h                  |    2 +-
 composer/e-composer-private.c                      |    4 +-
 composer/e-composer-private.h                      |    2 +-
 composer/e-composer-text-header.c                  |    4 +-
 composer/e-composer-text-header.h                  |    2 +-
 composer/e-msg-composer.c                          |   12 +-
 composer/e-msg-composer.h                          |    2 +-
 e-util/e-bconf-map.c                               |    2 +-
 e-util/e-bconf-map.h                               |    2 +-
 e-util/e-binding.c                                 |    2 +-
 e-util/e-binding.h                                 |    2 +-
 e-util/e-bit-array.c                               |    2 +-
 e-util/e-bit-array.h                               |    2 +-
 e-util/e-categories-config.c                       |    2 +-
 e-util/e-categories-config.h                       |    2 +-
 e-util/e-config-listener.c                         |    2 +-
 e-util/e-config-listener.h                         |    2 +-
 e-util/e-config.c                                  |    2 +-
 e-util/e-config.h                                  |    2 +-
 e-util/e-corba-utils.c                             |    2 +-
 e-util/e-corba-utils.h                             |    2 +-
 e-util/e-cursor.c                                  |    2 +-
 e-util/e-cursor.h                                  |    2 +-
 e-util/e-dialog-utils.c                            |    2 +-
 e-util/e-dialog-utils.h                            |    2 +-
 e-util/e-dialog-widgets.c                          |    2 +-
 e-util/e-dialog-widgets.h                          |    2 +-
 e-util/e-error.c                                   |    6 +-
 e-util/e-error.h                                   |    2 +-
 e-util/e-event.c                                   |    2 +-
 e-util/e-event.h                                   |    2 +-
 e-util/e-folder-map.c                              |    2 +-
 e-util/e-folder-map.h                              |    2 +-
 e-util/e-fsutils.c                                 |    2 +-
 e-util/e-fsutils.h                                 |    2 +-
 e-util/e-html-utils.c                              |    2 +-
 e-util/e-html-utils.h                              |    2 +-
 e-util/e-icon-factory.c                            |    2 +-
 e-util/e-icon-factory.h                            |    2 +-
 e-util/e-import.c                                  |    2 +-
 e-util/e-import.h                                  |    2 +-
 e-util/e-logger.c                                  |    6 +-
 e-util/e-logger.h                                  |    2 +-
 e-util/e-menu.c                                    |    2 +-
 e-util/e-menu.h                                    |    2 +-
 e-util/e-mktemp.c                                  |    2 +-
 e-util/e-mktemp.h                                  |    2 +-
 e-util/e-non-intrusive-error-dialog.c              |    2 +-
 e-util/e-pilot-map.c                               |    2 +-
 e-util/e-pilot-map.h                               |    2 +-
 e-util/e-pilot-util.c                              |    2 +-
 e-util/e-pilot-util.h                              |    2 +-
 e-util/e-plugin-ui.c                               |    4 +-
 e-util/e-plugin-ui.h                               |    2 +-
 e-util/e-plugin.c                                  |    4 +-
 e-util/e-plugin.h                                  |    6 +-
 e-util/e-popup.c                                   |    2 +-
 e-util/e-popup.h                                   |    2 +-
 e-util/e-print.c                                   |    2 +-
 e-util/e-print.h                                   |    2 +-
 e-util/e-profile-event.c                           |    2 +-
 e-util/e-profile-event.h                           |    2 +-
 e-util/e-request.c                                 |    2 +-
 e-util/e-request.h                                 |    2 +-
 e-util/e-signature-list.c                          |    2 +-
 e-util/e-signature-list.h                          |    2 +-
 e-util/e-signature.c                               |    2 +-
 e-util/e-signature.h                               |    2 +-
 e-util/e-sorter-array.c                            |    2 +-
 e-util/e-sorter-array.h                            |    2 +-
 e-util/e-sorter.c                                  |    2 +-
 e-util/e-sorter.h                                  |    2 +-
 e-util/e-text-event-processor-emacs-like.c         |    2 +-
 e-util/e-text-event-processor-emacs-like.h         |    2 +-
 e-util/e-text-event-processor-types.h              |    2 +-
 e-util/e-text-event-processor.c                    |    2 +-
 e-util/e-text-event-processor.h                    |    2 +-
 e-util/e-util-labels.c                             |    4 +-
 e-util/e-util-labels.h                             |    2 +-
 e-util/e-util-private.h                            |    2 +-
 e-util/e-util.c                                    |    8 +-
 e-util/e-util.h                                    |    2 +-
 e-util/e-win32-reloc.c                             |    2 +-
 e-util/e-xml-utils.c                               |    2 +-
 e-util/e-xml-utils.h                               |    2 +-
 e-util/gconf-bridge.c                              |   38 ++--
 e-util/gconf-bridge.h                              |    6 +-
 filter/filter-code.c                               |    2 +-
 filter/filter-code.h                               |    2 +-
 filter/filter-colour.c                             |    2 +-
 filter/filter-colour.h                             |    2 +-
 filter/filter-datespec.c                           |    2 +-
 filter/filter-datespec.h                           |    2 +-
 filter/filter-element.c                            |    2 +-
 filter/filter-element.h                            |    2 +-
 filter/filter-file.c                               |    2 +-
 filter/filter-file.h                               |    2 +-
 filter/filter-input.c                              |    2 +-
 filter/filter-input.h                              |    2 +-
 filter/filter-int.c                                |    2 +-
 filter/filter-int.h                                |    2 +-
 filter/filter-option.c                             |    2 +-
 filter/filter-option.h                             |    2 +-
 filter/filter-part.c                               |    2 +-
 filter/filter-part.h                               |    2 +-
 filter/filter-rule.c                               |    6 +-
 filter/filter-rule.h                               |    2 +-
 filter/rule-context.c                              |    2 +-
 filter/rule-context.h                              |    2 +-
 filter/rule-editor.c                               |    2 +-
 filter/rule-editor.h                               |    2 +-
 iconv-detect.c                                     |    2 +-
 mail/e-attachment-handler-mail.c                   |    2 +-
 mail/e-attachment-handler-mail.h                   |    2 +-
 mail/e-mail-attachment-bar.c                       |    2 +-
 mail/e-mail-attachment-bar.h                       |    2 +-
 mail/e-mail-search-bar.c                           |    2 +-
 mail/e-mail-search-bar.h                           |    2 +-
 mail/e-searching-tokenizer.c                       |    2 +-
 mail/e-searching-tokenizer.h                       |    2 +-
 mail/em-account-editor.c                           |   24 +-
 mail/em-account-editor.h                           |    2 +-
 mail/em-account-prefs.c                            |    2 +-
 mail/em-account-prefs.h                            |    2 +-
 mail/em-composer-prefs.c                           |    4 +-
 mail/em-composer-prefs.h                           |    2 +-
 mail/em-composer-utils.c                           |   26 +-
 mail/em-composer-utils.h                           |    4 +-
 mail/em-config.c                                   |    2 +-
 mail/em-config.h                                   |    2 +-
 mail/em-event.c                                    |    2 +-
 mail/em-event.h                                    |    2 +-
 mail/em-filter-context.c                           |    2 +-
 mail/em-filter-context.h                           |    2 +-
 mail/em-filter-editor.c                            |    4 +-
 mail/em-filter-editor.h                            |    2 +-
 mail/em-filter-folder-element.c                    |    2 +-
 mail/em-filter-folder-element.h                    |    2 +-
 mail/em-filter-rule.c                              |    4 +-
 mail/em-filter-rule.h                              |    2 +-
 mail/em-filter-source-element.c                    |    2 +-
 mail/em-filter-source-element.h                    |    2 +-
 mail/em-folder-browser.c                           |    6 +-
 mail/em-folder-browser.h                           |    2 +-
 mail/em-folder-properties.c                        |    6 +-
 mail/em-folder-properties.h                        |    2 +-
 mail/em-folder-selection-button.c                  |    2 +-
 mail/em-folder-selection-button.h                  |    2 +-
 mail/em-folder-selection.c                         |    2 +-
 mail/em-folder-selection.h                         |    2 +-
 mail/em-folder-selector.c                          |    2 +-
 mail/em-folder-selector.h                          |    2 +-
 mail/em-folder-tree-model.c                        |    2 +-
 mail/em-folder-tree-model.h                        |    2 +-
 mail/em-folder-tree.c                              |    4 +-
 mail/em-folder-tree.h                              |    2 +-
 mail/em-folder-utils.c                             |    6 +-
 mail/em-folder-utils.h                             |    2 +-
 mail/em-folder-view.c                              |   18 +-
 mail/em-folder-view.h                              |    2 +-
 mail/em-format-hook.c                              |    2 +-
 mail/em-format-hook.h                              |    2 +-
 mail/em-format-html-display.c                      |    6 +-
 mail/em-format-html-display.h                      |    2 +-
 mail/em-format-html-print.c                        |    2 +-
 mail/em-format-html-print.h                        |    2 +-
 mail/em-format-html.c                              |   70 +++---
 mail/em-format-html.h                              |    2 +-
 mail/em-format-quote.c                             |   28 ++--
 mail/em-format-quote.h                             |    2 +-
 mail/em-format.c                                   |    2 +-
 mail/em-format.h                                   |    2 +-
 mail/em-html-stream.c                              |    2 +-
 mail/em-html-stream.h                              |    2 +-
 mail/em-icon-stream.c                              |    2 +-
 mail/em-icon-stream.h                              |    2 +-
 mail/em-inline-filter.c                            |    2 +-
 mail/em-inline-filter.h                            |    2 +-
 mail/em-junk-hook.c                                |    2 +-
 mail/em-junk-hook.h                                |    2 +-
 mail/em-mailer-prefs.c                             |   10 +-
 mail/em-mailer-prefs.h                             |    4 +-
 mail/em-menu.c                                     |    2 +-
 mail/em-menu.h                                     |    2 +-
 mail/em-message-browser.c                          |    2 +-
 mail/em-message-browser.h                          |    2 +-
 mail/em-migrate.c                                  |   24 +-
 mail/em-migrate.h                                  |    2 +-
 mail/em-network-prefs.c                            |   62 +++---
 mail/em-network-prefs.h                            |   12 +-
 mail/em-popup.c                                    |    4 +-
 mail/em-popup.h                                    |    2 +-
 mail/em-search-context.c                           |    2 +-
 mail/em-search-context.h                           |    2 +-
 mail/em-stripsig-filter.c                          |    2 +-
 mail/em-stripsig-filter.h                          |    2 +-
 mail/em-subscribe-editor.c                         |   10 +-
 mail/em-subscribe-editor.h                         |    2 +-
 mail/em-sync-stream.c                              |    2 +-
 mail/em-sync-stream.h                              |    2 +-
 mail/em-utils.c                                    |   20 +-
 mail/em-utils.h                                    |    2 +-
 mail/em-vfolder-context.c                          |    2 +-
 mail/em-vfolder-context.h                          |    2 +-
 mail/em-vfolder-editor.c                           |    2 +-
 mail/em-vfolder-editor.h                           |    2 +-
 mail/em-vfolder-rule.c                             |    2 +-
 mail/em-vfolder-rule.h                             |    2 +-
 mail/importers/elm-importer.c                      |    2 +-
 mail/importers/evolution-mbox-importer.c           |    2 +-
 mail/importers/mail-importer.c                     |    2 +-
 mail/importers/mail-importer.h                     |    2 +-
 mail/importers/pine-importer.c                     |    2 +-
 mail/mail-autofilter.c                             |    2 +-
 mail/mail-autofilter.h                             |    2 +-
 mail/mail-component-factory.c                      |    2 +-
 mail/mail-component.c                              |    4 +-
 mail/mail-component.h                              |    2 +-
 mail/mail-config-factory.c                         |    2 +-
 mail/mail-config-factory.h                         |    2 +-
 mail/mail-config.c                                 |   12 +-
 mail/mail-config.h                                 |    2 +-
 mail/mail-crypto.c                                 |    2 +-
 mail/mail-crypto.h                                 |    2 +-
 mail/mail-folder-cache.c                           |    6 +-
 mail/mail-folder-cache.h                           |    2 +-
 mail/mail-mt.c                                     |    2 +-
 mail/mail-mt.h                                     |    2 +-
 mail/mail-ops.c                                    |   12 +-
 mail/mail-ops.h                                    |    2 +-
 mail/mail-send-recv.c                              |    8 +-
 mail/mail-send-recv.h                              |    2 +-
 mail/mail-session.c                                |    2 +-
 mail/mail-session.h                                |    2 +-
 mail/mail-signature-editor.c                       |    2 +-
 mail/mail-signature-editor.h                       |    2 +-
 mail/mail-tools.c                                  |    2 +-
 mail/mail-tools.h                                  |    2 +-
 mail/mail-types.h                                  |    2 +-
 mail/mail-vfolder.c                                |    2 +-
 mail/mail-vfolder.h                                |    2 +-
 mail/message-list.c                                |   12 +-
 mail/message-list.h                                |    2 +-
 mail/message-tag-editor.c                          |    2 +-
 mail/message-tag-editor.h                          |    2 +-
 mail/message-tag-followup.c                        |    2 +-
 mail/message-tag-followup.h                        |    2 +-
 plugins/addressbook-file/addressbook-file.c        |    2 +-
 plugins/attachment-reminder/attachment-reminder.c  |    2 +-
 plugins/audio-inline/audio-inline.c                |    2 +-
 plugins/backup-restore/backup-restore.c            |    6 +-
 plugins/backup-restore/backup.c                    |   14 +-
 plugins/bbdb/bbdb.c                                |    4 +-
 plugins/bbdb/bbdb.h                                |    2 +-
 plugins/bbdb/gaimbuddies.c                         |    6 +-
 plugins/bbdb/test-evobuddy.c                       |    2 +-
 plugins/bogo-junk-plugin/bf-junk-filter.c          |   10 +-
 plugins/caldav/caldav-source.c                     |    2 +-
 plugins/calendar-file/calendar-file.c              |    2 +-
 plugins/copy-tool/copy-tool.c                      |    2 +-
 plugins/default-mailer/default-mailer.c            |    2 +-
 plugins/default-source/default-source.c            |    2 +-
 plugins/email-custom-header/email-custom-header.c  |   88 ++++----
 plugins/email-custom-header/email-custom-header.h  |    4 +-
 .../exchange-operations/exchange-account-setup.c   |   22 +-
 plugins/exchange-operations/exchange-calendar.c    |    2 +-
 .../exchange-operations/exchange-change-password.c |    2 +-
 .../exchange-operations/exchange-change-password.h |    2 +-
 .../exchange-operations/exchange-config-listener.c |    2 +-
 .../exchange-operations/exchange-config-listener.h |    2 +-
 plugins/exchange-operations/exchange-contacts.c    |    4 +-
 .../exchange-operations/exchange-delegates-user.c  |    2 +-
 .../exchange-operations/exchange-delegates-user.h  |    2 +-
 plugins/exchange-operations/exchange-delegates.c   |    2 +-
 plugins/exchange-operations/exchange-delegates.h   |    2 +-
 .../exchange-folder-permission.c                   |    2 +-
 .../exchange-folder-size-display.c                 |    2 +-
 .../exchange-folder-size-display.h                 |    2 +-
 .../exchange-folder-subscription.c                 |    2 +-
 .../exchange-folder-subscription.h                 |    2 +-
 plugins/exchange-operations/exchange-folder.c      |    2 +-
 .../exchange-mail-send-options.c                   |    2 +-
 plugins/exchange-operations/exchange-operations.c  |    2 +-
 plugins/exchange-operations/exchange-operations.h  |    2 +-
 .../exchange-permissions-dialog.c                  |    2 +-
 .../exchange-permissions-dialog.h                  |    2 +-
 .../exchange-operations/exchange-send-options.c    |    2 +-
 .../exchange-operations/exchange-send-options.h    |    2 +-
 plugins/exchange-operations/exchange-user-dialog.c |    2 +-
 plugins/exchange-operations/exchange-user-dialog.h |    2 +-
 plugins/face/face.c                                |    2 +-
 plugins/folder-unsubscribe/folder-unsubscribe.c    |    2 +-
 .../google-account-setup/google-contacts-source.c  |    2 +-
 .../google-account-setup/google-contacts-source.h  |    2 +-
 plugins/google-account-setup/google-source.c       |    4 +-
 .../groupwise-account-setup/camel-gw-listener.c    |   14 +-
 .../groupwise-account-setup/camel-gw-listener.h    |    2 +-
 .../groupwise-account-setup.c                      |    6 +-
 plugins/groupwise-features/addressbook-groupwise.c |    2 +-
 plugins/groupwise-features/install-shared.c        |    2 +-
 plugins/groupwise-features/junk-mail-settings.c    |    2 +-
 plugins/groupwise-features/junk-settings.c         |    2 +-
 plugins/groupwise-features/junk-settings.h         |    2 +-
 plugins/groupwise-features/mail-retract.c          |    8 +-
 plugins/groupwise-features/mail-send-options.c     |    2 +-
 plugins/groupwise-features/mail-send-options.h     |    2 +-
 plugins/groupwise-features/process-meeting.c       |   30 ++--
 plugins/groupwise-features/proxy-login.c           |    2 +-
 plugins/groupwise-features/proxy-login.h           |    2 +-
 plugins/groupwise-features/proxy.c                 |    2 +-
 plugins/groupwise-features/proxy.h                 |    2 +-
 plugins/groupwise-features/send-options.c          |    2 +-
 plugins/groupwise-features/share-folder-common.c   |    2 +-
 plugins/groupwise-features/share-folder.c          |    2 +-
 plugins/groupwise-features/share-folder.h          |    2 +-
 plugins/groupwise-features/status-track.c          |    2 +-
 plugins/hula-account-setup/camel-hula-listener.c   |    2 +-
 plugins/hula-account-setup/camel-hula-listener.h   |    2 +-
 plugins/hula-account-setup/hula-account-setup.c    |    2 +-
 plugins/imap-features/imap-headers.c               |    4 +-
 plugins/ipod-sync/evolution-ipod-sync.c            |    2 +-
 plugins/ipod-sync/evolution-ipod-sync.h            |    2 +-
 plugins/ipod-sync/format-handler.h                 |    2 +-
 plugins/ipod-sync/ical-format.c                    |    4 +-
 plugins/ipod-sync/ipod-sync.c                      |    4 +-
 plugins/ipod-sync/ipod.c                           |    2 +-
 plugins/ipod-sync/sync.c                           |    4 +-
 plugins/itip-formatter/itip-formatter.c            |   16 +-
 plugins/itip-formatter/itip-view.c                 |   24 +-
 plugins/itip-formatter/itip-view.h                 |    2 +-
 .../mail-account-disable/mail-account-disable.c    |    2 +-
 plugins/mail-notification/mail-notification.c      |   24 +-
 plugins/mail-to-task/mail-to-task.c                |    6 +-
 .../mailing-list-actions/mailing-list-actions.c    |    2 +-
 plugins/mark-all-read/mark-all-read.c              |    2 +-
 plugins/mono/mono-plugin.c                         |    8 +-
 plugins/mono/mono-plugin.h                         |    2 +-
 plugins/plugin-manager/plugin-manager.c            |    6 +-
 plugins/prefer-plain/prefer-plain.c                |    2 +-
 plugins/profiler/profiler.c                        |    2 +-
 plugins/pst-import/pst-importer.c                  |  240 ++++++++++----------
 plugins/publish-calendar/publish-calendar.c        |   14 +-
 plugins/publish-calendar/publish-format-fb.c       |    2 +-
 plugins/publish-calendar/publish-format-fb.h       |    2 +-
 plugins/publish-calendar/publish-format-ical.c     |    2 +-
 plugins/publish-calendar/publish-format-ical.h     |    2 +-
 plugins/publish-calendar/publish-location.c        |    2 +-
 plugins/publish-calendar/publish-location.h        |    2 +-
 plugins/publish-calendar/url-editor-dialog.c       |    2 +-
 plugins/publish-calendar/url-editor-dialog.h       |    2 +-
 plugins/python/python-plugin-loader.c              |   12 +-
 plugins/python/python-plugin-loader.h              |    2 +-
 plugins/sa-junk-plugin/em-junk-filter.c            |   12 +-
 plugins/save-calendar/csv-format.c                 |    2 +-
 plugins/save-calendar/format-handler.h             |    2 +-
 plugins/save-calendar/ical-format.c                |    2 +-
 plugins/save-calendar/rdf-format.c                 |    2 +-
 plugins/save-calendar/save-calendar.c              |    2 +-
 plugins/select-one-source/select-one-source.c      |    2 +-
 plugins/startup-wizard/startup-wizard.c            |    2 +-
 plugins/subject-thread/subject-thread.c            |    2 +-
 plugins/templates/templates.c                      |   62 +++---
 plugins/tnef-attachments/tnef-plugin.c             |    4 +-
 plugins/vcard-inline/vcard-inline.c                |    2 +-
 .../webdav-account-setup/webdav-contacts-source.c  |    2 +-
 shell/e-component-registry.c                       |    2 +-
 shell/e-component-registry.h                       |    2 +-
 shell/e-component-view.c                           |    2 +-
 shell/e-component-view.h                           |    2 +-
 shell/e-config-upgrade.c                           |    2 +-
 shell/e-config-upgrade.h                           |    2 +-
 shell/e-corba-config-page.c                        |    2 +-
 shell/e-corba-config-page.h                        |    2 +-
 shell/e-shell-constants.h                          |    2 +-
 shell/e-shell-importer.c                           |    2 +-
 shell/e-shell-importer.h                           |    2 +-
 shell/e-shell-nm.c                                 |    2 +-
 shell/e-shell-settings-dialog.c                    |    2 +-
 shell/e-shell-settings-dialog.h                    |    2 +-
 shell/e-shell-view.c                               |    2 +-
 shell/e-shell-view.h                               |    2 +-
 shell/e-shell-window-commands.c                    |    2 +-
 shell/e-shell-window-commands.h                    |    2 +-
 shell/e-shell-window.c                             |    8 +-
 shell/e-shell-window.h                             |    2 +-
 shell/e-shell.c                                    |    2 +-
 shell/e-shell.h                                    |    4 +-
 shell/e-sidebar.c                                  |    2 +-
 shell/e-sidebar.h                                  |    2 +-
 shell/e-user-creatable-items-handler.c             |    2 +-
 shell/e-user-creatable-items-handler.h             |    2 +-
 shell/es-event.c                                   |    2 +-
 shell/es-event.h                                   |    2 +-
 shell/es-menu.c                                    |    2 +-
 shell/es-menu.h                                    |    2 +-
 shell/evolution-component.c                        |    2 +-
 shell/evolution-component.h                        |    2 +-
 shell/evolution-config-control.c                   |    2 +-
 shell/evolution-config-control.h                   |    2 +-
 shell/evolution-listener.c                         |    2 +-
 shell/evolution-listener.h                         |    2 +-
 shell/evolution-shell-component-utils.c            |    2 +-
 shell/evolution-shell-component-utils.h            |    2 +-
 shell/importer/evolution-importer-client.c         |    2 +-
 shell/importer/evolution-importer-client.h         |    2 +-
 shell/importer/evolution-importer-listener.c       |    2 +-
 shell/importer/evolution-importer-listener.h       |    2 +-
 shell/importer/evolution-importer.c                |    2 +-
 shell/importer/evolution-importer.h                |    2 +-
 shell/importer/evolution-intelligent-importer.c    |    2 +-
 shell/importer/evolution-intelligent-importer.h    |    2 +-
 shell/importer/intelligent.c                       |    2 +-
 shell/importer/intelligent.h                       |    2 +-
 shell/main.c                                       |    6 +-
 shell/test/evolution-test-component.c              |    2 +-
 shell/test/evolution-test-component.h              |    2 +-
 smime/gui/ca-trust-dialog.c                        |    2 +-
 smime/gui/ca-trust-dialog.h                        |    2 +-
 smime/gui/cert-trust-dialog.c                      |    2 +-
 smime/gui/cert-trust-dialog.h                      |    2 +-
 smime/gui/certificate-manager.c                    |    2 +-
 smime/gui/certificate-manager.h                    |    2 +-
 smime/gui/certificate-viewer.c                     |    2 +-
 smime/gui/certificate-viewer.h                     |    2 +-
 smime/gui/component.c                              |    2 +-
 smime/gui/component.h                              |    2 +-
 smime/gui/e-cert-selector.c                        |    2 +-
 smime/gui/e-cert-selector.h                        |    2 +-
 smime/lib/e-asn1-object.h                          |    2 +-
 smime/lib/e-cert-db.h                              |    2 +-
 smime/lib/e-cert-trust.h                           |    2 +-
 smime/lib/e-cert.h                                 |    2 +-
 smime/lib/e-pkcs12.h                               |    2 +-
 smime/tests/import-cert.c                          |    2 +-
 tools/killev.c                                     |    2 +-
 widgets/e-timezone-dialog/e-timezone-dialog.c      |   16 +-
 widgets/e-timezone-dialog/e-timezone-dialog.h      |    2 +-
 widgets/menus/gal-define-views-dialog.c            |    2 +-
 widgets/menus/gal-define-views-dialog.h            |    2 +-
 widgets/menus/gal-define-views-model.c             |    2 +-
 widgets/menus/gal-define-views-model.h             |    2 +-
 widgets/menus/gal-view-collection.c                |    2 +-
 widgets/menus/gal-view-collection.h                |    2 +-
 widgets/menus/gal-view-etable.c                    |    2 +-
 widgets/menus/gal-view-etable.h                    |    2 +-
 widgets/menus/gal-view-factory-etable.c            |    2 +-
 widgets/menus/gal-view-factory-etable.h            |    2 +-
 widgets/menus/gal-view-factory.c                   |    2 +-
 widgets/menus/gal-view-factory.h                   |    2 +-
 widgets/menus/gal-view-instance-save-as-dialog.c   |    2 +-
 widgets/menus/gal-view-instance-save-as-dialog.h   |    2 +-
 widgets/menus/gal-view-instance.c                  |    2 +-
 widgets/menus/gal-view-instance.h                  |    2 +-
 widgets/menus/gal-view-menus.c                     |    2 +-
 widgets/menus/gal-view-menus.h                     |    2 +-
 widgets/menus/gal-view-new-dialog.c                |    2 +-
 widgets/menus/gal-view-new-dialog.h                |    2 +-
 widgets/menus/gal-view.c                           |    2 +-
 widgets/menus/gal-view.h                           |    2 +-
 widgets/misc/e-account-combo-box.c                 |    2 +-
 widgets/misc/e-account-combo-box.h                 |    2 +-
 widgets/misc/e-activity-handler.c                  |   30 ++--
 widgets/misc/e-activity-handler.h                  |    2 +-
 widgets/misc/e-attachment-button.c                 |    2 +-
 widgets/misc/e-attachment-button.h                 |    2 +-
 widgets/misc/e-attachment-dialog.c                 |    2 +-
 widgets/misc/e-attachment-dialog.h                 |    2 +-
 widgets/misc/e-attachment-handler-image.c          |    2 +-
 widgets/misc/e-attachment-handler-image.h          |    2 +-
 widgets/misc/e-attachment-handler.c                |    2 +-
 widgets/misc/e-attachment-handler.h                |    2 +-
 widgets/misc/e-attachment-icon-view.c              |    2 +-
 widgets/misc/e-attachment-icon-view.h              |    2 +-
 widgets/misc/e-attachment-paned.c                  |    2 +-
 widgets/misc/e-attachment-paned.h                  |    2 +-
 widgets/misc/e-attachment-store.c                  |    2 +-
 widgets/misc/e-attachment-store.h                  |    2 +-
 widgets/misc/e-attachment-tree-view.c              |    2 +-
 widgets/misc/e-attachment-tree-view.h              |    2 +-
 widgets/misc/e-attachment-view.c                   |    2 +-
 widgets/misc/e-attachment-view.h                   |    2 +-
 widgets/misc/e-attachment.c                        |    2 +-
 widgets/misc/e-attachment.h                        |    2 +-
 widgets/misc/e-calendar-item.c                     |    8 +-
 widgets/misc/e-calendar-item.h                     |    2 +-
 widgets/misc/e-calendar.c                          |    2 +-
 widgets/misc/e-calendar.h                          |    2 +-
 widgets/misc/e-canvas-background.c                 |    2 +-
 widgets/misc/e-canvas-background.h                 |    2 +-
 widgets/misc/e-canvas-utils.c                      |    2 +-
 widgets/misc/e-canvas-utils.h                      |    2 +-
 widgets/misc/e-canvas-vbox.c                       |    2 +-
 widgets/misc/e-canvas-vbox.h                       |    2 +-
 widgets/misc/e-canvas.c                            |    2 +-
 widgets/misc/e-canvas.h                            |    2 +-
 widgets/misc/e-cell-date-edit.c                    |    2 +-
 widgets/misc/e-cell-date-edit.h                    |    2 +-
 widgets/misc/e-cell-percent.c                      |    2 +-
 widgets/misc/e-cell-percent.h                      |    2 +-
 widgets/misc/e-cell-renderer-combo.c               |    2 +-
 widgets/misc/e-cell-renderer-combo.h               |    2 +-
 widgets/misc/e-charset-picker.c                    |    4 +-
 widgets/misc/e-charset-picker.h                    |    2 +-
 widgets/misc/e-colors.c                            |    2 +-
 widgets/misc/e-colors.h                            |    2 +-
 widgets/misc/e-combo-button.c                      |    2 +-
 widgets/misc/e-combo-button.h                      |    2 +-
 widgets/misc/e-combo-cell-editable.c               |    2 +-
 widgets/misc/e-combo-cell-editable.h               |    2 +-
 widgets/misc/e-config-page.c                       |    2 +-
 widgets/misc/e-config-page.h                       |    2 +-
 widgets/misc/e-cursors.c                           |    2 +-
 widgets/misc/e-cursors.h                           |    2 +-
 widgets/misc/e-dateedit.c                          |    6 +-
 widgets/misc/e-dropdown-button.c                   |    2 +-
 widgets/misc/e-dropdown-button.h                   |    2 +-
 widgets/misc/e-filter-bar.c                        |    2 +-
 widgets/misc/e-filter-bar.h                        |    2 +-
 widgets/misc/e-gui-utils.c                         |    2 +-
 widgets/misc/e-gui-utils.h                         |    2 +-
 widgets/misc/e-image-chooser.c                     |    2 +-
 widgets/misc/e-image-chooser.h                     |    2 +-
 widgets/misc/e-info-label.c                        |    2 +-
 widgets/misc/e-info-label.h                        |    2 +-
 widgets/misc/e-map.c                               |    2 +-
 widgets/misc/e-map.h                               |    2 +-
 widgets/misc/e-multi-config-dialog.c               |    2 +-
 widgets/misc/e-multi-config-dialog.h               |    2 +-
 widgets/misc/e-online-button.c                     |    2 +-
 widgets/misc/e-online-button.h                     |    2 +-
 widgets/misc/e-pilot-settings.c                    |    2 +-
 widgets/misc/e-pilot-settings.h                    |    2 +-
 widgets/misc/e-popup-menu.c                        |    2 +-
 widgets/misc/e-popup-menu.h                        |    2 +-
 widgets/misc/e-printable.c                         |    2 +-
 widgets/misc/e-printable.h                         |    2 +-
 widgets/misc/e-reflow-model.c                      |    2 +-
 widgets/misc/e-reflow-model.h                      |    2 +-
 widgets/misc/e-reflow.c                            |    2 +-
 widgets/misc/e-reflow.h                            |    2 +-
 widgets/misc/e-search-bar.c                        |    4 +-
 widgets/misc/e-search-bar.h                        |    2 +-
 widgets/misc/e-selection-model-array.c             |    2 +-
 widgets/misc/e-selection-model-array.h             |    2 +-
 widgets/misc/e-selection-model-simple.c            |    2 +-
 widgets/misc/e-selection-model-simple.h            |    2 +-
 widgets/misc/e-selection-model.c                   |    2 +-
 widgets/misc/e-selection-model.h                   |    2 +-
 widgets/misc/e-send-options.c                      |    2 +-
 widgets/misc/e-send-options.h                      |    4 +-
 widgets/misc/e-signature-combo-box.c               |    2 +-
 widgets/misc/e-signature-combo-box.h               |    2 +-
 widgets/misc/e-task-bar.c                          |    8 +-
 widgets/misc/e-task-bar.h                          |    4 +-
 widgets/misc/e-task-widget.c                       |    4 +-
 widgets/misc/e-task-widget.h                       |    2 +-
 widgets/misc/e-unicode.c                           |    2 +-
 widgets/misc/e-unicode.h                           |    2 +-
 widgets/misc/e-url-entry.c                         |    2 +-
 widgets/misc/e-url-entry.h                         |    2 +-
 widgets/misc/test-calendar.c                       |    2 +-
 widgets/misc/test-dateedit.c                       |    2 +-
 widgets/misc/test-dropdown-button.c                |    2 +-
 widgets/misc/test-error.c                          |    2 +-
 widgets/misc/test-info-label.c                     |    2 +-
 widgets/misc/test-multi-config-dialog.c            |    2 +-
 widgets/table/e-cell-checkbox.c                    |    2 +-
 widgets/table/e-cell-checkbox.h                    |    2 +-
 widgets/table/e-cell-combo.c                       |    2 +-
 widgets/table/e-cell-combo.h                       |    2 +-
 widgets/table/e-cell-date.c                        |    4 +-
 widgets/table/e-cell-date.h                        |    2 +-
 widgets/table/e-cell-hbox.c                        |    2 +-
 widgets/table/e-cell-hbox.h                        |    2 +-
 widgets/table/e-cell-number.c                      |    2 +-
 widgets/table/e-cell-number.h                      |    2 +-
 widgets/table/e-cell-pixbuf.c                      |    6 +-
 widgets/table/e-cell-pixbuf.h                      |    2 +-
 widgets/table/e-cell-popup.c                       |    2 +-
 widgets/table/e-cell-popup.h                       |    2 +-
 widgets/table/e-cell-size.c                        |    2 +-
 widgets/table/e-cell-size.h                        |    2 +-
 widgets/table/e-cell-text.c                        |    2 +-
 widgets/table/e-cell-text.h                        |    2 +-
 widgets/table/e-cell-toggle.c                      |   10 +-
 widgets/table/e-cell-toggle.h                      |    2 +-
 widgets/table/e-cell-vbox.c                        |    2 +-
 widgets/table/e-cell-vbox.h                        |    2 +-
 widgets/table/e-cell.c                             |    2 +-
 widgets/table/e-cell.h                             |    2 +-
 widgets/table/e-table-click-to-add.c               |    2 +-
 widgets/table/e-table-click-to-add.h               |    2 +-
 widgets/table/e-table-col-dnd.h                    |    2 +-
 widgets/table/e-table-col.c                        |    2 +-
 widgets/table/e-table-col.h                        |    2 +-
 widgets/table/e-table-column-specification.c       |    2 +-
 widgets/table/e-table-column-specification.h       |    2 +-
 widgets/table/e-table-column.c                     |    2 +-
 widgets/table/e-table-config-field.c               |    2 +-
 widgets/table/e-table-config-field.h               |    2 +-
 widgets/table/e-table-config.c                     |    2 +-
 widgets/table/e-table-config.h                     |    2 +-
 widgets/table/e-table-defines.h                    |    2 +-
 widgets/table/e-table-example-1.c                  |    2 +-
 widgets/table/e-table-example-2.c                  |    2 +-
 widgets/table/e-table-extras.c                     |    2 +-
 widgets/table/e-table-extras.h                     |    2 +-
 widgets/table/e-table-field-chooser-dialog.c       |    2 +-
 widgets/table/e-table-field-chooser-dialog.h       |    2 +-
 widgets/table/e-table-field-chooser-item.c         |    2 +-
 widgets/table/e-table-field-chooser-item.h         |    2 +-
 widgets/table/e-table-field-chooser.c              |    2 +-
 widgets/table/e-table-field-chooser.h              |    2 +-
 widgets/table/e-table-group-container.c            |    2 +-
 widgets/table/e-table-group-container.h            |    2 +-
 widgets/table/e-table-group-leaf.c                 |    2 +-
 widgets/table/e-table-group-leaf.h                 |    2 +-
 widgets/table/e-table-group.c                      |    2 +-
 widgets/table/e-table-group.h                      |    2 +-
 widgets/table/e-table-header-item.c                |    2 +-
 widgets/table/e-table-header-item.h                |    2 +-
 widgets/table/e-table-header-utils.c               |    2 +-
 widgets/table/e-table-header-utils.h               |    2 +-
 widgets/table/e-table-header.c                     |    2 +-
 widgets/table/e-table-header.h                     |    2 +-
 widgets/table/e-table-item.c                       |   26 +-
 widgets/table/e-table-item.h                       |    2 +-
 widgets/table/e-table-memory-callbacks.c           |    2 +-
 widgets/table/e-table-memory-callbacks.h           |    2 +-
 widgets/table/e-table-memory-store.c               |    2 +-
 widgets/table/e-table-memory-store.h               |    2 +-
 widgets/table/e-table-memory.c                     |    2 +-
 widgets/table/e-table-memory.h                     |    2 +-
 widgets/table/e-table-model.c                      |    2 +-
 widgets/table/e-table-model.h                      |    2 +-
 widgets/table/e-table-one.c                        |    2 +-
 widgets/table/e-table-one.h                        |    2 +-
 widgets/table/e-table-scrolled.c                   |    2 +-
 widgets/table/e-table-scrolled.h                   |    2 +-
 widgets/table/e-table-search.c                     |    2 +-
 widgets/table/e-table-search.h                     |    2 +-
 widgets/table/e-table-selection-model.c            |    2 +-
 widgets/table/e-table-selection-model.h            |    2 +-
 widgets/table/e-table-simple.c                     |    2 +-
 widgets/table/e-table-simple.h                     |    2 +-
 widgets/table/e-table-sort-info.c                  |    2 +-
 widgets/table/e-table-sort-info.h                  |    2 +-
 widgets/table/e-table-sorted-variable.c            |    2 +-
 widgets/table/e-table-sorted-variable.h            |    2 +-
 widgets/table/e-table-sorted.c                     |    2 +-
 widgets/table/e-table-sorted.h                     |    2 +-
 widgets/table/e-table-sorter.c                     |    2 +-
 widgets/table/e-table-sorter.h                     |    2 +-
 widgets/table/e-table-sorting-utils.c              |    2 +-
 widgets/table/e-table-sorting-utils.h              |    2 +-
 widgets/table/e-table-specification.c              |    2 +-
 widgets/table/e-table-specification.h              |    2 +-
 widgets/table/e-table-state.c                      |    2 +-
 widgets/table/e-table-state.h                      |    2 +-
 widgets/table/e-table-subset-variable.c            |    2 +-
 widgets/table/e-table-subset-variable.h            |    2 +-
 widgets/table/e-table-subset.c                     |    2 +-
 widgets/table/e-table-subset.h                     |    2 +-
 widgets/table/e-table-tooltip.h                    |    2 +-
 widgets/table/e-table-tree.h                       |    2 +-
 widgets/table/e-table-utils.c                      |    2 +-
 widgets/table/e-table-utils.h                      |    2 +-
 widgets/table/e-table-without.c                    |    2 +-
 widgets/table/e-table-without.h                    |    2 +-
 widgets/table/e-table.c                            |    2 +-
 widgets/table/e-table.h                            |    2 +-
 widgets/table/e-tree-memory-callbacks.c            |    2 +-
 widgets/table/e-tree-memory-callbacks.h            |    2 +-
 widgets/table/e-tree-memory.c                      |    2 +-
 widgets/table/e-tree-memory.h                      |    2 +-
 widgets/table/e-tree-model.c                       |    2 +-
 widgets/table/e-tree-model.h                       |    2 +-
 widgets/table/e-tree-scrolled.c                    |    2 +-
 widgets/table/e-tree-scrolled.h                    |    2 +-
 widgets/table/e-tree-selection-model.c             |    2 +-
 widgets/table/e-tree-selection-model.h             |    2 +-
 widgets/table/e-tree-simple.c                      |    2 +-
 widgets/table/e-tree-simple.h                      |    2 +-
 widgets/table/e-tree-sorted-variable.c             |    2 +-
 widgets/table/e-tree-sorted-variable.h             |    2 +-
 widgets/table/e-tree-sorted.c                      |    2 +-
 widgets/table/e-tree-sorted.h                      |    2 +-
 widgets/table/e-tree-table-adapter.c               |    2 +-
 widgets/table/e-tree-table-adapter.h               |    2 +-
 widgets/table/e-tree.c                             |    4 +-
 widgets/table/e-tree.h                             |    2 +-
 widgets/table/table-test.h                         |    2 +-
 widgets/text/e-text-model-repos.c                  |    2 +-
 widgets/text/e-text-model-repos.h                  |    2 +-
 widgets/text/e-text-model.c                        |    2 +-
 widgets/text/e-text-model.h                        |    2 +-
 widgets/text/e-text.c                              |    8 +-
 widgets/text/e-text.h                              |    2 +-
 1096 files changed, 1795 insertions(+), 1795 deletions(-)

diff --git a/a11y/addressbook/ea-addressbook-view.c b/a11y/addressbook/ea-addressbook-view.c
index 962e73e..6c2da22 100644
--- a/a11y/addressbook/ea-addressbook-view.c
+++ b/a11y/addressbook/ea-addressbook-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-addressbook-view.h b/a11y/addressbook/ea-addressbook-view.h
index 86782ad..f223f24 100644
--- a/a11y/addressbook/ea-addressbook-view.h
+++ b/a11y/addressbook/ea-addressbook-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-addressbook.c b/a11y/addressbook/ea-addressbook.c
index b41a984..8ccff66 100644
--- a/a11y/addressbook/ea-addressbook.c
+++ b/a11y/addressbook/ea-addressbook.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-addressbook.h b/a11y/addressbook/ea-addressbook.h
index 337f467..97b691d 100644
--- a/a11y/addressbook/ea-addressbook.h
+++ b/a11y/addressbook/ea-addressbook.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-minicard-view.c b/a11y/addressbook/ea-minicard-view.c
index 944060b..dab53e6 100644
--- a/a11y/addressbook/ea-minicard-view.c
+++ b/a11y/addressbook/ea-minicard-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-minicard-view.h b/a11y/addressbook/ea-minicard-view.h
index 922941c..f20ef44 100644
--- a/a11y/addressbook/ea-minicard-view.h
+++ b/a11y/addressbook/ea-minicard-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-minicard.c b/a11y/addressbook/ea-minicard.c
index 258fcbd..d77d591 100644
--- a/a11y/addressbook/ea-minicard.c
+++ b/a11y/addressbook/ea-minicard.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/addressbook/ea-minicard.h b/a11y/addressbook/ea-minicard.h
index 9c0c8a2..15f89e1 100644
--- a/a11y/addressbook/ea-minicard.h
+++ b/a11y/addressbook/ea-minicard.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-cal-view-event.c b/a11y/calendar/ea-cal-view-event.c
index 7b7e8ea..e0c0f8f 100644
--- a/a11y/calendar/ea-cal-view-event.c
+++ b/a11y/calendar/ea-cal-view-event.c
@@ -10,11 +10,11 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
- *		Bolian Yin <bolian yin sun com> 
+ *		Bolian Yin <bolian yin sun com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/a11y/calendar/ea-cal-view-event.h b/a11y/calendar/ea-cal-view-event.h
index c500009..fccf023 100644
--- a/a11y/calendar/ea-cal-view-event.h
+++ b/a11y/calendar/ea-cal-view-event.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-cal-view.c b/a11y/calendar/ea-cal-view.c
index e184b91..7e337ac 100644
--- a/a11y/calendar/ea-cal-view.c
+++ b/a11y/calendar/ea-cal-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-cal-view.h b/a11y/calendar/ea-cal-view.h
index e8ebb9e..9aa026e 100644
--- a/a11y/calendar/ea-cal-view.h
+++ b/a11y/calendar/ea-cal-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-calendar-helpers.c b/a11y/calendar/ea-calendar-helpers.c
index cc9474c..f07cdfa 100644
--- a/a11y/calendar/ea-calendar-helpers.c
+++ b/a11y/calendar/ea-calendar-helpers.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-calendar-helpers.h b/a11y/calendar/ea-calendar-helpers.h
index 3c980f2..a4045cd 100644
--- a/a11y/calendar/ea-calendar-helpers.h
+++ b/a11y/calendar/ea-calendar-helpers.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-calendar.c b/a11y/calendar/ea-calendar.c
index bc37ab3..26e73da 100644
--- a/a11y/calendar/ea-calendar.c
+++ b/a11y/calendar/ea-calendar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-calendar.h b/a11y/calendar/ea-calendar.h
index 36ef7d5..b2238ff 100644
--- a/a11y/calendar/ea-calendar.h
+++ b/a11y/calendar/ea-calendar.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-day-view-cell.c b/a11y/calendar/ea-day-view-cell.c
index 1b8e111..bc303f3 100644
--- a/a11y/calendar/ea-day-view-cell.c
+++ b/a11y/calendar/ea-day-view-cell.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-day-view-cell.h b/a11y/calendar/ea-day-view-cell.h
index ca674e2..e0394c6 100644
--- a/a11y/calendar/ea-day-view-cell.h
+++ b/a11y/calendar/ea-day-view-cell.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-day-view-main-item.c b/a11y/calendar/ea-day-view-main-item.c
index aeaf1d1..783710d 100644
--- a/a11y/calendar/ea-day-view-main-item.c
+++ b/a11y/calendar/ea-day-view-main-item.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-day-view-main-item.h b/a11y/calendar/ea-day-view-main-item.h
index 79b166f..0ee7b5e 100644
--- a/a11y/calendar/ea-day-view-main-item.h
+++ b/a11y/calendar/ea-day-view-main-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-day-view.c b/a11y/calendar/ea-day-view.c
index b43ddbe..107f983 100644
--- a/a11y/calendar/ea-day-view.c
+++ b/a11y/calendar/ea-day-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-day-view.h b/a11y/calendar/ea-day-view.h
index 5c4773d..011064a 100644
--- a/a11y/calendar/ea-day-view.h
+++ b/a11y/calendar/ea-day-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-gnome-calendar.c b/a11y/calendar/ea-gnome-calendar.c
index b6eee26..4d6e752 100644
--- a/a11y/calendar/ea-gnome-calendar.c
+++ b/a11y/calendar/ea-gnome-calendar.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-gnome-calendar.h b/a11y/calendar/ea-gnome-calendar.h
index 50c4307..56e695a 100644
--- a/a11y/calendar/ea-gnome-calendar.h
+++ b/a11y/calendar/ea-gnome-calendar.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-jump-button.c b/a11y/calendar/ea-jump-button.c
index 3f9c72e..7888196 100644
--- a/a11y/calendar/ea-jump-button.c
+++ b/a11y/calendar/ea-jump-button.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-jump-button.h b/a11y/calendar/ea-jump-button.h
index 4fbd920..cb2bea3 100644
--- a/a11y/calendar/ea-jump-button.h
+++ b/a11y/calendar/ea-jump-button.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-week-view-cell.c b/a11y/calendar/ea-week-view-cell.c
index 1d1b4d0..4c7a591 100644
--- a/a11y/calendar/ea-week-view-cell.c
+++ b/a11y/calendar/ea-week-view-cell.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-week-view-cell.h b/a11y/calendar/ea-week-view-cell.h
index b09d7d1..4cd2971 100644
--- a/a11y/calendar/ea-week-view-cell.h
+++ b/a11y/calendar/ea-week-view-cell.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-week-view-main-item.c b/a11y/calendar/ea-week-view-main-item.c
index 5bfb733..ae507df 100644
--- a/a11y/calendar/ea-week-view-main-item.c
+++ b/a11y/calendar/ea-week-view-main-item.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-week-view-main-item.h b/a11y/calendar/ea-week-view-main-item.h
index 12687d2..2093de1 100644
--- a/a11y/calendar/ea-week-view-main-item.h
+++ b/a11y/calendar/ea-week-view-main-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-week-view.c b/a11y/calendar/ea-week-view.c
index 6cf234c..1d88e40 100644
--- a/a11y/calendar/ea-week-view.c
+++ b/a11y/calendar/ea-week-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/calendar/ea-week-view.h b/a11y/calendar/ea-week-view.h
index b24fe72..5a83276 100644
--- a/a11y/calendar/ea-week-view.h
+++ b/a11y/calendar/ea-week-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.c b/a11y/e-table/gal-a11y-e-cell-popup.c
index 1a40b23..5ae3cef 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.c
+++ b/a11y/e-table/gal-a11y-e-cell-popup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-popup.h b/a11y/e-table/gal-a11y-e-cell-popup.h
index ebc16c1..4bee17e 100644
--- a/a11y/e-table/gal-a11y-e-cell-popup.h
+++ b/a11y/e-table/gal-a11y-e-cell-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.c b/a11y/e-table/gal-a11y-e-cell-registry.c
index b88fb58..1da241f 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.c
+++ b/a11y/e-table/gal-a11y-e-cell-registry.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-registry.h b/a11y/e-table/gal-a11y-e-cell-registry.h
index f231567..bc43a66 100644
--- a/a11y/e-table/gal-a11y-e-cell-registry.h
+++ b/a11y/e-table/gal-a11y-e-cell-registry.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-text.c b/a11y/e-table/gal-a11y-e-cell-text.c
index e77c073..a2b9f71 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.c
+++ b/a11y/e-table/gal-a11y-e-cell-text.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-text.h b/a11y/e-table/gal-a11y-e-cell-text.h
index c69b374..fe40416 100644
--- a/a11y/e-table/gal-a11y-e-cell-text.h
+++ b/a11y/e-table/gal-a11y-e-cell-text.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.c b/a11y/e-table/gal-a11y-e-cell-toggle.c
index 23114b0..c0425a0 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.c
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-toggle.h b/a11y/e-table/gal-a11y-e-cell-toggle.h
index 56483aa..769e0b4 100644
--- a/a11y/e-table/gal-a11y-e-cell-toggle.h
+++ b/a11y/e-table/gal-a11y-e-cell-toggle.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.c b/a11y/e-table/gal-a11y-e-cell-tree.c
index 520a818..0a5f8e2 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.c
+++ b/a11y/e-table/gal-a11y-e-cell-tree.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-tree.h b/a11y/e-table/gal-a11y-e-cell-tree.h
index f6f6d9d..43169c2 100644
--- a/a11y/e-table/gal-a11y-e-cell-tree.h
+++ b/a11y/e-table/gal-a11y-e-cell-tree.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.c b/a11y/e-table/gal-a11y-e-cell-vbox.c
index 08859d0..7a5eadb 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.c
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell-vbox.h b/a11y/e-table/gal-a11y-e-cell-vbox.h
index 276a601..2055ac3 100644
--- a/a11y/e-table/gal-a11y-e-cell-vbox.h
+++ b/a11y/e-table/gal-a11y-e-cell-vbox.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell.c b/a11y/e-table/gal-a11y-e-cell.c
index 6154fc0..3b74675 100644
--- a/a11y/e-table/gal-a11y-e-cell.c
+++ b/a11y/e-table/gal-a11y-e-cell.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-cell.h b/a11y/e-table/gal-a11y-e-cell.h
index cdae721..af96c69 100644
--- a/a11y/e-table/gal-a11y-e-cell.h
+++ b/a11y/e-table/gal-a11y-e-cell.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
index 9161b4d..0ebb3c4 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
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 0e4ac11..9f249f0 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
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
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 85c896c..ed417e1 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
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-click-to-add.h b/a11y/e-table/gal-a11y-e-table-click-to-add.h
index ccefc7a..17d6940 100644
--- a/a11y/e-table/gal-a11y-e-table-click-to-add.h
+++ b/a11y/e-table/gal-a11y-e-table-click-to-add.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-column-header.c b/a11y/e-table/gal-a11y-e-table-column-header.c
index a50a286..4df75cc 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.c
+++ b/a11y/e-table/gal-a11y-e-table-column-header.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
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 083f0af..d0b1ff5 100644
--- a/a11y/e-table/gal-a11y-e-table-column-header.h
+++ b/a11y/e-table/gal-a11y-e-table-column-header.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-factory.c b/a11y/e-table/gal-a11y-e-table-factory.c
index 37c396a..f459f3b 100644
--- a/a11y/e-table/gal-a11y-e-table-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-factory.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-factory.h b/a11y/e-table/gal-a11y-e-table-factory.h
index e3ef52c..3439cf0 100644
--- a/a11y/e-table/gal-a11y-e-table-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-factory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-item-factory.c b/a11y/e-table/gal-a11y-e-table-item-factory.c
index 43508e4..fa14652 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.c
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
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 a85c9e8..f27c491 100644
--- a/a11y/e-table/gal-a11y-e-table-item-factory.h
+++ b/a11y/e-table/gal-a11y-e-table-item-factory.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-item.c b/a11y/e-table/gal-a11y-e-table-item.c
index e28d0f6..935f53b 100644
--- a/a11y/e-table/gal-a11y-e-table-item.c
+++ b/a11y/e-table/gal-a11y-e-table-item.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table-item.h b/a11y/e-table/gal-a11y-e-table-item.h
index e89f082..27d6a82 100644
--- a/a11y/e-table/gal-a11y-e-table-item.h
+++ b/a11y/e-table/gal-a11y-e-table-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table.c b/a11y/e-table/gal-a11y-e-table.c
index 20261d4..1966fb2 100644
--- a/a11y/e-table/gal-a11y-e-table.c
+++ b/a11y/e-table/gal-a11y-e-table.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-table.h b/a11y/e-table/gal-a11y-e-table.h
index ab133f5..d8f972d 100644
--- a/a11y/e-table/gal-a11y-e-table.h
+++ b/a11y/e-table/gal-a11y-e-table.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.c b/a11y/e-table/gal-a11y-e-tree-factory.c
index cacb3fe..8dc06e2 100644
--- a/a11y/e-table/gal-a11y-e-tree-factory.c
+++ b/a11y/e-table/gal-a11y-e-tree-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-tree-factory.h b/a11y/e-table/gal-a11y-e-tree-factory.h
index 621d256..3d97c7a 100644
--- a/a11y/e-table/gal-a11y-e-tree-factory.h
+++ b/a11y/e-table/gal-a11y-e-tree-factory.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-tree.c b/a11y/e-table/gal-a11y-e-tree.c
index 6fde32b..4ecce81 100644
--- a/a11y/e-table/gal-a11y-e-tree.c
+++ b/a11y/e-table/gal-a11y-e-tree.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-table/gal-a11y-e-tree.h b/a11y/e-table/gal-a11y-e-tree.h
index 9fe482e..d2aa8a0 100644
--- a/a11y/e-table/gal-a11y-e-tree.h
+++ b/a11y/e-table/gal-a11y-e-tree.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-text/gal-a11y-e-text-factory.c b/a11y/e-text/gal-a11y-e-text-factory.c
index e1f835e..2df9241 100644
--- a/a11y/e-text/gal-a11y-e-text-factory.c
+++ b/a11y/e-text/gal-a11y-e-text-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-text/gal-a11y-e-text-factory.h b/a11y/e-text/gal-a11y-e-text-factory.h
index ce4d4d0..df7638f 100644
--- a/a11y/e-text/gal-a11y-e-text-factory.h
+++ b/a11y/e-text/gal-a11y-e-text-factory.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-text/gal-a11y-e-text.c b/a11y/e-text/gal-a11y-e-text.c
index 4eeb781..9848494 100644
--- a/a11y/e-text/gal-a11y-e-text.c
+++ b/a11y/e-text/gal-a11y-e-text.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/e-text/gal-a11y-e-text.h b/a11y/e-text/gal-a11y-e-text.h
index 5cebd0f..6a5bb80 100644
--- a/a11y/e-text/gal-a11y-e-text.h
+++ b/a11y/e-text/gal-a11y-e-text.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/ea-cell-table.c b/a11y/ea-cell-table.c
index 89724ff..8c0b9ee 100644
--- a/a11y/ea-cell-table.c
+++ b/a11y/ea-cell-table.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/ea-cell-table.h b/a11y/ea-cell-table.h
index 6844abe..f8674ec 100644
--- a/a11y/ea-cell-table.h
+++ b/a11y/ea-cell-table.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/ea-factory.h b/a11y/ea-factory.h
index c7805c1..dcf6a13 100644
--- a/a11y/ea-factory.h
+++ b/a11y/ea-factory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/gal-a11y-factory.h b/a11y/gal-a11y-factory.h
index 884c94f..1ef8292 100644
--- a/a11y/gal-a11y-factory.h
+++ b/a11y/gal-a11y-factory.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/gal-a11y-util.c b/a11y/gal-a11y-util.c
index c06b4ef..ec2a506 100644
--- a/a11y/gal-a11y-util.c
+++ b/a11y/gal-a11y-util.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/gal-a11y-util.h b/a11y/gal-a11y-util.h
index 8354df9..dedad9e 100644
--- a/a11y/gal-a11y-util.h
+++ b/a11y/gal-a11y-util.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-calendar-cell.c b/a11y/widgets/ea-calendar-cell.c
index 9cd3a58..5b4e9f1 100644
--- a/a11y/widgets/ea-calendar-cell.c
+++ b/a11y/widgets/ea-calendar-cell.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-calendar-cell.h b/a11y/widgets/ea-calendar-cell.h
index a07b7e8..be35c66 100644
--- a/a11y/widgets/ea-calendar-cell.h
+++ b/a11y/widgets/ea-calendar-cell.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-calendar-item.c b/a11y/widgets/ea-calendar-item.c
index a3da175..fdb109d 100644
--- a/a11y/widgets/ea-calendar-item.c
+++ b/a11y/widgets/ea-calendar-item.c
@@ -10,11 +10,11 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
- *		Bolian Yin <bolian yin sun com> 
+ *		Bolian Yin <bolian yin sun com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/a11y/widgets/ea-calendar-item.h b/a11y/widgets/ea-calendar-item.h
index 87b825b..b5f1b0c 100644
--- a/a11y/widgets/ea-calendar-item.h
+++ b/a11y/widgets/ea-calendar-item.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-combo-button.c b/a11y/widgets/ea-combo-button.c
index c44274e..c5180c3 100644
--- a/a11y/widgets/ea-combo-button.c
+++ b/a11y/widgets/ea-combo-button.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-combo-button.h b/a11y/widgets/ea-combo-button.h
index 37533fd..2b5d0aa 100644
--- a/a11y/widgets/ea-combo-button.h
+++ b/a11y/widgets/ea-combo-button.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-widgets.c b/a11y/widgets/ea-widgets.c
index 5befb44..3dca419 100644
--- a/a11y/widgets/ea-widgets.c
+++ b/a11y/widgets/ea-widgets.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/a11y/widgets/ea-widgets.h b/a11y/widgets/ea-widgets.h
index 20c1c96..c07526f 100644
--- a/a11y/widgets/ea-widgets.h
+++ b/a11y/widgets/ea-widgets.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c
index ec89c9a..aa7bb74 100644
--- a/addressbook/conduit/address-conduit.c
+++ b/addressbook/conduit/address-conduit.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index e580fb2..2c1d5ca 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-component.h b/addressbook/gui/component/addressbook-component.h
index 83fbdf8..222ace8 100644
--- a/addressbook/gui/component/addressbook-component.h
+++ b/addressbook/gui/component/addressbook-component.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index 87e0187..ebb2d18 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-config.h b/addressbook/gui/component/addressbook-config.h
index 6ea33f1..e06e98f 100644
--- a/addressbook/gui/component/addressbook-config.h
+++ b/addressbook/gui/component/addressbook-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index f0e106e..ca69176 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-migrate.h b/addressbook/gui/component/addressbook-migrate.h
index ad3df6b..5727b3d 100644
--- a/addressbook/gui/component/addressbook-migrate.h
+++ b/addressbook/gui/component/addressbook-migrate.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 9759b3f..e6b99c6 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook-view.h b/addressbook/gui/component/addressbook-view.h
index f86ce46..08bbbb3 100644
--- a/addressbook/gui/component/addressbook-view.h
+++ b/addressbook/gui/component/addressbook-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook.c b/addressbook/gui/component/addressbook.c
index 9bb726e..f36012a 100644
--- a/addressbook/gui/component/addressbook.c
+++ b/addressbook/gui/component/addressbook.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/addressbook.h b/addressbook/gui/component/addressbook.h
index a56f088..0dbd4d7 100644
--- a/addressbook/gui/component/addressbook.h
+++ b/addressbook/gui/component/addressbook.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/autocompletion-config.c b/addressbook/gui/component/autocompletion-config.c
index 8c259c6..f45f222 100644
--- a/addressbook/gui/component/autocompletion-config.c
+++ b/addressbook/gui/component/autocompletion-config.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/autocompletion-config.h b/addressbook/gui/component/autocompletion-config.h
index 2f4f018..0690604 100644
--- a/addressbook/gui/component/autocompletion-config.h
+++ b/addressbook/gui/component/autocompletion-config.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/component/component-factory.c b/addressbook/gui/component/component-factory.c
index 52bc377..4d02cc3 100644
--- a/addressbook/gui/component/component-factory.c
+++ b/addressbook/gui/component/component-factory.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index c2194e8..3897d60 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
index 81b7182..6ccd89e 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.h
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index c8a427a..c7ce449 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-editor.h b/addressbook/gui/contact-editor/e-contact-editor.h
index 02b837f..e9f4050 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.h
+++ b/addressbook/gui/contact-editor/e-contact-editor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 926d369..e8d7b03 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.h b/addressbook/gui/contact-editor/e-contact-quick-add.h
index 0aaabdc..e58722b 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.h
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index b94dff2..d052e42 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/eab-editor.h b/addressbook/gui/contact-editor/eab-editor.h
index ae13270..18a1104 100644
--- a/addressbook/gui/contact-editor/eab-editor.h
+++ b/addressbook/gui/contact-editor/eab-editor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 2f55e47..e624c97 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.c b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
index 212c1bb..7a492f0 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -252,9 +252,9 @@ contact_list_editor_cancel_load (EContactListEditor *editor)
 	priv->load_book = NULL;
 }
 
-static gboolean 
+static gboolean
 contact_list_editor_contact_exists (EContactListModel *model,
-                                    const gchar *email) 
+                                    const gchar *email)
 {
 	const gchar *tag = "addressbook:ask-list-add-exists";
 
@@ -639,7 +639,7 @@ contact_list_editor_email_entry_updated_cb (GtkWidget *widget,
 	email = g_strdup (e_destination_get_address (destination));
 	store = e_name_selector_entry_peek_destination_store (entry);
 	e_destination_store_remove_destination (store, destination);
-	gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), "");	
+	gtk_entry_set_text (GTK_ENTRY (WIDGET (EMAIL_ENTRY)), "");
 
 	if (email && *email) {
 		e_contact_list_model_add_email (model, email);
@@ -1142,7 +1142,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_BOOK, 
+		PROP_BOOK,
 		g_param_spec_object (
 			"book",
 			_("Book"),
@@ -1152,7 +1152,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_CONTACT, 
+		PROP_CONTACT,
 		g_param_spec_object (
 			"contact",
 			_("Contact"),
@@ -1162,7 +1162,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_IS_NEW_LIST, 
+		PROP_IS_NEW_LIST,
 		g_param_spec_boolean (
 			"is_new_list",
 			_("Is New List"),
@@ -1172,7 +1172,7 @@ contact_list_editor_class_init (EContactListEditorClass *class)
 
 	g_object_class_install_property (
 		object_class,
-		PROP_EDITABLE, 
+		PROP_EDITABLE,
 		g_param_spec_boolean (
 			"editable",
 			_("Editable"),
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-editor.h b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
index deed3f6..fcee0b0 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.c b/addressbook/gui/contact-list-editor/e-contact-list-model.c
index f381e67..d43e895 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/contact-list-editor/e-contact-list-model.h b/addressbook/gui/contact-list-editor/e-contact-list-model.h
index f4fde83..1f7c35a 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.h
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/addressbook/gui/merging/eab-contact-compare.c b/addressbook/gui/merging/eab-contact-compare.c
index 7747669..86138ef 100644
--- a/addressbook/gui/merging/eab-contact-compare.c
+++ b/addressbook/gui/merging/eab-contact-compare.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/merging/eab-contact-compare.h b/addressbook/gui/merging/eab-contact-compare.h
index ff8bfc1..d084619 100644
--- a/addressbook/gui/merging/eab-contact-compare.h
+++ b/addressbook/gui/merging/eab-contact-compare.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/merging/eab-contact-merging.c b/addressbook/gui/merging/eab-contact-merging.c
index 502fe38..895e812 100644
--- a/addressbook/gui/merging/eab-contact-merging.c
+++ b/addressbook/gui/merging/eab-contact-merging.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/merging/eab-contact-merging.h b/addressbook/gui/merging/eab-contact-merging.h
index 4228fc1..81528c6 100644
--- a/addressbook/gui/merging/eab-contact-merging.h
+++ b/addressbook/gui/merging/eab-contact-merging.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 73518fc..9482a93 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-model.h b/addressbook/gui/widgets/e-addressbook-model.h
index 6558d94..ae1c5f4 100644
--- a/addressbook/gui/widgets/e-addressbook-model.h
+++ b/addressbook/gui/widgets/e-addressbook-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index d2c2072..2378381 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
index fd78426..88ce1a7 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index a444015..9e3dfe5 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.h b/addressbook/gui/widgets/e-addressbook-table-adapter.h
index c4182d2..edfb1ad 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.h
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index fe39c02..4cd151f 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h
index 799e01a..7f79641 100644
--- a/addressbook/gui/widgets/e-addressbook-view.h
+++ b/addressbook/gui/widgets/e-addressbook-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index 696d42d..a609029 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard-label.h b/addressbook/gui/widgets/e-minicard-label.h
index 3d41e4c..f6b0607 100644
--- a/addressbook/gui/widgets/e-minicard-label.h
+++ b/addressbook/gui/widgets/e-minicard-label.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c
index 0f9ae7c..9c493af 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h
index 1c43235..ff9cdda 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.h
+++ b/addressbook/gui/widgets/e-minicard-view-widget.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index 756a019..b716c86 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard-view.h b/addressbook/gui/widgets/e-minicard-view.h
index 7d0a5b1..4bda766 100644
--- a/addressbook/gui/widgets/e-minicard-view.h
+++ b/addressbook/gui/widgets/e-minicard-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 10a406e..0c70b12 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -770,7 +770,7 @@ add_field (EMinicard *e_minicard, EContactField field, gdouble left_width)
 	EMinicardField *minicard_field;
 	char *name;
 	char *string;
- 	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);	
+ 	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 
 	group = GNOME_CANVAS_GROUP( e_minicard );
 
@@ -839,7 +839,7 @@ add_email_field (EMinicard *e_minicard, GList *email_list, gdouble left_width, i
 	char *name;
 	GList *l, *le;
 	int count =0;
-	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);	
+	gboolean is_rtl = (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL);
 	GList *emails = e_contact_get (e_minicard->contact, E_CONTACT_EMAIL);
 	group = GNOME_CANVAS_GROUP( e_minicard );
 
diff --git a/addressbook/gui/widgets/e-minicard.h b/addressbook/gui/widgets/e-minicard.h
index 71c9767..fb8116c 100644
--- a/addressbook/gui/widgets/e-minicard.h
+++ b/addressbook/gui/widgets/e-minicard.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c
index bb8eb63..32ae078 100644
--- a/addressbook/gui/widgets/eab-config.c
+++ b/addressbook/gui/widgets/eab-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h
index 6e593f1..330df51 100644
--- a/addressbook/gui/widgets/eab-config.h
+++ b/addressbook/gui/widgets/eab-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index 6cec0b9..96050b2 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -408,7 +408,7 @@ accum_name_value (GString *gstr, const char *label, const char *str, const char
 		g_string_append_printf (gstr, "<td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
 		if (icon)
 			g_string_append_printf (gstr, "<img width=\"16\" height=\"16\" src=\"evo-icon:%s\"></td></tr>", icon);
-		else 
+		else
 			g_string_append_printf (gstr, "</td></tr>");
 	} else {
 		g_string_append_printf (gstr, "<tr><td valign=\"top\" width=\"" IMAGE_COL_WIDTH "\">");
@@ -549,7 +549,7 @@ render_contact (GtkHTMLStream *html_stream, EContact *contact)
 		if (!eab_parse_qp_email (l->data, &name, &mail))
 			mail = e_text_to_html (l->data, 0);
 
-		g_string_append_printf (accum, "%s%s%s<a href=\"internal-mailto:%d\";>%s</a>%s <font color=" HEADER_COLOR ">(%s)</font>", 
+		g_string_append_printf (accum, "%s%s%s<a href=\"internal-mailto:%d\";>%s</a>%s <font color=" HEADER_COLOR ">(%s)</font>",
 						nl,
 						name ? name : "",
 						name ? " &lt;" : "",
diff --git a/addressbook/gui/widgets/eab-contact-display.h b/addressbook/gui/widgets/eab-contact-display.h
index c7b7f1a..80acc5e 100644
--- a/addressbook/gui/widgets/eab-contact-display.h
+++ b/addressbook/gui/widgets/eab-contact-display.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index 14285cf..58895c7 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-gui-util.h b/addressbook/gui/widgets/eab-gui-util.h
index 4cab9b3..b5129d1 100644
--- a/addressbook/gui/widgets/eab-gui-util.h
+++ b/addressbook/gui/widgets/eab-gui-util.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -81,7 +81,7 @@ GtkWidget *eab_create_image_chooser_widget (gchar *name, gchar *string1, gchar *
 ESource            *eab_select_source             (const gchar *title, const gchar *message,
 						   const gchar *select_uid, GtkWindow *parent);
 
-/* To parse quoted printable address & return email & name fields */						
+/* To parse quoted printable address & return email & name fields */
 gboolean eab_parse_qp_email (const gchar *string, gchar **name, gchar **email);
 char *eab_parse_qp_email_to_html (const gchar *string);
 
diff --git a/addressbook/gui/widgets/eab-menu.c b/addressbook/gui/widgets/eab-menu.c
index 603e938..e07489b 100644
--- a/addressbook/gui/widgets/eab-menu.c
+++ b/addressbook/gui/widgets/eab-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-menu.h b/addressbook/gui/widgets/eab-menu.h
index 3803466..7bea32e 100644
--- a/addressbook/gui/widgets/eab-menu.h
+++ b/addressbook/gui/widgets/eab-menu.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c
index 6a702f3..d520108 100644
--- a/addressbook/gui/widgets/eab-popup-control.c
+++ b/addressbook/gui/widgets/eab-popup-control.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Jon Trowbridge <trow ximian com>
diff --git a/addressbook/gui/widgets/eab-popup-control.h b/addressbook/gui/widgets/eab-popup-control.h
index e8031a7..9eeedc8 100644
--- a/addressbook/gui/widgets/eab-popup-control.h
+++ b/addressbook/gui/widgets/eab-popup-control.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-popup.c b/addressbook/gui/widgets/eab-popup.c
index 17f9797..1b5cde4 100644
--- a/addressbook/gui/widgets/eab-popup.c
+++ b/addressbook/gui/widgets/eab-popup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/eab-popup.h b/addressbook/gui/widgets/eab-popup.h
index b86cc12..86deff7 100644
--- a/addressbook/gui/widgets/eab-popup.h
+++ b/addressbook/gui/widgets/eab-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.c b/addressbook/gui/widgets/gal-view-factory-minicard.c
index ccec1bf..0240ddd 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.c
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/gal-view-factory-minicard.h b/addressbook/gui/widgets/gal-view-factory-minicard.h
index d1cf2de..0aa6dc5 100644
--- a/addressbook/gui/widgets/gal-view-factory-minicard.h
+++ b/addressbook/gui/widgets/gal-view-factory-minicard.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index 4645517..0a2fac9 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/gui/widgets/gal-view-minicard.h b/addressbook/gui/widgets/gal-view-minicard.h
index bb22cf8..cf3faae 100644
--- a/addressbook/gui/widgets/gal-view-minicard.h
+++ b/addressbook/gui/widgets/gal-view-minicard.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/importers/evolution-addressbook-importers.h b/addressbook/importers/evolution-addressbook-importers.h
index 94b0e3b..747fe42 100644
--- a/addressbook/importers/evolution-addressbook-importers.h
+++ b/addressbook/importers/evolution-addressbook-importers.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index b5c9f7f..164f9f5 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index b0380cf..75f30a2 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/addressbook/importers/evolution-vcard-importer.c b/addressbook/importers/evolution-vcard-importer.c
index bd526e3..1ec623d 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/printing/e-contact-print-types.h b/addressbook/printing/e-contact-print-types.h
index 15d64e7..e21f3b7 100644
--- a/addressbook/printing/e-contact-print-types.h
+++ b/addressbook/printing/e-contact-print-types.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 0ba9dbb..cc3affe 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/printing/e-contact-print.h b/addressbook/printing/e-contact-print.h
index c9cc408..1604693 100644
--- a/addressbook/printing/e-contact-print.h
+++ b/addressbook/printing/e-contact-print.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/printing/test-print.c b/addressbook/printing/test-print.c
index e871eb6..c38d212 100644
--- a/addressbook/printing/test-print.c
+++ b/addressbook/printing/test-print.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/tools/evolution-addressbook-export-list-cards.c b/addressbook/tools/evolution-addressbook-export-list-cards.c
index b7ccf7c..72fa8a0 100644
--- a/addressbook/tools/evolution-addressbook-export-list-cards.c
+++ b/addressbook/tools/evolution-addressbook-export-list-cards.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/tools/evolution-addressbook-export-list-folders.c b/addressbook/tools/evolution-addressbook-export-list-folders.c
index 86affe4..e937488 100644
--- a/addressbook/tools/evolution-addressbook-export-list-folders.c
+++ b/addressbook/tools/evolution-addressbook-export-list-folders.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/tools/evolution-addressbook-export.c b/addressbook/tools/evolution-addressbook-export.c
index bfcaca9..1a7f861 100644
--- a/addressbook/tools/evolution-addressbook-export.c
+++ b/addressbook/tools/evolution-addressbook-export.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/tools/evolution-addressbook-export.h b/addressbook/tools/evolution-addressbook-export.h
index 210dc2c..815f524 100644
--- a/addressbook/tools/evolution-addressbook-export.h
+++ b/addressbook/tools/evolution-addressbook-export.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index af1324b..8d08a3e 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/addressbook/util/eab-book-util.h b/addressbook/util/eab-book-util.h
index 66c3a6c..0cded9c 100644
--- a/addressbook/util/eab-book-util.h
+++ b/addressbook/util/eab-book-util.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/common/authentication.c b/calendar/common/authentication.c
index 85bde3d..a331778 100644
--- a/calendar/common/authentication.c
+++ b/calendar/common/authentication.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -72,7 +72,7 @@ build_pass_key (ECal *ecal)
 	return euri_str;
 }
 
-void 
+void
 auth_cal_forget_password (ECal *ecal)
 {
 	ESource *source = NULL;
diff --git a/calendar/common/authentication.h b/calendar/common/authentication.h
index 147b67e..696a36d 100644
--- a/calendar/common/authentication.h
+++ b/calendar/common/authentication.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/conduits/calendar/calendar-conduit.c b/calendar/conduits/calendar/calendar-conduit.c
index b9b6b34..5aef1ae 100644
--- a/calendar/conduits/calendar/calendar-conduit.c
+++ b/calendar/conduits/calendar/calendar-conduit.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -187,7 +187,7 @@ calconduit_save_configuration (ECalConduitCfg *c)
 	g_snprintf (prefix, 255, "e-calendar-conduit/Pilot_%u", c->pilot_id);
 
 	e_pilot_set_sync_source (c->source_list, c->source);
-	
+
 	e_pilot_setup_set_bool (prefix, "secret", c->secret);
 	e_pilot_setup_set_bool (prefix, "multi_day_split", c->multi_day_split);
 	e_pilot_setup_set_string (prefix, "last_uri", c->last_uri ? c->last_uri : "");
diff --git a/calendar/conduits/common/libecalendar-common-conduit.c b/calendar/conduits/common/libecalendar-common-conduit.c
index 59f411d..cdb4a10 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.c
+++ b/calendar/conduits/common/libecalendar-common-conduit.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/conduits/common/libecalendar-common-conduit.h b/calendar/conduits/common/libecalendar-common-conduit.h
index 0641ec3..aab5a58 100644
--- a/calendar/conduits/common/libecalendar-common-conduit.h
+++ b/calendar/conduits/common/libecalendar-common-conduit.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/conduits/memo/memo-conduit.c b/calendar/conduits/memo/memo-conduit.c
index 4d599a6..61e5c85 100644
--- a/calendar/conduits/memo/memo-conduit.c
+++ b/calendar/conduits/memo/memo-conduit.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/conduits/todo/todo-conduit.c b/calendar/conduits/todo/todo-conduit.c
index 7639291..3a684e0 100644
--- a/calendar/conduits/todo/todo-conduit.c
+++ b/calendar/conduits/todo/todo-conduit.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c
index 7f54b6b..089bf37 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.h b/calendar/gui/alarm-notify/alarm-notify-dialog.h
index 7a94793..17f9b3a 100644
--- a/calendar/gui/alarm-notify/alarm-notify-dialog.h
+++ b/calendar/gui/alarm-notify/alarm-notify-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm-notify.c b/calendar/gui/alarm-notify/alarm-notify.c
index 38a3b49..4085815 100644
--- a/calendar/gui/alarm-notify/alarm-notify.c
+++ b/calendar/gui/alarm-notify/alarm-notify.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -352,7 +352,7 @@ alarm_notify_add_calendar (AlarmNotify *an, ECalSourceType source_type,  ESource
 	priv = an->priv;
 	str_uri = e_source_get_uri (source);
 	e_uri = e_uri_new (str_uri);
-	if (e_source_get_property (source, "auth-type")) 
+	if (e_source_get_property (source, "auth-type"))
 		pass_key = e_uri_to_string (e_uri, FALSE);
 	else
 		pass_key = g_strdup (str_uri);
diff --git a/calendar/gui/alarm-notify/alarm-notify.h b/calendar/gui/alarm-notify/alarm-notify.h
index 7fea501..a548716 100644
--- a/calendar/gui/alarm-notify/alarm-notify.h
+++ b/calendar/gui/alarm-notify/alarm-notify.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index 887cf7f..c293bf7 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm-queue.h b/calendar/gui/alarm-notify/alarm-queue.h
index 69fbafe..9a2e11c 100644
--- a/calendar/gui/alarm-notify/alarm-queue.h
+++ b/calendar/gui/alarm-notify/alarm-queue.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c
index 5dca49a..f2ab4bb 100644
--- a/calendar/gui/alarm-notify/alarm.c
+++ b/calendar/gui/alarm-notify/alarm.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/alarm.h b/calendar/gui/alarm-notify/alarm.h
index bbedf39..7a14db5 100644
--- a/calendar/gui/alarm-notify/alarm.h
+++ b/calendar/gui/alarm-notify/alarm.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/config-data.c b/calendar/gui/alarm-notify/config-data.c
index 5a05cfd..dba9099 100644
--- a/calendar/gui/alarm-notify/config-data.c
+++ b/calendar/gui/alarm-notify/config-data.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/config-data.h b/calendar/gui/alarm-notify/config-data.h
index 9dd6f02..63e6c72 100644
--- a/calendar/gui/alarm-notify/config-data.h
+++ b/calendar/gui/alarm-notify/config-data.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c
index 3504b0d..a625bec 100644
--- a/calendar/gui/alarm-notify/notify-main.c
+++ b/calendar/gui/alarm-notify/notify-main.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/util.c b/calendar/gui/alarm-notify/util.c
index 6a734a8..640a8f5 100644
--- a/calendar/gui/alarm-notify/util.c
+++ b/calendar/gui/alarm-notify/util.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/alarm-notify/util.h b/calendar/gui/alarm-notify/util.h
index c53f047..b7b715c 100644
--- a/calendar/gui/alarm-notify/util.h
+++ b/calendar/gui/alarm-notify/util.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index aab5d98..6183d87 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/cal-search-bar.h b/calendar/gui/cal-search-bar.h
index 64e1b40..26f3998 100644
--- a/calendar/gui/cal-search-bar.h
+++ b/calendar/gui/cal-search-bar.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 94a35f3..e69cd46 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
index cfe2d24..b1c093f 100644
--- a/calendar/gui/calendar-commands.h
+++ b/calendar/gui/calendar-commands.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 53abc56..bca0832 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -70,7 +70,7 @@
 #define WEATHER_BASE_URI "weather://"
 #define PERSONAL_RELATIVE_URI "system"
 #define CALENDAR_ERROR_LEVEL_KEY "/apps/evolution/calendar/display/error_level"
-#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout" 
+#define CALENDAR_ERROR_TIME_OUT_KEY "/apps/evolution/calendar/display/error_timeout"
 
 enum DndTargetType {
 	DND_TARGET_TYPE_CALENDAR_LIST
@@ -598,7 +598,7 @@ edit_calendar_cb (EPopup *ep, EPopupItem *pitem, void *data)
 	calendar_setup_edit_calendar (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source, NULL);
 }
 
-static void 
+static void
 set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
 {
 	CalendarComponentView *component_view = data;
@@ -614,13 +614,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char
 static void
 mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	set_offline_availability (ep, pitem, data, "0"); 
+	set_offline_availability (ep, pitem, data, "0");
 }
 
 static void
 mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	set_offline_availability (ep, pitem, data, "1"); 
+	set_offline_availability (ep, pitem, data, "1");
 }
 
 static EPopupItem ecc_source_popups[] = {
diff --git a/calendar/gui/calendar-component.h b/calendar/gui/calendar-component.h
index ec31837..1fbcdbc 100644
--- a/calendar/gui/calendar-component.h
+++ b/calendar/gui/calendar-component.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-config-keys.h b/calendar/gui/calendar-config-keys.h
index 6277f46..37724a5 100644
--- a/calendar/gui/calendar-config-keys.h
+++ b/calendar/gui/calendar-config-keys.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 285490b..ffd398b 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h
index c28077c..ff4e69d 100644
--- a/calendar/gui/calendar-config.h
+++ b/calendar/gui/calendar-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-view-factory.c b/calendar/gui/calendar-view-factory.c
index ce76578..8d167f4 100644
--- a/calendar/gui/calendar-view-factory.c
+++ b/calendar/gui/calendar-view-factory.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-view-factory.h b/calendar/gui/calendar-view-factory.h
index 779e598..0f182a1 100644
--- a/calendar/gui/calendar-view-factory.h
+++ b/calendar/gui/calendar-view-factory.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-view.c b/calendar/gui/calendar-view.c
index 331181e..5415aff 100644
--- a/calendar/gui/calendar-view.c
+++ b/calendar/gui/calendar-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/calendar-view.h b/calendar/gui/calendar-view.h
index 53c4ca6..51e3235 100644
--- a/calendar/gui/calendar-view.h
+++ b/calendar/gui/calendar-view.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/comp-editor-factory.c b/calendar/gui/comp-editor-factory.c
index 908293a..b98f717 100644
--- a/calendar/gui/comp-editor-factory.c
+++ b/calendar/gui/comp-editor-factory.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/comp-editor-factory.h b/calendar/gui/comp-editor-factory.h
index fdab8a0..3e79992 100644
--- a/calendar/gui/comp-editor-factory.h
+++ b/calendar/gui/comp-editor-factory.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index 53fdace..153dc08 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -641,7 +641,7 @@ update_objects (ECal *client, icalcomponent *icalcomp)
 	icalcomponent_kind kind;
 
 	kind = icalcomponent_isa (icalcomp);
-	if (kind == ICAL_VTODO_COMPONENT || 
+	if (kind == ICAL_VTODO_COMPONENT ||
 	    kind == ICAL_VEVENT_COMPONENT ||
 	    kind == ICAL_VJOURNAL_COMPONENT)
 		return update_single_object (client, icalcomp, kind == ICAL_VJOURNAL_COMPONENT);
@@ -803,7 +803,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
 	ECalComponent *master = NULL;
 	icalcomponent *icalcomp = NULL;
 	ECalComponentRange rid;
-       	ECalComponentDateTime sdt;	
+       	ECalComponentDateTime sdt;
 	const char *uid;
 
 	/* Get the master component */
@@ -839,7 +839,7 @@ comp_util_sanitize_recurrence_master (ECalComponent *comp, ECal *client)
 
 		e_cal_component_set_dtstart (comp, &sdt);
 		e_cal_component_set_dtend (comp, &edt);
-		
+
 		e_cal_component_get_sequence (master, &sequence);
 		e_cal_component_set_sequence (comp, sequence);
 
diff --git a/calendar/gui/comp-util.h b/calendar/gui/comp-util.h
index b93384f..3faf9f4 100644
--- a/calendar/gui/comp-util.h
+++ b/calendar/gui/comp-util.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c
index 2fcb3e2..3e7b749 100644
--- a/calendar/gui/control-factory.c
+++ b/calendar/gui/control-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h
index 2103f45..c79d70b 100644
--- a/calendar/gui/control-factory.h
+++ b/calendar/gui/control-factory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 3881c85..73bfde3 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/alarm-dialog.h b/calendar/gui/dialogs/alarm-dialog.h
index 0cdee74..b5560f9 100644
--- a/calendar/gui/dialogs/alarm-dialog.h
+++ b/calendar/gui/dialogs/alarm-dialog.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/alarm-list-dialog.c b/calendar/gui/dialogs/alarm-list-dialog.c
index 07395a4..8520b37 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.c
+++ b/calendar/gui/dialogs/alarm-list-dialog.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/alarm-list-dialog.h b/calendar/gui/dialogs/alarm-list-dialog.h
index 6a55f03..7d58fcb 100644
--- a/calendar/gui/dialogs/alarm-list-dialog.h
+++ b/calendar/gui/dialogs/alarm-list-dialog.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 5de8ea6..9c50215 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.h b/calendar/gui/dialogs/cal-attachment-select-file.h
index 3c39fed..0f965e6 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.h
+++ b/calendar/gui/dialogs/cal-attachment-select-file.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index b2763ca..f00adc0 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h
index 30b6244..647df41 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.h
+++ b/calendar/gui/dialogs/cal-prefs-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index 3ee5894..95820b8 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -258,7 +258,7 @@ eccp_general_offline (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 	GtkWidget *offline_setting = NULL;
 	const char *offline_sync;
 	int row;
-	const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group); 
+	const char *base_uri = e_source_group_peek_base_uri (sdialog->source_group);
 	gboolean is_local = base_uri && (g_str_has_prefix (base_uri, "file://") || g_str_has_prefix (base_uri, "contacts://"));
 	offline_sync =  e_source_get_property (sdialog->source, "offline_sync");
 	if (old)
diff --git a/calendar/gui/dialogs/calendar-setup.h b/calendar/gui/dialogs/calendar-setup.h
index 3898467..4ec9980 100644
--- a/calendar/gui/dialogs/calendar-setup.h
+++ b/calendar/gui/dialogs/calendar-setup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/cancel-comp.c b/calendar/gui/dialogs/cancel-comp.c
index 2548d5b..cddd4f8 100644
--- a/calendar/gui/dialogs/cancel-comp.c
+++ b/calendar/gui/dialogs/cancel-comp.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/cancel-comp.h b/calendar/gui/dialogs/cancel-comp.h
index 3566a75..5f1261f 100644
--- a/calendar/gui/dialogs/cancel-comp.h
+++ b/calendar/gui/dialogs/cancel-comp.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/changed-comp.c b/calendar/gui/dialogs/changed-comp.c
index 9a0665d..d1abc17 100644
--- a/calendar/gui/dialogs/changed-comp.c
+++ b/calendar/gui/dialogs/changed-comp.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/changed-comp.h b/calendar/gui/dialogs/changed-comp.h
index 7a8bcb3..6bb2021 100644
--- a/calendar/gui/dialogs/changed-comp.h
+++ b/calendar/gui/dialogs/changed-comp.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/comp-editor-page.c b/calendar/gui/dialogs/comp-editor-page.c
index a86465d..93b9cd9 100644
--- a/calendar/gui/dialogs/comp-editor-page.c
+++ b/calendar/gui/dialogs/comp-editor-page.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/comp-editor-page.h b/calendar/gui/dialogs/comp-editor-page.h
index f8b9db2..819ea74 100644
--- a/calendar/gui/dialogs/comp-editor-page.h
+++ b/calendar/gui/dialogs/comp-editor-page.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index f09024e..4666058 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/comp-editor-util.h b/calendar/gui/dialogs/comp-editor-util.h
index 565feea..5516fe4 100644
--- a/calendar/gui/dialogs/comp-editor-util.h
+++ b/calendar/gui/dialogs/comp-editor-util.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 545fca4..cd2dac7 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -238,7 +238,7 @@ get_attachment_list (CompEditor *editor)
 		 * calendar source */
 		utf8_safe_fname = camel_file_util_safe_filename (camel_mime_part_get_filename (mime_part));
 
-		/* It is absolutely fine to get a NULL from the filename of 
+		/* It is absolutely fine to get a NULL from the filename of
 		 * mime part. We assume that it is named "Attachment"
 		 * in mailer. I'll do that with a ticker */
 		if (!utf8_safe_fname)
@@ -798,7 +798,7 @@ action_save_cb (GtkAction *action,
 		priv->mod = CALOBJ_MOD_THIS;
 
 	comp = comp_editor_get_current_comp (editor, &correct);
-		
+
 	e_cal_component_get_summary (comp, &text);
 	g_object_unref (comp);
 
@@ -817,7 +817,7 @@ action_save_cb (GtkAction *action,
 		delegate = flags & COMP_EDITOR_DELEGATE;
 
 		if (delegate && !remove_event_dialog (priv->client, priv->comp, GTK_WINDOW (editor))) {
-			const char *uid = NULL; 
+			const char *uid = NULL;
 			GError *error = NULL;
 
 			e_cal_component_get_uid (priv->comp, &uid);
@@ -2440,7 +2440,7 @@ real_send_comp (CompEditor *editor, ECalComponentItipMethod method, gboolean str
 			set_attendees_for_delegation (send_comp, address, method);
 	}
 
-	if (!e_cal_component_has_attachments (priv->comp) 
+	if (!e_cal_component_has_attachments (priv->comp)
 	  || e_cal_get_static_capability (priv->client, CAL_STATIC_CAPABILITY_CREATE_MESSAGES)) {
 		if (itip_send_comp (method, send_comp, priv->client,
 					NULL, NULL, users, strip_alarms)) {
diff --git a/calendar/gui/dialogs/comp-editor.h b/calendar/gui/dialogs/comp-editor.h
index ab277fe..22167cb 100644
--- a/calendar/gui/dialogs/comp-editor.h
+++ b/calendar/gui/dialogs/comp-editor.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/copy-source-dialog.c b/calendar/gui/dialogs/copy-source-dialog.c
index 5bb9704..9244467 100644
--- a/calendar/gui/dialogs/copy-source-dialog.c
+++ b/calendar/gui/dialogs/copy-source-dialog.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/copy-source-dialog.h b/calendar/gui/dialogs/copy-source-dialog.h
index ba3169a..4c6f5b1 100644
--- a/calendar/gui/dialogs/copy-source-dialog.h
+++ b/calendar/gui/dialogs/copy-source-dialog.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index e5ae1e6..ae371aa 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/delete-comp.h b/calendar/gui/dialogs/delete-comp.h
index bb4b598..c619e28 100644
--- a/calendar/gui/dialogs/delete-comp.h
+++ b/calendar/gui/dialogs/delete-comp.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/delete-error.c b/calendar/gui/dialogs/delete-error.c
index b151ef8..f8df587 100644
--- a/calendar/gui/dialogs/delete-error.c
+++ b/calendar/gui/dialogs/delete-error.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/delete-error.h b/calendar/gui/dialogs/delete-error.h
index cb0a7d9..dab6205 100644
--- a/calendar/gui/dialogs/delete-error.h
+++ b/calendar/gui/dialogs/delete-error.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/e-delegate-dialog.c b/calendar/gui/dialogs/e-delegate-dialog.c
index 31c4631..8e06083 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.c
+++ b/calendar/gui/dialogs/e-delegate-dialog.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/e-delegate-dialog.h b/calendar/gui/dialogs/e-delegate-dialog.h
index 553b7c1..e4f4747 100644
--- a/calendar/gui/dialogs/e-delegate-dialog.h
+++ b/calendar/gui/dialogs/e-delegate-dialog.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index d9a55ac..fd6bf24 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index 568ef5b..01cf3ed 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
index 7755894..cff9d75 100644
--- a/calendar/gui/dialogs/event-editor.c
+++ b/calendar/gui/dialogs/event-editor.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/event-editor.h b/calendar/gui/dialogs/event-editor.h
index c050b92..03afd64 100644
--- a/calendar/gui/dialogs/event-editor.h
+++ b/calendar/gui/dialogs/event-editor.h
@@ -1,5 +1,5 @@
 /*
- * Evolution calendar - Event editor dialog 
+ * Evolution calendar - Event editor dialog
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index b225cdd..b2ac6b5 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -3281,7 +3281,7 @@ event_page_add_attendee (EventPage *epage, EMeetingAttendee *attendee)
 
 	g_return_if_fail (epage != NULL);
 	g_return_if_fail (IS_EVENT_PAGE (epage));
-	
+
 	priv = epage->priv;
 
 	e_meeting_store_add_attendee (priv->model, attendee);
@@ -3300,7 +3300,7 @@ event_page_remove_all_attendees (EventPage *epage)
 
 	g_return_if_fail (epage != NULL);
 	g_return_if_fail (IS_EVENT_PAGE (epage));
-	
+
 	priv = epage->priv;
 
 	e_meeting_store_remove_all_attendees (priv->model);
diff --git a/calendar/gui/dialogs/event-page.h b/calendar/gui/dialogs/event-page.h
index 63c0bd2..5bd377c 100644
--- a/calendar/gui/dialogs/event-page.h
+++ b/calendar/gui/dialogs/event-page.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index b90bd6f..cf3781a 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/memo-editor.h b/calendar/gui/dialogs/memo-editor.h
index b45edd1..2e431b5 100644
--- a/calendar/gui/dialogs/memo-editor.h
+++ b/calendar/gui/dialogs/memo-editor.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 4f8c37c..957b8f6 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/memo-page.h b/calendar/gui/dialogs/memo-page.h
index cfe4cb0..115d8aa 100644
--- a/calendar/gui/dialogs/memo-page.h
+++ b/calendar/gui/dialogs/memo-page.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/recur-comp.c b/calendar/gui/dialogs/recur-comp.c
index e57c0c8..8d8dabb 100644
--- a/calendar/gui/dialogs/recur-comp.c
+++ b/calendar/gui/dialogs/recur-comp.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/recur-comp.h b/calendar/gui/dialogs/recur-comp.h
index e466677..47236ef 100644
--- a/calendar/gui/dialogs/recur-comp.h
+++ b/calendar/gui/dialogs/recur-comp.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/recurrence-page.c b/calendar/gui/dialogs/recurrence-page.c
index c85a0ae..f899931 100644
--- a/calendar/gui/dialogs/recurrence-page.c
+++ b/calendar/gui/dialogs/recurrence-page.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/recurrence-page.h b/calendar/gui/dialogs/recurrence-page.h
index f3bff61..1dce00d 100644
--- a/calendar/gui/dialogs/recurrence-page.h
+++ b/calendar/gui/dialogs/recurrence-page.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/save-comp.c b/calendar/gui/dialogs/save-comp.c
index cb178e0..3f47312 100644
--- a/calendar/gui/dialogs/save-comp.c
+++ b/calendar/gui/dialogs/save-comp.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/save-comp.h b/calendar/gui/dialogs/save-comp.h
index 123a4a8..5105e4a 100644
--- a/calendar/gui/dialogs/save-comp.h
+++ b/calendar/gui/dialogs/save-comp.h
@@ -1,7 +1,7 @@
 /*
  *
  * Evolution calendar - Delete calendar component dialog
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/schedule-page.c b/calendar/gui/dialogs/schedule-page.c
index e1137be..4baa22a 100644
--- a/calendar/gui/dialogs/schedule-page.c
+++ b/calendar/gui/dialogs/schedule-page.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/schedule-page.h b/calendar/gui/dialogs/schedule-page.h
index 8ffbb43..71eec02 100644
--- a/calendar/gui/dialogs/schedule-page.h
+++ b/calendar/gui/dialogs/schedule-page.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/select-source-dialog.c b/calendar/gui/dialogs/select-source-dialog.c
index e9fc7d0..f73af15 100644
--- a/calendar/gui/dialogs/select-source-dialog.c
+++ b/calendar/gui/dialogs/select-source-dialog.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/select-source-dialog.h b/calendar/gui/dialogs/select-source-dialog.h
index 3ca3cec..850eddd 100644
--- a/calendar/gui/dialogs/select-source-dialog.h
+++ b/calendar/gui/dialogs/select-source-dialog.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/send-comp.c b/calendar/gui/dialogs/send-comp.c
index a7d87c4..4eca089 100644
--- a/calendar/gui/dialogs/send-comp.c
+++ b/calendar/gui/dialogs/send-comp.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/send-comp.h b/calendar/gui/dialogs/send-comp.h
index 21b3109..63644bd 100644
--- a/calendar/gui/dialogs/send-comp.h
+++ b/calendar/gui/dialogs/send-comp.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index 86a39aa..7fb4679 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/task-details-page.h b/calendar/gui/dialogs/task-details-page.h
index 9fbfcd4..585ab0b 100644
--- a/calendar/gui/dialogs/task-details-page.h
+++ b/calendar/gui/dialogs/task-details-page.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c
index eef1d64..fbab8b0 100644
--- a/calendar/gui/dialogs/task-editor.c
+++ b/calendar/gui/dialogs/task-editor.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h
index 9376b41..57ab33b 100644
--- a/calendar/gui/dialogs/task-editor.h
+++ b/calendar/gui/dialogs/task-editor.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index f371e60..b088fb4 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -2180,7 +2180,7 @@ task_page_add_attendee (TaskPage *tpage, EMeetingAttendee *attendee)
 
 	g_return_if_fail (tpage != NULL);
 	g_return_if_fail (IS_TASK_PAGE (tpage));
-	
+
 	priv = tpage->priv;
 
 	e_meeting_store_add_attendee (priv->model, attendee);
diff --git a/calendar/gui/dialogs/task-page.h b/calendar/gui/dialogs/task-page.h
index 77ec68f..b8a49f8 100644
--- a/calendar/gui/dialogs/task-page.h
+++ b/calendar/gui/dialogs/task-page.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 795d043..d60fab9 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-alarm-list.h b/calendar/gui/e-alarm-list.h
index 6819994..6dfb1c6 100644
--- a/calendar/gui/e-alarm-list.h
+++ b/calendar/gui/e-alarm-list.h
@@ -1,7 +1,7 @@
 /*
  *
  * EAlarmList - list of calendar alarms with GtkTreeModel interface.
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-attachment-handler-calendar.c b/calendar/gui/e-attachment-handler-calendar.c
index 5beb6e0..601d1f5 100644
--- a/calendar/gui/e-attachment-handler-calendar.c
+++ b/calendar/gui/e-attachment-handler-calendar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/gui/e-attachment-handler-calendar.h b/calendar/gui/e-attachment-handler-calendar.h
index b678861..0b0ab73 100644
--- a/calendar/gui/e-attachment-handler-calendar.h
+++ b/calendar/gui/e-attachment-handler-calendar.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index f564538..18c47eb 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-component-memo-preview.h b/calendar/gui/e-cal-component-memo-preview.h
index 7d77a0a..8dcab9d 100644
--- a/calendar/gui/e-cal-component-memo-preview.h
+++ b/calendar/gui/e-cal-component-memo-preview.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 0c759a1..a70bf57 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-component-preview.h b/calendar/gui/e-cal-component-preview.h
index 73e8126..4faa7bd 100644
--- a/calendar/gui/e-cal-component-preview.h
+++ b/calendar/gui/e-cal-component-preview.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index 18ceee7..fb1d6c2 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-config.h b/calendar/gui/e-cal-config.h
index 8f27cbd..15ad617 100644
--- a/calendar/gui/e-cal-config.h
+++ b/calendar/gui/e-cal-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index 6e295ab..db7e9ab 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-event.h b/calendar/gui/e-cal-event.h
index a77d2a1..0802640 100644
--- a/calendar/gui/e-cal-event.h
+++ b/calendar/gui/e-cal-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-list-view-config.c b/calendar/gui/e-cal-list-view-config.c
index 6c930b1..543b5e8 100644
--- a/calendar/gui/e-cal-list-view-config.c
+++ b/calendar/gui/e-cal-list-view-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-list-view-config.h b/calendar/gui/e-cal-list-view-config.h
index 021262e..270228b 100644
--- a/calendar/gui/e-cal-list-view-config.h
+++ b/calendar/gui/e-cal-list-view-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 0702d3a..6eab1f7 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Hans Petter Jansson  <hpj ximian com>
diff --git a/calendar/gui/e-cal-list-view.h b/calendar/gui/e-cal-list-view.h
index 606997c..656a582 100644
--- a/calendar/gui/e-cal-list-view.h
+++ b/calendar/gui/e-cal-list-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-menu.c b/calendar/gui/e-cal-menu.c
index c6639b2..b1f5ed9 100644
--- a/calendar/gui/e-cal-menu.c
+++ b/calendar/gui/e-cal-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-menu.h b/calendar/gui/e-cal-menu.h
index 9c37a6a..5dda63f 100644
--- a/calendar/gui/e-cal-menu.h
+++ b/calendar/gui/e-cal-menu.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index db25bf2..dac641a 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model-calendar.h b/calendar/gui/e-cal-model-calendar.h
index ec0cb4c..abe5363 100644
--- a/calendar/gui/e-cal-model-calendar.h
+++ b/calendar/gui/e-cal-model-calendar.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 0984827..95fe5f1 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model-memos.h b/calendar/gui/e-cal-model-memos.h
index 5417c9c..34b8e5a 100644
--- a/calendar/gui/e-cal-model-memos.h
+++ b/calendar/gui/e-cal-model-memos.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 5827117..a2b9eb6 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model-tasks.h b/calendar/gui/e-cal-model-tasks.h
index 40d651e..0900d1e 100644
--- a/calendar/gui/e-cal-model-tasks.h
+++ b/calendar/gui/e-cal-model-tasks.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 736f6a8..19844a7 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1522,7 +1522,7 @@ e_cal_view_objects_added_cb (ECalView *query, GList *objects, gpointer user_data
 			GSList *list = NULL;
 
 			pos = get_position_in_array (priv->objects, comp_data);
- 			
+
 			if (!g_ptr_array_remove (priv->objects, comp_data))
 				continue;
 
@@ -1576,7 +1576,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 
 	/*  re-add only the recurrence objects */
 	for (l = objects; l != NULL; l = g_list_next (l)) {
-		if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES)) 
+		if (!e_cal_util_component_is_instance (l->data) && e_cal_util_component_has_recurrences (l->data) && (priv->flags & E_CAL_MODEL_FLAGS_EXPAND_RECURRENCES))
 			list = g_list_prepend (list, l->data);
 		else {
 			int pos;
@@ -1639,7 +1639,7 @@ e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_d
 			e_cal_model_set_instance_times (comp_data, priv->zone);
 
 			pos = get_position_in_array (priv->objects, comp_data);
-			
+
 			e_table_model_row_changed (E_TABLE_MODEL (model), pos);
 		}
 	}
@@ -1676,7 +1676,7 @@ e_cal_view_objects_removed_cb (ECalView *query, GList *ids, gpointer user_data)
 
 			g_slist_free (l);
 			g_object_unref (comp_data);
-		
+
 			e_table_model_pre_change (E_TABLE_MODEL (model));
 			e_table_model_row_deleted (E_TABLE_MODEL (model), pos);
 		}
@@ -1739,15 +1739,15 @@ update_e_cal_view_for_client (ECalModel *model, ECalModelClient *client_data)
 	if (!client_data->do_query)
 		return;
 
-try_again:		
+try_again:
 	if (!e_cal_get_query (client_data->client, priv->full_sexp, &client_data->query, &error)) {
 		if (error->code == E_CALENDAR_STATUS_BUSY && tries != 10) {
 			tries++;
 			/*TODO chose an optimal value */
 			g_usleep (500);
 			g_clear_error (&error);
-			goto try_again;	
-		}	
+			goto try_again;
+		}
 
 		g_warning (G_STRLOC ": Unable to get query, %s", error->message);
 
@@ -1873,7 +1873,7 @@ remove_client_objects (ECalModel *model, ECalModelClient *client_data)
 			GSList *l = NULL;
 
 			g_ptr_array_remove (model->priv->objects, comp_data);
-		
+
 			l = g_slist_append (l, comp_data);
 			g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, l);
 
@@ -2014,9 +2014,9 @@ redo_queries (ECalModel *model)
 	slist = get_objects_as_list (model);
 	g_ptr_array_set_size (priv->objects, 0);
 	g_signal_emit (G_OBJECT (model), signals[COMPS_DELETED], 0, slist);
-	
+
 	e_table_model_rows_deleted (E_TABLE_MODEL (model), 0, len);
-	
+
 	g_slist_foreach (slist, (GFunc)g_object_unref, NULL);
 	g_slist_free (slist);
 
@@ -2342,7 +2342,7 @@ e_cal_model_component_class_init (ECalModelComponentClass *klass)
 
 
 static void
-e_cal_model_component_finalize (GObject *object) 
+e_cal_model_component_finalize (GObject *object)
 {
 	ECalModelComponent *comp_data = E_CAL_MODEL_COMPONENT(object);
 
@@ -2382,7 +2382,7 @@ e_cal_model_component_finalize (GObject *object)
 		g_free (comp_data->color);
 		comp_data->color = NULL;
 	}
-	
+
 	if (G_OBJECT_CLASS (parent_class)->finalize)
 		(* G_OBJECT_CLASS (parent_class)->finalize) (object);
 }
@@ -2440,7 +2440,7 @@ void
 e_cal_model_free_component_data (ECalModelComponent *comp_data)
 {
 	g_return_if_fail (comp_data != NULL);
-	
+
 	g_object_unref (comp_data);
 }
 
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index 6ec66a3..4b266b6 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -81,7 +81,7 @@ struct _ECalModelComponent {
 	icalcomponent *icalcomp;
 	time_t instance_start;
 	time_t instance_end;
-	
+
 	/* Private data used by ECalModelCalendar and ECalModelTasks */
 	/* keep these public to avoid many accessor functions */
 	ECellDateEditValue *dtstart;
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 0292f16..76dcb94 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cal-popup.h b/calendar/gui/e-cal-popup.h
index 185e987..5c68b48 100644
--- a/calendar/gui/e-cal-popup.h
+++ b/calendar/gui/e-cal-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-calendar-table-config.c b/calendar/gui/e-calendar-table-config.c
index f8a7af9..fb8d18c 100644
--- a/calendar/gui/e-calendar-table-config.c
+++ b/calendar/gui/e-calendar-table-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-calendar-table-config.h b/calendar/gui/e-calendar-table-config.h
index 12cbc3e..93588a6 100644
--- a/calendar/gui/e-calendar-table-config.h
+++ b/calendar/gui/e-calendar-table-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 5eba596..b8ce8d1 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h
index e9906ad..d5dac73 100644
--- a/calendar/gui/e-calendar-table.h
+++ b/calendar/gui/e-calendar-table.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index f88ae08..91f9ede 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -2061,7 +2061,7 @@ e_calendar_view_new_appointment_full (ECalendarView *cal_view, gboolean all_day,
 		int hours, mins;
 
 		if (!time_div) /* Possible if your gconf values aren't so nice */
-			time_div = 30; 
+			time_div = 30;
 
 		if (time_day_begin (now) == time_day_begin (dtstart)) {
 			/* same day as today */
@@ -2657,7 +2657,7 @@ draw_curved_rectangle (cairo_t *cr, double x0, double y0,
 	cairo_close_path (cr);
 }
 
-static void 
+static void
 error_response(GtkWidget *widget, gint response, void *data)
 {
 	gtk_widget_destroy (widget);
diff --git a/calendar/gui/e-calendar-view.h b/calendar/gui/e-calendar-view.h
index eedef31..99d405d 100644
--- a/calendar/gui/e-calendar-view.h
+++ b/calendar/gui/e-calendar-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cell-date-edit-config.c b/calendar/gui/e-cell-date-edit-config.c
index 5be8569..eb6c274 100644
--- a/calendar/gui/e-cell-date-edit-config.c
+++ b/calendar/gui/e-cell-date-edit-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cell-date-edit-config.h b/calendar/gui/e-cell-date-edit-config.h
index 6203aec..455cca7 100644
--- a/calendar/gui/e-cell-date-edit-config.h
+++ b/calendar/gui/e-cell-date-edit-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index b56d070..8a43c62 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
diff --git a/calendar/gui/e-cell-date-edit-text.h b/calendar/gui/e-cell-date-edit-text.h
index 9bbbfb0..c353ecd 100644
--- a/calendar/gui/e-cell-date-edit-text.h
+++ b/calendar/gui/e-cell-date-edit-text.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
diff --git a/calendar/gui/e-comp-editor-registry.c b/calendar/gui/e-comp-editor-registry.c
index 31b4637..a4bed10 100644
--- a/calendar/gui/e-comp-editor-registry.c
+++ b/calendar/gui/e-comp-editor-registry.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-comp-editor-registry.h b/calendar/gui/e-comp-editor-registry.h
index 4f14446..5c2b4c4 100644
--- a/calendar/gui/e-comp-editor-registry.h
+++ b/calendar/gui/e-comp-editor-registry.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-date-edit-config.c b/calendar/gui/e-date-edit-config.c
index d6fd6cf..f93f2cf 100644
--- a/calendar/gui/e-date-edit-config.c
+++ b/calendar/gui/e-date-edit-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-date-edit-config.h b/calendar/gui/e-date-edit-config.h
index c31899b..4065ec7 100644
--- a/calendar/gui/e-date-edit-config.h
+++ b/calendar/gui/e-date-edit-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index defd013..2aaab0d 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-date-time-list.h b/calendar/gui/e-date-time-list.h
index b4f6a01..fe5e1fd 100644
--- a/calendar/gui/e-date-time-list.h
+++ b/calendar/gui/e-date-time-list.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index 44156bf..edd02bb 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-config.h b/calendar/gui/e-day-view-config.h
index 6ca1f27..25d208b 100644
--- a/calendar/gui/e-day-view-config.h
+++ b/calendar/gui/e-day-view-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index 949f4b7..5b5536d 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-layout.h b/calendar/gui/e-day-view-layout.h
index 4ad1de6..f3d431c 100644
--- a/calendar/gui/e-day-view-layout.h
+++ b/calendar/gui/e-day-view-layout.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 97f5ab5..e161477 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-main-item.h b/calendar/gui/e-day-view-main-item.h
index 650f139..c9ce721 100644
--- a/calendar/gui/e-day-view-main-item.h
+++ b/calendar/gui/e-day-view-main-item.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index 9d7ce44..f6ded1e 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
@@ -781,7 +781,7 @@ e_day_view_time_item_show_popup_menu (EDayViewTimeItem *dvtmitem,
 		item = gtk_menu_item_new_with_label ("---");
 	gtk_widget_set_sensitive (item, FALSE);
 	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
-	
+
 	item = gtk_separator_menu_item_new ();
 	gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item);
 
diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h
index f3f2f64..9d7bdca 100644
--- a/calendar/gui/e-day-view-time-item.h
+++ b/calendar/gui/e-day-view-time-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 909379b..dd91133 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view-top-item.h b/calendar/gui/e-day-view-top-item.h
index d45aa4e..01a7c44 100644
--- a/calendar/gui/e-day-view-top-item.h
+++ b/calendar/gui/e-day-view-top-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index c8c06e6..ef8a336 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *      Damon Chaplin <damon ximian com>
@@ -681,10 +681,10 @@ 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;
-	
+
 	/* If our time hasn't been set yet, just return. */
 	if (day_view->lower == 0 && day_view->upper == 0)
 		return;
@@ -1812,7 +1812,7 @@ set_text_as_bold (EDayViewEvent *event)
 	for (l = attendees; l; l = l->next) {
 		ECalComponentAttendee *attendee = l->data;
 
-		if ((g_str_equal (itip_strip_mailto (attendee->value), address)) 
+		if ((g_str_equal (itip_strip_mailto (attendee->value), address))
 		 || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) {
 			at = attendee;
 			break;
@@ -1820,7 +1820,7 @@ set_text_as_bold (EDayViewEvent *event)
 	}
 
 	/* The attendee has not yet accepted the meeting, display the summary as bolded.
-	   If the attendee is not present, it might have come through a mailing list. 
+	   If the attendee is not present, it might have come through a mailing list.
 	   In that case, we never show the meeting as bold even if it is unaccepted. */
 	if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION))
 		gnome_canvas_item_set (event->canvas_item, "bold", TRUE, NULL);
@@ -3077,10 +3077,10 @@ e_day_view_on_time_canvas_scroll (GtkWidget      *widget,
 		return TRUE;
 	default:
 		return FALSE;
-	} 
-} 
- 
-static gboolean 
+	}
+}
+
+static gboolean
 e_day_view_on_long_event_button_press (EDayView		*day_view,
 				       gint		 event_num,
 				       GdkEventButton	*event,
@@ -3250,7 +3250,7 @@ e_day_view_on_event_click (EDayView *day_view,
 	    && (pos == E_CALENDAR_VIEW_POS_TOP_EDGE
 		|| pos == E_CALENDAR_VIEW_POS_BOTTOM_EDGE)) {
 		gboolean read_only = FALSE;
-	
+
 		if (event && (!event->is_editable || (e_cal_is_read_only (event->comp_data->client, &read_only, NULL) && read_only))) {
 			return;
 		}
@@ -4081,7 +4081,7 @@ e_day_view_finish_resize (EDayView *day_view)
 
 	if (day_view->resize_event_num == -1)
 		return;
-	
+
 	day = day_view->resize_event_day;
 	event_num = day_view->resize_event_num;
 	event = &g_array_index (day_view->events[day], EDayViewEvent,
@@ -4137,7 +4137,7 @@ e_day_view_finish_resize (EDayView *day_view)
  			gtk_widget_queue_draw (day_view->top_canvas);
 			goto out;
  		}
-				
+
 		if (mod == CALOBJ_MOD_ALL)
 			comp_util_sanitize_recurrence_master (comp, client);
 
@@ -4616,7 +4616,7 @@ e_day_view_reshape_day_events (EDayView *day_view,
 		if (day_view->last_edited_comp_string == NULL) {
 			g_free (current_comp_string);
 			continue;
-		}			
+		}
 
 		if (strncmp (current_comp_string, day_view->last_edited_comp_string,50) == 0) {
 			e_canvas_item_grab_focus (event->canvas_item, TRUE);
@@ -7544,7 +7544,7 @@ e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,
 					g_object_unref (comp);
 					return;
 				}
-				
+
 				if (mod == CALOBJ_MOD_ALL)
 					comp_util_sanitize_recurrence_master (comp, client);
 
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 7cfb3c2..d22201e 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index bab3620..12442ba 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -873,7 +873,7 @@ write_recurrence_piece (EItipControl *itip, ECalComponent *comp,
 		dt.value = &r->until;
 		dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone);
 
-		write_label_piece (itip, &dt, buffer, 
+		write_label_piece (itip, &dt, buffer,
 				   /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/
 				   _(", ending on "), NULL, TRUE);
 	}
diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h
index 642eccf..38dce21 100644
--- a/calendar/gui/e-itip-control.h
+++ b/calendar/gui/e-itip-control.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index efa6165..0b5e147 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -846,7 +846,7 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia,
 
 	/* If the busy_type is FREE, then there is no need to render it in UI */
 	if (busy_type == E_MEETING_FREE_BUSY_FREE)
-		goto done; 
+		goto done;
 
 	/* If the busy range is not set elsewhere, track it as best we can */
 	if (!priv->start_busy_range_set) {
diff --git a/calendar/gui/e-meeting-attendee.h b/calendar/gui/e-meeting-attendee.h
index a9f3444..a259de6 100644
--- a/calendar/gui/e-meeting-attendee.h
+++ b/calendar/gui/e-meeting-attendee.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 2d8a532..c903c97 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-list-view.h b/calendar/gui/e-meeting-list-view.h
index 12deb8a..50aad0c 100644
--- a/calendar/gui/e-meeting-list-view.h
+++ b/calendar/gui/e-meeting-list-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index a5bbffb..5e62709 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-store.h b/calendar/gui/e-meeting-store.h
index d20c122..8a237fc 100644
--- a/calendar/gui/e-meeting-store.h
+++ b/calendar/gui/e-meeting-store.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index 6687919..ae7eeb7 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -15,7 +15,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon gtk org>
diff --git a/calendar/gui/e-meeting-time-sel-item.h b/calendar/gui/e-meeting-time-sel-item.h
index addb99e..310eb4c 100644
--- a/calendar/gui/e-meeting-time-sel-item.h
+++ b/calendar/gui/e-meeting-time-sel-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index 4bf44eb..c10a85e 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-time-sel.h b/calendar/gui/e-meeting-time-sel.h
index deb91c2..2cc8227 100644
--- a/calendar/gui/e-meeting-time-sel.h
+++ b/calendar/gui/e-meeting-time-sel.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-types.h b/calendar/gui/e-meeting-types.h
index 4f7d41e..bfcdfc5 100644
--- a/calendar/gui/e-meeting-types.h
+++ b/calendar/gui/e-meeting-types.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
index 30fbaf1..ac11881 100644
--- a/calendar/gui/e-meeting-utils.c
+++ b/calendar/gui/e-meeting-utils.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-meeting-utils.h b/calendar/gui/e-meeting-utils.h
index d360471..c71efec 100644
--- a/calendar/gui/e-meeting-utils.h
+++ b/calendar/gui/e-meeting-utils.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-memo-table-config.c b/calendar/gui/e-memo-table-config.c
index 21e6f03..d79dac7 100644
--- a/calendar/gui/e-memo-table-config.c
+++ b/calendar/gui/e-memo-table-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-memo-table-config.h b/calendar/gui/e-memo-table-config.h
index 5242b5f..68960d5 100644
--- a/calendar/gui/e-memo-table-config.h
+++ b/calendar/gui/e-memo-table-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index 35d6c26..ac43b39 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-memo-table.h b/calendar/gui/e-memo-table.h
index 58f398b..b593b94 100644
--- a/calendar/gui/e-memo-table.h
+++ b/calendar/gui/e-memo-table.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index c9f4681..f6f1cff 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-memos.h b/calendar/gui/e-memos.h
index 1b3f0b8..0a000f0 100644
--- a/calendar/gui/e-memos.h
+++ b/calendar/gui/e-memos.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-mini-calendar-config.c b/calendar/gui/e-mini-calendar-config.c
index dfafc86..ccd9a20 100644
--- a/calendar/gui/e-mini-calendar-config.c
+++ b/calendar/gui/e-mini-calendar-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-mini-calendar-config.h b/calendar/gui/e-mini-calendar-config.h
index 621d682..60c88a1 100644
--- a/calendar/gui/e-mini-calendar-config.h
+++ b/calendar/gui/e-mini-calendar-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index dea9dd4..c177c52 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -142,7 +142,7 @@ e_select_names_editable_get_emails (ESelectNamesEditable *esne)
 
 	for (l = destinations; l != NULL; l = l->next) {
 		destination = l->data;
-		if (e_destination_is_evolution_list (destination)) {	
+		if (e_destination_is_evolution_list (destination)) {
 			const GList *list_dests, *l;
 
 			list_dests = e_destination_list_get_dests (destination);
@@ -205,7 +205,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne)
 		return NULL;
 
 	for (l = destinations; l != NULL; l = l->next) {
-		destination = l->data;	
+		destination = l->data;
 		if (e_destination_is_evolution_list (destination)) {
 			const GList *list_dests, *l;
 
@@ -217,7 +217,7 @@ e_select_names_editable_get_names (ESelectNamesEditable *esne)
 			result = g_list_append (result, g_strdup (e_destination_get_name (destination)));
 		}
 	}
-	
+
 	g_list_free (destinations);
 
 	return result;
diff --git a/calendar/gui/e-select-names-editable.h b/calendar/gui/e-select-names-editable.h
index da96123..58b0ce3 100644
--- a/calendar/gui/e-select-names-editable.h
+++ b/calendar/gui/e-select-names-editable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 357eba4..f1aa1ec 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -100,7 +100,7 @@ e_select_names_renderer_start_editing (GtkCellRenderer *cell, GdkEvent *event, G
 
 	g_signal_connect (editable, "editing_done", G_CALLBACK (e_select_names_renderer_editing_done), sn_cell);
 
-	/* Removed focus-out-event. focus out event already listen by base class. 
+	/* Removed focus-out-event. focus out event already listen by base class.
            We don't need to listen for the focus out event any more */
 
 	sn_cell->priv->editable = g_object_ref (editable);
diff --git a/calendar/gui/e-select-names-renderer.h b/calendar/gui/e-select-names-renderer.h
index 21deec2..6a2c4be 100644
--- a/calendar/gui/e-select-names-renderer.h
+++ b/calendar/gui/e-select-names-renderer.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index eabe4d7..16d8b76 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -951,7 +951,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, ETasks *tasks)
 	priv = tasks->priv;
 
 	source = e_cal_get_source (ecal);
-	
+
 	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED || status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
 		auth_cal_forget_password (ecal);
 
diff --git a/calendar/gui/e-tasks.h b/calendar/gui/e-tasks.h
index 41fcd2d..67989ee 100644
--- a/calendar/gui/e-tasks.h
+++ b/calendar/gui/e-tasks.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 391079a..2be6548 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-timezone-entry.h b/calendar/gui/e-timezone-entry.h
index f4780f0..6c63fb8 100644
--- a/calendar/gui/e-timezone-entry.h
+++ b/calendar/gui/e-timezone-entry.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-config.c b/calendar/gui/e-week-view-config.c
index 28224fb..8a0c0de 100644
--- a/calendar/gui/e-week-view-config.c
+++ b/calendar/gui/e-week-view-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-config.h b/calendar/gui/e-week-view-config.h
index 32f32b0..e86e0fa 100644
--- a/calendar/gui/e-week-view-config.h
+++ b/calendar/gui/e-week-view-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index 49513e9..458d8e7 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-event-item.h b/calendar/gui/e-week-view-event-item.h
index 1e56a5d..69d041f 100644
--- a/calendar/gui/e-week-view-event-item.h
+++ b/calendar/gui/e-week-view-event-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index 6599a3f..37a2706 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
diff --git a/calendar/gui/e-week-view-layout.h b/calendar/gui/e-week-view-layout.h
index d531435..0acd41d 100644
--- a/calendar/gui/e-week-view-layout.h
+++ b/calendar/gui/e-week-view-layout.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index be69282..e1c090b 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
diff --git a/calendar/gui/e-week-view-main-item.h b/calendar/gui/e-week-view-main-item.h
index 818ba87..34bdfa2 100644
--- a/calendar/gui/e-week-view-main-item.h
+++ b/calendar/gui/e-week-view-main-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index d483473..e23f2a6 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
diff --git a/calendar/gui/e-week-view-titles-item.h b/calendar/gui/e-week-view-titles-item.h
index 89f33de..0463c95 100644
--- a/calendar/gui/e-week-view-titles-item.h
+++ b/calendar/gui/e-week-view-titles-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 52fabef..57c0547 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -367,7 +367,7 @@ static void
 model_row_changed_cb (ETableModel *etm, int row, gpointer user_data)
 {
 	EWeekView *week_view = E_WEEK_VIEW (user_data);
-	
+
 	if (!E_CALENDAR_VIEW (week_view)->in_focus) {
 		return;
 	}
@@ -1931,7 +1931,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span)
 	for (l = attendees; l; l = l->next) {
 		ECalComponentAttendee *attendee = l->data;
 
-		if ((g_str_equal (itip_strip_mailto (attendee->value), address)) 
+		if ((g_str_equal (itip_strip_mailto (attendee->value), address))
 		 || (attendee->sentby && g_str_equal (itip_strip_mailto (attendee->sentby), address))) {
 			at = attendee;
 			break;
@@ -1939,7 +1939,7 @@ set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span)
 	}
 
 	/* The attendee has not yet accepted the meeting, display the summary as bolded.
-	   If the attendee is not present, it might have come through a mailing list. 
+	   If the attendee is not present, it might have come through a mailing list.
 	   In that case, we never show the meeting as bold even if it is unaccepted. */
 	if (at && (at->status == ICAL_PARTSTAT_NEEDSACTION))
 		gnome_canvas_item_set (span->text_item, "bold", TRUE, NULL);
@@ -3625,7 +3625,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view,
 				if (!recur_component_dialog (client, comp, &mod, NULL, FALSE)) {
 					goto out;
 				}
-		
+
 				if (mod == CALOBJ_MOD_ALL)
 					comp_util_sanitize_recurrence_master (comp, client);
 
@@ -3879,16 +3879,16 @@ e_month_view_do_cursor_key_up (EWeekView *week_view)
 		/* no easy way to calculate new selection_start_day, therefore
 		 * calculate a time_t value and set_selected_time_range */
 		time_t current;
-		if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {			
-			current = time_add_week(current,-1);			
+		if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
+			current = time_add_week(current,-1);
 			e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP);
-			e_week_view_set_selected_time_range_visible(week_view,current,current);					
+			e_week_view_set_selected_time_range_visible(week_view,current,current);
 		}
 	} else {
 		week_view->selection_start_day -= 7;
 		week_view->selection_end_day = week_view->selection_start_day;
 	}
-	
+
 	g_signal_emit_by_name (week_view, "selected_time_changed");
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
@@ -3908,13 +3908,13 @@ e_month_view_do_cursor_key_down (EWeekView *week_view)
 		if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
 			current = time_add_week(current,1);
 			e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN);
-			e_week_view_set_selected_time_range_visible(week_view,current,current);				
+			e_week_view_set_selected_time_range_visible(week_view,current,current);
 		}
 	} else {
 		week_view->selection_start_day += 7;
 		week_view->selection_end_day = week_view->selection_start_day;
 	}
-	
+
 	g_signal_emit_by_name (week_view, "selected_time_changed");
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
@@ -3930,15 +3930,15 @@ e_month_view_do_cursor_key_left (EWeekView *week_view)
 		 * calculate a time_t value and set_selected_time_range */
 		time_t current;
 		if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
-			current = time_add_day(current,-1);			
+			current = time_add_day(current,-1);
 			e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_UP);
-			e_week_view_set_selected_time_range_visible(week_view,current,current);						
+			e_week_view_set_selected_time_range_visible(week_view,current,current);
 		}
 	} else {
 		week_view->selection_start_day--;
 		week_view->selection_end_day = week_view->selection_start_day;
 	}
-	
+
 	g_signal_emit_by_name (week_view, "selected_time_changed");
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
@@ -3958,13 +3958,13 @@ e_month_view_do_cursor_key_right (EWeekView *week_view)
 		if (e_calendar_view_get_selected_time_range(&week_view->cal_view, &current, NULL)) {
 			current = time_add_day(current,1);
 			e_week_view_scroll_a_step(week_view, E_CAL_VIEW_MOVE_PAGE_DOWN);
-			e_week_view_set_selected_time_range_visible(week_view,current,current);						
+			e_week_view_set_selected_time_range_visible(week_view,current,current);
 		}
 	} else {
 		week_view->selection_start_day++;
 		week_view->selection_end_day = week_view->selection_start_day;
 	}
-	
+
 	g_signal_emit_by_name (week_view, "selected_time_changed");
 	gtk_widget_queue_draw (week_view->main_canvas);
 }
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index e62b2f6..0936a1e 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 991df09..18f4a47 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -856,8 +856,8 @@ struct _date_query_msg {
 	GnomeCalendar *gcal;
 };
 
-static void 
-update_query_async (struct _date_query_msg *msg) 
+static void
+update_query_async (struct _date_query_msg *msg)
 {
 	GnomeCalendar *gcal = msg->gcal;
 	GnomeCalendarPrivate *priv;
@@ -866,7 +866,7 @@ update_query_async (struct _date_query_msg *msg)
 	GList *l;
 
 	priv = gcal->priv;
-	
+
 	/* free the previous queries */
 	for (l = priv->dn_queries; l != NULL; l = l->next) {
 		old_query = l->data;
@@ -889,7 +889,7 @@ update_query_async (struct _date_query_msg *msg)
 		g_slice_free (struct _date_query_msg, msg);
 		return; /* No time range is set, so don't start a query */
 	}
-	
+
 	/* create queries for each loaded client */
 	for (l = priv->clients_list[E_CAL_SOURCE_TYPE_EVENT]; l != NULL; l = l->next) {
 		GError *error = NULL;
@@ -899,7 +899,7 @@ update_query_async (struct _date_query_msg *msg)
 		if (e_cal_get_load_state ((ECal *) l->data) != E_CAL_LOAD_LOADED)
 			continue;
 
-try_again:		
+try_again:
 		old_query = NULL;
 		if (!e_cal_get_query ((ECal *) l->data, real_sexp, &old_query, &error)) {
 			/* If calendar is busy try again for 3 times. */
@@ -907,11 +907,11 @@ try_again:
 				tries++;
 				/*TODO chose an optimal value */
 				g_usleep (500);
-				
+
 				g_clear_error (&error);
-				goto try_again;	
-			}	
-			
+				goto try_again;
+			}
+
 			g_warning (G_STRLOC ": Could not create the query: %s ", error->message);
 			g_clear_error (&error);
 
@@ -943,7 +943,7 @@ try_again:
 /* Restarts a query for the date navigator in the calendar */
 static void
 update_query (GnomeCalendar *gcal)
-{	
+{
 	struct _date_query_msg *msg;
 
 	e_calendar_item_clear_marks (gcal->priv->date_navigator->calitem);
@@ -1954,7 +1954,7 @@ gnome_calendar_destroy (GtkObject *object)
 		}
 
 		for (i = 0; i < GNOME_CAL_LAST_VIEW; i++) {
-			if (priv->configs[i]) 
+			if (priv->configs[i])
 				g_object_unref (priv->configs[i]);
 			priv->configs[i] = NULL;
 		}
@@ -2423,7 +2423,7 @@ display_view (GnomeCalendar *gcal, GnomeCalendarViewType view_type, gboolean gra
 			continue;
 		E_CALENDAR_VIEW (priv->views [i])->in_focus = FALSE;
 	}
-	
+
 	if (grab_focus)
 		focus_current_view (gcal);
 
@@ -2475,7 +2475,7 @@ display_view_cb (GalViewInstance *view_instance, GalView *view, gpointer data)
 
 
 	display_view (gcal, view_type, TRUE);
-	
+
 	if (!priv->base_view_time)
 		update_view_times (gcal, time (NULL));
 	else
@@ -2783,7 +2783,7 @@ add_mclient (ECalModel *model, ECal *client)
 	message_push ((Message *) msg);
 }
 
-static void 
+static void
 non_intrusive_error_remove(GtkWidget *w, void *data)
 {
 	g_hash_table_remove(non_intrusive_error_table, data);
@@ -2832,7 +2832,7 @@ client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar *gcal)
 		return;
 	case E_CALENDAR_STATUS_INVALID_SERVER_VERSION:
 		id = g_strdup ("calendar:server-version");
-             
+
 		if (g_hash_table_lookup(non_intrusive_error_table, id)) {
 			/* We already have it */
 			g_message("Error occurred while existing dialog active:\n");
@@ -2978,7 +2978,7 @@ default_client_cal_opened_cb (ECal *ecal, ECalendarStatus status, GnomeCalendar
 		g_hash_table_remove (priv->clients[source_type], e_source_peek_uid (source));
 
 		/* FIXME Is there a better way to handle this? */
-		if (priv->default_client[source_type]) 
+		if (priv->default_client[source_type])
 			g_object_unref (priv->default_client[source_type]);
 		priv->default_client[source_type] = NULL;
 
@@ -3073,7 +3073,7 @@ backend_error_cb (ECal *client, const char *message, gpointer data)
 
 	g_hash_table_insert (non_intrusive_error_table, id, g_object_ref(dialog));
 	g_signal_connect(GTK_WIDGET (dialog), "destroy", G_CALLBACK(non_intrusive_error_remove), id);
-	
+
 	g_free (uristr);
 }
 
@@ -3675,7 +3675,7 @@ gnome_calendar_on_date_navigator_selection_changed (ECalendarItem *calitem, Gnom
 	/* Make the views display things properly */
 	update_view_times (gcal, new_time);
 	set_view (gcal, view_type, TRUE);
-	
+
 	gnome_calendar_notify_dates_shown_changed (gcal);
 }
 
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index 1cf2005..947559b 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/goto.c b/calendar/gui/goto.c
index ac41001..d341245 100644
--- a/calendar/gui/goto.c
+++ b/calendar/gui/goto.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/goto.h b/calendar/gui/goto.h
index c1f5163..3b774d2 100644
--- a/calendar/gui/goto.h
+++ b/calendar/gui/goto.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/itip-bonobo-control.c b/calendar/gui/itip-bonobo-control.c
index ccfb025..f63e3e1 100644
--- a/calendar/gui/itip-bonobo-control.c
+++ b/calendar/gui/itip-bonobo-control.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/itip-bonobo-control.h b/calendar/gui/itip-bonobo-control.h
index 7c20336..c79b8f7 100644
--- a/calendar/gui/itip-bonobo-control.h
+++ b/calendar/gui/itip-bonobo-control.h
@@ -1,7 +1,7 @@
 /*
  *
  * Evolution calendar - Control for displaying iTIP mail messages
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 30ad982..ae822c9 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/itip-utils.h b/calendar/gui/itip-utils.h
index 9c8ffa1..8dce826 100644
--- a/calendar/gui/itip-utils.h
+++ b/calendar/gui/itip-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 14b8267..1687328 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 1ed3fb1..d14b350 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -450,7 +450,7 @@ edit_memo_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 	calendar_setup_edit_memo_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source);
 }
 
-static void 
+static void
 set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
 {
 	MemosComponentView *component_view = data;
@@ -466,13 +466,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char
 static void
 mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	set_offline_availability (ep, pitem, data, "0"); 
+	set_offline_availability (ep, pitem, data, "0");
 }
 
 static void
 mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	set_offline_availability (ep, pitem, data, "1"); 
+	set_offline_availability (ep, pitem, data, "1");
 }
 
 static EPopupItem emc_source_popups[] = {
diff --git a/calendar/gui/memos-component.h b/calendar/gui/memos-component.h
index b399562..3ca01a5 100644
--- a/calendar/gui/memos-component.h
+++ b/calendar/gui/memos-component.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/memos-control.c b/calendar/gui/memos-control.c
index 7b743a9..2f7bd9b 100644
--- a/calendar/gui/memos-control.c
+++ b/calendar/gui/memos-control.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/memos-control.h b/calendar/gui/memos-control.h
index 5861ae5..565ac16 100644
--- a/calendar/gui/memos-control.h
+++ b/calendar/gui/memos-control.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 8a68e4f..97cc575 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/migration.h b/calendar/gui/migration.h
index 4073e31..c16fd83 100644
--- a/calendar/gui/migration.h
+++ b/calendar/gui/migration.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index acae5d8..ab657d8 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/misc.h b/calendar/gui/misc.h
index 3e0fe04..8c32865 100644
--- a/calendar/gui/misc.h
+++ b/calendar/gui/misc.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index 943a4af..3fca566 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/print.h b/calendar/gui/print.h
index 35454f9..39482b3 100644
--- a/calendar/gui/print.h
+++ b/calendar/gui/print.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index 9000060..b57a50d 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/tag-calendar.h b/calendar/gui/tag-calendar.h
index 847aab1..e1d9fcf 100644
--- a/calendar/gui/tag-calendar.h
+++ b/calendar/gui/tag-calendar.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 2d17f57..68536b2 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -442,7 +442,7 @@ edit_task_list_cb (EPopup *ep, EPopupItem *pitem, void *data)
 	calendar_setup_edit_task_list (GTK_WINDOW (gtk_widget_get_toplevel(ep->target->widget)), selected_source);
 }
 
-static void 
+static void
 set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char *value)
 {
 	TasksComponentView *component_view = data;
@@ -458,13 +458,13 @@ set_offline_availability (EPopup *ep, EPopupItem *pitem, void *data, const char
 static void
 mark_no_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	set_offline_availability (ep, pitem, data, "0"); 
+	set_offline_availability (ep, pitem, data, "0");
 }
 
 static void
 mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
-	set_offline_availability (ep, pitem, data, "1"); 
+	set_offline_availability (ep, pitem, data, "1");
 }
 
 static EPopupItem etc_source_popups[] = {
diff --git a/calendar/gui/tasks-component.h b/calendar/gui/tasks-component.h
index cbb25d7..0667fc2 100644
--- a/calendar/gui/tasks-component.h
+++ b/calendar/gui/tasks-component.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 9732f2f..7ee468e 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -484,7 +484,7 @@ confirm_purge (ETasks *tasks)
 		GTK_DIALOG_DESTROY_WITH_PARENT,
 		GTK_MESSAGE_WARNING,
 		GTK_BUTTONS_YES_NO,
-		"%s", 
+		"%s",
 		_("This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n\nReally erase these tasks?"));
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_NO);
 
diff --git a/calendar/gui/tasks-control.h b/calendar/gui/tasks-control.h
index a41783f..9dd3a39 100644
--- a/calendar/gui/tasks-control.h
+++ b/calendar/gui/tasks-control.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 6681829..56a7386 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h
index c730ebb..bd78201 100644
--- a/calendar/gui/weekday-picker.h
+++ b/calendar/gui/weekday-picker.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/importers/evolution-calendar-importer.h b/calendar/importers/evolution-calendar-importer.h
index 9a3facc..7874a80 100644
--- a/calendar/importers/evolution-calendar-importer.h
+++ b/calendar/importers/evolution-calendar-importer.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index a7ea5e7..a4e0fa7 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/importers/main.c b/calendar/importers/main.c
index b1a3a20..dc91f37 100644
--- a/calendar/importers/main.c
+++ b/calendar/importers/main.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/calendar/zones.h b/calendar/zones.h
index ad485eb..4489960 100644
--- a/calendar/zones.h
+++ b/calendar/zones.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index 077c0c5..3b40d27 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-actions.h b/composer/e-composer-actions.h
index da3e470..5d49cde 100644
--- a/composer/e-composer-actions.h
+++ b/composer/e-composer-actions.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c
index 842deae..5da5842 100644
--- a/composer/e-composer-autosave.c
+++ b/composer/e-composer-autosave.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-autosave.h b/composer/e-composer-autosave.h
index 7c97338..fe03b7b 100644
--- a/composer/e-composer-autosave.h
+++ b/composer/e-composer-autosave.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-common.h b/composer/e-composer-common.h
index 832b380..28affba 100644
--- a/composer/e-composer-common.h
+++ b/composer/e-composer-common.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index 68b6c0c..4dadfa7 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-from-header.h b/composer/e-composer-from-header.h
index f8c6dc6..d2603bd 100644
--- a/composer/e-composer-from-header.h
+++ b/composer/e-composer-from-header.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 3304130..f25c3b7 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
@@ -548,7 +548,7 @@ composer_header_table_constructor (GType type,
 			priv->headers[ii]->input_widget,
 			"right-attach", 2, NULL);
 
-		gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO, 
+		gtk_table_attach (GTK_TABLE (object), (GtkWidget *)priv->actions_container, 2, 4, E_COMPOSER_HEADER_TO,
 				  E_COMPOSER_HEADER_TO + 1, GTK_FILL, 0, 0, 3);
 	}
 
diff --git a/composer/e-composer-header-table.h b/composer/e-composer-header-table.h
index 8178630..91ad56d 100644
--- a/composer/e-composer-header-table.h
+++ b/composer/e-composer-header-table.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index 674e7a6..7b7cb9b 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-header.h b/composer/e-composer-header.h
index 126af5f..eb339d6 100644
--- a/composer/e-composer-header.h
+++ b/composer/e-composer-header.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
@@ -65,7 +65,7 @@ void		e_composer_header_set_sensitive	(EComposerHeader *header,
 gboolean	e_composer_header_get_visible	(EComposerHeader *header);
 void		e_composer_header_set_visible	(EComposerHeader *header,
 						 gboolean visible);
-void		e_composer_header_set_property 	(GObject *object, guint property_id, 
+void		e_composer_header_set_property 	(GObject *object, guint property_id,
 						const GValue *value, GParamSpec *pspec);
 void		e_composer_header_set_title_tooltip
 						(EComposerHeader *header,
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index ed4e60c..bfc9441 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -282,7 +282,7 @@ e_composer_name_header_new_with_action (const gchar *label,
 
 	return g_object_new (
 		E_TYPE_COMPOSER_NAME_HEADER, "label", label,
-		"button", TRUE, "name-selector", name_selector, 
+		"button", TRUE, "name-selector", name_selector,
 		"addaction_text", action_label,
 		"addaction", action_label != NULL, NULL);
 }
diff --git a/composer/e-composer-name-header.h b/composer/e-composer-name-header.h
index af38666..100d6c8 100644
--- a/composer/e-composer-name-header.h
+++ b/composer/e-composer-name-header.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index bb971d5..59d81b8 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-post-header.h b/composer/e-composer-post-header.h
index 666d043..40dc5a8 100644
--- a/composer/e-composer-post-header.h
+++ b/composer/e-composer-post-header.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 0a1a91f..2a2cea6 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
@@ -101,7 +101,7 @@ e_composer_private_init (EMsgComposer *composer)
 		widget = gtkhtml_editor_get_managed_widget (editor, "/main-menu");
 		gtk_widget_hide (widget);
 		widget = gtkhtml_editor_get_managed_widget (editor, "/main-toolbar");
-		gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ);	
+		gtk_toolbar_set_style ((GtkToolbar *)widget, GTK_TOOLBAR_BOTH_HORIZ);
 		gtk_widget_hide (widget);
 
 	}
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index 8dc9b4b..49d9ae6 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index e676ef9..e765237 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -14,7 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
@@ -122,7 +122,7 @@ e_composer_text_header_new_button (const gchar *label, const gchar *action_label
 {
 	return g_object_new (
 		E_TYPE_COMPOSER_TEXT_HEADER, "label", label,
-		"button", TRUE, "addaction", action_label != NULL, 
+		"button", TRUE, "addaction", action_label != NULL,
 		"addaction_text", action_label,
 		"visible", action_label == NULL, NULL);
 }
diff --git a/composer/e-composer-text-header.h b/composer/e-composer-text-header.h
index 79e972d..74fb86f 100644
--- a/composer/e-composer-text-header.h
+++ b/composer/e-composer-text-header.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index a715774..946bff2 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1434,7 +1434,7 @@ msg_composer_update_preferences (GConfClient *client,
 
 	if (entry) {
 		if (strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_INLINE_SPELLING_KEY) != 0 &&
-		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 && 
+		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_LINKS_KEY) != 0 &&
 		    strcmp(gconf_entry_get_key(entry), COMPOSER_GCONF_MAGIC_SMILEYS_KEY) != 0)
 			return;
 	}
@@ -2928,13 +2928,13 @@ e_msg_composer_new_with_message (CamelMimeMessage *message)
 	/* Remove any other X-Evolution-* headers that may have been set */
 	xev = mail_tool_remove_xevolution_headers (message);
 	camel_header_raw_clear (&xev);
-	
+
 	/* Check for receipt request */
 	if (camel_medium_get_header (CAMEL_MEDIUM (message), "Disposition-Notification-To")) {
 		action = GTK_TOGGLE_ACTION (ACTION (REQUEST_READ_RECEIPT));
 		gtk_toggle_action_set_active (action, TRUE);
 	}
-	
+
 	/* Check for mail priority */
 	if (camel_medium_get_header (CAMEL_MEDIUM (message), "X-Priority")) {
 		action = GTK_TOGGLE_ACTION (ACTION (PRIORITIZE_MESSAGE));
@@ -3907,7 +3907,7 @@ e_msg_composer_request_close_all (void)
 
 		/* Try to autosave before closing.  If it fails for
 		 * some reason, the CLOSE action will still detect
-		 * unsaved changes and prompt the user. 
+		 * unsaved changes and prompt the user.
 		 *
 		 * FIXME If it /does/ prompt the user, the Cancel
 		 *       button will act the same as Discard Changes,
@@ -4094,7 +4094,7 @@ e_load_spell_languages (void)
 		const GtkhtmlSpellLanguage *language;
 
 		language = gtkhtml_spell_language_lookup (NULL);
-		
+
 		if (language) {
 			spell_languages = g_list_prepend (
 				spell_languages, (gpointer) language);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index bf712d2..b9985f7 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-bconf-map.c b/e-util/e-bconf-map.c
index 7d874b8..9f97a44 100644
--- a/e-util/e-bconf-map.c
+++ b/e-util/e-bconf-map.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-bconf-map.h b/e-util/e-bconf-map.h
index dfd015e..8c6ea6d 100644
--- a/e-util/e-bconf-map.h
+++ b/e-util/e-bconf-map.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-binding.c b/e-util/e-binding.c
index 6a29166..9d4e83f 100644
--- a/e-util/e-binding.c
+++ b/e-util/e-binding.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-binding.h b/e-util/e-binding.h
index 676093b..12f4db8 100644
--- a/e-util/e-binding.h
+++ b/e-util/e-binding.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index fdd3d3f..e2cf15a 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-bit-array.h b/e-util/e-bit-array.h
index 4504f5a..34c8016 100644
--- a/e-util/e-bit-array.h
+++ b/e-util/e-bit-array.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 875b679..c01b98c 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-categories-config.h b/e-util/e-categories-config.h
index 9eff161..bbd76f2 100644
--- a/e-util/e-categories-config.h
+++ b/e-util/e-categories-config.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config-listener.c b/e-util/e-config-listener.c
index 83fb305..7c1c6eb 100644
--- a/e-util/e-config-listener.c
+++ b/e-util/e-config-listener.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config-listener.h b/e-util/e-config-listener.h
index 655bc3c..4449d8f 100644
--- a/e-util/e-config-listener.h
+++ b/e-util/e-config-listener.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config.c b/e-util/e-config.c
index a2d68e1..5d0a709 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-config.h b/e-util/e-config.h
index 1ee7e29..b128005 100644
--- a/e-util/e-config.h
+++ b/e-util/e-config.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-corba-utils.c b/e-util/e-corba-utils.c
index 0288602..f673370 100644
--- a/e-util/e-corba-utils.c
+++ b/e-util/e-corba-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-corba-utils.h b/e-util/e-corba-utils.h
index 9792379..b6da724 100644
--- a/e-util/e-corba-utils.h
+++ b/e-util/e-corba-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-cursor.c b/e-util/e-cursor.c
index 7d547e3..c5f77c7 100644
--- a/e-util/e-cursor.c
+++ b/e-util/e-cursor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-cursor.h b/e-util/e-cursor.h
index f0b78b3..30ad722 100644
--- a/e-util/e-cursor.h
+++ b/e-util/e-cursor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index 0546430..9780335 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-utils.h b/e-util/e-dialog-utils.h
index 9d59412..6b9956d 100644
--- a/e-util/e-dialog-utils.h
+++ b/e-util/e-dialog-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index f1777ca..98e1be7 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h
index f5ff123..b7f8385 100644
--- a/e-util/e-dialog-widgets.h
+++ b/e-util/e-dialog-widgets.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-error.c b/e-util/e-error.c
index 23e52bc..f206795 100644
--- a/e-util/e-error.c
+++ b/e-util/e-error.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -529,7 +529,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 		g_string_free (oerr, TRUE);
 	} else
 		perr = g_strdup (gtk_window_get_title (GTK_WINDOW (dialog)));
-	
+
 	if (e->secondary) {
 		ee_build_label(out, e->secondary, args, TRUE);
 		oerr = g_string_new("");
@@ -561,7 +561,7 @@ e_error_newv(GtkWindow *parent, const char *tag, const char *arg0, va_list ap)
 	gtk_box_pack_start((GtkBox *)dialog->vbox, hbox, TRUE, TRUE, 0);
 	g_object_set_data_full ((GObject *) dialog, "primary", perr, g_free);
 	g_object_set_data_full ((GObject *) dialog, "secondary", serr, g_free);
-	
+
 	return (GtkWidget *)dialog;
 }
 
diff --git a/e-util/e-error.h b/e-util/e-error.h
index 3219578..014f74e 100644
--- a/e-util/e-error.h
+++ b/e-util/e-error.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 7311122..ab96701 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-event.h b/e-util/e-event.h
index c97f1b3..5b4e3f4 100644
--- a/e-util/e-event.h
+++ b/e-util/e-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-folder-map.c b/e-util/e-folder-map.c
index 157c4ca..d74817e 100644
--- a/e-util/e-folder-map.c
+++ b/e-util/e-folder-map.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-folder-map.h b/e-util/e-folder-map.h
index a939ea7..3f41838 100644
--- a/e-util/e-folder-map.h
+++ b/e-util/e-folder-map.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-fsutils.c b/e-util/e-fsutils.c
index 28b434f..2748095 100644
--- a/e-util/e-fsutils.c
+++ b/e-util/e-fsutils.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-fsutils.h b/e-util/e-fsutils.h
index 91ad9b9..76a03f5 100644
--- a/e-util/e-fsutils.h
+++ b/e-util/e-fsutils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 4cdb0ee..4958f08 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h
index fa70e55..55e67ba 100644
--- a/e-util/e-html-utils.h
+++ b/e-util/e-html-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 299dfff..5b1cd2f 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-icon-factory.h b/e-util/e-icon-factory.h
index c864b1b..b8a4df9 100644
--- a/e-util/e-icon-factory.h
+++ b/e-util/e-icon-factory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-import.c b/e-util/e-import.c
index 9e8c8a3..ccc44d7 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-import.h b/e-util/e-import.h
index 9a99941..4ca1ef1 100644
--- a/e-util/e-import.h
+++ b/e-util/e-import.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-logger.c b/e-util/e-logger.c
index 3d3c88c..19326d2 100644
--- a/e-util/e-logger.c
+++ b/e-util/e-logger.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -243,7 +243,7 @@ e_logger_log (ELogger *logger,
 	set_dirty (logger);
 }
 
-void 
+void
 e_logger_get_logs (ELogger *logger,
                    ELogFunction func,
                    gpointer data)
@@ -256,7 +256,7 @@ e_logger_get_logs (ELogger *logger,
 
 	/* Flush everything before we get the logs */
 	if (logger->priv->fp)
-		fflush (logger->priv->fp);	
+		fflush (logger->priv->fp);
 	fp = g_fopen (logger->priv->logfile, "r");
 
 	if (!fp) {
diff --git a/e-util/e-logger.h b/e-util/e-logger.h
index 186d918..b3bd4f8 100644
--- a/e-util/e-logger.h
+++ b/e-util/e-logger.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-menu.c b/e-util/e-menu.c
index cfbb215..e5472d6 100644
--- a/e-util/e-menu.c
+++ b/e-util/e-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-menu.h b/e-util/e-menu.h
index f844f80..5df8f11 100644
--- a/e-util/e-menu.h
+++ b/e-util/e-menu.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index ade1abc..6825639 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-mktemp.h b/e-util/e-mktemp.h
index 48e7223..01dbd18 100644
--- a/e-util/e-mktemp.h
+++ b/e-util/e-mktemp.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-non-intrusive-error-dialog.c b/e-util/e-non-intrusive-error-dialog.c
index 070c1e9..bb24a23 100644
--- a/e-util/e-non-intrusive-error-dialog.c
+++ b/e-util/e-non-intrusive-error-dialog.c
@@ -169,7 +169,7 @@ eni_error_level_value_changed (GtkComboBox *w, gpointer *data)
         g_object_unref (gconf_client);
 }
 
-void 
+void
 eni_show_logger(ELogger *logger, GtkWidget *top,const char *error_timeout_path, const char *error_level_path)
 {
 	GtkWidget *container;
diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c
index 877d60a..b2338cc 100644
--- a/e-util/e-pilot-map.c
+++ b/e-util/e-pilot-map.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-pilot-map.h b/e-util/e-pilot-map.h
index d49d62c..46eaf54 100644
--- a/e-util/e-pilot-map.h
+++ b/e-util/e-pilot-map.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-pilot-util.c b/e-util/e-pilot-util.c
index 2273064..582c945 100644
--- a/e-util/e-pilot-util.c
+++ b/e-util/e-pilot-util.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-pilot-util.h b/e-util/e-pilot-util.h
index 8559918..0d7aebb 100644
--- a/e-util/e-pilot-util.h
+++ b/e-util/e-pilot-util.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index c3ee13f..840dd67 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
@@ -29,7 +29,7 @@
 
 struct _EPluginUIHookPrivate {
 
-	/* Table of GtkUIManager ID's to UI definitions. 
+	/* Table of GtkUIManager ID's to UI definitions.
 	 *
 	 * For example:
 	 *
diff --git a/e-util/e-plugin-ui.h b/e-util/e-plugin-ui.h
index b8e795c..cdefda5 100644
--- a/e-util/e-plugin-ui.h
+++ b/e-util/e-plugin-ui.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index d43238b..7516fb3 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -459,7 +459,7 @@ ep_load(const char *filename, int load_level)
 						if (load_level == 1)
 							e_plugin_invoke (ep, "load_plugin_type_register_function", NULL);
 					}
-				} 
+				}
 			} else if (load_level == 2) {
 				ep = ep_load_plugin(root, pdoc);
 			}
diff --git a/e-util/e-plugin.h b/e-util/e-plugin.h
index 0b31409..54855d0 100644
--- a/e-util/e-plugin.h
+++ b/e-util/e-plugin.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -376,8 +376,8 @@ 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 
+/* README: Currently there is only one flag.
+   But we may need more in the future and hence makes
    sense to keep as an enum */
 
 typedef enum _EPluginFlags {
diff --git a/e-util/e-popup.c b/e-util/e-popup.c
index 41428c3..bcd1527 100644
--- a/e-util/e-popup.c
+++ b/e-util/e-popup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-popup.h b/e-util/e-popup.h
index 877f5df..65c51ce 100644
--- a/e-util/e-popup.h
+++ b/e-util/e-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-print.c b/e-util/e-print.c
index 4cc3b81..8faeafc 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-print.h b/e-util/e-print.h
index 93cbe2d..9469b63 100644
--- a/e-util/e-print.h
+++ b/e-util/e-print.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-profile-event.c b/e-util/e-profile-event.c
index 4fdd5d9..ee98ad8 100644
--- a/e-util/e-profile-event.c
+++ b/e-util/e-profile-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-profile-event.h b/e-util/e-profile-event.h
index dd84671..c20a5f1 100644
--- a/e-util/e-profile-event.h
+++ b/e-util/e-profile-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-request.c b/e-util/e-request.c
index 1977b9b..2175c75 100644
--- a/e-util/e-request.c
+++ b/e-util/e-request.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-request.h b/e-util/e-request.h
index a84da29..ae822db 100644
--- a/e-util/e-request.h
+++ b/e-util/e-request.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature-list.c b/e-util/e-signature-list.c
index d2b575c..eaeddda 100644
--- a/e-util/e-signature-list.c
+++ b/e-util/e-signature-list.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature-list.h b/e-util/e-signature-list.h
index cfaa64c..8d8caed 100644
--- a/e-util/e-signature-list.h
+++ b/e-util/e-signature-list.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature.c b/e-util/e-signature.c
index 2d0df59..1cbed6b 100644
--- a/e-util/e-signature.c
+++ b/e-util/e-signature.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-signature.h b/e-util/e-signature.h
index cc5309c..cc8591b 100644
--- a/e-util/e-signature.h
+++ b/e-util/e-signature.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter-array.c b/e-util/e-sorter-array.c
index 582ed95..060c3f4 100644
--- a/e-util/e-sorter-array.c
+++ b/e-util/e-sorter-array.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter-array.h b/e-util/e-sorter-array.h
index f31d9b0..a02f5d9 100644
--- a/e-util/e-sorter-array.h
+++ b/e-util/e-sorter-array.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter.c b/e-util/e-sorter.c
index 6176b58..f63e5e1 100644
--- a/e-util/e-sorter.c
+++ b/e-util/e-sorter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-sorter.h b/e-util/e-sorter.h
index 365d66a..d64851b 100644
--- a/e-util/e-sorter.h
+++ b/e-util/e-sorter.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index 4b99d89..f440191 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h
index 87e3fa7..99635e2 100644
--- a/e-util/e-text-event-processor-emacs-like.h
+++ b/e-util/e-text-event-processor-emacs-like.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h
index c4c0efa..6e9d155 100644
--- a/e-util/e-text-event-processor-types.h
+++ b/e-util/e-text-event-processor-types.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 48100de..6496a63 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h
index 1f88407..a9d329c 100644
--- a/e-util/e-text-event-processor.h
+++ b/e-util/e-text-event-processor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-util-labels.c b/e-util/e-util-labels.c
index a7d5913..ba1d011 100644
--- a/e-util/e-util-labels.c
+++ b/e-util/e-util-labels.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -218,7 +218,7 @@ find_label (GSList *labels, const char *tag)
 
 	for (l = labels; l; l = l->next) {
 		EUtilLabel *label = l->data;
-	
+
 		if (label && label->tag && !strcmp (tag, label->tag))
 			return label;
 	}
diff --git a/e-util/e-util-labels.h b/e-util/e-util-labels.h
index ee06ccc..725f740 100644
--- a/e-util/e-util-labels.h
+++ b/e-util/e-util-labels.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/e-util/e-util-private.h b/e-util/e-util-private.h
index cca11e2..f7d84de 100644
--- a/e-util/e-util-private.h
+++ b/e-util/e-util-private.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-util.c b/e-util/e-util.c
index fc4f71f..533dc2d 100644
--- a/e-util/e-util.c
+++ b/e-util/e-util.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1297,7 +1297,7 @@ e_file_lock_destroy ()
 	}
 }
 
-gboolean 
+gboolean
 e_file_lock_exists ()
 {
 	const char *fname = get_lock_filename ();
@@ -1334,7 +1334,7 @@ e_util_guess_mime_type (const char *filename, gboolean localfile)
 			fi = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, NULL);
 			if (fi) {
 				mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (fi));
-	
+
 				g_object_unref (fi);
 			}
 
@@ -1460,7 +1460,7 @@ e_util_read_file (const char *filename, gboolean filename_is_uri, char **buffer,
 
 				if (err)
 					res = FALSE;
-				
+
 				if (res)
 					*buffer = buff;
 				else
diff --git a/e-util/e-util.h b/e-util/e-util.h
index 480da24..e512621 100644
--- a/e-util/e-util.h
+++ b/e-util/e-util.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 1c8c5d3..04c70af 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index 653669b..73dd415 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h
index ef8ae8a..c327d61 100644
--- a/e-util/e-xml-utils.h
+++ b/e-util/e-xml-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/e-util/gconf-bridge.c b/e-util/gconf-bridge.c
index ff880a1..1b84497 100644
--- a/e-util/gconf-bridge.c
+++ b/e-util/gconf-bridge.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2005 OpenedHand Ltd.
  *
  * Author: Jorn Baayen <jorn openedhand com>
@@ -29,7 +29,7 @@
 
 struct _GConfBridge {
         GConfClient *client;
-        
+
         GHashTable *bindings;
 };
 
@@ -43,7 +43,7 @@ typedef enum {
 typedef struct {
         BindingType type;
         guint id;
-        
+
         gboolean delayed_mode;
 
         char *key;
@@ -149,7 +149,7 @@ gconf_bridge_get (void)
  * gconf_bridge_get_client
  * @bridge: A #GConfBridge
  *
- * Returns the #GConfClient used by @bridge. This is the same #GConfClient 
+ * Returns the #GConfClient used by @bridge. This is the same #GConfClient
  * as returned by gconf_client_get_default().
  *
  * Return value: A #GConfClient.
@@ -183,7 +183,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
                                 GConfValue  *pref_value)
 {
         GValue src_value, value;
-        
+
         /* Make sure we don't enter an infinite synchronizing loop */
         g_signal_handler_block (binding->object, binding->prop_notify_id);
 
@@ -229,7 +229,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
                                    "transform a \"%s\" to a \"%s\".",
                                    g_type_name (src_value.g_type),
                                    g_type_name (value.g_type));
-                        
+
                         goto done;
                 }
 
@@ -239,7 +239,7 @@ prop_binding_sync_pref_to_prop (PropBinding *binding,
                 g_object_set_property (binding->object,
                                        binding->prop->name, &src_value);
         }
-        
+
 done:
         g_value_unset (&src_value);
         g_value_unset (&value);
@@ -397,7 +397,7 @@ prop_binding_pref_changed (GConfClient *client,
         prop_binding_sync_pref_to_prop (binding, gconf_value);
 }
 
-/* Performs a scheduled prop-to-pref sync for a prop binding in 
+/* Performs a scheduled prop-to-pref sync for a prop binding in
  * delay mode */
 static gboolean
 prop_binding_perform_scheduled_sync (PropBinding *binding)
@@ -407,7 +407,7 @@ prop_binding_perform_scheduled_sync (PropBinding *binding)
         binding->sync_timeout_id = 0;
 
         g_object_unref (binding->object);
-        
+
         return FALSE;
 }
 
@@ -451,7 +451,7 @@ prop_binding_object_destroyed (gpointer user_data,
         binding = (PropBinding *) user_data;
         binding->object = NULL; /* Don't do anything with the object
                                    at unbind() */
-        
+
         g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding->id));
 }
@@ -516,7 +516,7 @@ gconf_bridge_bind_property_full (GConfBridge *bridge,
         binding->object = object;
         binding->prop = pspec;
         binding->sync_timeout_id = 0;
-        
+
         /* Watch GConf key */
         binding->val_notify_id =
                 gconf_client_notify_add (bridge->client, key,
@@ -557,7 +557,7 @@ prop_binding_unbind (PropBinding *binding)
         if (binding->delayed_mode && binding->sync_timeout_id > 0) {
                 /* Perform any scheduled syncs */
                 g_source_remove (binding->sync_timeout_id);
-                        
+
                 /* The object will still be around as we have
                  * a reference */
                 prop_binding_perform_scheduled_sync (binding);
@@ -696,7 +696,7 @@ window_binding_window_destroyed (gpointer user_data,
         binding = (WindowBinding *) user_data;
         binding->window = NULL; /* Don't do anything with the window
                                    at unbind() */
-        
+
         g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding->id));
 }
@@ -708,7 +708,7 @@ window_binding_window_destroyed (gpointer user_data,
  * @window: A #GtkWindow
  * @bind_size: TRUE to bind the size of @window
  * @bind_pos: TRUE to bind the position of @window
- * 
+ *
  * On calling this function @window will be resized to the values
  * specified by "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height"
  * and maximixed if "@key_prefix<!-- -->_maximized is TRUE if
@@ -784,7 +784,7 @@ gconf_bridge_bind_window (GConfBridge *bridge,
         if (bind_pos) {
                 char *key;
                 GConfValue *x_val, *y_val;
-                
+
                 key = g_strconcat (key_prefix, "_x", NULL);
                 x_val = gconf_client_get (bridge->client, key, NULL);
                 g_free (key);
@@ -879,7 +879,7 @@ list_store_binding_sync_pref_to_store (ListStoreBinding *binding,
                                 binding->row_inserted_id);
         g_signal_handler_block (binding->list_store,
                                 binding->row_deleted_id);
-        
+
         gtk_list_store_clear (binding->list_store);
 
         list = gconf_value_get_list (value);
@@ -996,7 +996,7 @@ list_store_binding_store_destroyed (gpointer user_data,
         binding = (ListStoreBinding *) user_data;
         binding->list_store = NULL; /* Don't do anything with the store
                                        at unbind() */
-        
+
         g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding->id));
 }
@@ -1019,7 +1019,7 @@ list_store_binding_store_changed_cb (ListStoreBinding *binding)
  * @bridge: A #GConfBridge
  * @key: A GConf key to be bound
  * @list_store: A #GtkListStore
- * 
+ *
  * On calling this function single string column #GtkListStore @list_store
  * will be kept synchronized with the GConf string list value pointed to by
  * @key. On calling this function @list_store will be populated with the
@@ -1192,7 +1192,7 @@ gconf_bridge_unbind (GConfBridge *bridge,
 
         /* This will trigger the hash tables value destruction
          * function, which will take care of further cleanup */
-        g_hash_table_remove (bridge->bindings, 
+        g_hash_table_remove (bridge->bindings,
                              GUINT_TO_POINTER (binding_id));
 }
 
diff --git a/e-util/gconf-bridge.h b/e-util/gconf-bridge.h
index ba67f4f..7edd247 100644
--- a/e-util/gconf-bridge.h
+++ b/e-util/gconf-bridge.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * (C) 2005 OpenedHand Ltd.
  *
  * Author: Jorn Baayen <jorn openedhand com>
@@ -81,7 +81,7 @@ guint        gconf_bridge_bind_window            (GConfBridge  *bridge,
  * @bridge: A #GConfBridge
  * @key_prefix: The prefix of the GConf keys
  * @window: A #GtkWindow
- * 
+ *
  * On calling this function @window will be resized to the values specified by
  * "@key_prefix<!-- -->_width" and "@key_prefix<!-- -->_height".  The respective
  * GConf values will be updated when the window is resized. See
@@ -95,7 +95,7 @@ guint        gconf_bridge_bind_window            (GConfBridge  *bridge,
  * @bridge: A #GConfBridge
  * @key_prefix: The prefix of the GConf keys
  * @window: A #GtkWindow
- * 
+ *
  * On calling this function @window will be moved to the values specified by
  * "@key_prefix<!-- -->_x" and "@key_prefix<!-- -->_y". The respective GConf
  * values will be updated when the window is moved. See
diff --git a/filter/filter-code.c b/filter/filter-code.c
index 1de9c3a..fb0880b 100644
--- a/filter/filter-code.c
+++ b/filter/filter-code.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-code.h b/filter/filter-code.h
index 7199bce..38336fc 100644
--- a/filter/filter-code.h
+++ b/filter/filter-code.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-colour.c b/filter/filter-colour.c
index 0d0388d..a5cc353 100644
--- a/filter/filter-colour.c
+++ b/filter/filter-colour.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-colour.h b/filter/filter-colour.h
index 1de46ab..ff19d66 100644
--- a/filter/filter-colour.h
+++ b/filter/filter-colour.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-datespec.c b/filter/filter-datespec.c
index cf92b80..d0a7b59 100644
--- a/filter/filter-datespec.c
+++ b/filter/filter-datespec.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-datespec.h b/filter/filter-datespec.h
index cbb79a4..c8eee1b 100644
--- a/filter/filter-datespec.h
+++ b/filter/filter-datespec.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-element.c b/filter/filter-element.c
index c14365c..1fa0a14 100644
--- a/filter/filter-element.c
+++ b/filter/filter-element.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-element.h b/filter/filter-element.h
index 6124b36..7689454 100644
--- a/filter/filter-element.h
+++ b/filter/filter-element.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-file.c b/filter/filter-file.c
index e43a02b..2c0ac87 100644
--- a/filter/filter-file.c
+++ b/filter/filter-file.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-file.h b/filter/filter-file.h
index 81e6b8c..02dabdb 100644
--- a/filter/filter-file.h
+++ b/filter/filter-file.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-input.c b/filter/filter-input.c
index 693fea0..30d6ed9 100644
--- a/filter/filter-input.c
+++ b/filter/filter-input.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-input.h b/filter/filter-input.h
index b6c6019..ac71847 100644
--- a/filter/filter-input.h
+++ b/filter/filter-input.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-int.c b/filter/filter-int.c
index 969a477..170657e 100644
--- a/filter/filter-int.c
+++ b/filter/filter-int.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-int.h b/filter/filter-int.h
index 06add3f..60e1b2b 100644
--- a/filter/filter-int.h
+++ b/filter/filter-int.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-option.c b/filter/filter-option.c
index 7c5bbe9..f4b208c 100644
--- a/filter/filter-option.c
+++ b/filter/filter-option.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-option.h b/filter/filter-option.h
index 6cf5664..8a4931a 100644
--- a/filter/filter-option.h
+++ b/filter/filter-option.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-part.c b/filter/filter-part.c
index 08434ea..799e7fc 100644
--- a/filter/filter-part.c
+++ b/filter/filter-part.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-part.h b/filter/filter-part.h
index 6c83b1d..1827433 100644
--- a/filter/filter-part.h
+++ b/filter/filter-part.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/filter-rule.c b/filter/filter-rule.c
index 7972de1..cdc9f37 100644
--- a/filter/filter-rule.c
+++ b/filter/filter-rule.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -635,7 +635,7 @@ part_combobox_changed (GtkComboBox *combobox, struct _part_data *data)
 
 	g_return_if_fail (part != NULL);
 	g_return_if_fail (i == index);
-	
+
 	/* dont update if we haven't changed */
 	if (!strcmp (part->title, data->part->title))
 		return;
@@ -809,7 +809,7 @@ more_parts (GtkWidget *button, struct _rule_data *data)
 			adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w));
 			if (adjustment)
 				gtk_adjustment_set_value (adjustment, adjustment->upper);
-				
+
 		}
 	}
 }
diff --git a/filter/filter-rule.h b/filter/filter-rule.h
index b1683e1..24419fe 100644
--- a/filter/filter-rule.h
+++ b/filter/filter-rule.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-context.c b/filter/rule-context.c
index 0a7438b..4bd364f 100644
--- a/filter/rule-context.c
+++ b/filter/rule-context.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-context.h b/filter/rule-context.h
index ba7e47c..539c5b3 100644
--- a/filter/rule-context.h
+++ b/filter/rule-context.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-editor.c b/filter/rule-editor.c
index 066689a..07ea3fd 100644
--- a/filter/rule-editor.c
+++ b/filter/rule-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/filter/rule-editor.h b/filter/rule-editor.h
index 555b5e8..40cc90e 100644
--- a/filter/rule-editor.h
+++ b/filter/rule-editor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/iconv-detect.c b/iconv-detect.c
index cbc1a1e..4eb6597 100644
--- a/iconv-detect.c
+++ b/iconv-detect.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/e-attachment-handler-mail.c b/mail/e-attachment-handler-mail.c
index 790c7b9..c17c97d 100644
--- a/mail/e-attachment-handler-mail.c
+++ b/mail/e-attachment-handler-mail.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/e-attachment-handler-mail.h b/mail/e-attachment-handler-mail.h
index da4ff23..c62ea99 100644
--- a/mail/e-attachment-handler-mail.h
+++ b/mail/e-attachment-handler-mail.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/e-mail-attachment-bar.c b/mail/e-mail-attachment-bar.c
index 92fc827..e3656e1 100644
--- a/mail/e-mail-attachment-bar.c
+++ b/mail/e-mail-attachment-bar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/e-mail-attachment-bar.h b/mail/e-mail-attachment-bar.h
index e32f6e2..38a4a86 100644
--- a/mail/e-mail-attachment-bar.h
+++ b/mail/e-mail-attachment-bar.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/e-mail-search-bar.c b/mail/e-mail-search-bar.c
index 4d55585..6dcddaf 100644
--- a/mail/e-mail-search-bar.c
+++ b/mail/e-mail-search-bar.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/e-mail-search-bar.h b/mail/e-mail-search-bar.h
index 7f19e17..f4748c7 100644
--- a/mail/e-mail-search-bar.h
+++ b/mail/e-mail-search-bar.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/e-searching-tokenizer.c b/mail/e-searching-tokenizer.c
index e0edb9d..724cc3b 100644
--- a/mail/e-searching-tokenizer.c
+++ b/mail/e-searching-tokenizer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/e-searching-tokenizer.h b/mail/e-searching-tokenizer.h
index 37a0048..f96c37e 100644
--- a/mail/e-searching-tokenizer.h
+++ b/mail/e-searching-tokenizer.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c
index fc61cdc..2b13e7e 100644
--- a/mail/em-account-editor.c
+++ b/mail/em-account-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1422,7 +1422,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
 	} else {
 		current = g_strdup("imap");
 	}
-	
+
 	store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
 
 	i = 0;
@@ -1448,7 +1448,7 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
 
 		gtk_list_store_append(store, &iter);
 		gtk_list_store_set(store, &iter, 0, provider->name, 1, provider, -1);
-		
+
 		/* find the displayed and set default */
 		if (i == 0 || (current && strcmp(provider->protocol, current) == 0)) {
 			service->provider = provider;
@@ -1480,10 +1480,10 @@ emae_refresh_providers(EMAccountEditor *emae, EMAccountEditorService *service)
 	if (!uri  || (url = camel_url_new(uri, NULL)) == NULL) {
 		return;
 	}
-	
+
 	tmp = camel_url_get_param(url, "use_ssl");
 	if (tmp == NULL)
-		tmp = "never";	
+		tmp = "never";
 	for (i=0;i<num_ssl_options;i++) {
 		if (!strcmp(ssl_options[i].value, tmp)) {
 			gtk_combo_box_set_active(service->use_ssl, i);
@@ -2370,7 +2370,7 @@ emae_send_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct
 		gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0);
 		w = page;
 		g_object_unref(druidxml);
-		gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);	
+		gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
 	} else {
 		gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email")));
 	}
@@ -2687,7 +2687,7 @@ emae_service_complete(EMAccountEditor *emae, EMAccountEditorService *service)
 	if (CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) {
 		if (url->host == NULL || url->host[0] == 0)
 			ok = FALSE;
-		else 
+		else
 			gtk_entry_set_text(service->hostname, url->host);
 	}
 	/* We only need the user if the service needs auth as well, i think */
@@ -2802,14 +2802,14 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 				} else {
 					g_warning("buz1\n");
 				}
-				
+
 			}
 		} else if (!strcmp(pageid, "30.send")) {
 				CamelURL *url;
 				char *at, *user;
 				int index;
 				char *uri = (char *)e_account_get_string(emae->account, E_ACCOUNT_TRANSPORT_URL);
-				
+
 				tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS);
 				at = strchr(tmp, '@');
 				user = g_alloca(at-tmp+1);
@@ -2831,8 +2831,8 @@ emae_check_complete(EConfig *ec, const char *pageid, void *data)
 				} else {
 					g_warning("buz2\n");
 				}
-				
-		
+
+
 		} else if (!strcmp(pageid, "20.receive_options")) {
 			if (emae->priv->source.provider
 			    && emae->priv->extra_provider != emae->priv->source.provider) {
@@ -3095,5 +3095,5 @@ em_account_editor_construct(EMAccountEditor *emae, EAccount *account, em_account
 		g_signal_connect(emae->editor, "destroy", G_CALLBACK(emae_editor_destroyed), emae);
 	} else {
 		e_config_create_widget((EConfig *)ec);
-	} 
+	}
 }
diff --git a/mail/em-account-editor.h b/mail/em-account-editor.h
index fdd25b8..e17236e 100644
--- a/mail/em-account-editor.h
+++ b/mail/em-account-editor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-account-prefs.c b/mail/em-account-prefs.c
index 56bb4ce..d2303aa 100644
--- a/mail/em-account-prefs.c
+++ b/mail/em-account-prefs.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-account-prefs.h b/mail/em-account-prefs.h
index c63b9f5..0dabc8a 100644
--- a/mail/em-account-prefs.h
+++ b/mail/em-account-prefs.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-composer-prefs.c b/mail/em-composer-prefs.c
index c369bdc..8c704a2 100644
--- a/mail/em-composer-prefs.c
+++ b/mail/em-composer-prefs.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -956,7 +956,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs)
 	spell_setup (prefs);
 
 	/* Forwards and Replies */
-	prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle")); 
+	prefs->forward_style = GTK_COMBO_BOX (glade_xml_get_widget (gui, "comboboxForwardStyle"));
 	style = gconf_client_get_int (client, "/apps/evolution/mail/format/forward_style", NULL);
 	gtk_combo_box_set_active (prefs->forward_style, style);
 	g_signal_connect (prefs->forward_style, "changed", G_CALLBACK (style_changed), (gpointer) "/apps/evolution/mail/format/forward_style");
diff --git a/mail/em-composer-prefs.h b/mail/em-composer-prefs.h
index 82c6ece..2e12c7f 100644
--- a/mail/em-composer-prefs.h
+++ b/mail/em-composer-prefs.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 9b3dbe6..4ed3e70 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -469,7 +469,7 @@ static void
 composer_set_no_change (EMsgComposer *composer, gboolean drop_undo, gboolean editor_changed)
 {
 	GtkhtmlEditor *editor;
-	
+
 	g_return_if_fail (composer != NULL);
 
 	editor = GTKHTML_EDITOR (composer);
@@ -662,7 +662,7 @@ create_new_composer (const char *subject, const char *fromuri, gboolean use_defa
  	if (lite)
  		composer = e_msg_composer_lite_new ();
  	else
- 		composer = e_msg_composer_new ();	
+ 		composer = e_msg_composer_new ();
 	table = e_msg_composer_get_header_table (composer);
 
 	if (fromuri != NULL) {
@@ -773,7 +773,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 		CamelMimePart *mime_part = CAMEL_MIME_PART (message);
 		CamelDataWrapper *mail_text;
 		CamelMultipart *body = camel_multipart_new ();
-		CamelStream *stream;		
+		CamelStream *stream;
 		CamelMimePart *part;
 		int count1 = 0, string_changed = 0;
 		const char *cur;
@@ -863,8 +863,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 				}
 
 				g_strfreev(temp_str);
-			}	
-			else 
+			}
+			else
 				cur++;
 		}
 
@@ -879,7 +879,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 
 			mail_text = camel_data_wrapper_new ();
 			camel_data_wrapper_set_mime_type_field (mail_text, type);
-			
+
 			camel_stream_printf (stream, "%s", g_strdup(str));
 
 			camel_data_wrapper_construct_from_stream (mail_text, stream);
@@ -896,10 +896,10 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
 			camel_object_unref (body);
 		}
 	}
-		
+
 	composer = e_msg_composer_new_with_message (message);
-	
-	if (em_utils_folder_is_templates(drafts, NULL) == TRUE) 
+
+	if (em_utils_folder_is_templates(drafts, NULL) == TRUE)
 		em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, NULL, NULL);
 	else
 		em_composer_utils_setup_callbacks (composer, NULL, NULL, 0, 0, drafts, uid);
@@ -925,7 +925,7 @@ em_utils_edit_message (CamelMimeMessage *message, CamelFolder *folder)
 	if (folder)
 		edit_message (message, folder, NULL);
 	else
-		edit_message (message, NULL, NULL);	
+		edit_message (message, NULL, NULL);
 }
 
 static void
@@ -1047,7 +1047,7 @@ forward_attached_cb (CamelFolder *folder, GPtrArray *messages, CamelMimePart *pa
 
 	if (part)
 		forward_attached (folder, fad->uids, messages, part, subject, fad->fromuri);
-	
+
 	g_free (fad->fromuri);
 	g_free (fad);
 }
@@ -2261,7 +2261,7 @@ em_utils_construct_composer_text (CamelMimeMessage *message, EMFormat *source)
 	char *text, *credits;
 	ssize_t len = 0;
 	gboolean start_bottom = 0;
-	
+
 	credits = attribution_format (ATTRIBUTION, message);
 	text = em_utils_message_to_html (message, credits, EM_FORMAT_QUOTE_CITE, &len, source, start_bottom ? "<BR>" : NULL);
 
diff --git a/mail/em-composer-utils.h b/mail/em-composer-utils.h
index bbdb73d..60944cb 100644
--- a/mail/em-composer-utils.h
+++ b/mail/em-composer-utils.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -50,7 +50,7 @@ void em_utils_composer_send_cb(struct _EMsgComposer *composer, gpointer user_dat
 void em_utils_composer_save_draft_cb(struct _EMsgComposer *composer, gpointer user_data);
 
 void em_utils_compose_new_message (const char *fromuri);
-struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri); 
+struct _EMsgComposer * em_utils_compose_lite_new_message (const char *fromuri);
 
 /* FIXME: mailto?  url?  should make up its mind what its called.  imho use 'uri' */
 void em_utils_compose_new_message_with_mailto (const char *url, const char *fromuri);
diff --git a/mail/em-config.c b/mail/em-config.c
index 94df437..160cec8 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-config.h b/mail/em-config.h
index ba19bb1..5f89530 100644
--- a/mail/em-config.h
+++ b/mail/em-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-event.c b/mail/em-event.c
index 8a027cc..b415d5f 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-event.h b/mail/em-event.h
index 21df1df..7c2c4c6 100644
--- a/mail/em-event.h
+++ b/mail/em-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index b0f82a7..a2a699a 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-context.h b/mail/em-filter-context.h
index 6b2e4f1..56f11a3 100644
--- a/mail/em-filter-context.h
+++ b/mail/em-filter-context.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index 4a92a65..4f68cf4 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -141,7 +141,7 @@ select_source (GtkComboBox *combobox, EMFilterEditor *fe)
 
 	idx = gtk_combo_box_get_active (combobox);
 	sources = g_object_get_data (G_OBJECT (combobox), "sources");
-	
+
 	g_return_if_fail (idx >= 0 && idx < g_slist_length (sources));
 
 	source = (char *)g_slist_nth (sources, idx);
diff --git a/mail/em-filter-editor.h b/mail/em-filter-editor.h
index f37536d..8d9926b 100644
--- a/mail/em-filter-editor.h
+++ b/mail/em-filter-editor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-folder-element.c b/mail/em-filter-folder-element.c
index a95a4dd..b975b81 100644
--- a/mail/em-filter-folder-element.c
+++ b/mail/em-filter-folder-element.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-folder-element.h b/mail/em-filter-folder-element.h
index 8f9a2d8..0d7d3b5 100644
--- a/mail/em-filter-folder-element.h
+++ b/mail/em-filter-folder-element.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index 45dd78c..583f829 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -496,7 +496,7 @@ more_parts(GtkWidget *button, struct _rule_data *data)
 			adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (w));
 			if (adjustment)
 				gtk_adjustment_set_value (adjustment, adjustment->upper);
-				
+
 		}
 	}
 }
diff --git a/mail/em-filter-rule.h b/mail/em-filter-rule.h
index 49e7185..6ddaddc 100644
--- a/mail/em-filter-rule.h
+++ b/mail/em-filter-rule.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index e358716..23a1b76 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-filter-source-element.h b/mail/em-filter-source-element.h
index 3204b63..ac9a1ff 100644
--- a/mail/em-filter-source-element.h
+++ b/mail/em-filter-source-element.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index 201db81..c835a1b 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1476,8 +1476,8 @@ emfb_edit_select_all(BonoboUIComponent *uid, void *data, const char *path)
 
 				emfb_expand_all_threads (uid, data, path);
 
-				/* The time out below is added so that the execution thread to 
-				   expand all conversations threads would've completed. 
+				/* The time out below is added so that the execution thread to
+				   expand all conversations threads would've completed.
 
 				   The timeout 505 is just to ensure that the value is a small delta
 				   more than the timeout value in expand_all_threads thread. */
diff --git a/mail/em-folder-browser.h b/mail/em-folder-browser.h
index 75dbe97..e2c74ec 100644
--- a/mail/em-folder-browser.h
+++ b/mail/em-folder-browser.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 56194b6..b0fbfc6 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -240,7 +240,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 			gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
 			gtk_widget_show (label);
 			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-			
+
 			w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0);
 			gtk_spin_button_set_value ((GtkSpinButton *) w, (double) prop_data->argv->argv[i].ca_int);
 			gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE);
@@ -254,7 +254,7 @@ emfp_get_folder_item(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent,
 			gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5);
 			gtk_widget_show (label);
 			gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row + 1, GTK_FILL, 0, 0, 0);
-			
+
 			w = gtk_spin_button_new_with_range (G_MININT, G_MAXINT, 1.0);
 			gtk_spin_button_set_value ((GtkSpinButton *) w, prop_data->argv->argv[i].ca_double);
 			gtk_spin_button_set_numeric ((GtkSpinButton *) w, TRUE);
diff --git a/mail/em-folder-properties.h b/mail/em-folder-properties.h
index 8bae384..cd58a9e 100644
--- a/mail/em-folder-properties.h
+++ b/mail/em-folder-properties.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index 9257c57..ce97dcb 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-selection-button.h b/mail/em-folder-selection-button.h
index e9cd1c2..c0ab32f 100644
--- a/mail/em-folder-selection-button.h
+++ b/mail/em-folder-selection-button.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-selection.c b/mail/em-folder-selection.c
index d56a470..cfb244c 100644
--- a/mail/em-folder-selection.c
+++ b/mail/em-folder-selection.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-selection.h b/mail/em-folder-selection.h
index 78cd300..25c35d2 100644
--- a/mail/em-folder-selection.h
+++ b/mail/em-folder-selection.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 3762e05..ae6a896 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-selector.h b/mail/em-folder-selector.h
index 7b011f5..12662ae 100644
--- a/mail/em-folder-selector.h
+++ b/mail/em-folder-selector.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index e3a2eda..d90bcbb 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-tree-model.h b/mail/em-folder-tree-model.h
index 13114c8..706e389 100644
--- a/mail/em-folder-tree-model.h
+++ b/mail/em-folder-tree-model.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index f773068..77e62df 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1700,7 +1700,7 @@ emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m)
 
 	/* Traverse to the last valid iter */
 	titer = iter;
-	while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter)) 
+	while (gtk_tree_model_iter_next((GtkTreeModel *) model, &iter))
 		titer = iter; /* Preserve the last valid iter */
 
 	iter = titer;
diff --git a/mail/em-folder-tree.h b/mail/em-folder-tree.h
index b02a4d8..e76acf4 100644
--- a/mail/em-folder-tree.h
+++ b/mail/em-folder-tree.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 0555fb7..ad60516 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -408,8 +408,8 @@ em_folder_utils_delete_folder (CamelFolder *folder)
 		em_utils_show_error_silent (dialog);
 		return;
 	}
-	
-	if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM)) 
+
+	if (mail_folder_cache_get_folder_info_flags (folder, &flags) && (flags & CAMEL_FOLDER_SYSTEM))
 	{
 		e_error_run(NULL,"mail:no-delete-special-folder", folder->name, NULL);
 		return;
diff --git a/mail/em-folder-utils.h b/mail/em-folder-utils.h
index 4d03ce5..c139a9e 100644
--- a/mail/em-folder-utils.h
+++ b/mail/em-folder-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index b19057a..d0f8289 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -168,7 +168,7 @@ static const EMFolderViewEnable emfv_enable_map[] = {
 	{ "MessageFilterJunk",        EM_POPUP_SELECT_MANY },
 	{ "MessageCopy",              EM_POPUP_SELECT_MANY },
 	{ "MessageDelete",            EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE },
-	{ "MessageDeleteKey",         EM_POPUP_SELECT_MANY},	
+	{ "MessageDeleteKey",         EM_POPUP_SELECT_MANY},
 	{ "MessageForward",           EM_POPUP_SELECT_MANY },
 	{ "MessageForwardAttached",   EM_POPUP_SELECT_MANY },
 	{ "MessageForwardInline",     EM_POPUP_SELECT_ONE },
@@ -511,7 +511,7 @@ em_folder_view_open_selected(EMFolderView *emfv)
 	}
 
         if (em_utils_folder_is_drafts(emfv->folder, emfv->folder_uri)
-	    || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri) 	
+	    || em_utils_folder_is_templates(emfv->folder, emfv->folder_uri)
 	    || em_utils_folder_is_outbox(emfv->folder, emfv->folder_uri)) {
 		em_utils_edit_messages(emfv->folder, uids, TRUE);
 		return uids->len;
@@ -884,7 +884,7 @@ emfv_popup_source(EPopup *ep, EPopupItem *pitem, void *data)
 
 	emmb = (EMMessageBrowser *)em_message_browser_window_new();
 	em_format_set_session((EMFormat *)((EMFolderView *)emmb)->preview, ((EMFormat *)emfv->preview)->session);
-	message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]);	
+	message_list_ensure_message (((EMFolderView *)emmb)->list, uids->pdata[0]);
 	em_folder_view_set_folder((EMFolderView *)emmb, emfv->folder, emfv->folder_uri);
 	em_format_set_mode((EMFormat *)((EMFolderView *)emmb)->preview, EM_FORMAT_SOURCE);
 	em_folder_view_set_message((EMFolderView *)emmb, uids->pdata[0], FALSE);
@@ -1233,7 +1233,7 @@ emfv_popup_label_clear(EPopup *ep, EPopupItem *pitem, void *data)
 {
 	EMFolderView *emfv = data;
 	GSList *l;
-	EUtilLabel *label; 
+	EUtilLabel *label;
 
 	for (l = mail_config_get_labels (); l; l = l->next) {
 		label = l->data;
@@ -1365,7 +1365,7 @@ static EPopupItem emfv_popup_items[] = {
 
 	{ E_POPUP_BAR, (gchar *) "90.filter", NULL, NULL, NULL, NULL },
 	{ E_POPUP_SUBMENU, (gchar *) "90.filter.00", (gchar *) N_("Crea_te Rule From Message"), NULL, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
-	/* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */ 
+	/* Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on. */
 	{ E_POPUP_ITEM, (gchar *) "90.filter.00/00.00", (gchar *) N_("Search Folder based on _Subject"), emfv_popup_vfolder_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, (gchar *) "90.filter.00/00.01", (gchar *) N_("Search Folder based on Se_nder"), emfv_popup_vfolder_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, (gchar *) "90.filter.00/00.02", (gchar *) N_("Search Folder based on _Recipients"), emfv_popup_vfolder_recipients, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -1373,7 +1373,7 @@ static EPopupItem emfv_popup_items[] = {
 	  emfv_popup_vfolder_mlist, NULL, NULL, EM_POPUP_SELECT_ONE|EM_POPUP_SELECT_MAILING_LIST|EM_FOLDER_VIEW_SELECT_LISTONLY },
 
 	{ E_POPUP_BAR, (gchar *) "90.filter.00/10", NULL, NULL, NULL, NULL },
-	/* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */ 
+	/* Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on. */
 	{ E_POPUP_ITEM, (gchar *) "90.filter.00/10.00", (gchar *) N_("Filter based on Sub_ject"), emfv_popup_filter_subject, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, (gchar *) "90.filter.00/10.01", (gchar *) N_("Filter based on Sen_der"), emfv_popup_filter_sender, NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
 	{ E_POPUP_ITEM, (gchar *) "90.filter.00/10.02", (gchar *) N_("Filter based on Re_cipients"), emfv_popup_filter_recipients,  NULL, NULL, EM_POPUP_SELECT_ONE|EM_FOLDER_VIEW_SELECT_LISTONLY },
@@ -2610,7 +2610,7 @@ emfv_list_double_click(ETree *tree, gint row, ETreePath path, gint col, GdkEvent
 	/* Ignore double-clicks on columns that handle thier own state */
 	if (MESSAGE_LIST_COLUMN_IS_ACTIVE (col))
 		return;
-	
+
 	em_folder_view_open_selected(emfv);
 }
 
@@ -2931,7 +2931,7 @@ emfv_format_popup_event(EMFormatHTMLDisplay *efhd, GdkEventButton *event, const
 		if (!main_emp)
 			main_emp = emp;
 	}
-	
+
 	if (event == NULL)
 		gtk_menu_popup (menu, NULL, NULL, NULL, NULL, 0, gtk_get_current_event_time());
 	else
diff --git a/mail/em-folder-view.h b/mail/em-folder-view.h
index b69a4a1..3a7a153 100644
--- a/mail/em-folder-view.h
+++ b/mail/em-folder-view.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format-hook.c b/mail/em-format-hook.c
index 6088139..9fec654 100644
--- a/mail/em-format-hook.c
+++ b/mail/em-format-hook.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format-hook.h b/mail/em-format-hook.h
index 3665bbf..08d99dd 100644
--- a/mail/em-format-hook.h
+++ b/mail/em-format-hook.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index 8863bf7..8d25923 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -186,13 +186,13 @@ efhd_gtkhtml_realise(GtkHTML *html, EMFormatHTMLDisplay *efhd)
 
 		r = style->fg[state].red >> 8;
 		g = style->fg[state].green >> 8;
-		b = style->fg[state].blue >> 8;		
+		b = style->fg[state].blue >> 8;
 
 		efhd->formathtml.header_colour = ((r<<16) | (g<< 8) | b) & 0xffffff;
 
 		r = style->bg[state].red >> 8;
 		g = style->bg[state].green >> 8;
-		b = style->bg[state].blue >> 8;		
+		b = style->bg[state].blue >> 8;
 
 		efhd->formathtml.body_colour = ((r<<16) | (g<< 8) | b) & 0xffffff;
 
diff --git a/mail/em-format-html-display.h b/mail/em-format-html-display.h
index 99234e9..bd0ea0e 100644
--- a/mail/em-format-html-display.h
+++ b/mail/em-format-html-display.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/em-format-html-print.c b/mail/em-format-html-print.c
index 985828d..ef1bbb1 100644
--- a/mail/em-format-html-print.c
+++ b/mail/em-format-html-print.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format-html-print.h b/mail/em-format-html-print.h
index ef25b63..2abdc82 100644
--- a/mail/em-format-html-print.h
+++ b/mail/em-format-html-print.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/mail/em-format-html.c b/mail/em-format-html.c
index d0172ea..aa82851 100644
--- a/mail/em-format-html.c
+++ b/mail/em-format-html.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1500,18 +1500,18 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab
 	const char *fmt, *html;
 	char *mhtml = NULL;
 	gboolean is_rtl;
-	
+
 	if (value == NULL)
 		return;
 
 	while (*value == ' ')
 		value++;
-	
+
 	if (!(flags & EM_FORMAT_HTML_HEADER_HTML))
 		html = mhtml = camel_text_to_html (value, emfh->text_html_flags, 0);
-	else 
+	else
 		html = value;
-	
+
 	is_rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
 	if (emfh->simple_headers) {
 		fmt = "<b>%s</b>: %s<br>";
@@ -1528,7 +1528,7 @@ efh_format_text_header (EMFormatHTML *emfh, CamelStream *stream, const char *lab
 			else
 				fmt = "<tr><th align=\"right\" valign=\"top\" nowrap>%s<b>&nbsp;</b></th><td valign=top>%s</td></tr>";
 		} else {
-			
+
 			if (flags & EM_FORMAT_HEADER_BOLD) {
 				if (is_rtl)
 					fmt = "<tr><td align=\"right\" valign=\"top\" width=\"100%%\">%2$s</td><th align=\"left\" nowrap>%1$s:<b>&nbsp;</b></th></tr>";
@@ -1667,22 +1667,22 @@ static void
 canon_header_name (char *name)
 {
 	char *inptr = name;
-	
+
 	/* canonicalise the header name... first letter is
 	 * capitalised and any letter following a '-' also gets
 	 * capitalised */
-	
+
 	if (*inptr >= 'a' && *inptr <= 'z')
 		*inptr -= 0x20;
-	
+
 	inptr++;
-	
+
 	while (*inptr) {
 		if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z')
 			*inptr -= 0x20;
 		else if (*inptr >= 'A' && *inptr <= 'Z')
 			*inptr += 0x20;
-		
+
 		inptr++;
 	}
 }
@@ -1707,22 +1707,22 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 			break;
 		}
 	}
-	
+
 	label = _(name);
-	
+
 	if (addrspec) {
 		struct _camel_header_address *addrs;
 		GString *html;
 		char *img;
-		
+
 		buf = camel_header_unfold (header->value);
 		if (!(addrs = camel_header_address_decode (buf, emf->charset ? emf->charset : emf->default_charset))) {
 			g_free (buf);
 			return;
 		}
-		
+
 		g_free (buf);
-		
+
 		html = g_string_new("");
 		img = efh_format_address(efh, html, addrs, (char *)label);
 
@@ -1732,7 +1732,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 			flags |= EM_FORMAT_HTML_HEADER_NODEC;
 			g_free (img);
 		}
-		
+
 		camel_header_address_unref(addrs);
 		txt = value = html->str;
 		g_string_free(html, FALSE);
@@ -1742,7 +1742,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 		buf = camel_header_unfold (header->value);
 		txt = value = camel_header_decode_string (buf, charset);
 		g_free (buf);
-		
+
 		flags |= EM_FORMAT_HEADER_BOLD;
 	} else if (!strcmp(name, "X-evolution-mailer")) {
 		/* pseudo-header */
@@ -1769,7 +1769,7 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 
 		if (msg_offset) {
 			char buf[256], *html;
-			
+
 			msg_offset += (local.tm_hour * 60) + local.tm_min;
 			if (msg_offset >= (24 * 60) || msg_offset < 0) {
 				/* translators: strftime format for local time equivalent in Date header display, with day */
@@ -1782,27 +1782,27 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 				e_utf8_strftime(buf, sizeof(buf), msg, &local);
 				g_free(msg);
 			}
-			
+
 			html = camel_text_to_html(txt, efh->text_html_flags, 0);
 			txt = value = g_strdup_printf("%s %s", html, buf);
 			g_free(html);
 			flags |= EM_FORMAT_HTML_HEADER_HTML;
 		}
-		
+
 		flags |= EM_FORMAT_HEADER_BOLD;
 	} else if (!strcmp(name, "Newsgroups")) {
 		struct _camel_header_newsgroup *ng, *scan;
 		GString *html;
-		
+
 		buf = camel_header_unfold (header->value);
-		
+
 		if (!(ng = camel_header_newsgroups_decode (buf))) {
 			g_free (buf);
 			return;
 		}
-		
+
 		g_free (buf);
-		
+
 		html = g_string_new("");
 		scan = ng;
 		while (scan) {
@@ -1811,9 +1811,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 			if (scan)
 				g_string_append_printf(html, ", ");
 		}
-		
+
 		camel_header_newsgroups_free(ng);
-		
+
 		txt = html->str;
 		g_string_free(html, FALSE);
 		flags |= EM_FORMAT_HEADER_BOLD|EM_FORMAT_HTML_HEADER_HTML;
@@ -1826,9 +1826,9 @@ efh_format_header(EMFormat *emf, CamelStream *stream, CamelMedium *part, struct
 		txt = value = camel_header_decode_string (buf, charset);
 		g_free (buf);
 	}
-	
+
 	efh_format_text_header(efh, stream, label, txt, flags);
-	
+
 	g_free (value);
 	g_free (str_field);
 }
@@ -1850,7 +1850,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 	char *header_sender = NULL, *header_from = NULL, *name;
 	gboolean mail_from_delegate = FALSE;
 	const char *hdr_charset;
-	
+
 	if (!part)
 		return;
 
@@ -1863,9 +1863,9 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 				    "<font color=\"#%06x\">\n"
 				    "<table cellpadding=\"0\" width=\"100%%\">",
 				    efh->header_colour & 0xffffff);
-	
+
 	hdr_charset = emf->charset ? emf->charset : emf->default_charset;
-	
+
 	header = ((CamelMimePart *)part)->headers;
 	while (header) {
 		if (!g_ascii_strcasecmp (header->name, "Sender")) {
@@ -1904,7 +1904,7 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 
 		header = header->next;
 	}
-	
+
 	if (header_sender && header_from && mail_from_delegate) {
 		camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>");
 		if(gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
@@ -1976,11 +1976,11 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part)
 						have_icon = TRUE;
 				} else if (!face_decoded && face && !g_ascii_strcasecmp (header->name, "Face")) {
 					char *cp = header->value;
-					
+
 					/* Skip over spaces */
 					while (*cp == ' ')
 						cp++;
-					
+
 					face_header_value = g_base64_decode (cp, &face_header_len);
 					face_header_value = g_realloc (face_header_value, face_header_len + 1);
 					face_header_value[face_header_len] = 0;
diff --git a/mail/em-format-html.h b/mail/em-format-html.h
index 7cadd5e..eb8aec9 100644
--- a/mail/em-format-html.h
+++ b/mail/em-format-html.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format-quote.c b/mail/em-format-quote.c
index 40e6902..85249a2 100644
--- a/mail/em-format-quote.c
+++ b/mail/em-format-quote.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -271,22 +271,22 @@ static void
 canon_header_name (char *name)
 {
 	char *inptr = name;
-	
+
 	/* canonicalise the header name... first letter is
 	 * capitalised and any letter following a '-' also gets
 	 * capitalised */
-	
+
 	if (*inptr >= 'a' && *inptr <= 'z')
 		*inptr -= 0x20;
-	
+
 	inptr++;
-	
+
 	while (*inptr) {
 		if (inptr[-1] == '-' && *inptr >= 'a' && *inptr <= 'z')
 			*inptr -= 0x20;
 		else if (*inptr >= 'A' && *inptr <= 'Z')
 			*inptr += 0x20;
-		
+
 		inptr++;
 	}
 }
@@ -312,24 +312,24 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const
 			break;
 		}
 	}
-	
+
 	label = _(name);
-	
+
 	if (addrspec) {
 		struct _camel_header_address *addrs;
 		GString *html;
 
 		if (!(txt = camel_medium_get_header (part, name)))
 			return;
-		
+
 		buf = camel_header_unfold (txt);
 		if (!(addrs = camel_header_address_decode (txt, emf->charset ? emf->charset : emf->default_charset))) {
 			g_free (buf);
 			return;
 		}
-		
+
 		g_free (buf);
-		
+
 		html = g_string_new ("");
 		emfq_format_address (html, addrs);
 		camel_header_address_unref (addrs);
@@ -347,15 +347,15 @@ emfq_format_header (EMFormat *emf, CamelStream *stream, CamelMedium *part, const
 				if (!(txt = camel_medium_get_header (part, "x-newsreader")))
 					if (!(txt = camel_medium_get_header (part, "x-mimeole")))
 						return;
-		
+
 		txt = value = camel_header_format_ctext (txt, charset);
-		
+
 		label = _("Mailer");
 		flags |= EM_FORMAT_HEADER_BOLD;
 	} else if (!strcmp (name, "Date") || !strcmp (name, "Resent-Date")) {
 		if (!(txt = camel_medium_get_header (part, name)))
 			return;
-		
+
 		flags |= EM_FORMAT_HEADER_BOLD;
 	} else {
 		txt = camel_medium_get_header (part, name);
diff --git a/mail/em-format-quote.h b/mail/em-format-quote.h
index 87f0151..86d277b 100644
--- a/mail/em-format-quote.h
+++ b/mail/em-format-quote.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format.c b/mail/em-format.c
index b2360bb..3aa20b2 100644
--- a/mail/em-format.c
+++ b/mail/em-format.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-format.h b/mail/em-format.h
index ce3d522..e2363c2 100644
--- a/mail/em-format.h
+++ b/mail/em-format.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-html-stream.c b/mail/em-html-stream.c
index daa81d3..a1615d2 100644
--- a/mail/em-html-stream.c
+++ b/mail/em-html-stream.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-html-stream.h b/mail/em-html-stream.h
index a8eabdd..86baa5c 100644
--- a/mail/em-html-stream.h
+++ b/mail/em-html-stream.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-icon-stream.c b/mail/em-icon-stream.c
index 2e1a7ae..b06145a 100644
--- a/mail/em-icon-stream.c
+++ b/mail/em-icon-stream.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-icon-stream.h b/mail/em-icon-stream.h
index f92bfef..321e0ca 100644
--- a/mail/em-icon-stream.h
+++ b/mail/em-icon-stream.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-inline-filter.c b/mail/em-inline-filter.c
index f671159..ffe9f67 100644
--- a/mail/em-inline-filter.c
+++ b/mail/em-inline-filter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-inline-filter.h b/mail/em-inline-filter.h
index 062a590..b6bc385 100644
--- a/mail/em-inline-filter.h
+++ b/mail/em-inline-filter.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-junk-hook.c b/mail/em-junk-hook.c
index c4ea8b1..f95685e 100644
--- a/mail/em-junk-hook.c
+++ b/mail/em-junk-hook.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-junk-hook.h b/mail/em-junk-hook.h
index 70926b2..0e467a2 100644
--- a/mail/em-junk-hook.h
+++ b/mail/em-junk-hook.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-mailer-prefs.c b/mail/em-mailer-prefs.c
index bb78675..27f27ca 100644
--- a/mail/em-mailer-prefs.c
+++ b/mail/em-mailer-prefs.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -346,7 +346,7 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
 	gtk_box_pack_start ((GtkBox *)hbox, l2, FALSE, FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)hbox, entry2, FALSE, FALSE, 6);
 	gtk_box_pack_start ((GtkBox *)vbox, hbox, FALSE, FALSE, 6);
-	
+
 	gtk_widget_show_all (vbox);
 	gtk_container_add ((GtkContainer *)((GtkDialog *)dialog)->vbox, vbox);
 	response = gtk_dialog_run ((GtkDialog *)dialog);
@@ -355,9 +355,9 @@ jh_add_cb (GtkWidget *widget, gpointer user_data)
 		const char *value = gtk_entry_get_text ((GtkEntry *)entry2);
 		char *tok;
 		GSList *list = gconf_client_get_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, NULL);
-		
+
 		/* FIXME: Validate the values */
-		
+
 		tok = g_strdup_printf ("%s=%s", name, value);
 		list = g_slist_append (list, tok);
 		gconf_client_set_list (prefs->gconf, "/apps/evolution/mail/junk/custom_header", GCONF_VALUE_STRING, list, NULL);
@@ -395,7 +395,7 @@ jh_remove_cb (GtkWidget *widget, gpointer user_data)
 				if (strcmp (test, value) == 0)
 					break;
 			}
-				
+
 			prev = node;
 			node = node->next;
 		}
diff --git a/mail/em-mailer-prefs.h b/mail/em-mailer-prefs.h
index 3b52d9f..10503a8 100644
--- a/mail/em-mailer-prefs.h
+++ b/mail/em-mailer-prefs.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -123,7 +123,7 @@ struct _EMMailerPrefs {
 	struct _GtkToggleButton *check_incoming;
 	struct _GtkToggleButton *empty_junk;
 	struct _GtkComboBox *empty_junk_days;
-	
+
 	struct _GtkToggleButton *sa_local_tests_only;
 	struct _GtkToggleButton *sa_use_daemon;
 	struct _GtkComboBox *default_junk_plugin;
diff --git a/mail/em-menu.c b/mail/em-menu.c
index fc2e43d..b504bd3 100644
--- a/mail/em-menu.c
+++ b/mail/em-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-menu.h b/mail/em-menu.h
index 08467fe..cdcc12b 100644
--- a/mail/em-menu.h
+++ b/mail/em-menu.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-message-browser.c b/mail/em-message-browser.c
index 973708b..9299f37 100644
--- a/mail/em-message-browser.c
+++ b/mail/em-message-browser.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-message-browser.h b/mail/em-message-browser.h
index cf00a74..d394adc 100644
--- a/mail/em-message-browser.h
+++ b/mail/em-message-browser.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/em-migrate.c b/mail/em-migrate.c
index 974c8b9..3f5beb3 100644
--- a/mail/em-migrate.c
+++ b/mail/em-migrate.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1130,7 +1130,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc)
 	gtk_label_set_markup (GTK_LABEL (w), markup);
 	gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
 	g_free (markup);
-	
+
 	w = gtk_label_new (desc);
 	gtk_misc_set_alignment (GTK_MISC (w), 0.0, 0.0);
 	gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
@@ -1139,7 +1139,7 @@ em_migrate_setup_progress_dialog (const char *title, const char *desc)
 	/* Progress bar */
 	w = gtk_vbox_new (FALSE, 6);
 	gtk_box_pack_start (GTK_BOX (vbox), w, TRUE, TRUE, 0);
-	
+
 	label = GTK_LABEL (gtk_label_new (""));
 	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
 	gtk_label_set_line_wrap (label, TRUE);
@@ -2785,7 +2785,7 @@ migrate_folders(CamelStore *store, gboolean is_local, CamelFolderInfo *fi, const
 		tmp = g_strdup_printf ("%s/%s", acc, fi->full_name);
 		em_migrate_set_folder_name (tmp);
 		g_free (tmp);
-		
+
 		progress = (double) (*nth_folder) / total_folders;
 		g_idle_add ((GSourceFunc) update_progress_in_main_thread, &progress);
 
@@ -2823,7 +2823,7 @@ setup_local_store (MailComponent *mc)
 	CamelURL *url;
 	char *tmp;
 	CamelStore *store;
-	
+
 	url = camel_url_new("mbox:", NULL);
 	tmp = g_build_filename (mail_component_peek_base_directory(mc), "local", NULL);
 	camel_url_set_path(url, tmp);
@@ -2833,7 +2833,7 @@ setup_local_store (MailComponent *mc)
 	g_free(tmp);
 
 	return store;
-	
+
 }
 
 struct migrate_folders_to_db_structure {
@@ -2844,13 +2844,13 @@ struct migrate_folders_to_db_structure {
 		gboolean done;
 		gboolean is_local_store;
 };
- 
+
 static void migrate_folders_to_db_thread (struct migrate_folders_to_db_structure *migrate_dbs)
 {
 		int num_of_folders = 0, nth_folder = 0;
 		count_folders (migrate_dbs->info, &num_of_folders);
-		migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info, 
-						migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done), 
+		migrate_folders (migrate_dbs->store, migrate_dbs->is_local_store, migrate_dbs->info,
+						migrate_dbs->account_name, &(migrate_dbs->ex), &(migrate_dbs->done),
 						&nth_folder, num_of_folders);
 }
 
@@ -2877,7 +2877,7 @@ migrate_to_db()
 								"patient while Evolution migrates your folders..."));
 
 		store = setup_local_store (component);
-		info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);	
+		info = camel_store_get_folder_info (store, NULL, CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST|CAMEL_STORE_FOLDER_INFO_SUBSCRIBED, NULL);
 
 		if (info) {
 				GThread *thread;
@@ -2885,7 +2885,7 @@ migrate_to_db()
 
 				if (g_str_has_suffix (((CamelService *)store)->url->path, ".evolution/mail/local"))
 						migrate_dbs.is_local_store = TRUE;
-				else 
+				else
 						migrate_dbs.is_local_store = FALSE;
 				camel_exception_init (&migrate_dbs.ex);
 				migrate_dbs.account_name = _("On This Computer");
@@ -2941,7 +2941,7 @@ migrate_to_db()
 		g_object_unref (iter);
 		em_migrate_close_progress_dialog ();
 }
-  
+
 
 int
 em_migrate (const char *evolution_dir, int major, int minor, int revision, CamelException *ex)
diff --git a/mail/em-migrate.h b/mail/em-migrate.h
index c755ef9..238f4fd 100644
--- a/mail/em-migrate.h
+++ b/mail/em-migrate.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-network-prefs.c b/mail/em-network-prefs.c
index 01fbd87..b0c51ed 100644
--- a/mail/em-network-prefs.c
+++ b/mail/em-network-prefs.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -76,7 +76,7 @@ GType
 em_network_prefs_get_type (void)
 {
 	static GType type = 0;
-	
+
 	if (!type) {
 		static const GTypeInfo info = {
 			sizeof (EMNetworkPrefsClass),
@@ -87,10 +87,10 @@ em_network_prefs_get_type (void)
 			0,
 			(GInstanceInitFunc) em_network_prefs_init,
 		};
-		
+
 		type = g_type_register_static (gtk_vbox_get_type (), "EMNetworkPrefs", &info, 0);
 	}
-	
+
 	return type;
 }
 
@@ -99,9 +99,9 @@ em_network_prefs_class_init (EMNetworkPrefsClass *klass)
 {
 	GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 	GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
-	
+
 	parent_class = g_type_class_ref (gtk_vbox_get_type ());
-	
+
 	object_class->destroy = em_network_prefs_destroy;
 	gobject_class->finalize = em_network_prefs_finalise;
 }
@@ -116,7 +116,7 @@ static void
 em_network_prefs_finalise (GObject *obj)
 {
 	d(g_print ("Network preferences finalize is called\n"));
-	
+
 	/* do something here */
         G_OBJECT_CLASS (parent_class)->finalize (obj);
 }
@@ -133,7 +133,7 @@ static void
 toggle_button_toggled (GtkToggleButton *toggle, EMNetworkPrefs *prefs)
 {
 	const char *key;
-	
+
 	key = g_object_get_data ((GObject *) toggle, "key");
 	gconf_client_set_bool (prefs->gconf, key, gtk_toggle_button_get_active (toggle), NULL);
 	if (toggle == prefs->use_auth) {
@@ -149,13 +149,13 @@ static void
 toggle_button_init (EMNetworkPrefs *prefs, GtkToggleButton *toggle, const char *key)
 {
 	gboolean bool;
-	
+
 	bool = gconf_client_get_bool (prefs->gconf, key, NULL);
 	gtk_toggle_button_set_active (toggle, bool);
-	
+
 	g_object_set_data ((GObject *) toggle, "key", (void *) key);
 	g_signal_connect (toggle, "toggled", G_CALLBACK (toggle_button_toggled), prefs);
-	
+
 	if (!gconf_client_key_is_writable (prefs->gconf, key, NULL))
 		gtk_widget_set_sensitive ((GtkWidget *) toggle, FALSE);
 }
@@ -176,9 +176,9 @@ emnp_set_sensitiveness (EMNetworkPrefs *prefs, NetworkConfigProxyType type, gboo
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->auto_proxy_url, sensitivity);
 		d(g_print ("Setting sensitivity of autoconfig to: %d\n", sensitivity));
 	} else
-#endif	
+#endif
 	if (type == NETWORK_PROXY_MANUAL) {
-		gboolean state; 
+		gboolean state;
 
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->http_host, sensitivity);
 		gtk_widget_set_sensitive ((GtkWidget *) prefs->https_host, sensitivity);
@@ -239,11 +239,11 @@ notify_proxy_type_changed (GtkWidget *widget, EMNetworkPrefs *prefs)
 		emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, TRUE);
 	}
 
-	if (type != NETWORK_PROXY_DIRECT_CONNECTION) 
+	if (type != NETWORK_PROXY_DIRECT_CONNECTION)
 		gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, TRUE, NULL);
 	else if (type != NETWORK_PROXY_SYS_SETTINGS)
 		gconf_client_set_bool (prefs->gconf, GCONF_E_USE_PROXY_KEY, FALSE, NULL);
-		
+
 }
 
 static void
@@ -253,8 +253,8 @@ widget_entry_changed_cb (GtkWidget *widget, gpointer data)
 	int port = -1;
 	GConfClient *gconf = mail_config_get_gconf_client ();
 
-	/* 
-	   Do not change the order of comparison - 
+	/*
+	   Do not change the order of comparison -
 	   GtkSpinButton is an extended form of GtkEntry
 	*/
 	if (GTK_IS_SPIN_BUTTON (widget)) {
@@ -307,9 +307,9 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	gboolean locked;
 	int i, val, port;
 	char *gladefile;
-	
+
 	prefs->gconf = mail_config_get_gconf_client ();
-	
+
 	gladefile = g_build_filename (EVOLUTION_GLADEDIR,
 				      "mail-config.glade",
 				      NULL);
@@ -393,32 +393,32 @@ em_network_prefs_construct (EMNetworkPrefs *prefs)
 	prefs->socks_port = GTK_SPIN_BUTTON (glade_xml_get_widget (gui, "spnSocksPort"));
 	prefs->lbl_socks_host = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksHost"));
 	prefs->lbl_socks_port = GTK_LABEL (glade_xml_get_widget (gui, "lblSocksPort"));
-	g_signal_connect (prefs->socks_host, "changed", 
+	g_signal_connect (prefs->socks_host, "changed",
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_HOST_KEY);
-	g_signal_connect (prefs->socks_port, "value_changed", 
+	g_signal_connect (prefs->socks_port, "value_changed",
 			  G_CALLBACK(widget_entry_changed_cb), GCONF_E_SOCKS_PORT_KEY);
 #endif
-	
+
 	/* Manual proxy options */
-	g_signal_connect (prefs->http_host, "changed", 
+	g_signal_connect (prefs->http_host, "changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTP_HOST_KEY);
-	g_signal_connect (prefs->https_host, "changed", 
+	g_signal_connect (prefs->https_host, "changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTPS_HOST_KEY);
-	g_signal_connect (prefs->ignore_hosts, "changed", 
+	g_signal_connect (prefs->ignore_hosts, "changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_IGNORE_HOSTS_KEY);
-	g_signal_connect (prefs->http_port, "value_changed", 
+	g_signal_connect (prefs->http_port, "value_changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTP_PORT_KEY);
-	g_signal_connect (prefs->https_port, "value_changed", 
+	g_signal_connect (prefs->https_port, "value_changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_HTTPS_PORT_KEY);
-	g_signal_connect (prefs->auth_user, "changed", 
+	g_signal_connect (prefs->auth_user, "changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_AUTH_USER_KEY);
-	g_signal_connect (prefs->auth_pwd, "changed", 
+	g_signal_connect (prefs->auth_pwd, "changed",
 			  G_CALLBACK(widget_entry_changed_cb),
 			  (gpointer) GCONF_E_AUTH_PWD_KEY);
 
@@ -493,9 +493,9 @@ GtkWidget *
 em_network_prefs_new (void)
 {
 	EMNetworkPrefs *new;
-	
+
 	new = (EMNetworkPrefs *) g_object_new (em_network_prefs_get_type (), NULL);
 	em_network_prefs_construct (new);
-	
+
 	return (GtkWidget *) new;
 }
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h
index 27c4e77..3d933a7 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -54,11 +54,11 @@ typedef enum {
 
 struct _EMNetworkPrefs {
 	GtkVBox parent_object;
-	
+
 	struct _GConfClient *gconf;
-	
+
 	struct _GladeXML *gui;
-	
+
 	/* Default Behavior */
 	struct _GtkToggleButton *sys_proxy;
 	struct _GtkToggleButton *no_proxy;
@@ -97,9 +97,9 @@ struct _EMNetworkPrefs {
 
 struct _EMNetworkPrefsClass {
 	GtkVBoxClass parent_class;
-	
+
 	/* signals */
-	
+
 };
 
 GType em_network_prefs_get_type (void);
diff --git a/mail/em-popup.c b/mail/em-popup.c
index 88aadf7..ad738fc 100644
--- a/mail/em-popup.c
+++ b/mail/em-popup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -624,7 +624,7 @@ emp_add_vcard (EPopup *ep, EPopupItem *item, void *data)
 	CamelMimePart *part;
 	CamelDataWrapper *content;
 	CamelStreamMem *mem;
-	
+
 
 	part = ((EMPopupTargetPart *) target)->part;
 
diff --git a/mail/em-popup.h b/mail/em-popup.h
index 8700551..cde903a 100644
--- a/mail/em-popup.h
+++ b/mail/em-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-search-context.c b/mail/em-search-context.c
index 5bf9861..ac03d40 100644
--- a/mail/em-search-context.c
+++ b/mail/em-search-context.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-search-context.h b/mail/em-search-context.h
index 3df5c1d..47dc6ea 100644
--- a/mail/em-search-context.h
+++ b/mail/em-search-context.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-stripsig-filter.c b/mail/em-stripsig-filter.c
index 7dd8a87..1600eea 100644
--- a/mail/em-stripsig-filter.c
+++ b/mail/em-stripsig-filter.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-stripsig-filter.h b/mail/em-stripsig-filter.h
index be72cef..761d466 100644
--- a/mail/em-stripsig-filter.h
+++ b/mail/em-stripsig-filter.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c
index fa68af1..25c447d 100644
--- a/mail/em-subscribe-editor.c
+++ b/mail/em-subscribe-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -112,7 +112,7 @@ struct _EMSubscribeNode {
 
 typedef struct _MailMsgListNode MailMsgListNode;
 struct _MailMsgListNode {
-	EDListNode node;	
+	EDListNode node;
 	MailMsg *msg;
 };
 
@@ -265,7 +265,7 @@ sub_subscribe_folder (EMSubscribe *sub, EMSubscribeNode *node, int state, const
 		d(printf("running subscribe folder '%s'\n", spath));
 		mail_msg_unordered_push (m);
 	} else {
-		msgListNode = g_malloc0(sizeof(MailMsgListNode)); 
+		msgListNode = g_malloc0(sizeof(MailMsgListNode));
 		msgListNode->msg = (MailMsg *) m;
 		d(printf("queueing subscribe folder '%s'\n", spath));
 		e_dlist_addtail(&sub->subscribe, (EDListNode *)msgListNode);
@@ -357,7 +357,7 @@ sub_folderinfo_exec (struct _emse_folderinfo_msg *m)
 
 	if (m->seq == m->sub->seq) {
 		camel_operation_register(m->base.cancel);
-		m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, 
+		m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name,
 						      CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL | CAMEL_STORE_FOLDER_INFO_SUBSCRIPTION_LIST, &m->base.ex);
 		camel_operation_unregister(m->base.cancel);
 	}
@@ -560,7 +560,7 @@ static void
 sub_destroy(GtkWidget *w, EMSubscribe *sub)
 {
 	struct _zsubscribe_msg *m;
-	MailMsgListNode *msgListNode;	
+	MailMsgListNode *msgListNode;
 
 	d(printf("subscribe closed\n"));
 	sub->cancel = TRUE;
diff --git a/mail/em-subscribe-editor.h b/mail/em-subscribe-editor.h
index aa9c9a2..36710ec 100644
--- a/mail/em-subscribe-editor.h
+++ b/mail/em-subscribe-editor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/em-sync-stream.c b/mail/em-sync-stream.c
index 311c2e1..138932c 100644
--- a/mail/em-sync-stream.c
+++ b/mail/em-sync-stream.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-sync-stream.h b/mail/em-sync-stream.h
index af513e9..fc687fa 100644
--- a/mail/em-sync-stream.h
+++ b/mail/em-sync-stream.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-utils.c b/mail/em-utils.c
index 9588646..ba180e5 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -648,12 +648,12 @@ em_utils_save_messages (GtkWidget *parent, CamelFolder *folder, GPtrArray *uids)
 	info = camel_folder_get_message_info (folder, uids->pdata[0]);
 	if (info) {
 		filename = g_strdup (camel_message_info_subject (info));
-		e_filename_make_safe (filename);		
+		e_filename_make_safe (filename);
 		camel_message_info_free (info);
 	}
 
 	filesel = e_file_get_save_filesel (parent, _("Save Message..."), filename, GTK_FILE_CHOOSER_ACTION_SAVE);
-	if (filename) 
+	if (filename)
 		g_free (filename);
 
 	camel_object_ref(folder);
@@ -1386,15 +1386,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri)
 
 	if (folder == mail_component_get_folder (NULL, MAIL_COMPONENT_FOLDER_TEMPLATES))
 		return TRUE;
-	
+
 	if (uri == NULL)
 		return FALSE;
-		
+
 	accounts = mail_config_get_accounts();
 	iter = e_list_get_iterator ((EList *)accounts);
 	while (e_iterator_is_valid (iter)) {
 		account = (EAccount *)e_iterator_get (iter);
-		
+
 		if (account->templates_folder_uri) {
 			templates_uri = em_uri_to_camel (account->templates_folder_uri);
 			if (camel_store_folder_uri_equal (folder->parent_store, templates_uri, uri)) {
@@ -1404,15 +1404,15 @@ em_utils_folder_is_templates (CamelFolder *folder, const char *uri)
 			}
 			g_free (templates_uri);
 		}
-		
+
 		e_iterator_next (iter);
 	}
-	
+
 	g_object_unref (iter);
-	
+
 	return is;
 }
-		
+
 /**
  * em_utils_folder_is_drafts:
  * @folder: folder
diff --git a/mail/em-utils.h b/mail/em-utils.h
index d64c411..1b60205 100644
--- a/mail/em-utils.h
+++ b/mail/em-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-vfolder-context.c b/mail/em-vfolder-context.c
index 88c97b0..e317b5c 100644
--- a/mail/em-vfolder-context.c
+++ b/mail/em-vfolder-context.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-vfolder-context.h b/mail/em-vfolder-context.h
index 50ce239..7f17f4e 100644
--- a/mail/em-vfolder-context.h
+++ b/mail/em-vfolder-context.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index b0614d9..dcc6f03 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-vfolder-editor.h b/mail/em-vfolder-editor.h
index bbdb6ff..58bcd56 100644
--- a/mail/em-vfolder-editor.h
+++ b/mail/em-vfolder-editor.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c
index bddb08f..03f46af 100644
--- a/mail/em-vfolder-rule.c
+++ b/mail/em-vfolder-rule.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/em-vfolder-rule.h b/mail/em-vfolder-rule.h
index bc6a330..9274c94 100644
--- a/mail/em-vfolder-rule.h
+++ b/mail/em-vfolder-rule.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 156c8d0..39bfd7b 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 2943772..f42afec 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index 44db11f..29a2ddd 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/importers/mail-importer.h b/mail/importers/mail-importer.h
index c01c3ab..f108967 100644
--- a/mail/importers/mail-importer.h
+++ b/mail/importers/mail-importer.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index e040a40..3a4e6d9 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index eb8caa7..53a0411 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Michael Zucchi <notzed ximian com>
diff --git a/mail/mail-autofilter.h b/mail/mail-autofilter.h
index bae8bd8..c12539a 100644
--- a/mail/mail-autofilter.h
+++ b/mail/mail-autofilter.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-component-factory.c b/mail/mail-component-factory.c
index 04d44e9..268f0b5 100644
--- a/mail/mail-component-factory.c
+++ b/mail/mail-component-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 2fd85ec..698cc94 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1317,7 +1317,7 @@ mail_component_init (MailComponent *component)
 	priv->mail_sync_in_progress = 0;
 	if (g_getenv("CAMEL_FLUSH_CHANGES"))
 		priv->mail_sync_id = g_timeout_add_seconds (mail_config_get_sync_timeout (), call_mail_sync, component);
-	else 
+	else
 		priv->mail_sync_id = 0;
 }
 
diff --git a/mail/mail-component.h b/mail/mail-component.h
index c1215c6..9af5caa 100644
--- a/mail/mail-component.h
+++ b/mail/mail-component.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-config-factory.c b/mail/mail-config-factory.c
index 74c05ec..f893835 100644
--- a/mail/mail-config-factory.c
+++ b/mail/mail-config-factory.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-config-factory.h b/mail/mail-config-factory.h
index f3a4b5f..4300583 100644
--- a/mail/mail-config-factory.h
+++ b/mail/mail-config-factory.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-config.c b/mail/mail-config.c
index 62f6ba6..bcf8dd7 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -423,7 +423,7 @@ mail_config_init (void)
 		config->gconf, key, func,
 		&config->error_time, NULL, NULL);
 	config->error_time =
-		gconf_client_get_int (config->gconf, key, NULL);	
+		gconf_client_get_int (config->gconf, key, NULL);
 
 	key = "/apps/evolution/mail/display/error_level";
 	func = (GConfClientNotifyFunc) gconf_int_value_changed;
@@ -431,7 +431,7 @@ mail_config_init (void)
 		config->gconf, key, func,
 		&config->error_level, NULL, NULL);
 	config->error_level =
-		gconf_client_get_int (config->gconf, key, NULL);	
+		gconf_client_get_int (config->gconf, key, NULL);
 
 	key = "/apps/evolution/mail/display/force_message_limit";
 	func = (GConfClientNotifyFunc) gconf_bool_value_changed;
@@ -678,7 +678,7 @@ mail_config_get_address_count (void)
 
 guint
 mail_config_get_error_timeout  (void)
-{	
+{
 	if (!config)
 		mail_config_init ();
 
@@ -687,7 +687,7 @@ mail_config_get_error_timeout  (void)
 
 guint
 mail_config_get_error_level  (void)
-{	
+{
 	if (!config)
 		mail_config_init ();
 
@@ -1206,7 +1206,7 @@ mail_config_reload_junk_headers (void)
 	/* It automatically sets in the session */
 	if (config == NULL)
 		mail_config_init ();
-	else 
+	else
 		gconf_jh_check_changed (config->gconf, 0, NULL, config);
 
 }
diff --git a/mail/mail-config.h b/mail/mail-config.h
index 81f2451..aea5c5d 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-crypto.c b/mail/mail-crypto.c
index d7350ea..f484e0a 100644
--- a/mail/mail-crypto.c
+++ b/mail/mail-crypto.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-crypto.h b/mail/mail-crypto.h
index dbe1e6f..a6ba393 100644
--- a/mail/mail-crypto.h
+++ b/mail/mail-crypto.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index ed3d583..a84dfcb 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1045,7 +1045,7 @@ int mail_note_get_folder_from_uri(const char *uri, CamelFolder **folderp)
 	return fi.fi != NULL;
 }
 
-gboolean 
+gboolean
 mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags)
 {
 	char *uri = mail_tools_folder_to_url (folder);
@@ -1061,7 +1061,7 @@ mail_folder_cache_get_folder_info_flags (CamelFolder *folder, int *flags)
 	if (flags) {
 		if (fi.fi) {
 			*flags = fi.fi->flags;
-		} 
+		}
 	}
 	UNLOCK(info_lock);
 
diff --git a/mail/mail-folder-cache.h b/mail/mail-folder-cache.h
index c0f7e86..932f5c3 100644
--- a/mail/mail-folder-cache.h
+++ b/mail/mail-folder-cache.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-mt.c b/mail/mail-mt.c
index 6388a56..ed7e257 100644
--- a/mail/mail-mt.c
+++ b/mail/mail-mt.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/mail/mail-mt.h b/mail/mail-mt.h
index b95620a..ed23c3b 100644
--- a/mail/mail-mt.h
+++ b/mail/mail-mt.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-ops.c b/mail/mail-ops.c
index d2183dd..4f310db 100644
--- a/mail/mail-ops.c
+++ b/mail/mail-ops.c
@@ -1,5 +1,5 @@
 /*
- * mail-ops.c: callbacks for the mail toolbar/menus 
+ * mail-ops.c: callbacks for the mail toolbar/menus
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -721,7 +721,7 @@ send_queue_exec (struct _send_queue_msg *m)
 		camel_operation_register (m->cancel);
  	else
  		camel_operation_register (m->base.cancel);
- 
+
  	if (!m->cancel)
  		camel_operation_start (NULL, _("Sending message"));
 
@@ -783,7 +783,7 @@ send_queue_exec (struct _send_queue_msg *m)
 		camel_folder_sync (sent_folder, FALSE, &ex);
 		camel_exception_clear (&ex);
 	}
- 
+
  	if (!m->cancel)
  		camel_operation_end (NULL);
 
@@ -791,7 +791,7 @@ send_queue_exec (struct _send_queue_msg *m)
 		camel_operation_unregister (m->cancel);
  	else
  		camel_operation_unregister (m->base.cancel);
- 
+
 }
 
 static void
@@ -2463,7 +2463,7 @@ prepare_offline_exec (struct _set_offline_msg *m)
 	} else if (CAMEL_IS_OFFLINE_STORE (m->store)) {
 		camel_offline_store_prepare_for_offline (CAMEL_OFFLINE_STORE (m->store),
 							 &m->base.ex);
-	}						 
+	}
 }
 
 static void
diff --git a/mail/mail-ops.h b/mail/mail-ops.h
index df92df4..39905fb 100644
--- a/mail/mail-ops.h
+++ b/mail/mail-ops.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 655f1db..be834bb 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -416,7 +416,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 	g_object_unref (iter);
 
 	/* Check to see if we have to send any mails --- if we don't, don't display the SMTP row in the table */
-	if (outbox && destination 
+	if (outbox && destination
 	 && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) == 0)
 		num_sources--;
 
@@ -545,7 +545,7 @@ build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destinati
 	e_event_emit ((EEvent *)em_event_peek (), "mail.sendreceive", (EEventTarget *) target);
 
 	/* Skip displaying the SMTP row if we've got no outbox, destination or unsent mails */
-	if (outbox && destination 
+	if (outbox && destination
 	 && (camel_folder_get_message_count(outbox) - camel_folder_get_deleted_message_count(outbox)) != 0) {
 		info = g_hash_table_lookup (data->active, SEND_URI_KEY);
 		if (info == NULL) {
@@ -1196,7 +1196,7 @@ mail_send (void)
 	info->status_label = NULL;
 	info->uri = g_strdup (transport->url);
 	info->keep_on_server = FALSE;
-	info->cancel = NULL; 
+	info->cancel = NULL;
 	info->cancel_button = NULL;
 	info->data = data;
 	info->state = SEND_ACTIVE;
diff --git a/mail/mail-send-recv.h b/mail/mail-send-recv.h
index 4fc4e99..a31abe7 100644
--- a/mail/mail-send-recv.h
+++ b/mail/mail-send-recv.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-session.c b/mail/mail-session.c
index 03277b4..d9e34cc 100644
--- a/mail/mail-session.c
+++ b/mail/mail-session.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-session.h b/mail/mail-session.h
index a2a5e97..60d6b9a 100644
--- a/mail/mail-session.h
+++ b/mail/mail-session.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-signature-editor.c b/mail/mail-signature-editor.c
index daee1db..401f26f 100644
--- a/mail/mail-signature-editor.c
+++ b/mail/mail-signature-editor.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-signature-editor.h b/mail/mail-signature-editor.h
index 649504b..82c786c 100644
--- a/mail/mail-signature-editor.h
+++ b/mail/mail-signature-editor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-tools.c b/mail/mail-tools.c
index 7278829..a256e7e 100644
--- a/mail/mail-tools.c
+++ b/mail/mail-tools.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-tools.h b/mail/mail-tools.h
index 794c1d4..1590636 100644
--- a/mail/mail-tools.h
+++ b/mail/mail-tools.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-types.h b/mail/mail-types.h
index 1873dc8..6acbeaf 100644
--- a/mail/mail-types.h
+++ b/mail/mail-types.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/mail/mail-vfolder.c b/mail/mail-vfolder.c
index d6b2058..aab8625 100644
--- a/mail/mail-vfolder.c
+++ b/mail/mail-vfolder.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/mail-vfolder.h b/mail/mail-vfolder.h
index b0f684e..0025413 100644
--- a/mail/mail-vfolder.h
+++ b/mail/mail-vfolder.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/message-list.c b/mail/message-list.c
index f9a0e92..09f080c 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -2609,7 +2609,7 @@ clear_tree (MessageList *ml, gboolean tfree)
 
 	ml->tree_root = e_tree_memory_node_insert (E_TREE_MEMORY(etm), NULL, 0, NULL);
 	if (tfree)
-		e_tree_model_rebuilt (E_TREE_MODEL(etm));	
+		e_tree_model_rebuilt (E_TREE_MODEL(etm));
 #ifdef TIMEIT
 	gettimeofday(&end, NULL);
 	diff = end.tv_sec * 1000 + end.tv_usec/1000;
@@ -3573,7 +3573,7 @@ message_list_get_uids(MessageList *ml)
 		ml,
 		g_ptr_array_new()
 	};
-	
+
 	e_tree_path_foreach(ml->tree, ml_getselected_cb, &data);
 
 	if (ml->folder && data.uids->len)
@@ -3589,11 +3589,11 @@ message_list_get_selected(MessageList *ml)
 		ml,
 		g_ptr_array_new()
 	};
-	
+
 	e_tree_selected_path_foreach(ml->tree, ml_getselected_cb, &data);
 
 	if (ml->folder && data.uids->len)
-		camel_folder_sort_uids (ml->folder, data.uids);	
+		camel_folder_sort_uids (ml->folder, data.uids);
 
 	return data.uids;
 }
@@ -4282,7 +4282,7 @@ regen_list_done (struct _regen_list_msg *m)
 
 		if (m->last_row >= e_table_model_row_count (E_TABLE_MODEL (etta)))
 			m->last_row = e_table_model_row_count (E_TABLE_MODEL (etta)) - 1;
-		
+
 		if (m->last_row >= 0) {
 			ETreePath path;
 
diff --git a/mail/message-list.h b/mail/message-list.h
index 15dae0f..4d0866f 100644
--- a/mail/message-list.h
+++ b/mail/message-list.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/message-tag-editor.c b/mail/message-tag-editor.c
index 71d2ae4..d3a1d15 100644
--- a/mail/message-tag-editor.c
+++ b/mail/message-tag-editor.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/message-tag-editor.h b/mail/message-tag-editor.h
index 019c7e2..30d3ec1 100644
--- a/mail/message-tag-editor.h
+++ b/mail/message-tag-editor.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c
index 46b6268..827fc68 100644
--- a/mail/message-tag-followup.c
+++ b/mail/message-tag-followup.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/mail/message-tag-followup.h b/mail/message-tag-followup.h
index 4b18865..5c229fe 100644
--- a/mail/message-tag-followup.h
+++ b/mail/message-tag-followup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/addressbook-file/addressbook-file.c b/plugins/addressbook-file/addressbook-file.c
index 0a9ee8b..3bccf0a 100644
--- a/plugins/addressbook-file/addressbook-file.c
+++ b/plugins/addressbook-file/addressbook-file.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index 08c1956..ccf14be 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/audio-inline/audio-inline.c b/plugins/audio-inline/audio-inline.c
index 5fa9133..c4c3c09 100644
--- a/plugins/audio-inline/audio-inline.c
+++ b/plugins/audio-inline/audio-inline.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/backup-restore/backup-restore.c b/plugins/backup-restore/backup-restore.c
index f9745e8..59c04a6 100644
--- a/plugins/backup-restore/backup-restore.c
+++ b/plugins/backup-restore/backup-restore.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -83,7 +83,7 @@ sanity_check (const char *filename)
 	g_message ("Sanity check result %d:%d %d", WIFEXITED (result), WEXITSTATUS (result), result);
 
 	return WIFEXITED (result) && (WEXITSTATUS (result) == 0);
-#else	
+#else
 	return result;
 #endif
 }
@@ -125,7 +125,7 @@ epbr_perform_pre_backup_checks (char* dir)
 #ifdef G_OS_WIN32
 	return TRUE;
 #else
-	return (g_access (dir, W_OK) == 0); 
+	return (g_access (dir, W_OK) == 0);
 #endif
 }
 
diff --git a/plugins/backup-restore/backup.c b/plugins/backup-restore/backup.c
index 7e7cc50..19e9e98 100644
--- a/plugins/backup-restore/backup.c
+++ b/plugins/backup-restore/backup.c
@@ -11,13 +11,13 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
- 
+
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -182,7 +182,7 @@ backup (const char *filename)
 
 	g_return_if_fail (filename && *filename);
 	quotedfname = g_shell_quote(filename);
-	
+
 	CANCEL (complete);
 	txt = _("Shutting down Evolution");
 	/* FIXME Will the versioned setting always work? */
@@ -226,10 +226,10 @@ restore (const char *filename)
 {
 	char *command;
 	char *quotedfname;
-	
+
 	g_return_if_fail (filename && *filename);
 	quotedfname = g_shell_quote(filename);
-	
+
 	/* FIXME Will the versioned setting always work? */
 	CANCEL (complete);
 	txt = _("Shutting down Evolution");
@@ -281,7 +281,7 @@ check (const char *filename)
 
 	g_return_if_fail (filename && *filename);
 	quotedfname = g_shell_quote(filename);
-	
+
 	command = g_strdup_printf ("tar ztf %s | grep -e \"^\\.evolution/$\"", quotedfname);
 	result = system (command);
 	g_free (command);
@@ -294,7 +294,7 @@ check (const char *filename)
 	result = system (command);
 	g_free (command);
 	g_free (quotedfname);
-	
+
 	g_message ("Second result %d", result);
 
 }
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index a2499df..72098ca 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -239,7 +239,7 @@ bbdb_handle_send (EPlugin *ep, EMEventTargetComposer *target)
 	enable = gconf_client_get_bool (gconf, GCONF_KEY_ENABLE, NULL);
 	g_object_unref (G_OBJECT (gconf));
 
-	if (!enable) 
+	if (!enable)
 		return;
 
 	message = e_msg_composer_get_message(target->composer, 1);
diff --git a/plugins/bbdb/bbdb.h b/plugins/bbdb/bbdb.h
index 55c8870..62887a8 100644
--- a/plugins/bbdb/bbdb.h
+++ b/plugins/bbdb/bbdb.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index d0b6b18..d23749d 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -6,7 +6,7 @@
  *  don't already have a buddy icon defined for a person.
  *
  *  This works today (25 October 2004), but is pretty sure to break
- *  later on as the Gaim buddylist file format shifts. 
+ *  later on as the Gaim buddylist file format shifts.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,7 +19,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -452,7 +452,7 @@ parse_contact (xmlNodePtr contact, GList **buddies, GSList *blocked)
 
 	}
 
-	if (is_blocked) 
+	if (is_blocked)
 		free_gaim_body (gb);
 	else
 		*buddies = g_list_prepend (*buddies, gb);
diff --git a/plugins/bbdb/test-evobuddy.c b/plugins/bbdb/test-evobuddy.c
index f7739fa..9d14aab 100644
--- a/plugins/bbdb/test-evobuddy.c
+++ b/plugins/bbdb/test-evobuddy.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/bogo-junk-plugin/bf-junk-filter.c b/plugins/bogo-junk-plugin/bf-junk-filter.c
index 8f520bd..77aa377 100644
--- a/plugins/bogo-junk-plugin/bf-junk-filter.c
+++ b/plugins/bogo-junk-plugin/bf-junk-filter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -103,7 +103,7 @@ init_db ()
 	camel_mime_parser_init_with_stream (parser, stream);
 	camel_mime_parser_scan_from (parser, FALSE);
 	camel_object_unref (stream);
-	
+
 	camel_mime_part_construct_from_parser ((CamelMimePart *) msg, parser);
 	camel_object_unref (parser);
 
@@ -130,7 +130,7 @@ pipe_to_bogofilter (CamelMimeMessage *msg, const gchar **argv, GError **error)
 	gint res;
 	static gboolean only_once = FALSE;
 
-retry:	
+retry:
 	if (camel_debug_start ("junk")) {
 		int i;
 
@@ -184,7 +184,7 @@ retry:
 			sleep (1);
 			waitres = waitpid (child_pid, &status, WNOHANG);
 			g_set_error (error, EM_JUNK_ERROR, -2, _("Bogofilter child process does not respond, killing..."));
-		} else 
+		} else
 			g_set_error (error, EM_JUNK_ERROR, -3, _("Wait for Bogofilter child process interrupted, terminating..."));
 	}
 
@@ -209,7 +209,7 @@ retry:
 			goto retry;
 		}
 		g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to Bogofilter failed, error code: %d."), res);
-	
+
 	}
 
 	return res;
diff --git a/plugins/caldav/caldav-source.c b/plugins/caldav/caldav-source.c
index e3d2c52..1dd5ae3 100644
--- a/plugins/caldav/caldav-source.c
+++ b/plugins/caldav/caldav-source.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/calendar-file/calendar-file.c b/plugins/calendar-file/calendar-file.c
index 33fef89..6670d23 100644
--- a/plugins/calendar-file/calendar-file.c
+++ b/plugins/calendar-file/calendar-file.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/copy-tool/copy-tool.c b/plugins/copy-tool/copy-tool.c
index 052722f..1f33ba7 100644
--- a/plugins/copy-tool/copy-tool.c
+++ b/plugins/copy-tool/copy-tool.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/default-mailer/default-mailer.c b/plugins/default-mailer/default-mailer.c
index f52bd30..8d38363 100644
--- a/plugins/default-mailer/default-mailer.c
+++ b/plugins/default-mailer/default-mailer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/default-source/default-source.c b/plugins/default-source/default-source.c
index 132203c..a3611cc 100644
--- a/plugins/default-source/default-source.c
+++ b/plugins/default-source/default-source.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index abfd453..7b065e0 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -92,7 +92,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
         return 0;
 }
 
-static void 
+static void
 epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -115,8 +115,8 @@ epech_get_widgets_data (CustomHeaderOptionsDialog *mch)
 	return;
 }
 
-static gboolean 
-epech_get_widgets (CustomHeaderOptionsDialog *mch) 
+static gboolean
+epech_get_widgets (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	priv = mch->priv;
@@ -127,39 +127,39 @@ epech_get_widgets (CustomHeaderOptionsDialog *mch)
 	if (!priv->main)
 		return FALSE;
 
-	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");	
-	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");	
+	priv->page  = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
+	priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
 #undef EMAIL_CUSTOM_HEADER
 
 	return (priv->page
 		&&priv->header_table);
 }
 
-static void 
+static void
 epech_fill_widgets_with_data (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	HeaderValueComboBox *sub_combo_box_fill;
-	gint set_index_row,set_index_column;	
+	gint set_index_row,set_index_column;
 
 	priv = mch->priv;
 	priv->help_section = g_strdup ("usage-mail");
 
-	for (set_index_row = 0,set_index_column = 0; 
+	for (set_index_row = 0,set_index_column = 0;
 		set_index_column < priv->email_custom_header_details->len;set_index_column++) {
 		sub_combo_box_fill = &g_array_index(priv->combo_box_header_value, HeaderValueComboBox,set_index_column);
 
 		if (priv->flag == 0) {
 			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,0);
 		} else {
-			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box, 
+			gtk_combo_box_set_active ((GtkComboBox *)sub_combo_box_fill->header_value_combo_box,
                         	g_array_index(priv->header_index_type, gint, set_index_column));
 		}
 	}
 }
 
 CustomHeaderOptionsDialog *
-epech_dialog_new (void) 
+epech_dialog_new (void)
 {
 	CustomHeaderOptionsDialog *mch;
 
@@ -168,7 +168,7 @@ epech_dialog_new (void)
 	return mch;
 }
 
-GType 
+GType
 epech_dialog_get_type (void)
 {
 	static GType type = 0;
@@ -189,12 +189,12 @@ epech_dialog_get_type (void)
 		type = g_type_register_static (G_TYPE_OBJECT,
 				"CustomHeaderOptionsDialogType",
 				&info, 0);
-	} 
+	}
 
 	return type;
 }
 
-static void 
+static void
 epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -203,14 +203,14 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 	mch = func_data;
 	priv = mch->priv;
 
-	switch (state) {			
+	switch (state) {
 		case GTK_RESPONSE_OK:
-			epech_get_widgets_data (mch); 
+			epech_get_widgets_data (mch);
 		case GTK_RESPONSE_CANCEL:
 			gtk_widget_hide (priv->main);
 			gtk_widget_destroy (priv->main);
 			g_object_unref (priv->xml);
-			break;	     
+			break;
 		case GTK_RESPONSE_HELP:
 			e_display_help (
 				GTK_WINDOW (priv->main),
@@ -221,9 +221,9 @@ epech_header_options_cb (GtkDialog *dialog, gint state, gpointer func_data)
 	g_signal_emit (G_OBJECT (func_data), signals[MCH_RESPONSE], 0, state);
 }
 
-static gboolean 
+static gboolean
 epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
-{	
+{
 	EmailCustomHeaderOptionsDialogPrivate *priv;
 	GtkWidget *toplevel;
 	gchar *filename;
@@ -260,12 +260,12 @@ epech_dialog_run (CustomHeaderOptionsDialog *mch, GtkWidget *parent)
 	return TRUE;
 }
 
-static void 
+static void
 epech_get_header_list (CustomHeaderOptionsDialog *mch)
 {
 	GConfClient *client;
 
-	client = gconf_client_get_default (); 
+	client = gconf_client_get_default ();
 	g_return_if_fail (GCONF_IS_CLIENT (client));
 	gconf_client_add_dir (client, GCONF_KEY_CUSTOM_HEADER, GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
 	epech_load_from_gconf (client, "/apps/evolution/eplugin/email_custom_header/customHeader", mch);
@@ -273,7 +273,7 @@ epech_get_header_list (CustomHeaderOptionsDialog *mch)
 	return;
 }
 
-static void 
+static void
 epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -319,7 +319,7 @@ epech_load_from_gconf (GConfClient *client,const char *path,CustomHeaderOptionsD
 	temp_header_details.number_of_header = pos;
 }
 
-static void 
+static void
 epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 {
 	EmailCustomHeaderOptionsDialogPrivate *priv;
@@ -345,9 +345,9 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	};
 
 	priv = mch->priv;
-	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox)); 
+	priv->combo_box_header_value = g_array_new (TRUE, FALSE, sizeof (HeaderValueComboBox));
 
-	for (header_section_id = 0,label_row = 0,row = 0,column = 1; 
+	for (header_section_id = 0,label_row = 0,row = 0,column = 1;
 		header_section_id < priv->email_custom_header_details->len; header_section_id++,row++,column++) {
 
 		/* To create an empty label widget. Text will be added dynamically. */
@@ -369,7 +369,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 		g_array_append_val(priv->combo_box_header_value, sub_combo_box);
 	}
 
-	for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len; 
+	for (sub_index = 0,row_combo = 0,column_combo = 1; sub_index < priv->combo_box_header_value->len;
                 sub_index++,row_combo++,column_combo++) {
 		temp = &g_array_index(priv->email_custom_header_details, EmailCustomHeaderDetails,sub_index);
 
@@ -380,7 +380,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 			(GtkAttachOptions) (GTK_FILL), 0, 0);
 
 		for (sub_type_index = 0; sub_type_index < temp->number_of_subtype_header; sub_type_index++) {
-			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index); 
+			temp_header_value_ptr = &g_array_index(temp->sub_header_type_value, CustomSubHeader,sub_type_index);
 			str = (temp_header_value_ptr->sub_header_string_value)->str;
 			for (i = 0; security_values[i].value != NULL; i++) {
 				if (strcmp (str, security_values[i].value) == 0) {
@@ -397,7 +397,7 @@ epech_setup_widgets (CustomHeaderOptionsDialog *mch)
 	}
 }
 
-static void 
+static void
 epech_dialog_class_init (GObjectClass *object)
 {
 	CustomHeaderOptionsDialogClass *klass;
@@ -420,7 +420,7 @@ epech_dialog_class_init (GObjectClass *object)
 			G_TYPE_INT);
 }
 
-static void 
+static void
 epech_dialog_init (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch;
@@ -435,7 +435,7 @@ epech_dialog_init (GObject *object)
 	priv->header_table = NULL;
 }
 
-static void 
+static void
 epech_dialog_finalize (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *)object;
@@ -450,11 +450,11 @@ epech_dialog_finalize (GObject *object)
 		mch->priv = NULL;
 	}
 
-	if (parent_class->finalize) 
+	if (parent_class->finalize)
 		(* parent_class->finalize) (object);
 }
 
-static void 
+static void
 epech_dialog_dispose (GObject *object)
 {
 	CustomHeaderOptionsDialog *mch = (CustomHeaderOptionsDialog *) object;
@@ -463,9 +463,9 @@ epech_dialog_dispose (GObject *object)
 
 	if (parent_class->dispose)
 		(* parent_class->dispose) (object);
-}	
+}
 
-static void 
+static void
 epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gpointer data)
 {
 	EMsgComposer *composer;
@@ -487,15 +487,15 @@ epech_append_to_custom_header (CustomHeaderOptionsDialog *dialog, gint state, gp
 				temp_header_value_ptr = &g_array_index(temp_header_ptr->sub_header_type_value, CustomSubHeader,sub_type_index);
 
 				if (sub_type_index == g_array_index(priv->header_index_type, gint, index_subtype)){
-					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str, 
-						(temp_header_value_ptr->sub_header_string_value)->str);		             
+					e_msg_composer_modify_header (composer, (temp_header_ptr->header_type_value)->str,
+						(temp_header_value_ptr->sub_header_string_value)->str);
 				}
 			}
 		}
 	}
 }
 
-static void 
+static void
 epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 {
         EMsgComposer *composer;
@@ -503,7 +503,7 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
         CustomHeaderOptionsDialog *current_dialog = NULL;
 
         composer = (EMsgComposer *) user_data;
-        
+
         if (!user_data || !EMAIL_CUSTOM_HEADER_OPTIONS_IS_DIALOG (user_data))
 		return;
 
@@ -515,16 +515,16 @@ epech_custom_header_options_commit (EMsgComposer *comp, gpointer user_data)
 
         if (current_dialog) {
 		g_free (current_dialog);
-		current_dialog = NULL;	
+		current_dialog = NULL;
         }
 
 	if (new_email_custom_header_window) {
 		g_free (new_email_custom_header_window);
-		new_email_custom_header_window = NULL;           
+		new_email_custom_header_window = NULL;
 	}
 }
 
-static gint 
+static gint
 epech_check_existing_composer_window(gconstpointer compowindow, gconstpointer other_compowindow)
 {
 	if ((compowindow) && (other_compowindow)){
@@ -570,7 +570,7 @@ static void action_email_custom_header_cb (GtkAction *action, EMsgComposer *comp
                         new_email_custom_header_window->epech_window =  menuitem->window;
                         new_email_custom_header_window->epech_dialog = dialog;
                         g_object_set_data_full ((GObject *) composer, "compowindow", new_email_custom_header_window, destroy_compo_data);
-		}        
+		}
 	}
 
 	epech_dialog_run (dialog, GTK_WIDGET (composer));
@@ -944,7 +944,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
 	g_signal_connect(G_OBJECT(model), "row-changed", G_CALLBACK(header_isempty), cd);
 
 	/* Populate tree view with values from gconf */
-	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);	
+	header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);
 
 	for (list = header_list; list; list = g_slist_next (list)) {
 		gchar **parse_header_list;
@@ -954,7 +954,7 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
                 parse_header_list = g_strsplit_set (buffer, "=,", -1);
                 str_colon = g_strconcat (parse_header_list[0], "", NULL);
                 gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1);
-		
+
 		for (index = 0; parse_header_list[index+1] ; ++index) {
                         str1_colon = g_strconcat (parse_header_list[index+1], "", NULL);
                         gtk_list_store_set (cd->store, &iter, HEADER_VALUE_COLUMN, str1_colon, -1);
diff --git a/plugins/email-custom-header/email-custom-header.h b/plugins/email-custom-header/email-custom-header.h
index f828a53..30e0f70 100644
--- a/plugins/email-custom-header/email-custom-header.h
+++ b/plugins/email-custom-header/email-custom-header.h
@@ -1,6 +1,6 @@
 /*
  * Evolution Email custom header options
- * 
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-account-setup.c b/plugins/exchange-operations/exchange-account-setup.c
index 6785585..2c08341 100644
--- a/plugins/exchange-operations/exchange-account-setup.c
+++ b/plugins/exchange-operations/exchange-account-setup.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -239,9 +239,9 @@ org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data)
 								    &offline_status);
 	if (offline_status == OFFLINE_MODE) {
 		e_error_run (NULL, ERROR_DOMAIN ":exchange-settings-offline", NULL);
-	
+
 		return NULL;
-	}	
+	}
 
 	oof_data = g_new0 (OOFData, 1);
 
@@ -637,7 +637,7 @@ want_mailbox_toggled (GtkWidget *toggle, EConfig *config)
 		const char *mailbox;
 
 		gtk_widget_set_sensitive (entry, is_active);
-		
+
 		target = (EMConfigTargetAccount *)config->target;
 		mailbox = gtk_entry_get_text (GTK_ENTRY (entry));
 
@@ -898,14 +898,14 @@ org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data)
 	}
 
 	camel_url_free (url);
-	
+
 	exchange_config_listener_get_offline_status (exchange_global_config_listener,
 								    &offline_status);
-	
+
 	if (offline_status == OFFLINE_MODE) {
                 return;
 	}
-	
+
 	/* Set oof data in exchange account */
 	set_oof_info ();
 	destroy_oof_data ();
@@ -1122,10 +1122,10 @@ org_gnome_exchange_show_folder_size_factory (EPlugin *epl, EConfigHookItemFactor
 	if (!account)
 		return NULL;
 
-	exchange_account_is_offline (account, &mode);  
-	if (mode == OFFLINE_MODE)  
-		return NULL;  
-	
+	exchange_account_is_offline (account, &mode);
+	if (mode == OFFLINE_MODE)
+		return NULL;
+
 	folder_name = (char*) camel_folder_get_name (cml_folder);
 	if (!folder_name)
 		folder_name = g_strdup ("name");
diff --git a/plugins/exchange-operations/exchange-calendar.c b/plugins/exchange-operations/exchange-calendar.c
index ef0eaae..58af042 100644
--- a/plugins/exchange-operations/exchange-calendar.c
+++ b/plugins/exchange-operations/exchange-calendar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-change-password.c b/plugins/exchange-operations/exchange-change-password.c
index e35ee38..539bd24 100644
--- a/plugins/exchange-operations/exchange-change-password.c
+++ b/plugins/exchange-operations/exchange-change-password.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-change-password.h b/plugins/exchange-operations/exchange-change-password.h
index e2c40c0..e320d89 100644
--- a/plugins/exchange-operations/exchange-change-password.h
+++ b/plugins/exchange-operations/exchange-change-password.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-config-listener.c b/plugins/exchange-operations/exchange-config-listener.c
index 19d5846..5ff53fb 100644
--- a/plugins/exchange-operations/exchange-config-listener.c
+++ b/plugins/exchange-operations/exchange-config-listener.c
@@ -14,7 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/plugins/exchange-operations/exchange-config-listener.h b/plugins/exchange-operations/exchange-config-listener.h
index d0048ee..b5ceca2 100644
--- a/plugins/exchange-operations/exchange-config-listener.h
+++ b/plugins/exchange-operations/exchange-config-listener.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-contacts.c b/plugins/exchange-operations/exchange-contacts.c
index f04c9d6..1955f58 100644
--- a/plugins/exchange-operations/exchange-contacts.c
+++ b/plugins/exchange-operations/exchange-contacts.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -503,7 +503,7 @@ e_exchange_contacts_commit (EPlugin *epl, EConfigTarget *target)
 		if (authtype) {
 			e_source_set_property (source, "auth-type", authtype);
 			g_free (authtype);
-			authtype=NULL;			
+			authtype=NULL;
 		}
 		e_source_set_property (source, "auth", "plain/password");
 		if (rename) {
diff --git a/plugins/exchange-operations/exchange-delegates-user.c b/plugins/exchange-operations/exchange-delegates-user.c
index 635e82a..7de3948 100644
--- a/plugins/exchange-operations/exchange-delegates-user.c
+++ b/plugins/exchange-operations/exchange-delegates-user.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-delegates-user.h b/plugins/exchange-operations/exchange-delegates-user.h
index 5621798..251a09d 100644
--- a/plugins/exchange-operations/exchange-delegates-user.h
+++ b/plugins/exchange-operations/exchange-delegates-user.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-delegates.c b/plugins/exchange-operations/exchange-delegates.c
index b1c94af..4038ef0 100644
--- a/plugins/exchange-operations/exchange-delegates.c
+++ b/plugins/exchange-operations/exchange-delegates.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-delegates.h b/plugins/exchange-operations/exchange-delegates.h
index b0c6833..77fc354 100644
--- a/plugins/exchange-operations/exchange-delegates.h
+++ b/plugins/exchange-operations/exchange-delegates.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-folder-permission.c b/plugins/exchange-operations/exchange-folder-permission.c
index 11d9b84..63874c7 100644
--- a/plugins/exchange-operations/exchange-folder-permission.c
+++ b/plugins/exchange-operations/exchange-folder-permission.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-folder-size-display.c b/plugins/exchange-operations/exchange-folder-size-display.c
index 4d3082e..ff36343 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.c
+++ b/plugins/exchange-operations/exchange-folder-size-display.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-folder-size-display.h b/plugins/exchange-operations/exchange-folder-size-display.h
index 9c10b93..95c7956 100644
--- a/plugins/exchange-operations/exchange-folder-size-display.h
+++ b/plugins/exchange-operations/exchange-folder-size-display.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-folder-subscription.c b/plugins/exchange-operations/exchange-folder-subscription.c
index ab63a5d..2f72552 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.c
+++ b/plugins/exchange-operations/exchange-folder-subscription.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-folder-subscription.h b/plugins/exchange-operations/exchange-folder-subscription.h
index f4a329c..15323ca 100644
--- a/plugins/exchange-operations/exchange-folder-subscription.h
+++ b/plugins/exchange-operations/exchange-folder-subscription.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/exchange-operations/exchange-folder.c b/plugins/exchange-operations/exchange-folder.c
index 1c2334e..3362f0a 100644
--- a/plugins/exchange-operations/exchange-folder.c
+++ b/plugins/exchange-operations/exchange-folder.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-mail-send-options.c b/plugins/exchange-operations/exchange-mail-send-options.c
index 7b801b1..74d3af2 100644
--- a/plugins/exchange-operations/exchange-mail-send-options.c
+++ b/plugins/exchange-operations/exchange-mail-send-options.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-operations.c b/plugins/exchange-operations/exchange-operations.c
index a42e867..553a416 100644
--- a/plugins/exchange-operations/exchange-operations.c
+++ b/plugins/exchange-operations/exchange-operations.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-operations.h b/plugins/exchange-operations/exchange-operations.h
index 156339f..c453b0b 100644
--- a/plugins/exchange-operations/exchange-operations.h
+++ b/plugins/exchange-operations/exchange-operations.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.c b/plugins/exchange-operations/exchange-permissions-dialog.c
index ddcec2d..a83d54c 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.c
+++ b/plugins/exchange-operations/exchange-permissions-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-permissions-dialog.h b/plugins/exchange-operations/exchange-permissions-dialog.h
index aa8d9bb..18bdcd4 100644
--- a/plugins/exchange-operations/exchange-permissions-dialog.h
+++ b/plugins/exchange-operations/exchange-permissions-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-send-options.c b/plugins/exchange-operations/exchange-send-options.c
index 6ca6404..a9858d3 100644
--- a/plugins/exchange-operations/exchange-send-options.c
+++ b/plugins/exchange-operations/exchange-send-options.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-send-options.h b/plugins/exchange-operations/exchange-send-options.h
index 35ce500..b7bb9dd 100644
--- a/plugins/exchange-operations/exchange-send-options.h
+++ b/plugins/exchange-operations/exchange-send-options.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/exchange-operations/exchange-user-dialog.c b/plugins/exchange-operations/exchange-user-dialog.c
index e1de8f4..9285b96 100644
--- a/plugins/exchange-operations/exchange-user-dialog.c
+++ b/plugins/exchange-operations/exchange-user-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/plugins/exchange-operations/exchange-user-dialog.h b/plugins/exchange-operations/exchange-user-dialog.h
index 453d4ca..6bf191b 100644
--- a/plugins/exchange-operations/exchange-user-dialog.h
+++ b/plugins/exchange-operations/exchange-user-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/face/face.c b/plugins/face/face.c
index ca3af16..1b77286 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/folder-unsubscribe/folder-unsubscribe.c b/plugins/folder-unsubscribe/folder-unsubscribe.c
index d2d83b6..308aea3 100644
--- a/plugins/folder-unsubscribe/folder-unsubscribe.c
+++ b/plugins/folder-unsubscribe/folder-unsubscribe.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/google-account-setup/google-contacts-source.c b/plugins/google-account-setup/google-contacts-source.c
index 00b7ebc..23314a4 100644
--- a/plugins/google-account-setup/google-contacts-source.c
+++ b/plugins/google-account-setup/google-contacts-source.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/google-account-setup/google-contacts-source.h b/plugins/google-account-setup/google-contacts-source.h
index 54c21d1..289ea0b 100644
--- a/plugins/google-account-setup/google-contacts-source.h
+++ b/plugins/google-account-setup/google-contacts-source.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c
index c296ab6..97d87c6 100644
--- a/plugins/google-account-setup/google-source.c
+++ b/plugins/google-account-setup/google-source.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -420,7 +420,7 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo)
 	g_return_if_fail (username != NULL && *username != '\0');
 
 	tmp = g_strdup_printf (_("Enter password for user %s to access list of subscribed calendars."), username);
-	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp, 
+	password = e_passwords_ask_password (_("Enter password"), "Calendar", "", tmp,
 			E_PASSWORDS_REMEMBER_NEVER | E_PASSWORDS_REPROMPT | E_PASSWORDS_SECRET | E_PASSWORDS_DISABLE_REMEMBER,
 			NULL, parent);
 	g_free (tmp);
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.c b/plugins/groupwise-account-setup/camel-gw-listener.c
index fd9091c..3d1fb15 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.c
+++ b/plugins/groupwise-account-setup/camel-gw-listener.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -224,7 +224,7 @@ add_esource (const char *conf_key, GwAccountInfo *info,  const char *source_name
 
 		e_source_set_property (source, "refresh", str);
 		g_free (str);
-	} else 
+	} else
 		e_source_set_property (source, "refresh", NULL);
 
 	e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" );
@@ -349,7 +349,7 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount
 	const char *poa_address;
 	const char *new_poa_address;
 	const char* new_group_name = a->name;
-	
+
 	url = camel_url_new (old_account_info->source_url, NULL);
 	poa_address = url->host;
 	if (!poa_address || strlen (poa_address) ==0)
@@ -387,13 +387,13 @@ modify_esource (const char* conf_key, GwAccountInfo *old_account_info, EAccount
 					e_source_set_property (source, "port", camel_url_get_param (new_url,"soap_port"));
 					e_source_set_property (source, "use_ssl",  camel_url_get_param (url, "use_ssl"));
 					e_source_set_property (source, "offline_sync",  camel_url_get_param (url, "offline_sync") ? "1" : "0");
-				
+
 					if (a->source->auto_check) {
 						char *str = g_strdup_printf ("%d", a->source->auto_check_time);
-					
+
 						e_source_set_property (source, "refresh", str);
 						g_free (str);
-					} else 
+					} else
 						e_source_set_property (source, "refresh", NULL);
 
 					e_source_list_sync (list, NULL);
@@ -424,7 +424,7 @@ add_calendar_tasks_sources (GwAccountInfo *info)
 	add_esource ("/apps/evolution/calendar/sources", info, _("Calendar"), url, NULL, FALSE);
 	add_esource ("/apps/evolution/tasks/sources", info, _("Tasks"), url, NULL, FALSE);
 	add_esource ("/apps/evolution/memos/sources", info, _("Notes"), url, NULL, TRUE);
- 
+
 	camel_url_free (url);
 
 
diff --git a/plugins/groupwise-account-setup/camel-gw-listener.h b/plugins/groupwise-account-setup/camel-gw-listener.h
index 16a3fbe..9682a68 100644
--- a/plugins/groupwise-account-setup/camel-gw-listener.h
+++ b/plugins/groupwise-account-setup/camel-gw-listener.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-account-setup/groupwise-account-setup.c b/plugins/groupwise-account-setup/groupwise-account-setup.c
index fca171a..aee5e90 100644
--- a/plugins/groupwise-account-setup/groupwise-account-setup.c
+++ b/plugins/groupwise-account-setup/groupwise-account-setup.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -51,7 +51,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha
 {
 	ESourceList *list;
         GSList *groups;
-	
+
         list = e_source_list_new_for_gconf (client, path);
 	groups = e_source_list_peek_groups (list);
 
@@ -67,7 +67,7 @@ set_esource_props (const char *path, EAccount *a, GConfClient *client, const cha
 
 				if (a->source->auto_check) {
 					char *str = g_strdup_printf ("%d",a->source->auto_check_time);
-				
+
 					e_source_set_property (source, "refresh", str);
 					g_free (str);
 				} else
diff --git a/plugins/groupwise-features/addressbook-groupwise.c b/plugins/groupwise-features/addressbook-groupwise.c
index c595924..b6519c6 100644
--- a/plugins/groupwise-features/addressbook-groupwise.c
+++ b/plugins/groupwise-features/addressbook-groupwise.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/install-shared.c b/plugins/groupwise-features/install-shared.c
index bfe2954..29c5ed2 100644
--- a/plugins/groupwise-features/install-shared.c
+++ b/plugins/groupwise-features/install-shared.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/junk-mail-settings.c b/plugins/groupwise-features/junk-mail-settings.c
index cdfffa5..3e7d522 100644
--- a/plugins/groupwise-features/junk-mail-settings.c
+++ b/plugins/groupwise-features/junk-mail-settings.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/junk-settings.c b/plugins/groupwise-features/junk-settings.c
index 65eca14..3d66a1c 100644
--- a/plugins/groupwise-features/junk-settings.c
+++ b/plugins/groupwise-features/junk-settings.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/junk-settings.h b/plugins/groupwise-features/junk-settings.h
index 9e3f60c..43322de 100644
--- a/plugins/groupwise-features/junk-settings.h
+++ b/plugins/groupwise-features/junk-settings.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/mail-retract.c b/plugins/groupwise-features/mail-retract.c
index 6396685..cf03993 100644
--- a/plugins/groupwise-features/mail-retract.c
+++ b/plugins/groupwise-features/mail-retract.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -50,8 +50,8 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 	if (cnc && E_IS_GW_CONNECTION(cnc)) {
 		id = (char *)item->user_data;
 
-		confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL, 
-				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+		confirm_dialog = gtk_dialog_new_with_buttons (_("Message Retract"), NULL,
+				GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 				GTK_STOCK_YES, GTK_RESPONSE_YES,
 				GTK_STOCK_NO, GTK_RESPONSE_NO, NULL);
 
@@ -78,7 +78,7 @@ static void retract_mail_settings (EPopup *ep, EPopupItem *item, void *data)
 				gtk_dialog_run (GTK_DIALOG(dialog));
 				gtk_widget_destroy (dialog);
 			}
-		} 
+		}
 	}
 }
 
diff --git a/plugins/groupwise-features/mail-send-options.c b/plugins/groupwise-features/mail-send-options.c
index 0e0663c..7954f9e 100644
--- a/plugins/groupwise-features/mail-send-options.c
+++ b/plugins/groupwise-features/mail-send-options.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/mail-send-options.h b/plugins/groupwise-features/mail-send-options.h
index 943614e..71cacbf 100644
--- a/plugins/groupwise-features/mail-send-options.h
+++ b/plugins/groupwise-features/mail-send-options.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/process-meeting.c b/plugins/groupwise-features/process-meeting.c
index 35057bf..67123de 100644
--- a/plugins/groupwise-features/process-meeting.c
+++ b/plugins/groupwise-features/process-meeting.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -322,7 +322,7 @@ static EPopupItem retract_popup_items[] = {
 	{ E_POPUP_ITEM, (gchar *) "49.resend", (gchar *) N_("Rese_nd Meeting..."), on_resend_meeting, NULL, (gchar *) GTK_STOCK_EDIT, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_MEETING}
 };
 
-void 
+void
 org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 {
 	GSList *menus = NULL;
@@ -348,7 +348,7 @@ org_gnome_retract_resend (EPlugin *ep, ECalPopupTargetSelect *target)
 
 	if (! g_strrstr (uri, "groupwise://"))
 		return ;
-	
+
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -394,7 +394,7 @@ add_retract_data (ECalComponent *comp, const char *retract_comment, CalObjModTyp
 	icalcomponent_add_property (icalcomp, icalprop);
 }
 
-static void 
+static void
 free_thread_data (ThreadData *data)
 {
 	if (data == NULL)
@@ -420,10 +420,10 @@ retract_object (gpointer val)
 	GError *error = NULL;
 
 	add_retract_data (data->comp, NULL, data->mod);
-	
+
 	icalcomp = e_cal_component_get_icalcomponent (data->comp);
 	icalcomponent_set_method (icalcomp, ICAL_METHOD_CANCEL);
-	
+
 	if (!e_cal_send_objects (data->client, icalcomp, &users,
 						&mod_comp, &error))	{
 		/* FIXME report error  */
@@ -434,15 +434,15 @@ retract_object (gpointer val)
 
 	if (mod_comp)
 		icalcomponent_free (mod_comp);
-				
+
 	if (users) {
 		g_list_foreach (users, (GFunc) g_free, NULL);
 		g_list_free (users);
 	}
-	
+
 	rid = e_cal_component_get_recurid_as_string (data->comp);
 	e_cal_component_get_uid (data->comp, &uid);
-			
+
 	if (!e_cal_remove_object_with_mod (data->client, uid,
 				rid, data->mod, &error)) {
 		g_warning ("Unable to remove the item \n");
@@ -461,7 +461,7 @@ object_created_cb (CompEditor *ce, gpointer data)
 	GThread *thread = NULL;
 	int response;
 	GError *error = NULL;
-	
+
 	gtk_widget_hide (GTK_WIDGET (ce));
 
 	response = e_error_run (NULL, "org.gnome.evolution.process_meeting:resend-retract", NULL);
@@ -507,18 +507,18 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 
 		response = e_error_run (NULL, msg, NULL);
 		if (response == GTK_RESPONSE_YES) {
-			mod = CALOBJ_MOD_ALL;	
+			mod = CALOBJ_MOD_ALL;
 		} else if (response == GTK_RESPONSE_CANCEL) {
 			g_object_unref (comp);
 			return;
 		}
-		
+
 		data = g_new0 (ThreadData, 1);
 		data->client = g_object_ref (event->comp_data->client);
 		data->comp = comp;
 		data->mod = mod;
-		
-		if (resend) 
+
+		if (resend)
 		{
 			guint flags = 0;
 			char *new_uid = NULL;
@@ -535,7 +535,7 @@ on_resend_meeting (EPopup *ep, EPopupItem *pitem, void *data)
 			e_cal_component_set_uid (new_comp, new_uid);
 			icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (new_comp));
 			ce = e_calendar_view_open_event_with_flags (cal_view, data->client, icalcomp, flags);
-			
+
 			g_signal_connect (ce, "object_created", G_CALLBACK (object_created_cb), data);
 			g_object_unref (new_comp);
 			g_free (new_uid);
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index e7e39ba..ebcf068 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/proxy-login.h b/plugins/groupwise-features/proxy-login.h
index b36d315..24717f8 100644
--- a/plugins/groupwise-features/proxy-login.h
+++ b/plugins/groupwise-features/proxy-login.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index f958880..7ab0095 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/proxy.h b/plugins/groupwise-features/proxy.h
index 127b4cf..c2bd933 100644
--- a/plugins/groupwise-features/proxy.h
+++ b/plugins/groupwise-features/proxy.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/send-options.c b/plugins/groupwise-features/send-options.c
index 24dfb1b..33f1dd2 100644
--- a/plugins/groupwise-features/send-options.c
+++ b/plugins/groupwise-features/send-options.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/share-folder-common.c b/plugins/groupwise-features/share-folder-common.c
index 8f38f2a..74ca71f 100644
--- a/plugins/groupwise-features/share-folder-common.c
+++ b/plugins/groupwise-features/share-folder-common.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/share-folder.c b/plugins/groupwise-features/share-folder.c
index a48cd10..382cf75 100644
--- a/plugins/groupwise-features/share-folder.c
+++ b/plugins/groupwise-features/share-folder.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/share-folder.h b/plugins/groupwise-features/share-folder.h
index 9801adc..fadf37b 100644
--- a/plugins/groupwise-features/share-folder.h
+++ b/plugins/groupwise-features/share-folder.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/groupwise-features/status-track.c b/plugins/groupwise-features/status-track.c
index 2b21b47..a465752 100644
--- a/plugins/groupwise-features/status-track.c
+++ b/plugins/groupwise-features/status-track.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/hula-account-setup/camel-hula-listener.c b/plugins/hula-account-setup/camel-hula-listener.c
index ee40a7b..1094bec 100644
--- a/plugins/hula-account-setup/camel-hula-listener.c
+++ b/plugins/hula-account-setup/camel-hula-listener.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/hula-account-setup/camel-hula-listener.h b/plugins/hula-account-setup/camel-hula-listener.h
index 3dfdff3..9a0c364 100644
--- a/plugins/hula-account-setup/camel-hula-listener.h
+++ b/plugins/hula-account-setup/camel-hula-listener.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/hula-account-setup/hula-account-setup.c b/plugins/hula-account-setup/hula-account-setup.c
index 6518d10..84a7a41 100644
--- a/plugins/hula-account-setup/hula-account-setup.c
+++ b/plugins/hula-account-setup/hula-account-setup.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/imap-features/imap-headers.c b/plugins/imap-features/imap-headers.c
index e3d2033..c33a02b 100644
--- a/plugins/imap-features/imap-headers.c
+++ b/plugins/imap-features/imap-headers.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -260,7 +260,7 @@ org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data)
 	GtkTreeViewColumn *column;
 	GtkTreeIter first, iter;
 	gboolean use_imap = g_getenv ("USE_IMAP") != NULL;
-	
+
 	ui = g_new0 (EPImapFeaturesData, 1);
 
 	target_account = (EMConfigTargetAccount *)data->config->target;
diff --git a/plugins/ipod-sync/evolution-ipod-sync.c b/plugins/ipod-sync/evolution-ipod-sync.c
index e0f4246..487d9f1 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.c
+++ b/plugins/ipod-sync/evolution-ipod-sync.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/ipod-sync/evolution-ipod-sync.h b/plugins/ipod-sync/evolution-ipod-sync.h
index 6fbf1e9..662b16e 100644
--- a/plugins/ipod-sync/evolution-ipod-sync.h
+++ b/plugins/ipod-sync/evolution-ipod-sync.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/ipod-sync/format-handler.h b/plugins/ipod-sync/format-handler.h
index d061f4c..145bcb7 100644
--- a/plugins/ipod-sync/format-handler.h
+++ b/plugins/ipod-sync/format-handler.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/ipod-sync/ical-format.c b/plugins/ipod-sync/ical-format.c
index 576c865..49c042f 100644
--- a/plugins/ipod-sync/ical-format.c
+++ b/plugins/ipod-sync/ical-format.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -99,7 +99,7 @@ do_save_calendar_ical (FormatHandler *handler, EPlugin *ep, ECalPopupTargetSourc
 
 		if (stream)
 			g_object_unref (stream);
-	} 
+	}
 
 	if (error) {
 		display_error_message (gtk_widget_get_toplevel (GTK_WIDGET (target->selector)), error->message);
diff --git a/plugins/ipod-sync/ipod-sync.c b/plugins/ipod-sync/ipod-sync.c
index f2d597b..1f589bf 100644
--- a/plugins/ipod-sync/ipod-sync.c
+++ b/plugins/ipod-sync/ipod-sync.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -256,7 +256,7 @@ org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target)
 {
 	if (!ipod_check_status(FALSE))
 		return;
-	
+
 	destination_save_cal (ep, target, E_CAL_SOURCE_TYPE_JOURNAL);
 }
 
diff --git a/plugins/ipod-sync/ipod.c b/plugins/ipod-sync/ipod.c
index 26e3d49..5f399f2 100644
--- a/plugins/ipod-sync/ipod.c
+++ b/plugins/ipod-sync/ipod.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/ipod-sync/sync.c b/plugins/ipod-sync/sync.c
index 42f3bdf..8fe83d1 100644
--- a/plugins/ipod-sync/sync.c
+++ b/plugins/ipod-sync/sync.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -425,7 +425,7 @@ export_memos (void)
 	g_string_free (data, TRUE);
 
 	free_uri_list (uris);
-	
+
 	pulse ();
 }
 
diff --git a/plugins/itip-formatter/itip-formatter.c b/plugins/itip-formatter/itip-formatter.c
index c777f6c..293c4e3 100644
--- a/plugins/itip-formatter/itip-formatter.c
+++ b/plugins/itip-formatter/itip-formatter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -695,7 +695,7 @@ find_cal_opened_cb (ECal *ecal, ECalendarStatus status, gpointer data)
 
 		itip_view_remove_lower_info_item (ITIP_VIEW (pitip->view), pitip->progress_info_id);
 		pitip->progress_info_id = 0;
-		
+
 		/*
 		 * Only allow replies if backend doesn't do that automatically.
                  * Only enable it for forwarded invitiations (PUBLISH) or direct
@@ -834,7 +834,7 @@ find_server (struct _itip_puri *pitip, ECalComponent *comp)
 
 	if (current_source) {
 		l = sources_conflict;
-		
+
 		pitip->progress_info_id = itip_view_add_lower_info_item (ITIP_VIEW (pitip->view), ITIP_VIEW_INFO_ITEM_TYPE_PROGRESS,
 				_("Opening the calendar. Please wait.."));
 	} else {
@@ -1243,8 +1243,8 @@ remove_delegate (struct _itip_puri *pitip, const char *delegate, const char *del
 
 }
 
-static void 
-update_x (ECalComponent *pitip_comp, ECalComponent *comp) 
+static void
+update_x (ECalComponent *pitip_comp, ECalComponent *comp)
 {
 	icalcomponent *itip_icalcomp = e_cal_component_get_icalcomponent (pitip_comp);
 	icalcomponent *icalcomp = e_cal_component_get_icalcomponent (comp);
@@ -2053,7 +2053,7 @@ format_itip_object (EMFormatHTML *efh, GtkHTMLEmbedded *eb, EMFormatHTMLPObject
 	gboolean have_alarms = FALSE;
 
 	info = (struct _itip_puri *) em_format_find_puri((EMFormat *)efh, pobject->classid);
-	
+
 	/* Accounts */
 	info->accounts = itip_addresses_get ();
 
@@ -2441,10 +2441,10 @@ format_itip (EPlugin *ep, EMFormatHookTarget *target)
 
 	if (((CamelStreamMem *) mem)->buffer->len == 0)
 		puri->vcalendar = NULL;
-	else 
+	else
 		puri->vcalendar = g_strndup ((char *)((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);
diff --git a/plugins/itip-formatter/itip-view.c b/plugins/itip-formatter/itip-view.c
index 2d714b4..30dbe13 100644
--- a/plugins/itip-formatter/itip-view.c
+++ b/plugins/itip-formatter/itip-view.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -737,7 +737,7 @@ set_info_items (GtkWidget *info_box, GSList *info_items)
 		}
 
 		label = gtk_label_new (item->message);
-		gtk_label_set_selectable (GTK_LABEL (label), TRUE);		
+		gtk_label_set_selectable (GTK_LABEL (label), TRUE);
 		gtk_widget_show (label);
 		gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 6);
 
@@ -1034,7 +1034,7 @@ itip_view_init (ItipView *view)
 	priv->start_header = gtk_label_new (_("Start time:"));
 	priv->start_label = gtk_label_new (NULL);
 	gtk_label_set_selectable (GTK_LABEL (priv->start_header), TRUE);
-	gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (priv->start_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->start_header), 0, 0.5);
 	gtk_misc_set_alignment (GTK_MISC (priv->start_label), 0, 0.5);
 	gtk_widget_show (priv->start_header);
@@ -1078,7 +1078,7 @@ itip_view_init (ItipView *view)
 
 	/* Description */
 	priv->description_label = gtk_label_new (NULL);
-	gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (priv->description_label), TRUE);
 	gtk_label_set_line_wrap (GTK_LABEL (priv->description_label), TRUE);
 	gtk_misc_set_alignment (GTK_MISC (priv->description_label), 0, 0.5);
 	gtk_box_pack_start (GTK_BOX (vbox), priv->description_label, FALSE, FALSE, 0);
@@ -1112,12 +1112,12 @@ itip_view_init (ItipView *view)
 	gtk_box_pack_start (GTK_BOX (priv->rsvp_box), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new (NULL);
-	gtk_label_set_selectable (GTK_LABEL (label), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (label), TRUE);
 	gtk_widget_show (label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 
 	priv->rsvp_comment_header = gtk_label_new (_("Comment:"));
-	gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);	
+	gtk_label_set_selectable (GTK_LABEL (priv->rsvp_comment_header), TRUE);
 	gtk_widget_set_sensitive (priv->rsvp_comment_header, FALSE);
 	gtk_widget_show (priv->rsvp_comment_header);
 	gtk_box_pack_start (GTK_BOX (hbox), priv->rsvp_comment_header, FALSE, FALSE, 0);
@@ -2174,8 +2174,8 @@ void
 itip_view_set_show_free_time_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->free_time_check);
 	else {
@@ -2196,8 +2196,8 @@ void
 itip_view_set_show_keep_alarm_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->keep_alarm_check);
 	else
@@ -2219,8 +2219,8 @@ void
 itip_view_set_show_inherit_alarm_check (ItipView *view, gboolean show)
 {
 	g_return_if_fail (view != NULL);
-	g_return_if_fail (ITIP_IS_VIEW (view));	
-	
+	g_return_if_fail (ITIP_IS_VIEW (view));
+
 	if (show)
 		gtk_widget_show (view->priv->inherit_alarm_check);
 	else {
diff --git a/plugins/itip-formatter/itip-view.h b/plugins/itip-formatter/itip-view.h
index 736119a..88d0120 100644
--- a/plugins/itip-formatter/itip-view.h
+++ b/plugins/itip-formatter/itip-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c
index 552bea5..d03e97d 100644
--- a/plugins/mail-account-disable/mail-account-disable.c
+++ b/plugins/mail-account-disable/mail-account-disable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 5bb65ce..466648d 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -398,8 +398,8 @@ do_properties (GtkMenuItem *item, gpointer user_data)
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
 
 	dialog = gtk_dialog_new_with_buttons (_("Mail Notification Properties"),
-						NULL, 
-						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, 
+						NULL,
+						GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
 						GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
 						NULL);
 
@@ -427,7 +427,7 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time
 	#endif
 	gtk_widget_show (item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
-	
+
 	item = gtk_separator_menu_item_new ();
 	gtk_widget_show (item);
 	gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@@ -443,11 +443,11 @@ popup_menu_status (GtkStatusIcon *status_icon, guint button, guint activate_time
 }
 
 #ifdef HAVE_LIBNOTIFY
-static void 
+static void
 notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a)
 {
 	g_static_mutex_lock (&mlock);
-	
+
 	gtk_status_icon_set_visible (status_icon, FALSE);
 	g_object_unref (status_icon);
 
@@ -457,7 +457,7 @@ notifyActionCallback (NotifyNotification *n, gchar *label, gpointer a)
 	}
 
 	status_icon = NULL;
-	status_count = 0;	
+	status_count = 0;
 	g_static_mutex_unlock (&mlock);
 }
 #endif
@@ -833,11 +833,11 @@ get_cfg_widget (void)
 	gtk_widget_show (check);
 	gtk_box_pack_start (GTK_BOX (vbox), check, FALSE, FALSE, 0);
 
-#ifdef HAVE_DBUS	
+#ifdef HAVE_DBUS
 	cfg = get_config_widget_dbus ();
 	if (cfg)
 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
-#endif 
+#endif
 	cfg = get_config_widget_status ();
 	if (cfg)
 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
@@ -868,7 +868,7 @@ org_gnome_mail_new_notify (EPlugin *ep, EMEventTargetFolder *t)
 
 	g_static_mutex_lock (&mlock);
 
-#ifdef HAVE_DBUS	
+#ifdef HAVE_DBUS
 	if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 		new_notify_dbus (t);
 #endif
@@ -908,7 +908,7 @@ int
 e_plugin_lib_enable (EPluginLib *ep, int enable)
 {
 	if (enable) {
-#ifdef HAVE_DBUS		
+#ifdef HAVE_DBUS
 		if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
 			enable_dbus (enable);
 #endif
@@ -922,7 +922,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
 	} else {
 #ifdef HAVE_DBUS
 		enable_dbus (enable);
-#endif 
+#endif
 		enable_status (enable);
 		enable_sound (enable);
 
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index 44a7d8b..5560a4c 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -372,7 +372,7 @@ do_mail_to_event (AsyncData *data)
 		dt.tzid = NULL;
 
 		tt2 = tt;
-		icaltime_adjust (&tt2, 1, 0, 0, 0);		
+		icaltime_adjust (&tt2, 1, 0, 0, 0);
 		dt2.value = &tt2;
 		dt2.tzid = NULL;
 
@@ -581,7 +581,7 @@ mail_to_event (ECalSourceType source_type, gboolean with_attendees, GPtrArray *u
 			}
 		}
 	}
-	
+
 	if (!source) {
 		GtkWidget *dialog;
 
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c b/plugins/mailing-list-actions/mailing-list-actions.c
index 9dd5c1c..7dc1895 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/mark-all-read/mark-all-read.c b/plugins/mark-all-read/mark-all-read.c
index c9ea67c..dfcf759 100644
--- a/plugins/mark-all-read/mark-all-read.c
+++ b/plugins/mark-all-read/mark-all-read.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/mono/mono-plugin.c b/plugins/mono/mono-plugin.c
index 5dd92e8..0bc9561 100644
--- a/plugins/mono/mono-plugin.c
+++ b/plugins/mono/mono-plugin.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -108,18 +108,18 @@ epm_invoke(EPlugin *ep, const char *name, void *data)
 		if (p->klass) {
 			d(printf("looking up method '%s' in class\n", name));
 			/* class method */
-			
+
 			d = mono_method_desc_new(name, FALSE);
 			/*if (d == NULL) {
 				g_warning("Can't create method descriptor for '%s'", name);
 				return NULL;
 			}*/
-			
+
 			gpointer iter = NULL;
 			MonoMethod* mono_method;
 
 			d(printf ("\n\a About to get methods in klass\n\a"));
-			       
+
 			while ((mono_method = mono_class_get_methods (p->klass, &iter))) {
 				g_print ("\n\a Method name is : <%s>\n\a", mono_method_get_name(mono_method));
 			}
diff --git a/plugins/mono/mono-plugin.h b/plugins/mono/mono-plugin.h
index 3c11072..9dd8fac 100644
--- a/plugins/mono/mono-plugin.h
+++ b/plugins/mono/mono-plugin.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/plugin-manager/plugin-manager.c b/plugins/plugin-manager/plugin-manager.c
index 19af3ee..54d1660 100644
--- a/plugins/plugin-manager/plugin-manager.c
+++ b/plugins/plugin-manager/plugin-manager.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -314,7 +314,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t)
 		GtkTreeIter iter;
 		GtkWidget *cfg_widget;
 
-		if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) { 
+		if (!g_getenv ("EVO_SHOW_ALL_PLUGINS")) {
 			/* hide ourselves always */
 			if (ep->flags & E_PLUGIN_FLAGS_SYSTEM_PLUGIN)
 				continue;
@@ -338,7 +338,7 @@ org_gnome_plugin_manager_manage (void *ep, ESMenuTargetShell *t)
 				    COL_PLUGIN_DATA, ep,
 				    COL_PLUGIN_CFG_WIDGET, cfg_widget,
 				    -1);
-				    
+
 	}
 
 	/* setup the treeview */
diff --git a/plugins/prefer-plain/prefer-plain.c b/plugins/prefer-plain/prefer-plain.c
index ed4b6dc..13453b2 100644
--- a/plugins/prefer-plain/prefer-plain.c
+++ b/plugins/prefer-plain/prefer-plain.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/profiler/profiler.c b/plugins/profiler/profiler.c
index 6f52759..08787fc 100644
--- a/plugins/profiler/profiler.c
+++ b/plugins/profiler/profiler.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 8cbf80e..4bfe66b 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -98,7 +98,7 @@ void org_credativ_evolution_readpst_cancel (EImport *ei, EImportTarget *target,
 int e_plugin_lib_enable (EPluginLib *ep, int enable);
 
 
-/* em-folder-selection-button.h is private, even though other internal evo plugins use it! 
+/* 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
 */
@@ -123,7 +123,7 @@ struct _PstImporter {
 	CamelException ex;
 
 	pst_file pst;
-	
+
 	CamelOperation *cancel;
 	CamelFolder *folder;
 	gchar *parent_uri;
@@ -152,7 +152,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target)
 	}
 
 	s = (EImportTargetURI *)target;
-	
+
 	if (s->uri_src == NULL) {
 		return TRUE;
 	}
@@ -170,7 +170,7 @@ org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target)
 		ret = n == sizeof (pst_signature) && memcmp (signature, pst_signature, sizeof (pst_signature)) == 0;
 		close (fd);
 	}
-	
+
 	return ret;
 }
 
@@ -214,8 +214,8 @@ folder_selected (EMFolderSelectionButton *button, EImportTargetURI *target)
 
 /**
  * Suggest a folder to import data into
- * @param target 
- * @return 
+ * @param target
+ * @return
  */
 static gchar*
 get_suggested_foldername (EImportTargetURI *target)
@@ -244,7 +244,7 @@ get_suggested_foldername (EImportTargetURI *target)
 	if (pst_init (&pst, filename) == 0) {
 		rootname = get_pst_rootname (&pst, filename);
 	}
-	
+
 	g_free (filename);
 
 	if (rootname != NULL) {
@@ -271,7 +271,7 @@ get_suggested_foldername (EImportTargetURI *target)
 				break;
 			}
 		}
-		
+
 		if (folder != NULL) {
 			pst_error_msg ("Error searching for an unused folder name. uri=%s", foldername);
 		}
@@ -301,17 +301,17 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, TRUE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_mail_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *) hbox, w, FALSE, FALSE, 0);
-	
+
 	w = em_folder_selection_button_new (_("Select folder"), _("Select folder to import into"));
 	foldername = get_suggested_foldername ((EImportTargetURI *) target);
 	((EImportTargetURI *) target)->uri_dest = g_strdup (foldername);
 	em_folder_selection_button_set_selection ((EMFolderSelectionButton *) w, foldername);
 	g_signal_connect (w, "selected", G_CALLBACK (folder_selected), target);
 	gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, FALSE, 0);
-	
+
 	w = gtk_label_new (_("Destination folder:"));
 	gtk_box_pack_end ((GtkBox *) hbox, w, FALSE, TRUE, 6);
-	
+
 	gtk_box_pack_start ((GtkBox *) framebox, hbox, FALSE, FALSE, 0);
 
 	/* Address book */
@@ -320,19 +320,19 @@ org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EI
 	/*gtk_widget_set_sensitive ((GtkWidget *)w, FALSE);*/ /* Disable until implemented */
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_addr_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *) framebox, w, FALSE, FALSE, 0);
-	
+
 	/* Appointments */
 	w = gtk_check_button_new_with_mnemonic (_("A_ppointments"));
 	gtk_toggle_button_set_active ((GtkToggleButton *) w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_appt_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
-	
+
 	/* Tasks */
 	w = gtk_check_button_new_with_mnemonic (_("_Tasks"));
 	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
 	g_signal_connect (w, "toggled", G_CALLBACK (checkbox_task_toggle_cb), target);
 	gtk_box_pack_start ((GtkBox *)framebox, w, FALSE, FALSE, 0);
-	
+
 	/* Journal */
 	w = gtk_check_button_new_with_mnemonic (_("_Journal entries"));
 	gtk_toggle_button_set_active ((GtkToggleButton *)w, FALSE);
@@ -360,24 +360,24 @@ open_ecal (ECalSourceType type, char *name)
 	ESource *primary;
 	ESourceList *source_list;
 	ECal *cal;
-	
+
 	if ((e_cal_get_sources (&source_list, type, NULL)) == 0) {
 		g_warning ("Could not get any sources of type %s.", name);
 		return NULL;
-	}		
-	
+	}
+
 	primary = e_source_list_peek_source_any (source_list);
-	
+
 	if ((cal = e_cal_new (primary, type)) == NULL) {
 		g_warning ("Could not create %s.", name);
 		g_object_unref (source_list);
 		return NULL;
 	}
-	
+
 	e_cal_open (cal, TRUE, NULL);
 	g_object_unref (primary);
 	g_object_unref (source_list);
-	
+
 	return cal;
 }
 
@@ -385,18 +385,18 @@ static void
 pst_import_import (PstImporter *m)
 {
 	CamelOperation *oldcancel = NULL;
-	
+
 	oldcancel = camel_operation_register (m->status);
-	
+
 	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-addr"))) {
 		/* Hack - grab the first address book we can find
 		   TODO - add a selection mechanism in get_widget */
 		ESource *primary;
 		ESourceList *source_list;
-	
+
 		if (e_book_get_addressbooks (&source_list, NULL)) {
 			primary = e_source_list_peek_source_any (source_list);
-		
+
 			if ((m->addressbook = e_book_new (primary,NULL))) {
 				e_book_open (m->addressbook, TRUE, NULL);
 				g_object_unref (primary);
@@ -406,8 +406,8 @@ pst_import_import (PstImporter *m)
 			}
 		} else {
 			g_warning ("Could not get address books.");
-		}		
-	}	
+		}
+	}
 
 	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-appt"))) {
 		m->calendar = open_ecal (E_CAL_SOURCE_TYPE_EVENT, "calendar");
@@ -420,10 +420,10 @@ pst_import_import (PstImporter *m)
 	if (GPOINTER_TO_INT (g_datalist_get_data (&m->target->data, "pst-do-journal"))) {
 		m->journal = open_ecal (E_CAL_SOURCE_TYPE_JOURNAL, "journal");
 	}
-	
+
 	pst_import_file (m);
 
-/* FIXME: Crashes often in here.	
+/* FIXME: Crashes often in here.
 	if (m->addressbook) {
 		g_object_unref (m->addressbook);
 	}
@@ -478,7 +478,7 @@ pst_import_file (PstImporter *m)
 	}
 
 	camel_operation_progress_count (NULL, 2);
-	
+
 	if ((d_ptr = pst_getTopOfFolders (&m->pst, item)) == NULL) {
 		pst_error_msg ("Top of folders record not found. Cannot continue");
 		return;
@@ -505,7 +505,7 @@ pst_import_folders (PstImporter *m, pst_desc_ll *topitem)
 
 	/* Walk through folder tree */
 	while (d_ptr != NULL && (camel_operation_cancel_check (NULL) == FALSE)) {
-		
+
 		pst_process_item (m, d_ptr);
 
 		if (d_ptr->child != NULL) {
@@ -555,9 +555,9 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
 	if (item->message_store != NULL) {
 		pst_error_msg ("A second message_store has been found - ignored");
 		pst_freeItem (item);
-		return;		
+		return;
 	}
-	
+
 	if (item->folder != NULL) {
 		pst_process_folder (m, item);
 		camel_operation_start (NULL, _("Importing `%s'"), item->file_as);
@@ -567,7 +567,7 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
 		} else {
 			camel_operation_progress (NULL, 100);
 		}
-		
+
 		if (item->email != NULL &&
 			(item->type == PST_TYPE_NOTE || item->type == PST_TYPE_REPORT)) {
 
@@ -599,12 +599,12 @@ pst_process_item (PstImporter *m, pst_desc_ll *d_ptr)
 			}
 
 		}
-		
+
 		m->current_item++;
 	}
 
 	pst_freeItem (item);
-	
+
 	if (d_ptr->next == NULL) {
 		camel_operation_end (NULL);
 	}
@@ -660,7 +660,7 @@ pst_process_folder (PstImporter *m, pst_item *item)
 	gchar *uri;
 	g_free (m->folder_name);
 	g_free (m->folder_uri);
-	
+
 	if (item->file_as != NULL) {
 		m->folder_name = foldername_to_utf8 (item->file_as);
 	} else {
@@ -670,7 +670,7 @@ pst_process_folder (PstImporter *m, pst_item *item)
 
 	uri = g_strjoin ("/", m->parent_uri, m->folder_name, NULL);
 	m->folder_uri = uri;
-	
+
 	if (m->folder) {
 		camel_object_unref (m->folder);
 		m->folder = NULL;
@@ -721,7 +721,7 @@ pst_create_folder (PstImporter *m)
 	}
 
 	m->folder = mail_tool_uri_to_folder (m->folder_uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex);
-	
+
 }
 
 /**
@@ -757,7 +757,7 @@ attachment_to_part (PstImporter *m, pst_item_attach *attach)
 		char *buf = NULL;
 		size_t size;
 		size = pst_attach_to_mem (&m->pst, attach, &buf);
-		
+
 		camel_mime_part_set_content (part, (char*) buf, size, mimetype);
 		free(buf);
 	}
@@ -773,7 +773,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	CamelMultipart *mp;
 	CamelMimePart *part;
 	CamelMessageInfo *info;
-	
+
 	if (m->folder == NULL) {
 		pst_create_folder (m);
 	}
@@ -784,7 +784,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 
 	if (item->email->subject != NULL) {
 		gchar *subj;
-		
+
 		subj = string_to_utf8 (item->email->subject->subj);
 		if (subj == NULL) {
 			g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj);
@@ -796,7 +796,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	}
 
 	addr = camel_internet_address_new ();
-	
+
 	if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) {
 		camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender);
 	} else if (item->email->outlook_sender_name != NULL) {
@@ -807,7 +807,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 		/* Evo prints a warning if no from is set, so supply an empty address */
 		camel_internet_address_add (addr, "", "");
 	}
-	
+
 	camel_mime_message_set_from (msg, addr);
 	camel_object_unref (addr);
 
@@ -830,7 +830,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 			g_warning ("Error reading headers, skipped");
 
 	} else {
-	 
+
 		if (item->email->sentto_address != NULL) {
 			addr = camel_internet_address_new ();
 
@@ -849,9 +849,9 @@ pst_process_email (PstImporter *m, pst_item *item)
 			camel_object_unref (addr);
 		}
 	}
-	
+
 	mp = camel_multipart_new ();
-	
+
 	if (item->attach != NULL) {
 
 		camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed");
@@ -909,7 +909,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 	} else if (item->email->body) {
 		camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain");
 	} else {
-		g_warning ("Email without body. Subject:%s", 
+		g_warning ("Email without body. Subject:%s",
 				(item->email->subject->subj ? item->email->subject->subj : "(empty)"));
 		camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain");
 	}
@@ -925,7 +925,7 @@ pst_process_email (PstImporter *m, pst_item *item)
 
 	if(item->email->flag && 0x08)
 		camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0);
-	
+
 	camel_folder_append_message (m->folder, msg, info, NULL, &m->ex);
 	camel_message_info_free (info);
 	camel_object_unref (msg);
@@ -962,34 +962,34 @@ static void
 contact_set_address (EContact *contact, EContactField id, char *address, char *city, char *country, char *po_box, char *postal_code, char *state, char *street)
 {
 	EContactAddress *eaddress;
-	
+
 	if (address || city || country || po_box || postal_code || state || street) {
 		eaddress = g_new0 (EContactAddress, 1);
 		if (po_box) {
 			eaddress->po = g_strdup (po_box);
 		}
-		//eaddress->ext = 
-		
+		//eaddress->ext =
+
 		if (street) {
 			eaddress->street = g_strdup (street);
 		}
-		
+
 		if (city) {
 			eaddress->locality = g_strdup (city);
 		}
-		
+
 		if (state) {
 			eaddress->region = g_strdup (state);
 		}
-		
+
 		if (postal_code) {
 			eaddress->code = g_strdup (postal_code);
 		}
-		
+
 		if (country) {
 			eaddress->country = g_strdup (country);
 		}
-		
+
 		e_contact_set (contact, id, eaddress);
 	}
 }
@@ -1002,14 +1002,14 @@ contact_set_date (EContact *contact, EContactField id, FILETIME *date)
 		struct tm tm;
 		EContactDate *bday;
 		bday = e_contact_date_new ();
-		
+
 		t1 = fileTimeToUnixTime (date, 0);
 		gmtime_r (&t1, &tm);
-		
+
 		bday->year = tm.tm_year + 1900;
 		bday->month = tm.tm_mon + 1;
 		bday->day = tm.tm_mday;
-		
+
 		e_contact_set (contact, id, bday);
 	}
 }
@@ -1021,7 +1021,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	EContact *ec;
 	c = item->contact;
 	GString *notes;
-	
+
 	notes = g_string_sized_new (2048);
 
 	ec = e_contact_new ();
@@ -1055,27 +1055,27 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	} else {
 		contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname);
 	}
-	
+
 	/* unknown_field (ec, notes, "initials", c->initials); */
-	
+
 	contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname);
-	
+
 	contact_set_string (ec, E_CONTACT_ORG, c->company_name);
 	contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department);
 	contact_set_string (ec, E_CONTACT_TITLE, c->job_title);
 
-	contact_set_address (ec,E_CONTACT_ADDRESS_WORK, 
-			    c->business_address, c->business_city, c->business_country, 
+	contact_set_address (ec,E_CONTACT_ADDRESS_WORK,
+			    c->business_address, c->business_city, c->business_country,
 			    c->business_po_box, c->business_postal_code, c->business_state, c->business_street);
-	
-	contact_set_address (ec,E_CONTACT_ADDRESS_HOME, 
-			    c->home_address, c->home_city, c->home_country, 
+
+	contact_set_address (ec,E_CONTACT_ADDRESS_HOME,
+			    c->home_address, c->home_city, c->home_country,
 			    c->home_po_box, c->home_postal_code, c->home_state, c->home_street);
-			
-	contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, 
-			    c->other_address, c->other_city, c->other_country, 
+
+	contact_set_address (ec,E_CONTACT_ADDRESS_OTHER,
+			    c->other_address, c->other_city, c->other_country,
 			    c->other_po_box, c->other_postal_code, c->other_state, c->other_street);
-	
+
 	contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone);
 	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax);
 	contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone);
@@ -1100,11 +1100,11 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	unknown_field (ec, notes, "billing_information", c->billing_information);
 	contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday);
 	/* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */
-	
+
 	contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1);
 	contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2);
 	contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3);
-	
+
 	/*unknown_field (ec, notes, "address1_desc" , c->address1_desc);
 	unknown_field (ec, notes, "address1_transport" , c->address1_transport);
 	unknown_field (ec, notes, "address2_desc" , c->address2_desc);
@@ -1120,9 +1120,9 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	unknown_field (ec, notes, "customer_id", c->customer_id);
 	unknown_field (ec, notes, "hobbies", c->hobbies);
 	unknown_field (ec, notes, "followup", c->followup);
-		
+
 	contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address);
-	
+
 	unknown_field (ec, notes, "keyword", c->keyword);
 	unknown_field (ec, notes, "language", c->language);
 	unknown_field (ec, notes, "location", c->location);
@@ -1134,7 +1134,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	unknown_field (ec, notes, "mileage", c->mileage);
 	unknown_field (ec, notes, "org_id", c->org_id);
 	contact_set_string (ec, E_CONTACT_ROLE, c->profession);
-	
+
 	contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name);
 
 	if (c->personal_homepage) {
@@ -1145,7 +1145,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 	} else if (c->business_homepage) {
 		contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage);
 	}
-	
+
 	if (item->comment) {
 		g_string_append_printf (notes, "%s\n", item->comment);
 	}
@@ -1156,7 +1156,7 @@ pst_process_contact (PstImporter *m, pst_item *item)
 
 	contact_set_string (ec, E_CONTACT_NOTE, notes->str);
 	g_string_free (notes, TRUE);
-	
+
 	e_book_add_contact (m->addressbook, ec, NULL);
 	g_object_unref (ec);
 
@@ -1188,7 +1188,7 @@ char *rfc2445_datetime_format (FILETIME *ft) {
 	if (buffer == NULL) {
 		buffer = malloc (30); // should be enough
 	}
-	
+
 	stm = fileTimeToStructTM (ft);
 	strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm);
 	return buffer;
@@ -1219,7 +1219,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 		part = attachment_to_part(m, attach);
 
 		orig_filename = camel_mime_part_get_filename(part);
-		
+
 		if (orig_filename == NULL) {
 			g_warning("Ignoring unnamed attachment");
 			attach = attach->next;
@@ -1229,10 +1229,10 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 		tmp = camel_file_util_safe_filename (orig_filename);
 		filename = g_strdup_printf ("%s-%s", uid, tmp);
 		path = g_build_filename (store_dir, filename, NULL);
-		
+
 		g_free (tmp);
 		g_free (filename);
-	
+
 		dirname = g_path_get_dirname(path);
 		if (g_mkdir_with_parents(dirname, 0777) == -1) {
 			g_warning("Could not create directory %s: %s", dirname, g_strerror(errno));
@@ -1241,7 +1241,7 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 			continue;
 		}
 		g_free(dirname);
-	
+
 		if (g_access(path, F_OK) == 0) {
 			if (g_access(path, W_OK) != 0) {
 				g_warning("Could not write file %s - file exists", path);
@@ -1249,21 +1249,21 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 				continue;
 			}
 		}
-		
+
 		if (g_stat(path, &st) != -1 && !S_ISREG(st.st_mode)) {
 			g_warning("Could not write file %s - not a file", path);
 			attach = attach->next;
 			continue;
 		}
-		
+
 		if (!(stream = camel_stream_fs_new_with_name (path, O_WRONLY | O_CREAT | O_TRUNC, 0666))) {
 			g_warning ("Could not create stream for file %s - %s", path, g_strerror (errno));
 			attach = attach->next;
 			continue;
 		}
-	
+
 		content = camel_medium_get_content_object (CAMEL_MEDIUM (part));
-	
+
 		if (camel_data_wrapper_decode_to_stream (content, stream) == -1
 			|| camel_stream_flush (stream) == -1)
 		{
@@ -1272,18 +1272,18 @@ set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_atta
 			attach = attach->next;
 			continue;
 		}
-					
+
 		camel_object_unref (stream);
-		
+
 		uri = g_filename_to_uri (path, NULL, NULL);
 		list = g_slist_append (list, g_strdup (uri));
 		g_free (uri);
-		
+
 		camel_object_unref (part);
 		g_free (path);
 
 		attach = attach->next;
-		
+
 	}
 
 	g_free (store_dir);
@@ -1296,13 +1296,13 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 {
 	pst_item_appointment *a;
 	pst_item_email *e;
-	
+
 	a = item->appointment;
 	e = item->email;
 	ECalComponentText text;
 	struct icaltimetype tt_start, tt_end;
 	ECalComponentDateTime dt_start, dt_end;
-	
+
 	if (item->create_date) {
 		struct icaltimetype tt;
 		tt = get_ical_date (item->create_date, FALSE);
@@ -1313,7 +1313,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 		tt = get_ical_date (item->modify_date, FALSE);
 		e_cal_component_set_last_modified (ec, &tt);
 	}
-	
+
 	if (e) {
 		if (e->subject || e->proc_subject) {
 			if (e->subject) {
@@ -1332,11 +1332,11 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 			l.data = &text;
 			l.next = NULL;
 			e_cal_component_set_description_list (ec, &l);
-		}				
+		}
 	} else {
 		g_warning ("%s without subject / body!", type);
 	}
-	
+
 	if (a->location) {
 		e_cal_component_set_location (ec, a->location);
 	}
@@ -1391,19 +1391,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 		case PST_APP_LABEL_PHONE_CALL:
 			e_cal_component_set_categories (ec, "Phone-call"); break;
 	}
-	
+
 	if (a->alarm || a->alarm_minutes) {
 		ECalComponentAlarm *alarm;
 		ECalComponentAlarmTrigger trigger;
-		
+
 		alarm = e_cal_component_alarm_new ();
-		
+
 		if (a->alarm_minutes) {
 			trigger.type = E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_START;
 			trigger.u.rel_duration = icaldurationtype_from_int (- (a->alarm_minutes)*60);
 			e_cal_component_alarm_set_trigger (alarm, trigger);
 		}
-		
+
 		if (a->alarm) {
 			if (a->alarm_filename) {
 				e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO);
@@ -1414,19 +1414,19 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 
 		e_cal_component_add_alarm (ec, alarm);
 		e_cal_component_alarm_free(alarm);
-	
+
 	}
-	
+
 	if (a->recurrence != PST_APP_RECUR_NONE) {
 		struct icalrecurrencetype  r;
 		GSList recur_list;
-		
+
 		icalrecurrencetype_clear (&r);
 		r.interval = 1; /* Interval not implemented in libpst */
 		if (a->recurrence_end) {
 			r.until = get_ical_date (a->recurrence_end, FALSE);
 		}
-		
+
 		switch (a->recurrence_type) {
 			case PST_APP_RECUR_DAILY:
 				r.freq = ICAL_DAILY_RECURRENCE; break;
@@ -1444,7 +1444,7 @@ fill_calcomponent (PstImporter *m, pst_item *item, ECalComponent *ec, const char
 		recur_list.next = NULL;
 		e_cal_component_set_rrule_list (ec, &recur_list);
 	}
-	
+
 }
 
 static void
@@ -1454,7 +1454,7 @@ pst_process_appointment (PstImporter *m, pst_item *item)
 
 	ec = e_cal_component_new ();
 	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_EVENT);
-	
+
 	fill_calcomponent (m, item, ec, "appointment");
 	set_cal_attachments (m->calendar, ec, m, item->attach);
 
@@ -1464,7 +1464,7 @@ pst_process_appointment (PstImporter *m, pst_item *item)
 	}
 
 	g_object_unref (ec);
-	
+
 }
 
 static void
@@ -1474,19 +1474,19 @@ pst_process_task (PstImporter *m, pst_item *item)
 
 	ec = e_cal_component_new ();
 	e_cal_component_set_new_vtype (ec, E_CAL_COMPONENT_TODO);
-	
+
 	fill_calcomponent (m, item, ec, "task");
 	set_cal_attachments (m->tasks, ec, m, item->attach);
 
 	/* Note - libpst is missing many fields. E.g. task status, start/completion date, % complete */
-	
+
 	if (!e_cal_create_object (m->tasks, e_cal_component_get_icalcomponent (ec), NULL, NULL)) {
 		g_warning("Creation of task failed");
 		g_free(ec);
 	}
-	
+
 	g_object_unref (ec);
-	
+
 }
 
 static void
@@ -1507,7 +1507,7 @@ pst_process_journal (PstImporter *m, pst_item *item)
 		ECalComponentText text;
 		struct icaltimetype tt_start, tt_end;
 		ECalComponentDateTime dt_start, dt_end;
-	
+
 		if (j->start) {
 			tt_start = get_ical_date (j->start, FALSE);
 			dt_start.value = &tt_start;
@@ -1515,7 +1515,7 @@ pst_process_journal (PstImporter *m, pst_item *item)
 			e_cal_component_set_dtstart (ec, &dt_start);
 			g_message ("journal start:%s", rfc2445_datetime_format (j->start));
 		}
-	
+
 		if (j->end) {
 			tt_end = get_ical_date (j->end, FALSE);
 			dt_end.value = &tt_end;
@@ -1532,7 +1532,7 @@ pst_process_journal (PstImporter *m, pst_item *item)
 	}
 
 	g_object_unref (ec);
-	
+
 }
 
 /* Print an error message - maybe later bring up an error dialog? */
@@ -1540,7 +1540,7 @@ static void
 pst_error_msg (const char *fmt, ...)
 {
 	va_list ap;
-	
+
 	va_start (ap, fmt);
 	g_critical (fmt, ap);
 	va_end (ap);
@@ -1628,11 +1628,11 @@ pst_import (EImport *ei, EImportTarget *target)
 	m->import = ei;
 	g_object_ref (m->import);
 	m->target = target;
-	
+
 	m->parent_uri = NULL;
 	m->folder_name = NULL;
 	m->folder_uri = NULL;
-	
+
 	m->addressbook = NULL;
 	m->calendar = NULL;
 	m->tasks = NULL;
@@ -1644,7 +1644,7 @@ pst_import (EImport *ei, EImportTarget *target)
 	m->status = camel_operation_new (pst_status, m);
 
 	id = m->base.seq;
-	
+
 	mail_msg_unordered_push (m);
 
 	return id;
@@ -1705,7 +1705,7 @@ pst_init (pst_file *pst, gchar *filename)
 	DEBUG_INIT (d_log);
 	DEBUG_REGISTER_CLOSE ();
 #endif
-	
+
 	DEBUG_ENT ("main");
 	if (pst_open (pst, filename) < 0) {
 		pst_error_msg ("Error opening PST file %s", filename);
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index a901317..943f0ed 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -156,7 +156,7 @@ mount_ready_cb (GObject *source_object, GAsyncResult *res, gpointer user_data)
 	g_file_mount_enclosing_volume_finish (G_FILE (source_object), res, &error);
 
 	if (error) {
-		
+
 		error_queue_add (g_strdup_printf (_("Mount of %s failed:"), ms->uri->location), error);
 
 		if (ms)
@@ -258,14 +258,14 @@ ask_question (GMountOperation *op, const char *message, const char *choices[])
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
 							  "%s", secondary);
 	}
-	
+
 	if (choices) {
-		/* First count the items in the list then 
+		/* First count the items in the list then
 		 * add the buttons in reverse order */
 		for (len = 0; choices[len] != NULL; len++) {
 			;
 		}
-		
+
 		for (cnt = len - 1; cnt >= 0; cnt--) {
 			gtk_dialog_add_button (GTK_DIALOG (dialog), choices[cnt], cnt);
 		}
@@ -294,7 +294,7 @@ mount_first (EPublishUri *uri, GFile *file, gboolean can_report_success)
 	ms->can_report_success = can_report_success;
 
 	g_signal_connect (ms->mount_op, "ask-password", G_CALLBACK (ask_password), ms);
-	g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms);	
+	g_signal_connect (ms->mount_op, "ask-question", G_CALLBACK (ask_question), ms);
 
 	g_file_mount_enclosing_volume (file, G_MOUNT_MOUNT_NONE, ms->mount_op, NULL, mount_ready_cb, ms);
 }
@@ -843,7 +843,7 @@ error_queue_show_idle (gpointer user_data)
 	gboolean has_error = FALSE, has_info = FALSE;
 
 	g_static_mutex_lock (&error_queue_lock);
-	
+
 	for (l = error_queue; l; l = l->next) {
 		struct eq_data *data = l->data;
 
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index a4b3a44..b284444 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/publish-format-fb.h b/plugins/publish-calendar/publish-format-fb.h
index 4975aa1..6d758f1 100644
--- a/plugins/publish-calendar/publish-format-fb.h
+++ b/plugins/publish-calendar/publish-format-fb.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 13962fc..04e70ca 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/publish-format-ical.h b/plugins/publish-calendar/publish-format-ical.h
index 4c32310..d4955ca 100644
--- a/plugins/publish-calendar/publish-format-ical.h
+++ b/plugins/publish-calendar/publish-format-ical.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 1ebe2cf..71b82c8 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/publish-location.h b/plugins/publish-calendar/publish-location.h
index 327cd98..a6afc2c 100644
--- a/plugins/publish-calendar/publish-location.h
+++ b/plugins/publish-calendar/publish-location.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index de58a02..08e5951 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/publish-calendar/url-editor-dialog.h b/plugins/publish-calendar/url-editor-dialog.h
index 94a1a71..8f45807 100644
--- a/plugins/publish-calendar/url-editor-dialog.h
+++ b/plugins/publish-calendar/url-editor-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/python/python-plugin-loader.c b/plugins/python/python-plugin-loader.c
index 5e7a83f..ea9ab4b 100644
--- a/plugins/python/python-plugin-loader.c
+++ b/plugins/python/python-plugin-loader.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -26,7 +26,7 @@
 
 #include "python-plugin-loader.h"
 
-#define d(x) 
+#define d(x)
 
 static void *epp_parent_class;
 
@@ -84,17 +84,17 @@ epp_invoke(EPlugin *ep, const char *name, void *data)
 		p->pDict = PyModule_GetDict(p->pModule);
 
 		if (epp->pClass) {
-			p->pClass = PyDict_GetItemString(p->pDict, epp->pClass);			
+			p->pClass = PyDict_GetItemString(p->pDict, epp->pClass);
 		}
 	}
 
 	if (p->pClass) {
 
-		if (PyCallable_Check(p->pClass)) 
-			pInstance = PyObject_CallObject(p->pClass, NULL); 
+		if (PyCallable_Check(p->pClass))
+			pInstance = PyObject_CallObject(p->pClass, NULL);
 
 		pValue = PyObject_CallMethod(pInstance, name, NULL);
-	       
+
 	} else {
 
 		pFunc = PyDict_GetItemString(p->pDict, name);
diff --git a/plugins/python/python-plugin-loader.h b/plugins/python/python-plugin-loader.h
index 86e94d6..4f9656e 100644
--- a/plugins/python/python-plugin-loader.h
+++ b/plugins/python/python-plugin-loader.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/sa-junk-plugin/em-junk-filter.c b/plugins/sa-junk-plugin/em-junk-filter.c
index 888ee40..8846e8b 100644
--- a/plugins/sa-junk-plugin/em-junk-filter.c
+++ b/plugins/sa-junk-plugin/em-junk-filter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -303,7 +303,7 @@ em_junk_sa_test_spamd_running (const gchar *binary, gboolean system)
   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
   for the idea).
-*/ 
+*/
 static void
 em_junk_sa_test_allow_tell (void)
 {
@@ -711,8 +711,8 @@ em_junk_sa_report_junk (EPlugin *ep, EMJunkHookTarget *target)
 			argv[4] = "--local";
 
 		pthread_mutex_lock (&em_junk_sa_report_lock);
-		pipe_to_sa (msg, NULL, 
-			    (no_allow_tell ? argv : argv2), 
+		pipe_to_sa (msg, NULL,
+			    (no_allow_tell ? argv : argv2),
 			    &target->error);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
 	}
@@ -748,8 +748,8 @@ em_junk_sa_report_non_junk (EPlugin *ep, EMJunkHookTarget *target)
 		if (no_allow_tell && em_junk_sa_local_only)
 			argv[4] = "--local";
 		pthread_mutex_lock (&em_junk_sa_report_lock);
-		pipe_to_sa (msg, NULL, 
-			    (no_allow_tell ? argv : argv2), 
+		pipe_to_sa (msg, NULL,
+			    (no_allow_tell ? argv : argv2),
 			    &target->error);
 		pthread_mutex_unlock (&em_junk_sa_report_lock);
 	}
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 663ba12..2f9c92d 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/save-calendar/format-handler.h b/plugins/save-calendar/format-handler.h
index 0174bfc..a7bc2e8 100644
--- a/plugins/save-calendar/format-handler.h
+++ b/plugins/save-calendar/format-handler.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index a537bf4..f538a9e 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index b1c8257..9c9f864 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 7e21b23..e461821 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/select-one-source/select-one-source.c b/plugins/select-one-source/select-one-source.c
index e45ef2d..c211814 100644
--- a/plugins/select-one-source/select-one-source.c
+++ b/plugins/select-one-source/select-one-source.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/startup-wizard/startup-wizard.c b/plugins/startup-wizard/startup-wizard.c
index 766f379..71fb4d4 100644
--- a/plugins/startup-wizard/startup-wizard.c
+++ b/plugins/startup-wizard/startup-wizard.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/subject-thread/subject-thread.c b/plugins/subject-thread/subject-thread.c
index 595f938..6c008c7 100644
--- a/plugins/subject-thread/subject-thread.c
+++ b/plugins/subject-thread/subject-thread.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 02983f1..a871399 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -74,14 +74,14 @@ static void reply_with_template	(EPopup *ep, EPopupItem *item, void *data);
 
 static void popup_free		(EPopup *ep, GSList *l, void *data);
 
-static GSList *fill_submenu	(CamelStore *store, 
-                             	CamelFolderInfo *info, 
-                              	GSList *list, 
+static GSList *fill_submenu	(CamelStore *store,
+                             	CamelFolderInfo *info,
+                              	GSList *list,
                               	EMPopupTargetSelect *t);
 
-static GSList *append_to_menu 	(CamelFolder *folder, 
-                             	GPtrArray *uids, 
-                             	GSList *list, 
+static GSList *append_to_menu 	(CamelFolder *folder,
+                             	GPtrArray *uids,
+                             	GSList *list,
                              	EMPopupTargetSelect *t);
 
 void org_gnome_templates_popup	(EPlugin *ep, EMPopupTargetSelect *t);
@@ -98,7 +98,7 @@ static void  key_cell_edited_callback (GtkCellRendererText *cell, gchar *path_st
 				   gchar *new_text,UIData *ui);
 
 static void  value_cell_edited_callback (GtkCellRendererText *cell, gchar *path_string,
-				   gchar *new_text,UIData *ui);				   
+				   gchar *new_text,UIData *ui);
 
 static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath
 					*path, GtkTreeIter *iter, UIData *ui);
@@ -145,16 +145,16 @@ commit_changes (UIData *ui)
 	while (valid) {
 		char *keyword, *value;
 		char *key;
-		
+
 		gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
 		gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);
 
 		/* Check if the keyword and value are not empty */
-		if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0) 
+		if ((keyword) && (value) && (g_utf8_strlen(g_strstrip(keyword), -1) > 0)
 			&& (g_utf8_strlen(g_strstrip(value), -1) > 0)) {
 			key = g_strdup_printf("%s=%s", keyword, value);
 			clue_list = g_slist_append (clue_list, key);
-		}	
+		}
 		valid = gtk_tree_model_iter_next (model, &iter);
 	}
 
@@ -229,7 +229,7 @@ key_cell_edited_callback (GtkCellRendererText *cell,
 
 	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
 
-	gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);	
+	gtk_tree_model_get (model, &iter, CLUE_VALUE_COLUMN, &value, -1);
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
 				    CLUE_KEYWORD_COLUMN, new_text, CLUE_VALUE_COLUMN, value, -1);
 
@@ -249,7 +249,7 @@ value_cell_edited_callback (GtkCellRendererText *cell,
 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (ui->treeview));
 
 	gtk_tree_model_get_iter_from_string (model, &iter, path_string);
-	
+
 	gtk_tree_model_get (model, &iter, CLUE_KEYWORD_COLUMN, &keyword, -1);
 
 	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
@@ -491,9 +491,9 @@ get_content (CamelMimeMessage *message)
 		g_free (str);
 		return convert_str;
 	}
-	else 
+	else
 		return str;
-			
+
 }
 
 static void
@@ -509,8 +509,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 
 	/* Get from the currently selected folder, the currently selected message */
-	reply_to = camel_folder_get_message (userdata->t->folder, 
-			g_ptr_array_index (userdata->t->uids, 0), 
+	reply_to = camel_folder_get_message (userdata->t->folder,
+			g_ptr_array_index (userdata->t->uids, 0),
 			NULL);
 
 	/* The message we'll be using has been stored when building the menu */
@@ -525,8 +525,8 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	header = ((CamelMimePart *)reply_to)->headers;
 	while (header) {
 		if (g_ascii_strncasecmp (header->name, "content-", 8) != 0) {
-			camel_medium_add_header((CamelMedium *) new, 
-					header->name, 
+			camel_medium_add_header((CamelMedium *) new,
+					header->name,
 					header->value);
 		}
 		header = header->next;
@@ -538,15 +538,15 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	cont = get_content (template);
 
 	/* Set the To: field to the same To: field of the message we are replying to. */
-	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_TO, 
+	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_set_recipients (new, CAMEL_RECIPIENT_TYPE_CC,
 			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_CC));
 
-	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC, 
+	camel_mime_message_set_recipients (new, CAMEL_RECIPIENT_TYPE_BCC,
 			camel_mime_message_get_recipients (template, CAMEL_RECIPIENT_TYPE_BCC));
 
 	camel_mime_part_set_content((CamelMimePart *)new,
@@ -558,7 +558,7 @@ reply_with_template (EPopup *ep, EPopupItem *item, void *data)
 	camel_object_unref(new);
 }
 
-static void 
+static void
 popup_free (EPopup *ep, GSList *l, void *data)
 {
 	g_slist_free (l);
@@ -588,10 +588,10 @@ static GSList
 		/* If this uid is trashed, ignore it */
 		if (camel_folder_get_message_flags (folder, uid) & CAMEL_MESSAGE_DELETED)
 			continue;
-		
+
 		/* Get the message for this uid */
-		message = camel_folder_get_message (folder, 
-				uid, 
+		message = camel_folder_get_message (folder,
+				uid,
 				NULL);
 
 		subject = camel_mime_message_get_subject (message);
@@ -617,7 +617,7 @@ static GSList
 	return list;
 }
 
-static GSList 
+static GSList
 *fill_submenu (CamelStore *store, CamelFolderInfo *info, GSList *list, EMPopupTargetSelect *t)
 {
 	while (info) {
@@ -629,7 +629,7 @@ static GSList
 
 		item = g_slice_alloc0(sizeof(*item));
 		item->type = E_POPUP_SUBMENU;
-		item->label = folder->name; 
+		item->label = folder->name;
 		item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE;
 
 		/* To avoid having a Templates dir, we ignore the top level */
@@ -670,9 +670,9 @@ org_gnome_templates_popup (EPlugin *ep, EMPopupTargetSelect *t)
 
 	templates_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_TEMPLATES);
 
-	templates_info = camel_store_get_folder_info (store, 
-			templates_folder->full_name, 
-			CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST, 
+	templates_info = camel_store_get_folder_info (store,
+			templates_folder->full_name,
+			CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_FAST,
 			NULL);
 
 	/* Get subfolders and fill it */
diff --git a/plugins/tnef-attachments/tnef-plugin.c b/plugins/tnef-attachments/tnef-plugin.c
index f015286..ae0dc37 100644
--- a/plugins/tnef-attachments/tnef-plugin.c
+++ b/plugins/tnef-attachments/tnef-plugin.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -38,7 +38,7 @@
 #include <ytnef.h>
 #elif defined HAVE_LIBYTNEF_YTNEF_H
 #include <libytnef/ytnef.h>
-#endif 
+#endif
 
 #include <camel/camel-mime-part.h>
 #include <camel/camel-folder.h>
diff --git a/plugins/vcard-inline/vcard-inline.c b/plugins/vcard-inline/vcard-inline.c
index e2b9e17..fa0077f 100644
--- a/plugins/vcard-inline/vcard-inline.c
+++ b/plugins/vcard-inline/vcard-inline.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/plugins/webdav-account-setup/webdav-contacts-source.c b/plugins/webdav-account-setup/webdav-contacts-source.c
index 012a541..79d4744 100644
--- a/plugins/webdav-account-setup/webdav-contacts-source.c
+++ b/plugins/webdav-account-setup/webdav-contacts-source.c
@@ -311,7 +311,7 @@ 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 cff9369..1809297 100644
--- a/shell/e-component-registry.c
+++ b/shell/e-component-registry.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-component-registry.h b/shell/e-component-registry.h
index 474dba8..927fcf0 100644
--- a/shell/e-component-registry.h
+++ b/shell/e-component-registry.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-component-view.c b/shell/e-component-view.c
index cbe5952..b87078e 100644
--- a/shell/e-component-view.c
+++ b/shell/e-component-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-component-view.h b/shell/e-component-view.h
index 96a48d1..51004e4 100644
--- a/shell/e-component-view.h
+++ b/shell/e-component-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-config-upgrade.c b/shell/e-config-upgrade.c
index 09c9281..9aa71d3 100644
--- a/shell/e-config-upgrade.c
+++ b/shell/e-config-upgrade.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-config-upgrade.h b/shell/e-config-upgrade.h
index 27d9393..f458042 100644
--- a/shell/e-config-upgrade.h
+++ b/shell/e-config-upgrade.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-corba-config-page.c b/shell/e-corba-config-page.c
index 603a8fd..f0fc892 100644
--- a/shell/e-corba-config-page.c
+++ b/shell/e-corba-config-page.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-corba-config-page.h b/shell/e-corba-config-page.h
index 9a6747c..8f0690f 100644
--- a/shell/e-corba-config-page.h
+++ b/shell/e-corba-config-page.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-constants.h b/shell/e-shell-constants.h
index 25aec79..13beed8 100644
--- a/shell/e-shell-constants.h
+++ b/shell/e-shell-constants.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-importer.c b/shell/e-shell-importer.c
index cb990f9..74a89cc 100644
--- a/shell/e-shell-importer.c
+++ b/shell/e-shell-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-importer.h b/shell/e-shell-importer.h
index f4489c3..d9dffcf 100644
--- a/shell/e-shell-importer.h
+++ b/shell/e-shell-importer.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-nm.c b/shell/e-shell-nm.c
index f7e4d3e..f51a565 100644
--- a/shell/e-shell-nm.c
+++ b/shell/e-shell-nm.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-settings-dialog.c b/shell/e-shell-settings-dialog.c
index 4d735eb..291a46c 100644
--- a/shell/e-shell-settings-dialog.c
+++ b/shell/e-shell-settings-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-settings-dialog.h b/shell/e-shell-settings-dialog.h
index 90c0962..55cce4a 100644
--- a/shell/e-shell-settings-dialog.h
+++ b/shell/e-shell-settings-dialog.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 022e7ec..a6d071c 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-view.h b/shell/e-shell-view.h
index f284604..dd500ef 100644
--- a/shell/e-shell-view.h
+++ b/shell/e-shell-view.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/shell/e-shell-window-commands.c b/shell/e-shell-window-commands.c
index cdd9e3b..6f18001 100644
--- a/shell/e-shell-window-commands.c
+++ b/shell/e-shell-window-commands.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-window-commands.h b/shell/e-shell-window-commands.h
index 3d3843c..0696a8a 100644
--- a/shell/e-shell-window-commands.h
+++ b/shell/e-shell-window-commands.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 548e987..83e537c 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -321,7 +321,7 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	}
 
 	if (component_view->title == NULL) {
-		/* To translators: This is the window title and %s is the 
+		/* To translators: This is the window title and %s is the
 		component name. Most translators will want to keep it as is. */
 		title = g_strdup_printf (_("%s - Evolution"), info->button_label);
 		gtk_window_set_title (GTK_WINDOW (window), title);
@@ -343,7 +343,7 @@ switch_view (EShellWindow *window, ComponentView *component_view)
 	/** @Event: Shell component activated or switched to.
 	 * @Id: component.activated
 	 * @Target: ESEventTargetComponent
-	 * 
+	 *
 	 * This event is emitted whenever the shell successfully activates component
 	 * view.
 	 */
@@ -408,7 +408,7 @@ update_offline_toggle_status (EShellWindow *window)
 static void
 update_send_receive_sensitivity (EShellWindow *window)
 {
-	if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE || 
+	if (e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_OFFLINE ||
 		e_shell_get_line_status (window->priv->shell.eshell) == E_SHELL_LINE_STATUS_FORCED_OFFLINE)
 		bonobo_ui_component_set_prop (window->priv->ui_component,
 					      "/commands/SendReceive",
diff --git a/shell/e-shell-window.h b/shell/e-shell-window.h
index d94aef0..869352b 100644
--- a/shell/e-shell-window.h
+++ b/shell/e-shell-window.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 061071e..9b4e6bc 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-shell.h b/shell/e-shell.h
index ab16ea8..e8451e3 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -10,11 +10,11 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
- *		Ettore Perazzoli <ettore ximian com> 
+ *		Ettore Perazzoli <ettore ximian com>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c
index 7b8ba1a..d4c02e6 100644
--- a/shell/e-sidebar.c
+++ b/shell/e-sidebar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-sidebar.h b/shell/e-sidebar.h
index a3d3b43..2585592 100644
--- a/shell/e-sidebar.h
+++ b/shell/e-sidebar.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-user-creatable-items-handler.c b/shell/e-user-creatable-items-handler.c
index ef58e3d..a49d7db 100644
--- a/shell/e-user-creatable-items-handler.c
+++ b/shell/e-user-creatable-items-handler.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/e-user-creatable-items-handler.h b/shell/e-user-creatable-items-handler.h
index 5d51612..b9be272 100644
--- a/shell/e-user-creatable-items-handler.h
+++ b/shell/e-user-creatable-items-handler.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/es-event.c b/shell/es-event.c
index 8aeeb7b..43a55c3 100644
--- a/shell/es-event.c
+++ b/shell/es-event.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/es-event.h b/shell/es-event.h
index ed248d1..5ac363b 100644
--- a/shell/es-event.h
+++ b/shell/es-event.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/es-menu.c b/shell/es-menu.c
index ac2736b..3b45926 100644
--- a/shell/es-menu.c
+++ b/shell/es-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/es-menu.h b/shell/es-menu.h
index 89f6011..9e9e061 100644
--- a/shell/es-menu.h
+++ b/shell/es-menu.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-component.c b/shell/evolution-component.c
index 62cddb6..49824c9 100644
--- a/shell/evolution-component.c
+++ b/shell/evolution-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-component.h b/shell/evolution-component.h
index 9202829..302263a 100644
--- a/shell/evolution-component.h
+++ b/shell/evolution-component.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c
index 35044c9..a0d3f47 100644
--- a/shell/evolution-config-control.c
+++ b/shell/evolution-config-control.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-config-control.h b/shell/evolution-config-control.h
index 10e320c..59d7aba 100644
--- a/shell/evolution-config-control.h
+++ b/shell/evolution-config-control.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-listener.c b/shell/evolution-listener.c
index 516c04a..4bf9a76 100644
--- a/shell/evolution-listener.c
+++ b/shell/evolution-listener.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-listener.h b/shell/evolution-listener.h
index c85ae53..7b79b3b 100644
--- a/shell/evolution-listener.h
+++ b/shell/evolution-listener.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index 9dc1c33..a8ce855 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/evolution-shell-component-utils.h b/shell/evolution-shell-component-utils.h
index eb04eda..ce4fa11 100644
--- a/shell/evolution-shell-component-utils.h
+++ b/shell/evolution-shell-component-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-importer-client.c b/shell/importer/evolution-importer-client.c
index 5f32241..06d30d5 100644
--- a/shell/importer/evolution-importer-client.c
+++ b/shell/importer/evolution-importer-client.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-importer-client.h b/shell/importer/evolution-importer-client.h
index 35cde85..3ae4b2f 100644
--- a/shell/importer/evolution-importer-client.h
+++ b/shell/importer/evolution-importer-client.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-importer-listener.c b/shell/importer/evolution-importer-listener.c
index e825697..8915202 100644
--- a/shell/importer/evolution-importer-listener.c
+++ b/shell/importer/evolution-importer-listener.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-importer-listener.h b/shell/importer/evolution-importer-listener.h
index 7e09ff2..63f480e 100644
--- a/shell/importer/evolution-importer-listener.h
+++ b/shell/importer/evolution-importer-listener.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-importer.c b/shell/importer/evolution-importer.c
index 9fb7e66..f8e6847 100644
--- a/shell/importer/evolution-importer.c
+++ b/shell/importer/evolution-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-importer.h b/shell/importer/evolution-importer.h
index a684aec..4925fad 100644
--- a/shell/importer/evolution-importer.h
+++ b/shell/importer/evolution-importer.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-intelligent-importer.c b/shell/importer/evolution-intelligent-importer.c
index bce7d75..d867c12 100644
--- a/shell/importer/evolution-intelligent-importer.c
+++ b/shell/importer/evolution-intelligent-importer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/evolution-intelligent-importer.h b/shell/importer/evolution-intelligent-importer.h
index 35ad7d0..2d36d49 100644
--- a/shell/importer/evolution-intelligent-importer.h
+++ b/shell/importer/evolution-intelligent-importer.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/intelligent.c b/shell/importer/intelligent.c
index 6503fc8..20927d2 100644
--- a/shell/importer/intelligent.c
+++ b/shell/importer/intelligent.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/importer/intelligent.h b/shell/importer/intelligent.h
index bbdf00c..5f5f718 100644
--- a/shell/importer/intelligent.h
+++ b/shell/importer/intelligent.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/main.c b/shell/main.c
index 5ffe316..c6959d7 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -398,7 +398,7 @@ idle_cb (gchar **uris)
 		bonobo_main_quit ();
 	}
 
-	/* This must be done after Bonobo has created all the components. For 
+	/* This must be done after Bonobo has created all the components. For
 	 * example the mail component makes the global variable `session` which
 	 * is being used by several EPlugins */
 
@@ -630,7 +630,7 @@ main (int argc, char **argv)
 	client = gconf_client_get_default ();
 
 #ifdef DEVELOPMENT
-	
+
 	if (force_migrate) {
 		destroy_config (client);
 	}
diff --git a/shell/test/evolution-test-component.c b/shell/test/evolution-test-component.c
index 16aed88..9fdeab7 100644
--- a/shell/test/evolution-test-component.c
+++ b/shell/test/evolution-test-component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/shell/test/evolution-test-component.h b/shell/test/evolution-test-component.h
index 18a86f1..18dd40c 100644
--- a/shell/test/evolution-test-component.h
+++ b/shell/test/evolution-test-component.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index f0d6cea..f3a47e1 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/ca-trust-dialog.h b/smime/gui/ca-trust-dialog.h
index 1ebd05e..ec7979d 100644
--- a/smime/gui/ca-trust-dialog.h
+++ b/smime/gui/ca-trust-dialog.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 0b82182..0e4af90 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/cert-trust-dialog.h b/smime/gui/cert-trust-dialog.h
index a9c3e9c..abdeb4d 100644
--- a/smime/gui/cert-trust-dialog.h
+++ b/smime/gui/cert-trust-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 2d1c8c1..c5261e8 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/certificate-manager.h b/smime/gui/certificate-manager.h
index 6a0898d..73d3688 100644
--- a/smime/gui/certificate-manager.h
+++ b/smime/gui/certificate-manager.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/certificate-viewer.c b/smime/gui/certificate-viewer.c
index 5c58713..997bbac 100644
--- a/smime/gui/certificate-viewer.c
+++ b/smime/gui/certificate-viewer.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/certificate-viewer.h b/smime/gui/certificate-viewer.h
index 2f088dd..6cfa7f6 100644
--- a/smime/gui/certificate-viewer.h
+++ b/smime/gui/certificate-viewer.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 339adab..1096aa2 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/component.h b/smime/gui/component.h
index 5a7492a..a41c4d1 100644
--- a/smime/gui/component.h
+++ b/smime/gui/component.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index 770f95c..0ac946b 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/gui/e-cert-selector.h b/smime/gui/e-cert-selector.h
index 542a211..85cfa0b 100644
--- a/smime/gui/e-cert-selector.h
+++ b/smime/gui/e-cert-selector.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/lib/e-asn1-object.h b/smime/lib/e-asn1-object.h
index d0cdb05..0c976dd 100644
--- a/smime/lib/e-asn1-object.h
+++ b/smime/lib/e-asn1-object.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h
index b3a6963..f628ba2 100644
--- a/smime/lib/e-cert-db.h
+++ b/smime/lib/e-cert-db.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/lib/e-cert-trust.h b/smime/lib/e-cert-trust.h
index 65a925d..6b515b1 100644
--- a/smime/lib/e-cert-trust.h
+++ b/smime/lib/e-cert-trust.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/lib/e-cert.h b/smime/lib/e-cert.h
index e152031..63125c1 100644
--- a/smime/lib/e-cert.h
+++ b/smime/lib/e-cert.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/smime/lib/e-pkcs12.h b/smime/lib/e-pkcs12.h
index 950a2d3..5717edb 100644
--- a/smime/lib/e-pkcs12.h
+++ b/smime/lib/e-pkcs12.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Chris Toshok <toshok ximian com>
diff --git a/smime/tests/import-cert.c b/smime/tests/import-cert.c
index 420afe7..b202053 100644
--- a/smime/tests/import-cert.c
+++ b/smime/tests/import-cert.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/tools/killev.c b/tools/killev.c
index 797e923..d260939 100644
--- a/tools/killev.c
+++ b/tools/killev.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.c b/widgets/e-timezone-dialog/e-timezone-dialog.c
index b60fdf4..80a4485 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.c
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -101,9 +101,9 @@ static void	set_map_timezone		(ETimezoneDialog *etd,
 static void	on_combo_changed		(GtkComboBox	*combo,
 						 ETimezoneDialog *etd);
 
-static void timezone_combo_get_active_text 	(GtkComboBox *combo, 
+static void timezone_combo_get_active_text 	(GtkComboBox *combo,
 						 const char **zone_name);
-static gboolean timezone_combo_set_active_text 	(GtkComboBox *combo, 
+static gboolean timezone_combo_set_active_text 	(GtkComboBox *combo,
 						 const char *zone_name);
 
 static void	map_destroy_cb			(gpointer data,
@@ -793,7 +793,7 @@ on_combo_changed (GtkComboBox *combo_box, ETimezoneDialog *etd)
 	set_map_timezone (etd, map_zone);
 }
 
-static void 
+static void
 timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name)
 {
 	GtkTreeModel *list_store;
@@ -802,13 +802,13 @@ timezone_combo_get_active_text (GtkComboBox *combo, const char **zone_name)
 	list_store = gtk_combo_box_get_model (combo);
 
 	/* Get the active iter in the list */
-	if (gtk_combo_box_get_active_iter (combo, &iter)) 
+	if (gtk_combo_box_get_active_iter (combo, &iter))
 		gtk_tree_model_get (list_store, &iter, 0, zone_name, -1);
-	else 
+	else
 		*zone_name = "";
 }
 
-static gboolean 
+static gboolean
 timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name)
 {
 	GtkTreeModel *list_store;
@@ -818,7 +818,7 @@ timezone_combo_set_active_text (GtkComboBox *combo, const char *zone_name)
 	list_store = gtk_combo_box_get_model (combo);
 	index = (GHashTable *) g_object_get_data (G_OBJECT (list_store), "index");
 
-	if (zone_name && *zone_name) 
+	if (zone_name && *zone_name)
 		id = g_hash_table_lookup (index, zone_name);
 
 	gtk_combo_box_set_active (combo, GPOINTER_TO_INT (id));
diff --git a/widgets/e-timezone-dialog/e-timezone-dialog.h b/widgets/e-timezone-dialog/e-timezone-dialog.h
index 0da1112..8992d40 100644
--- a/widgets/e-timezone-dialog/e-timezone-dialog.h
+++ b/widgets/e-timezone-dialog/e-timezone-dialog.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-define-views-dialog.c b/widgets/menus/gal-define-views-dialog.c
index 69778e4..e820a51 100644
--- a/widgets/menus/gal-define-views-dialog.c
+++ b/widgets/menus/gal-define-views-dialog.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-define-views-dialog.h b/widgets/menus/gal-define-views-dialog.h
index 08be5de..14112df 100644
--- a/widgets/menus/gal-define-views-dialog.h
+++ b/widgets/menus/gal-define-views-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-define-views-model.c b/widgets/menus/gal-define-views-model.c
index 737c800..9f67473 100644
--- a/widgets/menus/gal-define-views-model.c
+++ b/widgets/menus/gal-define-views-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-define-views-model.h b/widgets/menus/gal-define-views-model.h
index f1adb80..d0ccfb1 100644
--- a/widgets/menus/gal-define-views-model.h
+++ b/widgets/menus/gal-define-views-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-collection.c b/widgets/menus/gal-view-collection.c
index 890ee3e..c32e791 100644
--- a/widgets/menus/gal-view-collection.c
+++ b/widgets/menus/gal-view-collection.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-collection.h b/widgets/menus/gal-view-collection.h
index cf6871e..83e5217 100644
--- a/widgets/menus/gal-view-collection.h
+++ b/widgets/menus/gal-view-collection.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-etable.c b/widgets/menus/gal-view-etable.c
index 780e430..89ce837 100644
--- a/widgets/menus/gal-view-etable.c
+++ b/widgets/menus/gal-view-etable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-etable.h b/widgets/menus/gal-view-etable.h
index af03abb..fdc34b2 100644
--- a/widgets/menus/gal-view-etable.h
+++ b/widgets/menus/gal-view-etable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-factory-etable.c b/widgets/menus/gal-view-factory-etable.c
index 05cf097..52f759a 100644
--- a/widgets/menus/gal-view-factory-etable.c
+++ b/widgets/menus/gal-view-factory-etable.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-factory-etable.h b/widgets/menus/gal-view-factory-etable.h
index cd89717..440d6c6 100644
--- a/widgets/menus/gal-view-factory-etable.h
+++ b/widgets/menus/gal-view-factory-etable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-factory.c b/widgets/menus/gal-view-factory.c
index 7f740bc..5b10065 100644
--- a/widgets/menus/gal-view-factory.c
+++ b/widgets/menus/gal-view-factory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-factory.h b/widgets/menus/gal-view-factory.h
index a2f7809..d2c4b4a 100644
--- a/widgets/menus/gal-view-factory.h
+++ b/widgets/menus/gal-view-factory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index bad4c20..02283c6 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.h b/widgets/menus/gal-view-instance-save-as-dialog.h
index 5dbd436..2135bc5 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.h
+++ b/widgets/menus/gal-view-instance-save-as-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-instance.c b/widgets/menus/gal-view-instance.c
index 3b0e02c..9e0e2eb 100644
--- a/widgets/menus/gal-view-instance.c
+++ b/widgets/menus/gal-view-instance.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-instance.h b/widgets/menus/gal-view-instance.h
index 37c8ad6..787bc09 100644
--- a/widgets/menus/gal-view-instance.h
+++ b/widgets/menus/gal-view-instance.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-menus.c b/widgets/menus/gal-view-menus.c
index e663c6e..4f76eb6 100644
--- a/widgets/menus/gal-view-menus.c
+++ b/widgets/menus/gal-view-menus.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-menus.h b/widgets/menus/gal-view-menus.h
index 6124688..f565d07 100644
--- a/widgets/menus/gal-view-menus.h
+++ b/widgets/menus/gal-view-menus.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/menus/gal-view-new-dialog.c b/widgets/menus/gal-view-new-dialog.c
index 0822d83..8bfc84f 100644
--- a/widgets/menus/gal-view-new-dialog.c
+++ b/widgets/menus/gal-view-new-dialog.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view-new-dialog.h b/widgets/menus/gal-view-new-dialog.h
index 75016bc..d2acd5d 100644
--- a/widgets/menus/gal-view-new-dialog.h
+++ b/widgets/menus/gal-view-new-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view.c b/widgets/menus/gal-view.c
index 6509a79..fd3cdc2 100644
--- a/widgets/menus/gal-view.c
+++ b/widgets/menus/gal-view.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/menus/gal-view.h b/widgets/menus/gal-view.h
index 0baba16..b0ac4f3 100644
--- a/widgets/menus/gal-view.h
+++ b/widgets/menus/gal-view.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-account-combo-box.c b/widgets/misc/e-account-combo-box.c
index 21f30b6..7663f0f 100644
--- a/widgets/misc/e-account-combo-box.c
+++ b/widgets/misc/e-account-combo-box.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-account-combo-box.h b/widgets/misc/e-account-combo-box.h
index 87f7eb9..b163278 100644
--- a/widgets/misc/e-account-combo-box.h
+++ b/widgets/misc/e-account-combo-box.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-activity-handler.c b/widgets/misc/e-activity-handler.c
index e464353..dd0bd60 100644
--- a/widgets/misc/e-activity-handler.c
+++ b/widgets/misc/e-activity-handler.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -142,7 +142,7 @@ activity_info_new (const char *component_id,
 	info->menu           = NULL;
 	info->error          = NULL;
 	info->cancel_func    = NULL;
-	
+
 	return info;
 }
 
@@ -209,7 +209,7 @@ setup_task_bar (EActivityHandler *activity_handler,
 			g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler);
 			g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(info->id));
 			g_object_set_data ((GObject *) task_widget, "error-type", GINT_TO_POINTER(info->error_type));
-			g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);			
+			g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);
 		}
 	}
 }
@@ -360,14 +360,14 @@ e_activity_handler_attach_task_bar (EActivityHandler *activity_handler,
 }
 
 struct _cancel_wdata {
-	EActivityHandler *handler;	
+	EActivityHandler *handler;
 	ActivityInfo *info;
 	guint id;
 	void (*cancel)(gpointer);
 	gpointer data;
 };
 
-static void 
+static void
 cancel_wrapper (gpointer pdata)
 {
 	struct _cancel_wdata *data = (struct _cancel_wdata *) pdata;
@@ -379,7 +379,7 @@ cancel_wrapper (gpointer pdata)
 		int order, len;
 		GSList *sp;
 		GList *p = lookup_activity (handler->priv->activity_infos, data->id, &order);
-		e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"), 
+		e_logger_log (handler->priv->logger, E_LOG_ERROR, g_object_get_data (data->info->error, "primary"),
 						    g_object_get_data (data->info->error, "secondary"));
 		gtk_widget_destroy (data->info->error);
 		data->info->error = NULL;
@@ -388,7 +388,7 @@ cancel_wrapper (gpointer pdata)
 			ETaskBar *task_bar;
 
 			task_bar = E_TASK_BAR (sp->data);
-			e_task_bar_remove_task_from_id (task_bar, info->id);	
+			e_task_bar_remove_task_from_id (task_bar, info->id);
 		}
 		activity_info_free (info);
 		len = g_list_length (handler->priv->activity_infos);
@@ -488,8 +488,8 @@ handle_error (ETaskWidget *task)
 	id = GPOINTER_TO_UINT (g_object_get_data ((GObject *) task, "activity"));
 	e_activity_handler_operation_finished (activity_handler, id);
 	gtk_widget_show (error);
-	e_logger_log (activity_handler->priv->logger, error_type, 
-		      g_object_get_data ((GObject *) error, "primary"), 
+	e_logger_log (activity_handler->priv->logger, error_type,
+		      g_object_get_data ((GObject *) error, "primary"),
 				    g_object_get_data ((GObject *) error, "secondary"));
 }
 
@@ -511,7 +511,7 @@ error_cleanup (EActivityHandler *activity_handler)
 			berror = TRUE;
 		if (info->error && info->error_time && (now - info->error_time) > 5 ) {
 			/* Error older than wanted time. So cleanup */
-			e_logger_log (priv->logger, info->error_type, g_object_get_data (info->error, "primary"), 
+			e_logger_log (priv->logger, info->error_type, g_object_get_data (info->error, "primary"),
 						    g_object_get_data (info->error, "secondary"));
 
 			if (GTK_IS_DIALOG (info->error))
@@ -530,7 +530,7 @@ error_cleanup (EActivityHandler *activity_handler)
 			}
 			activity_info_free (info);
 			priv->activity_infos = g_list_remove_link (priv->activity_infos, node);
-		
+
 		} else
 			p = p->next;
 	}
@@ -559,7 +559,7 @@ e_activity_handler_make_error (EActivityHandler *activity_handler,
 	activity_info->error = error;
 	activity_info->error_time = time (NULL);
 	activity_info->error_type = error_type;
-	
+
 	img = error_type ? icon_data[1] : icon_data[0];
 	for (p = priv->task_bars; p != NULL; p = p->next) {
 		ETaskBar *task_bar;
@@ -567,17 +567,17 @@ e_activity_handler_make_error (EActivityHandler *activity_handler,
 		GtkWidget *tool;
 
 		task_bar = E_TASK_BAR (p->data);
-		task_widget = task_widget_new_from_activity_info (activity_info); 
+		task_widget = task_widget_new_from_activity_info (activity_info);
 		task_widget->id = activity_id;
 		e_task_bar_prepend_task (E_TASK_BAR (p->data), task_widget);
-		
+
 		tool = e_task_widget_update_image (task_widget, (char *)img, information);
 		g_object_set_data ((GObject *) task_widget, "tool", tool);
 		g_object_set_data ((GObject *) task_widget, "error", error);
 		g_object_set_data ((GObject *) task_widget, "activity-handler", activity_handler);
 		g_object_set_data ((GObject *) task_widget, "activity", GINT_TO_POINTER(activity_id));
 		g_object_set_data ((GObject *) task_widget, "error-type", GINT_TO_POINTER(error_type));
-		g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);		
+		g_signal_connect_swapped (tool, "clicked", G_CALLBACK(handle_error), task_widget);
 	}
 
 	priv->activity_infos = g_list_prepend (priv->activity_infos, activity_info);
diff --git a/widgets/misc/e-activity-handler.h b/widgets/misc/e-activity-handler.h
index 5dc1820..bf8d8e0 100644
--- a/widgets/misc/e-activity-handler.h
+++ b/widgets/misc/e-activity-handler.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-attachment-button.c b/widgets/misc/e-attachment-button.c
index a9c230b..d64dcaf 100644
--- a/widgets/misc/e-attachment-button.c
+++ b/widgets/misc/e-attachment-button.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-button.h b/widgets/misc/e-attachment-button.h
index 72592ef..89ecccf 100644
--- a/widgets/misc/e-attachment-button.h
+++ b/widgets/misc/e-attachment-button.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-dialog.c b/widgets/misc/e-attachment-dialog.c
index e8c599a..e1037ae 100644
--- a/widgets/misc/e-attachment-dialog.c
+++ b/widgets/misc/e-attachment-dialog.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-dialog.h b/widgets/misc/e-attachment-dialog.h
index e8ed583..503dcbb 100644
--- a/widgets/misc/e-attachment-dialog.h
+++ b/widgets/misc/e-attachment-dialog.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-handler-image.c b/widgets/misc/e-attachment-handler-image.c
index ba5f8d7..a91b433 100644
--- a/widgets/misc/e-attachment-handler-image.c
+++ b/widgets/misc/e-attachment-handler-image.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-handler-image.h b/widgets/misc/e-attachment-handler-image.h
index 44ff404..bade5ce 100644
--- a/widgets/misc/e-attachment-handler-image.h
+++ b/widgets/misc/e-attachment-handler-image.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-handler.c b/widgets/misc/e-attachment-handler.c
index 03af1ee..0a6ed05 100644
--- a/widgets/misc/e-attachment-handler.c
+++ b/widgets/misc/e-attachment-handler.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-handler.h b/widgets/misc/e-attachment-handler.h
index f95bc55..e7e52c8 100644
--- a/widgets/misc/e-attachment-handler.h
+++ b/widgets/misc/e-attachment-handler.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-icon-view.c b/widgets/misc/e-attachment-icon-view.c
index 0845f82..a7d8ad2 100644
--- a/widgets/misc/e-attachment-icon-view.c
+++ b/widgets/misc/e-attachment-icon-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-icon-view.h b/widgets/misc/e-attachment-icon-view.h
index ab9360e..4aabf6c 100644
--- a/widgets/misc/e-attachment-icon-view.h
+++ b/widgets/misc/e-attachment-icon-view.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
index 3fed031..a88f9fa 100644
--- a/widgets/misc/e-attachment-paned.c
+++ b/widgets/misc/e-attachment-paned.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-paned.h b/widgets/misc/e-attachment-paned.h
index 076ab60..401ec58 100644
--- a/widgets/misc/e-attachment-paned.h
+++ b/widgets/misc/e-attachment-paned.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-store.c b/widgets/misc/e-attachment-store.c
index 216a60d..2977be9 100644
--- a/widgets/misc/e-attachment-store.c
+++ b/widgets/misc/e-attachment-store.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-store.h b/widgets/misc/e-attachment-store.h
index 9fdd74d..46ca9e4 100644
--- a/widgets/misc/e-attachment-store.h
+++ b/widgets/misc/e-attachment-store.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-tree-view.c b/widgets/misc/e-attachment-tree-view.c
index f2c17cb..42876e4 100644
--- a/widgets/misc/e-attachment-tree-view.c
+++ b/widgets/misc/e-attachment-tree-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-tree-view.h b/widgets/misc/e-attachment-tree-view.h
index 7f16ba5..4300ffa 100644
--- a/widgets/misc/e-attachment-tree-view.h
+++ b/widgets/misc/e-attachment-tree-view.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-view.c b/widgets/misc/e-attachment-view.c
index d2b6769..41e0b30 100644
--- a/widgets/misc/e-attachment-view.c
+++ b/widgets/misc/e-attachment-view.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment-view.h b/widgets/misc/e-attachment-view.h
index 38480c3..89d2d28 100644
--- a/widgets/misc/e-attachment-view.h
+++ b/widgets/misc/e-attachment-view.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index e4e336e..e9df602 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-attachment.h b/widgets/misc/e-attachment.h
index 934e1e0..d7cfb5b 100644
--- a/widgets/misc/e-attachment.h
+++ b/widgets/misc/e-attachment.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-calendar-item.c b/widgets/misc/e-calendar-item.c
index 32e74dd..be3751f 100644
--- a/widgets/misc/e-calendar-item.c
+++ b/widgets/misc/e-calendar-item.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
@@ -1386,9 +1386,9 @@ get_digit_fomat ()
 
 	if (major > 2 || minor > 2 || (minor == 2 && revision > 2)) {
 		return "%Id";
-	} 
+	}
 #endif
-	
+
 	return "%d";
 }
 
@@ -1984,7 +1984,7 @@ e_calendar_item_recalc_sizes		(ECalendarItem *calitem)
 	for (digit = 0; digit < 10; digit++) {
 		gchar locale_digit[5];
 		int locale_digit_len;
-		
+
 		locale_digit_len = sprintf (locale_digit, get_digit_fomat (), digit);
 
 		pango_layout_set_text (layout, locale_digit, locale_digit_len);
diff --git a/widgets/misc/e-calendar-item.h b/widgets/misc/e-calendar-item.h
index 0032e12..c0ee9a4 100644
--- a/widgets/misc/e-calendar-item.h
+++ b/widgets/misc/e-calendar-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-calendar.c b/widgets/misc/e-calendar.c
index 824a79d..88e59b8 100644
--- a/widgets/misc/e-calendar.c
+++ b/widgets/misc/e-calendar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-calendar.h b/widgets/misc/e-calendar.h
index aebc615..7a3c8fd 100644
--- a/widgets/misc/e-calendar.h
+++ b/widgets/misc/e-calendar.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas-background.c b/widgets/misc/e-canvas-background.c
index 4d300f0..181d788 100644
--- a/widgets/misc/e-canvas-background.c
+++ b/widgets/misc/e-canvas-background.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas-background.h b/widgets/misc/e-canvas-background.h
index 5d75735..562987e 100644
--- a/widgets/misc/e-canvas-background.h
+++ b/widgets/misc/e-canvas-background.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas-utils.c b/widgets/misc/e-canvas-utils.c
index c46f64c..62ea6c5 100644
--- a/widgets/misc/e-canvas-utils.c
+++ b/widgets/misc/e-canvas-utils.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas-utils.h b/widgets/misc/e-canvas-utils.h
index fa09a86..cda34e9 100644
--- a/widgets/misc/e-canvas-utils.h
+++ b/widgets/misc/e-canvas-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas-vbox.c b/widgets/misc/e-canvas-vbox.c
index 377a7a2..3d4e879 100644
--- a/widgets/misc/e-canvas-vbox.c
+++ b/widgets/misc/e-canvas-vbox.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas-vbox.h b/widgets/misc/e-canvas-vbox.h
index 51602e7..7fa38fa 100644
--- a/widgets/misc/e-canvas-vbox.h
+++ b/widgets/misc/e-canvas-vbox.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas.c b/widgets/misc/e-canvas.c
index 40aaf7d..055f031 100644
--- a/widgets/misc/e-canvas.c
+++ b/widgets/misc/e-canvas.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-canvas.h b/widgets/misc/e-canvas.h
index e06bed7..00692c4 100644
--- a/widgets/misc/e-canvas.h
+++ b/widgets/misc/e-canvas.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cell-date-edit.c b/widgets/misc/e-cell-date-edit.c
index 76450b8..e994120 100644
--- a/widgets/misc/e-cell-date-edit.c
+++ b/widgets/misc/e-cell-date-edit.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cell-date-edit.h b/widgets/misc/e-cell-date-edit.h
index 30dee53..2e125fe 100644
--- a/widgets/misc/e-cell-date-edit.h
+++ b/widgets/misc/e-cell-date-edit.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cell-percent.c b/widgets/misc/e-cell-percent.c
index 94e3348..194a7bd 100644
--- a/widgets/misc/e-cell-percent.c
+++ b/widgets/misc/e-cell-percent.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cell-percent.h b/widgets/misc/e-cell-percent.h
index 46a7ddc..5e202df 100644
--- a/widgets/misc/e-cell-percent.h
+++ b/widgets/misc/e-cell-percent.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cell-renderer-combo.c b/widgets/misc/e-cell-renderer-combo.c
index 96f474d..ab03c73 100644
--- a/widgets/misc/e-cell-renderer-combo.c
+++ b/widgets/misc/e-cell-renderer-combo.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cell-renderer-combo.h b/widgets/misc/e-cell-renderer-combo.h
index 547eca7..515ed75 100644
--- a/widgets/misc/e-cell-renderer-combo.h
+++ b/widgets/misc/e-cell-renderer-combo.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-charset-picker.c b/widgets/misc/e-charset-picker.c
index 6c7233a..5d1f8c0 100644
--- a/widgets/misc/e-charset-picker.c
+++ b/widgets/misc/e-charset-picker.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -444,7 +444,7 @@ e_charset_picker_dialog (const char *title, const char *prompt,
  *                   locale character set
  * @callback: a callback function for actions in the group, or %NULL
  * @user_data: user data to be passed to @callback, or %NULL
- * 
+ *
  * Adds a set of #GtkRadioActions for available character sets to
  * @action_group.  The @default_charset (or locale character set if
  * @default_charset is %NULL) will be added first, and selected by
diff --git a/widgets/misc/e-charset-picker.h b/widgets/misc/e-charset-picker.h
index 7250b10..88c89fb 100644
--- a/widgets/misc/e-charset-picker.h
+++ b/widgets/misc/e-charset-picker.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-colors.c b/widgets/misc/e-colors.c
index c9c72d0..74fbdbf 100644
--- a/widgets/misc/e-colors.c
+++ b/widgets/misc/e-colors.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-colors.h b/widgets/misc/e-colors.h
index 30ddfd4..710ee59 100644
--- a/widgets/misc/e-colors.h
+++ b/widgets/misc/e-colors.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-combo-button.c b/widgets/misc/e-combo-button.c
index aabb707..dc978af 100644
--- a/widgets/misc/e-combo-button.c
+++ b/widgets/misc/e-combo-button.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-combo-button.h b/widgets/misc/e-combo-button.h
index 0abe347..edeb1be 100644
--- a/widgets/misc/e-combo-button.h
+++ b/widgets/misc/e-combo-button.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-combo-cell-editable.c b/widgets/misc/e-combo-cell-editable.c
index 5502a83..8cee128 100644
--- a/widgets/misc/e-combo-cell-editable.c
+++ b/widgets/misc/e-combo-cell-editable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-combo-cell-editable.h b/widgets/misc/e-combo-cell-editable.h
index d3f64a3..c37e786 100644
--- a/widgets/misc/e-combo-cell-editable.h
+++ b/widgets/misc/e-combo-cell-editable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-config-page.c b/widgets/misc/e-config-page.c
index c9823a2..00fb991 100644
--- a/widgets/misc/e-config-page.c
+++ b/widgets/misc/e-config-page.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-config-page.h b/widgets/misc/e-config-page.h
index 24317d3..886d89d 100644
--- a/widgets/misc/e-config-page.h
+++ b/widgets/misc/e-config-page.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cursors.c b/widgets/misc/e-cursors.c
index f0b9ca6..ebc2f9b 100644
--- a/widgets/misc/e-cursors.c
+++ b/widgets/misc/e-cursors.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-cursors.h b/widgets/misc/e-cursors.h
index c22e295..7df3404 100644
--- a/widgets/misc/e-cursors.h
+++ b/widgets/misc/e-cursors.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 2120483..701cf69 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Authors:
  *		Damon Chaplin <damon ximian com>
@@ -1471,7 +1471,7 @@ e_date_edit_parse_date (EDateEdit *dedit,
 		if (date_tm->tm_year > today_tm->tm_year)
 			date_tm->tm_year -= 100;
 	}
-	
+
 	return TRUE;
 }
 
@@ -1725,7 +1725,7 @@ e_date_edit_update_date_entry		(EDateEdit	*dedit)
 	if (priv->date_set_to_none || !priv->date_is_valid) {
 		gtk_entry_set_text (GTK_ENTRY (priv->date_entry), _("None"));
 	} else {
-		/* This is a strftime() format for a short date. 
+		/* This is a strftime() format for a short date.
 		   %x the preferred date representation for the current locale without the time,
 		   but has forced to use 4 digit year */
 		char *format = e_time_get_d_fmt_with_4digit_year ();
diff --git a/widgets/misc/e-dropdown-button.c b/widgets/misc/e-dropdown-button.c
index 6008f64..00b2695 100644
--- a/widgets/misc/e-dropdown-button.c
+++ b/widgets/misc/e-dropdown-button.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-dropdown-button.h b/widgets/misc/e-dropdown-button.h
index b10fd9a..bd4fe6f 100644
--- a/widgets/misc/e-dropdown-button.h
+++ b/widgets/misc/e-dropdown-button.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index 2dffb39..9a67636 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-filter-bar.h b/widgets/misc/e-filter-bar.h
index 4178070..8f06c86 100644
--- a/widgets/misc/e-filter-bar.h
+++ b/widgets/misc/e-filter-bar.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-gui-utils.c b/widgets/misc/e-gui-utils.c
index 4e0b099..6acbe92 100644
--- a/widgets/misc/e-gui-utils.c
+++ b/widgets/misc/e-gui-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-gui-utils.h b/widgets/misc/e-gui-utils.h
index d0a54f7..840a552 100644
--- a/widgets/misc/e-gui-utils.h
+++ b/widgets/misc/e-gui-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 7d50468..d3b5a1a 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-image-chooser.h b/widgets/misc/e-image-chooser.h
index 0e78026..b7f599f 100644
--- a/widgets/misc/e-image-chooser.h
+++ b/widgets/misc/e-image-chooser.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-info-label.c b/widgets/misc/e-info-label.c
index e195960..e6db111 100644
--- a/widgets/misc/e-info-label.c
+++ b/widgets/misc/e-info-label.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-info-label.h b/widgets/misc/e-info-label.h
index 905a39b..d4dd16e 100644
--- a/widgets/misc/e-info-label.h
+++ b/widgets/misc/e-info-label.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index f9742b5..c2c0806 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-map.h b/widgets/misc/e-map.h
index 4d65c7b..0c915fb 100644
--- a/widgets/misc/e-map.h
+++ b/widgets/misc/e-map.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-multi-config-dialog.c b/widgets/misc/e-multi-config-dialog.c
index 6cee26e..f78f764 100644
--- a/widgets/misc/e-multi-config-dialog.c
+++ b/widgets/misc/e-multi-config-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-multi-config-dialog.h b/widgets/misc/e-multi-config-dialog.h
index 462d593..e8d9896 100644
--- a/widgets/misc/e-multi-config-dialog.h
+++ b/widgets/misc/e-multi-config-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-online-button.c b/widgets/misc/e-online-button.c
index dec24a6..114d76a 100644
--- a/widgets/misc/e-online-button.c
+++ b/widgets/misc/e-online-button.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/widgets/misc/e-online-button.h b/widgets/misc/e-online-button.h
index 6576035..03f676d 100644
--- a/widgets/misc/e-online-button.h
+++ b/widgets/misc/e-online-button.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
diff --git a/widgets/misc/e-pilot-settings.c b/widgets/misc/e-pilot-settings.c
index 80ad52d..1bed863 100644
--- a/widgets/misc/e-pilot-settings.c
+++ b/widgets/misc/e-pilot-settings.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-pilot-settings.h b/widgets/misc/e-pilot-settings.h
index fbba3b2..0c4fbd7 100644
--- a/widgets/misc/e-pilot-settings.h
+++ b/widgets/misc/e-pilot-settings.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-popup-menu.c b/widgets/misc/e-popup-menu.c
index 1581d3e..143eaff 100644
--- a/widgets/misc/e-popup-menu.c
+++ b/widgets/misc/e-popup-menu.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-popup-menu.h b/widgets/misc/e-popup-menu.h
index 37589f4..ddf6ed0 100644
--- a/widgets/misc/e-popup-menu.h
+++ b/widgets/misc/e-popup-menu.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index 7f2db7e..05a219f 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-printable.h b/widgets/misc/e-printable.h
index d0d3223..32cbadd 100644
--- a/widgets/misc/e-printable.h
+++ b/widgets/misc/e-printable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index eae3d43..d24b915 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h
index 7482e50..c772621 100644
--- a/widgets/misc/e-reflow-model.h
+++ b/widgets/misc/e-reflow-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index f51a502..129046a 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-reflow.h b/widgets/misc/e-reflow.h
index 6d67369..69f34d0 100644
--- a/widgets/misc/e-reflow.h
+++ b/widgets/misc/e-reflow.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index d3d5791..2bbbc91 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1048,7 +1048,7 @@ e_search_bar_construct (ESearchBar *search_bar,
 		label = gtk_label_new_with_mnemonic (_(" i_n "));
 		gtk_widget_show (label);
 		gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), label, FALSE, FALSE, 0);
-	
+
 		search_bar->scopeoption = gtk_option_menu_new ();
 	/* 	g_signal_connect (GTK_OPTION_MENU (search_bar->scopeoption), "changed", scopeoption_changed_cb, search_bar); */
 		gtk_box_pack_start (GTK_BOX(search_bar->scopeoption_box), search_bar->scopeoption, FALSE, FALSE, 0);
diff --git a/widgets/misc/e-search-bar.h b/widgets/misc/e-search-bar.h
index f2d9b05..fd91068 100644
--- a/widgets/misc/e-search-bar.h
+++ b/widgets/misc/e-search-bar.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-selection-model-array.c b/widgets/misc/e-selection-model-array.c
index f45923c..7e82039 100644
--- a/widgets/misc/e-selection-model-array.c
+++ b/widgets/misc/e-selection-model-array.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-selection-model-array.h b/widgets/misc/e-selection-model-array.h
index abbf828..9f297c1 100644
--- a/widgets/misc/e-selection-model-array.h
+++ b/widgets/misc/e-selection-model-array.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-selection-model-simple.c b/widgets/misc/e-selection-model-simple.c
index f285662..b9f1d33 100644
--- a/widgets/misc/e-selection-model-simple.c
+++ b/widgets/misc/e-selection-model-simple.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-selection-model-simple.h b/widgets/misc/e-selection-model-simple.h
index 2cd2eca..7f11d3a 100644
--- a/widgets/misc/e-selection-model-simple.h
+++ b/widgets/misc/e-selection-model-simple.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 697bb68..66187e6 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index 18bbc2a..24eccd3 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-send-options.c b/widgets/misc/e-send-options.c
index 6c10a60..8740f2d 100644
--- a/widgets/misc/e-send-options.c
+++ b/widgets/misc/e-send-options.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-send-options.h b/widgets/misc/e-send-options.h
index 9a32357..3ed5d6f 100644
--- a/widgets/misc/e-send-options.h
+++ b/widgets/misc/e-send-options.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -20,7 +20,7 @@
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  *
  */
- 
+
 #ifndef __E_SENDOPTIONS_DIALOG_H__
 #define __E_SENDOPTIONS_DIALOG_H__
 
diff --git a/widgets/misc/e-signature-combo-box.c b/widgets/misc/e-signature-combo-box.c
index 9ebd20a..cb11ba6 100644
--- a/widgets/misc/e-signature-combo-box.c
+++ b/widgets/misc/e-signature-combo-box.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-signature-combo-box.h b/widgets/misc/e-signature-combo-box.h
index ec05c2b..fac4751 100644
--- a/widgets/misc/e-signature-combo-box.h
+++ b/widgets/misc/e-signature-combo-box.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
diff --git a/widgets/misc/e-task-bar.c b/widgets/misc/e-task-bar.c
index 8400f29..c7a715d 100644
--- a/widgets/misc/e-task-bar.c
+++ b/widgets/misc/e-task-bar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -37,7 +37,7 @@ struct _ETaskBarPrivate
 
 G_DEFINE_TYPE (ETaskBar, e_task_bar, GTK_TYPE_HBOX)
 
-#if 0	
+#if 0
 static void
 reduce_displayed_activities_per_component (ETaskBar *task_bar)
 {
@@ -80,7 +80,7 @@ reduce_displayed_activities_per_component (ETaskBar *task_bar)
 
 	g_hash_table_destroy (component_ids_hash);
 }
-#endif 
+#endif
 
 
 static void impl_finalize (GObject *object);
@@ -281,7 +281,7 @@ e_task_bar_get_task_widget_from_id (ETaskBar *task_bar,
 		w = NULL;
 		list = list->next;
 	}
-	
+
 	return w;
 }
 
diff --git a/widgets/misc/e-task-bar.h b/widgets/misc/e-task-bar.h
index 363e062..d36898e 100644
--- a/widgets/misc/e-task-bar.h
+++ b/widgets/misc/e-task-bar.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -66,7 +66,7 @@ void         e_task_bar_prepend_task     (ETaskBar    *task_bar,
 					  ETaskWidget *task_widget);
 void         e_task_bar_remove_task      (ETaskBar    *task_bar,
 					  int          n);
-ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar, 
+ETaskWidget * e_task_bar_get_task_widget_from_id (ETaskBar *task_bar,
 						  guint id);
 
 void 	    e_task_bar_remove_task_from_id (ETaskBar *task_bar,
diff --git a/widgets/misc/e-task-widget.c b/widgets/misc/e-task-widget.c
index d545613..2569a46 100644
--- a/widgets/misc/e-task-widget.c
+++ b/widgets/misc/e-task-widget.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -106,7 +106,7 @@ prepare_popup (ETaskWidget *widget, GdkEventButton *event)
 
 	if (event->button != 3)
 		return FALSE;
-	
+
 	/* FIXME: Implement Cancel */
 
 	return TRUE;
diff --git a/widgets/misc/e-task-widget.h b/widgets/misc/e-task-widget.h
index e478e91..4770b9d 100644
--- a/widgets/misc/e-task-widget.h
+++ b/widgets/misc/e-task-widget.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index cc50b39..2769001 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-unicode.h b/widgets/misc/e-unicode.h
index b0319b0..77d1a35 100644
--- a/widgets/misc/e-unicode.h
+++ b/widgets/misc/e-unicode.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-url-entry.c b/widgets/misc/e-url-entry.c
index 32490f6..6c8eab7 100644
--- a/widgets/misc/e-url-entry.c
+++ b/widgets/misc/e-url-entry.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/e-url-entry.h b/widgets/misc/e-url-entry.h
index 1c051ac..a4edc51 100644
--- a/widgets/misc/e-url-entry.h
+++ b/widgets/misc/e-url-entry.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/test-calendar.c b/widgets/misc/test-calendar.c
index 10a463d..6852010 100644
--- a/widgets/misc/test-calendar.c
+++ b/widgets/misc/test-calendar.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/test-dateedit.c b/widgets/misc/test-dateedit.c
index d359d12..7468053 100644
--- a/widgets/misc/test-dateedit.c
+++ b/widgets/misc/test-dateedit.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/test-dropdown-button.c b/widgets/misc/test-dropdown-button.c
index 51143ff..b76174f 100644
--- a/widgets/misc/test-dropdown-button.c
+++ b/widgets/misc/test-dropdown-button.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/test-error.c b/widgets/misc/test-error.c
index c8b442b..e67e698 100644
--- a/widgets/misc/test-error.c
+++ b/widgets/misc/test-error.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/test-info-label.c b/widgets/misc/test-info-label.c
index 2ef4748..31298ed 100644
--- a/widgets/misc/test-info-label.c
+++ b/widgets/misc/test-info-label.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/misc/test-multi-config-dialog.c b/widgets/misc/test-multi-config-dialog.c
index bc52f49..34a7624 100644
--- a/widgets/misc/test-multi-config-dialog.c
+++ b/widgets/misc/test-multi-config-dialog.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-checkbox.c b/widgets/table/e-cell-checkbox.c
index 114c2b5..09e2187 100644
--- a/widgets/table/e-cell-checkbox.c
+++ b/widgets/table/e-cell-checkbox.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-checkbox.h b/widgets/table/e-cell-checkbox.h
index 79f55c3..fa05ecb 100644
--- a/widgets/table/e-cell-checkbox.h
+++ b/widgets/table/e-cell-checkbox.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-combo.c b/widgets/table/e-cell-combo.c
index 83c17d3..80d6294 100644
--- a/widgets/table/e-cell-combo.c
+++ b/widgets/table/e-cell-combo.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-combo.h b/widgets/table/e-cell-combo.h
index 2e801f3..fafda30 100644
--- a/widgets/table/e-cell-combo.h
+++ b/widgets/table/e-cell-combo.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-date.c b/widgets/table/e-cell-date.c
index ac0274f..92c0dd9 100644
--- a/widgets/table/e-cell-date.c
+++ b/widgets/table/e-cell-date.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -54,7 +54,7 @@ ecd_get_text(ECellText *cell, ETableModel *model, int col, int row)
 	if (date == 0) {
 		return g_strdup (_("?"));
 	}
-	
+
 	tzset ();
 	localtime_r (&date, &then);
 	localtime_r (&nowdate, &now);
diff --git a/widgets/table/e-cell-date.h b/widgets/table/e-cell-date.h
index f7d24cf..fece501 100644
--- a/widgets/table/e-cell-date.h
+++ b/widgets/table/e-cell-date.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-hbox.c b/widgets/table/e-cell-hbox.c
index f6cb11e..f84d876 100644
--- a/widgets/table/e-cell-hbox.c
+++ b/widgets/table/e-cell-hbox.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-hbox.h b/widgets/table/e-cell-hbox.h
index d3cb84d..dc72696 100644
--- a/widgets/table/e-cell-hbox.h
+++ b/widgets/table/e-cell-hbox.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-number.c b/widgets/table/e-cell-number.c
index 6d4e392..56754a0 100644
--- a/widgets/table/e-cell-number.c
+++ b/widgets/table/e-cell-number.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-number.h b/widgets/table/e-cell-number.h
index 006801d..75471f7 100644
--- a/widgets/table/e-cell-number.h
+++ b/widgets/table/e-cell-number.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-pixbuf.c b/widgets/table/e-cell-pixbuf.c
index 4a2dde7..ea14130 100644
--- a/widgets/table/e-cell-pixbuf.c
+++ b/widgets/table/e-cell-pixbuf.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -116,7 +116,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable,
     int real_x, real_y, real_w, real_h;
     int pix_w, pix_h;
     cairo_t *cr;
-	
+
     cell_pixbuf = e_table_model_value_at (ecell_view->e_table_model,
 							  1, row);
 
@@ -155,7 +155,7 @@ pixbuf_draw (ECellView *ecell_view, GdkDrawable *drawable,
     gdk_cairo_set_source_pixbuf (cr, cell_pixbuf, real_x, real_y);
     cairo_paint_with_alpha (cr, 1);
     cairo_restore (cr);
-    cairo_destroy (cr);	
+    cairo_destroy (cr);
 }
 
 static gint
diff --git a/widgets/table/e-cell-pixbuf.h b/widgets/table/e-cell-pixbuf.h
index 09918a4..850e9d5 100644
--- a/widgets/table/e-cell-pixbuf.h
+++ b/widgets/table/e-cell-pixbuf.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-popup.c b/widgets/table/e-cell-popup.c
index c291571..8a8918d 100644
--- a/widgets/table/e-cell-popup.c
+++ b/widgets/table/e-cell-popup.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-popup.h b/widgets/table/e-cell-popup.h
index 12e44cb..c1262a1 100644
--- a/widgets/table/e-cell-popup.h
+++ b/widgets/table/e-cell-popup.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-size.c b/widgets/table/e-cell-size.c
index 08a1c8a..ca40785 100644
--- a/widgets/table/e-cell-size.c
+++ b/widgets/table/e-cell-size.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-size.h b/widgets/table/e-cell-size.h
index 68ee4eb..ed0d279 100644
--- a/widgets/table/e-cell-size.h
+++ b/widgets/table/e-cell-size.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c
index b86d709..3a03fe5 100644
--- a/widgets/table/e-cell-text.c
+++ b/widgets/table/e-cell-text.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index c831b2e..d92b025 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-toggle.c b/widgets/table/e-cell-toggle.c
index 4fc6aca..69dc1b2 100644
--- a/widgets/table/e-cell-toggle.c
+++ b/widgets/table/e-cell-toggle.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -141,7 +141,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 
 
 	image = toggle->images[value];
-	
+
 	if ((x2 - x1) < gdk_pixbuf_get_width (image)){
 		x = x1;
 		width = x2 - x1;
@@ -149,7 +149,7 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 		x = x1 + ((x2 - x1) - gdk_pixbuf_get_width (image)) / 2;
 		width = gdk_pixbuf_get_width (image);
 	}
-	
+
 	if ((y2 - y1) < gdk_pixbuf_get_height (image)){
 		y = y1;
 		height = y2 - y1;
@@ -163,9 +163,9 @@ etog_draw (ECellView *ecell_view, GdkDrawable *drawable,
 	gdk_cairo_set_source_pixbuf (cr, image, x, y);
 	cairo_paint_with_alpha (cr, 1);
 	cairo_restore (cr);
-	cairo_destroy (cr);	
+	cairo_destroy (cr);
 
-}	
+}
 
 static void
 etog_set_value (ECellToggleView *toggle_view, int model_col, int view_col, int row, int value)
diff --git a/widgets/table/e-cell-toggle.h b/widgets/table/e-cell-toggle.h
index 49e2afb..97d16dc 100644
--- a/widgets/table/e-cell-toggle.h
+++ b/widgets/table/e-cell-toggle.h
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-vbox.c b/widgets/table/e-cell-vbox.c
index af398ae..1fd770a 100644
--- a/widgets/table/e-cell-vbox.c
+++ b/widgets/table/e-cell-vbox.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell-vbox.h b/widgets/table/e-cell-vbox.h
index 6292862..ae774db 100644
--- a/widgets/table/e-cell-vbox.h
+++ b/widgets/table/e-cell-vbox.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 1de405f..41ffe86 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index cb60cc8..5a00050 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-click-to-add.c b/widgets/table/e-table-click-to-add.c
index 4871b05..879b8c3 100644
--- a/widgets/table/e-table-click-to-add.c
+++ b/widgets/table/e-table-click-to-add.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-click-to-add.h b/widgets/table/e-table-click-to-add.h
index 1ddbe4e..31dded1 100644
--- a/widgets/table/e-table-click-to-add.h
+++ b/widgets/table/e-table-click-to-add.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-col-dnd.h b/widgets/table/e-table-col-dnd.h
index 335b456..100a4d9 100644
--- a/widgets/table/e-table-col-dnd.h
+++ b/widgets/table/e-table-col-dnd.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-col.c b/widgets/table/e-table-col.c
index 892ff7c..d844f53 100644
--- a/widgets/table/e-table-col.c
+++ b/widgets/table/e-table-col.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-col.h b/widgets/table/e-table-col.h
index 562e4fd..f7d892d 100644
--- a/widgets/table/e-table-col.h
+++ b/widgets/table/e-table-col.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-column-specification.c b/widgets/table/e-table-column-specification.c
index 3da9e28..c484515 100644
--- a/widgets/table/e-table-column-specification.c
+++ b/widgets/table/e-table-column-specification.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-column-specification.h b/widgets/table/e-table-column-specification.h
index 775cbc3..688e194 100644
--- a/widgets/table/e-table-column-specification.h
+++ b/widgets/table/e-table-column-specification.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-column.c b/widgets/table/e-table-column.c
index 54909a0..d2180d8 100644
--- a/widgets/table/e-table-column.c
+++ b/widgets/table/e-table-column.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-config-field.c b/widgets/table/e-table-config-field.c
index f5111d7..6d3e561 100644
--- a/widgets/table/e-table-config-field.c
+++ b/widgets/table/e-table-config-field.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-config-field.h b/widgets/table/e-table-config-field.h
index 382ff94..9fbd21d 100644
--- a/widgets/table/e-table-config-field.h
+++ b/widgets/table/e-table-config-field.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-config.c b/widgets/table/e-table-config.c
index 1c40798..06f9806 100644
--- a/widgets/table/e-table-config.c
+++ b/widgets/table/e-table-config.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-config.h b/widgets/table/e-table-config.h
index b265e32..d5366bf 100644
--- a/widgets/table/e-table-config.h
+++ b/widgets/table/e-table-config.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-defines.h b/widgets/table/e-table-defines.h
index d11ac3e..c2511c0 100644
--- a/widgets/table/e-table-defines.h
+++ b/widgets/table/e-table-defines.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-example-1.c b/widgets/table/e-table-example-1.c
index cacef10..b1eae4c 100644
--- a/widgets/table/e-table-example-1.c
+++ b/widgets/table/e-table-example-1.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-example-2.c b/widgets/table/e-table-example-2.c
index 4f3324d..ac12886 100644
--- a/widgets/table/e-table-example-2.c
+++ b/widgets/table/e-table-example-2.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-extras.c b/widgets/table/e-table-extras.c
index 107739e..0099b23 100644
--- a/widgets/table/e-table-extras.c
+++ b/widgets/table/e-table-extras.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-extras.h b/widgets/table/e-table-extras.h
index a7efcd8..794cf46 100644
--- a/widgets/table/e-table-extras.h
+++ b/widgets/table/e-table-extras.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-field-chooser-dialog.c b/widgets/table/e-table-field-chooser-dialog.c
index 5b50449..61dedd4 100644
--- a/widgets/table/e-table-field-chooser-dialog.c
+++ b/widgets/table/e-table-field-chooser-dialog.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-field-chooser-dialog.h b/widgets/table/e-table-field-chooser-dialog.h
index 8467316..e0bc591 100644
--- a/widgets/table/e-table-field-chooser-dialog.h
+++ b/widgets/table/e-table-field-chooser-dialog.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-field-chooser-item.c b/widgets/table/e-table-field-chooser-item.c
index 4b4c6b1..99b61f9 100644
--- a/widgets/table/e-table-field-chooser-item.c
+++ b/widgets/table/e-table-field-chooser-item.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-field-chooser-item.h b/widgets/table/e-table-field-chooser-item.h
index 96b5b28..3b9937b 100644
--- a/widgets/table/e-table-field-chooser-item.h
+++ b/widgets/table/e-table-field-chooser-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-field-chooser.c b/widgets/table/e-table-field-chooser.c
index 60a0b40..fb66d96 100644
--- a/widgets/table/e-table-field-chooser.c
+++ b/widgets/table/e-table-field-chooser.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-field-chooser.h b/widgets/table/e-table-field-chooser.h
index 01a54da..71e1724 100644
--- a/widgets/table/e-table-field-chooser.h
+++ b/widgets/table/e-table-field-chooser.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-group-container.c b/widgets/table/e-table-group-container.c
index c342c6c..5af4053 100644
--- a/widgets/table/e-table-group-container.c
+++ b/widgets/table/e-table-group-container.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-group-container.h b/widgets/table/e-table-group-container.h
index c4e0293..69791e3 100644
--- a/widgets/table/e-table-group-container.h
+++ b/widgets/table/e-table-group-container.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-group-leaf.c b/widgets/table/e-table-group-leaf.c
index dc4c8ba..6076030 100644
--- a/widgets/table/e-table-group-leaf.c
+++ b/widgets/table/e-table-group-leaf.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-group-leaf.h b/widgets/table/e-table-group-leaf.h
index 394c2dd..e19bf8c 100644
--- a/widgets/table/e-table-group-leaf.h
+++ b/widgets/table/e-table-group-leaf.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-group.c b/widgets/table/e-table-group.c
index 257d23f..5cc03e9 100644
--- a/widgets/table/e-table-group.c
+++ b/widgets/table/e-table-group.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-group.h b/widgets/table/e-table-group.h
index ee225c2..36868f7 100644
--- a/widgets/table/e-table-group.h
+++ b/widgets/table/e-table-group.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-header-item.c b/widgets/table/e-table-header-item.c
index 028fd9b..62c00f9 100644
--- a/widgets/table/e-table-header-item.c
+++ b/widgets/table/e-table-header-item.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-header-item.h b/widgets/table/e-table-header-item.h
index d9b3efc..24a8693 100644
--- a/widgets/table/e-table-header-item.h
+++ b/widgets/table/e-table-header-item.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-header-utils.c b/widgets/table/e-table-header-utils.c
index afcc072..ae5ebf8 100644
--- a/widgets/table/e-table-header-utils.c
+++ b/widgets/table/e-table-header-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-header-utils.h b/widgets/table/e-table-header-utils.h
index 33376f3..2ae1f79 100644
--- a/widgets/table/e-table-header-utils.h
+++ b/widgets/table/e-table-header-utils.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-header.c b/widgets/table/e-table-header.c
index 3bd1409..6fd40ae 100644
--- a/widgets/table/e-table-header.c
+++ b/widgets/table/e-table-header.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index 2c091ce..00b145e 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 58d6c65..ce2484c 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -13,7 +13,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -1982,16 +1982,16 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width,
 
 			cairo_save (cr);
 			pat = cairo_pattern_create_linear (0, y1, 0, y2);
-			cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 , 
-								     background->green/65535.0, 
+			cairo_pattern_add_color_stop_rgba (pat, 0.0, background->red/65535.0 ,
+								     background->green/65535.0,
 								     background->blue/65535.0, selected ? 0.8: 1.0);
 			if (selected)
-				cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 , 
-									     background->green/65535.0, 
+				cairo_pattern_add_color_stop_rgba (pat, 0.5, background->red/65535.0 ,
+									     background->green/65535.0,
 									     background->blue/65535.0, 0.9);
 
-			cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 , 
-								   background->green/65535.0, 
+			cairo_pattern_add_color_stop_rgba (pat, 1, background->red/65535.0 ,
+								   background->green/65535.0,
 								   background->blue/65535.0, selected ? 0.8 : 1.0);
 			cairo_rectangle (cr, x1, y1, ecol->width, height-1);
 			cairo_set_source (cr, pat);
@@ -2003,22 +2003,22 @@ eti_draw (GnomeCanvasItem *item, GdkDrawable *drawable, int x, int y, int width,
 
 			cairo_save (cr);
 			cairo_set_line_width (cr, 1.0);
-			cairo_set_source_rgba (cr, background->red/65535.0 , 
-						   background->green/65535.0, 
+			cairo_set_source_rgba (cr, background->red/65535.0 ,
+						   background->green/65535.0,
 						   background->blue/65535.0, 1);
 			cairo_move_to (cr, x1, y1);
 			cairo_line_to (cr, x2, y1);
 			cairo_stroke (cr);
 
 			cairo_set_line_width (cr, 1.0);
-			cairo_set_source_rgba (cr, background->red/65535.0 , 
-						  background->green/65535.0, 
+			cairo_set_source_rgba (cr, background->red/65535.0 ,
+						  background->green/65535.0,
 						  background->blue/65535.0, 1);
 			cairo_move_to (cr, x1, y2);
 			cairo_line_to (cr, x2, y2);
 			cairo_stroke (cr);
-			cairo_restore (cr); 
-			
+			cairo_restore (cr);
+
 			if (free_background)
 				gdk_color_free (background);
 
diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h
index 48d6093..befadb7 100644
--- a/widgets/table/e-table-item.h
+++ b/widgets/table/e-table-item.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-memory-callbacks.c b/widgets/table/e-table-memory-callbacks.c
index 071494c..b1833aa 100644
--- a/widgets/table/e-table-memory-callbacks.c
+++ b/widgets/table/e-table-memory-callbacks.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-memory-callbacks.h b/widgets/table/e-table-memory-callbacks.h
index c9202ec..bfeacb2 100644
--- a/widgets/table/e-table-memory-callbacks.h
+++ b/widgets/table/e-table-memory-callbacks.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-memory-store.c b/widgets/table/e-table-memory-store.c
index 5756402..284823b 100644
--- a/widgets/table/e-table-memory-store.c
+++ b/widgets/table/e-table-memory-store.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-memory-store.h b/widgets/table/e-table-memory-store.h
index b16a18f..f197e11 100644
--- a/widgets/table/e-table-memory-store.h
+++ b/widgets/table/e-table-memory-store.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-memory.c b/widgets/table/e-table-memory.c
index 3712613..3fb85a9 100644
--- a/widgets/table/e-table-memory.c
+++ b/widgets/table/e-table-memory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-memory.h b/widgets/table/e-table-memory.h
index 37fc344..889eec5 100644
--- a/widgets/table/e-table-memory.h
+++ b/widgets/table/e-table-memory.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index f88f3bf..efe097c 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-model.h b/widgets/table/e-table-model.h
index f639d77..d647eee 100644
--- a/widgets/table/e-table-model.h
+++ b/widgets/table/e-table-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-one.c b/widgets/table/e-table-one.c
index 939733f..56cd8b6 100644
--- a/widgets/table/e-table-one.c
+++ b/widgets/table/e-table-one.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-one.h b/widgets/table/e-table-one.h
index d5e0b6a..2984aea 100644
--- a/widgets/table/e-table-one.h
+++ b/widgets/table/e-table-one.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-scrolled.c b/widgets/table/e-table-scrolled.c
index 0fca40d..42425ef 100644
--- a/widgets/table/e-table-scrolled.c
+++ b/widgets/table/e-table-scrolled.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-scrolled.h b/widgets/table/e-table-scrolled.h
index 2ff7332..d2f5024 100644
--- a/widgets/table/e-table-scrolled.h
+++ b/widgets/table/e-table-scrolled.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-search.c b/widgets/table/e-table-search.c
index 307d28d..401e0fd 100644
--- a/widgets/table/e-table-search.c
+++ b/widgets/table/e-table-search.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-search.h b/widgets/table/e-table-search.h
index 94232bd..9866d07 100644
--- a/widgets/table/e-table-search.h
+++ b/widgets/table/e-table-search.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-selection-model.c b/widgets/table/e-table-selection-model.c
index 2fdef3f..7f6ab4d 100644
--- a/widgets/table/e-table-selection-model.c
+++ b/widgets/table/e-table-selection-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 5d7d831..cbd7390 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-simple.c b/widgets/table/e-table-simple.c
index d4ba8d8..a220769 100644
--- a/widgets/table/e-table-simple.c
+++ b/widgets/table/e-table-simple.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-simple.h b/widgets/table/e-table-simple.h
index b8661fe..453a90a 100644
--- a/widgets/table/e-table-simple.h
+++ b/widgets/table/e-table-simple.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sort-info.c b/widgets/table/e-table-sort-info.c
index e5e3da3..8d72203 100644
--- a/widgets/table/e-table-sort-info.c
+++ b/widgets/table/e-table-sort-info.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sort-info.h b/widgets/table/e-table-sort-info.h
index 5a1874e..4a0dde4 100644
--- a/widgets/table/e-table-sort-info.h
+++ b/widgets/table/e-table-sort-info.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorted-variable.c b/widgets/table/e-table-sorted-variable.c
index b181b43..02a2e8b 100644
--- a/widgets/table/e-table-sorted-variable.c
+++ b/widgets/table/e-table-sorted-variable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorted-variable.h b/widgets/table/e-table-sorted-variable.h
index 06d3980..53744dc 100644
--- a/widgets/table/e-table-sorted-variable.h
+++ b/widgets/table/e-table-sorted-variable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorted.c b/widgets/table/e-table-sorted.c
index 4cb1a6c..076863a 100644
--- a/widgets/table/e-table-sorted.c
+++ b/widgets/table/e-table-sorted.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorted.h b/widgets/table/e-table-sorted.h
index 1d93b2a..031d9c9 100644
--- a/widgets/table/e-table-sorted.h
+++ b/widgets/table/e-table-sorted.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorter.c b/widgets/table/e-table-sorter.c
index dc63f74..154d5a2 100644
--- a/widgets/table/e-table-sorter.c
+++ b/widgets/table/e-table-sorter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorter.h b/widgets/table/e-table-sorter.h
index 81a7eb7..245539e 100644
--- a/widgets/table/e-table-sorter.h
+++ b/widgets/table/e-table-sorter.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorting-utils.c b/widgets/table/e-table-sorting-utils.c
index 479b920..d04144d 100644
--- a/widgets/table/e-table-sorting-utils.c
+++ b/widgets/table/e-table-sorting-utils.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-sorting-utils.h b/widgets/table/e-table-sorting-utils.h
index 4ab8714..a0f43fb 100644
--- a/widgets/table/e-table-sorting-utils.h
+++ b/widgets/table/e-table-sorting-utils.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-specification.c b/widgets/table/e-table-specification.c
index ff170df..f966b3c 100644
--- a/widgets/table/e-table-specification.c
+++ b/widgets/table/e-table-specification.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-specification.h b/widgets/table/e-table-specification.h
index 463bba6..580cbc6 100644
--- a/widgets/table/e-table-specification.h
+++ b/widgets/table/e-table-specification.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-state.c b/widgets/table/e-table-state.c
index 69d3348..e9440ec 100644
--- a/widgets/table/e-table-state.c
+++ b/widgets/table/e-table-state.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-state.h b/widgets/table/e-table-state.h
index f09baf7..7a320c5 100644
--- a/widgets/table/e-table-state.h
+++ b/widgets/table/e-table-state.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-subset-variable.c b/widgets/table/e-table-subset-variable.c
index 50913dd..b088d83 100644
--- a/widgets/table/e-table-subset-variable.c
+++ b/widgets/table/e-table-subset-variable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-subset-variable.h b/widgets/table/e-table-subset-variable.h
index 680d426..1aed0d3 100644
--- a/widgets/table/e-table-subset-variable.h
+++ b/widgets/table/e-table-subset-variable.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-subset.c b/widgets/table/e-table-subset.c
index d1e9ee6..1cec532 100644
--- a/widgets/table/e-table-subset.c
+++ b/widgets/table/e-table-subset.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-subset.h b/widgets/table/e-table-subset.h
index e2bf5b4..83c9af4 100644
--- a/widgets/table/e-table-subset.h
+++ b/widgets/table/e-table-subset.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-tooltip.h b/widgets/table/e-table-tooltip.h
index 4c85c08..5b2acbf 100644
--- a/widgets/table/e-table-tooltip.h
+++ b/widgets/table/e-table-tooltip.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-tree.h b/widgets/table/e-table-tree.h
index 13d6bf7..864359b 100644
--- a/widgets/table/e-table-tree.h
+++ b/widgets/table/e-table-tree.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-utils.c b/widgets/table/e-table-utils.c
index d01d94a..6e87a2a 100644
--- a/widgets/table/e-table-utils.c
+++ b/widgets/table/e-table-utils.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-utils.h b/widgets/table/e-table-utils.h
index 037a5f9..2c725f4 100644
--- a/widgets/table/e-table-utils.h
+++ b/widgets/table/e-table-utils.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-without.c b/widgets/table/e-table-without.c
index 2ee1734..7d9c5bf 100644
--- a/widgets/table/e-table-without.c
+++ b/widgets/table/e-table-without.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table-without.h b/widgets/table/e-table-without.h
index db40ded..c43bdab 100644
--- a/widgets/table/e-table-without.h
+++ b/widgets/table/e-table-without.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index f832101..b48fd45 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-table.h b/widgets/table/e-table.h
index 6b2a698..4894085 100644
--- a/widgets/table/e-table.h
+++ b/widgets/table/e-table.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-memory-callbacks.c b/widgets/table/e-tree-memory-callbacks.c
index 3a6f7a8..08d703b 100644
--- a/widgets/table/e-tree-memory-callbacks.c
+++ b/widgets/table/e-tree-memory-callbacks.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-memory-callbacks.h b/widgets/table/e-tree-memory-callbacks.h
index 89d3a0d..f74a472 100644
--- a/widgets/table/e-tree-memory-callbacks.h
+++ b/widgets/table/e-tree-memory-callbacks.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-memory.c b/widgets/table/e-tree-memory.c
index a7d266e..99c9ef9 100644
--- a/widgets/table/e-tree-memory.c
+++ b/widgets/table/e-tree-memory.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-memory.h b/widgets/table/e-tree-memory.h
index 075f740..2c82d1c 100644
--- a/widgets/table/e-tree-memory.h
+++ b/widgets/table/e-tree-memory.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-model.c b/widgets/table/e-tree-model.c
index b2e2d99..bd35358 100644
--- a/widgets/table/e-tree-model.c
+++ b/widgets/table/e-tree-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-model.h b/widgets/table/e-tree-model.h
index 96828a8..ed34933 100644
--- a/widgets/table/e-tree-model.h
+++ b/widgets/table/e-tree-model.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-scrolled.c b/widgets/table/e-tree-scrolled.c
index 7e40ef8..18267a4 100644
--- a/widgets/table/e-tree-scrolled.c
+++ b/widgets/table/e-tree-scrolled.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-scrolled.h b/widgets/table/e-tree-scrolled.h
index cbe725a..5d4b8de 100644
--- a/widgets/table/e-tree-scrolled.h
+++ b/widgets/table/e-tree-scrolled.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-selection-model.c b/widgets/table/e-tree-selection-model.c
index 2b903ca..1d694f9 100644
--- a/widgets/table/e-tree-selection-model.c
+++ b/widgets/table/e-tree-selection-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-selection-model.h b/widgets/table/e-tree-selection-model.h
index e1541a6..8652851 100644
--- a/widgets/table/e-tree-selection-model.h
+++ b/widgets/table/e-tree-selection-model.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-simple.c b/widgets/table/e-tree-simple.c
index be67a95..3252a3d 100644
--- a/widgets/table/e-tree-simple.c
+++ b/widgets/table/e-tree-simple.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-simple.h b/widgets/table/e-tree-simple.h
index 95e0bfb..bb64aa1 100644
--- a/widgets/table/e-tree-simple.h
+++ b/widgets/table/e-tree-simple.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-sorted-variable.c b/widgets/table/e-tree-sorted-variable.c
index d30812d..432a789 100644
--- a/widgets/table/e-tree-sorted-variable.c
+++ b/widgets/table/e-tree-sorted-variable.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-sorted-variable.h b/widgets/table/e-tree-sorted-variable.h
index 6abed5e..15f9d8e 100644
--- a/widgets/table/e-tree-sorted-variable.h
+++ b/widgets/table/e-tree-sorted-variable.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-sorted.c b/widgets/table/e-tree-sorted.c
index dd326ec..092fa87 100644
--- a/widgets/table/e-tree-sorted.c
+++ b/widgets/table/e-tree-sorted.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-sorted.h b/widgets/table/e-tree-sorted.h
index 1dc7f05..1e286b7 100644
--- a/widgets/table/e-tree-sorted.h
+++ b/widgets/table/e-tree-sorted.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-table-adapter.c b/widgets/table/e-tree-table-adapter.c
index 8e583ec..7cfeab3 100644
--- a/widgets/table/e-tree-table-adapter.c
+++ b/widgets/table/e-tree-table-adapter.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree-table-adapter.h b/widgets/table/e-tree-table-adapter.h
index d1296c2..13ab578 100644
--- a/widgets/table/e-tree-table-adapter.h
+++ b/widgets/table/e-tree-table-adapter.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 2eba9d4..e58ac1b 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
@@ -3415,7 +3415,7 @@ tree_size_allocate (GtkWidget *widget, GtkAllocation *alloc, ETree *tree)
 /**
  * e_tree_set_info_message:
  * @tree: #ETree instance
- * @info_message: Message to set. Can be NULL. 
+ * @info_message: Message to set. Can be NULL.
  *
  * Creates an info message in table area, or removes old.
  **/
diff --git a/widgets/table/e-tree.h b/widgets/table/e-tree.h
index 361ab5a..426cf9c 100644
--- a/widgets/table/e-tree.h
+++ b/widgets/table/e-tree.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/table/table-test.h b/widgets/table/table-test.h
index 3dc7d98..8b179ba 100644
--- a/widgets/table/table-test.h
+++ b/widgets/table/table-test.h
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/text/e-text-model-repos.c b/widgets/text/e-text-model-repos.c
index 0b55930..ef31f91 100644
--- a/widgets/text/e-text-model-repos.c
+++ b/widgets/text/e-text-model-repos.c
@@ -11,7 +11,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/text/e-text-model-repos.h b/widgets/text/e-text-model-repos.h
index 461a70f..6a185da 100644
--- a/widgets/text/e-text-model-repos.h
+++ b/widgets/text/e-text-model-repos.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 663cdd6..c7462e2 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 2a484f1..69c6f0c 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -10,7 +10,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index bd79c0a..c225636 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -386,10 +386,10 @@ reset_layout_attrs (EText *text)
 	}
 
 	pango_layout_set_attributes (text->layout, attrs);
-	
+
 	if (attrs)
 		pango_attr_list_unref (attrs);
-	
+
 	calc_height (text);
 }
 
@@ -1514,12 +1514,12 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
 		}
 	}
 
-	/* Insert preedit text only when im_context signals are connected & 
+	/* Insert preedit text only when im_context signals are connected &
 	 * text->preedit_len is not zero */
 	if (text->im_context_signals_registered && text->preedit_len)
 		insert_preedit_text (text);
 
-	/* Need to reset the layout to cleanly clear the preedit buffer when 
+	/* Need to reset the layout to cleanly clear the preedit buffer when
 	 * typing in CJK & using backspace on the preedit */
 	if(!text->preedit_len)
 		reset_layout (text);
diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h
index a426b2c..ebe5817 100644
--- a/widgets/text/e-text.h
+++ b/widgets/text/e-text.h
@@ -12,7 +12,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with the program; if not, see <http://www.gnu.org/licenses/>  
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>
  *
  *
  * Authors:
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]