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



commit e7b2e7c924d46997024ee3f120d769cf52b20304
Author: Milan Crha <mcrha redhat com>
Date:   Wed Feb 26 16:21:12 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-mapi.c          |    6 +++---
 src/calendar/e-cal-backend-mapi.c              |    6 +++---
 src/camel/camel-mapi-store.c                   |   10 +++++-----
 src/collection/e-mapi-backend-authenticator.c  |    6 +++---
 src/collection/e-mapi-backend.c                |    6 +++---
 src/configuration/e-mail-config-mapi-backend.c |    6 +++---
 src/configuration/e-mail-config-mapi-page.c    |    8 ++++----
 src/configuration/e-mapi-config-utils.c        |    6 +++---
 8 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/src/addressbook/e-book-backend-mapi.c b/src/addressbook/e-book-backend-mapi.c
index 065a369..d94b9b7 100644
--- a/src/addressbook/e-book-backend-mapi.c
+++ b/src/addressbook/e-book-backend-mapi.c
@@ -42,7 +42,7 @@
 
 #include "e-book-backend-mapi.h"
 
-static void e_book_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_book_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (EBookBackendMAPI, e_book_backend_mapi, E_TYPE_BOOK_BACKEND,
        G_IMPLEMENT_INTERFACE (E_TYPE_SOURCE_AUTHENTICATOR, e_book_backend_mapi_authenticator_init))
@@ -1425,9 +1425,9 @@ e_book_backend_mapi_class_init (EBookBackendMAPIClass *klass)
 }
 
 static void
-e_book_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_book_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = ebbm_try_password_sync;
+       iface->try_password_sync = ebbm_try_password_sync;
 }
 
 const gchar *
diff --git a/src/calendar/e-cal-backend-mapi.c b/src/calendar/e-cal-backend-mapi.c
index ac36bbf..e1c96a5 100644
--- a/src/calendar/e-cal-backend-mapi.c
+++ b/src/calendar/e-cal-backend-mapi.c
@@ -56,7 +56,7 @@
 #define EDC_ERROR(_code) e_data_cal_create_error (_code, NULL)
 #define EDC_ERROR_EX(_code, _msg) e_data_cal_create_error (_code, _msg)
 
-static void e_cal_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_cal_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (ECalBackendMAPI, e_cal_backend_mapi, E_TYPE_CAL_BACKEND,
        G_IMPLEMENT_INTERFACE (E_TYPE_SOURCE_AUTHENTICATOR, e_cal_backend_mapi_authenticator_init))
@@ -3567,9 +3567,9 @@ e_cal_backend_mapi_class_init (ECalBackendMAPIClass *class)
 }
 
 static void
-e_cal_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_cal_backend_mapi_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = ecbm_try_password_sync;
+       iface->try_password_sync = ecbm_try_password_sync;
 }
 
 static void
diff --git a/src/camel/camel-mapi-store.c b/src/camel/camel-mapi-store.c
index ba2055b..669d80c 100644
--- a/src/camel/camel-mapi-store.c
+++ b/src/camel/camel-mapi-store.c
@@ -72,7 +72,7 @@ struct _CamelMapiStorePrivate {
 };
 
 /* Forward Declarations */
-static void camel_subscribable_init (CamelSubscribableInterface *interface);
+static void camel_subscribable_init (CamelSubscribableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
        CamelMapiStore,
@@ -2055,11 +2055,11 @@ camel_mapi_store_class_init (CamelMapiStoreClass *class)
 }
 
 static void
