Replace 'interface' with 'iface' in the code

Win32 headers have a #define for 'interface', which breaks the build
when this word is used in the code, thus replace it to 'iface',
the same way as GLib or GTK+ code use to have it. (See bug #722068.)

10 files changed, 56 insertions, 56 deletions

diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c
index 01e70d018c..e39c2dfe8c 100644
--- a/modules/backup-restore/e-mail-config-restore-page.c
+++ b/modules/backup-restore/e-mail-config-restore-page.c
@@ -46,9 +46,9 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_restore_page_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 static void	e_mail_config_restore_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigRestorePage,
@@ -299,17 +299,17 @@ e_mail_config_restore_page_class_finalize (EMailConfigRestorePageClass *class)
 }
 
 static void
-e_mail_config_restore_page_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_config_restore_page_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_config_restore_page_submit_alert;
+	iface->submit_alert = mail_config_restore_page_submit_alert;
 }
 
 static void
-e_mail_config_restore_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_restore_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Restore from Backup");
-	interface->sort_order = E_MAIL_CONFIG_RESTORE_PAGE_SORT_ORDER;
-	interface->check_complete = mail_config_restore_page_check_complete;
+	iface->title = _("Restore from Backup");
+	iface->sort_order = E_MAIL_CONFIG_RESTORE_PAGE_SORT_ORDER;
+	iface->check_complete = mail_config_restore_page_check_complete;
 }
 
 static void
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 fc4d86ef14..2638391bac 100644
--- a/modules/backup-restore/e-mail-config-restore-ready-page.c
+++ b/modules/backup-restore/e-mail-config-restore-ready-page.c
@@ -27,7 +27,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_restore_ready_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigRestoreReadyPage,
@@ -49,12 +49,12 @@ e_mail_config_restore_ready_page_class_finalize (EMailConfigRestoreReadyPageClas
 }
 
 static void
-e_mail_config_restore_ready_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_restore_ready_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Keep the title identical to EMailConfigRestorePage
 	 * so it's only shown once in the assistant sidebar. */
-	interface->title = _("Restore from Backup");
-	interface->sort_order = E_MAIL_CONFIG_RESTORE_READY_PAGE_SORT_ORDER;
+	iface->title = _("Restore from Backup");
+	iface->sort_order = E_MAIL_CONFIG_RESTORE_READY_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/modules/bogofilter/evolution-bogofilter.c b/modules/bogofilter/evolution-bogofilter.c
index 7cc39213e0..4b061b6526 100644
--- a/modules/bogofilter/evolution-bogofilter.c
+++ b/modules/bogofilter/evolution-bogofilter.c
@@ -63,7 +63,7 @@ void e_module_unload (GTypeModule *type_module);
 
 /* Forward Declarations */
 GType e_bogofilter_get_type (void);
-static void e_bogofilter_interface_init (CamelJunkFilterInterface *interface);
+static void e_bogofilter_interface_init (CamelJunkFilterInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EBogofilter,
@@ -490,11 +490,11 @@ e_bogofilter_class_finalize (EBogofilterClass *class)
 }
 
 static void
-e_bogofilter_interface_init (CamelJunkFilterInterface *interface)
+e_bogofilter_interface_init (CamelJunkFilterInterface *iface)
 {
-	interface->classify = bogofilter_classify;
-	interface->learn_junk = bogofilter_learn_junk;
-	interface->learn_not_junk = bogofilter_learn_not_junk;
+	iface->classify = bogofilter_classify;
+	iface->learn_junk = bogofilter_learn_junk;
+	iface->learn_not_junk = bogofilter_learn_not_junk;
 }
 
 static void
diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
index d6f349257c..2c4f4110b5 100644
--- a/modules/cal-config-caldav/e-caldav-chooser.c
+++ b/modules/cal-config-caldav/e-caldav-chooser.c
@@ -95,7 +95,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_caldav_chooser_authenticator_init
-				(ESourceAuthenticatorInterface *interface);
+				(ESourceAuthenticatorInterface *iface);
 static void	caldav_chooser_get_collection_details
 				(SoupSession *session,
 				 SoupMessage *message,
@@ -1514,9 +1514,9 @@ e_caldav_chooser_class_finalize (ECaldavChooserClass *class)
 }
 
 static void
