[evolution/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/wip/cmake] Use ${PROJECT_NAME}-config.h unconditionally in the sources
- Date: Wed, 5 Oct 2016 17:15:44 +0000 (UTC)
commit 694ac0adc2e4e8210c22d71287f0025c6ef30180
Author: Milan Crha <mcrha redhat com>
Date: Wed Oct 5 19:16:08 2016 +0200
Use ${PROJECT_NAME}-config.h unconditionally in the sources
CMakeLists.txt | 6 +---
.../gui/contact-editor/e-contact-editor-fullname.c | 4 +--
addressbook/gui/contact-editor/e-contact-editor.c | 4 +--
.../gui/contact-editor/e-contact-quick-add.c | 4 +--
addressbook/gui/contact-editor/eab-editor.c | 4 +--
addressbook/gui/contact-editor/test-editor.c | 4 +--
.../contact-list-editor/e-contact-list-editor.c | 4 +--
.../gui/contact-list-editor/e-contact-list-model.c | 4 +--
addressbook/gui/widgets/e-addressbook-model.c | 4 +--
.../gui/widgets/e-addressbook-reflow-adapter.c | 4 +--
addressbook/gui/widgets/e-addressbook-selector.c | 4 +--
.../gui/widgets/e-addressbook-table-adapter.c | 4 +--
addressbook/gui/widgets/e-addressbook-view.c | 4 +--
addressbook/gui/widgets/e-contact-map-window.c | 4 +--
addressbook/gui/widgets/e-contact-map.c | 4 +--
addressbook/gui/widgets/e-minicard-label.c | 4 +--
addressbook/gui/widgets/e-minicard-view-widget.c | 4 +--
addressbook/gui/widgets/e-minicard-view.c | 4 +--
addressbook/gui/widgets/e-minicard.c | 4 +--
addressbook/gui/widgets/ea-addressbook-view.c | 4 +--
addressbook/gui/widgets/ea-addressbook.c | 4 +--
addressbook/gui/widgets/ea-minicard-view.c | 4 +--
addressbook/gui/widgets/ea-minicard.c | 4 +--
addressbook/gui/widgets/eab-config.c | 4 +--
addressbook/gui/widgets/eab-contact-compare.c | 4 +--
addressbook/gui/widgets/eab-contact-display.c | 4 +--
addressbook/gui/widgets/eab-contact-formatter.c | 5 ++-
addressbook/gui/widgets/eab-contact-merging.c | 4 +--
addressbook/gui/widgets/eab-gui-util.c | 4 +--
addressbook/gui/widgets/gal-view-minicard.c | 4 +--
addressbook/importers/evolution-csv-importer.c | 4 +--
addressbook/importers/evolution-ldif-importer.c | 4 +--
addressbook/importers/evolution-vcard-importer.c | 4 +--
addressbook/printing/e-contact-print.c | 4 +--
addressbook/util/eab-book-util.c | 4 +--
calendar/alarm-notify/alarm-notify-dialog.c | 4 +--
calendar/alarm-notify/alarm-notify.c | 4 +--
calendar/alarm-notify/alarm-queue.c | 4 +--
calendar/alarm-notify/alarm.c | 4 +--
calendar/alarm-notify/config-data.c | 4 +--
calendar/alarm-notify/notify-main.c | 4 +--
calendar/alarm-notify/util.c | 4 +--
calendar/gui/calendar-config.c | 4 +--
calendar/gui/comp-util.c | 4 +--
calendar/gui/e-alarm-list.c | 4 +--
calendar/gui/e-cal-component-preview.c | 4 +--
calendar/gui/e-cal-config.c | 4 +--
calendar/gui/e-cal-data-model-subscriber.c | 4 +--
calendar/gui/e-cal-data-model.c | 4 +--
calendar/gui/e-cal-dialogs.c | 4 +--
calendar/gui/e-cal-event.c | 4 +--
calendar/gui/e-cal-list-view.c | 4 +--
calendar/gui/e-cal-model-calendar.c | 4 +--
calendar/gui/e-cal-model-memos.c | 4 +--
calendar/gui/e-cal-model-tasks.c | 4 +--
calendar/gui/e-cal-model.c | 4 +--
calendar/gui/e-cal-ops.c | 4 +--
calendar/gui/e-calendar-view.c | 4 +--
calendar/gui/e-cell-date-edit-text.c | 4 +--
calendar/gui/e-comp-editor-event.c | 4 +--
calendar/gui/e-comp-editor-memo.c | 4 +--
calendar/gui/e-comp-editor-page-attachments.c | 4 +--
calendar/gui/e-comp-editor-page-general.c | 4 +--
calendar/gui/e-comp-editor-page-recurrence.c | 4 +--
calendar/gui/e-comp-editor-page-reminders.c | 4 +--
calendar/gui/e-comp-editor-page-schedule.c | 4 +--
calendar/gui/e-comp-editor-page.c | 4 +--
calendar/gui/e-comp-editor-property-part.c | 4 +--
calendar/gui/e-comp-editor-property-parts.c | 4 +--
calendar/gui/e-comp-editor-task.c | 4 +--
calendar/gui/e-comp-editor.c | 4 +--
calendar/gui/e-date-time-list.c | 4 +--
calendar/gui/e-day-view-layout.c | 4 +--
calendar/gui/e-day-view-main-item.c | 4 +--
calendar/gui/e-day-view-time-item.c | 4 +--
calendar/gui/e-day-view-top-item.c | 4 +--
calendar/gui/e-day-view.c | 4 +--
calendar/gui/e-meeting-attendee.c | 4 +--
calendar/gui/e-meeting-list-view.c | 4 +--
calendar/gui/e-meeting-store.c | 4 +--
calendar/gui/e-meeting-time-sel-item.c | 4 +--
calendar/gui/e-meeting-time-sel.c | 4 +--
calendar/gui/e-meeting-utils.c | 4 +--
calendar/gui/e-memo-table.c | 4 +--
calendar/gui/e-month-view.c | 4 +--
calendar/gui/e-select-names-editable.c | 4 +--
calendar/gui/e-select-names-renderer.c | 4 +--
calendar/gui/e-send-options-utils.c | 4 +--
calendar/gui/e-task-table.c | 4 +--
calendar/gui/e-timezone-entry.c | 4 +--
calendar/gui/e-week-view-event-item.c | 4 +--
calendar/gui/e-week-view-layout.c | 4 +--
calendar/gui/e-week-view-main-item.c | 4 +--
calendar/gui/e-week-view-titles-item.c | 4 +--
calendar/gui/e-week-view.c | 4 +--
calendar/gui/e-weekday-chooser.c | 5 ++-
calendar/gui/ea-cal-view-event.c | 4 +--
calendar/gui/ea-cal-view.c | 4 +--
calendar/gui/ea-calendar-helpers.c | 4 +--
calendar/gui/ea-calendar.c | 4 +--
calendar/gui/ea-day-view-cell.c | 4 +--
calendar/gui/ea-day-view-main-item.c | 4 +--
calendar/gui/ea-day-view.c | 4 +--
calendar/gui/ea-jump-button.c | 4 +--
calendar/gui/ea-week-view-cell.c | 4 +--
calendar/gui/ea-week-view-main-item.c | 4 +--
calendar/gui/ea-week-view.c | 4 +--
calendar/gui/itip-utils.c | 4 +--
calendar/gui/misc.c | 4 +--
calendar/gui/print.c | 4 +--
calendar/gui/tag-calendar.c | 4 +--
calendar/importers/icalendar-importer.c | 4 +--
composer/e-composer-actions.c | 4 +--
composer/e-composer-from-header.c | 4 +--
composer/e-composer-header-table.c | 4 +--
composer/e-composer-header.c | 4 +--
composer/e-composer-name-header.c | 4 +--
composer/e-composer-post-header.c | 4 +--
composer/e-composer-private.c | 4 +--
composer/e-composer-spell-header.c | 4 +--
composer/e-composer-text-header.c | 4 +--
composer/e-msg-composer.c | 4 +--
config.h.in | 2 +-
e-util/e-action-combo-box.c | 4 +--
e-util/e-activity-bar.c | 4 +--
e-util/e-activity-proxy.c | 4 +--
e-util/e-activity.c | 4 +--
e-util/e-alert-bar.c | 4 +-
e-util/e-alert-dialog.c | 4 +--
e-util/e-alert-sink.c | 4 +--
e-util/e-alert.c | 4 +--
e-util/e-attachment-bar.c | 4 +--
e-util/e-attachment-dialog.c | 4 +--
e-util/e-attachment-handler-image.c | 4 +--
e-util/e-attachment-handler.c | 4 +--
e-util/e-attachment-icon-view.c | 4 +--
e-util/e-attachment-paned.c | 4 +--
e-util/e-attachment-store.c | 4 +--
e-util/e-attachment-tree-view.c | 4 +--
e-util/e-attachment-view.c | 4 +--
e-util/e-attachment.c | 4 +--
e-util/e-bit-array.c | 4 +--
e-util/e-book-source-config.c | 3 +-
e-util/e-buffer-tagger.c | 4 +--
e-util/e-cal-source-config.c | 4 +-
e-util/e-calendar-item.c | 4 +--
e-util/e-calendar.c | 4 +-
e-util/e-canvas-background.c | 4 +--
e-util/e-canvas-utils.c | 5 +--
e-util/e-canvas-vbox.c | 4 +--
e-util/e-canvas.c | 6 ++--
e-util/e-categories-config.c | 4 +--
e-util/e-categories-dialog.c | 4 +--
e-util/e-categories-editor.c | 3 +-
e-util/e-categories-selector.c | 3 +-
e-util/e-category-completion.c | 7 +----
e-util/e-category-editor.c | 5 +--
e-util/e-cell-checkbox.c | 4 +--
e-util/e-cell-combo.c | 4 +--
e-util/e-cell-date-edit.c | 4 +--
e-util/e-cell-date-int.c | 4 +--
e-util/e-cell-date.c | 4 +--
e-util/e-cell-hbox.c | 4 +--
e-util/e-cell-number.c | 4 +--
e-util/e-cell-percent.c | 4 +--
e-util/e-cell-pixbuf.c | 4 +--
e-util/e-cell-popup.c | 4 +--
e-util/e-cell-size.c | 4 +--
e-util/e-cell-text.c | 4 +--
e-util/e-cell-toggle.c | 4 +--
e-util/e-cell-tree.c | 4 +--
e-util/e-cell-vbox.c | 4 +--
e-util/e-cell.c | 4 +--
e-util/e-charset-combo-box.c | 4 +--
e-util/e-charset.c | 4 +--
e-util/e-client-cache.c | 5 ++-
e-util/e-client-selector.c | 4 +--
e-util/e-color-chooser-widget.c | 4 +--
e-util/e-color-combo.c | 4 +--
e-util/e-config.c | 4 +--
e-util/e-contact-store.c | 4 +--
e-util/e-content-editor.c | 4 +--
e-util/e-content-request.c | 4 +--
e-util/e-dateedit.c | 4 +--
e-util/e-datetime-format.c | 4 +--
e-util/e-destination-store.c | 4 +--
e-util/e-dialog-utils.c | 4 +--
e-util/e-dialog-widgets.c | 4 +--
e-util/e-emoticon-chooser-menu.c | 4 +--
e-util/e-emoticon-chooser.c | 4 +--
e-util/e-emoticon-tool-button.c | 4 +--
e-util/e-event.c | 4 +--
e-util/e-file-request.c | 4 +--
e-util/e-file-utils.c | 5 ++-
e-util/e-filter-code.c | 4 +--
e-util/e-filter-color.c | 4 +--
e-util/e-filter-datespec.c | 4 +--
e-util/e-filter-element.c | 4 +--
e-util/e-filter-file.c | 4 +--
e-util/e-filter-input.c | 4 +--
e-util/e-filter-int.c | 4 +--
e-util/e-filter-option.c | 4 +--
e-util/e-filter-part.c | 4 +--
e-util/e-filter-rule.c | 4 +--
e-util/e-focus-tracker.c | 4 +--
e-util/e-html-editor-actions.c | 4 +--
e-util/e-html-editor-cell-dialog.c | 4 +--
e-util/e-html-editor-dialog.c | 4 +--
e-util/e-html-editor-find-dialog.c | 4 +--
e-util/e-html-editor-hrule-dialog.c | 4 +--
e-util/e-html-editor-image-dialog.c | 4 +--
e-util/e-html-editor-link-dialog.c | 4 +--
e-util/e-html-editor-page-dialog.c | 4 +--
e-util/e-html-editor-paragraph-dialog.c | 4 +--
e-util/e-html-editor-replace-dialog.c | 4 +--
e-util/e-html-editor-spell-check-dialog.c | 4 +--
e-util/e-html-editor-table-dialog.c | 4 +--
e-util/e-html-editor-text-dialog.c | 4 +--
e-util/e-html-editor.c | 3 +-
e-util/e-html-utils.c | 4 +--
e-util/e-icon-factory.c | 4 +--
e-util/e-image-chooser-dialog.c | 4 +--
e-util/e-image-chooser.c | 4 +--
e-util/e-import-assistant.c | 4 +--
e-util/e-import.c | 4 +--
e-util/e-interval-chooser.c | 5 ++-
e-util/e-mail-identity-combo-box.c | 5 ++-
e-util/e-mail-signature-combo-box.c | 5 ++-
e-util/e-mail-signature-editor.c | 5 ++-
e-util/e-mail-signature-script-dialog.c | 5 ++-
e-util/e-map.c | 5 ++-
e-util/e-menu-tool-action.c | 4 +--
e-util/e-menu-tool-button.c | 4 +--
e-util/e-misc-utils.c | 4 +--
e-util/e-mktemp.c | 4 +--
e-util/e-name-selector-dialog.c | 5 +---
e-util/e-name-selector-entry.c | 3 +-
e-util/e-name-selector-list.c | 3 +-
e-util/e-name-selector-model.c | 4 +--
e-util/e-name-selector.c | 4 +--
e-util/e-online-button.c | 4 +--
e-util/e-paned.c | 4 +--
e-util/e-passwords.c | 4 +--
e-util/e-picture-gallery.c | 4 +--
e-util/e-plugin-ui.c | 4 +--
e-util/e-plugin.c | 4 +--
e-util/e-poolv.c | 4 +--
e-util/e-popup-action.c | 4 +--
e-util/e-popup-menu.c | 4 +--
e-util/e-port-entry.c | 5 ++-
e-util/e-preferences-window.c | 4 +--
e-util/e-print.c | 4 +--
e-util/e-printable.c | 4 +--
e-util/e-proxy-editor.c | 5 ++-
e-util/e-proxy-preferences.c | 11 +++++----
e-util/e-proxy-selector.c | 5 ++-
e-util/e-reflow-model.c | 4 +--
e-util/e-reflow.c | 4 +--
e-util/e-rule-context.c | 4 +--
e-util/e-rule-editor.c | 4 +--
e-util/e-search-bar.c | 4 +--
e-util/e-selectable.c | 4 +--
e-util/e-selection-model-array.c | 4 +--
e-util/e-selection-model-simple.c | 4 +--
e-util/e-selection-model.c | 4 +--
e-util/e-selection.c | 4 +--
e-util/e-send-options.c | 4 +--
e-util/e-simple-async-result.c | 4 +--
e-util/e-source-combo-box.c | 4 +--
e-util/e-source-config-dialog.c | 4 +--
e-util/e-source-config.c | 5 ++-
e-util/e-source-selector-dialog.c | 4 +--
e-util/e-source-selector.c | 4 +--
e-util/e-spell-checker.c | 4 +--
e-util/e-spell-dictionary.c | 4 +--
e-util/e-spell-entry.c | 3 +-
e-util/e-spell-text-view.c | 4 +--
e-util/e-spinner.c | 4 +--
e-util/e-stock-request.c | 4 +--
e-util/e-table-click-to-add.c | 4 +--
e-util/e-table-col.c | 4 +--
e-util/e-table-column-selector.c | 6 ++--
e-util/e-table-column-specification.c | 4 +--
e-util/e-table-config.c | 4 +-
e-util/e-table-extras.c | 4 +--
e-util/e-table-field-chooser-dialog.c | 4 +--
e-util/e-table-field-chooser-item.c | 4 +--
e-util/e-table-field-chooser.c | 4 +--
e-util/e-table-group-container.c | 4 +--
e-util/e-table-group-leaf.c | 4 +--
e-util/e-table-group.c | 4 +--
e-util/e-table-header-item.c | 4 +--
e-util/e-table-header-utils.c | 4 +--
e-util/e-table-header.c | 4 +--
e-util/e-table-item.c | 5 +--
e-util/e-table-one.c | 4 +--
e-util/e-table-search.c | 4 +-
e-util/e-table-selection-model.c | 4 +--
e-util/e-table-sorted-variable.c | 4 +--
e-util/e-table-sorted.c | 4 +--
e-util/e-table-sorter.c | 4 +--
e-util/e-table-sorting-utils.c | 4 +--
e-util/e-table-subset-variable.c | 4 +--
e-util/e-table-subset.c | 4 +--
e-util/e-table-utils.c | 4 +--
e-util/e-table.c | 4 +--
e-util/e-text-event-processor-emacs-like.c | 4 +--
e-util/e-text-event-processor.c | 4 +--
e-util/e-text-model-repos.c | 4 +--
e-util/e-text-model.c | 4 +--
e-util/e-text.c | 5 ++-
e-util/e-timezone-dialog.c | 4 +--
e-util/e-tree-model-generator.c | 4 +--
e-util/e-tree-selection-model.c | 4 +--
e-util/e-tree-view-frame.c | 4 +--
e-util/e-tree.c | 4 +--
e-util/e-unicode.c | 4 +--
e-util/e-url-entry.c | 4 +--
e-util/e-web-view-preview.c | 4 +--
e-util/e-web-view.c | 7 +++--
e-util/e-widget-undo.c | 4 +--
e-util/e-win32-defaults.c | 4 +--
e-util/e-win32-reloc.c | 4 +--
e-util/e-xml-utils.c | 4 +--
e-util/ea-calendar-cell.c | 4 +--
e-util/ea-calendar-item.c | 4 +--
e-util/ea-cell-table.c | 4 +--
e-util/ea-widgets.c | 4 +--
e-util/evolution-source-viewer.c | 3 +-
e-util/gal-a11y-e-cell-popup.c | 4 +--
e-util/gal-a11y-e-cell-registry.c | 4 +--
e-util/gal-a11y-e-cell-text.c | 2 +-
e-util/gal-a11y-e-cell-toggle.c | 4 +--
e-util/gal-a11y-e-cell-tree.c | 4 +--
e-util/gal-a11y-e-cell-vbox.c | 4 +--
e-util/gal-a11y-e-cell.c | 4 +--
e-util/gal-a11y-e-table-click-to-add-factory.c | 4 +--
e-util/gal-a11y-e-table-click-to-add.c | 4 +--
e-util/gal-a11y-e-table-column-header.c | 4 +--
e-util/gal-a11y-e-table-factory.c | 4 +--
e-util/gal-a11y-e-table-item-factory.c | 4 +--
e-util/gal-a11y-e-table-item.c | 4 +--
e-util/gal-a11y-e-table.c | 4 +--
e-util/gal-a11y-e-text-factory.c | 4 +--
e-util/gal-a11y-e-text.c | 4 +--
e-util/gal-a11y-e-tree-factory.c | 4 +--
e-util/gal-a11y-e-tree.c | 4 +--
e-util/gal-a11y-util.c | 4 +--
e-util/gal-view-instance-save-as-dialog.c | 4 +--
e-util/gal-view-instance.c | 4 +--
e-util/test-calendar.c | 4 +--
e-util/test-dateedit.c | 4 +--
e-util/test-html-editor-units-bugs.c | 4 +--
e-util/test-html-editor-units-utils.c | 4 +--
e-util/test-html-editor-units.c | 4 +--
e-util/test-html-editor.c | 4 +--
e-util/test-keyfile-settings-backend.c | 4 +--
e-util/test-source-combo-box.c | 3 +-
em-format/e-mail-formatter-attachment.c | 4 +--
em-format/e-mail-formatter-audio.c | 4 +--
em-format/e-mail-formatter-error.c | 4 +--
em-format/e-mail-formatter-headers.c | 4 +--
em-format/e-mail-formatter-image.c | 4 +--
em-format/e-mail-formatter-message-rfc822.c | 4 +--
em-format/e-mail-formatter-print-headers.c | 4 +--
em-format/e-mail-formatter-quote-headers.c | 4 +--
em-format/e-mail-formatter-quote-message-rfc822.c | 4 +--
em-format/e-mail-formatter-quote-text-enriched.c | 4 +--
em-format/e-mail-formatter-quote-text-html.c | 4 +--
em-format/e-mail-formatter-quote-text-plain.c | 4 +--
em-format/e-mail-formatter-secure-button.c | 4 +--
em-format/e-mail-formatter-source.c | 4 +--
em-format/e-mail-formatter-text-enriched.c | 4 +--
em-format/e-mail-formatter-text-html.c | 4 +--
em-format/e-mail-formatter-text-plain.c | 4 +--
em-format/e-mail-formatter-utils.c | 4 +--
em-format/e-mail-inline-filter.c | 4 +--
em-format/e-mail-parser-application-mbox.c | 4 +--
em-format/e-mail-parser-application-smime.c | 4 +--
em-format/e-mail-parser-audio.c | 4 +--
em-format/e-mail-parser-headers.c | 4 +--
em-format/e-mail-parser-image.c | 4 +--
em-format/e-mail-parser-inlinepgp-encrypted.c | 4 +--
em-format/e-mail-parser-inlinepgp-signed.c | 4 +--
em-format/e-mail-parser-message-deliverystatus.c | 4 +--
em-format/e-mail-parser-message-external.c | 4 +--
em-format/e-mail-parser-message-rfc822.c | 4 +--
em-format/e-mail-parser-message.c | 4 +--
em-format/e-mail-parser-multipart-alternative.c | 4 +--
em-format/e-mail-parser-multipart-appledouble.c | 4 +--
em-format/e-mail-parser-multipart-digest.c | 4 +--
em-format/e-mail-parser-multipart-encrypted.c | 4 +--
em-format/e-mail-parser-multipart-mixed.c | 4 +--
em-format/e-mail-parser-multipart-related.c | 4 +--
em-format/e-mail-parser-multipart-signed.c | 4 +--
em-format/e-mail-parser-secure-button.c | 4 +--
em-format/e-mail-parser-source.c | 4 +--
em-format/e-mail-parser-text-enriched.c | 4 +--
em-format/e-mail-parser-text-html.c | 4 +--
em-format/e-mail-parser-text-plain.c | 4 +--
em-format/e-mail-parser.c | 4 +--
em-format/e-mail-part-headers.c | 4 +-
em-format/e-mail-part-secure-button.c | 4 +--
em-format/e-mail-part-utils.c | 4 +--
em-format/e-mail-part.c | 4 +--
em-format/e-mail-stripsig-filter.c | 4 +--
libemail-engine/camel-null-store.c | 5 ++-
libemail-engine/camel-sasl-oauth2-google.c | 4 +--
libemail-engine/camel-sasl-xoauth2.c | 3 +-
libemail-engine/e-mail-folder-utils.c | 4 +--
libemail-engine/e-mail-session-utils.c | 4 +--
libemail-engine/e-mail-session.c | 4 +--
libemail-engine/e-mail-store-utils.c | 4 +--
libemail-engine/em-filter-folder-element.c | 4 +--
libemail-engine/em-vfolder-context.c | 4 +--
libemail-engine/em-vfolder-rule.c | 4 +--
libemail-engine/mail-config.c | 4 +--
libemail-engine/mail-folder-cache.c | 4 +--
libemail-engine/mail-mt.c | 4 +--
libemail-engine/mail-ops.c | 4 +--
libemail-engine/mail-tools.c | 4 +--
libemail-engine/mail-vfolder.c | 4 +--
libgnomecanvas/gailcanvas.c | 4 +--
libgnomecanvas/gailcanvasgroup.c | 4 +--
libgnomecanvas/gailcanvasgroupfactory.c | 4 +--
libgnomecanvas/gailcanvasitem.c | 4 +--
libgnomecanvas/gailcanvasitemfactory.c | 4 +--
libgnomecanvas/gailcanvastext.c | 4 +--
libgnomecanvas/gailcanvastextfactory.c | 4 +--
libgnomecanvas/gailcanvaswidget.c | 4 +--
libgnomecanvas/gailcanvaswidgetfactory.c | 4 +--
libgnomecanvas/gnome-canvas-pixbuf.c | 4 +--
libgnomecanvas/gnome-canvas-rect.c | 4 +--
libgnomecanvas/gnome-canvas-text.c | 4 +--
libgnomecanvas/gnome-canvas-util.c | 4 +--
libgnomecanvas/gnome-canvas-widget.c | 4 +--
libgnomecanvas/gnome-canvas.c | 4 +--
mail/e-cid-request.c | 4 +--
mail/e-http-request.c | 4 +--
mail/e-mail-account-manager.c | 7 +++--
mail/e-mail-account-store.c | 7 +++--
mail/e-mail-account-tree-view.c | 5 ++-
mail/e-mail-autoconfig.c | 5 ++-
mail/e-mail-backend.c | 4 +--
mail/e-mail-browser.c | 4 +--
mail/e-mail-config-assistant.c | 21 ++++++++++---------
mail/e-mail-config-auth-check.c | 3 +-
mail/e-mail-config-confirm-page.c | 5 ++-
mail/e-mail-config-defaults-page.c | 3 +-
mail/e-mail-config-identity-page.c | 4 +-
mail/e-mail-config-lookup-page.c | 5 +--
mail/e-mail-config-page.c | 5 ++-
mail/e-mail-config-provider-page.c | 5 ++-
mail/e-mail-config-receiving-page.c | 5 ++-
mail/e-mail-config-security-page.c | 5 ++-
mail/e-mail-config-sending-page.c | 5 ++-
mail/e-mail-config-service-page.c | 9 ++++---
mail/e-mail-config-summary-page.c | 5 ++-
mail/e-mail-config-welcome-page.c | 5 ++-
mail/e-mail-config-window.c | 9 ++++---
mail/e-mail-display.c | 7 +++--
mail/e-mail-folder-create-dialog.c | 5 ++-
mail/e-mail-folder-pane.c | 4 +--
mail/e-mail-free-form-exp.c | 4 +--
mail/e-mail-junk-options.c | 5 ++-
mail/e-mail-label-action.c | 4 +--
mail/e-mail-label-dialog.c | 4 +--
mail/e-mail-label-list-store.c | 4 +--
mail/e-mail-label-manager.c | 4 +--
mail/e-mail-label-tree-view.c | 4 +--
mail/e-mail-message-pane.c | 4 +--
mail/e-mail-migrate.c | 4 +--
mail/e-mail-notes.c | 4 +--
mail/e-mail-paned-view.c | 5 ++-
mail/e-mail-print-config-headers.c | 5 ++-
mail/e-mail-printer.c | 4 +--
mail/e-mail-properties.c | 4 +--
mail/e-mail-reader-utils.c | 4 +--
mail/e-mail-reader.c | 4 +--
mail/e-mail-remote-content.c | 4 +--
mail/e-mail-request.c | 4 +--
mail/e-mail-send-account-override.c | 5 ++-
mail/e-mail-sidebar.c | 7 +++--
mail/e-mail-tag-editor.c | 4 +--
mail/e-mail-ui-session.c | 4 +--
mail/e-mail-view.c | 4 +--
mail/em-composer-utils.c | 4 +--
mail/em-config.c | 4 +--
mail/em-event.c | 4 +--
mail/em-filter-context.c | 4 +--
mail/em-filter-editor-folder-element.c | 9 ++++---
mail/em-filter-editor.c | 4 +--
mail/em-filter-rule.c | 4 +--
mail/em-filter-source-element.c | 5 ++-
mail/em-folder-properties.c | 4 +--
mail/em-folder-selection-button.c | 5 ++-
mail/em-folder-selector.c | 5 ++-
mail/em-folder-tree-model.c | 5 ++-
mail/em-folder-tree.c | 5 ++-
mail/em-folder-utils.c | 5 ++-
mail/em-search-context.c | 4 +--
mail/em-subscription-editor.c | 4 +-
mail/em-utils.c | 5 ++-
mail/em-vfolder-editor-context.c | 4 +--
mail/em-vfolder-editor-rule.c | 5 ++-
mail/em-vfolder-editor.c | 4 +--
mail/importers/elm-importer.c | 3 +-
mail/importers/evolution-mbox-importer.c | 3 +-
mail/importers/kmail-importer.c | 4 +--
mail/importers/kmail-libs.c | 4 +--
mail/importers/mail-importer.c | 7 +++--
mail/importers/pine-importer.c | 3 +-
mail/mail-autofilter.c | 3 +-
mail/mail-send-recv.c | 5 ++-
mail/mail-vfolder-ui.c | 5 ++-
mail/message-list.c | 5 ++-
mail/test-mail-autoconfig.c | 2 +
modules/addressbook/autocompletion-config.c | 3 +-
modules/addressbook/e-book-config-hook.c | 4 +--
modules/addressbook/e-book-shell-backend.c | 4 +--
modules/addressbook/e-book-shell-content.c | 4 +--
modules/addressbook/e-book-shell-migrate.c | 4 +--
modules/addressbook/e-book-shell-sidebar.c | 4 +--
modules/addressbook/e-book-shell-view-actions.c | 4 +--
modules/addressbook/e-book-shell-view-private.c | 4 +--
modules/addressbook/e-book-shell-view.c | 4 +--
modules/addressbook/eab-composer-util.c | 4 +--
modules/addressbook/evolution-module-addressbook.c | 4 +--
.../backup-restore/e-mail-config-restore-page.c | 5 ++-
.../e-mail-config-restore-ready-page.c | 5 ++-
modules/backup-restore/evolution-backup-restore.c | 3 +-
modules/backup-restore/evolution-backup-tool.c | 4 +--
modules/bogofilter/evolution-bogofilter.c | 4 +--
.../evolution-book-config-google.c | 3 +-
.../book-config-ldap/evolution-book-config-ldap.c | 3 +-
.../evolution-book-config-local.c | 3 +-
.../evolution-book-config-webdav.c | 3 +-
.../evolution-cal-config-caldav.c | 3 +-
modules/cal-config-contacts/e-contacts-selector.c | 4 +--
.../evolution-cal-config-contacts.c | 3 +-
modules/cal-config-google/e-cal-config-google.c | 3 +-
modules/cal-config-google/e-cal-config-gtasks.c | 4 +--
.../cal-config-google/e-google-chooser-button.c | 5 ++-
.../cal-config-google/module-cal-config-google.c | 4 +--
.../cal-config-local/evolution-cal-config-local.c | 3 +-
.../evolution-cal-config-weather.c | 3 +-
.../evolution-cal-config-webcal.c | 3 +-
modules/calendar/e-cal-attachment-handler.c | 4 +--
modules/calendar/e-cal-base-shell-backend.c | 4 +--
modules/calendar/e-cal-base-shell-content.c | 4 +--
modules/calendar/e-cal-base-shell-sidebar.c | 4 +--
modules/calendar/e-cal-base-shell-view.c | 4 +--
modules/calendar/e-cal-config-hook.c | 4 +--
modules/calendar/e-cal-event-hook.c | 4 +--
modules/calendar/e-cal-shell-backend.c | 4 +--
modules/calendar/e-cal-shell-content.c | 4 +--
modules/calendar/e-cal-shell-migrate.c | 4 +--
modules/calendar/e-cal-shell-view-actions.c | 4 +--
modules/calendar/e-cal-shell-view-memopad.c | 4 +--
modules/calendar/e-cal-shell-view-private.c | 4 +--
modules/calendar/e-cal-shell-view-taskpad.c | 4 +--
modules/calendar/e-cal-shell-view.c | 4 +--
modules/calendar/e-calendar-preferences.c | 4 +--
modules/calendar/e-memo-shell-backend.c | 4 +--
modules/calendar/e-memo-shell-content.c | 4 +--
modules/calendar/e-memo-shell-migrate.c | 4 +--
modules/calendar/e-memo-shell-view-actions.c | 4 +--
modules/calendar/e-memo-shell-view-private.c | 4 +--
modules/calendar/e-memo-shell-view.c | 4 +--
modules/calendar/e-task-shell-backend.c | 4 +--
modules/calendar/e-task-shell-content.c | 4 +--
modules/calendar/e-task-shell-migrate.c | 4 +--
modules/calendar/e-task-shell-view-actions.c | 4 +--
modules/calendar/e-task-shell-view-private.c | 4 +--
modules/calendar/e-task-shell-view.c | 4 +--
modules/calendar/evolution-module-calendar.c | 4 +--
modules/composer-autosave/e-autosave-utils.c | 4 +--
modules/composer-autosave/e-composer-autosave.c | 4 +--
modules/composer-autosave/e-composer-registry.c | 5 ++-
modules/itip-formatter/e-mail-formatter-itip.c | 8 ++----
modules/itip-formatter/e-mail-parser-itip.c | 4 +--
modules/itip-formatter/e-mail-part-itip.c | 4 +--
modules/itip-formatter/itip-view.c | 4 +--
modules/mail-config/e-mail-config-google-summary.c | 5 ++-
modules/mail-config/e-mail-config-local-accounts.c | 3 +-
.../mail-config/e-mail-config-remote-accounts.c | 3 +-
.../mail-config/e-mail-config-sendmail-backend.c | 4 +--
modules/mail-config/e-mail-config-smtp-backend.c | 5 ++-
modules/mail-config/e-mail-config-yahoo-summary.c | 5 ++-
modules/mail/e-mail-attachment-handler.c | 4 +--
modules/mail/e-mail-config-hook.c | 4 +--
modules/mail/e-mail-event-hook.c | 4 +--
modules/mail/e-mail-shell-backend.c | 4 +--
modules/mail/e-mail-shell-content.c | 4 +--
modules/mail/e-mail-shell-sidebar.c | 4 +--
modules/mail/e-mail-shell-view-actions.c | 4 +--
modules/mail/e-mail-shell-view-private.c | 4 +--
modules/mail/e-mail-shell-view.c | 4 +--
modules/mail/em-account-prefs.c | 4 +--
modules/mail/em-composer-prefs.c | 4 +--
modules/mail/em-mailer-prefs.c | 4 +--
modules/mail/evolution-module-mail.c | 4 +--
modules/mailto-handler/evolution-mailto-handler.c | 4 +--
modules/mdn/evolution-mdn.c | 3 +-
modules/offline-alert/evolution-offline-alert.c | 4 +--
modules/plugin-lib/e-plugin-lib.c | 4 +--
modules/plugin-lib/evolution-module-plugin-lib.c | 4 +--
modules/plugin-manager/evolution-plugin-manager.c | 4 +--
.../e-mail-display-popup-prefer-plain.c | 4 +--
modules/prefer-plain/e-mail-parser-prefer-plain.c | 4 +--
.../prefer-plain/evolution-module-prefer-plain.c | 4 +--
modules/prefer-plain/plugin/config-ui.c | 4 +--
modules/settings/e-settings-cal-model.c | 4 +--
modules/settings/e-settings-calendar-item.c | 4 +--
modules/settings/e-settings-calendar-view.c | 4 +--
modules/settings/e-settings-client-cache.c | 2 +-
modules/settings/e-settings-content-editor.c | 4 +--
modules/settings/e-settings-date-edit.c | 4 +--
modules/settings/e-settings-mail-formatter.c | 4 +--
modules/settings/e-settings-mail-reader.c | 4 +--
modules/settings/e-settings-meeting-store.c | 4 +--
.../settings/e-settings-meeting-time-selector.c | 4 +--
modules/settings/e-settings-name-selector-entry.c | 4 +--
modules/settings/e-settings-weekday-chooser.c | 4 +--
modules/spamassassin/evolution-spamassassin.c | 3 +-
modules/startup-wizard/e-mail-config-import-page.c | 5 ++-
.../e-mail-config-import-progress-page.c | 5 ++-
modules/startup-wizard/e-startup-assistant.c | 5 ++-
modules/startup-wizard/evolution-startup-wizard.c | 4 +--
.../e-mail-display-popup-text-highlight.c | 4 +--
.../e-mail-formatter-text-highlight.c | 4 +--
.../text-highlight/e-mail-parser-text-highlight.c | 4 +--
modules/text-highlight/languages.c | 4 +--
.../e-mail-parser-tnef-attachment.c | 4 +--
modules/vcard-inline/e-mail-formatter-vcard.c | 4 +--
modules/vcard-inline/e-mail-parser-vcard.c | 4 +--
modules/vcard-inline/e-mail-part-vcard.c | 5 ++-
modules/webkit-editor/e-webkit-editor-extension.c | 4 +--
modules/webkit-editor/e-webkit-editor.c | 4 +--
.../webkit-editor/evolution-module-webkit-editor.c | 4 +--
.../web-extension/e-composer-dom-functions.c | 4 +--
.../web-extension/e-dialogs-dom-functions.c | 4 +--
.../web-extension/e-editor-dom-functions.c | 4 +--
.../webkit-editor/web-extension/e-editor-page.c | 4 +--
.../web-extension/e-editor-undo-redo-manager.c | 4 +--
.../web-extension/e-editor-web-extension-main.c | 4 +--
.../web-extension/e-editor-web-extension.c | 4 +--
.../webkit-inspector/evolution-webkit-inspector.c | 3 +-
plugins/attachment-reminder/attachment-reminder.c | 4 +--
plugins/bbdb/bbdb.c | 4 +--
plugins/bbdb/gaimbuddies.c | 4 +--
plugins/dbx-import/dbx-importer.c | 4 +--
plugins/email-custom-header/email-custom-header.c | 4 +--
plugins/external-editor/external-editor.c | 4 +--
plugins/face/face.c | 4 +--
plugins/mail-notification/mail-notification.c | 4 +--
plugins/mail-to-task/mail-to-task.c | 4 +--
.../mailing-list-actions/mailing-list-actions.c | 4 +--
plugins/pst-import/pst-importer.c | 4 +--
plugins/publish-calendar/publish-calendar.c | 4 +--
plugins/publish-calendar/publish-format-fb.c | 4 +--
plugins/publish-calendar/publish-format-ical.c | 4 +--
plugins/publish-calendar/publish-location.c | 4 +--
plugins/publish-calendar/url-editor-dialog.c | 4 +--
plugins/save-calendar/csv-format.c | 4 +--
plugins/save-calendar/ical-format.c | 4 +--
plugins/save-calendar/rdf-format.c | 4 +--
plugins/save-calendar/save-calendar.c | 4 +--
plugins/templates/e-templates-store.c | 4 +--
plugins/templates/templates.c | 4 +--
shell/e-convert-local-mail.c | 4 +--
shell/e-shell-backend.c | 4 +--
shell/e-shell-content.c | 4 +--
shell/e-shell-migrate.c | 4 +--
shell/e-shell-searchbar.c | 4 +--
shell/e-shell-sidebar.c | 4 +--
shell/e-shell-switcher.c | 4 +--
shell/e-shell-taskbar.c | 4 +--
shell/e-shell-utils.c | 4 +--
shell/e-shell-view.c | 4 +--
shell/e-shell-window-actions.c | 4 +--
shell/e-shell-window-private.c | 4 +--
shell/e-shell-window.c | 4 +--
shell/e-shell.c | 4 +--
shell/killev.c | 2 +-
shell/main.c | 2 +-
smime/gui/ca-trust-dialog.c | 4 +--
smime/gui/cert-trust-dialog.c | 4 +--
smime/gui/certificate-manager.c | 4 +--
smime/gui/component.c | 4 +--
smime/gui/e-cert-selector.c | 4 +--
smime/lib/e-cert-db.c | 5 +--
smime/lib/e-cert-trust.c | 5 +--
smime/lib/e-cert.c | 5 +--
smime/lib/e-pkcs12.c | 5 +--
web-extensions/e-dom-utils.c | 4 +--
web-extensions/e-web-extension-main.c | 4 +--
web-extensions/e-web-extension.c | 4 +--
698 files changed, 907 insertions(+), 1972 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6eeecd3..ddbb161 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -646,10 +646,8 @@ if(WITH_GLADE_CATALOG)
pkg_check_modules_for_option(WITH_GLADE_CATALOG "Glade 3 catalog files" GLADEUI
gladeui-2.0>=${gladeui_minimum_version})
endif(WITH_GLADE_CATALOG)
-# Generate the config.h file
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/config.h)
-
-add_definitions(-DHAVE_CONFIG_H=1)
+# Generate the ${PROJECT_NAME}-config.h file
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}-config.h)
print_build_options()
diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
index 2754312..076365d 100644
--- a/addressbook/gui/contact-editor/e-contact-editor-fullname.c
+++ b/addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c
b/addressbook/gui/contact-editor/e-contact-editor.c
index 4704528..19b97a1 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "eab-editor.h"
#include "e-contact-editor.h"
diff --git a/addressbook/gui/contact-editor/e-contact-quick-add.c
b/addressbook/gui/contact-editor/e-contact-quick-add.c
index 2830508..f975083 100644
--- a/addressbook/gui/contact-editor/e-contact-quick-add.c
+++ b/addressbook/gui/contact-editor/e-contact-quick-add.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index 3dd4ed5..c1ed5b0 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index f00812a..e93d410 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <gtk/gtk.h>
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 52c86b3..5e00836 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-editor.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-editor.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-contact-list-editor.h"
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 e8c273c..925d28b 100644
--- a/addressbook/gui/contact-list-editor/e-contact-list-model.c
+++ b/addressbook/gui/contact-list-editor/e-contact-list-model.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/addressbook/gui/widgets/e-addressbook-model.c b/addressbook/gui/widgets/e-addressbook-model.c
index 95fc3af..9eb38fe 100644
--- a/addressbook/gui/widgets/e-addressbook-model.c
+++ b/addressbook/gui/widgets/e-addressbook-model.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
index a531e33..220a1d4 100644
--- a/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -15,9 +15,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/addressbook/gui/widgets/e-addressbook-selector.c
b/addressbook/gui/widgets/e-addressbook-selector.c
index 2ff8c15..80f0e2d 100644
--- a/addressbook/gui/widgets/e-addressbook-selector.c
+++ b/addressbook/gui/widgets/e-addressbook-selector.c
@@ -16,9 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-addressbook-selector.h"
diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c
b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 36e71b3..3a953fa 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 463e49f..7f78faa 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/addressbook/gui/widgets/e-contact-map-window.c b/addressbook/gui/widgets/e-contact-map-window.c
index caa21d6..63103c4 100644
--- a/addressbook/gui/widgets/e-contact-map-window.c
+++ b/addressbook/gui/widgets/e-contact-map-window.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#ifdef ENABLE_CONTACT_MAPS
diff --git a/addressbook/gui/widgets/e-contact-map.c b/addressbook/gui/widgets/e-contact-map.c
index 963a58e..3b72322 100644
--- a/addressbook/gui/widgets/e-contact-map.c
+++ b/addressbook/gui/widgets/e-contact-map.c
@@ -16,9 +16,7 @@
* Copyright (C) 2011 Dan Vratil <dvratil redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#ifdef ENABLE_CONTACT_MAPS
diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c
index c6d8dff..eee477c 100644
--- a/addressbook/gui/widgets/e-minicard-label.c
+++ b/addressbook/gui/widgets/e-minicard-label.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-minicard-label.h"
diff --git a/addressbook/gui/widgets/e-minicard-view-widget.c
b/addressbook/gui/widgets/e-minicard-view-widget.c
index 4ed6161..7ca5d93 100644
--- a/addressbook/gui/widgets/e-minicard-view-widget.c
+++ b/addressbook/gui/widgets/e-minicard-view-widget.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c
index a7b1f61..8623294 100644
--- a/addressbook/gui/widgets/e-minicard-view.c
+++ b/addressbook/gui/widgets/e-minicard-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-minicard-view.h"
diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c
index 4c17ba7..95bae88 100644
--- a/addressbook/gui/widgets/e-minicard.c
+++ b/addressbook/gui/widgets/e-minicard.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-minicard.h"
diff --git a/addressbook/gui/widgets/ea-addressbook-view.c b/addressbook/gui/widgets/ea-addressbook-view.c
index f7324e5..3982458 100644
--- a/addressbook/gui/widgets/ea-addressbook-view.c
+++ b/addressbook/gui/widgets/ea-addressbook-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
#include "ea-addressbook-view.h"
diff --git a/addressbook/gui/widgets/ea-addressbook.c b/addressbook/gui/widgets/ea-addressbook.c
index 60d78c1..91f9f07 100644
--- a/addressbook/gui/widgets/ea-addressbook.c
+++ b/addressbook/gui/widgets/ea-addressbook.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-util/e-util.h"
diff --git a/addressbook/gui/widgets/ea-minicard-view.c b/addressbook/gui/widgets/ea-minicard-view.c
index ae130d1..d14a719 100644
--- a/addressbook/gui/widgets/ea-minicard-view.c
+++ b/addressbook/gui/widgets/ea-minicard-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/addressbook/gui/widgets/ea-minicard.c b/addressbook/gui/widgets/ea-minicard.c
index ad2e1f1..28153ca 100644
--- a/addressbook/gui/widgets/ea-minicard.c
+++ b/addressbook/gui/widgets/ea-minicard.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/addressbook/gui/widgets/eab-config.c b/addressbook/gui/widgets/eab-config.c
index bffc6c8..45c6417 100644
--- a/addressbook/gui/widgets/eab-config.c
+++ b/addressbook/gui/widgets/eab-config.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "eab-config.h"
diff --git a/addressbook/gui/widgets/eab-contact-compare.c b/addressbook/gui/widgets/eab-contact-compare.c
index 21648af..c4ac180 100644
--- a/addressbook/gui/widgets/eab-contact-compare.c
+++ b/addressbook/gui/widgets/eab-contact-compare.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/addressbook/gui/widgets/eab-contact-display.c b/addressbook/gui/widgets/eab-contact-display.c
index d40e867..20801ab 100644
--- a/addressbook/gui/widgets/eab-contact-display.c
+++ b/addressbook/gui/widgets/eab-contact-display.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "eab-contact-display.h"
diff --git a/addressbook/gui/widgets/eab-contact-formatter.c b/addressbook/gui/widgets/eab-contact-formatter.c
index 198f417..eaf842d 100644
--- a/addressbook/gui/widgets/eab-contact-formatter.c
+++ b/addressbook/gui/widgets/eab-contact-formatter.c
@@ -15,9 +15,8 @@
*
*/
-#include "eab-contact-formatter.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
@@ -26,6 +25,8 @@
#include "eab-book-util.h"
#include "eab-gui-util.h"
+#include "eab-contact-formatter.h"
+
#define EAB_CONTACT_FORMATTER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EAB_TYPE_CONTACT_FORMATTER, EABContactFormatterPrivate))
diff --git a/addressbook/gui/widgets/eab-contact-merging.c b/addressbook/gui/widgets/eab-contact-merging.c
index 80ce637..515e98a 100644
--- a/addressbook/gui/widgets/eab-contact-merging.c
+++ b/addressbook/gui/widgets/eab-contact-merging.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "eab-contact-merging.h"
#include "eab-contact-compare.h"
diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c
index d457558..cd9a0d1 100644
--- a/addressbook/gui/widgets/eab-gui-util.c
+++ b/addressbook/gui/widgets/eab-gui-util.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <unistd.h>
#include <fcntl.h>
diff --git a/addressbook/gui/widgets/gal-view-minicard.c b/addressbook/gui/widgets/gal-view-minicard.c
index 4490dec..2e185ee 100644
--- a/addressbook/gui/widgets/gal-view-minicard.c
+++ b/addressbook/gui/widgets/gal-view-minicard.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libxml/parser.h>
diff --git a/addressbook/importers/evolution-csv-importer.c b/addressbook/importers/evolution-csv-importer.c
index e98dc54..4a674cc 100644
--- a/addressbook/importers/evolution-csv-importer.c
+++ b/addressbook/importers/evolution-csv-importer.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/addressbook/importers/evolution-ldif-importer.c b/addressbook/importers/evolution-ldif-importer.c
index 2d0454d..d8d79a2 100644
--- a/addressbook/importers/evolution-ldif-importer.c
+++ b/addressbook/importers/evolution-ldif-importer.c
@@ -28,9 +28,7 @@
* Made re-entrant, converted to eplugin, Michael Zucchi <notzed ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/addressbook/importers/evolution-vcard-importer.c
b/addressbook/importers/evolution-vcard-importer.c
index 9903679..636d6a8 100644
--- a/addressbook/importers/evolution-vcard-importer.c
+++ b/addressbook/importers/evolution-vcard-importer.c
@@ -23,9 +23,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/addressbook/printing/e-contact-print.c b/addressbook/printing/e-contact-print.c
index 93ad923..352ae90 100644
--- a/addressbook/printing/e-contact-print.c
+++ b/addressbook/printing/e-contact-print.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <sys/types.h>
diff --git a/addressbook/util/eab-book-util.c b/addressbook/util/eab-book-util.c
index 18c7ec0..bd6d218 100644
--- a/addressbook/util/eab-book-util.c
+++ b/addressbook/util/eab-book-util.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
#include <string.h>
diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c
index 84df985..a8a6d68 100644
--- a/calendar/alarm-notify/alarm-notify-dialog.c
+++ b/calendar/alarm-notify/alarm-notify-dialog.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c
index 50621f1..616dabf 100644
--- a/calendar/alarm-notify/alarm-notify.c
+++ b/calendar/alarm-notify/alarm-notify.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <camel/camel.h>
diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c
index 5539c5c..50a9aa3 100644
--- a/calendar/alarm-notify/alarm-queue.c
+++ b/calendar/alarm-notify/alarm-queue.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/calendar/alarm-notify/alarm.c b/calendar/alarm-notify/alarm.c
index 64e5b7e..a4cebf6 100644
--- a/calendar/alarm-notify/alarm.c
+++ b/calendar/alarm-notify/alarm.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <unistd.h>
#include <time.h>
diff --git a/calendar/alarm-notify/config-data.c b/calendar/alarm-notify/config-data.c
index 4c0fa72..a2cc71a 100644
--- a/calendar/alarm-notify/config-data.c
+++ b/calendar/alarm-notify/config-data.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <e-util/e-util.h>
diff --git a/calendar/alarm-notify/notify-main.c b/calendar/alarm-notify/notify-main.c
index 26538da..c827f15 100644
--- a/calendar/alarm-notify/notify-main.c
+++ b/calendar/alarm-notify/notify-main.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/calendar/alarm-notify/util.c b/calendar/alarm-notify/util.c
index a50b5b3..227f561 100644
--- a/calendar/alarm-notify/util.c
+++ b/calendar/alarm-notify/util.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
#include "e-util/e-util.h"
diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c
index 0a0d238..b79784b 100644
--- a/calendar/gui/calendar-config.c
+++ b/calendar/gui/calendar-config.c
@@ -24,9 +24,7 @@
* calendar-config.c - functions to load/save/get/set user settings.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <time.h>
#include <string.h>
diff --git a/calendar/gui/comp-util.c b/calendar/gui/comp-util.c
index f37fa33..4132dba 100644
--- a/calendar/gui/comp-util.c
+++ b/calendar/gui/comp-util.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <time.h>
diff --git a/calendar/gui/e-alarm-list.c b/calendar/gui/e-alarm-list.c
index 353b61f..61234db 100644
--- a/calendar/gui/e-alarm-list.c
+++ b/calendar/gui/e-alarm-list.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 1653819..d185251 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-component-preview.h"
diff --git a/calendar/gui/e-cal-config.c b/calendar/gui/e-cal-config.c
index 15fda00..9d0649f 100644
--- a/calendar/gui/e-cal-config.c
+++ b/calendar/gui/e-cal-config.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-cal-data-model-subscriber.c b/calendar/gui/e-cal-data-model-subscriber.c
index b08b0c1..141a5cb 100644
--- a/calendar/gui/e-cal-data-model-subscriber.c
+++ b/calendar/gui/e-cal-data-model-subscriber.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-data-model-subscriber.h"
diff --git a/calendar/gui/e-cal-data-model.c b/calendar/gui/e-cal-data-model.c
index 9618c1c..4f83a7b 100644
--- a/calendar/gui/e-cal-data-model.c
+++ b/calendar/gui/e-cal-data-model.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-cal-dialogs.c b/calendar/gui/e-cal-dialogs.c
index 10e8de4..c1a8509 100644
--- a/calendar/gui/e-cal-dialogs.c
+++ b/calendar/gui/e-cal-dialogs.c
@@ -19,9 +19,7 @@
* Federico Mena-Quintero <federico ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-cal-event.c b/calendar/gui/e-cal-event.c
index 6a97248..76d914e 100644
--- a/calendar/gui/e-cal-event.c
+++ b/calendar/gui/e-cal-event.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-event.h"
diff --git a/calendar/gui/e-cal-list-view.c b/calendar/gui/e-cal-list-view.c
index 1cbd114..2bd3e28 100644
--- a/calendar/gui/e-cal-list-view.c
+++ b/calendar/gui/e-cal-list-view.c
@@ -19,9 +19,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-list-view.h"
#include "ea-calendar.h"
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index e5e969a..e5dd927 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index 0b00768..f7ee2b0 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index c0649ec..02ce42f 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <string.h>
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 19c649d..89f3f82 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-cal-ops.c b/calendar/gui/e-cal-ops.c
index b66acf2..d729060 100644
--- a/calendar/gui/e-cal-ops.c
+++ b/calendar/gui/e-cal-ops.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 539e4d4..4b44c22 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <time.h>
diff --git a/calendar/gui/e-cell-date-edit-text.c b/calendar/gui/e-cell-date-edit-text.c
index 103e27d..2c70434 100644
--- a/calendar/gui/e-cell-date-edit-text.c
+++ b/calendar/gui/e-cell-date-edit-text.c
@@ -20,9 +20,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/time.h>
#include <time.h>
diff --git a/calendar/gui/e-comp-editor-event.c b/calendar/gui/e-comp-editor-event.c
index 78a43dc..9e61347 100644
--- a/calendar/gui/e-comp-editor-event.c
+++ b/calendar/gui/e-comp-editor-event.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-comp-editor-memo.c b/calendar/gui/e-comp-editor-memo.c
index 2114c0d..c2bad16 100644
--- a/calendar/gui/e-comp-editor-memo.c
+++ b/calendar/gui/e-comp-editor-memo.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-comp-editor-page-attachments.c b/calendar/gui/e-comp-editor-page-attachments.c
index 5910c7a..c3400b7 100644
--- a/calendar/gui/e-comp-editor-page-attachments.c
+++ b/calendar/gui/e-comp-editor-page-attachments.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gstdio.h>
diff --git a/calendar/gui/e-comp-editor-page-general.c b/calendar/gui/e-comp-editor-page-general.c
index ab8f63a..90f763a 100644
--- a/calendar/gui/e-comp-editor-page-general.c
+++ b/calendar/gui/e-comp-editor-page-general.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-comp-editor-page-recurrence.c b/calendar/gui/e-comp-editor-page-recurrence.c
index 74621e4..7f302df 100644
--- a/calendar/gui/e-comp-editor-page-recurrence.c
+++ b/calendar/gui/e-comp-editor-page-recurrence.c
@@ -22,9 +22,7 @@
* Hans Petter Jansson <hpj ximiman com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-comp-editor-page-reminders.c b/calendar/gui/e-comp-editor-page-reminders.c
index 9ceb4ec..e64154d 100644
--- a/calendar/gui/e-comp-editor-page-reminders.c
+++ b/calendar/gui/e-comp-editor-page-reminders.c
@@ -22,9 +22,7 @@
* Hans Petter Jansson <hpj ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-comp-editor-page-schedule.c b/calendar/gui/e-comp-editor-page-schedule.c
index 728b891..dc44ea6 100644
--- a/calendar/gui/e-comp-editor-page-schedule.c
+++ b/calendar/gui/e-comp-editor-page-schedule.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-comp-editor-page.c b/calendar/gui/e-comp-editor-page.c
index 8cf9fb5..018d21b 100644
--- a/calendar/gui/e-comp-editor-page.c
+++ b/calendar/gui/e-comp-editor-page.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-comp-editor-property-part.c b/calendar/gui/e-comp-editor-property-part.c
index 80fbe0c..2a872df 100644
--- a/calendar/gui/e-comp-editor-property-part.c
+++ b/calendar/gui/e-comp-editor-property-part.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib-object.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-comp-editor-property-parts.c b/calendar/gui/e-comp-editor-property-parts.c
index 066b738..adbec6d 100644
--- a/calendar/gui/e-comp-editor-property-parts.c
+++ b/calendar/gui/e-comp-editor-property-parts.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/e-comp-editor-task.c b/calendar/gui/e-comp-editor-task.c
index 90f8917..2f155eb 100644
--- a/calendar/gui/e-comp-editor-task.c
+++ b/calendar/gui/e-comp-editor-task.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-comp-editor.c b/calendar/gui/e-comp-editor.c
index c33f9e6..3c2d570 100644
--- a/calendar/gui/e-comp-editor.c
+++ b/calendar/gui/e-comp-editor.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-date-time-list.c b/calendar/gui/e-date-time-list.c
index 47f9ab5..681e0a2 100644
--- a/calendar/gui/e-date-time-list.c
+++ b/calendar/gui/e-date-time-list.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-date-time-list.h"
diff --git a/calendar/gui/e-day-view-layout.c b/calendar/gui/e-day-view-layout.c
index c891242..65405b0 100644
--- a/calendar/gui/e-day-view-layout.c
+++ b/calendar/gui/e-day-view-layout.c
@@ -25,9 +25,7 @@
* used for printing.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-day-view-layout.h"
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 5f6ee1f..a0bca0e 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -24,9 +24,7 @@
* data in the main Day/Work Week display.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-day-view-main-item.h"
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index f2bafbd..6af16b6 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -20,9 +20,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 74fedd6..58a8aa6 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -23,9 +23,7 @@
* EDayViewTopItem - displays the top part of the Day/Work Week calendar view.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index 555319a..aec869b 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -21,9 +21,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-day-view.h"
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 525e499..abca018 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index 63755f4..08d0037 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 5bd652f..ae2012b 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gio/gio.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-meeting-time-sel-item.c b/calendar/gui/e-meeting-time-sel-item.c
index f220182..dfc3874 100644
--- a/calendar/gui/e-meeting-time-sel-item.c
+++ b/calendar/gui/e-meeting-time-sel-item.c
@@ -22,9 +22,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <time.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-meeting-time-sel.c b/calendar/gui/e-meeting-time-sel.c
index bd8a4bc..847818f 100644
--- a/calendar/gui/e-meeting-time-sel.c
+++ b/calendar/gui/e-meeting-time-sel.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-meeting-time-sel.h"
diff --git a/calendar/gui/e-meeting-utils.c b/calendar/gui/e-meeting-utils.c
index 4726673..e7df2f8 100644
--- a/calendar/gui/e-meeting-utils.c
+++ b/calendar/gui/e-meeting-utils.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <libedataserver/libedataserver.h>
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index f4309ee..71922da 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -25,9 +25,7 @@
* EMemoTable - displays the ECalComponent objects in a table (an ETable).
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-memo-table.h"
diff --git a/calendar/gui/e-month-view.c b/calendar/gui/e-month-view.c
index 265d974..6c45c42 100644
--- a/calendar/gui/e-month-view.c
+++ b/calendar/gui/e-month-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-month-view.h"
diff --git a/calendar/gui/e-select-names-editable.c b/calendar/gui/e-select-names-editable.c
index e0bb7b1..d57e7ce 100644
--- a/calendar/gui/e-select-names-editable.c
+++ b/calendar/gui/e-select-names-editable.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff --git a/calendar/gui/e-select-names-renderer.c b/calendar/gui/e-select-names-renderer.c
index 1be7aef..03bdc44 100644
--- a/calendar/gui/e-select-names-renderer.c
+++ b/calendar/gui/e-select-names-renderer.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-select-names-editable.h"
#include "e-select-names-renderer.h"
diff --git a/calendar/gui/e-send-options-utils.c b/calendar/gui/e-send-options-utils.c
index 6afef2f..122af98 100644
--- a/calendar/gui/e-send-options-utils.c
+++ b/calendar/gui/e-send-options-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-send-options-utils.h"
diff --git a/calendar/gui/e-task-table.c b/calendar/gui/e-task-table.c
index 2216e06..5160893 100644
--- a/calendar/gui/e-task-table.c
+++ b/calendar/gui/e-task-table.c
@@ -24,9 +24,7 @@
* ETaskTable - displays the ECalComponent objects in a table (an ETable).
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-task-table.h"
diff --git a/calendar/gui/e-timezone-entry.c b/calendar/gui/e-timezone-entry.c
index 3dd84b5..3757528 100644
--- a/calendar/gui/e-timezone-entry.c
+++ b/calendar/gui/e-timezone-entry.c
@@ -27,9 +27,7 @@
* timezone.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-timezone-entry.h"
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index dadd940..ffde31b 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -25,9 +25,7 @@
* edit the text.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-week-view-event-item.h"
diff --git a/calendar/gui/e-week-view-layout.c b/calendar/gui/e-week-view-layout.c
index ca64930..818765f 100644
--- a/calendar/gui/e-week-view-layout.c
+++ b/calendar/gui/e-week-view-layout.c
@@ -20,9 +20,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-week-view-layout.h"
#include "calendar-config.h"
diff --git a/calendar/gui/e-week-view-main-item.c b/calendar/gui/e-week-view-main-item.c
index cf69529..82ddf4e 100644
--- a/calendar/gui/e-week-view-main-item.c
+++ b/calendar/gui/e-week-view-main-item.c
@@ -20,9 +20,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/calendar/gui/e-week-view-titles-item.c b/calendar/gui/e-week-view-titles-item.c
index 23a41be..746c2a3 100644
--- a/calendar/gui/e-week-view-titles-item.c
+++ b/calendar/gui/e-week-view-titles-item.c
@@ -20,9 +20,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <e-util/e-util.h>
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index ec9b695..c7e5789 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -24,9 +24,7 @@
* EWeekView - displays the Week & Month views of the calendar.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-week-view.h"
diff --git a/calendar/gui/e-weekday-chooser.c b/calendar/gui/e-weekday-chooser.c
index 3e4d1b7..eb49d1d 100644
--- a/calendar/gui/e-weekday-chooser.c
+++ b/calendar/gui/e-weekday-chooser.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-weekday-chooser.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <gtk/gtk.h>
@@ -27,6 +26,8 @@
#include <libgnomecanvas/libgnomecanvas.h>
#include <e-util/e-util.h>
+#include "e-weekday-chooser.h"
+
#define PADDING 2
#define E_WEEKDAY_CHOOSER_GET_PRIVATE(obj) \
diff --git a/calendar/gui/ea-cal-view-event.c b/calendar/gui/ea-cal-view-event.c
index 1c915cd..6ab80cb 100644
--- a/calendar/gui/ea-cal-view-event.c
+++ b/calendar/gui/ea-cal-view-event.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/calendar/gui/ea-cal-view.c b/calendar/gui/ea-cal-view.c
index 3c0d238..5af10ba 100644
--- a/calendar/gui/ea-cal-view.c
+++ b/calendar/gui/ea-cal-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-cal-view.h"
#include "ea-calendar-helpers.h"
diff --git a/calendar/gui/ea-calendar-helpers.c b/calendar/gui/ea-calendar-helpers.c
index a60751d..f45b4bd 100644
--- a/calendar/gui/ea-calendar-helpers.c
+++ b/calendar/gui/ea-calendar-helpers.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-calendar-helpers.h"
#include "ea-cal-view-event.h"
diff --git a/calendar/gui/ea-calendar.c b/calendar/gui/ea-calendar.c
index ce80773..c994644 100644
--- a/calendar/gui/ea-calendar.c
+++ b/calendar/gui/ea-calendar.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libgnomecanvas/libgnomecanvas.h>
diff --git a/calendar/gui/ea-day-view-cell.c b/calendar/gui/ea-day-view-cell.c
index ee9d4e6..aac4f22 100644
--- a/calendar/gui/ea-day-view-cell.c
+++ b/calendar/gui/ea-day-view-cell.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-day-view-cell.h"
#include "ea-day-view-main-item.h"
diff --git a/calendar/gui/ea-day-view-main-item.c b/calendar/gui/ea-day-view-main-item.c
index ecd8a5f..00e8cd2 100644
--- a/calendar/gui/ea-day-view-main-item.c
+++ b/calendar/gui/ea-day-view-main-item.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/calendar/gui/ea-day-view.c b/calendar/gui/ea-day-view.c
index 3331148..1022c01 100644
--- a/calendar/gui/ea-day-view.c
+++ b/calendar/gui/ea-day-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-day-view.h"
#include "ea-cal-view-event.h"
diff --git a/calendar/gui/ea-jump-button.c b/calendar/gui/ea-jump-button.c
index d3176b0..bc5f86b 100644
--- a/calendar/gui/ea-jump-button.c
+++ b/calendar/gui/ea-jump-button.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-jump-button.h"
#include "ea-calendar-helpers.h"
diff --git a/calendar/gui/ea-week-view-cell.c b/calendar/gui/ea-week-view-cell.c
index 19f076b..f5747dd 100644
--- a/calendar/gui/ea-week-view-cell.c
+++ b/calendar/gui/ea-week-view-cell.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-week-view-cell.h"
#include "ea-week-view-main-item.h"
diff --git a/calendar/gui/ea-week-view-main-item.c b/calendar/gui/ea-week-view-main-item.c
index d70e7ef..7002b01 100644
--- a/calendar/gui/ea-week-view-main-item.c
+++ b/calendar/gui/ea-week-view-main-item.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-week-view-main-item.h"
diff --git a/calendar/gui/ea-week-view.c b/calendar/gui/ea-week-view.c
index 45ce69a..3f292d7 100644
--- a/calendar/gui/ea-week-view.c
+++ b/calendar/gui/ea-week-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-week-view.h"
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index c873e99..49464e5 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <time.h>
#include <glib/gi18n-lib.h>
diff --git a/calendar/gui/misc.c b/calendar/gui/misc.c
index eba20be..ba4c52e 100644
--- a/calendar/gui/misc.c
+++ b/calendar/gui/misc.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <time.h>
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index dac6bdb..49276b9 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -23,9 +23,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "print.h"
diff --git a/calendar/gui/tag-calendar.c b/calendar/gui/tag-calendar.c
index e507aa9..b5563be 100644
--- a/calendar/gui/tag-calendar.c
+++ b/calendar/gui/tag-calendar.c
@@ -23,9 +23,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "shell/e-shell.h"
#include "calendar-config.h"
diff --git a/calendar/importers/icalendar-importer.c b/calendar/importers/icalendar-importer.c
index af47264..9044678 100644
--- a/calendar/importers/icalendar-importer.c
+++ b/calendar/importers/icalendar-importer.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/composer/e-composer-actions.c b/composer/e-composer-actions.c
index bafbc72..5d88b76 100644
--- a/composer/e-composer-actions.c
+++ b/composer/e-composer-actions.c
@@ -15,9 +15,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-actions.h"
#include "e-composer-private.h"
diff --git a/composer/e-composer-from-header.c b/composer/e-composer-from-header.c
index ecc2985..dd530be 100644
--- a/composer/e-composer-from-header.c
+++ b/composer/e-composer-from-header.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/composer/e-composer-header-table.c b/composer/e-composer-header-table.c
index 40b75aa..6b952c4 100644
--- a/composer/e-composer-header-table.c
+++ b/composer/e-composer-header-table.c
@@ -14,9 +14,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-header-table.h"
diff --git a/composer/e-composer-header.c b/composer/e-composer-header.c
index d114297..7ea39cc 100644
--- a/composer/e-composer-header.c
+++ b/composer/e-composer-header.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-header.h"
diff --git a/composer/e-composer-name-header.c b/composer/e-composer-name-header.c
index d99b325..669a52f 100644
--- a/composer/e-composer-name-header.c
+++ b/composer/e-composer-name-header.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-msg-composer.h"
#include "e-composer-name-header.h"
diff --git a/composer/e-composer-post-header.c b/composer/e-composer-post-header.c
index 4c93ffd..e7f53b0 100644
--- a/composer/e-composer-post-header.c
+++ b/composer/e-composer-post-header.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-post-header.h"
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 2b20b28..91aef51 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -16,9 +16,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-private.h"
#include "e-composer-from-header.h"
diff --git a/composer/e-composer-spell-header.c b/composer/e-composer-spell-header.c
index b2d2dfa..5550fd0 100644
--- a/composer/e-composer-spell-header.c
+++ b/composer/e-composer-spell-header.c
@@ -14,9 +14,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-spell-header.h"
diff --git a/composer/e-composer-text-header.c b/composer/e-composer-text-header.c
index f0bd6a3..78e1e84 100644
--- a/composer/e-composer-text-header.c
+++ b/composer/e-composer-text-header.c
@@ -18,9 +18,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-text-header.h"
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 6bc7efc..cb89c25 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -23,9 +23,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/config.h.in b/config.h.in
index a9c379c..d7897a5 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-/* config.h generated by CMake */
+/* @PROJECT_NAME@-config.h generated by CMake */
/* Name of the package */
#define PACKAGE "@PROJECT_NAME@"
diff --git a/e-util/e-action-combo-box.c b/e-util/e-action-combo-box.c
index 33d678a..c69e8fa 100644
--- a/e-util/e-action-combo-box.c
+++ b/e-util/e-action-combo-box.c
@@ -16,9 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-action-combo-box.h"
#include "e-misc-utils.h"
diff --git a/e-util/e-activity-bar.c b/e-util/e-activity-bar.c
index 33145e5..0d14871 100644
--- a/e-util/e-activity-bar.c
+++ b/e-util/e-activity-bar.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
diff --git a/e-util/e-activity-proxy.c b/e-util/e-activity-proxy.c
index 33aa7f0..347b70d 100644
--- a/e-util/e-activity-proxy.c
+++ b/e-util/e-activity-proxy.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/e-util/e-activity.c b/e-util/e-activity.c
index 010a114..8adc210 100644
--- a/e-util/e-activity.c
+++ b/e-util/e-activity.c
@@ -27,9 +27,7 @@
* button which is linked to a #GCancellable.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-activity.h"
diff --git a/e-util/e-alert-bar.c b/e-util/e-alert-bar.c
index 56cdf21..9acd9dd 100644
--- a/e-util/e-alert-bar.c
+++ b/e-util/e-alert-bar.c
@@ -15,12 +15,12 @@
*
*/
-#include "e-alert-bar.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "e-dialog-widgets.h"
+#include "e-alert-bar.h"
#define E_ALERT_BAR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index d972c2b..d239257 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -20,9 +20,7 @@
* Copyright (C) 2009 Intel Corporation
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/e-util/e-alert-sink.c b/e-util/e-alert-sink.c
index e70f57d..9a826fa 100644
--- a/e-util/e-alert-sink.c
+++ b/e-util/e-alert-sink.c
@@ -24,9 +24,7 @@
* usually by displaying them to the user.
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
diff --git a/e-util/e-alert.c b/e-util/e-alert.c
index f83f87c..c8823b8 100644
--- a/e-util/e-alert.c
+++ b/e-util/e-alert.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <sys/types.h>
diff --git a/e-util/e-attachment-bar.c b/e-util/e-attachment-bar.c
index e5da99f..fbe0add 100644
--- a/e-util/e-attachment-bar.c
+++ b/e-util/e-attachment-bar.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-bar.h"
diff --git a/e-util/e-attachment-dialog.c b/e-util/e-attachment-dialog.c
index 0f71bc9..e34e8d2 100644
--- a/e-util/e-attachment-dialog.c
+++ b/e-util/e-attachment-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-dialog.h"
diff --git a/e-util/e-attachment-handler-image.c b/e-util/e-attachment-handler-image.c
index 5de55e9..4edb9c5 100644
--- a/e-util/e-attachment-handler-image.c
+++ b/e-util/e-attachment-handler-image.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-handler-image.h"
diff --git a/e-util/e-attachment-handler.c b/e-util/e-attachment-handler.c
index 7898a60..c81a616 100644
--- a/e-util/e-attachment-handler.c
+++ b/e-util/e-attachment-handler.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-handler.h"
diff --git a/e-util/e-attachment-icon-view.c b/e-util/e-attachment-icon-view.c
index cd0bc52..1f33644 100644
--- a/e-util/e-attachment-icon-view.c
+++ b/e-util/e-attachment-icon-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-icon-view.h"
diff --git a/e-util/e-attachment-paned.c b/e-util/e-attachment-paned.c
index ee96a9a..71242ab 100644
--- a/e-util/e-attachment-paned.c
+++ b/e-util/e-attachment-paned.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-paned.h"
diff --git a/e-util/e-attachment-store.c b/e-util/e-attachment-store.c
index 05e4809..e1191fc 100644
--- a/e-util/e-attachment-store.c
+++ b/e-util/e-attachment-store.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-store.h"
#include "e-icon-factory.h"
diff --git a/e-util/e-attachment-tree-view.c b/e-util/e-attachment-tree-view.c
index 9f20a7d..8d19eb5 100644
--- a/e-util/e-attachment-tree-view.c
+++ b/e-util/e-attachment-tree-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-tree-view.h"
diff --git a/e-util/e-attachment-view.c b/e-util/e-attachment-view.c
index 00b17df..b713a5b 100644
--- a/e-util/e-attachment-view.c
+++ b/e-util/e-attachment-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment-view.h"
diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c
index 21dec66..2c3ec5b 100644
--- a/e-util/e-attachment.c
+++ b/e-util/e-attachment.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-attachment.h"
diff --git a/e-util/e-bit-array.c b/e-util/e-bit-array.c
index 8e70095..0f87e43 100644
--- a/e-util/e-bit-array.c
+++ b/e-util/e-bit-array.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-book-source-config.c b/e-util/e-book-source-config.c
index a4f8ea1..4899fc6 100644
--- a/e-util/e-book-source-config.c
+++ b/e-util/e-book-source-config.c
@@ -15,9 +15,10 @@
*
*/
+#include "evolution-config.h"
+
#include "e-book-source-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#define E_BOOK_SOURCE_CONFIG_GET_PRIVATE(obj) \
diff --git a/e-util/e-buffer-tagger.c b/e-util/e-buffer-tagger.c
index 91c9ea8..77d82f4 100644
--- a/e-util/e-buffer-tagger.c
+++ b/e-util/e-buffer-tagger.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff --git a/e-util/e-cal-source-config.c b/e-util/e-cal-source-config.c
index d90d93f..833f580 100644
--- a/e-util/e-cal-source-config.c
+++ b/e-util/e-cal-source-config.c
@@ -15,12 +15,12 @@
*
*/
-#include "e-cal-source-config.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "e-misc-utils.h"
+#include "e-cal-source-config.h"
#define E_CAL_SOURCE_CONFIG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/e-util/e-calendar-item.c b/e-util/e-calendar-item.c
index e63a714..fc6d8af 100644
--- a/e-util/e-calendar-item.c
+++ b/e-util/e-calendar-item.c
@@ -20,9 +20,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libebackend/libebackend.h>
diff --git a/e-util/e-calendar.c b/e-util/e-calendar.c
index f429ec0..706278c 100644
--- a/e-util/e-calendar.c
+++ b/e-util/e-calendar.c
@@ -28,9 +28,8 @@
* to got to the current day.
*/
-#include "e-calendar.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
@@ -39,6 +38,7 @@
#include <libgnomecanvas/gnome-canvas-widget.h>
#include "e-misc-utils.h"
+#include "e-calendar.h"
#define E_CALENDAR_SMALL_FONT_PTSIZE 6
diff --git a/e-util/e-canvas-background.c b/e-util/e-canvas-background.c
index b7612ca..36af28a 100644
--- a/e-util/e-canvas-background.c
+++ b/e-util/e-canvas-background.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-canvas-background.h"
diff --git a/e-util/e-canvas-utils.c b/e-util/e-canvas-utils.c
index fa753c5..79c2090 100644
--- a/e-util/e-canvas-utils.c
+++ b/e-util/e-canvas-utils.c
@@ -20,11 +20,10 @@
*
*/
-#include "e-canvas-utils.h"
-
-#include <config.h>
+#include "evolution-config.h"
#include <libedataserver/libedataserver.h>
+#include "e-canvas-utils.h"
void
e_canvas_item_move_absolute (GnomeCanvasItem *item,
diff --git a/e-util/e-canvas-vbox.c b/e-util/e-canvas-vbox.c
index a7bcbc9..656a6ee 100644
--- a/e-util/e-canvas-vbox.c
+++ b/e-util/e-canvas-vbox.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
diff --git a/e-util/e-canvas.c b/e-util/e-canvas.c
index f9f6b14..7929a17 100644
--- a/e-util/e-canvas.c
+++ b/e-util/e-canvas.c
@@ -19,13 +19,13 @@
*
*/
-#include "e-canvas.h"
-
-#include <config.h>
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <libedataserver/libedataserver.h>
+#include "e-canvas.h"
+
#define d(x)
enum {
diff --git a/e-util/e-categories-config.c b/e-util/e-categories-config.c
index 226f653..6816c5c 100644
--- a/e-util/e-categories-config.c
+++ b/e-util/e-categories-config.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-categories-config.h"
diff --git a/e-util/e-categories-dialog.c b/e-util/e-categories-dialog.c
index dcd2d58..d7eea4b 100644
--- a/e-util/e-categories-dialog.c
+++ b/e-util/e-categories-dialog.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-categories-editor.c b/e-util/e-categories-editor.c
index eed1043..f6e411f 100644
--- a/e-util/e-categories-editor.c
+++ b/e-util/e-categories-editor.c
@@ -15,7 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <string.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
diff --git a/e-util/e-categories-selector.c b/e-util/e-categories-selector.c
index e014e7d..c148dc5 100644
--- a/e-util/e-categories-selector.c
+++ b/e-util/e-categories-selector.c
@@ -15,7 +15,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
diff --git a/e-util/e-category-completion.c b/e-util/e-category-completion.c
index 8210f72..a45447b 100644
--- a/e-util/e-category-completion.c
+++ b/e-util/e-category-completion.c
@@ -14,11 +14,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#include "e-category-completion.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
@@ -26,6 +22,7 @@
#include <libedataserver/libedataserver.h>
#include "e-misc-utils.h"
+#include "e-category-completion.h"
#define E_CATEGORY_COMPLETION_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/e-util/e-category-editor.c b/e-util/e-category-editor.c
index 708ba5c..9c01438 100644
--- a/e-util/e-category-editor.c
+++ b/e-util/e-category-editor.c
@@ -14,9 +14,8 @@
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-cell-checkbox.c b/e-util/e-cell-checkbox.c
index 88f898c..c56cc50 100644
--- a/e-util/e-cell-checkbox.c
+++ b/e-util/e-cell-checkbox.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-cell-combo.c b/e-util/e-cell-combo.c
index 966f97a..de2fde8 100644
--- a/e-util/e-cell-combo.c
+++ b/e-util/e-cell-combo.c
@@ -52,9 +52,7 @@
* close the popup, like the Escape key, or a button press outside the popup.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cell-combo.h"
diff --git a/e-util/e-cell-date-edit.c b/e-util/e-cell-date-edit.c
index a1abd55..1226e1d 100644
--- a/e-util/e-cell-date-edit.c
+++ b/e-util/e-cell-date-edit.c
@@ -24,9 +24,7 @@
* window to edit it.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cell-date-edit.h"
diff --git a/e-util/e-cell-date-int.c b/e-util/e-cell-date-int.c
index 6f0dd75..4ce6cd9 100644
--- a/e-util/e-cell-date-int.c
+++ b/e-util/e-cell-date-int.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cell-date.h"
#include "e-cell-date-int.h"
diff --git a/e-util/e-cell-date.c b/e-util/e-cell-date.c
index 7f0da8e..1ac86a9 100644
--- a/e-util/e-cell-date.c
+++ b/e-util/e-cell-date.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cell-date.h"
diff --git a/e-util/e-cell-hbox.c b/e-util/e-cell-hbox.c
index 74a7871..7717949 100644
--- a/e-util/e-cell-hbox.c
+++ b/e-util/e-cell-hbox.c
@@ -23,9 +23,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <math.h>
diff --git a/e-util/e-cell-number.c b/e-util/e-cell-number.c
index c59c4b9..e35fef8 100644
--- a/e-util/e-cell-number.c
+++ b/e-util/e-cell-number.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cell-number.h"
diff --git a/e-util/e-cell-percent.c b/e-util/e-cell-percent.c
index 981f252..5086aca 100644
--- a/e-util/e-cell-percent.c
+++ b/e-util/e-cell-percent.c
@@ -24,9 +24,7 @@
* in an ETable.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
diff --git a/e-util/e-cell-pixbuf.c b/e-util/e-cell-pixbuf.c
index 466c354..16b91a2 100644
--- a/e-util/e-cell-pixbuf.c
+++ b/e-util/e-cell-pixbuf.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
diff --git a/e-util/e-cell-popup.c b/e-util/e-cell-popup.c
index ee7fc54..0011451 100644
--- a/e-util/e-cell-popup.c
+++ b/e-util/e-cell-popup.c
@@ -28,9 +28,7 @@
* popup.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gdk/gdkkeysyms.h>
diff --git a/e-util/e-cell-size.c b/e-util/e-cell-size.c
index 662443e..8a8341b 100644
--- a/e-util/e-cell-size.c
+++ b/e-util/e-cell-size.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/time.h>
#include <unistd.h>
diff --git a/e-util/e-cell-text.c b/e-util/e-cell-text.c
index 3e39fad..64aa840 100644
--- a/e-util/e-cell-text.c
+++ b/e-util/e-cell-text.c
@@ -32,9 +32,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <ctype.h>
diff --git a/e-util/e-cell-toggle.c b/e-util/e-cell-toggle.c
index b081bac..3503f64 100644
--- a/e-util/e-cell-toggle.c
+++ b/e-util/e-cell-toggle.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-cell-tree.c b/e-util/e-cell-tree.c
index 3f83ef6..2e9cf7d 100644
--- a/e-util/e-cell-tree.c
+++ b/e-util/e-cell-tree.c
@@ -27,9 +27,7 @@
* 02110-1301, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <math.h>
diff --git a/e-util/e-cell-vbox.c b/e-util/e-cell-vbox.c
index 49265e3..7d9ab07 100644
--- a/e-util/e-cell-vbox.c
+++ b/e-util/e-cell-vbox.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <math.h>
diff --git a/e-util/e-cell.c b/e-util/e-cell.c
index d66276e..c35f853 100644
--- a/e-util/e-cell.c
+++ b/e-util/e-cell.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-charset-combo-box.c b/e-util/e-charset-combo-box.c
index 0036cf4..1f15727 100644
--- a/e-util/e-charset-combo-box.c
+++ b/e-util/e-charset-combo-box.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-charset-combo-box.h"
diff --git a/e-util/e-charset.c b/e-util/e-charset.c
index de4e998..2cc7188 100644
--- a/e-util/e-charset.c
+++ b/e-util/e-charset.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-charset.h"
diff --git a/e-util/e-client-cache.c b/e-util/e-client-cache.c
index 2c084c3..07da3df 100644
--- a/e-util/e-client-cache.c
+++ b/e-util/e-client-cache.c
@@ -30,15 +30,16 @@
* and a new instance is created on the next request.
**/
-#include "e-client-cache.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libecal/libecal.h>
#include <libebook/libebook.h>
#include <libebackend/libebackend.h>
+#include "e-client-cache.h"
+
#define E_CLIENT_CACHE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_CLIENT_CACHE, EClientCachePrivate))
diff --git a/e-util/e-client-selector.c b/e-util/e-client-selector.c
index 42769d5..473e147 100644
--- a/e-util/e-client-selector.c
+++ b/e-util/e-client-selector.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
/**
* SECTION: e-client-selector
diff --git a/e-util/e-color-chooser-widget.c b/e-util/e-color-chooser-widget.c
index 530f199..f7d5bbb 100644
--- a/e-util/e-color-chooser-widget.c
+++ b/e-util/e-color-chooser-widget.c
@@ -18,9 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-color-chooser-widget.h"
diff --git a/e-util/e-color-combo.c b/e-util/e-color-combo.c
index 3a9c051..53975be 100644
--- a/e-util/e-color-combo.c
+++ b/e-util/e-color-combo.c
@@ -17,9 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-color-combo.h"
#include "e-color-chooser-widget.h"
diff --git a/e-util/e-config.c b/e-util/e-config.c
index 709f7c9..0b9c7f5 100644
--- a/e-util/e-config.c
+++ b/e-util/e-config.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/e-util/e-contact-store.c b/e-util/e-contact-store.c
index 05c0bde..f81ffca 100644
--- a/e-util/e-contact-store.c
+++ b/e-util/e-contact-store.c
@@ -19,9 +19,7 @@
* Authors: Hans Petter Jansson <hpj novell com>
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-content-editor.c b/e-util/e-content-editor.c
index 2224af0..18baf87 100644
--- a/e-util/e-content-editor.c
+++ b/e-util/e-content-editor.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib-object.h>
diff --git a/e-util/e-content-request.c b/e-util/e-content-request.c
index 9448d44..3e95094 100644
--- a/e-util/e-content-request.c
+++ b/e-util/e-content-request.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
diff --git a/e-util/e-dateedit.c b/e-util/e-dateedit.c
index 6b08132..8af28c5 100644
--- a/e-util/e-dateedit.c
+++ b/e-util/e-dateedit.c
@@ -22,9 +22,7 @@
* time field with popups for entering a date.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-dateedit.h"
diff --git a/e-util/e-datetime-format.c b/e-util/e-datetime-format.c
index bb4918a..fd3def6 100644
--- a/e-util/e-datetime-format.c
+++ b/e-util/e-datetime-format.c
@@ -17,9 +17,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-destination-store.c b/e-util/e-destination-store.c
index c61b42f..4dcb08b 100644
--- a/e-util/e-destination-store.c
+++ b/e-util/e-destination-store.c
@@ -19,9 +19,7 @@
* Authors: Hans Petter Jansson <hpj novell com>
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-dialog-utils.c b/e-util/e-dialog-utils.c
index bf7e66b..f380ca3 100644
--- a/e-util/e-dialog-utils.c
+++ b/e-util/e-dialog-utils.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-dialog-utils.h"
diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c
index 1386002..a2618a5 100644
--- a/e-util/e-dialog-widgets.c
+++ b/e-util/e-dialog-widgets.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <string.h>
diff --git a/e-util/e-emoticon-chooser-menu.c b/e-util/e-emoticon-chooser-menu.c
index f2ed337..d4b6f79 100644
--- a/e-util/e-emoticon-chooser-menu.c
+++ b/e-util/e-emoticon-chooser-menu.c
@@ -19,9 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-emoticon-chooser-menu.h"
#include "e-emoticon-chooser.h"
diff --git a/e-util/e-emoticon-chooser.c b/e-util/e-emoticon-chooser.c
index 428e116..f58d1f3 100644
--- a/e-util/e-emoticon-chooser.c
+++ b/e-util/e-emoticon-chooser.c
@@ -19,9 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-emoticon-chooser.h"
diff --git a/e-util/e-emoticon-tool-button.c b/e-util/e-emoticon-tool-button.c
index 0b10133..bf274d3 100644
--- a/e-util/e-emoticon-tool-button.c
+++ b/e-util/e-emoticon-tool-button.c
@@ -19,9 +19,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-emoticon-tool-button.h"
diff --git a/e-util/e-event.c b/e-util/e-event.c
index 34a00be..5860526 100644
--- a/e-util/e-event.c
+++ b/e-util/e-event.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/e-util/e-file-request.c b/e-util/e-file-request.c
index 8cdb18a..f58c809 100644
--- a/e-util/e-file-request.c
+++ b/e-util/e-file-request.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/e-util/e-file-utils.c b/e-util/e-file-utils.c
index be1e912..7577404 100644
--- a/e-util/e-file-utils.c
+++ b/e-util/e-file-utils.c
@@ -20,11 +20,12 @@
*
*/
-#include "e-file-utils.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-file-utils.h"
+
typedef struct _AsyncContext AsyncContext;
struct _AsyncContext {
diff --git a/e-util/e-filter-code.c b/e-util/e-filter-code.c
index a4fc5a0..5fd6779 100644
--- a/e-util/e-filter-code.c
+++ b/e-util/e-filter-code.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-filter-code.h"
#include "e-filter-part.h"
diff --git a/e-util/e-filter-color.c b/e-util/e-filter-color.c
index a833f16..24f8e3c 100644
--- a/e-util/e-filter-color.c
+++ b/e-util/e-filter-color.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-filter-datespec.c b/e-util/e-filter-datespec.c
index 71a3972..a975dca 100644
--- a/e-util/e-filter-datespec.c
+++ b/e-util/e-filter-datespec.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/e-util/e-filter-element.c b/e-util/e-filter-element.c
index 2fbcb17..f97f482 100644
--- a/e-util/e-filter-element.c
+++ b/e-util/e-filter-element.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/e-util/e-filter-file.c b/e-util/e-filter-file.c
index 52cf538..9cdc2b0 100644
--- a/e-util/e-filter-file.c
+++ b/e-util/e-filter-file.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <sys/types.h>
diff --git a/e-util/e-filter-input.c b/e-util/e-filter-input.c
index dac0d5b..9dbc856 100644
--- a/e-util/e-filter-input.c
+++ b/e-util/e-filter-input.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <sys/types.h>
diff --git a/e-util/e-filter-int.c b/e-util/e-filter-int.c
index 24f18cf..9127079 100644
--- a/e-util/e-filter-int.c
+++ b/e-util/e-filter-int.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-filter-option.c b/e-util/e-filter-option.c
index cec156b..cd4ca4e 100644
--- a/e-util/e-filter-option.c
+++ b/e-util/e-filter-option.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/e-filter-part.c b/e-util/e-filter-part.c
index b36a81e..99206d8 100644
--- a/e-util/e-filter-part.c
+++ b/e-util/e-filter-part.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-filter-rule.c b/e-util/e-filter-rule.c
index ef3e688..4b5d7ae 100644
--- a/e-util/e-filter-rule.c
+++ b/e-util/e-filter-rule.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/e-focus-tracker.c b/e-util/e-focus-tracker.c
index 794e56d..c4390e3 100644
--- a/e-util/e-focus-tracker.c
+++ b/e-util/e-focus-tracker.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-focus-tracker.h"
diff --git a/e-util/e-html-editor-actions.c b/e-util/e-html-editor-actions.c
index 3e2780a..14e76aa 100644
--- a/e-util/e-html-editor-actions.c
+++ b/e-util/e-html-editor-actions.c
@@ -17,9 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gio/gio.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-html-editor-cell-dialog.c b/e-util/e-html-editor-cell-dialog.c
index b5379ec..b06f6b2 100644
--- a/e-util/e-html-editor-cell-dialog.c
+++ b/e-util/e-html-editor-cell-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-cell-dialog.h"
diff --git a/e-util/e-html-editor-dialog.c b/e-util/e-html-editor-dialog.c
index b62e4ac..1ee2330 100644
--- a/e-util/e-html-editor-dialog.c
+++ b/e-util/e-html-editor-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-html-editor-find-dialog.c b/e-util/e-html-editor-find-dialog.c
index f1ad2f2..b8a3d97 100644
--- a/e-util/e-html-editor-find-dialog.c
+++ b/e-util/e-html-editor-find-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-find-dialog.h"
#include "e-dialog-widgets.h"
diff --git a/e-util/e-html-editor-hrule-dialog.c b/e-util/e-html-editor-hrule-dialog.c
index 5dc6860..342cdc1 100644
--- a/e-util/e-html-editor-hrule-dialog.c
+++ b/e-util/e-html-editor-hrule-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-hrule-dialog.h"
diff --git a/e-util/e-html-editor-image-dialog.c b/e-util/e-html-editor-image-dialog.c
index 71d4779..975ebf9 100644
--- a/e-util/e-html-editor-image-dialog.c
+++ b/e-util/e-html-editor-image-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-html-editor-link-dialog.c b/e-util/e-html-editor-link-dialog.c
index 84f4590..bc348df 100644
--- a/e-util/e-html-editor-link-dialog.c
+++ b/e-util/e-html-editor-link-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-html-editor-page-dialog.c b/e-util/e-html-editor-page-dialog.c
index 2399566..e86f2c9 100644
--- a/e-util/e-html-editor-page-dialog.c
+++ b/e-util/e-html-editor-page-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-page-dialog.h"
diff --git a/e-util/e-html-editor-paragraph-dialog.c b/e-util/e-html-editor-paragraph-dialog.c
index 654bde5..014de3b 100644
--- a/e-util/e-html-editor-paragraph-dialog.c
+++ b/e-util/e-html-editor-paragraph-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-paragraph-dialog.h"
diff --git a/e-util/e-html-editor-replace-dialog.c b/e-util/e-html-editor-replace-dialog.c
index 59b69a7..d217b75 100644
--- a/e-util/e-html-editor-replace-dialog.c
+++ b/e-util/e-html-editor-replace-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-replace-dialog.h"
diff --git a/e-util/e-html-editor-spell-check-dialog.c b/e-util/e-html-editor-spell-check-dialog.c
index d7447e0..72056f0 100644
--- a/e-util/e-html-editor-spell-check-dialog.c
+++ b/e-util/e-html-editor-spell-check-dialog.c
@@ -18,9 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-spell-check-dialog.h"
diff --git a/e-util/e-html-editor-table-dialog.c b/e-util/e-html-editor-table-dialog.c
index 370b72f..484975b 100644
--- a/e-util/e-html-editor-table-dialog.c
+++ b/e-util/e-html-editor-table-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-table-dialog.h"
diff --git a/e-util/e-html-editor-text-dialog.c b/e-util/e-html-editor-text-dialog.c
index f944338..7d1ce72 100644
--- a/e-util/e-html-editor-text-dialog.c
+++ b/e-util/e-html-editor-text-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-html-editor-text-dialog.h"
diff --git a/e-util/e-html-editor.c b/e-util/e-html-editor.c
index 39070ee..ff14693 100644
--- a/e-util/e-html-editor.c
+++ b/e-util/e-html-editor.c
@@ -18,7 +18,8 @@
* Boston, MA 02111-1307, USA.
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index 9187b75..73f508b 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/e-util/e-icon-factory.c b/e-util/e-icon-factory.c
index 9263ee4..fc43b4b 100644
--- a/e-util/e-icon-factory.c
+++ b/e-util/e-icon-factory.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/e-util/e-image-chooser-dialog.c b/e-util/e-image-chooser-dialog.c
index da788f5..56d8f7d 100644
--- a/e-util/e-image-chooser-dialog.c
+++ b/e-util/e-image-chooser-dialog.c
@@ -18,9 +18,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-image-chooser.c b/e-util/e-image-chooser.c
index 92c4365..cf42c21 100644
--- a/e-util/e-image-chooser.c
+++ b/e-util/e-image-chooser.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/e-util/e-import-assistant.c b/e-util/e-import-assistant.c
index d028312..c8d2e5d 100644
--- a/e-util/e-import-assistant.c
+++ b/e-util/e-import-assistant.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-import-assistant.h"
diff --git a/e-util/e-import.c b/e-util/e-import.c
index b35319c..acbc4ea 100644
--- a/e-util/e-import.c
+++ b/e-util/e-import.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#ifdef HAVE_IMPORT_H
#include <import.h>
diff --git a/e-util/e-interval-chooser.c b/e-util/e-interval-chooser.c
index df6805c..57207b9 100644
--- a/e-util/e-interval-chooser.c
+++ b/e-util/e-interval-chooser.c
@@ -15,14 +15,15 @@
*
*/
-#include "e-interval-chooser.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "e-util-enums.h"
#include "e-misc-utils.h"
+#include "e-interval-chooser.h"
+
#define E_INTERVAL_CHOOSER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_INTERVAL_CHOOSER, EIntervalChooserPrivate))
diff --git a/e-util/e-mail-identity-combo-box.c b/e-util/e-mail-identity-combo-box.c
index 9320d13..4f8d8b1 100644
--- a/e-util/e-mail-identity-combo-box.c
+++ b/e-util/e-mail-identity-combo-box.c
@@ -26,11 +26,12 @@
* with #ESource #ESource:uid strings.
**/
-#include "e-mail-identity-combo-box.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-identity-combo-box.h"
+
#define E_MAIL_IDENTITY_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_IDENTITY_COMBO_BOX, EMailIdentityComboBoxPrivate))
diff --git a/e-util/e-mail-signature-combo-box.c b/e-util/e-mail-signature-combo-box.c
index fda55a4..92949b8 100644
--- a/e-util/e-mail-signature-combo-box.c
+++ b/e-util/e-mail-signature-combo-box.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-signature-combo-box.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-signature-combo-box.h"
+
#define E_MAIL_SIGNATURE_COMBO_BOX_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_SIGNATURE_COMBO_BOX, EMailSignatureComboBoxPrivate))
diff --git a/e-util/e-mail-signature-editor.c b/e-util/e-mail-signature-editor.c
index 45c5f7a..e888111 100644
--- a/e-util/e-mail-signature-editor.c
+++ b/e-util/e-mail-signature-editor.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-signature-editor.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
@@ -26,6 +25,8 @@
#include "e-alert-bar.h"
#include "e-simple-async-result.h"
+#include "e-mail-signature-editor.h"
+
#define E_MAIL_SIGNATURE_EDITOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_SIGNATURE_EDITOR, EMailSignatureEditorPrivate))
diff --git a/e-util/e-mail-signature-script-dialog.c b/e-util/e-mail-signature-script-dialog.c
index 72040f9..d7cbf1e 100644
--- a/e-util/e-mail-signature-script-dialog.c
+++ b/e-util/e-mail-signature-script-dialog.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-signature-script-dialog.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-signature-script-dialog.h"
+
#define E_MAIL_SIGNATURE_SCRIPT_DIALOG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_SIGNATURE_SCRIPT_DIALOG, \
diff --git a/e-util/e-map.c b/e-util/e-map.c
index 1b3d51a..61419d1 100644
--- a/e-util/e-map.c
+++ b/e-util/e-map.c
@@ -21,9 +21,8 @@
*
*/
-#include "e-map.h"
+#include "evolution-config.h"
-#include <config.h>
#include <math.h>
#include <stdlib.h>
@@ -34,6 +33,8 @@
#include "e-util-private.h"
+#include "e-map.h"
+
#define E_MAP_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAP, EMapPrivate))
diff --git a/e-util/e-menu-tool-action.c b/e-util/e-menu-tool-action.c
index bc4e9b2..97e5276 100644
--- a/e-util/e-menu-tool-action.c
+++ b/e-util/e-menu-tool-action.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-menu-tool-action.h"
diff --git a/e-util/e-menu-tool-button.c b/e-util/e-menu-tool-button.c
index cffadd0..0ee2181 100644
--- a/e-util/e-menu-tool-button.c
+++ b/e-util/e-menu-tool-button.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-menu-tool-button.h"
#include "e-misc-utils.h"
diff --git a/e-util/e-misc-utils.c b/e-util/e-misc-utils.c
index 13ce806..4821680 100644
--- a/e-util/e-misc-utils.c
+++ b/e-util/e-misc-utils.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-misc-utils.h"
diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c
index 3112140..ca321ce 100644
--- a/e-util/e-mktemp.c
+++ b/e-util/e-mktemp.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gstdio.h>
#include <sys/stat.h>
diff --git a/e-util/e-name-selector-dialog.c b/e-util/e-name-selector-dialog.c
index d776190..f2db4d7 100644
--- a/e-util/e-name-selector-dialog.c
+++ b/e-util/e-name-selector-dialog.c
@@ -19,11 +19,8 @@
* Author: Hans Petter Jansson <hpj novell com>
*/
-#ifdef GTK_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#endif
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-name-selector-entry.c b/e-util/e-name-selector-entry.c
index 94b92a5..03dd8f0 100644
--- a/e-util/e-name-selector-entry.c
+++ b/e-util/e-name-selector-entry.c
@@ -19,7 +19,8 @@
* Authors: Hans Petter Jansson <hpj novell com>
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-name-selector-list.c b/e-util/e-name-selector-list.c
index 2de7e7f..548c6d3 100644
--- a/e-util/e-name-selector-list.c
+++ b/e-util/e-name-selector-list.c
@@ -22,7 +22,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-name-selector-model.c b/e-util/e-name-selector-model.c
index 3e5116b..5443b66 100644
--- a/e-util/e-name-selector-model.c
+++ b/e-util/e-name-selector-model.c
@@ -19,9 +19,7 @@
* Authors: Hans Petter Jansson <hpj novell com>
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-name-selector.c b/e-util/e-name-selector.c
index e5f8993..054ee56 100644
--- a/e-util/e-name-selector.c
+++ b/e-util/e-name-selector.c
@@ -19,9 +19,7 @@
* Authors: Hans Petter Jansson <hpj novell com>
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/e-util/e-online-button.c b/e-util/e-online-button.c
index b2bd687..36fc5a4 100644
--- a/e-util/e-online-button.c
+++ b/e-util/e-online-button.c
@@ -14,9 +14,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-online-button.h"
diff --git a/e-util/e-paned.c b/e-util/e-paned.c
index b4a0914..300293a 100644
--- a/e-util/e-paned.c
+++ b/e-util/e-paned.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-paned.h"
diff --git a/e-util/e-passwords.c b/e-util/e-passwords.c
index 2505e4a..2247c47 100644
--- a/e-util/e-passwords.c
+++ b/e-util/e-passwords.c
@@ -35,9 +35,7 @@
* order, but will not be processed out of order.
*/
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "evolution-config.h"
#include <limits.h>
#include <stdlib.h>
diff --git a/e-util/e-picture-gallery.c b/e-util/e-picture-gallery.c
index 6e01715..217ac5b 100644
--- a/e-util/e-picture-gallery.c
+++ b/e-util/e-picture-gallery.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-picture-gallery.h"
diff --git a/e-util/e-plugin-ui.c b/e-util/e-plugin-ui.c
index e875b5a..e81113e 100644
--- a/e-util/e-plugin-ui.c
+++ b/e-util/e-plugin-ui.c
@@ -14,9 +14,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-plugin-ui.h"
diff --git a/e-util/e-plugin.c b/e-util/e-plugin.c
index 5657b75..4926cfa 100644
--- a/e-util/e-plugin.c
+++ b/e-util/e-plugin.c
@@ -15,9 +15,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/types.h>
#include <string.h>
diff --git a/e-util/e-poolv.c b/e-util/e-poolv.c
index 1207d08..02f1efa 100644
--- a/e-util/e-poolv.c
+++ b/e-util/e-poolv.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-poolv.h"
diff --git a/e-util/e-popup-action.c b/e-util/e-popup-action.c
index 9a3702b..9eb9835 100644
--- a/e-util/e-popup-action.c
+++ b/e-util/e-popup-action.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-popup-action.h"
diff --git a/e-util/e-popup-menu.c b/e-util/e-popup-menu.c
index fc2ec02..c49d19f 100644
--- a/e-util/e-popup-menu.c
+++ b/e-util/e-popup-menu.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libintl.h>
#include <string.h>
diff --git a/e-util/e-port-entry.c b/e-util/e-port-entry.c
index e0925d0..182f6c8 100644
--- a/e-util/e-port-entry.c
+++ b/e-util/e-port-entry.c
@@ -11,13 +11,14 @@
* Dan Vratil <dvratil redhat com>
*/
-#include "e-port-entry.h"
+#include "evolution-config.h"
-#include <config.h>
#include <errno.h>
#include <stddef.h>
#include <string.h>
+#include "e-port-entry.h"
+
#define E_PORT_ENTRY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_PORT_ENTRY, EPortEntryPrivate))
diff --git a/e-util/e-preferences-window.c b/e-util/e-preferences-window.c
index 680140d..1bebeb6 100644
--- a/e-util/e-preferences-window.c
+++ b/e-util/e-preferences-window.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-preferences-window.h"
diff --git a/e-util/e-print.c b/e-util/e-print.c
index f2a6688..0a2ab1c 100644
--- a/e-util/e-print.c
+++ b/e-util/e-print.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-print.h"
diff --git a/e-util/e-printable.c b/e-util/e-printable.c
index 9d2b42c..325e994 100644
--- a/e-util/e-printable.c
+++ b/e-util/e-printable.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-proxy-editor.c b/e-util/e-proxy-editor.c
index c8e69ba..db8a822 100644
--- a/e-util/e-proxy-editor.c
+++ b/e-util/e-proxy-editor.c
@@ -28,11 +28,12 @@
* e_proxy_editor_set_source().
**/
-#include "e-proxy-editor.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-proxy-editor.h"
+
#define E_PROXY_EDITOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_PROXY_EDITOR, EProxyEditorPrivate))
diff --git a/e-util/e-proxy-preferences.c b/e-util/e-proxy-preferences.c
index 1dd259f..d93d397 100644
--- a/e-util/e-proxy-preferences.c
+++ b/e-util/e-proxy-preferences.c
@@ -29,14 +29,15 @@
* accounts.
**/
-#include "e-proxy-preferences.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
-#include <e-util/e-proxy-editor.h>
-#include <e-util/e-proxy-link-selector.h>
-#include <e-util/e-proxy-selector.h>
+#include "e-proxy-editor.h"
+#include "e-proxy-link-selector.h"
+#include "e-proxy-selector.h"
+
+#include "e-proxy-preferences.h"
#define E_PROXY_PREFERENCES_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/e-util/e-proxy-selector.c b/e-util/e-proxy-selector.c
index e66185b..2017aa7 100644
--- a/e-util/e-proxy-selector.c
+++ b/e-util/e-proxy-selector.c
@@ -24,11 +24,12 @@
* toolbar controls for adding and removing profiles.
**/
-#include "e-proxy-selector.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-proxy-selector.h"
+
#define E_PROXY_SELECTOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_PROXY_SELECTOR, EProxySelectorPrivate))
diff --git a/e-util/e-reflow-model.c b/e-util/e-reflow-model.c
index 6af3c46..bce9e40 100644
--- a/e-util/e-reflow-model.c
+++ b/e-util/e-reflow-model.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-reflow-model.h"
diff --git a/e-util/e-reflow.c b/e-util/e-reflow.c
index 3f3d22f..6ce2e7a 100644
--- a/e-util/e-reflow.c
+++ b/e-util/e-reflow.c
@@ -19,9 +19,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-reflow.h"
diff --git a/e-util/e-rule-context.c b/e-util/e-rule-context.c
index 668bea2..8fe5b27 100644
--- a/e-util/e-rule-context.c
+++ b/e-util/e-rule-context.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <sys/types.h>
diff --git a/e-util/e-rule-editor.c b/e-util/e-rule-editor.c
index 7fe08f3..2120fc1 100644
--- a/e-util/e-rule-editor.c
+++ b/e-util/e-rule-editor.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-rule-editor.h"
diff --git a/e-util/e-search-bar.c b/e-util/e-search-bar.c
index b5ebdde..2b5a860 100644
--- a/e-util/e-search-bar.c
+++ b/e-util/e-search-bar.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-search-bar.h"
diff --git a/e-util/e-selectable.c b/e-util/e-selectable.c
index 5e3267c..95684e7 100644
--- a/e-util/e-selectable.c
+++ b/e-util/e-selectable.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-selectable.h"
diff --git a/e-util/e-selection-model-array.c b/e-util/e-selection-model-array.c
index 05b570d..c0735f1 100644
--- a/e-util/e-selection-model-array.c
+++ b/e-util/e-selection-model-array.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-selection-model-simple.c b/e-util/e-selection-model-simple.c
index 0669117..ae27f1f 100644
--- a/e-util/e-selection-model-simple.c
+++ b/e-util/e-selection-model-simple.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-selection-model-array.h"
#include "e-selection-model-simple.h"
diff --git a/e-util/e-selection-model.c b/e-util/e-selection-model.c
index 45c4289..99e8d29 100644
--- a/e-util/e-selection-model.c
+++ b/e-util/e-selection-model.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-selection-model.h"
diff --git a/e-util/e-selection.c b/e-util/e-selection.c
index c789c73..8818bfd 100644
--- a/e-util/e-selection.c
+++ b/e-util/e-selection.c
@@ -24,9 +24,7 @@
* @include: e-util/e-util.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-selection.h"
diff --git a/e-util/e-send-options.c b/e-util/e-send-options.c
index b95486a..580c087 100644
--- a/e-util/e-send-options.c
+++ b/e-util/e-send-options.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-send-options.h"
diff --git a/e-util/e-simple-async-result.c b/e-util/e-simple-async-result.c
index 76e6cf6..dcec35b 100644
--- a/e-util/e-simple-async-result.c
+++ b/e-util/e-simple-async-result.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gio/gio.h>
diff --git a/e-util/e-source-combo-box.c b/e-util/e-source-combo-box.c
index 61dd756..93bbc53 100644
--- a/e-util/e-source-combo-box.c
+++ b/e-util/e-source-combo-box.c
@@ -16,9 +16,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libedataserverui/libedataserverui.h>
diff --git a/e-util/e-source-config-dialog.c b/e-util/e-source-config-dialog.c
index d7b4d55..1f48d10 100644
--- a/e-util/e-source-config-dialog.c
+++ b/e-util/e-source-config-dialog.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-source-config.c b/e-util/e-source-config.c
index d53a54e..066cf10 100644
--- a/e-util/e-source-config.c
+++ b/e-util/e-source-config.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-source-config.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
@@ -27,6 +26,8 @@
#include "e-misc-utils.h"
#include "e-source-config-backend.h"
+#include "e-source-config.h"
+
#define E_SOURCE_CONFIG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_SOURCE_CONFIG, ESourceConfigPrivate))
diff --git a/e-util/e-source-selector-dialog.c b/e-util/e-source-selector-dialog.c
index b54ee71..6b6b6f9 100644
--- a/e-util/e-source-selector-dialog.c
+++ b/e-util/e-source-selector-dialog.c
@@ -18,9 +18,7 @@
* Author: Rodrigo Moya <rodrigo novell com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include "e-source-selector.h"
diff --git a/e-util/e-source-selector.c b/e-util/e-source-selector.c
index a32dc16..49392da 100644
--- a/e-util/e-source-selector.c
+++ b/e-util/e-source-selector.c
@@ -18,9 +18,7 @@
* Author: Ettore Perazzoli <ettore ximian com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-spell-checker.c b/e-util/e-spell-checker.c
index dbdd895..fc5a0ff 100644
--- a/e-util/e-spell-checker.c
+++ b/e-util/e-spell-checker.c
@@ -16,9 +16,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-spell-checker.h"
#include "e-spell-dictionary.h"
diff --git a/e-util/e-spell-dictionary.c b/e-util/e-spell-dictionary.c
index 6b221ab..ab89f55 100644
--- a/e-util/e-spell-dictionary.c
+++ b/e-util/e-spell-dictionary.c
@@ -16,9 +16,7 @@
* Boston, MA 02111-1307, USA.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-util-private.h"
#include "e-spell-dictionary.h"
diff --git a/e-util/e-spell-entry.c b/e-util/e-spell-entry.c
index b48390c..9a328a3 100644
--- a/e-util/e-spell-entry.c
+++ b/e-util/e-spell-entry.c
@@ -17,7 +17,8 @@
/* This code is based on libsexy's SexySpellEntry */
-#include <config.h>
+#include "evolution-config.h"
+
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-spell-text-view.c b/e-util/e-spell-text-view.c
index d2caa20..8101341 100644
--- a/e-util/e-spell-text-view.c
+++ b/e-util/e-spell-text-view.c
@@ -17,9 +17,7 @@
/* Just a proxy for GtkSpell Text View spell checker */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-spinner.c b/e-util/e-spinner.c
index 8a4b972..5d1dae6 100644
--- a/e-util/e-spinner.c
+++ b/e-util/e-spinner.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-stock-request.c b/e-util/e-stock-request.c
index c550a2c..56d8fa7 100644
--- a/e-util/e-stock-request.c
+++ b/e-util/e-stock-request.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-table-click-to-add.c b/e-util/e-table-click-to-add.c
index 5d4eb9a..386cb87 100644
--- a/e-util/e-table-click-to-add.c
+++ b/e-util/e-table-click-to-add.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-click-to-add.h"
diff --git a/e-util/e-table-col.c b/e-util/e-table-col.c
index df93282..4bebad2 100644
--- a/e-util/e-table-col.c
+++ b/e-util/e-table-col.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/e-util/e-table-column-selector.c b/e-util/e-table-column-selector.c
index beab157..85b0b0b 100644
--- a/e-util/e-table-column-selector.c
+++ b/e-util/e-table-column-selector.c
@@ -24,12 +24,12 @@
* available columns of an #ETable or #ETree.
**/
-#include "e-table-column-selector.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
-#include "e-util/e-table-specification.h"
+#include "e-table-specification.h"
+#include "e-table-column-selector.h"
#define E_TABLE_COLUMN_SELECTOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/e-util/e-table-column-specification.c b/e-util/e-table-column-specification.c
index da42a41..bf5df71 100644
--- a/e-util/e-table-column-specification.c
+++ b/e-util/e-table-column-specification.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-column-specification.h"
diff --git a/e-util/e-table-config.c b/e-util/e-table-config.c
index 3d928b8..8317c49 100644
--- a/e-util/e-table-config.c
+++ b/e-util/e-table-config.c
@@ -26,12 +26,12 @@
* Make Clear all work.
*/
-#include "e-table-config.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n.h>
#include "e-table-column-selector.h"
+#include "e-table-config.h"
G_DEFINE_TYPE (ETableConfig, e_table_config, G_TYPE_OBJECT)
diff --git a/e-util/e-table-extras.c b/e-util/e-table-extras.c
index 8f43a1f..71f2797 100644
--- a/e-util/e-table-extras.c
+++ b/e-util/e-table-extras.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-table-field-chooser-dialog.c b/e-util/e-table-field-chooser-dialog.c
index 88b3962..0039567 100644
--- a/e-util/e-table-field-chooser-dialog.c
+++ b/e-util/e-table-field-chooser-dialog.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/e-util/e-table-field-chooser-item.c b/e-util/e-table-field-chooser-item.c
index 4ab2526..a63167f 100644
--- a/e-util/e-table-field-chooser-item.c
+++ b/e-util/e-table-field-chooser-item.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/e-table-field-chooser.c b/e-util/e-table-field-chooser.c
index d36fccb..3dfe57c 100644
--- a/e-util/e-table-field-chooser.c
+++ b/e-util/e-table-field-chooser.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-field-chooser.h"
diff --git a/e-util/e-table-group-container.c b/e-util/e-table-group-container.c
index 850e018..7b9d339 100644
--- a/e-util/e-table-group-container.c
+++ b/e-util/e-table-group-container.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-group-container.h"
diff --git a/e-util/e-table-group-leaf.c b/e-util/e-table-group-leaf.c
index ffdb8b9..dc5710e 100644
--- a/e-util/e-table-group-leaf.c
+++ b/e-util/e-table-group-leaf.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-group-leaf.h"
diff --git a/e-util/e-table-group.c b/e-util/e-table-group.c
index 32c4aae..d41d82e 100644
--- a/e-util/e-table-group.c
+++ b/e-util/e-table-group.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <libgnomecanvas/libgnomecanvas.h>
diff --git a/e-util/e-table-header-item.c b/e-util/e-table-header-item.c
index 63d873b..7fbde32 100644
--- a/e-util/e-table-header-item.c
+++ b/e-util/e-table-header-item.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-header-item.h"
diff --git a/e-util/e-table-header-utils.c b/e-util/e-table-header-utils.c
index 582791b..9be35c9 100644
--- a/e-util/e-table-header-utils.c
+++ b/e-util/e-table-header-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-header-utils.h"
diff --git a/e-util/e-table-header.c b/e-util/e-table-header.c
index 37bb6c0..1c1255f 100644
--- a/e-util/e-table-header.c
+++ b/e-util/e-table-header.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/e-table-item.c b/e-util/e-table-item.c
index f2bbad6..0ef48b1 100644
--- a/e-util/e-table-item.c
+++ b/e-util/e-table-item.c
@@ -25,9 +25,8 @@
* TODO:
* Add a border to the thing, so that focusing works properly.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include "e-table-item.h"
diff --git a/e-util/e-table-one.c b/e-util/e-table-one.c
index 338ad66..57aeb9f 100644
--- a/e-util/e-table-one.c
+++ b/e-util/e-table-one.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-one.h"
diff --git a/e-util/e-table-search.c b/e-util/e-table-search.c
index 6ce6a86..4452a3f 100644
--- a/e-util/e-table-search.c
+++ b/e-util/e-table-search.c
@@ -19,14 +19,14 @@
*
*/
-#include "e-table-search.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <libedataserver/libedataserver.h>
#include "e-marshal.h"
+#include "e-table-search.h"
#define d(x)
diff --git a/e-util/e-table-selection-model.c b/e-util/e-table-selection-model.c
index 56cc1b3..c85ffd8 100644
--- a/e-util/e-table-selection-model.c
+++ b/e-util/e-table-selection-model.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/e-table-sorted-variable.c b/e-util/e-table-sorted-variable.c
index 065fe54..8352d47 100644
--- a/e-util/e-table-sorted-variable.c
+++ b/e-util/e-table-sorted-variable.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-table-sorted.c b/e-util/e-table-sorted.c
index beed341..10cf8fa 100644
--- a/e-util/e-table-sorted.c
+++ b/e-util/e-table-sorted.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-table-sorter.c b/e-util/e-table-sorter.c
index 5efc39e..6ffdf29 100644
--- a/e-util/e-table-sorter.c
+++ b/e-util/e-table-sorter.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-table-sorting-utils.c b/e-util/e-table-sorting-utils.c
index 68f673c..ea9b53a 100644
--- a/e-util/e-table-sorting-utils.c
+++ b/e-util/e-table-sorting-utils.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-sorting-utils.h"
diff --git a/e-util/e-table-subset-variable.c b/e-util/e-table-subset-variable.c
index e88ec3d..3340c97 100644
--- a/e-util/e-table-subset-variable.c
+++ b/e-util/e-table-subset-variable.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-table-subset.c b/e-util/e-table-subset.c
index b00dfb6..e825325 100644
--- a/e-util/e-table-subset.c
+++ b/e-util/e-table-subset.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
diff --git a/e-util/e-table-utils.c b/e-util/e-table-utils.c
index 9e3072b..b49cafd 100644
--- a/e-util/e-table-utils.c
+++ b/e-util/e-table-utils.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table-utils.h"
diff --git a/e-util/e-table.c b/e-util/e-table.c
index 450810a..685ee12 100644
--- a/e-util/e-table.c
+++ b/e-util/e-table.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-table.h"
diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c
index a99529a..d161c1f 100644
--- a/e-util/e-text-event-processor-emacs-like.c
+++ b/e-util/e-text-event-processor-emacs-like.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c
index 9e2a4a9..b694b82 100644
--- a/e-util/e-text-event-processor.c
+++ b/e-util/e-text-event-processor.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/e-util/e-text-model-repos.c b/e-util/e-text-model-repos.c
index 99c9cfb..c51c8ef 100644
--- a/e-util/e-text-model-repos.c
+++ b/e-util/e-text-model-repos.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-text-model-repos.h"
diff --git a/e-util/e-text-model.c b/e-util/e-text-model.c
index a6fecdb..a0bc2fe 100644
--- a/e-util/e-text-model.c
+++ b/e-util/e-text-model.c
@@ -21,9 +21,7 @@
#undef PARANOID_DEBUGGING
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-text-model.h"
diff --git a/e-util/e-text.c b/e-util/e-text.c
index 34ad317..38b5e73 100644
--- a/e-util/e-text.c
+++ b/e-util/e-text.c
@@ -34,9 +34,8 @@
* 02110-1301, USA.
*/
-#include "e-text.h"
+#include "evolution-config.h"
-#include <config.h>
#include <math.h>
#include <ctype.h>
#include <string.h>
@@ -55,6 +54,8 @@
#include "e-misc-utils.h"
#include "gal-a11y-e-text.h"
+#include "e-text.h"
+
G_DEFINE_TYPE (EText, e_text, GNOME_TYPE_CANVAS_ITEM)
enum {
diff --git a/e-util/e-timezone-dialog.c b/e-util/e-timezone-dialog.c
index 297ac97..3f613ae 100644
--- a/e-util/e-timezone-dialog.c
+++ b/e-util/e-timezone-dialog.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-timezone-dialog.h"
diff --git a/e-util/e-tree-model-generator.c b/e-util/e-tree-model-generator.c
index 81c4086..b8fe4a3 100644
--- a/e-util/e-tree-model-generator.c
+++ b/e-util/e-tree-model-generator.c
@@ -19,9 +19,7 @@
* Authors: Hans Petter Jansson <hpj novell com>
*/
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-tree-selection-model.c b/e-util/e-tree-selection-model.c
index d19cbb4..63a6c0e 100644
--- a/e-util/e-tree-selection-model.c
+++ b/e-util/e-tree-selection-model.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-tree-selection-model.h"
diff --git a/e-util/e-tree-view-frame.c b/e-util/e-tree-view-frame.c
index 716f480..8052e5d 100644
--- a/e-util/e-tree-view-frame.c
+++ b/e-util/e-tree-view-frame.c
@@ -29,9 +29,7 @@
* extended through e_tree_view_frame_insert_toolbar_action().
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libebackend/libebackend.h>
diff --git a/e-util/e-tree.c b/e-util/e-tree.c
index 19f83c5..49e685a 100644
--- a/e-util/e-tree.c
+++ b/e-util/e-tree.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <stdio.h>
diff --git a/e-util/e-unicode.c b/e-util/e-unicode.c
index a0d5950..d386b37 100644
--- a/e-util/e-unicode.c
+++ b/e-util/e-unicode.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdlib.h>
#include <string.h>
diff --git a/e-util/e-url-entry.c b/e-util/e-url-entry.c
index 6e8d94c..d86ef40 100644
--- a/e-util/e-url-entry.c
+++ b/e-util/e-url-entry.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-url-entry.h"
diff --git a/e-util/e-web-view-preview.c b/e-util/e-web-view-preview.c
index 13fd32d..9bac835 100644
--- a/e-util/e-web-view-preview.c
+++ b/e-util/e-web-view-preview.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-web-view-preview.h"
diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c
index 5294320..3ee6654 100644
--- a/e-util/e-web-view.c
+++ b/e-util/e-web-view.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-web-view.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <math.h>
@@ -40,7 +39,9 @@
#include "e-selectable.h"
#include "e-stock-request.h"
-#include <web-extensions/e-web-extension-names.h>
+#include "web-extensions/e-web-extension-names.h"
+
+#include "e-web-view.h"
#define E_WEB_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/e-util/e-widget-undo.c b/e-util/e-widget-undo.c
index 9efe760..77f220f 100644
--- a/e-util/e-widget-undo.c
+++ b/e-util/e-widget-undo.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/e-util/e-win32-defaults.c b/e-util/e-win32-defaults.c
index f447706..3a43207 100644
--- a/e-util/e-win32-defaults.c
+++ b/e-util/e-win32-defaults.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <windows.h>
diff --git a/e-util/e-win32-reloc.c b/e-util/e-win32-reloc.c
index 2c559cf..9a72905 100644
--- a/e-util/e-win32-reloc.c
+++ b/e-util/e-win32-reloc.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <windows.h>
#include <string.h>
diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c
index c3f9a03..43cc0e5 100644
--- a/e-util/e-xml-utils.c
+++ b/e-util/e-xml-utils.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-xml-utils.h"
diff --git a/e-util/ea-calendar-cell.c b/e-util/ea-calendar-cell.c
index e15b1ae..d527ff2 100644
--- a/e-util/ea-calendar-cell.c
+++ b/e-util/ea-calendar-cell.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include "ea-calendar-cell.h"
diff --git a/e-util/ea-calendar-item.c b/e-util/ea-calendar-item.c
index b620777..c22adfb 100644
--- a/e-util/ea-calendar-item.c
+++ b/e-util/ea-calendar-item.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <time.h>
diff --git a/e-util/ea-cell-table.c b/e-util/ea-cell-table.c
index dd1e647..c1ee374 100644
--- a/e-util/ea-cell-table.c
+++ b/e-util/ea-cell-table.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-cell-table.h"
diff --git a/e-util/ea-widgets.c b/e-util/ea-widgets.c
index d16aefc..12bf191 100644
--- a/e-util/ea-widgets.c
+++ b/e-util/ea-widgets.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ea-factory.h"
#include "ea-calendar-item.h"
diff --git a/e-util/evolution-source-viewer.c b/e-util/evolution-source-viewer.c
index 61c5880..069d625 100644
--- a/e-util/evolution-source-viewer.c
+++ b/e-util/evolution-source-viewer.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/e-util/gal-a11y-e-cell-popup.c b/e-util/gal-a11y-e-cell-popup.c
index 2744a1c..afa3e20 100644
--- a/e-util/gal-a11y-e-cell-popup.c
+++ b/e-util/gal-a11y-e-cell-popup.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-cell-popup.h"
diff --git a/e-util/gal-a11y-e-cell-registry.c b/e-util/gal-a11y-e-cell-registry.c
index 54f9d0b..407d004 100644
--- a/e-util/gal-a11y-e-cell-registry.c
+++ b/e-util/gal-a11y-e-cell-registry.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-cell.h"
#include "gal-a11y-e-cell-registry.h"
diff --git a/e-util/gal-a11y-e-cell-text.c b/e-util/gal-a11y-e-cell-text.c
index db65078..d8e994e 100644
--- a/e-util/gal-a11y-e-cell-text.c
+++ b/e-util/gal-a11y-e-cell-text.c
@@ -20,7 +20,7 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
#include <string.h>
diff --git a/e-util/gal-a11y-e-cell-toggle.c b/e-util/gal-a11y-e-cell-toggle.c
index ef4b274..6dabc6b 100644
--- a/e-util/gal-a11y-e-cell-toggle.c
+++ b/e-util/gal-a11y-e-cell-toggle.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-cell-toggle.h"
diff --git a/e-util/gal-a11y-e-cell-tree.c b/e-util/gal-a11y-e-cell-tree.c
index 1b20aed..5d39508 100644
--- a/e-util/gal-a11y-e-cell-tree.c
+++ b/e-util/gal-a11y-e-cell-tree.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-cell-tree.h"
diff --git a/e-util/gal-a11y-e-cell-vbox.c b/e-util/gal-a11y-e-cell-vbox.c
index c998eed..bdec15c 100644
--- a/e-util/gal-a11y-e-cell-vbox.c
+++ b/e-util/gal-a11y-e-cell-vbox.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-cell-vbox.h"
diff --git a/e-util/gal-a11y-e-cell.c b/e-util/gal-a11y-e-cell.c
index 537f998..bd4ed25 100644
--- a/e-util/gal-a11y-e-cell.c
+++ b/e-util/gal-a11y-e-cell.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-cell.h"
diff --git a/e-util/gal-a11y-e-table-click-to-add-factory.c b/e-util/gal-a11y-e-table-click-to-add-factory.c
index e3c0b38..d01a5ee 100644
--- a/e-util/gal-a11y-e-table-click-to-add-factory.c
+++ b/e-util/gal-a11y-e-table-click-to-add-factory.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table-click-to-add-factory.h"
diff --git a/e-util/gal-a11y-e-table-click-to-add.c b/e-util/gal-a11y-e-table-click-to-add.c
index 120bf15..6eff5c8 100644
--- a/e-util/gal-a11y-e-table-click-to-add.c
+++ b/e-util/gal-a11y-e-table-click-to-add.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table-click-to-add.h"
diff --git a/e-util/gal-a11y-e-table-column-header.c b/e-util/gal-a11y-e-table-column-header.c
index 55618aa..ee5ea3b 100644
--- a/e-util/gal-a11y-e-table-column-header.c
+++ b/e-util/gal-a11y-e-table-column-header.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table-column-header.h"
diff --git a/e-util/gal-a11y-e-table-factory.c b/e-util/gal-a11y-e-table-factory.c
index f6885c1..f4fdfca 100644
--- a/e-util/gal-a11y-e-table-factory.c
+++ b/e-util/gal-a11y-e-table-factory.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table.h"
#include "gal-a11y-e-table-factory.h"
diff --git a/e-util/gal-a11y-e-table-item-factory.c b/e-util/gal-a11y-e-table-item-factory.c
index 65b449a..acb2d80 100644
--- a/e-util/gal-a11y-e-table-item-factory.c
+++ b/e-util/gal-a11y-e-table-item-factory.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table-item-factory.h"
diff --git a/e-util/gal-a11y-e-table-item.c b/e-util/gal-a11y-e-table-item.c
index 11e82cd..cf06fb3 100644
--- a/e-util/gal-a11y-e-table-item.c
+++ b/e-util/gal-a11y-e-table-item.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table-item.h"
diff --git a/e-util/gal-a11y-e-table.c b/e-util/gal-a11y-e-table.c
index e766b18..7f13789 100644
--- a/e-util/gal-a11y-e-table.c
+++ b/e-util/gal-a11y-e-table.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-table.h"
diff --git a/e-util/gal-a11y-e-text-factory.c b/e-util/gal-a11y-e-text-factory.c
index 9b7d3fc..359fc94 100644
--- a/e-util/gal-a11y-e-text-factory.c
+++ b/e-util/gal-a11y-e-text-factory.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-text.h"
#include "gal-a11y-e-text-factory.h"
diff --git a/e-util/gal-a11y-e-text.c b/e-util/gal-a11y-e-text.c
index 950b923..cc10fe5 100644
--- a/e-util/gal-a11y-e-text.c
+++ b/e-util/gal-a11y-e-text.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-text.h"
diff --git a/e-util/gal-a11y-e-tree-factory.c b/e-util/gal-a11y-e-tree-factory.c
index f218052..81c53e9 100644
--- a/e-util/gal-a11y-e-tree-factory.c
+++ b/e-util/gal-a11y-e-tree-factory.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-tree.h"
#include "gal-a11y-e-tree-factory.h"
diff --git a/e-util/gal-a11y-e-tree.c b/e-util/gal-a11y-e-tree.c
index fb0a224..e19e73b 100644
--- a/e-util/gal-a11y-e-tree.c
+++ b/e-util/gal-a11y-e-tree.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-e-tree.h"
diff --git a/e-util/gal-a11y-util.c b/e-util/gal-a11y-util.c
index bcb993c..59db1cc 100644
--- a/e-util/gal-a11y-util.c
+++ b/e-util/gal-a11y-util.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-a11y-util.h"
diff --git a/e-util/gal-view-instance-save-as-dialog.c b/e-util/gal-view-instance-save-as-dialog.c
index 361fdd3..f6cbcfd 100644
--- a/e-util/gal-view-instance-save-as-dialog.c
+++ b/e-util/gal-view-instance-save-as-dialog.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/e-util/gal-view-instance.c b/e-util/gal-view-instance.c
index 109a5fa..03b957b 100644
--- a/e-util/gal-view-instance.c
+++ b/e-util/gal-view-instance.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gal-view-instance.h"
diff --git a/e-util/test-calendar.c b/e-util/test-calendar.c
index 2a64a4f..3c4dc77 100644
--- a/e-util/test-calendar.c
+++ b/e-util/test-calendar.c
@@ -23,9 +23,7 @@
* test-calendar - tests the ECalendar widget.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <e-util/e-util.h>
diff --git a/e-util/test-dateedit.c b/e-util/test-dateedit.c
index 03e8df1..def69db 100644
--- a/e-util/test-dateedit.c
+++ b/e-util/test-dateedit.c
@@ -23,9 +23,7 @@
* test-dateedit - tests the EDateEdit widget.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include "e-dateedit.h"
diff --git a/e-util/test-html-editor-units-bugs.c b/e-util/test-html-editor-units-bugs.c
index 9e71bb0..d3bf679 100644
--- a/e-util/test-html-editor-units-bugs.c
+++ b/e-util/test-html-editor-units-bugs.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <e-util/e-util.h>
diff --git a/e-util/test-html-editor-units-utils.c b/e-util/test-html-editor-units-utils.c
index 90fbbf6..7fb8325 100644
--- a/e-util/test-html-editor-units-utils.c
+++ b/e-util/test-html-editor-units-utils.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/e-util/test-html-editor-units.c b/e-util/test-html-editor-units.c
index f6e60c6..4c4270f 100644
--- a/e-util/test-html-editor-units.c
+++ b/e-util/test-html-editor-units.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gstdio.h>
diff --git a/e-util/test-html-editor.c b/e-util/test-html-editor.c
index d7d6f60..c567c28 100644
--- a/e-util/test-html-editor.c
+++ b/e-util/test-html-editor.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <e-util/e-util.h>
diff --git a/e-util/test-keyfile-settings-backend.c b/e-util/test-keyfile-settings-backend.c
index 9e28b23..b3ba28a 100644
--- a/e-util/test-keyfile-settings-backend.c
+++ b/e-util/test-keyfile-settings-backend.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <gio/gio.h>
diff --git a/e-util/test-source-combo-box.c b/e-util/test-source-combo-box.c
index c365aa1..334ba86 100644
--- a/e-util/test-source-combo-box.c
+++ b/e-util/test-source-combo-box.c
@@ -18,7 +18,8 @@
* Author: Ettore Perazzoli <ettore ximian com>
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <gtk/gtk.h>
#include <e-util/e-util.h>
diff --git a/em-format/e-mail-formatter-attachment.c b/em-format/e-mail-formatter-attachment.c
index 86a39ef..7430fb2 100644
--- a/em-format/e-mail-formatter-attachment.c
+++ b/em-format/e-mail-formatter-attachment.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-audio.c b/em-format/e-mail-formatter-audio.c
index 2837000..eaaf382 100644
--- a/em-format/e-mail-formatter-audio.c
+++ b/em-format/e-mail-formatter-audio.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-error.c b/em-format/e-mail-formatter-error.c
index 10993d7..40fe2b9 100644
--- a/em-format/e-mail-formatter-error.c
+++ b/em-format/e-mail-formatter-error.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-headers.c b/em-format/e-mail-formatter-headers.c
index 2affbe1..a397cb0 100644
--- a/em-format/e-mail-formatter-headers.c
+++ b/em-format/e-mail-formatter-headers.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-image.c b/em-format/e-mail-formatter-image.c
index 619082f..70ca898 100644
--- a/em-format/e-mail-formatter-image.c
+++ b/em-format/e-mail-formatter-image.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-message-rfc822.c b/em-format/e-mail-formatter-message-rfc822.c
index 7f8d6ef..2e77d9f 100644
--- a/em-format/e-mail-formatter-message-rfc822.c
+++ b/em-format/e-mail-formatter-message-rfc822.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-print-headers.c b/em-format/e-mail-formatter-print-headers.c
index ae2e5c1..a7e8eb2 100644
--- a/em-format/e-mail-formatter-print-headers.c
+++ b/em-format/e-mail-formatter-print-headers.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-quote-headers.c b/em-format/e-mail-formatter-quote-headers.c
index 68212d7..01a77dd 100644
--- a/em-format/e-mail-formatter-quote-headers.c
+++ b/em-format/e-mail-formatter-quote-headers.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-quote-message-rfc822.c
b/em-format/e-mail-formatter-quote-message-rfc822.c
index 7ed0bd4..3dc59ba 100644
--- a/em-format/e-mail-formatter-quote-message-rfc822.c
+++ b/em-format/e-mail-formatter-quote-message-rfc822.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-quote-text-enriched.c
b/em-format/e-mail-formatter-quote-text-enriched.c
index 679ab7c..0dc761e 100644
--- a/em-format/e-mail-formatter-quote-text-enriched.c
+++ b/em-format/e-mail-formatter-quote-text-enriched.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-quote-text-html.c b/em-format/e-mail-formatter-quote-text-html.c
index 8c6433c..32fa8a7 100644
--- a/em-format/e-mail-formatter-quote-text-html.c
+++ b/em-format/e-mail-formatter-quote-text-html.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-quote-text-plain.c b/em-format/e-mail-formatter-quote-text-plain.c
index 0b13f5e..817613d 100644
--- a/em-format/e-mail-formatter-quote-text-plain.c
+++ b/em-format/e-mail-formatter-quote-text-plain.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-secure-button.c b/em-format/e-mail-formatter-secure-button.c
index 80cfb09..7eca64f 100644
--- a/em-format/e-mail-formatter-secure-button.c
+++ b/em-format/e-mail-formatter-secure-button.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-source.c b/em-format/e-mail-formatter-source.c
index ed7304f..6c2ecf5 100644
--- a/em-format/e-mail-formatter-source.c
+++ b/em-format/e-mail-formatter-source.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-text-enriched.c b/em-format/e-mail-formatter-text-enriched.c
index 31cc8eb..dc26dcd 100644
--- a/em-format/e-mail-formatter-text-enriched.c
+++ b/em-format/e-mail-formatter-text-enriched.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-text-html.c b/em-format/e-mail-formatter-text-html.c
index 7f4a81c..1afcf15 100644
--- a/em-format/e-mail-formatter-text-html.c
+++ b/em-format/e-mail-formatter-text-html.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <string.h>
diff --git a/em-format/e-mail-formatter-text-plain.c b/em-format/e-mail-formatter-text-plain.c
index 39ab253..d816d98 100644
--- a/em-format/e-mail-formatter-text-plain.c
+++ b/em-format/e-mail-formatter-text-plain.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-formatter-utils.c b/em-format/e-mail-formatter-utils.c
index b890c45..b24167d 100644
--- a/em-format/e-mail-formatter-utils.c
+++ b/em-format/e-mail-formatter-utils.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-formatter-utils.h"
#include "e-mail-part-headers.h"
diff --git a/em-format/e-mail-inline-filter.c b/em-format/e-mail-inline-filter.c
index f52e970..91bfcfc 100644
--- a/em-format/e-mail-inline-filter.c
+++ b/em-format/e-mail-inline-filter.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/em-format/e-mail-parser-application-mbox.c b/em-format/e-mail-parser-application-mbox.c
index 21c2426..c4e9ecd 100644
--- a/em-format/e-mail-parser-application-mbox.c
+++ b/em-format/e-mail-parser-application-mbox.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-application-smime.c b/em-format/e-mail-parser-application-smime.c
index f3673bf..c7e631b 100644
--- a/em-format/e-mail-parser-application-smime.c
+++ b/em-format/e-mail-parser-application-smime.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-audio.c b/em-format/e-mail-parser-audio.c
index 974d2fa..a29434a 100644
--- a/em-format/e-mail-parser-audio.c
+++ b/em-format/e-mail-parser-audio.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-headers.c b/em-format/e-mail-parser-headers.c
index 2d446a3..c1ac5a4 100644
--- a/em-format/e-mail-parser-headers.c
+++ b/em-format/e-mail-parser-headers.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-image.c b/em-format/e-mail-parser-image.c
index 7f4d854..3a0bc99 100644
--- a/em-format/e-mail-parser-image.c
+++ b/em-format/e-mail-parser-image.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-inlinepgp-encrypted.c b/em-format/e-mail-parser-inlinepgp-encrypted.c
index bdabcb8..3a19d8c 100644
--- a/em-format/e-mail-parser-inlinepgp-encrypted.c
+++ b/em-format/e-mail-parser-inlinepgp-encrypted.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-inlinepgp-signed.c b/em-format/e-mail-parser-inlinepgp-signed.c
index 84f38bd..2ac8c3a 100644
--- a/em-format/e-mail-parser-inlinepgp-signed.c
+++ b/em-format/e-mail-parser-inlinepgp-signed.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-message-deliverystatus.c
b/em-format/e-mail-parser-message-deliverystatus.c
index bbf26de..f85e8d1 100644
--- a/em-format/e-mail-parser-message-deliverystatus.c
+++ b/em-format/e-mail-parser-message-deliverystatus.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/em-format/e-mail-parser-message-external.c b/em-format/e-mail-parser-message-external.c
index 72fa66a..a8f191e 100644
--- a/em-format/e-mail-parser-message-external.c
+++ b/em-format/e-mail-parser-message-external.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <ctype.h>
diff --git a/em-format/e-mail-parser-message-rfc822.c b/em-format/e-mail-parser-message-rfc822.c
index 372b801..f690502 100644
--- a/em-format/e-mail-parser-message-rfc822.c
+++ b/em-format/e-mail-parser-message-rfc822.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-message.c b/em-format/e-mail-parser-message.c
index 0a3b77f..ab18eba 100644
--- a/em-format/e-mail-parser-message.c
+++ b/em-format/e-mail-parser-message.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-multipart-alternative.c b/em-format/e-mail-parser-multipart-alternative.c
index e023b9c..5853b12 100644
--- a/em-format/e-mail-parser-multipart-alternative.c
+++ b/em-format/e-mail-parser-multipart-alternative.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/em-format/e-mail-parser-multipart-appledouble.c b/em-format/e-mail-parser-multipart-appledouble.c
index cc74fbc..8845f73 100644
--- a/em-format/e-mail-parser-multipart-appledouble.c
+++ b/em-format/e-mail-parser-multipart-appledouble.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-parser-extension.h"
diff --git a/em-format/e-mail-parser-multipart-digest.c b/em-format/e-mail-parser-multipart-digest.c
index 83e902c..d8fd277 100644
--- a/em-format/e-mail-parser-multipart-digest.c
+++ b/em-format/e-mail-parser-multipart-digest.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/em-format/e-mail-parser-multipart-encrypted.c b/em-format/e-mail-parser-multipart-encrypted.c
index 6c8a65e..11daa2d 100644
--- a/em-format/e-mail-parser-multipart-encrypted.c
+++ b/em-format/e-mail-parser-multipart-encrypted.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-multipart-mixed.c b/em-format/e-mail-parser-multipart-mixed.c
index 432fef4..480cb12 100644
--- a/em-format/e-mail-parser-multipart-mixed.c
+++ b/em-format/e-mail-parser-multipart-mixed.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/em-format/e-mail-parser-multipart-related.c b/em-format/e-mail-parser-multipart-related.c
index 6e9956a..f105829 100644
--- a/em-format/e-mail-parser-multipart-related.c
+++ b/em-format/e-mail-parser-multipart-related.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/em-format/e-mail-parser-multipart-signed.c b/em-format/e-mail-parser-multipart-signed.c
index f90d645..a76ca61 100644
--- a/em-format/e-mail-parser-multipart-signed.c
+++ b/em-format/e-mail-parser-multipart-signed.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-secure-button.c b/em-format/e-mail-parser-secure-button.c
index e458598..574fce7 100644
--- a/em-format/e-mail-parser-secure-button.c
+++ b/em-format/e-mail-parser-secure-button.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-source.c b/em-format/e-mail-parser-source.c
index ac18571..4faf56b 100644
--- a/em-format/e-mail-parser-source.c
+++ b/em-format/e-mail-parser-source.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-text-enriched.c b/em-format/e-mail-parser-text-enriched.c
index 5238149..28ad435 100644
--- a/em-format/e-mail-parser-text-enriched.c
+++ b/em-format/e-mail-parser-text-enriched.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-text-html.c b/em-format/e-mail-parser-text-html.c
index 8765ab3..25578e0 100644
--- a/em-format/e-mail-parser-text-html.c
+++ b/em-format/e-mail-parser-text-html.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser-text-plain.c b/em-format/e-mail-parser-text-plain.c
index aa5c55a..572a84f 100644
--- a/em-format/e-mail-parser-text-plain.c
+++ b/em-format/e-mail-parser-text-plain.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <ctype.h>
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-parser.c b/em-format/e-mail-parser.c
index 335bee9..2ad5892 100644
--- a/em-format/e-mail-parser.c
+++ b/em-format/e-mail-parser.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-parser.h"
diff --git a/em-format/e-mail-part-headers.c b/em-format/e-mail-part-headers.c
index 1908c77..da37b81 100644
--- a/em-format/e-mail-part-headers.c
+++ b/em-format/e-mail-part-headers.c
@@ -15,12 +15,12 @@
*
*/
-#include "e-mail-part-headers.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "e-mail-part-list.h"
+#include "e-mail-part-headers.h"
#define E_MAIL_PART_HEADERS_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/em-format/e-mail-part-secure-button.c b/em-format/e-mail-part-secure-button.c
index 51ff633..9351e9d 100644
--- a/em-format/e-mail-part-secure-button.c
+++ b/em-format/e-mail-part-secure-button.c
@@ -13,9 +13,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-part-utils.c b/em-format/e-mail-part-utils.c
index 0568a35..011a041 100644
--- a/em-format/e-mail-part-utils.c
+++ b/em-format/e-mail-part-utils.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/em-format/e-mail-part.c b/em-format/e-mail-part.c
index fbfb332..3b16025 100644
--- a/em-format/e-mail-part.c
+++ b/em-format/e-mail-part.c
@@ -26,9 +26,7 @@
* message.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-part.h"
diff --git a/em-format/e-mail-stripsig-filter.c b/em-format/e-mail-stripsig-filter.c
index 0371cac..e50cee7 100644
--- a/em-format/e-mail-stripsig-filter.c
+++ b/em-format/e-mail-stripsig-filter.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/libemail-engine/camel-null-store.c b/libemail-engine/camel-null-store.c
index 19d8b19..509c934 100644
--- a/libemail-engine/camel-null-store.c
+++ b/libemail-engine/camel-null-store.c
@@ -15,11 +15,12 @@
*
*/
-#include "camel-null-store.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "camel-null-store.h"
+
G_DEFINE_TYPE (CamelNullStore, camel_null_store, CAMEL_TYPE_STORE)
static CamelProvider null_provider = {
diff --git a/libemail-engine/camel-sasl-oauth2-google.c b/libemail-engine/camel-sasl-oauth2-google.c
index 1275c62..2c89750 100644
--- a/libemail-engine/camel-sasl-oauth2-google.c
+++ b/libemail-engine/camel-sasl-oauth2-google.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/libemail-engine/camel-sasl-xoauth2.c b/libemail-engine/camel-sasl-xoauth2.c
index 2402f0d..ab71197 100644
--- a/libemail-engine/camel-sasl-xoauth2.c
+++ b/libemail-engine/camel-sasl-xoauth2.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include "camel-sasl-xoauth2.h"
diff --git a/libemail-engine/e-mail-folder-utils.c b/libemail-engine/e-mail-folder-utils.c
index 6a7e69b..0667962 100644
--- a/libemail-engine/e-mail-folder-utils.c
+++ b/libemail-engine/e-mail-folder-utils.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-folder-utils.h"
diff --git a/libemail-engine/e-mail-session-utils.c b/libemail-engine/e-mail-session-utils.c
index 3f84376..20ba4aa 100644
--- a/libemail-engine/e-mail-session-utils.c
+++ b/libemail-engine/e-mail-session-utils.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-session-utils.h"
diff --git a/libemail-engine/e-mail-session.c b/libemail-engine/e-mail-session.c
index 23f1ad8..fc612bc 100644
--- a/libemail-engine/e-mail-session.c
+++ b/libemail-engine/e-mail-session.c
@@ -24,9 +24,7 @@
/* mail-session.c: handles the session information and resource manipulation */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/libemail-engine/e-mail-store-utils.c b/libemail-engine/e-mail-store-utils.c
index 34a1a1a..34a4a32 100644
--- a/libemail-engine/e-mail-store-utils.c
+++ b/libemail-engine/e-mail-store-utils.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-folder-utils.h"
#include "e-mail-utils.h"
diff --git a/libemail-engine/em-filter-folder-element.c b/libemail-engine/em-filter-folder-element.c
index 8a88823..fec0e0b 100644
--- a/libemail-engine/em-filter-folder-element.c
+++ b/libemail-engine/em-filter-folder-element.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-filter-folder-element.h"
diff --git a/libemail-engine/em-vfolder-context.c b/libemail-engine/em-vfolder-context.c
index 43ee3f2..3a58c59 100644
--- a/libemail-engine/em-vfolder-context.c
+++ b/libemail-engine/em-vfolder-context.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-vfolder-context.h"
diff --git a/libemail-engine/em-vfolder-rule.c b/libemail-engine/em-vfolder-rule.c
index 3a6ffa3..794e209 100644
--- a/libemail-engine/em-vfolder-rule.c
+++ b/libemail-engine/em-vfolder-rule.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/libemail-engine/mail-config.c b/libemail-engine/mail-config.c
index 68834b9..8834745 100644
--- a/libemail-engine/mail-config.c
+++ b/libemail-engine/mail-config.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/libemail-engine/mail-folder-cache.c b/libemail-engine/mail-folder-cache.c
index 96093b2..8c8b380 100644
--- a/libemail-engine/mail-folder-cache.c
+++ b/libemail-engine/mail-folder-cache.c
@@ -27,9 +27,7 @@
* @short_description: Stores information about open folders
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <string.h>
diff --git a/libemail-engine/mail-mt.c b/libemail-engine/mail-mt.c
index d97f120..a612ff8 100644
--- a/libemail-engine/mail-mt.c
+++ b/libemail-engine/mail-mt.c
@@ -14,9 +14,7 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c
index f1dc8f3..7790e3a 100644
--- a/libemail-engine/mail-ops.c
+++ b/libemail-engine/mail-ops.c
@@ -24,9 +24,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
diff --git a/libemail-engine/mail-tools.c b/libemail-engine/mail-tools.c
index 061ebb9..5f3334d 100644
--- a/libemail-engine/mail-tools.c
+++ b/libemail-engine/mail-tools.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/libemail-engine/mail-vfolder.c b/libemail-engine/mail-vfolder.c
index 5c8c594..eadd318 100644
--- a/libemail-engine/mail-vfolder.c
+++ b/libemail-engine/mail-vfolder.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "mail-vfolder.h"
diff --git a/libgnomecanvas/gailcanvas.c b/libgnomecanvas/gailcanvas.c
index 61a9124..6cfd504 100644
--- a/libgnomecanvas/gailcanvas.c
+++ b/libgnomecanvas/gailcanvas.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
diff --git a/libgnomecanvas/gailcanvasgroup.c b/libgnomecanvas/gailcanvasgroup.c
index e64032c..c478f6e 100644
--- a/libgnomecanvas/gailcanvasgroup.c
+++ b/libgnomecanvas/gailcanvasgroup.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
diff --git a/libgnomecanvas/gailcanvasgroupfactory.c b/libgnomecanvas/gailcanvasgroupfactory.c
index 0563a8a..fb2a49c 100644
--- a/libgnomecanvas/gailcanvasgroupfactory.c
+++ b/libgnomecanvas/gailcanvasgroupfactory.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include "gailcanvasgroupfactory.h"
diff --git a/libgnomecanvas/gailcanvasitem.c b/libgnomecanvas/gailcanvasitem.c
index 31f38d7..e62bdfd 100644
--- a/libgnomecanvas/gailcanvasitem.c
+++ b/libgnomecanvas/gailcanvasitem.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <gtk/gtk.h>
diff --git a/libgnomecanvas/gailcanvasitemfactory.c b/libgnomecanvas/gailcanvasitemfactory.c
index 28f6811..7104452 100644
--- a/libgnomecanvas/gailcanvasitemfactory.c
+++ b/libgnomecanvas/gailcanvasitemfactory.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include "gailcanvasitemfactory.h"
diff --git a/libgnomecanvas/gailcanvastext.c b/libgnomecanvas/gailcanvastext.c
index 6a658d6..4026bfd 100644
--- a/libgnomecanvas/gailcanvastext.c
+++ b/libgnomecanvas/gailcanvastext.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <libgnomecanvas/libgnomecanvas.h>
diff --git a/libgnomecanvas/gailcanvastextfactory.c b/libgnomecanvas/gailcanvastextfactory.c
index fd8ea26..6d0f3bd 100644
--- a/libgnomecanvas/gailcanvastextfactory.c
+++ b/libgnomecanvas/gailcanvastextfactory.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include "gailcanvastextfactory.h"
diff --git a/libgnomecanvas/gailcanvaswidget.c b/libgnomecanvas/gailcanvaswidget.c
index 003b5d3..4ec3efa 100644
--- a/libgnomecanvas/gailcanvaswidget.c
+++ b/libgnomecanvas/gailcanvaswidget.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <libgnomecanvas/gnome-canvas.h>
diff --git a/libgnomecanvas/gailcanvaswidgetfactory.c b/libgnomecanvas/gailcanvaswidgetfactory.c
index fff58aa..27b3ca4 100644
--- a/libgnomecanvas/gailcanvaswidgetfactory.c
+++ b/libgnomecanvas/gailcanvaswidgetfactory.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "gailcanvaswidgetfactory.h"
#include "gailcanvaswidget.h"
diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c
index 87c3c26..796bd86 100644
--- a/libgnomecanvas/gnome-canvas-pixbuf.c
+++ b/libgnomecanvas/gnome-canvas-pixbuf.c
@@ -17,9 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <libgnomecanvas/gnome-canvas.h>
diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c
index eefdb12..a966dd8 100644
--- a/libgnomecanvas/gnome-canvas-rect.c
+++ b/libgnomecanvas/gnome-canvas-rect.c
@@ -18,9 +18,7 @@
/* These includes are set up for standalone compile. If/when this codebase
* is integrated into libgnomeui, the includes will need to change. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <string.h>
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index 5480551..43e6e76 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -32,9 +32,7 @@
* Port to Pango co-done by Gerg� �rdi <cactus cactus rulez org>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <string.h>
diff --git a/libgnomecanvas/gnome-canvas-util.c b/libgnomecanvas/gnome-canvas-util.c
index 76b2c0a..60e70ff 100644
--- a/libgnomecanvas/gnome-canvas-util.c
+++ b/libgnomecanvas/gnome-canvas-util.c
@@ -29,9 +29,7 @@
* Author: Federico Mena <federico nuclecu unam mx>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
/* needed for M_PI_2 under 'gcc -ansi -predantic' on GNU/Linux */
#ifndef _DEFAULT_SOURCE
diff --git a/libgnomecanvas/gnome-canvas-widget.c b/libgnomecanvas/gnome-canvas-widget.c
index ea31b3a..7593970 100644
--- a/libgnomecanvas/gnome-canvas-widget.c
+++ b/libgnomecanvas/gnome-canvas-widget.c
@@ -29,9 +29,7 @@
* Author: Federico Mena <federico nuclecu unam mx>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include "gnome-canvas-widget.h"
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index fecce97..6412673 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -74,9 +74,7 @@
* - Add more image loading techniques to work around imlib deficiencies.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <math.h>
#include <string.h>
diff --git a/mail/e-cid-request.c b/mail/e-cid-request.c
index e7529f7..69fd326 100644
--- a/mail/e-cid-request.c
+++ b/mail/e-cid-request.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/mail/e-http-request.c b/mail/e-http-request.c
index 9e7711b..f956c80 100644
--- a/mail/e-http-request.c
+++ b/mail/e-http-request.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/mail/e-mail-account-manager.c b/mail/e-mail-account-manager.c
index 48ca8e6..06488b4 100644
--- a/mail/e-mail-account-manager.c
+++ b/mail/e-mail-account-manager.c
@@ -15,16 +15,17 @@
*
*/
-#include "e-mail-account-manager.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <gdk/gdkkeysyms.h>
#include <e-util/e-util.h>
#include <libemail-engine/libemail-engine.h>
-#include <mail/e-mail-account-tree-view.h>
+#include "e-mail-account-tree-view.h"
+
+#include "e-mail-account-manager.h"
#define E_MAIL_ACCOUNT_MANAGER_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-account-store.c b/mail/e-mail-account-store.c
index 8fd06e8..ea84c87 100644
--- a/mail/e-mail-account-store.c
+++ b/mail/e-mail-account-store.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-account-store.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gstdio.h>
#include <glib/gi18n-lib.h>
@@ -25,7 +24,9 @@
#include <libemail-engine/libemail-engine.h>
-#include <mail/mail-vfolder-ui.h>
+#include "mail-vfolder-ui.h"
+
+#include "e-mail-account-store.h"
#define E_MAIL_ACCOUNT_STORE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-account-tree-view.c b/mail/e-mail-account-tree-view.c
index c7c824e..ea313f0 100644
--- a/mail/e-mail-account-tree-view.c
+++ b/mail/e-mail-account-tree-view.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-account-tree-view.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-account-tree-view.h"
+
#define E_MAIL_ACCOUNT_TREE_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_ACCOUNT_TREE_VIEW, EMailAccountTreeViewPrivate))
diff --git a/mail/e-mail-autoconfig.c b/mail/e-mail-autoconfig.c
index c7cc0b3..bfd2fc4 100644
--- a/mail/e-mail-autoconfig.c
+++ b/mail/e-mail-autoconfig.c
@@ -61,15 +61,16 @@
* Recording my thoughts here for posterity. -- mbarnes
*/
-#include "e-mail-autoconfig.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
/* For error codes. */
#include <libsoup/soup.h>
+#include "e-mail-autoconfig.h"
+
#define E_MAIL_AUTOCONFIG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_AUTOCONFIG, EMailAutoconfigPrivate))
diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c
index 3483017..9e76425 100644
--- a/mail/e-mail-backend.c
+++ b/mail/e-mail-backend.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-backend.h"
diff --git a/mail/e-mail-browser.c b/mail/e-mail-browser.c
index 2186a72..5809256 100644
--- a/mail/e-mail-browser.c
+++ b/mail/e-mail-browser.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-browser.h"
diff --git a/mail/e-mail-config-assistant.c b/mail/e-mail-config-assistant.c
index 3363c21..6240bdc 100644
--- a/mail/e-mail-config-assistant.c
+++ b/mail/e-mail-config-assistant.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-config-assistant.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
@@ -27,17 +26,19 @@
#include <shell/e-shell-view.h>
#include <shell/e-shell-sidebar.h>
-#include <mail/e-mail-config-confirm-page.h>
-#include <mail/e-mail-config-identity-page.h>
-#include <mail/e-mail-config-lookup-page.h>
-#include <mail/e-mail-config-provider-page.h>
-#include <mail/e-mail-config-receiving-page.h>
-#include <mail/e-mail-config-sending-page.h>
-#include <mail/e-mail-config-summary-page.h>
-#include <mail/e-mail-config-welcome-page.h>
+#include "e-mail-config-confirm-page.h"
+#include "e-mail-config-identity-page.h"
+#include "e-mail-config-lookup-page.h"
+#include "e-mail-config-provider-page.h"
+#include "e-mail-config-receiving-page.h"
+#include "e-mail-config-sending-page.h"
+#include "e-mail-config-summary-page.h"
+#include "e-mail-config-welcome-page.h"
#include "em-folder-tree.h"
+#include "e-mail-config-assistant.h"
+
#define E_MAIL_CONFIG_ASSISTANT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_ASSISTANT, EMailConfigAssistantPrivate))
diff --git a/mail/e-mail-config-auth-check.c b/mail/e-mail-config-auth-check.c
index eb7adc8..3284fb8 100644
--- a/mail/e-mail-config-auth-check.c
+++ b/mail/e-mail-config-auth-check.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include "e-util/e-util.h"
diff --git a/mail/e-mail-config-confirm-page.c b/mail/e-mail-config-confirm-page.c
index 1882f0f..d943001 100644
--- a/mail/e-mail-config-confirm-page.c
+++ b/mail/e-mail-config-confirm-page.c
@@ -15,13 +15,14 @@
*
*/
-#include "e-mail-config-confirm-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
+#include "e-mail-config-confirm-page.h"
+
#define E_MAIL_CONFIG_CONFIRM_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_CONFIRM_PAGE, EMailConfigConfirmPagePrivate))
diff --git a/mail/e-mail-config-defaults-page.c b/mail/e-mail-config-defaults-page.c
index bf1399d..ed33f85 100644
--- a/mail/e-mail-config-defaults-page.c
+++ b/mail/e-mail-config-defaults-page.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/mail/e-mail-config-identity-page.c b/mail/e-mail-config-identity-page.c
index 5baa5f5..7c60091 100644
--- a/mail/e-mail-config-identity-page.c
+++ b/mail/e-mail-config-identity-page.c
@@ -15,14 +15,14 @@
*
*/
-#include "e-mail-config-identity-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
#include "e-util/e-util.h"
+#include "e-mail-config-identity-page.h"
#define E_MAIL_CONFIG_IDENTITY_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-config-lookup-page.c b/mail/e-mail-config-lookup-page.c
index 22cbf51..9c0c21a 100644
--- a/mail/e-mail-config-lookup-page.c
+++ b/mail/e-mail-config-lookup-page.c
@@ -14,9 +14,8 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/mail/e-mail-config-page.c b/mail/e-mail-config-page.c
index 05d87f5..c9795aa 100644
--- a/mail/e-mail-config-page.c
+++ b/mail/e-mail-config-page.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-config-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
@@ -25,6 +24,8 @@
#include <e-util/e-marshal.h>
#include <e-util/e-util.h>
+#include "e-mail-config-page.h"
+
enum {
CHANGED,
SETUP_DEFAULTS,
diff --git a/mail/e-mail-config-provider-page.c b/mail/e-mail-config-provider-page.c
index 46858ae..4b82c73 100644
--- a/mail/e-mail-config-provider-page.c
+++ b/mail/e-mail-config-provider-page.c
@@ -15,14 +15,15 @@
*
*/
-#include "e-mail-config-provider-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
+#include "e-mail-config-provider-page.h"
+
#define E_MAIL_CONFIG_PROVIDER_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_PROVIDER_PAGE, EMailConfigProviderPagePrivate))
diff --git a/mail/e-mail-config-receiving-page.c b/mail/e-mail-config-receiving-page.c
index b289ef8..a2be696 100644
--- a/mail/e-mail-config-receiving-page.c
+++ b/mail/e-mail-config-receiving-page.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-config-receiving-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-config-receiving-page.h"
+
/* Forward Declarations */
static void e_mail_config_receiving_page_interface_init
(EMailConfigPageInterface *iface);
diff --git a/mail/e-mail-config-security-page.c b/mail/e-mail-config-security-page.c
index 0a6f52f..95f666d 100644
--- a/mail/e-mail-config-security-page.c
+++ b/mail/e-mail-config-security-page.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-config-security-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <e-util/e-util.h>
@@ -33,6 +32,8 @@
#undef LIBCRYPTUI_API_SUBJECT_TO_CHANGE
#endif /* HAVE_LIBCRYPTUI */
+#include "e-mail-config-security-page.h"
+
#define E_MAIL_CONFIG_SECURITY_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_SECURITY_PAGE, EMailConfigSecurityPagePrivate))
diff --git a/mail/e-mail-config-sending-page.c b/mail/e-mail-config-sending-page.c
index 56d39de..17c8374 100644
--- a/mail/e-mail-config-sending-page.c
+++ b/mail/e-mail-config-sending-page.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-config-sending-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-config-sending-page.h"
+
/* Forward Declarations */
static void e_mail_config_sending_page_interface_init
(EMailConfigPageInterface *iface);
diff --git a/mail/e-mail-config-service-page.c b/mail/e-mail-config-service-page.c
index d7747a5..a3ed3ae 100644
--- a/mail/e-mail-config-service-page.c
+++ b/mail/e-mail-config-service-page.c
@@ -15,16 +15,17 @@
*
*/
-#include "e-mail-config-service-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
#include <libebackend/libebackend.h>
-#include <mail/e-mail-config-page.h>
-#include <mail/e-mail-config-service-notebook.h>
+#include "e-mail-config-page.h"
+#include "e-mail-config-service-notebook.h"
+
+#include "e-mail-config-service-page.h"
#define E_MAIL_CONFIG_SERVICE_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-config-summary-page.c b/mail/e-mail-config-summary-page.c
index 417187b..5c692ca 100644
--- a/mail/e-mail-config-summary-page.c
+++ b/mail/e-mail-config-summary-page.c
@@ -15,15 +15,16 @@
*
*/
-#include "e-mail-config-summary-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
#include <libebackend/libebackend.h>
#include <e-util/e-util.h>
+#include "e-mail-config-summary-page.h"
+
#define E_MAIL_CONFIG_SUMMARY_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_SUMMARY_PAGE, EMailConfigSummaryPagePrivate))
diff --git a/mail/e-mail-config-welcome-page.c b/mail/e-mail-config-welcome-page.c
index edb249a..fdf13cc 100644
--- a/mail/e-mail-config-welcome-page.c
+++ b/mail/e-mail-config-welcome-page.c
@@ -15,14 +15,15 @@
*
*/
-#include "e-mail-config-welcome-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <e-util/e-util.h>
#include <libebackend/libebackend.h>
+#include "e-mail-config-welcome-page.h"
+
#define E_MAIL_CONFIG_WELCOME_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_WELCOME_PAGE, EMailConfigWelcomePagePrivate))
diff --git a/mail/e-mail-config-window.c b/mail/e-mail-config-window.c
index db92465..5727ea2 100644
--- a/mail/e-mail-config-window.c
+++ b/mail/e-mail-config-window.c
@@ -15,15 +15,16 @@
*
*/
-#include "e-mail-config-window.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "e-util/e-util.h"
-#include "mail/e-mail-config-notebook.h"
-#include "mail/e-mail-config-sidebar.h"
+#include "e-mail-config-notebook.h"
+#include "e-mail-config-sidebar.h"
+
+#include "e-mail-config-window.h"
#define E_MAIL_CONFIG_WINDOW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-display.c b/mail/e-mail-display.c
index 5fc90f7..f26a188 100644
--- a/mail/e-mail-display.c
+++ b/mail/e-mail-display.c
@@ -18,9 +18,8 @@
*
*/
-#include "e-mail-display.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
@@ -43,7 +42,9 @@
#include "em-composer-utils.h"
#include "em-utils.h"
-#include <web-extensions/e-web-extension-names.h>
+#include "web-extensions/e-web-extension-names.h"
+
+#include "e-mail-display.h"
#define d(x)
diff --git a/mail/e-mail-folder-create-dialog.c b/mail/e-mail-folder-create-dialog.c
index 0192614..9d32b54 100644
--- a/mail/e-mail-folder-create-dialog.c
+++ b/mail/e-mail-folder-create-dialog.c
@@ -15,14 +15,15 @@
*
*/
-#include "e-mail-folder-create-dialog.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include "em-vfolder-editor-rule.h"
#include "mail-vfolder-ui.h"
+#include "e-mail-folder-create-dialog.h"
+
#define E_MAIL_FOLDER_CREATE_DIALOG_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_FOLDER_CREATE_DIALOG, EMailFolderCreateDialogPrivate))
diff --git a/mail/e-mail-folder-pane.c b/mail/e-mail-folder-pane.c
index 8a6c7bd..1c689a7 100644
--- a/mail/e-mail-folder-pane.c
+++ b/mail/e-mail-folder-pane.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-folder-pane.h"
diff --git a/mail/e-mail-free-form-exp.c b/mail/e-mail-free-form-exp.c
index 39af793..62af45a 100644
--- a/mail/e-mail-free-form-exp.c
+++ b/mail/e-mail-free-form-exp.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/mail/e-mail-junk-options.c b/mail/e-mail-junk-options.c
index 975bd36..4397556 100644
--- a/mail/e-mail-junk-options.c
+++ b/mail/e-mail-junk-options.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-junk-options.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-junk-options.h"
+
#define E_MAIL_JUNK_OPTIONS_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_JUNK_OPTIONS, EMailJunkOptionsPrivate))
diff --git a/mail/e-mail-label-action.c b/mail/e-mail-label-action.c
index 9aceb39..dceb585 100644
--- a/mail/e-mail-label-action.c
+++ b/mail/e-mail-label-action.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libedataserver/libedataserver.h>
diff --git a/mail/e-mail-label-dialog.c b/mail/e-mail-label-dialog.c
index eb02461..43aa5be 100644
--- a/mail/e-mail-label-dialog.c
+++ b/mail/e-mail-label-dialog.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-label-dialog.h"
diff --git a/mail/e-mail-label-list-store.c b/mail/e-mail-label-list-store.c
index 774495a..991bac7 100644
--- a/mail/e-mail-label-list-store.c
+++ b/mail/e-mail-label-list-store.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-label-list-store.h"
diff --git a/mail/e-mail-label-manager.c b/mail/e-mail-label-manager.c
index ac0e0d3..d0d86aa 100644
--- a/mail/e-mail-label-manager.c
+++ b/mail/e-mail-label-manager.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-label-manager.h"
diff --git a/mail/e-mail-label-tree-view.c b/mail/e-mail-label-tree-view.c
index 16a4fba..ab2ec60 100644
--- a/mail/e-mail-label-tree-view.c
+++ b/mail/e-mail-label-tree-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-label-tree-view.h"
diff --git a/mail/e-mail-message-pane.c b/mail/e-mail-message-pane.c
index 0249d82..d5f49ab 100644
--- a/mail/e-mail-message-pane.c
+++ b/mail/e-mail-message-pane.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-message-pane.h"
diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c
index 1ff2f6b..50fdf2b 100644
--- a/mail/e-mail-migrate.c
+++ b/mail/e-mail-migrate.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-migrate.h"
diff --git a/mail/e-mail-notes.c b/mail/e-mail-notes.c
index 94a8396..a917360 100644
--- a/mail/e-mail-notes.c
+++ b/mail/e-mail-notes.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdio.h>
diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index cf5635e..b038fe2 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -19,9 +19,8 @@
*
*/
-#include "e-mail-paned-view.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n.h>
#include <shell/e-shell-window-actions.h>
@@ -32,6 +31,8 @@
#include "message-list.h"
#include "e-mail-reader-utils.h"
+#include "e-mail-paned-view.h"
+
#define E_MAIL_PANED_VIEW_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_PANED_VIEW, EMailPanedViewPrivate))
diff --git a/mail/e-mail-print-config-headers.c b/mail/e-mail-print-config-headers.c
index e58b3e0..9b5bfbd 100644
--- a/mail/e-mail-print-config-headers.c
+++ b/mail/e-mail-print-config-headers.c
@@ -15,13 +15,14 @@
*
*/
-#include "e-mail-print-config-headers.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <em-format/e-mail-formatter-print.h>
+#include "e-mail-print-config-headers.h"
+
#define E_MAIL_PRINT_CONFIG_HEADERS_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_PRINT_CONFIG_HEADERS, EMailPrintConfigHeadersPrivate))
diff --git a/mail/e-mail-printer.c b/mail/e-mail-printer.c
index e49f8cd..346407a 100644
--- a/mail/e-mail-printer.c
+++ b/mail/e-mail-printer.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/mail/e-mail-properties.c b/mail/e-mail-properties.c
index 47a8e8c..588eff7 100644
--- a/mail/e-mail-properties.c
+++ b/mail/e-mail-properties.c
@@ -15,9 +15,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/mail/e-mail-reader-utils.c b/mail/e-mail-reader-utils.c
index b23d51d..8221cc4 100644
--- a/mail/e-mail-reader-utils.c
+++ b/mail/e-mail-reader-utils.c
@@ -20,9 +20,7 @@
/* Miscellaneous utility functions used by EMailReader actions. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-reader-utils.h"
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index 8fe32f4..be23984 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-reader.h"
diff --git a/mail/e-mail-remote-content.c b/mail/e-mail-remote-content.c
index 57ae1af..f38d541 100644
--- a/mail/e-mail-remote-content.c
+++ b/mail/e-mail-remote-content.c
@@ -15,9 +15,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/mail/e-mail-request.c b/mail/e-mail-request.c
index a5ef505..ba350d6 100644
--- a/mail/e-mail-request.c
+++ b/mail/e-mail-request.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libsoup/soup.h>
diff --git a/mail/e-mail-send-account-override.c b/mail/e-mail-send-account-override.c
index db407de..ad73f72 100644
--- a/mail/e-mail-send-account-override.c
+++ b/mail/e-mail-send-account-override.c
@@ -18,13 +18,14 @@
*
*/
-#include "e-mail-send-account-override.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <libedataserver/libedataserver.h>
+#include "e-mail-send-account-override.h"
+
#define E_MAIL_SEND_ACCOUNT_OVERRIDE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_SEND_ACCOUNT_OVERRIDE, EMailSendAccountOverridePrivate))
diff --git a/mail/e-mail-sidebar.c b/mail/e-mail-sidebar.c
index cf6a20c..2d4f717 100644
--- a/mail/e-mail-sidebar.c
+++ b/mail/e-mail-sidebar.c
@@ -18,13 +18,14 @@
*
*/
-#include "e-mail-sidebar.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <camel/camel.h>
-#include "mail/em-utils.h"
+#include "em-utils.h"
+
+#include "e-mail-sidebar.h"
#define E_MAIL_SIDEBAR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/e-mail-tag-editor.c b/mail/e-mail-tag-editor.c
index 7414d7e..2602241 100644
--- a/mail/e-mail-tag-editor.c
+++ b/mail/e-mail-tag-editor.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-tag-editor.h"
diff --git a/mail/e-mail-ui-session.c b/mail/e-mail-ui-session.c
index fd62835..9fcc2e8 100644
--- a/mail/e-mail-ui-session.c
+++ b/mail/e-mail-ui-session.c
@@ -24,9 +24,7 @@
/* mail-session.c: handles the session information and resource manipulation */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <stdlib.h>
diff --git a/mail/e-mail-view.c b/mail/e-mail-view.c
index f970be8..a9a752f 100644
--- a/mail/e-mail-view.c
+++ b/mail/e-mail-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-view.h"
diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 5eb1cd9..8b9334a 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/mail/em-config.c b/mail/em-config.c
index ed65b60..eeffd6d 100644
--- a/mail/em-config.c
+++ b/mail/em-config.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/mail/em-event.c b/mail/em-event.c
index 34095f1..9beef05 100644
--- a/mail/em-event.c
+++ b/mail/em-event.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/mail/em-filter-context.c b/mail/em-filter-context.c
index 59485a9..da33df6 100644
--- a/mail/em-filter-context.c
+++ b/mail/em-filter-context.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/mail/em-filter-editor-folder-element.c b/mail/em-filter-editor-folder-element.c
index 28bcc9d..246210c 100644
--- a/mail/em-filter-editor-folder-element.c
+++ b/mail/em-filter-editor-folder-element.c
@@ -21,18 +21,19 @@
*
*/
-#include "em-filter-editor-folder-element.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
-#include "mail/em-folder-selection-button.h"
-#include "mail/em-utils.h"
+#include "em-folder-selection-button.h"
+#include "em-utils.h"
#include "shell/e-shell.h"
+#include "em-filter-editor-folder-element.h"
+
#define EM_FILTER_EDITOR_FOLDER_ELEMENT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EM_TYPE_FILTER_EDITOR_FOLDER_ELEMENT, EMFilterEditorFolderElementPrivate))
diff --git a/mail/em-filter-editor.c b/mail/em-filter-editor.c
index f4e0d27..e20983b 100644
--- a/mail/em-filter-editor.c
+++ b/mail/em-filter-editor.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/mail/em-filter-rule.c b/mail/em-filter-rule.c
index cb80e1f..75df5a1 100644
--- a/mail/em-filter-rule.c
+++ b/mail/em-filter-rule.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/mail/em-filter-source-element.c b/mail/em-filter-source-element.c
index 21328ea..dc32d53 100644
--- a/mail/em-filter-source-element.c
+++ b/mail/em-filter-source-element.c
@@ -20,9 +20,8 @@
*
*/
-#include "em-filter-source-element.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <gtk/gtk.h>
@@ -33,6 +32,8 @@
#include "e-mail-account-store.h"
#include "e-mail-ui-session.h"
+#include "em-filter-source-element.h"
+
#define EM_FILTER_SOURCE_ELEMENT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EM_TYPE_FILTER_SOURCE_ELEMENT, EMFilterSourceElementPrivate))
diff --git a/mail/em-folder-properties.c b/mail/em-folder-properties.c
index 09ac395..d267b05 100644
--- a/mail/em-folder-properties.c
+++ b/mail/em-folder-properties.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-folder-properties.h"
diff --git a/mail/em-folder-selection-button.c b/mail/em-folder-selection-button.c
index b43eb3e..4119f24 100644
--- a/mail/em-folder-selection-button.c
+++ b/mail/em-folder-selection-button.c
@@ -19,9 +19,8 @@
*
*/
-#include "em-folder-selection-button.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
#include <e-util/e-util.h>
@@ -32,6 +31,8 @@
#include "em-folder-selector.h"
#include "em-utils.h"
+#include "em-folder-selection-button.h"
+
#define EM_FOLDER_SELECTION_BUTTON_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EM_TYPE_FOLDER_SELECTION_BUTTON, EMFolderSelectionButtonPrivate))
diff --git a/mail/em-folder-selector.c b/mail/em-folder-selector.c
index 6f78e35..67cac64 100644
--- a/mail/em-folder-selector.c
+++ b/mail/em-folder-selector.c
@@ -20,9 +20,8 @@
*
*/
-#include "em-folder-selector.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
@@ -34,6 +33,8 @@
#include "em-folder-utils.h"
#include "em-utils.h"
+#include "em-folder-selector.h"
+
#define d(x)
#define EM_FOLDER_SELECTOR_GET_PRIVATE(obj) \
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index 37480d9..2d76046 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -19,9 +19,8 @@
*
*/
-#include "em-folder-tree-model.h"
+#include "evolution-config.h"
-#include <config.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@@ -41,6 +40,8 @@
#include "em-folder-utils.h"
#include "em-event.h"
+#include "em-folder-tree-model.h"
+
#define EM_FOLDER_TREE_MODEL_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EM_TYPE_FOLDER_TREE_MODEL, EMFolderTreeModelPrivate))
diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c
index ce5ab9f..42d3e56 100644
--- a/mail/em-folder-tree.c
+++ b/mail/em-folder-tree.c
@@ -19,9 +19,8 @@
*
*/
-#include "em-folder-tree.h"
+#include "evolution-config.h"
-#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -48,6 +47,8 @@
#include "e-mail-ui-session.h"
+#include "em-folder-tree.h"
+
#define d(x)
#define EM_FOLDER_TREE_GET_PRIVATE(obj) \
diff --git a/mail/em-folder-utils.c b/mail/em-folder-utils.c
index 479d878..2f52d4a 100644
--- a/mail/em-folder-utils.c
+++ b/mail/em-folder-utils.c
@@ -19,9 +19,8 @@
*
*/
-#include "em-folder-utils.h"
+#include "evolution-config.h"
-#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -49,6 +48,8 @@
#include "em-folder-properties.h"
#include "mail-vfolder-ui.h"
+#include "em-folder-utils.h"
+
#define d(x)
static gboolean
diff --git a/mail/em-search-context.c b/mail/em-search-context.c
index e990784..8e9dec9 100644
--- a/mail/em-search-context.c
+++ b/mail/em-search-context.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-search-context.h"
diff --git a/mail/em-subscription-editor.c b/mail/em-subscription-editor.c
index 934b24e..c7027b0 100644
--- a/mail/em-subscription-editor.c
+++ b/mail/em-subscription-editor.c
@@ -15,15 +15,15 @@
*
*/
-#include "em-subscription-editor.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n-lib.h>
#include <e-util/e-util.h>
#include "em-folder-utils.h"
+#include "em-subscription-editor.h"
#define EM_SUBSCRIPTION_EDITOR_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
diff --git a/mail/em-utils.c b/mail/em-utils.c
index c287030..1b55f48 100644
--- a/mail/em-utils.c
+++ b/mail/em-utils.c
@@ -19,9 +19,8 @@
*
*/
-#include "em-utils.h"
+#include "evolution-config.h"
-#include <config.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@@ -52,6 +51,8 @@
#include "em-filter-editor.h"
#include "em-folder-properties.h"
+#include "em-utils.h"
+
/* How many is too many? */
/* Used in em_util_ask_open_many() */
#define TOO_MANY 10
diff --git a/mail/em-vfolder-editor-context.c b/mail/em-vfolder-editor-context.c
index e1fc3bb..c3e8e61 100644
--- a/mail/em-vfolder-editor-context.c
+++ b/mail/em-vfolder-editor-context.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-vfolder-editor-context.h"
diff --git a/mail/em-vfolder-editor-rule.c b/mail/em-vfolder-editor-rule.c
index 541ec34..8385c4c 100644
--- a/mail/em-vfolder-editor-rule.c
+++ b/mail/em-vfolder-editor-rule.c
@@ -20,9 +20,8 @@
*
*/
-#include "em-vfolder-editor-rule.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <gtk/gtk.h>
@@ -38,6 +37,8 @@
#include "em-utils.h"
#include "em-vfolder-editor-context.h"
+#include "em-vfolder-editor-rule.h"
+
#define EM_VFOLDER_EDITOR_RULE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), EM_TYPE_VFOLDER_EDITOR_RULE, EMVFolderEditorRulePrivate))
diff --git a/mail/em-vfolder-editor.c b/mail/em-vfolder-editor.c
index c026f4a..7809828 100644
--- a/mail/em-vfolder-editor.c
+++ b/mail/em-vfolder-editor.c
@@ -22,9 +22,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/mail/importers/elm-importer.c b/mail/importers/elm-importer.c
index 454cab4..a53f4f2 100644
--- a/mail/importers/elm-importer.c
+++ b/mail/importers/elm-importer.c
@@ -20,7 +20,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
diff --git a/mail/importers/evolution-mbox-importer.c b/mail/importers/evolution-mbox-importer.c
index 6a9ba05..2324ce8 100644
--- a/mail/importers/evolution-mbox-importer.c
+++ b/mail/importers/evolution-mbox-importer.c
@@ -20,7 +20,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
diff --git a/mail/importers/kmail-importer.c b/mail/importers/kmail-importer.c
index f454c45..307d20e 100644
--- a/mail/importers/kmail-importer.c
+++ b/mail/importers/kmail-importer.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <errno.h>
diff --git a/mail/importers/kmail-libs.c b/mail/importers/kmail-libs.c
index 6079541..bc93b64 100644
--- a/mail/importers/kmail-libs.c
+++ b/mail/importers/kmail-libs.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/mail/importers/mail-importer.c b/mail/importers/mail-importer.c
index cb88c1d..0c02121 100644
--- a/mail/importers/mail-importer.c
+++ b/mail/importers/mail-importer.c
@@ -20,10 +20,8 @@
*
*/
-#include "mail-importer.h"
-#include "kmail-libs.h"
+#include "evolution-config.h"
-#include <config.h>
#include <errno.h>
#include <string.h>
#include <sys/types.h>
@@ -37,6 +35,9 @@
#include "e-util/e-util-private.h"
#include "shell/e-shell-backend.h"
+#include "mail-importer.h"
+#include "kmail-libs.h"
+
struct _import_mbox_msg {
MailMsg base;
diff --git a/mail/importers/pine-importer.c b/mail/importers/pine-importer.c
index 074ac3b..9397693 100644
--- a/mail/importers/pine-importer.c
+++ b/mail/importers/pine-importer.c
@@ -20,7 +20,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index 92dd32a..46e517a 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -20,7 +20,8 @@
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <ctype.h>
#include <string.h>
#include <glib/gi18n.h>
diff --git a/mail/mail-send-recv.c b/mail/mail-send-recv.c
index 08b0d1e..b968335 100644
--- a/mail/mail-send-recv.c
+++ b/mail/mail-send-recv.c
@@ -19,9 +19,8 @@
*
*/
-#include "mail-send-recv.h"
+#include "evolution-config.h"
-#include <config.h>
#include <stdio.h>
#include <string.h>
#include <glib/gi18n.h>
@@ -38,6 +37,8 @@
#include "em-filter-rule.h"
#include "em-utils.h"
+#include "mail-send-recv.h"
+
#define d(x)
/* ms between status updates to the gui */
diff --git a/mail/mail-vfolder-ui.c b/mail/mail-vfolder-ui.c
index 7ada540..5767bce 100644
--- a/mail/mail-vfolder-ui.c
+++ b/mail/mail-vfolder-ui.c
@@ -19,9 +19,8 @@
*
*/
-#include "mail-vfolder-ui.h"
+#include "evolution-config.h"
-#include <config.h>
#include <string.h>
#include <glib/gi18n.h>
@@ -36,6 +35,8 @@
#include "mail-autofilter.h"
#include "e-mail-ui-session.h"
+#include "mail-vfolder-ui.h"
+
#define d(x) /* (printf("%s:%s: ", G_STRLOC, G_STRFUNC), (x))*/
/* NOTE: Once mail is moved to EDS, this context needs to be created ofr Mail UI. */
diff --git a/mail/message-list.c b/mail/message-list.c
index 227bc8f..58890b5 100644
--- a/mail/message-list.c
+++ b/mail/message-list.c
@@ -21,9 +21,8 @@
*
*/
-#include "message-list.h"
+#include "evolution-config.h"
-#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
@@ -58,6 +57,8 @@
#define localtime_r(tp,tmp) (localtime(tp)?(*(tmp)=*localtime(tp),(tmp)):0)
#endif
+#include "message-list.h"
+
#define d(x)
#define t(x)
diff --git a/mail/test-mail-autoconfig.c b/mail/test-mail-autoconfig.c
index 2dd5491..6e7ad4e 100644
--- a/mail/test-mail-autoconfig.c
+++ b/mail/test-mail-autoconfig.c
@@ -15,6 +15,8 @@
*
*/
+#include "evolution-config.h"
+
#include <stdlib.h>
#include <libedataserver/libedataserver.h>
diff --git a/modules/addressbook/autocompletion-config.c b/modules/addressbook/autocompletion-config.c
index cc7c7ec..de9baa7 100644
--- a/modules/addressbook/autocompletion-config.c
+++ b/modules/addressbook/autocompletion-config.c
@@ -21,11 +21,12 @@
*
*/
-#include "autocompletion-config.h"
+#include "evolution-config.h"
#include <glib/gi18n.h>
#include "addressbook/gui/widgets/eab-config.h"
+#include "autocompletion-config.h"
static GtkWidget *
add_section (GtkWidget *container,
diff --git a/modules/addressbook/e-book-config-hook.c b/modules/addressbook/e-book-config-hook.c
index a5aa0ed..2fd5ae2 100644
--- a/modules/addressbook/e-book-config-hook.c
+++ b/modules/addressbook/e-book-config-hook.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-config-hook.h"
diff --git a/modules/addressbook/e-book-shell-backend.c b/modules/addressbook/e-book-shell-backend.c
index 666120f..1c3a712 100644
--- a/modules/addressbook/e-book-shell-backend.c
+++ b/modules/addressbook/e-book-shell-backend.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-shell-backend.h"
diff --git a/modules/addressbook/e-book-shell-content.c b/modules/addressbook/e-book-shell-content.c
index e420079..efb973c 100644
--- a/modules/addressbook/e-book-shell-content.c
+++ b/modules/addressbook/e-book-shell-content.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-shell-content.h"
diff --git a/modules/addressbook/e-book-shell-migrate.c b/modules/addressbook/e-book-shell-migrate.c
index bb05455..17f6db6 100644
--- a/modules/addressbook/e-book-shell-migrate.c
+++ b/modules/addressbook/e-book-shell-migrate.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-shell-migrate.h"
diff --git a/modules/addressbook/e-book-shell-sidebar.c b/modules/addressbook/e-book-shell-sidebar.c
index 97e31d0..b87252e 100644
--- a/modules/addressbook/e-book-shell-sidebar.c
+++ b/modules/addressbook/e-book-shell-sidebar.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-shell-sidebar.h"
diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index de3de46..1a66aca 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-shell-view-private.h"
diff --git a/modules/addressbook/e-book-shell-view-private.c b/modules/addressbook/e-book-shell-view-private.c
index 59d3584..fa3081f 100644
--- a/modules/addressbook/e-book-shell-view-private.c
+++ b/modules/addressbook/e-book-shell-view-private.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-util/e-util-private.h"
diff --git a/modules/addressbook/e-book-shell-view.c b/modules/addressbook/e-book-shell-view.c
index 3b4e563..f8281a5 100644
--- a/modules/addressbook/e-book-shell-view.c
+++ b/modules/addressbook/e-book-shell-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-shell-view-private.h"
diff --git a/modules/addressbook/eab-composer-util.c b/modules/addressbook/eab-composer-util.c
index 94e8aaf..bbc2efe 100644
--- a/modules/addressbook/eab-composer-util.c
+++ b/modules/addressbook/eab-composer-util.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "eab-composer-util.h"
diff --git a/modules/addressbook/evolution-module-addressbook.c
b/modules/addressbook/evolution-module-addressbook.c
index 78df57c..574fb07 100644
--- a/modules/addressbook/evolution-module-addressbook.c
+++ b/modules/addressbook/evolution-module-addressbook.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-book-config-hook.h"
diff --git a/modules/backup-restore/e-mail-config-restore-page.c
b/modules/backup-restore/e-mail-config-restore-page.c
index e0b32f8..f0270fd 100644
--- a/modules/backup-restore/e-mail-config-restore-page.c
+++ b/modules/backup-restore/e-mail-config-restore-page.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-config-restore-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
@@ -28,6 +27,8 @@
#include <e-util/e-util.h>
+#include "e-mail-config-restore-page.h"
+
#define E_MAIL_CONFIG_RESTORE_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_RESTORE_PAGE, EMailConfigRestorePagePrivate))
diff --git a/modules/backup-restore/e-mail-config-restore-ready-page.c
b/modules/backup-restore/e-mail-config-restore-ready-page.c
index 2638391..20a9176 100644
--- a/modules/backup-restore/e-mail-config-restore-ready-page.c
+++ b/modules/backup-restore/e-mail-config-restore-ready-page.c
@@ -20,11 +20,12 @@
* to restore. As soon as we arrive on this page we execl() the
* "evolution-backup" tool, and the startup wizard disappears. */
-#include "e-mail-config-restore-ready-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-config-restore-ready-page.h"
+
/* Forward Declarations */
static void e_mail_config_restore_ready_page_interface_init
(EMailConfigPageInterface *iface);
diff --git a/modules/backup-restore/evolution-backup-restore.c
b/modules/backup-restore/evolution-backup-restore.c
index fadb1a1..1b41886 100644
--- a/modules/backup-restore/evolution-backup-restore.c
+++ b/modules/backup-restore/evolution-backup-restore.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <unistd.h>
#include <sys/types.h>
#ifdef HAVE_SYS_WAIT_H
diff --git a/modules/backup-restore/evolution-backup-tool.c b/modules/backup-restore/evolution-backup-tool.c
index e0ed680..9a9881c 100644
--- a/modules/backup-restore/evolution-backup-tool.c
+++ b/modules/backup-restore/evolution-backup-tool.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <stdio.h>
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 50e81e2..d09c2fa 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/modules/book-config-google/evolution-book-config-google.c
b/modules/book-config-google/evolution-book-config-google.c
index 91eeb8c..1d00ea4 100644
--- a/modules/book-config-google/evolution-book-config-google.c
+++ b/modules/book-config-google/evolution-book-config-google.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/book-config-ldap/evolution-book-config-ldap.c
b/modules/book-config-ldap/evolution-book-config-ldap.c
index 2ff38ef..d00a79a 100644
--- a/modules/book-config-ldap/evolution-book-config-ldap.c
+++ b/modules/book-config-ldap/evolution-book-config-ldap.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <stdlib.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/book-config-local/evolution-book-config-local.c
b/modules/book-config-local/evolution-book-config-local.c
index 816507c..b209973 100644
--- a/modules/book-config-local/evolution-book-config-local.c
+++ b/modules/book-config-local/evolution-book-config-local.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/book-config-webdav/evolution-book-config-webdav.c
b/modules/book-config-webdav/evolution-book-config-webdav.c
index ad739a7..9c7fea8 100644
--- a/modules/book-config-webdav/evolution-book-config-webdav.c
+++ b/modules/book-config-webdav/evolution-book-config-webdav.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-caldav/evolution-cal-config-caldav.c
b/modules/cal-config-caldav/evolution-cal-config-caldav.c
index 0e39034..fca6b04 100644
--- a/modules/cal-config-caldav/evolution-cal-config-caldav.c
+++ b/modules/cal-config-caldav/evolution-cal-config-caldav.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-contacts/e-contacts-selector.c
b/modules/cal-config-contacts/e-contacts-selector.c
index 5972d45..3d0486c 100644
--- a/modules/cal-config-contacts/e-contacts-selector.c
+++ b/modules/cal-config-contacts/e-contacts-selector.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libedataserver/libedataserver.h>
diff --git a/modules/cal-config-contacts/evolution-cal-config-contacts.c
b/modules/cal-config-contacts/evolution-cal-config-contacts.c
index 290d421..a311c41 100644
--- a/modules/cal-config-contacts/evolution-cal-config-contacts.c
+++ b/modules/cal-config-contacts/evolution-cal-config-contacts.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-google/e-cal-config-google.c b/modules/cal-config-google/e-cal-config-google.c
index c7dd42d..675a210 100644
--- a/modules/cal-config-google/e-cal-config-google.c
+++ b/modules/cal-config-google/e-cal-config-google.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-google/e-cal-config-gtasks.c b/modules/cal-config-google/e-cal-config-gtasks.c
index bb21a14..d25bb7d 100644
--- a/modules/cal-config-google/e-cal-config-gtasks.c
+++ b/modules/cal-config-google/e-cal-config-gtasks.c
@@ -13,9 +13,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/cal-config-google/e-google-chooser-button.c
b/modules/cal-config-google/e-google-chooser-button.c
index 653bcad..cdd5369 100644
--- a/modules/cal-config-google/e-google-chooser-button.c
+++ b/modules/cal-config-google/e-google-chooser-button.c
@@ -15,13 +15,14 @@
*
*/
-#include "e-google-chooser-button.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserverui/libedataserverui.h>
+#include "e-google-chooser-button.h"
+
#define E_GOOGLE_CHOOSER_BUTTON_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_GOOGLE_CHOOSER_BUTTON, EGoogleChooserButtonPrivate))
diff --git a/modules/cal-config-google/module-cal-config-google.c
b/modules/cal-config-google/module-cal-config-google.c
index 9085843..79f6020 100644
--- a/modules/cal-config-google/module-cal-config-google.c
+++ b/modules/cal-config-google/module-cal-config-google.c
@@ -13,9 +13,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-local/evolution-cal-config-local.c
b/modules/cal-config-local/evolution-cal-config-local.c
index eb9edf7..dad56b6 100644
--- a/modules/cal-config-local/evolution-cal-config-local.c
+++ b/modules/cal-config-local/evolution-cal-config-local.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-weather/evolution-cal-config-weather.c
b/modules/cal-config-weather/evolution-cal-config-weather.c
index e02b2d6..e431674 100644
--- a/modules/cal-config-weather/evolution-cal-config-weather.c
+++ b/modules/cal-config-weather/evolution-cal-config-weather.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/cal-config-webcal/evolution-cal-config-webcal.c
b/modules/cal-config-webcal/evolution-cal-config-webcal.c
index e6b933e..f24f94f 100644
--- a/modules/cal-config-webcal/evolution-cal-config-webcal.c
+++ b/modules/cal-config-webcal/evolution-cal-config-webcal.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/calendar/e-cal-attachment-handler.c b/modules/calendar/e-cal-attachment-handler.c
index ef28ddd..989e136 100644
--- a/modules/calendar/e-cal-attachment-handler.c
+++ b/modules/calendar/e-cal-attachment-handler.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-attachment-handler.h"
diff --git a/modules/calendar/e-cal-base-shell-backend.c b/modules/calendar/e-cal-base-shell-backend.c
index 473f822..a1b5d4a 100644
--- a/modules/calendar/e-cal-base-shell-backend.c
+++ b/modules/calendar/e-cal-base-shell-backend.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/calendar/e-cal-base-shell-content.c b/modules/calendar/e-cal-base-shell-content.c
index 399aa85..a0a60e4 100644
--- a/modules/calendar/e-cal-base-shell-content.c
+++ b/modules/calendar/e-cal-base-shell-content.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/calendar/e-cal-base-shell-sidebar.c b/modules/calendar/e-cal-base-shell-sidebar.c
index da10449..937e212 100644
--- a/modules/calendar/e-cal-base-shell-sidebar.c
+++ b/modules/calendar/e-cal-base-shell-sidebar.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/modules/calendar/e-cal-base-shell-view.c b/modules/calendar/e-cal-base-shell-view.c
index 8d9a92c..2833542 100644
--- a/modules/calendar/e-cal-base-shell-view.c
+++ b/modules/calendar/e-cal-base-shell-view.c
@@ -16,9 +16,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/calendar/e-cal-config-hook.c b/modules/calendar/e-cal-config-hook.c
index 716851c..089f2b6 100644
--- a/modules/calendar/e-cal-config-hook.c
+++ b/modules/calendar/e-cal-config-hook.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-config-hook.h"
diff --git a/modules/calendar/e-cal-event-hook.c b/modules/calendar/e-cal-event-hook.c
index 0dfb748..7e88f53 100644
--- a/modules/calendar/e-cal-event-hook.c
+++ b/modules/calendar/e-cal-event-hook.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-event-hook.h"
diff --git a/modules/calendar/e-cal-shell-backend.c b/modules/calendar/e-cal-shell-backend.c
index 35a58fb..2cde083 100644
--- a/modules/calendar/e-cal-shell-backend.c
+++ b/modules/calendar/e-cal-shell-backend.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/modules/calendar/e-cal-shell-content.c b/modules/calendar/e-cal-shell-content.c
index 114ab8d..6394dae 100644
--- a/modules/calendar/e-cal-shell-content.c
+++ b/modules/calendar/e-cal-shell-content.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <math.h>
diff --git a/modules/calendar/e-cal-shell-migrate.c b/modules/calendar/e-cal-shell-migrate.c
index adf2390..a92b98f 100644
--- a/modules/calendar/e-cal-shell-migrate.c
+++ b/modules/calendar/e-cal-shell-migrate.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-shell-migrate.h"
diff --git a/modules/calendar/e-cal-shell-view-actions.c b/modules/calendar/e-cal-shell-view-actions.c
index bc40565..9fc0e6f 100644
--- a/modules/calendar/e-cal-shell-view-actions.c
+++ b/modules/calendar/e-cal-shell-view-actions.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "calendar/gui/e-cal-dialogs.h"
#include "calendar/gui/e-cal-ops.h"
diff --git a/modules/calendar/e-cal-shell-view-memopad.c b/modules/calendar/e-cal-shell-view-memopad.c
index 58068f3..198d492 100644
--- a/modules/calendar/e-cal-shell-view-memopad.c
+++ b/modules/calendar/e-cal-shell-view-memopad.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "calendar/gui/e-cal-ops.h"
#include "calendar/gui/itip-utils.h"
diff --git a/modules/calendar/e-cal-shell-view-private.c b/modules/calendar/e-cal-shell-view-private.c
index e9b179d..95a8ca8 100644
--- a/modules/calendar/e-cal-shell-view-private.c
+++ b/modules/calendar/e-cal-shell-view-private.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-util/e-util-private.h"
#include <calendar/gui/e-cal-ops.h>
diff --git a/modules/calendar/e-cal-shell-view-taskpad.c b/modules/calendar/e-cal-shell-view-taskpad.c
index b49667e..891bbb1 100644
--- a/modules/calendar/e-cal-shell-view-taskpad.c
+++ b/modules/calendar/e-cal-shell-view-taskpad.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "calendar/gui/e-cal-ops.h"
#include "calendar/gui/itip-utils.h"
diff --git a/modules/calendar/e-cal-shell-view.c b/modules/calendar/e-cal-shell-view.c
index 139dc23..2a354bf 100644
--- a/modules/calendar/e-cal-shell-view.c
+++ b/modules/calendar/e-cal-shell-view.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/calendar/e-calendar-preferences.c b/modules/calendar/e-calendar-preferences.c
index 63bc7c9..6a0158e 100644
--- a/modules/calendar/e-calendar-preferences.c
+++ b/modules/calendar/e-calendar-preferences.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-calendar-preferences.h"
diff --git a/modules/calendar/e-memo-shell-backend.c b/modules/calendar/e-memo-shell-backend.c
index cea61fb..f47167e 100644
--- a/modules/calendar/e-memo-shell-backend.c
+++ b/modules/calendar/e-memo-shell-backend.c
@@ -17,9 +17,7 @@
* Authors: Milan Crha <mcrha redhat com>
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/modules/calendar/e-memo-shell-content.c b/modules/calendar/e-memo-shell-content.c
index 5c81731..7dacbfb 100644
--- a/modules/calendar/e-memo-shell-content.c
+++ b/modules/calendar/e-memo-shell-content.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/calendar/e-memo-shell-migrate.c b/modules/calendar/e-memo-shell-migrate.c
index b209d2c..b379a10 100644
--- a/modules/calendar/e-memo-shell-migrate.c
+++ b/modules/calendar/e-memo-shell-migrate.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-memo-shell-migrate.h"
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index c883b4d..5c2c0a8 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "calendar/gui/e-cal-ops.h"
#include "calendar/gui/itip-utils.h"
diff --git a/modules/calendar/e-memo-shell-view-private.c b/modules/calendar/e-memo-shell-view-private.c
index 3785942..393d299 100644
--- a/modules/calendar/e-memo-shell-view-private.c
+++ b/modules/calendar/e-memo-shell-view-private.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-util/e-util-private.h"
#include <calendar/gui/e-cal-ops.h>
diff --git a/modules/calendar/e-memo-shell-view.c b/modules/calendar/e-memo-shell-view.c
index 1804e6b..04d71c8 100644
--- a/modules/calendar/e-memo-shell-view.c
+++ b/modules/calendar/e-memo-shell-view.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/calendar/e-task-shell-backend.c b/modules/calendar/e-task-shell-backend.c
index 43ccaec..1e5f6a3 100644
--- a/modules/calendar/e-task-shell-backend.c
+++ b/modules/calendar/e-task-shell-backend.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/modules/calendar/e-task-shell-content.c b/modules/calendar/e-task-shell-content.c
index f8d2b53..c425d8f 100644
--- a/modules/calendar/e-task-shell-content.c
+++ b/modules/calendar/e-task-shell-content.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/modules/calendar/e-task-shell-migrate.c b/modules/calendar/e-task-shell-migrate.c
index 8de9255..2659fb8 100644
--- a/modules/calendar/e-task-shell-migrate.c
+++ b/modules/calendar/e-task-shell-migrate.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-task-shell-migrate.h"
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index d7bc023..f8e57eb 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "calendar/gui/e-cal-ops.h"
#include "calendar/gui/itip-utils.h"
diff --git a/modules/calendar/e-task-shell-view-private.c b/modules/calendar/e-task-shell-view-private.c
index 4022127..17611df 100644
--- a/modules/calendar/e-task-shell-view-private.c
+++ b/modules/calendar/e-task-shell-view-private.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-util/e-util-private.h"
#include <calendar/gui/e-cal-ops.h>
diff --git a/modules/calendar/e-task-shell-view.c b/modules/calendar/e-task-shell-view.c
index c731b1f..21193f9 100644
--- a/modules/calendar/e-task-shell-view.c
+++ b/modules/calendar/e-task-shell-view.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/modules/calendar/evolution-module-calendar.c b/modules/calendar/evolution-module-calendar.c
index 17e73b1..d8e4ba3 100644
--- a/modules/calendar/evolution-module-calendar.c
+++ b/modules/calendar/evolution-module-calendar.c
@@ -15,9 +15,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cal-attachment-handler.h"
diff --git a/modules/composer-autosave/e-autosave-utils.c b/modules/composer-autosave/e-autosave-utils.c
index 19a64b1..4fc6234 100644
--- a/modules/composer-autosave/e-autosave-utils.c
+++ b/modules/composer-autosave/e-autosave-utils.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-autosave-utils.h"
diff --git a/modules/composer-autosave/e-composer-autosave.c b/modules/composer-autosave/e-composer-autosave.c
index eabc2e1..efab816 100644
--- a/modules/composer-autosave/e-composer-autosave.c
+++ b/modules/composer-autosave/e-composer-autosave.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-composer-autosave.h"
diff --git a/modules/composer-autosave/e-composer-registry.c b/modules/composer-autosave/e-composer-registry.c
index 1048563..29b2118 100644
--- a/modules/composer-autosave/e-composer-registry.c
+++ b/modules/composer-autosave/e-composer-registry.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-composer-registry.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gstdio.h>
#include <libebackend/libebackend.h>
@@ -27,6 +26,8 @@
#include "e-autosave-utils.h"
+#include "e-composer-registry.h"
+
#define E_COMPOSER_REGISTRY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_COMPOSER_REGISTRY, EComposerRegistryPrivate))
diff --git a/modules/itip-formatter/e-mail-formatter-itip.c b/modules/itip-formatter/e-mail-formatter-itip.c
index 9ac5751..a77bdbe 100644
--- a/modules/itip-formatter/e-mail-formatter-itip.c
+++ b/modules/itip-formatter/e-mail-formatter-itip.c
@@ -15,11 +15,7 @@
*
*/
-#include "e-mail-formatter-itip.h"
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
@@ -31,6 +27,8 @@
#include "itip-view.h"
#include "e-mail-part-itip.h"
+#include "e-mail-formatter-itip.h"
+
#define d(x)
typedef EMailFormatterExtension EMailFormatterItip;
diff --git a/modules/itip-formatter/e-mail-parser-itip.c b/modules/itip-formatter/e-mail-parser-itip.c
index 6b60153..7ef3325 100644
--- a/modules/itip-formatter/e-mail-parser-itip.c
+++ b/modules/itip-formatter/e-mail-parser-itip.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/modules/itip-formatter/e-mail-part-itip.c b/modules/itip-formatter/e-mail-part-itip.c
index fbb4ffb..7b1f7dd 100644
--- a/modules/itip-formatter/e-mail-part-itip.c
+++ b/modules/itip-formatter/e-mail-part-itip.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <e-util/e-util.h>
diff --git a/modules/itip-formatter/itip-view.c b/modules/itip-formatter/itip-view.c
index 4ffde23..e6d470a 100644
--- a/modules/itip-formatter/itip-view.c
+++ b/modules/itip-formatter/itip-view.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/modules/mail-config/e-mail-config-google-summary.c
b/modules/mail-config/e-mail-config-google-summary.c
index 0bbeb37..af33744 100644
--- a/modules/mail-config/e-mail-config-google-summary.c
+++ b/modules/mail-config/e-mail-config-google-summary.c
@@ -15,14 +15,15 @@
*
*/
-#include "e-mail-config-google-summary.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <libedataserver/libedataserver.h>
#include <mail/e-mail-config-summary-page.h>
+#include "e-mail-config-google-summary.h"
+
#define E_MAIL_CONFIG_GOOGLE_SUMMARY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_GOOGLE_SUMMARY, EMailConfigGoogleSummaryPrivate))
diff --git a/modules/mail-config/e-mail-config-local-accounts.c
b/modules/mail-config/e-mail-config-local-accounts.c
index 15d36a9..bd43107 100644
--- a/modules/mail-config/e-mail-config-local-accounts.c
+++ b/modules/mail-config/e-mail-config-local-accounts.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
diff --git a/modules/mail-config/e-mail-config-remote-accounts.c
b/modules/mail-config/e-mail-config-remote-accounts.c
index 3782930..21c39e9 100644
--- a/modules/mail-config/e-mail-config-remote-accounts.c
+++ b/modules/mail-config/e-mail-config-remote-accounts.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
diff --git a/modules/mail-config/e-mail-config-sendmail-backend.c
b/modules/mail-config/e-mail-config-sendmail-backend.c
index 1b0a003..5b516c1 100644
--- a/modules/mail-config/e-mail-config-sendmail-backend.c
+++ b/modules/mail-config/e-mail-config-sendmail-backend.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/modules/mail-config/e-mail-config-smtp-backend.c
b/modules/mail-config/e-mail-config-smtp-backend.c
index e907375..68a8982 100644
--- a/modules/mail-config/e-mail-config-smtp-backend.c
+++ b/modules/mail-config/e-mail-config-smtp-backend.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-config-smtp-backend.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <camel/camel.h>
@@ -27,6 +26,8 @@
#include <mail/e-mail-config-page.h>
#include <mail/e-mail-config-service-page.h>
+#include "e-mail-config-smtp-backend.h"
+
#define E_MAIL_CONFIG_SMTP_BACKEND_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_SMTP_BACKEND, EMailConfigSmtpBackendPrivate))
diff --git a/modules/mail-config/e-mail-config-yahoo-summary.c
b/modules/mail-config/e-mail-config-yahoo-summary.c
index 10fceae..39dbd89 100644
--- a/modules/mail-config/e-mail-config-yahoo-summary.c
+++ b/modules/mail-config/e-mail-config-yahoo-summary.c
@@ -15,13 +15,14 @@
*
*/
-#include "e-mail-config-yahoo-summary.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <mail/e-mail-config-summary-page.h>
+#include "e-mail-config-yahoo-summary.h"
+
#define E_MAIL_CONFIG_YAHOO_SUMMARY_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_YAHOO_SUMMARY, EMailConfigYahooSummaryPrivate))
diff --git a/modules/mail/e-mail-attachment-handler.c b/modules/mail/e-mail-attachment-handler.c
index a5252b8..e0825e3 100644
--- a/modules/mail/e-mail-attachment-handler.c
+++ b/modules/mail/e-mail-attachment-handler.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-attachment-handler.h"
diff --git a/modules/mail/e-mail-config-hook.c b/modules/mail/e-mail-config-hook.c
index ed844a4..9da10db 100644
--- a/modules/mail/e-mail-config-hook.c
+++ b/modules/mail/e-mail-config-hook.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-config-hook.h"
diff --git a/modules/mail/e-mail-event-hook.c b/modules/mail/e-mail-event-hook.c
index e2d6d58..671330c 100644
--- a/modules/mail/e-mail-event-hook.c
+++ b/modules/mail/e-mail-event-hook.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-event-hook.h"
diff --git a/modules/mail/e-mail-shell-backend.c b/modules/mail/e-mail-shell-backend.c
index 506b0d7..09e157e 100644
--- a/modules/mail/e-mail-shell-backend.c
+++ b/modules/mail/e-mail-shell-backend.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-shell-backend.h"
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 917c6cf..48ad047 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-shell-content.h"
diff --git a/modules/mail/e-mail-shell-sidebar.c b/modules/mail/e-mail-shell-sidebar.c
index 8638d16..7c4ecb4 100644
--- a/modules/mail/e-mail-shell-sidebar.c
+++ b/modules/mail/e-mail-shell-sidebar.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-shell-sidebar.h"
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index e9aea63..a2b77b3 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-shell-view-private.h"
diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index c7ff361..e8bed96 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-shell-view-private.h"
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index 6fae60a..3d25ed8 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-shell-view-private.h"
diff --git a/modules/mail/em-account-prefs.c b/modules/mail/em-account-prefs.c
index e4f0160..92d224e 100644
--- a/modules/mail/em-account-prefs.c
+++ b/modules/mail/em-account-prefs.c
@@ -24,9 +24,7 @@
* to someday move account management completely out of the mailer,
* perhaps to evolution-data-server. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-account-prefs.h"
#include "e-mail-shell-backend.h"
diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c
index ecdcf40..2410cb7 100644
--- a/modules/mail/em-composer-prefs.c
+++ b/modules/mail/em-composer-prefs.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "em-composer-prefs.h"
diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c
index de6ba47..c82234c 100644
--- a/modules/mail/em-mailer-prefs.c
+++ b/modules/mail/em-mailer-prefs.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/mail/evolution-module-mail.c b/modules/mail/evolution-module-mail.c
index d52c365..6ca44e8 100644
--- a/modules/mail/evolution-module-mail.c
+++ b/modules/mail/evolution-module-mail.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-attachment-handler.h"
diff --git a/modules/mailto-handler/evolution-mailto-handler.c
b/modules/mailto-handler/evolution-mailto-handler.c
index 9cd2c95..51fc582 100644
--- a/modules/mailto-handler/evolution-mailto-handler.c
+++ b/modules/mailto-handler/evolution-mailto-handler.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/mdn/evolution-mdn.c b/modules/mdn/evolution-mdn.c
index 1577fd5..1a8cbad 100644
--- a/modules/mdn/evolution-mdn.c
+++ b/modules/mdn/evolution-mdn.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <string.h>
#include <glib/gi18n-lib.h>
diff --git a/modules/offline-alert/evolution-offline-alert.c b/modules/offline-alert/evolution-offline-alert.c
index db99dc1..fd11c9f 100644
--- a/modules/offline-alert/evolution-offline-alert.c
+++ b/modules/offline-alert/evolution-offline-alert.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libebackend/libebackend.h>
diff --git a/modules/plugin-lib/e-plugin-lib.c b/modules/plugin-lib/e-plugin-lib.c
index d4496f3..3bcce3b 100644
--- a/modules/plugin-lib/e-plugin-lib.c
+++ b/modules/plugin-lib/e-plugin-lib.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-plugin-lib.h"
diff --git a/modules/plugin-lib/evolution-module-plugin-lib.c
b/modules/plugin-lib/evolution-module-plugin-lib.c
index bc85300..48d2e37 100644
--- a/modules/plugin-lib/evolution-module-plugin-lib.c
+++ b/modules/plugin-lib/evolution-module-plugin-lib.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-plugin-lib.h"
diff --git a/modules/plugin-manager/evolution-plugin-manager.c
b/modules/plugin-manager/evolution-plugin-manager.c
index 4f7adb8..e80a2a0 100644
--- a/modules/plugin-manager/evolution-plugin-manager.c
+++ b/modules/plugin-manager/evolution-plugin-manager.c
@@ -15,9 +15,7 @@
/* A plugin manager ui */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <stdio.h>
diff --git a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
index 21fc1ce..4d6c360 100644
--- a/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-display-popup-prefer-plain.c
@@ -12,9 +12,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-display-popup-prefer-plain.h"
#include "mail/e-mail-display-popup-extension.h"
diff --git a/modules/prefer-plain/e-mail-parser-prefer-plain.c
b/modules/prefer-plain/e-mail-parser-prefer-plain.c
index 7908999..357473f 100644
--- a/modules/prefer-plain/e-mail-parser-prefer-plain.c
+++ b/modules/prefer-plain/e-mail-parser-prefer-plain.c
@@ -12,9 +12,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/modules/prefer-plain/evolution-module-prefer-plain.c
b/modules/prefer-plain/evolution-module-prefer-plain.c
index 59de774..bd9d9a8 100644
--- a/modules/prefer-plain/evolution-module-prefer-plain.c
+++ b/modules/prefer-plain/evolution-module-prefer-plain.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-parser-prefer-plain.h"
#include "e-mail-display-popup-prefer-plain.h"
diff --git a/modules/prefer-plain/plugin/config-ui.c b/modules/prefer-plain/plugin/config-ui.c
index de30b42..ae7a3d2 100644
--- a/modules/prefer-plain/plugin/config-ui.c
+++ b/modules/prefer-plain/plugin/config-ui.c
@@ -13,9 +13,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/modules/settings/e-settings-cal-model.c b/modules/settings/e-settings-cal-model.c
index 19401cd..a6f10c8 100644
--- a/modules/settings/e-settings-cal-model.c
+++ b/modules/settings/e-settings-cal-model.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-cal-model.h"
diff --git a/modules/settings/e-settings-calendar-item.c b/modules/settings/e-settings-calendar-item.c
index 555b08a..7b9a280 100644
--- a/modules/settings/e-settings-calendar-item.c
+++ b/modules/settings/e-settings-calendar-item.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-calendar-item.h"
diff --git a/modules/settings/e-settings-calendar-view.c b/modules/settings/e-settings-calendar-view.c
index 4cacb34..4430cff 100644
--- a/modules/settings/e-settings-calendar-view.c
+++ b/modules/settings/e-settings-calendar-view.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-calendar-view.h"
diff --git a/modules/settings/e-settings-client-cache.c b/modules/settings/e-settings-client-cache.c
index df9c01b..e994404 100644
--- a/modules/settings/e-settings-client-cache.c
+++ b/modules/settings/e-settings-client-cache.c
@@ -15,7 +15,7 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
#include "e-settings-client-cache.h"
diff --git a/modules/settings/e-settings-content-editor.c b/modules/settings/e-settings-content-editor.c
index 3bc438c..5cb43ad 100644
--- a/modules/settings/e-settings-content-editor.c
+++ b/modules/settings/e-settings-content-editor.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/modules/settings/e-settings-date-edit.c b/modules/settings/e-settings-date-edit.c
index f1c8f38..7d6d733 100644
--- a/modules/settings/e-settings-date-edit.c
+++ b/modules/settings/e-settings-date-edit.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-date-edit.h"
diff --git a/modules/settings/e-settings-mail-formatter.c b/modules/settings/e-settings-mail-formatter.c
index fb00016..bd12e20 100644
--- a/modules/settings/e-settings-mail-formatter.c
+++ b/modules/settings/e-settings-mail-formatter.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-mail-formatter.h"
diff --git a/modules/settings/e-settings-mail-reader.c b/modules/settings/e-settings-mail-reader.c
index 7d473ef..2875d0f 100644
--- a/modules/settings/e-settings-mail-reader.c
+++ b/modules/settings/e-settings-mail-reader.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-mail-reader.h"
diff --git a/modules/settings/e-settings-meeting-store.c b/modules/settings/e-settings-meeting-store.c
index a373e00..5259959 100644
--- a/modules/settings/e-settings-meeting-store.c
+++ b/modules/settings/e-settings-meeting-store.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-meeting-store.h"
diff --git a/modules/settings/e-settings-meeting-time-selector.c
b/modules/settings/e-settings-meeting-time-selector.c
index 8e4a69f..77cf64d 100644
--- a/modules/settings/e-settings-meeting-time-selector.c
+++ b/modules/settings/e-settings-meeting-time-selector.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-meeting-time-selector.h"
diff --git a/modules/settings/e-settings-name-selector-entry.c
b/modules/settings/e-settings-name-selector-entry.c
index 5d069d0..281472e 100644
--- a/modules/settings/e-settings-name-selector-entry.c
+++ b/modules/settings/e-settings-name-selector-entry.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-settings-name-selector-entry.h"
diff --git a/modules/settings/e-settings-weekday-chooser.c b/modules/settings/e-settings-weekday-chooser.c
index 3c66293..1fc161f 100644
--- a/modules/settings/e-settings-weekday-chooser.c
+++ b/modules/settings/e-settings-weekday-chooser.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <e-util/e-util.h>
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 47164c6..db354f6 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <errno.h>
#include <sys/types.h>
#include <sys/wait.h>
diff --git a/modules/startup-wizard/e-mail-config-import-page.c
b/modules/startup-wizard/e-mail-config-import-page.c
index c2e79aa..c81d425 100644
--- a/modules/startup-wizard/e-mail-config-import-page.c
+++ b/modules/startup-wizard/e-mail-config-import-page.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-config-import-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-config-import-page.h"
+
#define E_MAIL_CONFIG_IMPORT_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_IMPORT_PAGE, EMailConfigImportPagePrivate))
diff --git a/modules/startup-wizard/e-mail-config-import-progress-page.c
b/modules/startup-wizard/e-mail-config-import-progress-page.c
index c742bdb..5d19c82 100644
--- a/modules/startup-wizard/e-mail-config-import-progress-page.c
+++ b/modules/startup-wizard/e-mail-config-import-progress-page.c
@@ -15,11 +15,12 @@
*
*/
-#include "e-mail-config-import-progress-page.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
+#include "e-mail-config-import-progress-page.h"
+
#define E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_CONFIG_IMPORT_PROGRESS_PAGE, EMailConfigImportProgressPagePrivate))
diff --git a/modules/startup-wizard/e-startup-assistant.c b/modules/startup-wizard/e-startup-assistant.c
index 739c5ca..07b7dfb 100644
--- a/modules/startup-wizard/e-startup-assistant.c
+++ b/modules/startup-wizard/e-startup-assistant.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-startup-assistant.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n-lib.h>
#include <e-util/e-util.h>
@@ -27,6 +26,8 @@
#include "e-mail-config-import-page.h"
#include "e-mail-config-import-progress-page.h"
+#include "e-startup-assistant.h"
+
#define E_STARTUP_ASSISTANT_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_STARTUP_ASSISTANT, EStartupAssistantPrivate))
diff --git a/modules/startup-wizard/evolution-startup-wizard.c
b/modules/startup-wizard/evolution-startup-wizard.c
index 60b8f45..2709f55 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <libebackend/libebackend.h>
diff --git a/modules/text-highlight/e-mail-display-popup-text-highlight.c
b/modules/text-highlight/e-mail-display-popup-text-highlight.c
index a28932e..646745a 100644
--- a/modules/text-highlight/e-mail-display-popup-text-highlight.c
+++ b/modules/text-highlight/e-mail-display-popup-text-highlight.c
@@ -12,9 +12,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-display-popup-text-highlight.h"
#include "mail/e-mail-display-popup-extension.h"
diff --git a/modules/text-highlight/e-mail-formatter-text-highlight.c
b/modules/text-highlight/e-mail-formatter-text-highlight.c
index 4eb1cbe..f1188ba 100644
--- a/modules/text-highlight/e-mail-formatter-text-highlight.c
+++ b/modules/text-highlight/e-mail-formatter-text-highlight.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-formatter-text-highlight.h"
#include "languages.h"
diff --git a/modules/text-highlight/e-mail-parser-text-highlight.c
b/modules/text-highlight/e-mail-parser-text-highlight.c
index f1acc97..277f683 100644
--- a/modules/text-highlight/e-mail-parser-text-highlight.c
+++ b/modules/text-highlight/e-mail-parser-text-highlight.c
@@ -12,9 +12,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/modules/text-highlight/languages.c b/modules/text-highlight/languages.c
index ef232a0..4571f2d 100644
--- a/modules/text-highlight/languages.c
+++ b/modules/text-highlight/languages.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "languages.h"
diff --git a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
index b67f31f..ece7520 100644
--- a/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
+++ b/modules/tnef-attachment/e-mail-parser-tnef-attachment.c
@@ -12,9 +12,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-parser-tnef-attachment.h"
diff --git a/modules/vcard-inline/e-mail-formatter-vcard.c b/modules/vcard-inline/e-mail-formatter-vcard.c
index 40e573c..9f226e7 100644
--- a/modules/vcard-inline/e-mail-formatter-vcard.c
+++ b/modules/vcard-inline/e-mail-formatter-vcard.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-mail-formatter-vcard.h"
#include "e-mail-part-vcard.h"
diff --git a/modules/vcard-inline/e-mail-parser-vcard.c b/modules/vcard-inline/e-mail-parser-vcard.c
index f1cf005..6ec7e1c 100644
--- a/modules/vcard-inline/e-mail-parser-vcard.c
+++ b/modules/vcard-inline/e-mail-parser-vcard.c
@@ -14,9 +14,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/modules/vcard-inline/e-mail-part-vcard.c b/modules/vcard-inline/e-mail-part-vcard.c
index f38d22f..db7e790 100644
--- a/modules/vcard-inline/e-mail-part-vcard.c
+++ b/modules/vcard-inline/e-mail-part-vcard.c
@@ -15,9 +15,8 @@
*
*/
-#include "e-mail-part-vcard.h"
+#include "evolution-config.h"
-#include <config.h>
#include <glib/gi18n.h>
#include <em-format/e-mail-formatter-utils.h>
@@ -26,6 +25,8 @@
#include <shell/e-shell.h>
#include <addressbook/gui/widgets/eab-contact-merging.h>
+#include "e-mail-part-vcard.h"
+
#define E_MAIL_PART_VCARD_GET_PRIVATE(obj) \
(G_TYPE_INSTANCE_GET_PRIVATE \
((obj), E_TYPE_MAIL_PART_VCARD, EMailPartVCardPrivate))
diff --git a/modules/webkit-editor/e-webkit-editor-extension.c
b/modules/webkit-editor/e-webkit-editor-extension.c
index e05ee20..50b4973 100644
--- a/modules/webkit-editor/e-webkit-editor-extension.c
+++ b/modules/webkit-editor/e-webkit-editor-extension.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-webkit-editor-extension.h"
#include "e-webkit-editor.h"
diff --git a/modules/webkit-editor/e-webkit-editor.c b/modules/webkit-editor/e-webkit-editor.c
index e285729..8a509d8 100644
--- a/modules/webkit-editor/e-webkit-editor.c
+++ b/modules/webkit-editor/e-webkit-editor.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-webkit-editor.h"
diff --git a/modules/webkit-editor/evolution-module-webkit-editor.c
b/modules/webkit-editor/evolution-module-webkit-editor.c
index 116903f..8225da3 100644
--- a/modules/webkit-editor/evolution-module-webkit-editor.c
+++ b/modules/webkit-editor/evolution-module-webkit-editor.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-webkit-editor-extension.h"
diff --git a/modules/webkit-editor/web-extension/e-composer-dom-functions.c
b/modules/webkit-editor/web-extension/e-composer-dom-functions.c
index 79358ce..0e6bd2d 100644
--- a/modules/webkit-editor/web-extension/e-composer-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-composer-dom-functions.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
index ceddce4..e962802 100644
--- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c
@@ -15,9 +15,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#define WEBKIT_DOM_USE_UNSTABLE_API
#include <webkitdom/WebKitDOMDOMSelection.h>
diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
index 31c8e93..d6a2149 100644
--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -14,9 +14,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/modules/webkit-editor/web-extension/e-editor-page.c
b/modules/webkit-editor/web-extension/e-editor-page.c
index 7566a30..b386f7c 100644
--- a/modules/webkit-editor/web-extension/e-editor-page.c
+++ b/modules/webkit-editor/web-extension/e-editor-page.c
@@ -15,9 +15,7 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib.h>
#include <webkit2/webkit-web-extension.h>
diff --git a/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
b/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
index 5082e6c..aa91537 100644
--- a/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
+++ b/modules/webkit-editor/web-extension/e-editor-undo-redo-manager.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#define WEBKIT_DOM_USE_UNSTABLE_API
#include <webkitdom/WebKitDOMDocumentFragmentUnstable.h>
diff --git a/modules/webkit-editor/web-extension/e-editor-web-extension-main.c
b/modules/webkit-editor/web-extension/e-editor-web-extension-main.c
index 244bc4c..7bbcc0d 100644
--- a/modules/webkit-editor/web-extension/e-editor-web-extension-main.c
+++ b/modules/webkit-editor/web-extension/e-editor-web-extension-main.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <camel/camel.h>
diff --git a/modules/webkit-editor/web-extension/e-editor-web-extension.c
b/modules/webkit-editor/web-extension/e-editor-web-extension.c
index a465f3b..73da600 100644
--- a/modules/webkit-editor/web-extension/e-editor-web-extension.c
+++ b/modules/webkit-editor/web-extension/e-editor-web-extension.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/modules/webkit-inspector/evolution-webkit-inspector.c
b/modules/webkit-inspector/evolution-webkit-inspector.c
index 4c9a141..bb3fea8 100644
--- a/modules/webkit-inspector/evolution-webkit-inspector.c
+++ b/modules/webkit-inspector/evolution-webkit-inspector.c
@@ -15,7 +15,8 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
+
#include <glib/gi18n-lib.h>
#include <gdk/gdkkeysyms.h>
diff --git a/plugins/attachment-reminder/attachment-reminder.c
b/plugins/attachment-reminder/attachment-reminder.c
index aec294d..8436e52 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/plugins/bbdb/bbdb.c b/plugins/bbdb/bbdb.c
index 6e7582c..0b26fca 100644
--- a/plugins/bbdb/bbdb.c
+++ b/plugins/bbdb/bbdb.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/plugins/bbdb/gaimbuddies.c b/plugins/bbdb/gaimbuddies.c
index 5129583..d256255 100644
--- a/plugins/bbdb/gaimbuddies.c
+++ b/plugins/bbdb/gaimbuddies.c
@@ -28,9 +28,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <libxml/tree.h>
#include <libxml/parser.h>
diff --git a/plugins/dbx-import/dbx-importer.c b/plugins/dbx-import/dbx-importer.c
index b10016c..0fe66dc 100644
--- a/plugins/dbx-import/dbx-importer.c
+++ b/plugins/dbx-import/dbx-importer.c
@@ -28,9 +28,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/plugins/email-custom-header/email-custom-header.c
b/plugins/email-custom-header/email-custom-header.c
index af5e258..e51445e 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/external-editor/external-editor.c b/plugins/external-editor/external-editor.c
index f349b5f..db2a677 100644
--- a/plugins/external-editor/external-editor.c
+++ b/plugins/external-editor/external-editor.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 797e526..7953bfd 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "composer/e-msg-composer.h"
#include <gtk/gtk.h>
diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c
index 5edbdb3..2a4f28f 100644
--- a/plugins/mail-notification/mail-notification.c
+++ b/plugins/mail-notification/mail-notification.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/mail-to-task/mail-to-task.c b/plugins/mail-to-task/mail-to-task.c
index ef0fda4..527698c 100644
--- a/plugins/mail-to-task/mail-to-task.c
+++ b/plugins/mail-to-task/mail-to-task.c
@@ -23,9 +23,7 @@
/* Convert a mail message into a task */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/plugins/mailing-list-actions/mailing-list-actions.c
b/plugins/mailing-list-actions/mailing-list-actions.c
index 58f58f6..9affe98 100644
--- a/plugins/mailing-list-actions/mailing-list-actions.c
+++ b/plugins/mailing-list-actions/mailing-list-actions.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <stdio.h>
#include <string.h>
diff --git a/plugins/pst-import/pst-importer.c b/plugins/pst-import/pst-importer.c
index 8dbb3e9..fed8493 100644
--- a/plugins/pst-import/pst-importer.c
+++ b/plugins/pst-import/pst-importer.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <sys/types.h>
#include <sys/stat.h>
diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c
index dfa4e17..a7affb4 100644
--- a/plugins/publish-calendar/publish-calendar.c
+++ b/plugins/publish-calendar/publish-calendar.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <gtk/gtk.h>
diff --git a/plugins/publish-calendar/publish-format-fb.c b/plugins/publish-calendar/publish-format-fb.c
index 2181193..fd486c2 100644
--- a/plugins/publish-calendar/publish-format-fb.c
+++ b/plugins/publish-calendar/publish-format-fb.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <time.h>
diff --git a/plugins/publish-calendar/publish-format-ical.c b/plugins/publish-calendar/publish-format-ical.c
index 3f06cdb..6075919 100644
--- a/plugins/publish-calendar/publish-format-ical.c
+++ b/plugins/publish-calendar/publish-format-ical.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/publish-calendar/publish-location.c b/plugins/publish-calendar/publish-location.c
index 8d9f91e..452a4c2 100644
--- a/plugins/publish-calendar/publish-location.c
+++ b/plugins/publish-calendar/publish-location.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "publish-location.h"
diff --git a/plugins/publish-calendar/url-editor-dialog.c b/plugins/publish-calendar/url-editor-dialog.c
index 582e85d..2415806 100644
--- a/plugins/publish-calendar/url-editor-dialog.c
+++ b/plugins/publish-calendar/url-editor-dialog.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "url-editor-dialog.h"
diff --git a/plugins/save-calendar/csv-format.c b/plugins/save-calendar/csv-format.c
index 1a1b163..9e7d29c 100644
--- a/plugins/save-calendar/csv-format.c
+++ b/plugins/save-calendar/csv-format.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/save-calendar/ical-format.c b/plugins/save-calendar/ical-format.c
index 8e3d64d..e42ae7f 100644
--- a/plugins/save-calendar/ical-format.c
+++ b/plugins/save-calendar/ical-format.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/save-calendar/rdf-format.c b/plugins/save-calendar/rdf-format.c
index fcf4181..ee6760a 100644
--- a/plugins/save-calendar/rdf-format.c
+++ b/plugins/save-calendar/rdf-format.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/save-calendar/save-calendar.c b/plugins/save-calendar/save-calendar.c
index 723a1c2..3ee0f2e 100644
--- a/plugins/save-calendar/save-calendar.c
+++ b/plugins/save-calendar/save-calendar.c
@@ -22,9 +22,7 @@
/* This is prototype code only, this may, or may not, use undocumented
* unstable or private internal function calls. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/plugins/templates/e-templates-store.c b/plugins/templates/e-templates-store.c
index dbae0ff..40b092f 100644
--- a/plugins/templates/e-templates-store.c
+++ b/plugins/templates/e-templates-store.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index 3f98a6e..cdd6319 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -21,9 +21,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/shell/e-convert-local-mail.c b/shell/e-convert-local-mail.c
index cd6ec91..3a14d49 100644
--- a/shell/e-convert-local-mail.c
+++ b/shell/e-convert-local-mail.c
@@ -15,9 +15,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <glib/gstdio.h>
diff --git a/shell/e-shell-backend.c b/shell/e-shell-backend.c
index a0b0e59..01b4fc0 100644
--- a/shell/e-shell-backend.c
+++ b/shell/e-shell-backend.c
@@ -26,9 +26,7 @@
* @include: shell/e-shell-backend.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-backend.h"
diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index 8509668..88a7fe7 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-content.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-content.h"
diff --git a/shell/e-shell-migrate.c b/shell/e-shell-migrate.c
index 5aa3efa..7f7f6f1 100644
--- a/shell/e-shell-migrate.c
+++ b/shell/e-shell-migrate.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <errno.h>
#include <glib/gstdio.h>
diff --git a/shell/e-shell-searchbar.c b/shell/e-shell-searchbar.c
index 00073a0..4de9470 100644
--- a/shell/e-shell-searchbar.c
+++ b/shell/e-shell-searchbar.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-searchbar.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-searchbar.h"
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 1683cf6..4d83e5b 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-sidebar.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-sidebar.h"
diff --git a/shell/e-shell-switcher.c b/shell/e-shell-switcher.c
index a4f0271..31d46fe 100644
--- a/shell/e-shell-switcher.c
+++ b/shell/e-shell-switcher.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-switcher.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-switcher.h"
diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index db595b1..04194b1 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-taskbar.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-taskbar.h"
diff --git a/shell/e-shell-utils.c b/shell/e-shell-utils.c
index 7b493e4..15efc5e 100644
--- a/shell/e-shell-utils.c
+++ b/shell/e-shell-utils.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-utils.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n-lib.h>
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index f7a5d06..cfb3c25 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-view.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-view.h"
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 5665821..0c13bcb 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-window-private.h"
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index f9e21b1..b85bca9 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -18,9 +18,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-window-private.h"
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 6d3b3c5..db5909f 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell-window.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell-window-private.h"
diff --git a/shell/e-shell.c b/shell/e-shell.c
index c3d0be6..e6bf94a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -24,9 +24,7 @@
* @include: shell/e-shell.h
**/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-shell.h"
diff --git a/shell/killev.c b/shell/killev.c
index 6513f1e..4af9df1 100644
--- a/shell/killev.c
+++ b/shell/killev.c
@@ -18,7 +18,7 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
#include <signal.h>
#include <stdlib.h>
diff --git a/shell/main.c b/shell/main.c
index a92ebc6..276ec62 100644
--- a/shell/main.c
+++ b/shell/main.c
@@ -19,7 +19,7 @@
*
*/
-#include <config.h>
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/smime/gui/ca-trust-dialog.c b/smime/gui/ca-trust-dialog.c
index 611c958..5955e8a 100644
--- a/smime/gui/ca-trust-dialog.c
+++ b/smime/gui/ca-trust-dialog.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "ca-trust-dialog.h"
#include "certificate-manager.h"
diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c
index 061cf90..82358fa 100644
--- a/smime/gui/cert-trust-dialog.c
+++ b/smime/gui/cert-trust-dialog.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "e-cert.h"
#include "e-cert-trust.h"
diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c
index 66c36d4..70764d3 100644
--- a/smime/gui/certificate-manager.c
+++ b/smime/gui/certificate-manager.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <gtk/gtk.h>
diff --git a/smime/gui/component.c b/smime/gui/component.c
index 11682ef..3b39383 100644
--- a/smime/gui/component.c
+++ b/smime/gui/component.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include "component.h"
diff --git a/smime/gui/e-cert-selector.c b/smime/gui/e-cert-selector.c
index f18abd2..77e492b 100644
--- a/smime/gui/e-cert-selector.c
+++ b/smime/gui/e-cert-selector.c
@@ -20,9 +20,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <glib/gi18n.h>
diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c
index 237c912..bfd2024 100644
--- a/smime/lib/e-cert-db.c
+++ b/smime/lib/e-cert-db.c
@@ -40,9 +40,8 @@
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include <gtk/gtk.h>
#include <glib/gi18n.h>
diff --git a/smime/lib/e-cert-trust.c b/smime/lib/e-cert-trust.c
index 54f092d..fd3174c 100644
--- a/smime/lib/e-cert-trust.c
+++ b/smime/lib/e-cert-trust.c
@@ -39,9 +39,8 @@
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include "e-cert-trust.h"
diff --git a/smime/lib/e-cert.c b/smime/lib/e-cert.c
index 3bc4a9b..002e967 100644
--- a/smime/lib/e-cert.c
+++ b/smime/lib/e-cert.c
@@ -39,9 +39,8 @@
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include <time.h>
diff --git a/smime/lib/e-pkcs12.c b/smime/lib/e-pkcs12.c
index 464fa81..79bf425 100644
--- a/smime/lib/e-pkcs12.c
+++ b/smime/lib/e-pkcs12.c
@@ -39,9 +39,8 @@
*
* Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+
+#include "evolution-config.h"
#include <glib/gstdio.h>
#include <gtk/gtk.h>
diff --git a/web-extensions/e-dom-utils.c b/web-extensions/e-dom-utils.c
index 5782c74..4d790ca 100644
--- a/web-extensions/e-dom-utils.c
+++ b/web-extensions/e-dom-utils.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
diff --git a/web-extensions/e-web-extension-main.c b/web-extensions/e-web-extension-main.c
index 1525638..24bb6a9 100644
--- a/web-extensions/e-web-extension-main.c
+++ b/web-extensions/e-web-extension-main.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <camel/camel.h>
diff --git a/web-extensions/e-web-extension.c b/web-extensions/e-web-extension.c
index 1cc24d2..d053d2e 100644
--- a/web-extensions/e-web-extension.c
+++ b/web-extensions/e-web-extension.c
@@ -16,9 +16,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "evolution-config.h"
#include <string.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