-camel_subscribable_init (CamelSubscribableInterface *interface)
+camel_subscribable_init (CamelSubscribableInterface *iface)
 {
-       interface->folder_is_subscribed = mapi_store_folder_is_subscribed;
-       interface->subscribe_folder_sync = mapi_store_subscribe_folder_sync;
-       interface->unsubscribe_folder_sync = mapi_store_unsubscribe_folder_sync;
+       iface->folder_is_subscribed = mapi_store_folder_is_subscribed;
+       iface->subscribe_folder_sync = mapi_store_subscribe_folder_sync;
+       iface->unsubscribe_folder_sync = mapi_store_unsubscribe_folder_sync;
 }
 
 /*
diff --git a/src/collection/e-mapi-backend-authenticator.c b/src/collection/e-mapi-backend-authenticator.c
index dddfafd..7830f33 100644
--- a/src/collection/e-mapi-backend-authenticator.c
+++ b/src/collection/e-mapi-backend-authenticator.c
@@ -91,7 +91,7 @@ mapi_config_utils_authenticator_try_password_sync (ESourceAuthenticator *auth,
 
 GType e_mapi_backend_authenticator_get_type (void) G_GNUC_CONST;
 
-static void e_mapi_backend_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_mapi_backend_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (EMapiBackendAuthenticator, e_mapi_backend_authenticator, G_TYPE_OBJECT, 0,
        G_IMPLEMENT_INTERFACE (E_TYPE_SOURCE_AUTHENTICATOR, e_mapi_backend_authenticator_authenticator_init))
@@ -116,9 +116,9 @@ e_mapi_backend_authenticator_class_init (EMapiBackendAuthenticatorClass *class)
 }
 
 static void
-e_mapi_backend_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mapi_backend_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = mapi_config_utils_authenticator_try_password_sync;
+       iface->try_password_sync = mapi_config_utils_authenticator_try_password_sync;
 }
 
 static void
diff --git a/src/collection/e-mapi-backend.c b/src/collection/e-mapi-backend.c
index 9c72ebf..abbfb60 100644
--- a/src/collection/e-mapi-backend.c
+++ b/src/collection/e-mapi-backend.c
@@ -42,7 +42,7 @@ struct _EMapiBackendPrivate {
        gboolean need_update_folders;
 };
 
-static void e_mapi_backend_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_mapi_backend_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
        EMapiBackend,
@@ -848,9 +848,9 @@ e_mapi_backend_class_finalize (EMapiBackendClass *class)
 }
 
 static void
-e_mapi_backend_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mapi_backend_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = mapi_backend_try_password_sync;
+       iface->try_password_sync = mapi_backend_try_password_sync;
 }
 
 static void
diff --git a/src/configuration/e-mail-config-mapi-backend.c b/src/configuration/e-mail-config-mapi-backend.c
index 54fd9d5..bab840e 100644
--- a/src/configuration/e-mail-config-mapi-backend.c
+++ b/src/configuration/e-mail-config-mapi-backend.c
@@ -341,7 +341,7 @@ mail_config_mapi_authenticator_try_password_sync (ESourceAuthenticator *auth,
 
 GType e_mail_config_mapi_authenticator_get_type (void) G_GNUC_CONST;
 
-static void e_mail_config_mapi_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_mail_config_mapi_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (EMailConfigMapiAuthenticator, e_mail_config_mapi_authenticator, G_TYPE_OBJECT, 0,
        G_IMPLEMENT_INTERFACE (E_TYPE_SOURCE_AUTHENTICATOR, 
e_mail_config_mapi_authenticator_authenticator_init))
@@ -371,9 +371,9 @@ e_mail_config_mapi_authenticator_class_init (EMailConfigMapiAuthenticatorClass *
 }
 
 static void
-e_mail_config_mapi_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mail_config_mapi_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = mail_config_mapi_authenticator_try_password_sync;
+       iface->try_password_sync = mail_config_mapi_authenticator_try_password_sync;
 }
 
 static void
diff --git a/src/configuration/e-mail-config-mapi-page.c b/src/configuration/e-mail-config-mapi-page.c
index 4fd97ad..806d803 100644
--- a/src/configuration/e-mail-config-mapi-page.c
+++ b/src/configuration/e-mail-config-mapi-page.c
@@ -48,7 +48,7 @@ enum {
        PROP_SOURCE_REGISTRY
 };
 
-static void e_mail_config_mapi_page_interface_init (EMailConfigPageInterface *interface);
+static void e_mail_config_mapi_page_interface_init (EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (EMailConfigMapiPage, e_mail_config_mapi_page, GTK_TYPE_BOX, 0,
        G_IMPLEMENT_INTERFACE_DYNAMIC (E_TYPE_MAIL_CONFIG_PAGE, e_mail_config_mapi_page_interface_init))
@@ -247,10 +247,10 @@ e_mail_config_mapi_page_class_finalize (EMailConfigMapiPageClass *class)
 }
 
 static void
-e_mail_config_mapi_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_mapi_page_interface_init (EMailConfigPageInterface *iface)
 {
-       interface->title = _("MAPI Settings");
-       interface->sort_order = E_MAIL_CONFIG_MAPI_PAGE_SORT_ORDER;
+       iface->title = _("MAPI Settings");
+       iface->sort_order = E_MAIL_CONFIG_MAPI_PAGE_SORT_ORDER;
 }
 
 static void
diff --git a/src/configuration/e-mapi-config-utils.c b/src/configuration/e-mapi-config-utils.c
index f0e4f99..2407cb0 100644
--- a/src/configuration/e-mapi-config-utils.c
+++ b/src/configuration/e-mapi-config-utils.c
@@ -299,7 +299,7 @@ mapi_config_utils_authenticator_try_password_sync (ESourceAuthenticator *auth,
 
 GType e_mapi_config_utils_authenticator_get_type (void) G_GNUC_CONST;
 
-static void e_mapi_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface);
+static void e_mapi_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_EXTENDED (EMapiConfigUtilsAuthenticator, e_mapi_config_utils_authenticator, G_TYPE_OBJECT, 0,
        G_IMPLEMENT_INTERFACE (E_TYPE_SOURCE_AUTHENTICATOR, 
e_mapi_config_utils_authenticator_authenticator_init))
@@ -327,9 +327,9 @@ e_mapi_config_utils_authenticator_class_init (EMapiConfigUtilsAuthenticatorClass
 }
 
 static void
-e_mapi_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_mapi_config_utils_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-       interface->try_password_sync = mapi_config_utils_authenticator_try_password_sync;
+       iface->try_password_sync = mapi_config_utils_authenticator_try_password_sync;
 }
 
 static void


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