[evolution-ews] Replace 'interface' with 'iface' in the code



commit a68df717013effecd85a4466eda40176ea2eba4f
Author: Milan Crha <mcrha redhat com>
Date:   Wed Feb 26 16:19:49 2014 +0100

    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.

 src/addressbook/e-book-backend-ews.c               |    6 +++---
 src/calendar/e-cal-backend-ews.c                   |    6 +++---
 src/camel/camel-ews-store.c                        |   18 +++++++++---------
 src/configuration/e-ews-config-utils.c             |    6 +++---
 src/configuration/e-mail-config-ews-autodiscover.c |    6 +++---
 .../e-mail-config-ews-delegates-page.c             |   18 +++++++++---------
 .../e-mail-config-ews-folder-sizes-page.c          |    8 ++++----
 .../e-mail-config-ews-oal-combo-box.c              |    6 +++---
 src/configuration/e-mail-config-ews-ooo-page.c     |   18 +++++++++---------
 src/server/e-ews-connection.c                      |    6 +++---
 src/server/e-ews-oof-settings.c                    |   14 +++++++-------
 11 files changed, 56 insertions(+), 56 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-ews.c b/src/addressbook/e-book-backend-ews.c
index 8e9d02a..5e05a2c 100644
--- a/src/addressbook/e-book-backend-ews.c
+++ b/src/addressbook/e-book-backend-ews.c
@@ -117,7 +117,7 @@ enum {
 
 /* Forward Declarations */
 static void    e_book_backend_ews_authenticator_init
-                               (ESourceAuthenticatorInterface *interface);
+                               (ESourceAuthenticatorInterface *iface);
 static gpointer ews_update_items_thread (gpointer data);
 
 
@@ -4095,9 +4095,9 @@ e_book_backend_ews_class_init (EBookBackendEwsClass *klass)
 }
 
 static void
-e_book_backend_ews_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_book_backend_ews_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = book_backend_ews_try_password_sync;
+       iface->try_password_sync = book_backend_ews_try_password_sync;
 }
 
 static void
diff --git a/src/calendar/e-cal-backend-ews.c b/src/calendar/e-cal-backend-ews.c
index 0ba3990..4ace6da 100644
--- a/src/calendar/e-cal-backend-ews.c
+++ b/src/calendar/e-cal-backend-ews.c
@@ -133,7 +133,7 @@ static void ews_cal_component_get_item_id (ECalComponent *comp, gchar **itemid,
 static gboolean ews_start_sync (gpointer data);
 static gpointer ews_start_sync_thread (gpointer data);
 static void    e_cal_backend_ews_authenticator_init
-                               (ESourceAuthenticatorInterface *interface);
+                               (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
        ECalBackendEws,
@@ -4132,9 +4132,9 @@ e_cal_backend_ews_class_init (ECalBackendEwsClass *class)
 }
 
 static void
-e_cal_backend_ews_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_cal_backend_ews_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = cal_backend_ews_try_password_sync;
+       iface->try_password_sync = cal_backend_ews_try_password_sync;
 }
 
 static void
