Fix "make check" errors.

2 files changed, 114 insertions, 93 deletions

diff --git a/addressbook/gui/contact-editor/test-editor.c b/addressbook/gui/contact-editor/test-editor.c
index 2f55e4777c..356311eb8f 100644
--- a/addressbook/gui/contact-editor/test-editor.c
+++ b/addressbook/gui/contact-editor/test-editor.c
@@ -28,31 +28,19 @@
 #include "e-contact-editor.h"
 #include "ebook/e-card.h"
 
-#define TEST_VCARD                   \
-"BEGIN:VCARD
-"                      \
-"FN:Nat
-"                           \
-"N:Friedman;Nat;D;Mr.
-"             \
-"BDAY:1977-08-06
-"                  \
-"TEL;WORK:617 679 1984
-"            \
-"TEL;CELL:123 456 7890
-"            \
-"EMAIL;INTERNET:nat@nat.org
-"       \
-"EMAIL;INTERNET:nat@ximian.com
-" \
-"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;
-" \
-"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA
-" \
-"END:VCARD
-"                        \
-"
-"
+#define TEST_VCARD \
+"BEGIN:VCARD" \
+"FN:Nat" \
+"N:Friedman;Nat;D;Mr." \
+"BDAY:1977-08-06" \
+"TEL;WORK:617 679 1984" \
+"TEL;CELL:123 456 7890" \
+"EMAIL;INTERNET:nat@nat.org" \
+"EMAIL;INTERNET:nat@ximian.com" \
+"ADR;WORK;POSTAL:P.O. Box 101;;;Any Town;CA;91921-1234;" \
+"ADR;HOME;POSTAL;INTL:P.O. Box 202;;;Any Town 2;MI;12344-4321;USA" \
+"END:VCARD" \
+""
 
 static char *
 read_file (char *name)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 39a35ece46..2dd31891f4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,35 +1,17 @@
 # List of source files containing translatable strings.
 # Please keep this list in alphabetic order.
-a11y/addressbook/ea-addressbook-view.c
-a11y/addressbook/ea-minicard-view.c
-a11y/addressbook/ea-minicard.c
-a11y/calendar/ea-cal-view-event.c
-a11y/calendar/ea-cal-view.c
-a11y/calendar/ea-day-view-main-item.c
-a11y/calendar/ea-day-view.c
-a11y/calendar/ea-gnome-calendar.c
-a11y/calendar/ea-jump-button.c
-a11y/calendar/ea-week-view-main-item.c
-a11y/calendar/ea-week-view.c
-a11y/e-table/gal-a11y-e-cell-popup.c
-a11y/e-table/gal-a11y-e-cell-text.c
-a11y/e-table/gal-a11y-e-cell-toggle.c
-a11y/e-table/gal-a11y-e-cell-tree.c
-a11y/e-table/gal-a11y-e-cell.c
-a11y/e-table/gal-a11y-e-table-click-to-add.c
-a11y/e-table/gal-a11y-e-table-column-header.c
-a11y/widgets/ea-calendar-item.c
-a11y/widgets/ea-combo-button.c
 addressbook/addressbook.error.xml
 addressbook/conduit/address-conduit.c
-addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in
-addressbook/gui/component/addressbook-component.c
 addressbook/gui/component/addressbook-config.c
-addressbook/gui/component/addressbook-migrate.c
-addressbook/gui/component/addressbook-view.c
-addressbook/gui/component/addressbook.c
 addressbook/gui/component/apps_evolution_addressbook.schemas.in
 addressbook/gui/component/autocompletion-config.c
+addressbook/gui/component/e-book-shell-backend.c
+addressbook/gui/component/e-book-shell-content.c
+addressbook/gui/component/e-book-shell-migrate.c
+addressbook/gui/component/e-book-shell-sidebar.c
+addressbook/gui/component/e-book-shell-view-actions.c
+addressbook/gui/component/e-book-shell-view.c
+addressbook/gui/component/eab-composer-util.c
 addressbook/gui/component/ldap-config.glade
 addressbook/gui/contact-editor/contact-editor.glade
 addressbook/gui/contact-editor/e-contact-editor-fullname.c
@@ -42,6 +24,9 @@ addressbook/gui/contact-list-editor/e-contact-list-editor.c
 addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade
 addressbook/gui/merging/eab-contact-duplicate-detected.glade
 addressbook/gui/merging/eab-contact-merging.c
