[evolution-data-server] Replace 'interface' with 'iface' in the code
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Replace 'interface' with 'iface' in the code
- Date: Wed, 26 Feb 2014 14:49:06 +0000 (UTC)
commit c0f7b4797597f38bbc8fa2c0dfd4aad4297f48bc
Author: Tarnyko <tarnyko tarnyko net>
Date: Wed Feb 26 15:46:30 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.
addressbook/backends/file/e-book-backend-file.c | 6 +-
.../backends/google/e-book-backend-google.c | 6 +-
.../backends/google/e-gdata-oauth2-authorizer.c | 10 +-
addressbook/backends/ldap/e-book-backend-ldap.c | 8 +-
.../backends/webdav/e-book-backend-webdav.c | 6 +-
addressbook/libebook/e-book-client-cursor.c | 6 +-
addressbook/libebook/e-book-client-view.c | 6 +-
addressbook/libebook/e-book-client.c | 14 ++--
addressbook/libebook/e-book.c | 6 +-
addressbook/libedata-book/e-data-book-factory.c | 10 +-
addressbook/libedata-book/e-data-book-view.c | 6 +-
addressbook/libedata-book/e-data-book.c | 60 +++++++-------
calendar/backends/caldav/e-cal-backend-caldav.c | 6 +-
calendar/backends/file/e-cal-backend-file.c | 13 ++--
calendar/backends/http/e-cal-backend-http.c | 6 +-
calendar/libecal/e-cal-client-view.c | 6 +-
calendar/libecal/e-cal-client.c | 24 +++---
calendar/libecal/e-cal.c | 6 +-
calendar/libecal/e-timezone-cache.c | 28 ++++----
calendar/libedata-cal/e-cal-backend.c | 10 +-
calendar/libedata-cal/e-data-cal-factory.c | 18 ++--
calendar/libedata-cal/e-data-cal-view.c | 6 +-
calendar/libedata-cal/e-data-cal.c | 80 ++++++++++----------
camel/camel-junk-filter.c | 34 ++++----
camel/camel-network-service.c | 42 +++++-----
camel/camel-network-settings.c | 12 ++--
camel/camel-service.c | 6 +-
camel/camel-store.c | 8 +-
camel/camel-stream-filter.c | 14 ++--
camel/camel-stream-fs.c | 14 ++--
camel/camel-stream-mem.c | 14 ++--
camel/camel-stream-null.c | 14 ++--
camel/camel-stream.c | 14 ++--
camel/camel-subscribable.c | 30 ++++----
camel/providers/imapx/camel-imapx-input-stream.c | 12 ++--
camel/providers/imapx/camel-imapx-logger.c | 8 +-
camel/providers/imapx/camel-imapx-store.c | 26 +++---
camel/providers/nntp/camel-nntp-store.c | 32 ++++----
camel/providers/pop3/camel-pop3-store.c | 8 +-
camel/providers/smtp/camel-smtp-transport.c | 8 +-
libebackend/e-authentication-mediator.c | 76 +++++++++---------
libebackend/e-extensible.c | 2 +-
libebackend/e-oauth2-support.c | 30 ++++----
libebackend/e-server-side-source.c | 32 ++++----
libebackend/e-source-registry-server.c | 16 ++--
libedataserver/e-source-authenticator.c | 50 ++++++------
libedataserver/e-source-registry.c | 6 +-
libedataserver/e-source.c | 18 ++--
modules/gnome-online-accounts/e-goa-client.c | 6 +-
.../module-gnome-online-accounts.c | 6 +-
modules/owncloud-backend/owncloud-utils.c | 6 +-
.../module-ubuntu-online-accounts.c | 10 +-
52 files changed, 449 insertions(+), 452 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index 87cd8b9..bf506fe 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -62,7 +62,7 @@
/* Forward Declarations */
static void e_book_backend_file_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EBookBackendFile,
@@ -2120,9 +2120,9 @@ e_book_backend_file_class_init (EBookBackendFileClass *class)
}
static void
-e_book_backend_file_initable_init (GInitableIface *interface)
+e_book_backend_file_initable_init (GInitableIface *iface)
{
- interface->init = book_backend_file_initable_init;
+ iface->init = book_backend_file_initable_init;
}
static void
diff --git a/addressbook/backends/google/e-book-backend-google.c
b/addressbook/backends/google/e-book-backend-google.c
index 3030609..149f391 100644
--- a/addressbook/backends/google/e-book-backend-google.c
+++ b/addressbook/backends/google/e-book-backend-google.c
@@ -46,7 +46,7 @@
/* Forward Declarations */
static void e_book_backend_google_source_authenticator_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EBookBackendGoogle,
@@ -2317,9 +2317,9 @@ e_book_backend_google_class_init (EBookBackendGoogleClass *class)
}
static void
-e_book_backend_google_source_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_book_backend_google_source_authenticator_init (ESourceAuthenticatorInterface *iface)
{
- interface->try_password_sync = book_backend_google_try_password_sync;
+ iface->try_password_sync = book_backend_google_try_password_sync;
}
static void
diff --git a/addressbook/backends/google/e-gdata-oauth2-authorizer.c
b/addressbook/backends/google/e-gdata-oauth2-authorizer.c
index 6980ca1..13a10bd 100644
--- a/addressbook/backends/google/e-gdata-oauth2-authorizer.c
+++ b/addressbook/backends/google/e-gdata-oauth2-authorizer.c
@@ -39,7 +39,7 @@ static GMutex mutex;
/* Forward Declarations */
static void e_gdata_oauth2_authorizer_interface_init
- (GDataAuthorizerInterface *interface);
+ (GDataAuthorizerInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EGDataOAuth2Authorizer,
@@ -279,13 +279,13 @@ e_gdata_oauth2_authorizer_class_init (EGDataOAuth2AuthorizerClass *class)
}
static void
-e_gdata_oauth2_authorizer_interface_init (GDataAuthorizerInterface *interface)
+e_gdata_oauth2_authorizer_interface_init (GDataAuthorizerInterface *iface)
{
- interface->process_request =
+ iface->process_request =
gdata_oauth2_authorizer_process_request;
- interface->is_authorized_for_domain =
+ iface->is_authorized_for_domain =
gdata_oauth2_authorizer_is_authorized_for_domain;
- interface->refresh_authorization =
+ iface->refresh_authorization =
gdata_oauth2_authorizer_refresh_authorization;
}
diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index bec5d63..ce928c2 100644
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -43,9 +43,7 @@
#undef LDAP_DEBUG
#endif
#else
-#define interface windows_interface
#include <windows.h>
-#undef interface
#include <winldap.h>
#define LDAP_RES_RENAME LDAP_RES_MODRDN
#include <winber.h>
@@ -178,7 +176,7 @@ typedef struct LDAPOp LDAPOp;
/* Forward Declarations */
static void e_book_backend_ldap_source_authenticator_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EBookBackendLDAP,
@@ -5865,9 +5863,9 @@ e_book_backend_ldap_class_init (EBookBackendLDAPClass *class)
}
static void
-e_book_backend_ldap_source_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_book_backend_ldap_source_authenticator_init (ESourceAuthenticatorInterface *iface)
{
- interface->try_password_sync = book_backend_ldap_try_password_sync;
+ iface->try_password_sync = book_backend_ldap_try_password_sync;
}
static void
diff --git a/addressbook/backends/webdav/e-book-backend-webdav.c
b/addressbook/backends/webdav/e-book-backend-webdav.c
index 772618c..328a1db 100644
--- a/addressbook/backends/webdav/e-book-backend-webdav.c
+++ b/addressbook/backends/webdav/e-book-backend-webdav.c
@@ -52,7 +52,7 @@
/* Forward Declarations */
static void e_book_backend_webdav_source_authenticator_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EBookBackendWebdav,
@@ -1650,9 +1650,9 @@ e_book_backend_webdav_class_init (EBookBackendWebdavClass *class)
}
static void
-e_book_backend_webdav_source_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_book_backend_webdav_source_authenticator_init (ESourceAuthenticatorInterface *iface)
{
- interface->try_password_sync = book_backend_webdav_try_password_sync;
+ iface->try_password_sync = book_backend_webdav_try_password_sync;
}
static void
diff --git a/addressbook/libebook/e-book-client-cursor.c b/addressbook/libebook/e-book-client-cursor.c
index 2262b03..1de0026 100644
--- a/addressbook/libebook/e-book-client-cursor.c
+++ b/addressbook/libebook/e-book-client-cursor.c
@@ -492,7 +492,7 @@ static void book_client_cursor_get_property (GObject
GParamSpec *pspec);
/* GInitable */
-static void e_book_client_cursor_initable_init (GInitableIface *interface);
+static void e_book_client_cursor_initable_init (GInitableIface *iface);
static gboolean book_client_cursor_initable_init (GInitable *initable,
GCancellable *cancellable,
GError **error);
@@ -1090,9 +1090,9 @@ book_client_cursor_get_property (GObject *object,
* GInitable *
****************************************************/
static void
-e_book_client_cursor_initable_init (GInitableIface *interface)
+e_book_client_cursor_initable_init (GInitableIface *iface)
{
- interface->init = book_client_cursor_initable_init;
+ iface->init = book_client_cursor_initable_init;
}
static gboolean
diff --git a/addressbook/libebook/e-book-client-view.c b/addressbook/libebook/e-book-client-view.c
index dfdeee9..ed8e67b 100644
--- a/addressbook/libebook/e-book-client-view.c
+++ b/addressbook/libebook/e-book-client-view.c
@@ -96,7 +96,7 @@ enum {
/* Forward Declarations */
static void e_book_client_view_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
static guint signals[LAST_SIGNAL];
@@ -1042,9 +1042,9 @@ e_book_client_view_class_init (EBookClientViewClass *class)
}
static void
-e_book_client_view_initable_init (GInitableIface *interface)
+e_book_client_view_initable_init (GInitableIface *iface)
{
- interface->init = book_client_view_initable_init;
+ iface->init = book_client_view_initable_init;
}
static void
diff --git a/addressbook/libebook/e-book-client.c b/addressbook/libebook/e-book-client.c
index 4ab1132..513944a 100644
--- a/addressbook/libebook/e-book-client.c
+++ b/addressbook/libebook/e-book-client.c
@@ -107,9 +107,9 @@ struct _RunInThreadClosure {
/* Forward Declarations */
static void e_book_client_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
static void e_book_client_async_initable_init
- (GAsyncInitableIface *interface);
+ (GAsyncInitableIface *iface);
static void book_client_set_locale (EBookClient *client,
const gchar *locale);
@@ -1137,16 +1137,16 @@ e_book_client_class_init (EBookClientClass *class)
}
static void
-e_book_client_initable_init (GInitableIface *interface)
+e_book_client_initable_init (GInitableIface *iface)
{
- interface->init = book_client_initable_init;
+ iface->init = book_client_initable_init;
}
static void
-e_book_client_async_initable_init (GAsyncInitableIface *interface)
+e_book_client_async_initable_init (GAsyncInitableIface *iface)
{
- interface->init_async = book_client_initable_init_async;
- interface->init_finish = book_client_initable_init_finish;
+ iface->init_async = book_client_initable_init_async;
+ iface->init_finish = book_client_initable_init_finish;
}
static void
diff --git a/addressbook/libebook/e-book.c b/addressbook/libebook/e-book.c
index 92efbc6..428f762 100644
--- a/addressbook/libebook/e-book.c
+++ b/addressbook/libebook/e-book.c
@@ -82,7 +82,7 @@ enum {
static guint signals[LAST_SIGNAL];
-static void e_book_initable_init (GInitableIface *interface);
+static void e_book_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EBook, e_book, G_TYPE_OBJECT,
@@ -288,9 +288,9 @@ e_book_class_init (EBookClass *class)
}
static void
-e_book_initable_init (GInitableIface *interface)
+e_book_initable_init (GInitableIface *iface)
{
- interface->init = book_initable_init;
+ iface->init = book_initable_init;
}
static void
diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c
index 87bfc1a..96fb1d4 100644
--- a/addressbook/libedata-book/e-data-book-factory.c
+++ b/addressbook/libedata-book/e-data-book-factory.c
@@ -78,7 +78,7 @@ enum {
/* Forward Declarations */
static void e_data_book_factory_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataBookFactory,
@@ -462,7 +462,7 @@ data_book_factory_open (EDataBookFactory *factory,
}
static gboolean
-data_book_factory_handle_open_address_book_cb (EDBusAddressBookFactory *interface,
+data_book_factory_handle_open_address_book_cb (EDBusAddressBookFactory *iface,
GDBusMethodInvocation *invocation,
const gchar *uid,
EDataBookFactory *factory)
@@ -480,7 +480,7 @@ data_book_factory_handle_open_address_book_cb (EDBusAddressBookFactory *interfac
if (object_path != NULL) {
e_dbus_address_book_factory_complete_open_address_book (
- interface, invocation, object_path);
+ iface, invocation, object_path);
g_free (object_path);
} else {
g_return_val_if_fail (error != NULL, FALSE);
@@ -868,9 +868,9 @@ e_data_book_factory_class_init (EDataBookFactoryClass *class)
}
static void
-e_data_book_factory_initable_init (GInitableIface *interface)
+e_data_book_factory_initable_init (GInitableIface *iface)
{
- interface->init = data_book_factory_initable_init;
+ iface->init = data_book_factory_initable_init;
}
static void
diff --git a/addressbook/libedata-book/e-data-book-view.c b/addressbook/libedata-book/e-data-book-view.c
index 85e3ebd..0c1ad49 100644
--- a/addressbook/libedata-book/e-data-book-view.c
+++ b/addressbook/libedata-book/e-data-book-view.c
@@ -90,7 +90,7 @@ enum {
};
/* Forward Declarations */
-static void e_data_book_view_initable_init (GInitableIface *interface);
+static void e_data_book_view_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataBookView,
@@ -601,9 +601,9 @@ e_data_book_view_class_init (EDataBookViewClass *class)
}
static void
-e_data_book_view_initable_init (GInitableIface *interface)
+e_data_book_view_initable_init (GInitableIface *iface)
{
- interface->init = data_book_view_initable_init;
+ iface->init = data_book_view_initable_init;
}
static void
diff --git a/addressbook/libedata-book/e-data-book.c b/addressbook/libedata-book/e-data-book.c
index 4c8f112..6f3b2c7 100644
--- a/addressbook/libedata-book/e-data-book.c
+++ b/addressbook/libedata-book/e-data-book.c
@@ -67,7 +67,7 @@ struct _EDataBookPrivate {
struct _AsyncContext {
EDataBook *data_book;
- EDBusAddressBook *interface;
+ EDBusAddressBook *dbus_interface;
GDBusMethodInvocation *invocation;
GCancellable *cancellable;
guint watcher_id;
@@ -81,7 +81,7 @@ enum {
};
/* Forward Declarations */
-static void e_data_book_initable_init (GInitableIface *interface);
+static void e_data_book_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataBook,
@@ -159,13 +159,13 @@ async_context_new (EDataBook *data_book,
GDBusMethodInvocation *invocation)
{
AsyncContext *async_context;
- EDBusAddressBook *interface;
+ EDBusAddressBook *dbus_interface;
- interface = data_book->priv->dbus_interface;
+ dbus_interface = data_book->priv->dbus_interface;
async_context = g_slice_new0 (AsyncContext);
async_context->data_book = g_object_ref (data_book);
- async_context->interface = g_object_ref (interface);
+ async_context->dbus_interface = g_object_ref (dbus_interface);
async_context->invocation = g_object_ref (invocation);
async_context->cancellable = g_cancellable_new ();
@@ -196,7 +196,7 @@ async_context_free (AsyncContext *async_context)
async_context->cancellable);
g_clear_object (&async_context->data_book);
- g_clear_object (&async_context->interface);
+ g_clear_object (&async_context->dbus_interface);
g_clear_object (&async_context->invocation);
g_clear_object (&async_context->cancellable);
@@ -550,7 +550,7 @@ data_book_complete_open_cb (GObject *source_object,
if (error == NULL) {
e_dbus_address_book_complete_open (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_book_convert_to_client_error (error);
@@ -562,7 +562,7 @@ data_book_complete_open_cb (GObject *source_object,
}
static gboolean
-data_book_handle_open_cb (EDBusAddressBook *interface,
+data_book_handle_open_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
EDataBook *data_book)
{
@@ -598,7 +598,7 @@ data_book_complete_refresh_cb (GObject *source_object,
if (error == NULL) {
e_dbus_address_book_complete_refresh (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_book_convert_to_client_error (error);
@@ -610,7 +610,7 @@ data_book_complete_refresh_cb (GObject *source_object,
}
static gboolean
-data_book_handle_refresh_cb (EDBusAddressBook *interface,
+data_book_handle_refresh_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
EDataBook *data_book)
{
@@ -659,7 +659,7 @@ data_book_complete_get_contact_cb (GObject *source_object,
EVC_FORMAT_VCARD_30);
utf8_vcard = e_util_utf8_make_valid (vcard);
e_dbus_address_book_complete_get_contact (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
utf8_vcard);
g_free (utf8_vcard);
@@ -676,7 +676,7 @@ data_book_complete_get_contact_cb (GObject *source_object,
}
static gboolean
-data_book_handle_get_contact_cb (EDBusAddressBook *interface,
+data_book_handle_get_contact_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_uid,
EDataBook *data_book)
@@ -734,7 +734,7 @@ data_book_complete_get_contact_list_cb (GObject *source_object,
}
e_dbus_address_book_complete_get_contact_list (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv);
@@ -749,7 +749,7 @@ data_book_complete_get_contact_list_cb (GObject *source_object,
}
static gboolean
-data_book_handle_get_contact_list_cb (EDBusAddressBook *interface,
+data_book_handle_get_contact_list_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_query,
EDataBook *data_book)
@@ -798,7 +798,7 @@ data_book_complete_get_contact_list_uids_cb (GObject *source_object,
}
e_dbus_address_book_complete_get_contact_list_uids (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv);
@@ -813,7 +813,7 @@ data_book_complete_get_contact_list_uids_cb (GObject *source_object,
}
static gboolean
-data_book_handle_get_contact_list_uids_cb (EDBusAddressBook *interface,
+data_book_handle_get_contact_list_uids_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_query,
EDataBook *data_book)
@@ -866,7 +866,7 @@ data_book_complete_create_contacts_cb (GObject *source_object,
}
e_dbus_address_book_complete_create_contacts (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv);
@@ -881,7 +881,7 @@ data_book_complete_create_contacts_cb (GObject *source_object,
}
static gboolean
-data_book_handle_create_contacts_cb (EDBusAddressBook *interface,
+data_book_handle_create_contacts_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar * const *in_vcards,
EDataBook *data_book)
@@ -918,7 +918,7 @@ data_book_complete_modify_contacts_cb (GObject *source_object,
if (error == NULL) {
e_dbus_address_book_complete_modify_contacts (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_book_convert_to_client_error (error);
@@ -930,7 +930,7 @@ data_book_complete_modify_contacts_cb (GObject *source_object,
}
static gboolean
-data_book_handle_modify_contacts_cb (EDBusAddressBook *interface,
+data_book_handle_modify_contacts_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar * const *in_vcards,
EDataBook *data_book)
@@ -967,7 +967,7 @@ data_book_complete_remove_contacts_cb (GObject *source_object,
if (error == NULL) {
e_dbus_address_book_complete_remove_contacts (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_book_convert_to_client_error (error);
@@ -979,7 +979,7 @@ data_book_complete_remove_contacts_cb (GObject *source_object,
}
static gboolean
-data_book_handle_remove_contacts_cb (EDBusAddressBook *interface,
+data_book_handle_remove_contacts_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar * const *in_uids,
EDataBook *data_book)
@@ -1004,7 +1004,7 @@ data_book_handle_remove_contacts_cb (EDBusAddressBook *interface,
}
static gboolean
-data_book_handle_get_view_cb (EDBusAddressBook *interface,
+data_book_handle_get_view_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_query,
EDataBook *data_book)
@@ -1045,7 +1045,7 @@ data_book_handle_get_view_cb (EDBusAddressBook *interface,
if (view != NULL) {
e_dbus_address_book_complete_get_view (
- interface, invocation, object_path);
+ dbus_interface, invocation, object_path);
e_book_backend_add_view (backend, view);
g_object_unref (view);
} else {
@@ -1146,7 +1146,7 @@ data_book_interpret_sort_keys (const gchar * const *in_sort_keys,
}
static gboolean
-data_book_handle_get_cursor_cb (EDBusAddressBook *interface,
+data_book_handle_get_cursor_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_query,
const gchar * const *in_sort_keys,
@@ -1222,14 +1222,14 @@ data_book_handle_get_cursor_cb (EDBusAddressBook *interface,
* All is good in the hood, complete the method call
*/
e_dbus_address_book_complete_get_cursor (
- interface, invocation, object_path);
+ dbus_interface, invocation, object_path);
g_free (object_path);
g_object_unref (backend);
return TRUE;
}
static gboolean
-data_book_handle_close_cb (EDBusAddressBook *interface,
+data_book_handle_close_cb (EDBusAddressBook *dbus_interface,
GDBusMethodInvocation *invocation,
EDataBook *data_book)
{
@@ -1239,7 +1239,7 @@ data_book_handle_close_cb (EDBusAddressBook *interface,
/* G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED should be set on
* the GDBusMessage, but we complete the invocation anyway
* and let the D-Bus machinery suppress the reply. */
- e_dbus_address_book_complete_close (interface, invocation);
+ e_dbus_address_book_complete_close (dbus_interface, invocation);
backend = e_data_book_ref_backend (data_book);
g_return_val_if_fail (backend != NULL, FALSE);
@@ -1972,9 +1972,9 @@ e_data_book_class_init (EDataBookClass *class)
}
static void
-e_data_book_initable_init (GInitableIface *interface)
+e_data_book_initable_init (GInitableIface *iface)
{
- interface->init = data_book_initable_init;
+ iface->init = data_book_initable_init;
}
static void
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
index 379a320..948901d 100644
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
@@ -133,7 +133,7 @@ struct _ECalBackendCalDAVPrivate {
/* Forward Declarations */
static void caldav_source_authenticator_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ECalBackendCalDAV,
@@ -5196,9 +5196,9 @@ caldav_try_password_sync (ESourceAuthenticator *authenticator,
}
static void
-caldav_source_authenticator_init (ESourceAuthenticatorInterface *interface)
+caldav_source_authenticator_init (ESourceAuthenticatorInterface *iface)
{
- interface->try_password_sync = caldav_try_password_sync;
+ iface->try_password_sync = caldav_try_password_sync;
}
/* ************************************************************************* */
diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c
index 0583060..ff02976 100644
--- a/calendar/backends/file/e-cal-backend-file.c
+++ b/calendar/backends/file/e-cal-backend-file.c
@@ -115,7 +115,7 @@ static void free_refresh_data (ECalBackendFile *cbfile);
static void bump_revision (ECalBackendFile *cbfile);
static void e_cal_backend_file_timezone_cache_init
- (ETimezoneCacheInterface *interface);
+ (ETimezoneCacheInterface *iface);
static ETimezoneCacheInterface *parent_timezone_cache_interface;
@@ -3563,14 +3563,13 @@ e_cal_backend_file_class_init (ECalBackendFileClass *class)
}
static void
-e_cal_backend_file_timezone_cache_init (ETimezoneCacheInterface *interface)
+e_cal_backend_file_timezone_cache_init (ETimezoneCacheInterface *iface)
{
- parent_timezone_cache_interface =
- g_type_interface_peek_parent (interface);
+ parent_timezone_cache_interface = g_type_interface_peek_parent (iface);
- interface->add_timezone = cal_backend_file_add_cached_timezone;
- interface->get_timezone = cal_backend_file_get_cached_timezone;
- interface->list_timezones = cal_backend_file_list_cached_timezones;
+ iface->add_timezone = cal_backend_file_add_cached_timezone;
+ iface->get_timezone = cal_backend_file_get_cached_timezone;
+ iface->list_timezones = cal_backend_file_list_cached_timezones;
}
static void
diff --git a/calendar/backends/http/e-cal-backend-http.c b/calendar/backends/http/e-cal-backend-http.c
index 296d7d4..13e4abd 100644
--- a/calendar/backends/http/e-cal-backend-http.c
+++ b/calendar/backends/http/e-cal-backend-http.c
@@ -38,7 +38,7 @@
/* Forward Declarations */
static void e_cal_backend_http_source_authenticator_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ECalBackendHttp,
@@ -1504,8 +1504,8 @@ e_cal_backend_http_class_init (ECalBackendHttpClass *class)
}
static void
-e_cal_backend_http_source_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_cal_backend_http_source_authenticator_init (ESourceAuthenticatorInterface *iface)
{
- interface->try_password_sync = cal_backend_http_try_password_sync;
+ iface->try_password_sync = cal_backend_http_try_password_sync;
}
diff --git a/calendar/libecal/e-cal-client-view.c b/calendar/libecal/e-cal-client-view.c
index 52881eb..bbcc2b9 100644
--- a/calendar/libecal/e-cal-client-view.c
+++ b/calendar/libecal/e-cal-client-view.c
@@ -91,7 +91,7 @@ enum {
};
/* Forward Declarations */
-static void e_cal_client_view_initable_init (GInitableIface *interface);
+static void e_cal_client_view_initable_init (GInitableIface *iface);
static guint signals[LAST_SIGNAL];
@@ -865,9 +865,9 @@ e_cal_client_view_class_init (ECalClientViewClass *class)
}
static void
-e_cal_client_view_initable_init (GInitableIface *interface)
+e_cal_client_view_initable_init (GInitableIface *iface)
{
- interface->init = cal_client_view_initable_init;
+ iface->init = cal_client_view_initable_init;
}
static void
diff --git a/calendar/libecal/e-cal-client.c b/calendar/libecal/e-cal-client.c
index 02940a5..8ab422c 100644
--- a/calendar/libecal/e-cal-client.c
+++ b/calendar/libecal/e-cal-client.c
@@ -126,11 +126,11 @@ enum {
/* Forward Declarations */
static void e_cal_client_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
static void e_cal_client_async_initable_init
- (GAsyncInitableIface *interface);
+ (GAsyncInitableIface *iface);
static void e_cal_client_timezone_cache_init
- (ETimezoneCacheInterface *interface);
+ (ETimezoneCacheInterface *iface);
static guint signals[LAST_SIGNAL];
@@ -1438,24 +1438,24 @@ e_cal_client_class_init (ECalClientClass *class)
}
static void
-e_cal_client_initable_init (GInitableIface *interface)
+e_cal_client_initable_init (GInitableIface *iface)
{
- interface->init = cal_client_initable_init;
+ iface->init = cal_client_initable_init;
}
static void
-e_cal_client_async_initable_init (GAsyncInitableIface *interface)
+e_cal_client_async_initable_init (GAsyncInitableIface *iface)
{
- interface->init_async = cal_client_initable_init_async;
- interface->init_finish = cal_client_initable_init_finish;
+ iface->init_async = cal_client_initable_init_async;
+ iface->init_finish = cal_client_initable_init_finish;
}
static void
-e_cal_client_timezone_cache_init (ETimezoneCacheInterface *interface)
+e_cal_client_timezone_cache_init (ETimezoneCacheInterface *iface)
{
- interface->add_timezone = cal_client_add_cached_timezone;
- interface->get_timezone = cal_client_get_cached_timezone;
- interface->list_timezones = cal_client_list_cached_timezones;
+ iface->add_timezone = cal_client_add_cached_timezone;
+ iface->get_timezone = cal_client_get_cached_timezone;
+ iface->list_timezones = cal_client_list_cached_timezones;
}
static void
diff --git a/calendar/libecal/e-cal.c b/calendar/libecal/e-cal.c
index 8c71715..df50e6d 100644
--- a/calendar/libecal/e-cal.c
+++ b/calendar/libecal/e-cal.c
@@ -93,7 +93,7 @@ enum {
static guint signals[LAST_SIGNAL];
-static void e_cal_initable_init (GInitableIface *interface);
+static void e_cal_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
ECal, e_cal, G_TYPE_OBJECT,
@@ -528,9 +528,9 @@ e_cal_class_init (ECalClass *class)
}
static void
-e_cal_initable_init (GInitableIface *interface)
+e_cal_initable_init (GInitableIface *iface)
{
- interface->init = cal_initable_init;
+ iface->init = cal_initable_init;
}
static void
diff --git a/calendar/libecal/e-timezone-cache.c b/calendar/libecal/e-timezone-cache.c
index c8f8ce7..b410fb7 100644
--- a/calendar/libecal/e-timezone-cache.c
+++ b/calendar/libecal/e-timezone-cache.c
@@ -34,7 +34,7 @@ G_DEFINE_INTERFACE (
G_TYPE_OBJECT)
static void
-e_timezone_cache_default_init (ETimezoneCacheInterface *interface)
+e_timezone_cache_default_init (ETimezoneCacheInterface *iface)
{
/**
* ETimezoneCache::timezone-added:
@@ -45,7 +45,7 @@ e_timezone_cache_default_init (ETimezoneCacheInterface *interface)
**/
g_signal_new (
"timezone-added",
- G_OBJECT_CLASS_TYPE (interface),
+ G_OBJECT_CLASS_TYPE (iface),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (ETimezoneCacheInterface, timezone_added),
NULL, NULL, NULL,
@@ -74,15 +74,15 @@ void
e_timezone_cache_add_timezone (ETimezoneCache *cache,
icaltimezone *zone)
{
- ETimezoneCacheInterface *interface;
+ ETimezoneCacheInterface *iface;
g_return_if_fail (E_IS_TIMEZONE_CACHE (cache));
g_return_if_fail (zone != NULL);
- interface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
- g_return_if_fail (interface->add_timezone != NULL);
+ iface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
+ g_return_if_fail (iface->add_timezone != NULL);
- interface->add_timezone (cache, zone);
+ iface->add_timezone (cache, zone);
}
/**
@@ -102,15 +102,15 @@ icaltimezone *
e_timezone_cache_get_timezone (ETimezoneCache *cache,
const gchar *tzid)
{
- ETimezoneCacheInterface *interface;
+ ETimezoneCacheInterface *iface;
g_return_val_if_fail (E_IS_TIMEZONE_CACHE (cache), NULL);
g_return_val_if_fail (tzid != NULL, NULL);
- interface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
- g_return_val_if_fail (interface->get_timezone != NULL, NULL);
+ iface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
+ g_return_val_if_fail (iface->get_timezone != NULL, NULL);
- return interface->get_timezone (cache, tzid);
+ return iface->get_timezone (cache, tzid);
}
/**
@@ -133,13 +133,13 @@ e_timezone_cache_get_timezone (ETimezoneCache *cache,
GList *
e_timezone_cache_list_timezones (ETimezoneCache *cache)
{
- ETimezoneCacheInterface *interface;
+ ETimezoneCacheInterface *iface;
g_return_val_if_fail (E_IS_TIMEZONE_CACHE (cache), NULL);
- interface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
- g_return_val_if_fail (interface->list_timezones != NULL, NULL);
+ iface = E_TIMEZONE_CACHE_GET_INTERFACE (cache);
+ g_return_val_if_fail (iface->list_timezones != NULL, NULL);
- return interface->list_timezones (cache);
+ return iface->list_timezones (cache);
}
diff --git a/calendar/libedata-cal/e-cal-backend.c b/calendar/libedata-cal/e-cal-backend.c
index a7374f0..ab53f72 100644
--- a/calendar/libedata-cal/e-cal-backend.c
+++ b/calendar/libedata-cal/e-cal-backend.c
@@ -128,7 +128,7 @@ static guint signals[LAST_SIGNAL];
/* Forward Declarations */
static void e_cal_backend_timezone_cache_init
- (ETimezoneCacheInterface *interface);
+ (ETimezoneCacheInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
ECalBackend,
@@ -1013,11 +1013,11 @@ e_cal_backend_class_init (ECalBackendClass *class)
}
static void
-e_cal_backend_timezone_cache_init (ETimezoneCacheInterface *interface)
+e_cal_backend_timezone_cache_init (ETimezoneCacheInterface *iface)
{
- interface->add_timezone = cal_backend_add_cached_timezone;
- interface->get_timezone = cal_backend_get_cached_timezone;
- interface->list_timezones = cal_backend_list_cached_timezones;
+ iface->add_timezone = cal_backend_add_cached_timezone;
+ iface->get_timezone = cal_backend_get_cached_timezone;
+ iface->list_timezones = cal_backend_list_cached_timezones;
}
static void
diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c
index 7907c91..eb34085 100644
--- a/calendar/libedata-cal/e-data-cal-factory.c
+++ b/calendar/libedata-cal/e-data-cal-factory.c
@@ -77,7 +77,7 @@ enum {
/* Forward Declarations */
static void e_data_cal_factory_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataCalFactory,
@@ -417,7 +417,7 @@ data_cal_factory_open (EDataCalFactory *factory,
}
static gboolean
-data_cal_factory_handle_open_calendar_cb (EDBusCalendarFactory *interface,
+data_cal_factory_handle_open_calendar_cb (EDBusCalendarFactory *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *uid,
EDataCalFactory *factory)
@@ -436,7 +436,7 @@ data_cal_factory_handle_open_calendar_cb (EDBusCalendarFactory *interface,
if (object_path != NULL) {
e_dbus_calendar_factory_complete_open_calendar (
- interface, invocation, object_path);
+ dbus_interface, invocation, object_path);
g_free (object_path);
} else {
g_return_val_if_fail (error != NULL, FALSE);
@@ -447,7 +447,7 @@ data_cal_factory_handle_open_calendar_cb (EDBusCalendarFactory *interface,
}
static gboolean
-data_cal_factory_handle_open_task_list_cb (EDBusCalendarFactory *interface,
+data_cal_factory_handle_open_task_list_cb (EDBusCalendarFactory *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *uid,
EDataCalFactory *factory)
@@ -466,7 +466,7 @@ data_cal_factory_handle_open_task_list_cb (EDBusCalendarFactory *interface,
if (object_path != NULL) {
e_dbus_calendar_factory_complete_open_task_list (
- interface, invocation, object_path);
+ dbus_interface, invocation, object_path);
g_free (object_path);
} else {
g_return_val_if_fail (error != NULL, FALSE);
@@ -477,7 +477,7 @@ data_cal_factory_handle_open_task_list_cb (EDBusCalendarFactory *interface,
}
static gboolean
-data_cal_factory_handle_open_memo_list_cb (EDBusCalendarFactory *interface,
+data_cal_factory_handle_open_memo_list_cb (EDBusCalendarFactory *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *uid,
EDataCalFactory *factory)
@@ -496,7 +496,7 @@ data_cal_factory_handle_open_memo_list_cb (EDBusCalendarFactory *interface,
if (object_path != NULL) {
e_dbus_calendar_factory_complete_open_memo_list (
- interface, invocation, object_path);
+ dbus_interface, invocation, object_path);
g_free (object_path);
} else {
g_return_val_if_fail (error != NULL, FALSE);
@@ -681,9 +681,9 @@ e_data_cal_factory_class_init (EDataCalFactoryClass *class)
}
static void
-e_data_cal_factory_initable_init (GInitableIface *interface)
+e_data_cal_factory_initable_init (GInitableIface *iface)
{
- interface->init = data_cal_factory_initable_init;
+ iface->init = data_cal_factory_initable_init;
}
static void
diff --git a/calendar/libedata-cal/e-data-cal-view.c b/calendar/libedata-cal/e-data-cal-view.c
index 28cefdb..1701111 100644
--- a/calendar/libedata-cal/e-data-cal-view.c
+++ b/calendar/libedata-cal/e-data-cal-view.c
@@ -93,7 +93,7 @@ enum {
};
/* Forward Declarations */
-static void e_data_cal_view_initable_init (GInitableIface *interface);
+static void e_data_cal_view_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataCalView,
@@ -557,9 +557,9 @@ e_data_cal_view_class_init (EDataCalViewClass *class)
}
static void
-e_data_cal_view_initable_init (GInitableIface *interface)
+e_data_cal_view_initable_init (GInitableIface *iface)
{
- interface->init = data_cal_view_initable_init;
+ iface->init = data_cal_view_initable_init;
}
static void
diff --git a/calendar/libedata-cal/e-data-cal.c b/calendar/libedata-cal/e-data-cal.c
index 5585df3..d42516f 100644
--- a/calendar/libedata-cal/e-data-cal.c
+++ b/calendar/libedata-cal/e-data-cal.c
@@ -62,7 +62,7 @@ struct _EDataCalPrivate {
struct _AsyncContext {
EDataCal *data_cal;
- EDBusCalendar *interface;
+ EDBusCalendar *dbus_interface;
GDBusMethodInvocation *invocation;
GCancellable *cancellable;
guint watcher_id;
@@ -76,7 +76,7 @@ enum {
};
/* Forward Declarations */
-static void e_data_cal_initable_init (GInitableIface *interface);
+static void e_data_cal_initable_init (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EDataCal,
@@ -154,13 +154,13 @@ async_context_new (EDataCal *data_cal,
GDBusMethodInvocation *invocation)
{
AsyncContext *async_context;
- EDBusCalendar *interface;
+ EDBusCalendar *dbus_interface;
- interface = data_cal->priv->dbus_interface;
+ dbus_interface = data_cal->priv->dbus_interface;
async_context = g_slice_new0 (AsyncContext);
async_context->data_cal = g_object_ref (data_cal);
- async_context->interface = g_object_ref (interface);
+ async_context->dbus_interface = g_object_ref (dbus_interface);
async_context->invocation = g_object_ref (invocation);
async_context->cancellable = g_cancellable_new ();
@@ -191,7 +191,7 @@ async_context_free (AsyncContext *async_context)
async_context->cancellable);
g_clear_object (&async_context->data_cal);
- g_clear_object (&async_context->interface);
+ g_clear_object (&async_context->dbus_interface);
g_clear_object (&async_context->invocation);
g_clear_object (&async_context->cancellable);
@@ -502,7 +502,7 @@ data_cal_complete_open_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_open (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -514,7 +514,7 @@ data_cal_complete_open_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_open_cb (EDBusCalendar *interface,
+data_cal_handle_open_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
EDataCal *data_cal)
{
@@ -550,7 +550,7 @@ data_cal_complete_refresh_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_refresh (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -562,7 +562,7 @@ data_cal_complete_refresh_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_refresh_cb (EDBusCalendar *interface,
+data_cal_handle_refresh_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
EDataCal *data_cal)
{
@@ -608,7 +608,7 @@ data_cal_complete_get_object_cb (GObject *source_object,
utf8_calobj = e_util_utf8_make_valid (calobj);
e_dbus_calendar_complete_get_object (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
utf8_calobj);
@@ -624,7 +624,7 @@ data_cal_complete_get_object_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_get_object_cb (EDBusCalendar *interface,
+data_cal_handle_get_object_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_uid,
const gchar *in_rid,
@@ -684,7 +684,7 @@ data_cal_complete_get_object_list_cb (GObject *source_object,
}
e_dbus_calendar_complete_get_object_list (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv);
@@ -699,7 +699,7 @@ data_cal_complete_get_object_list_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_get_object_list_cb (EDBusCalendar *interface,
+data_cal_handle_get_object_list_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_query,
EDataCal *data_cal)
@@ -737,7 +737,7 @@ data_cal_complete_get_free_busy_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_get_free_busy (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -749,7 +749,7 @@ data_cal_complete_get_free_busy_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_get_free_busy_cb (EDBusCalendar *interface,
+data_cal_handle_get_free_busy_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
gint64 in_start,
gint64 in_end,
@@ -805,7 +805,7 @@ data_cal_complete_create_objects_cb (GObject *source_object,
}
e_dbus_calendar_complete_create_objects (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv);
@@ -820,7 +820,7 @@ data_cal_complete_create_objects_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_create_objects_cb (EDBusCalendar *interface,
+data_cal_handle_create_objects_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar * const *in_calobjs,
EDataCal *data_cal)
@@ -858,7 +858,7 @@ data_cal_complete_modify_objects_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_modify_objects (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -870,7 +870,7 @@ data_cal_complete_modify_objects_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_modify_objects_cb (EDBusCalendar *interface,
+data_cal_handle_modify_objects_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar * const *in_ics_objects,
const gchar *in_mod_type,
@@ -931,7 +931,7 @@ data_cal_complete_remove_objects_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_remove_objects (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -943,7 +943,7 @@ data_cal_complete_remove_objects_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_remove_objects_cb (EDBusCalendar *interface,
+data_cal_handle_remove_objects_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
GVariant *in_uid_rid_array,
const gchar *in_mod_type,
@@ -1035,7 +1035,7 @@ data_cal_complete_receive_objects_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_receive_objects (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -1047,7 +1047,7 @@ data_cal_complete_receive_objects_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_receive_objects_cb (EDBusCalendar *interface,
+data_cal_handle_receive_objects_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_calobj,
EDataCal *data_cal)
@@ -1108,7 +1108,7 @@ data_cal_complete_send_objects_cb (GObject *source_object,
utf8_calobj = e_util_utf8_make_valid (calobj);
e_dbus_calendar_complete_send_objects (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv,
utf8_calobj);
@@ -1127,7 +1127,7 @@ data_cal_complete_send_objects_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_send_objects_cb (EDBusCalendar *interface,
+data_cal_handle_send_objects_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_calobj,
EDataCal *data_cal)
@@ -1179,7 +1179,7 @@ data_cal_complete_get_attachment_uris_cb (GObject *source_object,
}
e_dbus_calendar_complete_get_attachment_uris (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
(const gchar * const *) strv);
@@ -1194,7 +1194,7 @@ data_cal_complete_get_attachment_uris_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_get_attachment_uris_cb (EDBusCalendar *interface,
+data_cal_handle_get_attachment_uris_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_uid,
const gchar *in_rid,
@@ -1238,7 +1238,7 @@ data_cal_complete_discard_alarm_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_discard_alarm (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -1250,7 +1250,7 @@ data_cal_complete_discard_alarm_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_discard_alarm_cb (EDBusCalendar *interface,
+data_cal_handle_discard_alarm_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_uid,
const gchar *in_rid,
@@ -1283,7 +1283,7 @@ data_cal_handle_discard_alarm_cb (EDBusCalendar *interface,
}
static gboolean
-data_cal_handle_get_view_cb (EDBusCalendar *interface,
+data_cal_handle_get_view_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_query,
EDataCal *data_cal)
@@ -1324,7 +1324,7 @@ data_cal_handle_get_view_cb (EDBusCalendar *interface,
if (view != NULL) {
e_dbus_calendar_complete_get_view (
- interface, invocation, object_path);
+ dbus_interface, invocation, object_path);
e_cal_backend_add_view (backend, view);
g_object_unref (view);
} else {
@@ -1360,7 +1360,7 @@ data_cal_complete_get_timezone_cb (GObject *source_object,
if (tzobject != NULL) {
e_dbus_calendar_complete_get_timezone (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation,
tzobject);
@@ -1375,7 +1375,7 @@ data_cal_complete_get_timezone_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_get_timezone_cb (EDBusCalendar *interface,
+data_cal_handle_get_timezone_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_tzid,
EDataCal *data_cal)
@@ -1413,7 +1413,7 @@ data_cal_complete_add_timezone_cb (GObject *source_object,
if (error == NULL) {
e_dbus_calendar_complete_add_timezone (
- async_context->interface,
+ async_context->dbus_interface,
async_context->invocation);
} else {
data_cal_convert_to_client_error (error);
@@ -1425,7 +1425,7 @@ data_cal_complete_add_timezone_cb (GObject *source_object,
}
static gboolean
-data_cal_handle_add_timezone_cb (EDBusCalendar *interface,
+data_cal_handle_add_timezone_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *in_tzobject,
EDataCal *data_cal)
@@ -1451,7 +1451,7 @@ data_cal_handle_add_timezone_cb (EDBusCalendar *interface,
}
static gboolean
-data_cal_handle_close_cb (EDBusCalendar *interface,
+data_cal_handle_close_cb (EDBusCalendar *dbus_interface,
GDBusMethodInvocation *invocation,
EDataCal *data_cal)
{
@@ -1461,7 +1461,7 @@ data_cal_handle_close_cb (EDBusCalendar *interface,
/* G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED should be set on
* the GDBusMessage, but we complete the invocation anyway
* and let the D-Bus machinery suppress the reply. */
- e_dbus_calendar_complete_close (interface, invocation);
+ e_dbus_calendar_complete_close (dbus_interface, invocation);
backend = e_data_cal_ref_backend (data_cal);
g_return_val_if_fail (backend != NULL, FALSE);
@@ -2550,9 +2550,9 @@ e_data_cal_class_init (EDataCalClass *class)
}
static void
-e_data_cal_initable_init (GInitableIface *interface)
+e_data_cal_initable_init (GInitableIface *iface)
{
- interface->init = data_cal_initable_init;
+ iface->init = data_cal_initable_init;
}
static void
diff --git a/camel/camel-junk-filter.c b/camel/camel-junk-filter.c
index 6434eb0..e691fe0 100644
--- a/camel/camel-junk-filter.c
+++ b/camel/camel-junk-filter.c
@@ -25,7 +25,7 @@
G_DEFINE_INTERFACE (CamelJunkFilter, camel_junk_filter, G_TYPE_OBJECT)
static void
-camel_junk_filter_default_init (CamelJunkFilterInterface *interface)
+camel_junk_filter_default_init (CamelJunkFilterInterface *iface)
{
}
@@ -51,15 +51,15 @@ camel_junk_filter_classify (CamelJunkFilter *junk_filter,
GCancellable *cancellable,
GError **error)
{
- CamelJunkFilterInterface *interface;
+ CamelJunkFilterInterface *iface;
g_return_val_if_fail (CAMEL_IS_JUNK_FILTER (junk_filter), 0);
g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), 0);
- interface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
- g_return_val_if_fail (interface->classify != NULL, 0);
+ iface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
+ g_return_val_if_fail (iface->classify != NULL, 0);
- return interface->classify (
+ return iface->classify (
junk_filter, message, cancellable, error);
}
@@ -86,15 +86,15 @@ camel_junk_filter_learn_junk (CamelJunkFilter *junk_filter,
GCancellable *cancellable,
GError **error)
{
- CamelJunkFilterInterface *interface;
+ CamelJunkFilterInterface *iface;
g_return_val_if_fail (CAMEL_IS_JUNK_FILTER (junk_filter), FALSE);
g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), FALSE);
- interface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
- g_return_val_if_fail (interface->learn_junk != NULL, FALSE);
+ iface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
+ g_return_val_if_fail (iface->learn_junk != NULL, FALSE);
- return interface->learn_junk (
+ return iface->learn_junk (
junk_filter, message, cancellable, error);
}
@@ -121,15 +121,15 @@ camel_junk_filter_learn_not_junk (CamelJunkFilter *junk_filter,
GCancellable *cancellable,
GError **error)
{
- CamelJunkFilterInterface *interface;
+ CamelJunkFilterInterface *iface;
g_return_val_if_fail (CAMEL_IS_JUNK_FILTER (junk_filter), FALSE);
g_return_val_if_fail (CAMEL_IS_MIME_MESSAGE (message), FALSE);
- interface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
- g_return_val_if_fail (interface->learn_not_junk != NULL, FALSE);
+ iface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
+ g_return_val_if_fail (iface->learn_not_junk != NULL, FALSE);
- return interface->learn_not_junk (
+ return iface->learn_not_junk (
junk_filter, message, cancellable, error);
}
@@ -154,19 +154,19 @@ camel_junk_filter_synchronize (CamelJunkFilter *junk_filter,
GCancellable *cancellable,
GError **error)
{
- CamelJunkFilterInterface *interface;
+ CamelJunkFilterInterface *iface;
gboolean success = TRUE;
g_return_val_if_fail (CAMEL_IS_JUNK_FILTER (junk_filter), FALSE);
/* This method is optional. */
- interface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
+ iface = CAMEL_JUNK_FILTER_GET_INTERFACE (junk_filter);
- if (interface->synchronize != NULL) {
+ if (iface->synchronize != NULL) {
camel_operation_push_message (
cancellable, _("Synchronizing junk database"));
- success = interface->synchronize (
+ success = iface->synchronize (
junk_filter, cancellable, error);
camel_operation_pop_message (cancellable);
diff --git a/camel/camel-network-service.c b/camel/camel-network-service.c
index fb18d6c..0afcb34 100644
--- a/camel/camel-network-service.c
+++ b/camel/camel-network-service.c
@@ -671,13 +671,13 @@ network_service_new_connectable (CamelNetworkService *service)
}
static void
-camel_network_service_default_init (CamelNetworkServiceInterface *interface)
+camel_network_service_default_init (CamelNetworkServiceInterface *iface)
{
- interface->connect_sync = network_service_connect_sync;
- interface->new_connectable = network_service_new_connectable;
+ iface->connect_sync = network_service_connect_sync;
+ iface->new_connectable = network_service_new_connectable;
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_object (
"connectable",
"Connectable",
@@ -687,7 +687,7 @@ camel_network_service_default_init (CamelNetworkServiceInterface *interface)
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_boolean (
"host-reachable",
"Host Reachable",
@@ -729,15 +729,15 @@ const gchar *
camel_network_service_get_service_name (CamelNetworkService *service,
CamelNetworkSecurityMethod method)
{
- CamelNetworkServiceInterface *interface;
+ CamelNetworkServiceInterface *iface;
const gchar *service_name = NULL;
g_return_val_if_fail (CAMEL_IS_NETWORK_SERVICE (service), NULL);
- interface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
+ iface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
- if (interface->get_service_name != NULL)
- service_name = interface->get_service_name (service, method);
+ if (iface->get_service_name != NULL)
+ service_name = iface->get_service_name (service, method);
return service_name;
}
@@ -760,15 +760,15 @@ guint16
camel_network_service_get_default_port (CamelNetworkService *service,
CamelNetworkSecurityMethod method)
{
- CamelNetworkServiceInterface *interface;
+ CamelNetworkServiceInterface *iface;
guint16 default_port = 0;
g_return_val_if_fail (CAMEL_IS_NETWORK_SERVICE (service), 0);
- interface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
+ iface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
- if (interface->get_default_port != NULL)
- default_port = interface->get_default_port (service, method);
+ if (iface->get_default_port != NULL)
+ default_port = iface->get_default_port (service, method);
return default_port;
}
@@ -823,13 +823,13 @@ void
camel_network_service_set_connectable (CamelNetworkService *service,
GSocketConnectable *connectable)
{
- CamelNetworkServiceInterface *interface;
+ CamelNetworkServiceInterface *iface;
CamelNetworkServicePrivate *priv;
g_return_if_fail (CAMEL_IS_NETWORK_SERVICE (service));
- interface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
- g_return_if_fail (interface->new_connectable != NULL);
+ iface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
+ g_return_if_fail (iface->new_connectable != NULL);
priv = CAMEL_NETWORK_SERVICE_GET_PRIVATE (service);
g_return_if_fail (priv != NULL);
@@ -840,7 +840,7 @@ camel_network_service_set_connectable (CamelNetworkService *service,
} else {
/* This may return NULL if we don't have valid network
* settings from which to create a GSocketConnectable. */
- connectable = interface->new_connectable (service);
+ connectable = iface->new_connectable (service);
}
g_mutex_lock (&priv->property_lock);
@@ -903,14 +903,14 @@ camel_network_service_connect_sync (CamelNetworkService *service,
GCancellable *cancellable,
GError **error)
{
- CamelNetworkServiceInterface *interface;
+ CamelNetworkServiceInterface *iface;
g_return_val_if_fail (CAMEL_IS_NETWORK_SERVICE (service), NULL);
- interface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
- g_return_val_if_fail (interface->connect_sync != NULL, NULL);
+ iface = CAMEL_NETWORK_SERVICE_GET_INTERFACE (service);
+ g_return_val_if_fail (iface->connect_sync != NULL, NULL);
- return interface->connect_sync (service, cancellable, error);
+ return iface->connect_sync (service, cancellable, error);
}
/**
diff --git a/camel/camel-network-settings.c b/camel/camel-network-settings.c
index 5b9d3b6..347a1c4 100644
--- a/camel/camel-network-settings.c
+++ b/camel/camel-network-settings.c
@@ -37,10 +37,10 @@ G_DEFINE_INTERFACE (
CAMEL_TYPE_SETTINGS)
static void
-camel_network_settings_default_init (CamelNetworkSettingsInterface *interface)
+camel_network_settings_default_init (CamelNetworkSettingsInterface *iface)
{
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_string (
"auth-mechanism",
"Auth Mechanism",
@@ -51,7 +51,7 @@ camel_network_settings_default_init (CamelNetworkSettingsInterface *interface)
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_string (
"host",
"Host",
@@ -62,7 +62,7 @@ camel_network_settings_default_init (CamelNetworkSettingsInterface *interface)
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_uint (
"port",
"Port",
@@ -73,7 +73,7 @@ camel_network_settings_default_init (CamelNetworkSettingsInterface *interface)
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_enum (
"security-method",
"Security Method",
@@ -85,7 +85,7 @@ camel_network_settings_default_init (CamelNetworkSettingsInterface *interface)
G_PARAM_STATIC_STRINGS));
g_object_interface_install_property (
- interface,
+ iface,
g_param_spec_string (
"user",
"User",
diff --git a/camel/camel-service.c b/camel/camel-service.c
index 2ea3d22..2593c23 100644
--- a/camel/camel-service.c
+++ b/camel/camel-service.c
@@ -119,7 +119,7 @@ enum {
/* Forward Declarations */
void camel_network_service_init (CamelNetworkService *service);
-static void camel_service_initable_init (GInitableIface *interface);
+static void camel_service_initable_init (GInitableIface *iface);
static void service_task_dispatch (CamelService *service,
GTask *task);
@@ -1068,9 +1068,9 @@ camel_service_class_init (CamelServiceClass *class)
}
static void
-camel_service_initable_init (GInitableIface *interface)
+camel_service_initable_init (GInitableIface *iface)
{
- interface->init = service_initable_init;
+ iface->init = service_initable_init;
}
static void
diff --git a/camel/camel-store.c b/camel/camel-store.c
index b09baf8..1c8ecd7 100644
--- a/camel/camel-store.c
+++ b/camel/camel-store.c
@@ -86,7 +86,7 @@ static guint signals[LAST_SIGNAL];
static GInitableIface *parent_initable_interface;
/* Forward Declarations */
-static void camel_store_initable_init (GInitableIface *interface);
+static void camel_store_initable_init (GInitableIface *iface);
G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
CamelStore, camel_store, CAMEL_TYPE_SERVICE,
@@ -630,11 +630,11 @@ camel_store_class_init (CamelStoreClass *class)
}
static void
-camel_store_initable_init (GInitableIface *interface)
+camel_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 = store_initable_init;
+ iface->init = store_initable_init;
}
static void
diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c
index a91fa38..74463bd 100644
--- a/camel/camel-stream-filter.c
+++ b/camel/camel-stream-filter.c
@@ -65,7 +65,7 @@ struct _CamelStreamFilterPrivate {
#define READ_PAD (128) /* bytes padded before buffer */
#define READ_SIZE (4096)
-static void camel_stream_filter_seekable_init (GSeekableIface *interface);
+static void camel_stream_filter_seekable_init (GSeekableIface *iface);
G_DEFINE_TYPE_WITH_CODE (CamelStreamFilter, camel_stream_filter, CAMEL_TYPE_STREAM,
G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, camel_stream_filter_seekable_init))
@@ -399,13 +399,13 @@ camel_stream_filter_class_init (CamelStreamFilterClass *class)
}
static void
-camel_stream_filter_seekable_init (GSeekableIface *interface)
+camel_stream_filter_seekable_init (GSeekableIface *iface)
{
- interface->tell = stream_filter_tell;
- interface->can_seek = stream_filter_can_seek;
- interface->seek = stream_filter_seek;
- interface->can_truncate = stream_filter_can_truncate;
- interface->truncate_fn = stream_filter_truncate_fn;
+ iface->tell = stream_filter_tell;
+ iface->can_seek = stream_filter_can_seek;
+ iface->seek = stream_filter_seek;
+ iface->can_truncate = stream_filter_can_truncate;
+ iface->truncate_fn = stream_filter_truncate_fn;
}
static void
diff --git a/camel/camel-stream-fs.c b/camel/camel-stream-fs.c
index b8fe7a4..522a229 100644
--- a/camel/camel-stream-fs.c
+++ b/camel/camel-stream-fs.c
@@ -46,7 +46,7 @@ struct _CamelStreamFsPrivate {
};
/* Forward Declarations */
-static void camel_stream_fs_seekable_init (GSeekableIface *interface);
+static void camel_stream_fs_seekable_init (GSeekableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelStreamFs, camel_stream_fs, CAMEL_TYPE_STREAM,
@@ -248,13 +248,13 @@ camel_stream_fs_class_init (CamelStreamFsClass *class)
}
static void
-camel_stream_fs_seekable_init (GSeekableIface *interface)
+camel_stream_fs_seekable_init (GSeekableIface *iface)
{
- interface->tell = stream_fs_tell;
- interface->can_seek = stream_fs_can_seek;
- interface->seek = stream_fs_seek;
- interface->can_truncate = stream_fs_can_truncate;
- interface->truncate_fn = stream_fs_truncate_fn;
+ iface->tell = stream_fs_tell;
+ iface->can_seek = stream_fs_can_seek;
+ iface->seek = stream_fs_seek;
+ iface->can_truncate = stream_fs_can_truncate;
+ iface->truncate_fn = stream_fs_truncate_fn;
}
static void
diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c
index 6345179..73bc401 100644
--- a/camel/camel-stream-mem.c
+++ b/camel/camel-stream-mem.c
@@ -46,7 +46,7 @@ struct _CamelStreamMemPrivate {
};
/* Forward Declarations */
-static void camel_stream_mem_seekable_init (GSeekableIface *interface);
+static void camel_stream_mem_seekable_init (GSeekableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelStreamMem, camel_stream_mem, CAMEL_TYPE_STREAM,
@@ -240,13 +240,13 @@ camel_stream_mem_class_init (CamelStreamMemClass *class)
}
static void
-camel_stream_mem_seekable_init (GSeekableIface *interface)
+camel_stream_mem_seekable_init (GSeekableIface *iface)
{
- interface->tell = stream_mem_tell;
- interface->can_seek = stream_mem_can_seek;
- interface->seek = stream_mem_seek;
- interface->can_truncate = stream_mem_can_truncate;
- interface->truncate_fn = stream_mem_truncate_fn;
+ iface->tell = stream_mem_tell;
+ iface->can_seek = stream_mem_can_seek;
+ iface->seek = stream_mem_seek;
+ iface->can_truncate = stream_mem_can_truncate;
+ iface->truncate_fn = stream_mem_truncate_fn;
}
static void
diff --git a/camel/camel-stream-null.c b/camel/camel-stream-null.c
index 443fcef..60625b4 100644
--- a/camel/camel-stream-null.c
+++ b/camel/camel-stream-null.c
@@ -28,7 +28,7 @@
#include "camel-stream-null.h"
-static void camel_stream_null_seekable_init (GSeekableIface *interface);
+static void camel_stream_null_seekable_init (GSeekableIface *iface);
G_DEFINE_TYPE_WITH_CODE (CamelStreamNull, camel_stream_null, CAMEL_TYPE_STREAM,
G_IMPLEMENT_INTERFACE (G_TYPE_SEEKABLE, camel_stream_null_seekable_init))
@@ -113,13 +113,13 @@ camel_stream_null_class_init (CamelStreamNullClass *class)
}
static void
-camel_stream_null_seekable_init (GSeekableIface *interface)
+camel_stream_null_seekable_init (GSeekableIface *iface)
{
- interface->tell = stream_null_tell;
- interface->can_seek = stream_null_can_seek;
- interface->seek = stream_null_seek;
- interface->can_truncate = stream_null_can_truncate;
- interface->truncate_fn = stream_null_truncate_fn;
+ iface->tell = stream_null_tell;
+ iface->can_seek = stream_null_can_seek;
+ iface->seek = stream_null_seek;
+ iface->can_truncate = stream_null_can_truncate;
+ iface->truncate_fn = stream_null_truncate_fn;
}
static void
diff --git a/camel/camel-stream.c b/camel/camel-stream.c
index 1075168..50f10b4 100644
--- a/camel/camel-stream.c
+++ b/camel/camel-stream.c
@@ -42,7 +42,7 @@ enum {
};
/* Forward Declarations */
-static void camel_stream_seekable_init (GSeekableIface *interface);
+static void camel_stream_seekable_init (GSeekableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelStream,
@@ -376,13 +376,13 @@ camel_stream_class_init (CamelStreamClass *class)
}
static void
-camel_stream_seekable_init (GSeekableIface *interface)
+camel_stream_seekable_init (GSeekableIface *iface)
{
- interface->tell = stream_tell;
- interface->can_seek = stream_can_seek;
- interface->seek = stream_seek;
- interface->can_truncate = stream_can_truncate;
- interface->truncate_fn = stream_truncate;
+ iface->tell = stream_tell;
+ iface->can_seek = stream_can_seek;
+ iface->seek = stream_seek;
+ iface->can_truncate = stream_can_truncate;
+ iface->truncate_fn = stream_truncate;
}
static void
diff --git a/camel/camel-subscribable.c b/camel/camel-subscribable.c
index d812aad..c9e9837 100644
--- a/camel/camel-subscribable.c
+++ b/camel/camel-subscribable.c
@@ -145,11 +145,11 @@ subscribable_delete_cached_folder (CamelStore *store,
}
static void
-camel_subscribable_default_init (CamelSubscribableInterface *interface)
+camel_subscribable_default_init (CamelSubscribableInterface *iface)
{
signals[FOLDER_SUBSCRIBED] = g_signal_new (
"folder-subscribed",
- G_OBJECT_CLASS_TYPE (interface),
+ G_OBJECT_CLASS_TYPE (iface),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (
CamelSubscribableInterface,
@@ -160,7 +160,7 @@ camel_subscribable_default_init (CamelSubscribableInterface *interface)
signals[FOLDER_UNSUBSCRIBED] = g_signal_new (
"folder-unsubscribed",
- G_OBJECT_CLASS_TYPE (interface),
+ G_OBJECT_CLASS_TYPE (iface),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (
CamelSubscribableInterface,
@@ -185,15 +185,15 @@ gboolean
camel_subscribable_folder_is_subscribed (CamelSubscribable *subscribable,
const gchar *folder_name)
{
- CamelSubscribableInterface *interface;
+ CamelSubscribableInterface *iface;
g_return_val_if_fail (CAMEL_IS_SUBSCRIBABLE (subscribable), FALSE);
g_return_val_if_fail (folder_name != NULL, FALSE);
- interface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
- g_return_val_if_fail (interface->folder_is_subscribed != NULL, FALSE);
+ iface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
+ g_return_val_if_fail (iface->folder_is_subscribed != NULL, FALSE);
- return interface->folder_is_subscribed (subscribable, folder_name);
+ return iface->folder_is_subscribed (subscribable, folder_name);
}
/**
@@ -247,7 +247,7 @@ subscribable_subscribe_folder_thread (GTask *task,
GCancellable *cancellable)
{
CamelSubscribable *subscribable;
- CamelSubscribableInterface *interface;
+ CamelSubscribableInterface *iface;
const gchar *folder_name;
const gchar *message;
gboolean success;
@@ -259,8 +259,8 @@ subscribable_subscribe_folder_thread (GTask *task,
folder_name = async_context->folder_name;
- interface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
- g_return_if_fail (interface->subscribe_folder_sync != NULL);
+ iface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
+ g_return_if_fail (iface->subscribe_folder_sync != NULL);
/* Need to establish a connection before subscribing. */
camel_service_connect_sync (
@@ -273,7 +273,7 @@ subscribable_subscribe_folder_thread (GTask *task,
message = _("Subscribing to folder '%s'");
camel_operation_push_message (cancellable, message, folder_name);
- success = interface->subscribe_folder_sync (
+ success = iface->subscribe_folder_sync (
subscribable, folder_name, cancellable, &local_error);
CAMEL_CHECK_LOCAL_GERROR (
subscribable, subscribe_folder_sync, success, local_error);
@@ -416,7 +416,7 @@ subscribable_unsubscribe_folder_thread (GTask *task,
GCancellable *cancellable)
{
CamelSubscribable *subscribable;
- CamelSubscribableInterface *interface;
+ CamelSubscribableInterface *iface;
const gchar *folder_name;
const gchar *message;
gboolean success;
@@ -428,8 +428,8 @@ subscribable_unsubscribe_folder_thread (GTask *task,
folder_name = async_context->folder_name;
- interface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
- g_return_if_fail (interface->unsubscribe_folder_sync != NULL);
+ iface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
+ g_return_if_fail (iface->unsubscribe_folder_sync != NULL);
/* Need to establish a connection before unsubscribing. */
camel_service_connect_sync (
@@ -442,7 +442,7 @@ subscribable_unsubscribe_folder_thread (GTask *task,
message = _("Unsubscribing from folder '%s'");
camel_operation_push_message (cancellable, message, folder_name);
- success = interface->unsubscribe_folder_sync (
+ success = iface->unsubscribe_folder_sync (
subscribable, folder_name, cancellable, &local_error);
CAMEL_CHECK_LOCAL_GERROR (
subscribable, unsubscribe_folder_sync, success, local_error);
diff --git a/camel/providers/imapx/camel-imapx-input-stream.c
b/camel/providers/imapx/camel-imapx-input-stream.c
index 77165c3..ebc8af9 100644
--- a/camel/providers/imapx/camel-imapx-input-stream.c
+++ b/camel/providers/imapx/camel-imapx-input-stream.c
@@ -48,7 +48,7 @@ struct _CamelIMAPXInputStreamPrivate {
/* Forward Declarations */
static void camel_imapx_input_stream_pollable_init
- (GPollableInputStreamInterface *interface);
+ (GPollableInputStreamInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelIMAPXInputStream,
@@ -225,12 +225,12 @@ camel_imapx_input_stream_class_init (CamelIMAPXInputStreamClass *class)
}
static void
-camel_imapx_input_stream_pollable_init (GPollableInputStreamInterface *interface)
+camel_imapx_input_stream_pollable_init (GPollableInputStreamInterface *iface)
{
- interface->can_poll = imapx_input_stream_can_poll;
- interface->is_readable = imapx_input_stream_is_readable;
- interface->create_source = imapx_input_stream_create_source;
- interface->read_nonblocking = imapx_input_stream_read_nonblocking;
+ iface->can_poll = imapx_input_stream_can_poll;
+ iface->is_readable = imapx_input_stream_is_readable;
+ iface->create_source = imapx_input_stream_create_source;
+ iface->read_nonblocking = imapx_input_stream_read_nonblocking;
}
static void
diff --git a/camel/providers/imapx/camel-imapx-logger.c b/camel/providers/imapx/camel-imapx-logger.c
index 7938440..30f9de9 100644
--- a/camel/providers/imapx/camel-imapx-logger.c
+++ b/camel/providers/imapx/camel-imapx-logger.c
@@ -46,7 +46,7 @@ enum {
/* Forward Declarations */
static void camel_imapx_logger_interface_init
- (GConverterIface *interface);
+ (GConverterIface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelIMAPXLogger,
@@ -165,10 +165,10 @@ camel_imapx_logger_class_init (CamelIMAPXLoggerClass *class)
}
static void
-camel_imapx_logger_interface_init (GConverterIface *interface)
+camel_imapx_logger_interface_init (GConverterIface *iface)
{
- interface->convert = imapx_logger_convert;
- interface->reset = imapx_logger_reset;
+ iface->convert = imapx_logger_convert;
+ iface->reset = imapx_logger_reset;
}
static void
diff --git a/camel/providers/imapx/camel-imapx-store.c b/camel/providers/imapx/camel-imapx-store.c
index 2c38511..82753c6 100644
--- a/camel/providers/imapx/camel-imapx-store.c
+++ b/camel/providers/imapx/camel-imapx-store.c
@@ -86,9 +86,9 @@ enum {
static GInitableIface *parent_initable_interface;
/* Forward Declarations */
-static void camel_imapx_store_initable_init (GInitableIface *interface);
-static void camel_network_service_init (CamelNetworkServiceInterface *interface);
-static void camel_subscribable_init (CamelSubscribableInterface *interface);
+static void camel_imapx_store_initable_init (GInitableIface *iface);
+static void camel_network_service_init (CamelNetworkServiceInterface *iface);
+static void camel_subscribable_init (CamelSubscribableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelIMAPXStore,
@@ -2526,26 +2526,26 @@ camel_imapx_store_class_init (CamelIMAPXStoreClass *class)
}
static void
-camel_imapx_store_initable_init (GInitableIface *interface)
+camel_imapx_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 = imapx_store_initable_init;
+ iface->init = imapx_store_initable_init;
}
static void
-camel_network_service_init (CamelNetworkServiceInterface *interface)
+camel_network_service_init (CamelNetworkServiceInterface *iface)
{
- interface->get_service_name = imapx_store_get_service_name;
- interface->get_default_port = imapx_store_get_default_port;
+ iface->get_service_name = imapx_store_get_service_name;
+ iface->get_default_port = imapx_store_get_default_port;
}
static void
-camel_subscribable_init (CamelSubscribableInterface *interface)
+camel_subscribable_init (CamelSubscribableInterface *iface)
{
- interface->folder_is_subscribed = imapx_store_folder_is_subscribed;
- interface->subscribe_folder_sync = imapx_store_subscribe_folder_sync;
- interface->unsubscribe_folder_sync = imapx_store_unsubscribe_folder_sync;
+ iface->folder_is_subscribed = imapx_store_folder_is_subscribed;
+ iface->subscribe_folder_sync = imapx_store_subscribe_folder_sync;
+ iface->unsubscribe_folder_sync = imapx_store_unsubscribe_folder_sync;
}
static void
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index 59badac..e209725 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -76,9 +76,9 @@ enum {
static GInitableIface *parent_initable_interface;
/* Forward Declarations */
-static void camel_nntp_store_initable_init (GInitableIface *interface);
-static void camel_network_service_init (CamelNetworkServiceInterface *interface);
-static void camel_subscribable_init (CamelSubscribableInterface *interface);
+static void camel_nntp_store_initable_init (GInitableIface *iface);
+static void camel_network_service_init (CamelNetworkServiceInterface *iface);
+static void camel_subscribable_init (CamelSubscribableInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelNNTPStore,
@@ -1292,12 +1292,12 @@ nntp_store_delete_folder_sync (CamelStore *store,
GError **error)
{
CamelSubscribable *subscribable;
- CamelSubscribableInterface *interface;
+ CamelSubscribableInterface *iface;
subscribable = CAMEL_SUBSCRIBABLE (store);
- interface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
+ iface = CAMEL_SUBSCRIBABLE_GET_INTERFACE (subscribable);
- interface->unsubscribe_folder_sync (
+ iface->unsubscribe_folder_sync (
subscribable, folder_name, cancellable, NULL);
g_set_error (
@@ -1654,26 +1654,26 @@ camel_nntp_store_class_init (CamelNNTPStoreClass *class)
}
static void
-camel_nntp_store_initable_init (GInitableIface *interface)
+camel_nntp_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 = nntp_store_initable_init;
+ iface->init = nntp_store_initable_init;
}
static void
-camel_network_service_init (CamelNetworkServiceInterface *interface)
+camel_network_service_init (CamelNetworkServiceInterface *iface)
{
- interface->get_service_name = nntp_store_get_service_name;
- interface->get_default_port = nntp_store_get_default_port;
+ iface->get_service_name = nntp_store_get_service_name;
+ iface->get_default_port = nntp_store_get_default_port;
}
static void
-camel_subscribable_init (CamelSubscribableInterface *interface)
+camel_subscribable_init (CamelSubscribableInterface *iface)
{
- interface->folder_is_subscribed = nntp_store_folder_is_subscribed;
- interface->subscribe_folder_sync = nntp_store_subscribe_folder_sync;
- interface->unsubscribe_folder_sync = nntp_store_unsubscribe_folder_sync;
+ iface->folder_is_subscribed = nntp_store_folder_is_subscribed;
+ iface->subscribe_folder_sync = nntp_store_subscribe_folder_sync;
+ iface->unsubscribe_folder_sync = nntp_store_unsubscribe_folder_sync;
}
static void
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index afc3dba..a341324 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -70,7 +70,7 @@ extern CamelServiceAuthType camel_pop3_password_authtype;
extern CamelServiceAuthType camel_pop3_apop_authtype;
/* Forward Declarations */
-static void camel_network_service_init (CamelNetworkServiceInterface *interface);
+static void camel_network_service_init (CamelNetworkServiceInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelPOP3Store,
@@ -974,10 +974,10 @@ camel_pop3_store_class_init (CamelPOP3StoreClass *class)
}
static void
-camel_network_service_init (CamelNetworkServiceInterface *interface)
+camel_network_service_init (CamelNetworkServiceInterface *iface)
{
- interface->get_service_name = pop3_store_get_service_name;
- interface->get_default_port = pop3_store_get_default_port;
+ iface->get_service_name = pop3_store_get_service_name;
+ iface->get_default_port = pop3_store_get_default_port;
}
static void
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 9255a3d..007bf63 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -95,7 +95,7 @@ static void smtp_set_error (CamelSmtpTransport *transport,
GError **error);
/* Forward Declarations */
-static void camel_network_service_init (CamelNetworkServiceInterface *interface);
+static void camel_network_service_init (CamelNetworkServiceInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
CamelSmtpTransport,
@@ -849,10 +849,10 @@ camel_smtp_transport_class_init (CamelSmtpTransportClass *class)
}
static void
-camel_network_service_init (CamelNetworkServiceInterface *interface)
+camel_network_service_init (CamelNetworkServiceInterface *iface)
{
- interface->get_service_name = smtp_transport_get_service_name;
- interface->get_default_port = smtp_transport_get_default_port;
+ iface->get_service_name = smtp_transport_get_service_name;
+ iface->get_default_port = smtp_transport_get_default_port;
}
static void
diff --git a/libebackend/e-authentication-mediator.c b/libebackend/e-authentication-mediator.c
index 9da4ef8..8c0dc8a 100644
--- a/libebackend/e-authentication-mediator.c
+++ b/libebackend/e-authentication-mediator.c
@@ -53,7 +53,7 @@ typedef struct _ThreadClosure ThreadClosure;
struct _EAuthenticationMediatorPrivate {
GDBusConnection *connection;
- EDBusAuthenticator *interface;
+ EDBusAuthenticator *dbus_interface;
GcrSecretExchange *secret_exchange;
gchar *object_path;
gchar *sender;
@@ -102,9 +102,9 @@ enum {
/* Forward Declarations */
static void e_authentication_mediator_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
static void e_authentication_mediator_interface_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_WITH_CODE (
EAuthenticationMediator,
@@ -271,7 +271,7 @@ authentication_mediator_timeout_cb (gpointer user_data)
}
static gboolean
-authentication_mediator_handle_ready (EDBusAuthenticator *interface,
+authentication_mediator_handle_ready (EDBusAuthenticator *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *encrypted_key,
ThreadClosure *closure)
@@ -301,7 +301,7 @@ authentication_mediator_handle_ready (EDBusAuthenticator *interface,
g_mutex_unlock (&mediator->priv->shared_data_lock);
- e_dbus_authenticator_complete_ready (interface, invocation);
+ e_dbus_authenticator_complete_ready (dbus_interface, invocation);
g_object_unref (mediator);
@@ -309,7 +309,7 @@ authentication_mediator_handle_ready (EDBusAuthenticator *interface,
}
static gboolean
-authentication_mediator_handle_cancel (EDBusAuthenticator *interface,
+authentication_mediator_handle_cancel (EDBusAuthenticator *dbus_interface,
GDBusMethodInvocation *invocation,
ThreadClosure *closure)
{
@@ -348,7 +348,7 @@ authentication_mediator_handle_cancel (EDBusAuthenticator *interface,
g_mutex_unlock (&mediator->priv->shared_data_lock);
- e_dbus_authenticator_complete_cancel (interface, invocation);
+ e_dbus_authenticator_complete_cancel (dbus_interface, invocation);
g_object_unref (mediator);
@@ -356,7 +356,7 @@ authentication_mediator_handle_cancel (EDBusAuthenticator *interface,
}
static gboolean
-authentication_mediator_handle_accepted (EDBusAuthenticator *interface,
+authentication_mediator_handle_accepted (EDBusAuthenticator *dbus_interface,
GDBusMethodInvocation *invocation,
ThreadClosure *closure)
{
@@ -382,7 +382,7 @@ authentication_mediator_handle_accepted (EDBusAuthenticator *interface,
g_mutex_unlock (&mediator->priv->shared_data_lock);
- e_dbus_authenticator_complete_accepted (interface, invocation);
+ e_dbus_authenticator_complete_accepted (dbus_interface, invocation);
g_object_unref (mediator);
@@ -390,7 +390,7 @@ authentication_mediator_handle_accepted (EDBusAuthenticator *interface,
}
static gboolean
-authentication_mediator_handle_rejected (EDBusAuthenticator *interface,
+authentication_mediator_handle_rejected (EDBusAuthenticator *dbus_interface,
GDBusMethodInvocation *invocation,
ThreadClosure *closure)
{
@@ -419,7 +419,7 @@ authentication_mediator_handle_rejected (EDBusAuthenticator *interface,
g_mutex_unlock (&mediator->priv->shared_data_lock);
- e_dbus_authenticator_complete_rejected (interface, invocation);
+ e_dbus_authenticator_complete_rejected (dbus_interface, invocation);
g_object_unref (mediator);
@@ -442,7 +442,7 @@ static gpointer
authentication_mediator_authenticator_thread (gpointer data)
{
EAuthenticationMediator *mediator;
- GDBusInterfaceSkeleton *interface;
+ GDBusInterfaceSkeleton *dbus_interface;
GDBusConnection *connection;
ThreadClosure *closure = data;
GSource *idle_source;
@@ -465,7 +465,7 @@ authentication_mediator_authenticator_thread (gpointer data)
/* Keep our own reference to the GDBusInterfaceSkeleton so
* we can clean up signals after the mediator is disposed. */
- interface = g_object_ref (mediator->priv->interface);
+ dbus_interface = g_object_ref (mediator->priv->dbus_interface);
connection = e_authentication_mediator_get_connection (mediator);
object_path = e_authentication_mediator_get_object_path (mediator);
@@ -480,25 +480,25 @@ authentication_mediator_authenticator_thread (gpointer data)
/* Listen for method invocations. */
handle_ready_id = g_signal_connect_data (
- interface, "handle-ready",
+ dbus_interface, "handle-ready",
G_CALLBACK (authentication_mediator_handle_ready),
thread_closure_ref (closure),
(GClosureNotify) thread_closure_unref, 0);
handle_cancel_id = g_signal_connect_data (
- interface, "handle-cancel",
+ dbus_interface, "handle-cancel",
G_CALLBACK (authentication_mediator_handle_cancel),
thread_closure_ref (closure),
(GClosureNotify) thread_closure_unref, 0);
handle_accepted_id = g_signal_connect_data (
- interface, "handle-accepted",
+ dbus_interface, "handle-accepted",
G_CALLBACK (authentication_mediator_handle_accepted),
thread_closure_ref (closure),
(GClosureNotify) thread_closure_unref, 0);
handle_rejected_id = g_signal_connect_data (
- interface, "handle-rejected",
+ dbus_interface, "handle-rejected",
G_CALLBACK (authentication_mediator_handle_rejected),
thread_closure_ref (closure),
(GClosureNotify) thread_closure_unref, 0);
@@ -506,7 +506,7 @@ authentication_mediator_authenticator_thread (gpointer data)
/* Export the Authenticator interface. */
g_dbus_interface_skeleton_export (
- interface, connection, object_path, &closure->export_error);
+ dbus_interface, connection, object_path, &closure->export_error);
/* Schedule a one-time idle callback to broadcast through a
* condition variable that our main loop is up and running. */
@@ -530,14 +530,14 @@ authentication_mediator_authenticator_thread (gpointer data)
/* Clean up and exit. */
- g_signal_handler_disconnect (interface, handle_ready_id);
- g_signal_handler_disconnect (interface, handle_cancel_id);
- g_signal_handler_disconnect (interface, handle_accepted_id);
- g_signal_handler_disconnect (interface, handle_rejected_id);
+ g_signal_handler_disconnect (dbus_interface, handle_ready_id);
+ g_signal_handler_disconnect (dbus_interface, handle_cancel_id);
+ g_signal_handler_disconnect (dbus_interface, handle_accepted_id);
+ g_signal_handler_disconnect (dbus_interface, handle_rejected_id);
g_main_context_pop_thread_default (closure->main_context);
- g_object_unref (interface);
+ g_object_unref (dbus_interface);
thread_closure_unref (closure);
@@ -655,9 +655,9 @@ authentication_mediator_dispose (GObject *object)
priv->connection = NULL;
}
- if (priv->interface != NULL) {
- g_object_unref (priv->interface);
- priv->interface = NULL;
+ if (priv->dbus_interface != NULL) {
+ g_object_unref (priv->dbus_interface);
+ priv->dbus_interface = NULL;
}
if (priv->secret_exchange != NULL) {
@@ -780,7 +780,7 @@ authentication_mediator_get_without_password (ESourceAuthenticator *auth)
mediator = E_AUTHENTICATION_MEDIATOR (auth);
- return e_dbus_authenticator_get_without_password (mediator->priv->interface);
+ return e_dbus_authenticator_get_without_password (mediator->priv->dbus_interface);
}
static ESourceAuthenticationResult
@@ -872,7 +872,7 @@ authentication_mediator_try_password (ESourceAuthenticator *auth,
mediator->priv->secret_exchange, password->str, -1);
e_dbus_authenticator_emit_authenticate (
- mediator->priv->interface, encrypted_secret);
+ mediator->priv->dbus_interface, encrypted_secret);
g_free (encrypted_secret);
}
@@ -961,21 +961,21 @@ e_authentication_mediator_class_init (EAuthenticationMediatorClass *class)
}
static void
-e_authentication_mediator_initable_init (GInitableIface *interface)
+e_authentication_mediator_initable_init (GInitableIface *iface)
{
- interface->init = authentication_mediator_initable_init;
+ iface->init = authentication_mediator_initable_init;
}
static void
-e_authentication_mediator_interface_init (ESourceAuthenticatorInterface *interface)
+e_authentication_mediator_interface_init (ESourceAuthenticatorInterface *iface)
{
- interface->get_without_password =
+ iface->get_without_password =
authentication_mediator_get_without_password;
- interface->try_password_sync =
+ iface->try_password_sync =
authentication_mediator_try_password_sync;
- interface->try_password =
+ iface->try_password =
authentication_mediator_try_password;
- interface->try_password_finish =
+ iface->try_password_finish =
authentication_mediator_try_password_finish;
}
@@ -984,7 +984,7 @@ e_authentication_mediator_init (EAuthenticationMediator *mediator)
{
mediator->priv = E_AUTHENTICATION_MEDIATOR_GET_PRIVATE (mediator);
- mediator->priv->interface = e_dbus_authenticator_skeleton_new ();
+ mediator->priv->dbus_interface = e_dbus_authenticator_skeleton_new ();
mediator->priv->secret_exchange = gcr_secret_exchange_new (NULL);
g_mutex_init (&mediator->priv->shared_data_lock);
@@ -1260,7 +1260,7 @@ e_authentication_mediator_dismiss (EAuthenticationMediator *mediator)
{
g_return_if_fail (E_IS_AUTHENTICATION_MEDIATOR (mediator));
- e_dbus_authenticator_emit_dismissed (mediator->priv->interface);
+ e_dbus_authenticator_emit_dismissed (mediator->priv->dbus_interface);
}
/**
@@ -1285,7 +1285,7 @@ e_authentication_mediator_server_error (EAuthenticationMediator *mediator,
name = g_dbus_error_encode_gerror (error);
g_return_if_fail (name != NULL);
- e_dbus_authenticator_emit_server_error (mediator->priv->interface, name, error->message);
+ e_dbus_authenticator_emit_server_error (mediator->priv->dbus_interface, name, error->message);
g_free (name);
}
diff --git a/libebackend/e-extensible.c b/libebackend/e-extensible.c
index 4a2fe77..86999aa 100644
--- a/libebackend/e-extensible.c
+++ b/libebackend/e-extensible.c
@@ -104,7 +104,7 @@ exit:
}
static void
-e_extensible_default_init (EExtensibleInterface *interface)
+e_extensible_default_init (EExtensibleInterface *iface)
{
extensible_quark = g_quark_from_static_string ("e-extensible-quark");
}
diff --git a/libebackend/e-oauth2-support.c b/libebackend/e-oauth2-support.c
index 317a62f..a0253fc 100644
--- a/libebackend/e-oauth2-support.c
+++ b/libebackend/e-oauth2-support.c
@@ -142,11 +142,11 @@ oauth2_support_get_access_token_finish (EOAuth2Support *support,
}
static void
-e_oauth2_support_default_init (EOAuth2SupportInterface *interface)
+e_oauth2_support_default_init (EOAuth2SupportInterface *iface)
{
- interface->get_access_token =
+ iface->get_access_token =
oauth2_support_get_access_token;
- interface->get_access_token_finish =
+ iface->get_access_token_finish =
oauth2_support_get_access_token_finish;
}
@@ -177,15 +177,15 @@ e_oauth2_support_get_access_token_sync (EOAuth2Support *support,
gint *out_expires_in,
GError **error)
{
- EOAuth2SupportInterface *interface;
+ EOAuth2SupportInterface *iface;
g_return_val_if_fail (E_IS_OAUTH2_SUPPORT (support), FALSE);
g_return_val_if_fail (E_IS_SOURCE (source), FALSE);
- interface = E_OAUTH2_SUPPORT_GET_INTERFACE (support);
- g_return_val_if_fail (interface->get_access_token_sync != NULL, FALSE);
+ iface = E_OAUTH2_SUPPORT_GET_INTERFACE (support);
+ g_return_val_if_fail (iface->get_access_token_sync != NULL, FALSE);
- return interface->get_access_token_sync (
+ return iface->get_access_token_sync (
support, source, cancellable,
out_access_token, out_expires_in, error);
}
@@ -214,15 +214,15 @@ e_oauth2_support_get_access_token (EOAuth2Support *support,
GAsyncReadyCallback callback,
gpointer user_data)
{
- EOAuth2SupportInterface *interface;
+ EOAuth2SupportInterface *iface;
g_return_if_fail (E_IS_OAUTH2_SUPPORT (support));
g_return_if_fail (E_IS_SOURCE (source));
- interface = E_OAUTH2_SUPPORT_GET_INTERFACE (support);
- g_return_if_fail (interface->get_access_token != NULL);
+ iface = E_OAUTH2_SUPPORT_GET_INTERFACE (support);
+ g_return_if_fail (iface->get_access_token != NULL);
- return interface->get_access_token (
+ return iface->get_access_token (
support, source, cancellable, callback, user_data);
}
@@ -250,15 +250,15 @@ e_oauth2_support_get_access_token_finish (EOAuth2Support *support,
gint *out_expires_in,
GError **error)
{
- EOAuth2SupportInterface *interface;
+ EOAuth2SupportInterface *iface;
g_return_val_if_fail (E_IS_OAUTH2_SUPPORT (support), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
- interface = E_OAUTH2_SUPPORT_GET_INTERFACE (support);
- g_return_val_if_fail (interface->get_access_token_finish != NULL, FALSE);
+ iface = E_OAUTH2_SUPPORT_GET_INTERFACE (support);
+ g_return_val_if_fail (iface->get_access_token_finish != NULL, FALSE);
- return interface->get_access_token_finish (
+ return iface->get_access_token_finish (
support, result, out_access_token, out_expires_in, error);
}
diff --git a/libebackend/e-server-side-source.c b/libebackend/e-server-side-source.c
index dab1bb4..60ce7f3 100644
--- a/libebackend/e-server-side-source.c
+++ b/libebackend/e-server-side-source.c
@@ -83,7 +83,7 @@ static GInitableIface *initable_parent_interface;
/* Forward Declarations */
static void e_server_side_source_initable_init
- (GInitableIface *interface);
+ (GInitableIface *iface);
G_DEFINE_TYPE_WITH_CODE (
EServerSideSource,
@@ -190,19 +190,19 @@ server_side_source_traverse_cb (GNode *node,
}
static gboolean
-server_side_source_allow_auth_prompt_cb (EDBusSource *interface,
+server_side_source_allow_auth_prompt_cb (EDBusSource *dbus_interface,
GDBusMethodInvocation *invocation,
EServerSideSource *source)
{
e_server_side_source_set_allow_auth_prompt (source, TRUE);
- e_dbus_source_complete_allow_auth_prompt (interface, invocation);
+ e_dbus_source_complete_allow_auth_prompt (dbus_interface, invocation);
return TRUE;
}
static gboolean
-server_side_source_remove_cb (EDBusSourceRemovable *interface,
+server_side_source_remove_cb (EDBusSourceRemovable *dbus_interface,
GDBusMethodInvocation *invocation,
EServerSideSource *source)
{
@@ -219,13 +219,13 @@ server_side_source_remove_cb (EDBusSourceRemovable *interface,
g_dbus_method_invocation_take_error (invocation, error);
else
e_dbus_source_removable_complete_remove (
- interface, invocation);
+ dbus_interface, invocation);
return TRUE;
}
static gboolean
-server_side_source_write_cb (EDBusSourceWritable *interface,
+server_side_source_write_cb (EDBusSourceWritable *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *data,
ESource *source)
@@ -279,7 +279,7 @@ server_side_source_write_cb (EDBusSourceWritable *interface,
g_dbus_method_invocation_take_error (invocation, error);
else
e_dbus_source_writable_complete_write (
- interface, invocation);
+ dbus_interface, invocation);
g_object_unref (dbus_source);
g_object_unref (dbus_object);
@@ -314,7 +314,7 @@ server_side_source_remote_create_done_cb (GObject *source_object,
}
static gboolean
-server_side_source_remote_create_cb (EDBusSourceRemoteCreatable *interface,
+server_side_source_remote_create_cb (EDBusSourceRemoteCreatable *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *uid,
const gchar *data,
@@ -372,7 +372,7 @@ server_side_source_remote_create_cb (EDBusSourceRemoteCreatable *interface,
g_object_unref (dbus_source);
async_context = g_slice_new0 (AsyncContext);
- async_context->remote_creatable = g_object_ref (interface);
+ async_context->remote_creatable = g_object_ref (dbus_interface);
async_context->invocation = g_object_ref (invocation);
e_source_remote_create (
@@ -412,14 +412,14 @@ server_side_source_remote_delete_done_cb (GObject *source_object,
}
static gboolean
-server_side_source_remote_delete_cb (EDBusSourceRemoteDeletable *interface,
+server_side_source_remote_delete_cb (EDBusSourceRemoteDeletable *dbus_interface,
GDBusMethodInvocation *invocation,
ESource *source)
{
AsyncContext *async_context;
async_context = g_slice_new0 (AsyncContext);
- async_context->remote_deletable = g_object_ref (interface);
+ async_context->remote_deletable = g_object_ref (dbus_interface);
async_context->invocation = g_object_ref (invocation);
e_source_remote_delete (
@@ -468,14 +468,14 @@ server_side_source_get_access_token_done_cb (GObject *source_object,
}
static gboolean
-server_side_source_get_access_token_cb (EDBusSourceOAuth2Support *interface,
+server_side_source_get_access_token_cb (EDBusSourceOAuth2Support *dbus_interface,
GDBusMethodInvocation *invocation,
ESource *source)
{
AsyncContext *async_context;
async_context = g_slice_new0 (AsyncContext);
- async_context->oauth2_support = g_object_ref (interface);
+ async_context->oauth2_support = g_object_ref (dbus_interface);
async_context->invocation = g_object_ref (invocation);
e_source_get_oauth2_access_token (
@@ -1326,11 +1326,11 @@ e_server_side_source_class_init (EServerSideSourceClass *class)
}
static void
-e_server_side_source_initable_init (GInitableIface *interface)
+e_server_side_source_initable_init (GInitableIface *iface)
{
- initable_parent_interface = g_type_interface_peek_parent (interface);
+ initable_parent_interface = g_type_interface_peek_parent (iface);
- interface->init = server_side_source_initable_init;
+ iface->init = server_side_source_initable_init;
}
static void
diff --git a/libebackend/e-source-registry-server.c b/libebackend/e-source-registry-server.c
index 75e028a..7525b8b 100644
--- a/libebackend/e-source-registry-server.c
+++ b/libebackend/e-source-registry-server.c
@@ -652,7 +652,7 @@ source_registry_server_wait_for_client_cb (GObject *source_object,
}
static gboolean
-source_registry_server_allow_auth_prompt_all_cb (EDBusSourceManager *interface,
+source_registry_server_allow_auth_prompt_all_cb (EDBusSourceManager *dbus_interface,
GDBusMethodInvocation *invocation,
ESourceRegistryServer *server)
{
@@ -667,13 +667,13 @@ source_registry_server_allow_auth_prompt_all_cb (EDBusSourceManager *interface,
g_list_free_full (list, (GDestroyNotify) g_object_unref);
e_dbus_source_manager_complete_allow_auth_prompt_all (
- interface, invocation);
+ dbus_interface, invocation);
return TRUE;
}
static gboolean
-source_registry_server_authenticate_cb (EDBusSourceManager *interface,
+source_registry_server_authenticate_cb (EDBusSourceManager *dbus_interface,
GDBusMethodInvocation *invocation,
const gchar *source_uid,
const gchar *prompt_title,
@@ -741,7 +741,7 @@ source_registry_server_authenticate_cb (EDBusSourceManager *interface,
g_object_ref (session));
e_dbus_source_manager_complete_authenticate (
- interface, invocation, auth_object_path);
+ dbus_interface, invocation, auth_object_path);
g_object_unref (authenticator);
g_object_unref (session);
@@ -854,7 +854,7 @@ source_registry_server_create_source (ESourceRegistryServer *server,
}
static gboolean
-source_registry_server_create_sources_cb (EDBusSourceManager *interface,
+source_registry_server_create_sources_cb (EDBusSourceManager *dbus_interface,
GDBusMethodInvocation *invocation,
GVariant *array,
ESourceRegistryServer *server)
@@ -880,13 +880,13 @@ source_registry_server_create_sources_cb (EDBusSourceManager *interface,
g_dbus_method_invocation_take_error (invocation, error);
else
e_dbus_source_manager_complete_create_sources (
- interface, invocation);
+ dbus_interface, invocation);
return TRUE;
}
static gboolean
-source_registry_server_reload_cb (EDBusSourceManager *interface,
+source_registry_server_reload_cb (EDBusSourceManager *dbus_interface,
GDBusMethodInvocation *invocation,
ESourceRegistryServer *server)
{
@@ -894,7 +894,7 @@ source_registry_server_reload_cb (EDBusSourceManager *interface,
E_DBUS_SERVER (server),
E_DBUS_SERVER_EXIT_RELOAD);
- e_dbus_source_manager_complete_reload (interface, invocation);
+ e_dbus_source_manager_complete_reload (dbus_interface, invocation);
return TRUE;
}
diff --git a/libedataserver/e-source-authenticator.c b/libedataserver/e-source-authenticator.c
index adf72e1..c95770e 100644
--- a/libedataserver/e-source-authenticator.c
+++ b/libedataserver/e-source-authenticator.c
@@ -323,12 +323,12 @@ source_authenticator_try_password_finish (ESourceAuthenticator *auth,
}
static void
-e_source_authenticator_default_init (ESourceAuthenticatorInterface *interface)
+e_source_authenticator_default_init (ESourceAuthenticatorInterface *iface)
{
- interface->get_prompt_strings = source_authenticator_get_prompt_strings;
- interface->get_without_password = source_authenticator_get_without_password;
- interface->try_password = source_authenticator_try_password;
- interface->try_password_finish = source_authenticator_try_password_finish;
+ iface->get_prompt_strings = source_authenticator_get_prompt_strings;
+ iface->get_without_password = source_authenticator_get_without_password;
+ iface->try_password = source_authenticator_try_password;
+ iface->try_password_finish = source_authenticator_try_password_finish;
}
/**
@@ -362,7 +362,7 @@ e_source_authenticator_get_prompt_strings (ESourceAuthenticator *auth,
gchar **prompt_message,
gchar **prompt_description)
{
- ESourceAuthenticatorInterface *interface;
+ ESourceAuthenticatorInterface *iface;
g_return_if_fail (E_IS_SOURCE_AUTHENTICATOR (auth));
g_return_if_fail (E_IS_SOURCE (source));
@@ -370,10 +370,10 @@ e_source_authenticator_get_prompt_strings (ESourceAuthenticator *auth,
g_return_if_fail (prompt_message != NULL);
g_return_if_fail (prompt_description != NULL);
- interface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
- g_return_if_fail (interface->get_prompt_strings);
+ iface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
+ g_return_if_fail (iface->get_prompt_strings);
- interface->get_prompt_strings (
+ iface->get_prompt_strings (
auth, source,
prompt_title,
prompt_message,
@@ -397,14 +397,14 @@ e_source_authenticator_get_prompt_strings (ESourceAuthenticator *auth,
gboolean
e_source_authenticator_get_without_password (ESourceAuthenticator *auth)
{
- ESourceAuthenticatorInterface *interface;
+ ESourceAuthenticatorInterface *iface;
g_return_val_if_fail (E_IS_SOURCE_AUTHENTICATOR (auth), FALSE);
- interface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
- g_return_val_if_fail (interface->get_without_password, FALSE);
+ iface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
+ g_return_val_if_fail (iface->get_without_password, FALSE);
- return interface->get_without_password (auth);
+ return iface->get_without_password (auth);
}
/**
@@ -432,7 +432,7 @@ e_source_authenticator_try_password_sync (ESourceAuthenticator *auth,
GCancellable *cancellable,
GError **error)
{
- ESourceAuthenticatorInterface *interface;
+ ESourceAuthenticatorInterface *iface;
g_return_val_if_fail (
E_IS_SOURCE_AUTHENTICATOR (auth),
@@ -441,12 +441,12 @@ e_source_authenticator_try_password_sync (ESourceAuthenticator *auth,
password != NULL,
E_SOURCE_AUTHENTICATION_REJECTED);
- interface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
+ iface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
g_return_val_if_fail (
- interface->try_password_sync != NULL,
+ iface->try_password_sync != NULL,
E_SOURCE_AUTHENTICATION_REJECTED);
- return interface->try_password_sync (
+ return iface->try_password_sync (
auth, password, cancellable, error);
}
@@ -477,15 +477,15 @@ e_source_authenticator_try_password (ESourceAuthenticator *auth,
GAsyncReadyCallback callback,
gpointer user_data)
{
- ESourceAuthenticatorInterface *interface;
+ ESourceAuthenticatorInterface *iface;
g_return_if_fail (E_IS_SOURCE_AUTHENTICATOR (auth));
g_return_if_fail (password != NULL);
- interface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
- g_return_if_fail (interface->try_password != NULL);
+ iface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
+ g_return_if_fail (iface->try_password != NULL);
- interface->try_password (
+ iface->try_password (
auth, password, cancellable, callback, user_data);
}
@@ -509,7 +509,7 @@ e_source_authenticator_try_password_finish (ESourceAuthenticator *auth,
GAsyncResult *result,
GError **error)
{
- ESourceAuthenticatorInterface *interface;
+ ESourceAuthenticatorInterface *iface;
g_return_val_if_fail (
E_IS_SOURCE_AUTHENTICATOR (auth),
@@ -518,11 +518,11 @@ e_source_authenticator_try_password_finish (ESourceAuthenticator *auth,
G_IS_ASYNC_RESULT (result),
E_SOURCE_AUTHENTICATION_REJECTED);
- interface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
+ iface = E_SOURCE_AUTHENTICATOR_GET_INTERFACE (auth);
g_return_val_if_fail (
- interface->try_password_finish != NULL,
+ iface->try_password_finish != NULL,
E_SOURCE_AUTHENTICATION_REJECTED);
- return interface->try_password_finish (auth, result, error);
+ return iface->try_password_finish (auth, result, error);
}
diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
index 51747b1..df1e6b3 100644
--- a/libedataserver/e-source-registry.c
+++ b/libedataserver/e-source-registry.c
@@ -178,7 +178,7 @@ enum {
/* Forward Declarations */
static void source_registry_add_source (ESourceRegistry *registry,
ESource *source);
-static void e_source_registry_initable_init (GInitableIface *interface);
+static void e_source_registry_initable_init (GInitableIface *iface);
/* Private ESource function, for our use only. */
void __e_source_private_replace_dbus_object
@@ -1622,9 +1622,9 @@ e_source_registry_class_init (ESourceRegistryClass *class)
}
static void
-e_source_registry_initable_init (GInitableIface *interface)
+e_source_registry_initable_init (GInitableIface *iface)
{
- interface->init = source_registry_initable_init;
+ iface->init = source_registry_initable_init;
}
static void
diff --git a/libedataserver/e-source.c b/libedataserver/e-source.c
index 5de2aa0..fe25872 100644
--- a/libedataserver/e-source.c
+++ b/libedataserver/e-source.c
@@ -189,9 +189,9 @@ static SecretSchema password_schema = {
static guint signals[LAST_SIGNAL];
/* Forward Declarations */
-static void e_source_initable_init (GInitableIface *interface);
+static void e_source_initable_init (GInitableIface *iface);
static void e_source_proxy_resolver_init
- (GProxyResolverInterface *interface);
+ (GProxyResolverInterface *iface);
/* Private function shared only with ESourceRegistry. */
void __e_source_private_replace_dbus_object
@@ -2011,18 +2011,18 @@ e_source_class_init (ESourceClass *class)
}
static void
-e_source_initable_init (GInitableIface *interface)
+e_source_initable_init (GInitableIface *iface)
{
- interface->init = source_initable_init;
+ iface->init = source_initable_init;
}
static void
-e_source_proxy_resolver_init (GProxyResolverInterface *interface)
+e_source_proxy_resolver_init (GProxyResolverInterface *iface)
{
- interface->is_supported = source_proxy_resolver_is_supported;
- interface->lookup = source_proxy_resolver_lookup;
- interface->lookup_async = source_proxy_resolver_lookup_async;
- interface->lookup_finish = source_proxy_resolver_lookup_finish;
+ iface->is_supported = source_proxy_resolver_is_supported;
+ iface->lookup = source_proxy_resolver_lookup;
+ iface->lookup_async = source_proxy_resolver_lookup_async;
+ iface->lookup_finish = source_proxy_resolver_lookup_finish;
}
static void
diff --git a/modules/gnome-online-accounts/e-goa-client.c b/modules/gnome-online-accounts/e-goa-client.c
index 155c0a5..a6cf7d5 100644
--- a/modules/gnome-online-accounts/e-goa-client.c
+++ b/modules/gnome-online-accounts/e-goa-client.c
@@ -47,7 +47,7 @@ enum {
static guint signals[LAST_SIGNAL];
/* Forward Declarations */
-static void e_goa_client_interface_init (GInitableIface *interface);
+static void e_goa_client_interface_init (GInitableIface *iface);
/* By default, the GAsyncInitable interface calls GInitable.init()
* from a separate thread, so we only have to override GInitable. */
@@ -408,9 +408,9 @@ e_goa_client_class_finalize (EGoaClientClass *class)
}
static void
-e_goa_client_interface_init (GInitableIface *interface)
+e_goa_client_interface_init (GInitableIface *iface)
{
- interface->init = e_goa_client_initable_init;
+ iface->init = e_goa_client_initable_init;
}
static void
diff --git a/modules/gnome-online-accounts/module-gnome-online-accounts.c
b/modules/gnome-online-accounts/module-gnome-online-accounts.c
index 4f4ba57..973d182 100644
--- a/modules/gnome-online-accounts/module-gnome-online-accounts.c
+++ b/modules/gnome-online-accounts/module-gnome-online-accounts.c
@@ -67,7 +67,7 @@ void e_module_unload (GTypeModule *type_module);
/* Forward Declarations */
GType e_gnome_online_accounts_get_type (void);
static void e_gnome_online_accounts_oauth2_support_init
- (EOAuth2SupportInterface *interface);
+ (EOAuth2SupportInterface *iface);
G_DEFINE_DYNAMIC_TYPE_EXTENDED (
EGnomeOnlineAccounts,
@@ -1312,9 +1312,9 @@ e_gnome_online_accounts_class_finalize (EGnomeOnlineAccountsClass *class)
}
static void
-e_gnome_online_accounts_oauth2_support_init (EOAuth2SupportInterface *interface)
+e_gnome_online_accounts_oauth2_support_init (EOAuth2SupportInterface *iface)
{
- interface->get_access_token_sync =
+ iface->get_access_token_sync =
gnome_online_accounts_get_access_token_sync;
}
diff --git a/modules/owncloud-backend/owncloud-utils.c b/modules/owncloud-backend/owncloud-utils.c
index 5fb5703..d89d1d2 100644
--- a/modules/owncloud-backend/owncloud-utils.c
+++ b/modules/owncloud-backend/owncloud-utils.c
@@ -66,7 +66,7 @@ owncloud_authenticator_try_password_sync (ESourceAuthenticator *auth,
GType e_owncloud_authenticator_get_type
(void) G_GNUC_CONST;
static void e_owncloud_authenticator_authenticator_init
- (ESourceAuthenticatorInterface *interface);
+ (ESourceAuthenticatorInterface *iface);
G_DEFINE_TYPE_EXTENDED (
EOwncloudAuthenticator,
@@ -98,9 +98,9 @@ e_owncloud_authenticator_class_init (EOwncloudAuthenticatorClass *class)
}
static void
-e_owncloud_authenticator_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_owncloud_authenticator_authenticator_init (ESourceAuthenticatorInterface *iface)
{
- interface->try_password_sync = owncloud_authenticator_try_password_sync;
+ iface->try_password_sync = owncloud_authenticator_try_password_sync;
}
static void
diff --git a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
index 2fae96e..3e16146 100644
--- a/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
+++ b/modules/ubuntu-online-accounts/module-ubuntu-online-accounts.c
@@ -63,7 +63,7 @@ void e_module_unload (GTypeModule *type_module);
/* Forward Declarations */
GType e_ubuntu_online_accounts_get_type (void);
static void e_ubuntu_online_accounts_oauth2_support_init
- (EOAuth2SupportInterface *interface);
+ (EOAuth2SupportInterface *iface);
G_DEFINE_DYNAMIC_TYPE_EXTENDED (
EUbuntuOnlineAccounts,
@@ -1118,11 +1118,11 @@ e_ubuntu_online_accounts_class_finalize (EUbuntuOnlineAccountsClass *class)
}
static void
-e_ubuntu_online_accounts_oauth2_support_init (EOAuth2SupportInterface *interface)
+e_ubuntu_online_accounts_oauth2_support_init (EOAuth2SupportInterface *iface)
{
- interface->get_access_token_sync = ubuntu_online_accounts_get_access_token_sync;
- interface->get_access_token = ubuntu_online_accounts_get_access_token;
- interface->get_access_token_finish = ubuntu_online_accounts_get_access_token_finish;
+ iface->get_access_token_sync = ubuntu_online_accounts_get_access_token_sync;
+ iface->get_access_token = ubuntu_online_accounts_get_access_token;
+ iface->get_access_token_finish = ubuntu_online_accounts_get_access_token_finish;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