-e_caldav_chooser_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_caldav_chooser_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-	interface->try_password_sync = caldav_chooser_try_password_sync;
+	iface->try_password_sync = caldav_chooser_try_password_sync;
 }
 
 static void
diff --git a/modules/contact-photos/e-contact-photo-source.c b/modules/contact-photos/e-contact-photo-source.c
index ad27d05377..910bc12d3a 100644
--- a/modules/contact-photos/e-contact-photo-source.c
+++ b/modules/contact-photos/e-contact-photo-source.c
@@ -44,7 +44,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_contact_photo_source_interface_init
-					(EPhotoSourceInterface *interface);
+					(EPhotoSourceInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EContactPhotoSource,
@@ -415,10 +415,10 @@ e_contact_photo_source_class_finalize (EContactPhotoSourceClass *class)
 }
 
 static void
-e_contact_photo_source_interface_init (EPhotoSourceInterface *interface)
+e_contact_photo_source_interface_init (EPhotoSourceInterface *iface)
 {
-	interface->get_photo = contact_photo_source_get_photo;
-	interface->get_photo_finish = contact_photo_source_get_photo_finish;
+	iface->get_photo = contact_photo_source_get_photo;
+	iface->get_photo_finish = contact_photo_source_get_photo_finish;
 }
 
 static void
diff --git a/modules/gravatar/e-gravatar-photo-source.c b/modules/gravatar/e-gravatar-photo-source.c
index 8e3a5339f0..5ca4d2483e 100644
--- a/modules/gravatar/e-gravatar-photo-source.c
+++ b/modules/gravatar/e-gravatar-photo-source.c
@@ -35,7 +35,7 @@ struct _AsyncContext {
 
 /* Forward Declarations */
 static void	e_gravatar_photo_source_interface_init
-					(EPhotoSourceInterface *interface);
+					(EPhotoSourceInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EGravatarPhotoSource,
@@ -201,10 +201,10 @@ e_gravatar_photo_source_class_finalize (EGravatarPhotoSourceClass *class)
 }
 
 static void
-e_gravatar_photo_source_interface_init (EPhotoSourceInterface *interface)
+e_gravatar_photo_source_interface_init (EPhotoSourceInterface *iface)
 {
-	interface->get_photo = gravatar_photo_source_get_photo;
-	interface->get_photo_finish = gravatar_photo_source_get_photo_finish;
+	iface->get_photo = gravatar_photo_source_get_photo;
+	iface->get_photo_finish = gravatar_photo_source_get_photo_finish;
 }
 
 static void
diff --git a/modules/mail/e-mail-shell-content.c b/modules/mail/e-mail-shell-content.c
index 47e2fb30cb..bd631f12f8 100644
--- a/modules/mail/e-mail-shell-content.c
+++ b/modules/mail/e-mail-shell-content.c
@@ -55,7 +55,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_shell_content_reader_init
-					(EMailReaderInterface *interface);
+					(EMailReaderInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailShellContent,
@@ -432,18 +432,18 @@ e_mail_shell_content_class_finalize (EMailShellContentClass *class)
 }
 
 static void
-e_mail_shell_content_reader_init (EMailReaderInterface *interface)
+e_mail_shell_content_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_shell_content_get_action_group;
-	interface->get_backend = mail_shell_content_get_backend;
-	interface->get_mail_display = mail_shell_content_get_mail_display;
-	interface->get_hide_deleted = mail_shell_content_get_hide_deleted;
-	interface->get_message_list = mail_shell_content_get_message_list;
-	interface->get_popup_menu = mail_shell_content_get_popup_menu;
-	interface->get_preview_pane = mail_shell_content_get_preview_pane;
-	interface->get_window = mail_shell_content_get_window;
-	interface->set_folder = mail_shell_content_set_folder;
-	interface->open_selected_mail = mail_shell_content_open_selected_mail;
+	iface->get_action_group = mail_shell_content_get_action_group;
+	iface->get_backend = mail_shell_content_get_backend;
+	iface->get_mail_display = mail_shell_content_get_mail_display;
+	iface->get_hide_deleted = mail_shell_content_get_hide_deleted;
+	iface->get_message_list = mail_shell_content_get_message_list;
+	iface->get_popup_menu = mail_shell_content_get_popup_menu;
+	iface->get_preview_pane = mail_shell_content_get_preview_pane;
+	iface->get_window = mail_shell_content_get_window;
+	iface->set_folder = mail_shell_content_set_folder;
+	iface->open_selected_mail = mail_shell_content_open_selected_mail;
 }
 
 static void