+addressbook/gui/widgets/a11y/ea-addressbook-view.c
+addressbook/gui/widgets/a11y/ea-minicard-view.c
+addressbook/gui/widgets/a11y/ea-minicard.c
 addressbook/gui/widgets/addresstypes.xml
 addressbook/gui/widgets/e-addressbook-model.c
 addressbook/gui/widgets/e-addressbook-reflow-adapter.c
@@ -54,8 +39,6 @@ addressbook/gui/widgets/e-minicard-view.c
 addressbook/gui/widgets/e-minicard.c
 addressbook/gui/widgets/eab-contact-display.c
 addressbook/gui/widgets/eab-gui-util.c
-addressbook/gui/widgets/eab-popup-control.c
-addressbook/gui/widgets/eab-vcard-control.c
 addressbook/gui/widgets/gal-view-factory-minicard.c
 addressbook/importers/evolution-csv-importer.c
 addressbook/importers/evolution-ldif-importer.c
@@ -65,12 +48,21 @@ addressbook/printing/test-print.c
 addressbook/tools/evolution-addressbook-export-list-cards.c
 addressbook/tools/evolution-addressbook-export-list-folders.c
 addressbook/tools/evolution-addressbook-export.c
+addressbook/util/addressbook.c
 calendar/calendar.error.xml
 calendar/common/authentication.c
 calendar/conduits/calendar/calendar-conduit.c
 calendar/conduits/memo/memo-conduit.c
 calendar/conduits/todo/todo-conduit.c
 calendar/gui/GNOME_Evolution_Calendar.server.in.in
+calendar/gui/a11y/ea-cal-view-event.c
+calendar/gui/a11y/ea-cal-view.c
+calendar/gui/a11y/ea-day-view-main-item.c
+calendar/gui/a11y/ea-day-view.c
+calendar/gui/a11y/ea-gnome-calendar.c
+calendar/gui/a11y/ea-jump-button.c
+calendar/gui/a11y/ea-week-view-main-item.c
+calendar/gui/a11y/ea-week-view.c
 calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in
 calendar/gui/alarm-notify/alarm-notify-dialog.c
 calendar/gui/alarm-notify/alarm-notify.glade
@@ -83,8 +75,6 @@ calendar/gui/calendar-commands.c
 calendar/gui/calendar-component.c
 calendar/gui/calendar-view-factory.c
 calendar/gui/caltypes.xml
-calendar/gui/comp-editor-factory.c
-calendar/gui/control-factory.c
 calendar/gui/dialogs/alarm-dialog.c
 calendar/gui/dialogs/alarm-dialog.glade
 calendar/gui/dialogs/alarm-list-dialog.c
@@ -123,7 +113,6 @@ calendar/gui/dialogs/task-page.c
 calendar/gui/dialogs/task-page.glade
 calendar/gui/e-alarm-list.c
 calendar/gui/e-attachment-handler-calendar.c
-calendar/gui/e-cal-component-memo-preview.c
 calendar/gui/e-cal-component-preview.c
 calendar/gui/e-cal-list-view.c
 calendar/gui/e-cal-list-view.etspec
@@ -157,9 +146,7 @@ calendar/gui/goto-dialog.glade
 calendar/gui/goto.c
 calendar/gui/itip-utils.c
 calendar/gui/memos-component.c
-calendar/gui/memos-control.c
 calendar/gui/memotypes.xml
-calendar/gui/migration.c
 calendar/gui/misc.c
 calendar/gui/print.c
 calendar/gui/tasks-component.c
@@ -167,9 +154,32 @@ calendar/gui/tasks-control.c
 calendar/gui/tasktypes.xml
 calendar/gui/weekday-picker.c
 calendar/importers/icalendar-importer.c
+calendar/module/e-cal-shell-backend.c
+calendar/module/e-cal-shell-content.c
+calendar/module/e-cal-shell-migrate.c
+calendar/module/e-cal-shell-sidebar.c
+calendar/module/e-cal-shell-view-actions.c
+calendar/module/e-cal-shell-view-memopad.c
+calendar/module/e-cal-shell-view-private.c
+calendar/module/e-cal-shell-view-taskpad.c
+calendar/module/e-cal-shell-view.c
+calendar/module/e-memo-shell-backend.c
+calendar/module/e-memo-shell-content.c
+calendar/module/e-memo-shell-migrate.c
+calendar/module/e-memo-shell-sidebar.c
+calendar/module/e-memo-shell-view-actions.c
+calendar/module/e-memo-shell-view-private.c
+calendar/module/e-memo-shell-view.c
+calendar/module/e-task-shell-backend.c
+calendar/module/e-task-shell-content.c
+calendar/module/e-task-shell-migrate.c
+calendar/module/e-task-shell-sidebar.c
+calendar/module/e-task-shell-view-actions.c
+calendar/module/e-task-shell-view-private.c
+calendar/module/e-task-shell-view.c
 calendar/zones.h