diff --git a/src/camel/camel-ews-store.c b/src/camel/camel-ews-store.c
index 7d50774..e9749a2 100644
--- a/src/camel/camel-ews-store.c
+++ b/src/camel/camel-ews-store.c
@@ -90,8 +90,8 @@ struct _CamelEwsStorePrivate {
 static gboolean        ews_store_construct     (CamelService *service, CamelSession *session,
                                         CamelProvider *provider, GError **error);
 
-static void camel_ews_store_initable_init (GInitableIface *interface);
-static void camel_ews_subscribable_init (CamelSubscribableInterface *interface);
+static void camel_ews_store_initable_init (GInitableIface *iface);
+static void camel_ews_subscribable_init (CamelSubscribableInterface *iface);
 static GInitableIface *parent_initable_interface;
 
 static CamelFolderInfo *folder_info_from_store_summary (CamelEwsStore *store,
@@ -300,11 +300,11 @@ ews_store_initable_init (GInitable *initable,
 }
 
 static void
-camel_ews_store_initable_init (GInitableIface *interface)
+camel_ews_store_initable_init (GInitableIface *iface)
 {
-       parent_initable_interface = g_type_interface_peek_parent (interface);
+       parent_initable_interface = g_type_interface_peek_parent (iface);
 
-       interface->init = ews_store_initable_init;
+       iface->init = ews_store_initable_init;
 }
 
 static gboolean
@@ -3696,11 +3696,11 @@ camel_ews_store_class_init (CamelEwsStoreClass *class)
 }
 
 static void
-camel_ews_subscribable_init (CamelSubscribableInterface *interface)
+camel_ews_subscribable_init (CamelSubscribableInterface *iface)
 {
-       interface->folder_is_subscribed = ews_store_folder_is_subscribed;
-       interface->subscribe_folder_sync = ews_store_subscribe_folder_sync;
-       interface->unsubscribe_folder_sync = ews_store_unsubscribe_folder_sync;
+       iface->folder_is_subscribed = ews_store_folder_is_subscribed;
+       iface->subscribe_folder_sync = ews_store_subscribe_folder_sync;
+       iface->unsubscribe_folder_sync = ews_store_unsubscribe_folder_sync;
 }
 
 static void
diff --git a/src/configuration/e-ews-config-utils.c b/src/configuration/e-ews-config-utils.c
index fb080ab..2dadce8 100644
--- a/src/configuration/e-ews-config-utils.c
+++ b/src/configuration/e-ews-config-utils.c
@@ -328,7 +328,7 @@ ews_config_utils_authenticator_try_password_sync (ESourceAuthenticator *auth,
 
 GType e_ews_config_utils_authenticator_get_type (void) G_GNUC_CONST;
 
-static void e_ews_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_ews_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (EEwsConfigUtilsAuthenticator, e_ews_config_utils_authenticator, G_TYPE_OBJECT, 0,
        G_IMPLEMENT_INTERFACE (E_TYPE_SOURCE_AUTHENTICATOR, 
e_ews_config_utils_authenticator_authenticator_init))
@@ -356,9 +356,9 @@ e_ews_config_utils_authenticator_class_init (EEwsConfigUtilsAuthenticatorClass *
 }
 
 static void
-e_ews_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_ews_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = ews_config_utils_authenticator_try_password_sync;
+       iface->try_password_sync = ews_config_utils_authenticator_try_password_sync;
 }
 
 static void
diff --git a/src/configuration/e-mail-config-ews-autodiscover.c 
b/src/configuration/e-mail-config-ews-autodiscover.c
index 3c6987f..2e34158 100644
--- a/src/configuration/e-mail-config-ews-autodiscover.c
+++ b/src/configuration/e-mail-config-ews-autodiscover.c
@@ -50,7 +50,7 @@ enum {
 
 /* Forward Declarations */
 static void    e_mail_config_ews_autodiscover_authenticator_init
-                               (ESourceAuthenticatorInterface *interface);
+                               (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
        EMailConfigEwsAutodiscover,
@@ -319,9 +319,9 @@ e_mail_config_ews_autodiscover_class_init (EMailConfigEwsAutodiscoverClass *clas
 }
 
 static void
-e_mail_config_ews_autodiscover_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mail_config_ews_autodiscover_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync =
+       iface->try_password_sync =
                mail_config_ews_autodiscover_try_password_sync;
 }
 
diff --git a/src/configuration/e-mail-config-ews-delegates-page.c 
b/src/configuration/e-mail-config-ews-delegates-page.c
index a365870..bd1a7f7 100644
--- a/src/configuration/e-mail-config-ews-delegates-page.c
+++ b/src/configuration/e-mail-config-ews-delegates-page.c
@@ -84,9 +84,9 @@ enum {
 
 /* Forward Declarations */
 static void    e_mail_config_ews_delegates_page_interface_init
-                                       (EMailConfigPageInterface *interface);
+                                       (EMailConfigPageInterface *iface);
 static void    e_mail_config_ews_delegates_page_authenticator_init
-                                       (ESourceAuthenticatorInterface *interface);
+                                       (ESourceAuthenticatorInterface *iface);
 static void    add_to_tree_view        (EMailConfigEwsDelegatesPage *page,
                                         EwsDelegateInfo *di,
                                         gboolean select);
@@ -1625,18 +1625,18 @@ e_mail_config_ews_delegates_page_class_init (EMailConfigEwsDelegatesPageClass *c
 }
 
 static void
-e_mail_config_ews_delegates_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_ews_delegates_page_interface_init (EMailConfigPageInterface *iface)
 {
-       interface->title = _("Delegates");
-       interface->sort_order = E_MAIL_CONFIG_EWS_DELEGATES_PAGE_SORT_ORDER;
-       interface->submit = mail_config_ews_delegates_page_submit;
-       interface->submit_finish = mail_config_ews_delegates_page_submit_finish;
+       iface->title = _("Delegates");
+       iface->sort_order = E_MAIL_CONFIG_EWS_DELEGATES_PAGE_SORT_ORDER;
+       iface->submit = mail_config_ews_delegates_page_submit;
+       iface->submit_finish = mail_config_ews_delegates_page_submit_finish;
 }
 
 static void
-e_mail_config_ews_delegates_page_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mail_config_ews_delegates_page_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = mail_config_ews_delegates_page_try_password_sync;
+       iface->try_password_sync = mail_config_ews_delegates_page_try_password_sync;
 }
 
 static void
diff --git a/src/configuration/e-mail-config-ews-folder-sizes-page.c 
b/src/configuration/e-mail-config-ews-folder-sizes-page.c
index 5dd1930..9eeb228 100644
--- a/src/configuration/e-mail-config-ews-folder-sizes-page.c
+++ b/src/configuration/e-mail-config-ews-folder-sizes-page.c
@@ -49,7 +49,7 @@ enum {
        PROP_SOURCE_REGISTRY
 };
 
-static void e_mail_config_ews_folder_sizes_page_interface_init (EMailConfigPageInterface *interface);
+static void e_mail_config_ews_folder_sizes_page_interface_init (EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (EMailConfigEwsFolderSizesPage, e_mail_config_ews_folder_sizes_page, 
GTK_TYPE_BOX, 0,
        G_IMPLEMENT_INTERFACE_DYNAMIC (E_TYPE_MAIL_CONFIG_PAGE, 
e_mail_config_ews_folder_sizes_page_interface_init))
@@ -252,10 +252,10 @@ e_mail_config_ews_folder_sizes_page_class_finalize (EMailConfigEwsFolderSizesPag
 }
 
 static void
-e_mail_config_ews_folder_sizes_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_ews_folder_sizes_page_interface_init (EMailConfigPageInterface *iface)
 {
-       interface->title = _("EWS Settings");
-       interface->sort_order = E_MAIL_CONFIG_EWS_FOLDER_SIZES_PAGE_SORT_ORDER;
+       iface->title = _("EWS Settings");
+       iface->sort_order = E_MAIL_CONFIG_EWS_FOLDER_SIZES_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/src/configuration/e-mail-config-ews-oal-combo-box.c 
b/src/configuration/e-mail-config-ews-oal-combo-box.c
index 7a03275..4018b7b 100644
--- a/src/configuration/e-mail-config-ews-oal-combo-box.c
+++ b/src/configuration/e-mail-config-ews-oal-combo-box.c
@@ -48,7 +48,7 @@ enum {
 
 /* Forward Declarations */
 static void    e_mail_config_ews_oal_combo_box_authenticator_init
-                               (ESourceAuthenticatorInterface *interface);
+                               (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
        EMailConfigEwsOalComboBox,
@@ -217,9 +217,9 @@ e_mail_config_ews_oal_combo_box_class_init (EMailConfigEwsOalComboBoxClass *clas
 }
 
 static void
-e_mail_config_ews_oal_combo_box_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mail_config_ews_oal_combo_box_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync =
+       iface->try_password_sync =
                mail_config_ews_oal_combo_box_try_password_sync;
 }
 
diff --git a/src/configuration/e-mail-config-ews-ooo-page.c b/src/configuration/e-mail-config-ews-ooo-page.c
index e3a0e87..49ad5b5 100644
--- a/src/configuration/e-mail-config-ews-ooo-page.c
+++ b/src/configuration/e-mail-config-ews-ooo-page.c
@@ -81,9 +81,9 @@ enum {
 
 /* Forward Declarations */
 static void    e_mail_config_ews_ooo_page_interface_init
-                               (EMailConfigPageInterface *interface);
+                               (EMailConfigPageInterface *iface);
 static void    e_mail_config_ews_ooo_page_authenticator_init
-                               (ESourceAuthenticatorInterface *interface);
+                               (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
        EMailConfigEwsOooPage,
@@ -911,18 +911,18 @@ e_mail_config_ews_ooo_page_class_init (EMailConfigEwsOooPageClass *class)
 }
 
 static void
-e_mail_config_ews_ooo_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_ews_ooo_page_interface_init (EMailConfigPageInterface *iface)
 {
-       interface->title = _("Out of Office");
-       interface->sort_order = E_MAIL_CONFIG_EWS_OOO_PAGE_SORT_ORDER;
-       interface->submit = mail_config_ews_ooo_page_submit;
-       interface->submit_finish = mail_config_ews_ooo_page_submit_finish;
+       iface->title = _("Out of Office");
+       iface->sort_order = E_MAIL_CONFIG_EWS_OOO_PAGE_SORT_ORDER;
+       iface->submit = mail_config_ews_ooo_page_submit;
+       iface->submit_finish = mail_config_ews_ooo_page_submit_finish;
 }
 
 static void
-e_mail_config_ews_ooo_page_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mail_config_ews_ooo_page_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync =
+       iface->try_password_sync =
                mail_config_ews_ooo_page_try_password_sync;
 }
 
diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c
index 46cd0d6..3459f43 100644
--- a/src/server/e-ews-connection.c
+++ b/src/server/e-ews-connection.c
@@ -158,7 +158,7 @@ struct _EwsNode {
 
 /* Forward Declarations */
 static void    e_ews_connection_authenticator_init
-                               (ESourceAuthenticatorInterface *interface);
+                               (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
        EEwsConnection,
@@ -1730,9 +1730,9 @@ e_ews_connection_folders_list_free (gpointer data)
 }
 
 static void
-e_ews_connection_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_ews_connection_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = ews_connection_try_password_sync;
+       iface->try_password_sync = ews_connection_try_password_sync;
 }
 
 static gpointer
diff --git a/src/server/e-ews-oof-settings.c b/src/server/e-ews-oof-settings.c
index 2e26531..7c66768 100644
--- a/src/server/e-ews-oof-settings.c
+++ b/src/server/e-ews-oof-settings.c
@@ -36,9 +36,9 @@
 
 /* Forward Declarations */
 static void    e_ews_oof_settings_initable_init
-                                       (GInitableIface *interface);
+                                       (GInitableIface *iface);
 static void    e_ews_oof_settings_async_initable_init
-                                       (GAsyncInitableIface *interface);
+                                       (GAsyncInitableIface *iface);
 
 struct _EEwsOofSettingsPrivate {
        GMutex property_lock;
@@ -634,16 +634,16 @@ e_ews_oof_settings_init (EEwsOofSettings *settings)
 }
 
 static void
-e_ews_oof_settings_initable_init (GInitableIface *interface)
+e_ews_oof_settings_initable_init (GInitableIface *iface)
 {
-       interface->init = ews_oof_settings_initable_init;
+       iface->init = ews_oof_settings_initable_init;
 }
 
 static void
-e_ews_oof_settings_async_initable_init (GAsyncInitableIface *interface)
+e_ews_oof_settings_async_initable_init (GAsyncInitableIface *iface)
 {
-       interface->init_async = ews_oof_settings_initable_init_async;
-       interface->init_finish = ews_oof_settings_initable_init_finish;
+       iface->init_async = ews_oof_settings_initable_init_async;
+       iface->init_finish = ews_oof_settings_initable_init_finish;
 }
 
 EEwsOofSettings *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]