diff --git a/modules/spamassassin/evolution-spamassassin.c b/modules/spamassassin/evolution-spamassassin.c
index 858d78eadb..868d056e80 100644
--- a/modules/spamassassin/evolution-spamassassin.c
+++ b/modules/spamassassin/evolution-spamassassin.c
@@ -61,7 +61,7 @@ void e_module_unload (GTypeModule *type_module);
 
 /* Forward Declarations */
 GType e_spam_assassin_get_type (void);
-static void e_spam_assassin_interface_init (CamelJunkFilterInterface *interface);
+static void e_spam_assassin_interface_init (CamelJunkFilterInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	ESpamAssassin,
@@ -575,12 +575,12 @@ e_spam_assassin_class_finalize (ESpamAssassinClass *class)
 }
 
 static void
-e_spam_assassin_interface_init (CamelJunkFilterInterface *interface)
+e_spam_assassin_interface_init (CamelJunkFilterInterface *iface)
 {
-	interface->classify = spam_assassin_classify;
-	interface->learn_junk = spam_assassin_learn_junk;
-	interface->learn_not_junk = spam_assassin_learn_not_junk;
-	interface->synchronize = spam_assassin_synchronize;
+	iface->classify = spam_assassin_classify;
+	iface->learn_junk = spam_assassin_learn_junk;
+	iface->learn_not_junk = spam_assassin_learn_not_junk;
+	iface->synchronize = spam_assassin_synchronize;
 }
 
 static void
diff --git a/modules/startup-wizard/e-mail-config-import-page.c b/modules/startup-wizard/e-mail-config-import-page.c
index bf3bc29a5f..61e5bb0c94 100644
--- a/modules/startup-wizard/e-mail-config-import-page.c
+++ b/modules/startup-wizard/e-mail-config-import-page.c
@@ -42,7 +42,7 @@ struct _AsyncContext {
 
 /* Forward Declarations */
 static void	e_mail_config_import_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 static gboolean	mail_config_import_page_next	(gpointer user_data);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
@@ -256,10 +256,10 @@ e_mail_config_import_page_class_finalize (EMailConfigImportPageClass *class)
 }
 
 static void
-e_mail_config_import_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_import_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Importing Files");
-	interface->sort_order = E_MAIL_CONFIG_IMPORT_PAGE_SORT_ORDER;
+	iface->title = _("Importing Files");
+	iface->sort_order = E_MAIL_CONFIG_IMPORT_PAGE_SORT_ORDER;
 }
 
 static void
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 6dbc4b7f1c..5d96a16f20 100644
--- a/modules/startup-wizard/e-mail-config-import-progress-page.c
+++ b/modules/startup-wizard/e-mail-config-import-progress-page.c
@@ -38,7 +38,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_mail_config_import_progress_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigImportProgressPage,
@@ -333,14 +333,14 @@ e_mail_config_import_progress_page_class_finalize (EMailConfigImportProgressPage
 }
 
 static void
-e_mail_config_import_progress_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_import_progress_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Keep the title identical to EMailConfigImportPage
 	 * so it's only shown once in the assistant sidebar. */
-	interface->title = _("Importing Files");
-	interface->sort_order = E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_SORT_ORDER;
-	interface->page_type = GTK_ASSISTANT_PAGE_PROGRESS;
-	interface->check_complete = mail_config_import_progress_page_check_complete;
+	iface->title = _("Importing Files");
+	iface->sort_order = E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_SORT_ORDER;
+	iface->page_type = GTK_ASSISTANT_PAGE_PROGRESS;
+	iface->check_complete = mail_config_import_progress_page_check_complete;
 }
 
 static void