-composer/e-composer-autosave.c
 composer/e-composer-actions.c
+composer/e-composer-autosave.c
 composer/e-composer-header-table.c
 composer/e-composer-name-header.c
 composer/e-composer-post-header.c
@@ -182,14 +192,16 @@ e-util/e-categories-config.c
 e-util/e-dialog-utils.c
 e-util/e-error.c
 e-util/e-logger.c
+e-util/e-module.c
 e-util/e-non-intrusive-error-dialog.c
 e-util/e-non-intrusive-error-dialog.h
 e-util/e-plugin.c
 e-util/e-print.c
 e-util/e-system.error.xml
 e-util/e-util.c
-e-util/e-util-labels.c
 e-util/gconf-bridge.c
+em-format/em-format-quote.c
+em-format/em-format.c
 filter/filter-datespec.c
 filter/filter-file.c
 filter/filter-input.c
@@ -203,6 +215,21 @@ filter/rule-editor.c
 mail/GNOME_Evolution_Mail.server.in.in
 mail/e-attachment-handler-mail.c
 mail/e-mail-attachment-bar.c
+mail/e-mail-browser.c
+mail/e-mail-display.c
+mail/e-mail-label-dialog.c
+mail/e-mail-label-list-store.c
+mail/e-mail-label-manager.c
+mail/e-mail-label-tree-view.c
+mail/e-mail-reader-utils.c
+mail/e-mail-reader.c
+mail/e-mail-search-bar.c
+mail/e-mail-shell-backend.c
+mail/e-mail-shell-content.c
+mail/e-mail-shell-migrate.c
+mail/e-mail-shell-view-actions.c
+mail/e-mail-shell-view-private.c
+mail/e-mail-shell-view.c
 mail/em-account-editor.c
 mail/em-account-prefs.c
 mail/em-composer-prefs.c
@@ -222,11 +249,8 @@ mail/em-folder-view.c
 mail/em-format-html-display.c
 mail/em-format-html-print.c
 mail/em-format-html.c
-mail/em-format-quote.c
-mail/em-format.c
 mail/em-junk-hook.c
 mail/em-mailer-prefs.c
-mail/em-migrate.c
 mail/em-popup.c
 mail/em-subscribe-editor.c
 mail/em-utils.c
@@ -241,14 +265,12 @@ mail/mail-autofilter.c
 mail/mail-component.c
 mail/mail-config.c
 mail/mail-config.glade
-mail/mail-crypto.c
 mail/mail-dialogs.glade
 mail/mail-folder-cache.c
 mail/mail-mt.c
 mail/mail-ops.c
 mail/mail-send-recv.c
 mail/mail-session.c
-mail/mail-signature-editor.c
 mail/mail-tools.c
 mail/mail-vfolder.c
 mail/mail.error.xml
@@ -261,8 +283,8 @@ plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml
 plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in
 plugins/attachment-reminder/attachment-reminder.c
 plugins/attachment-reminder/attachment-reminder.glade
-plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml
 plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml
+plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml
 plugins/audio-inline/org-gnome-audio-inline.eplug.xml
 plugins/backup-restore/backup-restore.c
 plugins/backup-restore/backup.c
@@ -287,11 +309,11 @@ plugins/default-mailer/org-gnome-default-mailer.eplug.xml
 plugins/default-mailer/org-gnome-default-mailer.error.xml
 plugins/default-source/default-source.c
 plugins/default-source/org-gnome-default-source.eplug.xml
+plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
 plugins/email-custom-header/email-custom-header.c
 plugins/email-custom-header/email-custom-header.glade
-plugins/email-custom-header/org-gnome-email-custom-header.glade
 plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml
-plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in
+plugins/email-custom-header/org-gnome-email-custom-header.glade
 plugins/exchange-operations/e-foreign-folder-dialog.glade
 plugins/exchange-operations/exchange-account-setup.c
 plugins/exchange-operations/exchange-calendar.c
@@ -322,15 +344,15 @@ plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml
 plugins/exchange-operations/org-gnome-folder-permissions.xml
 plugins/exchange-operations/org-gnome-folder-subscription.xml
 plugins/external-editor/apps-evolution-external-editor.schemas.in
+plugins/external-editor/external-editor.c
 plugins/external-editor/org-gnome-external-editor.eplug.xml
 plugins/external-editor/org-gnome-external-editor.error.xml
-plugins/external-editor/external-editor.c
 plugins/face/face.c
 plugins/face/org-gnome-face.eplug.xml
 plugins/folder-unsubscribe/folder-unsubscribe.c
 plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
-plugins/google-account-setup/google-source.c
 plugins/google-account-setup/google-contacts-source.c
+plugins/google-account-setup/google-source.c
 plugins/google-account-setup/org-gnome-evolution-google.eplug.xml
 plugins/groupwise-account-setup/camel-gw-listener.c
 plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
@@ -342,8 +364,8 @@ plugins/groupwise-features/mail-retract.c
 plugins/groupwise-features/org-gnome-compose-send-options.xml
 plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
 plugins/groupwise-features/org-gnome-mail-retract.error.xml
-plugins/groupwise-features/org-gnome-proxy.error.xml
 plugins/groupwise-features/org-gnome-proxy-login.error.xml
+plugins/groupwise-features/org-gnome-proxy.error.xml
 plugins/groupwise-features/org-gnome-shared-folder.error.xml
 plugins/groupwise-features/process-meeting.c
 plugins/groupwise-features/properties.glade
@@ -368,8 +390,6 @@ plugins/itip-formatter/itip-formatter.c
 plugins/itip-formatter/itip-view.c
 plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml
 plugins/itip-formatter/org-gnome-itip-formatter.error.xml
-plugins/mail-account-disable/mail-account-disable.c
-plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
 plugins/mail-notification/apps-evolution-mail-notification.schemas.in
 plugins/mail-notification/mail-notification.c
 plugins/mail-notification/org-gnome-mail-notification.eplug.xml
@@ -383,7 +403,6 @@ plugins/mark-all-read/mark-all-read.c
 plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
 plugins/mono/org-gnome-evolution-mono.eplug.xml
 plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml
-plugins/plugin-manager/org-gnome-plugin-manager.xml
 plugins/plugin-manager/plugin-manager.c
 plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml
 plugins/prefer-plain/prefer-plain.c
@@ -407,36 +426,36 @@ plugins/save-calendar/ical-format.c
 plugins/save-calendar/org-gnome-save-calendar.eplug.xml
 plugins/save-calendar/rdf-format.c
 plugins/save-calendar/save-calendar.c
-plugins/select-one-source/org-gnome-select-one-source.eplug.xml
 plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml
 plugins/startup-wizard/startup-wizard.c
 plugins/subject-thread/org-gnome-subject-thread.eplug.xml
 plugins/subject-thread/subject-thread.c
 plugins/templates/apps-evolution-template-placeholders.schemas.in
+plugins/templates/org-gnome-templates.eplug.xml
 plugins/templates/templates.c
 plugins/templates/templates.glade
-plugins/templates/org-gnome-templates.eplug.xml
 plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml
+plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml
+plugins/vcard-inline/vcard-inline.c
 plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml
 plugins/webdav-account-setup/webdav-contacts-source.c
 shell/GNOME_Evolution_Shell.server.in.in
-shell/test/GNOME_Evolution_Test.server.in.in
 shell/apps_evolution_shell.schemas.in
-shell/e-active-connection-dialog.glade
-shell/e-component-registry.c
 shell/e-config-upgrade.c
+shell/e-shell-backend.c
+shell/e-shell-content.c
 shell/e-shell-importer.c
-shell/e-shell-settings-dialog.c
+shell/e-shell-migrate.c
+shell/e-shell-switcher.c
 shell/e-shell-view.c
-shell/e-shell-window-commands.c
+shell/e-shell-window-actions.c
+shell/e-shell-window-private.c
 shell/e-shell-window.c
 shell/e-shell.c
