diff options
| author | Tarnyko <tarnyko@tarnyko.net> | 2014-02-26 23:15:21 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2014-02-26 23:15:21 +0800 |
| commit | 5c60d57082ede522169b65efa67a1e268989b487 (patch) | |
| tree | b77a62c5fbee1719f7216f7135c068ca081c9c77 /modules/startup-wizard | |
| parent | 5727d74fb54a1c76922099d023a182418c3bac70 (diff) | |
| download | gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.gz gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.bz2 gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.lz gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.xz gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.zst gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.zip | |
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.)
Diffstat (limited to 'modules/startup-wizard')
| -rw-r--r-- | modules/startup-wizard/e-mail-config-import-page.c | 8 | ||||
| -rw-r--r-- | modules/startup-wizard/e-mail-config-import-progress-page.c | 12 |
2 files changed, 10 insertions, 10 deletions
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 |