-shell/e-user-creatable-items-handler.c
-shell/evolution-shell-component-utils.c
-shell/test/evolution-test-component.c
 shell/import.glade
 shell/main.c
 shell/shell.error.xml
+shell/test/e-test-shell-backend.c
 smime/gui/ca-trust-dialog.c
 smime/gui/cert-trust-dialog.c
 smime/gui/certificate-manager.c
@@ -448,14 +467,10 @@ smime/lib/e-cert-db.c
 smime/lib/e-cert.c
 smime/lib/e-pkcs12.c
 tools/killev.c
-ui/evolution-addressbook.xml
-ui/evolution-calendar.xml
 ui/evolution-mail-global.xml
 ui/evolution-mail-list.xml
 ui/evolution-mail-message.xml
 ui/evolution-mail-messagedisplay.xml
-ui/evolution-memos.xml
-ui/evolution-tasks.xml
 ui/evolution.xml
 views/addressbook/galview.xml
 views/calendar/galview.xml
@@ -471,10 +486,14 @@ widgets/menus/gal-view-factory-etable.c
 widgets/menus/gal-view-instance-save-as-dialog.c
 widgets/menus/gal-view-instance-save-as-dialog.glade
 widgets/menus/gal-view-instance.c
-widgets/menus/gal-view-menus.c
 widgets/menus/gal-view-new-dialog.c
 widgets/menus/gal-view-new-dialog.glade
-widgets/misc/e-attachment.c
+widgets/misc/a11y/ea-calendar-item.c
+widgets/misc/e-account-manager.c
+widgets/misc/e-account-tree-view.c
+widgets/misc/e-action-combo-box.c
+widgets/misc/e-activity-proxy.c
+widgets/misc/e-activity.c
 widgets/misc/e-attachment-dialog.c
 widgets/misc/e-attachment-handler-image.c
 widgets/misc/e-attachment-handler-sendto.c
@@ -483,12 +502,11 @@ widgets/misc/e-attachment-paned.c
 widgets/misc/e-attachment-store.c
 widgets/misc/e-attachment-tree-view.c
 widgets/misc/e-attachment-view.c
+widgets/misc/e-attachment.c
 widgets/misc/e-calendar-item.c
 widgets/misc/e-calendar.c
 widgets/misc/e-canvas-background.c
 widgets/misc/e-canvas-vbox.c
-widgets/misc/e-cell-date-edit.c
-widgets/misc/e-cell-percent.c
 widgets/misc/e-charset-picker.c
 widgets/misc/e-dateedit.c
 widgets/misc/e-filter-bar.c
@@ -497,17 +515,32 @@ widgets/misc/e-image-chooser.c
 widgets/misc/e-map.c
 widgets/misc/e-online-button.c
 widgets/misc/e-pilot-settings.c
-widgets/misc/e-reflow.c
+widgets/misc/e-popup-action.c
+widgets/misc/e-preferences-window.c
 widgets/misc/e-search-bar.c
+widgets/misc/e-search-bar.c.BASE.11732.c
+widgets/misc/e-search-bar.c.LOCAL.11732.c
+widgets/misc/e-search-bar.c.REMOTE.11732.c
 widgets/misc/e-selection-model-array.c
 widgets/misc/e-selection-model.c
 widgets/misc/e-send-options.c
 widgets/misc/e-send-options.glade
 widgets/misc/e-signature-combo-box.c
-widgets/misc/e-task-widget.c
+widgets/misc/e-signature-editor.c
+widgets/misc/e-signature-manager.c
+widgets/misc/e-signature-script-dialog.c
 widgets/misc/e-url-entry.c
+widgets/table/a11y/gal-a11y-e-cell-popup.c
+widgets/table/a11y/gal-a11y-e-cell-text.c
+widgets/table/a11y/gal-a11y-e-cell-toggle.c
+widgets/table/a11y/gal-a11y-e-cell-tree.c
+widgets/table/a11y/gal-a11y-e-cell.c
+widgets/table/a11y/gal-a11y-e-table-click-to-add.c
+widgets/table/a11y/gal-a11y-e-table-column-header.c
 widgets/table/e-cell-combo.c
+widgets/table/e-cell-date-edit.c
 widgets/table/e-cell-date.c
+widgets/table/e-cell-percent.c
 widgets/table/e-cell-pixbuf.c
 widgets/table/e-cell-text.c
 widgets/table/e-table-click-to-add.c