aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/e-photo-source.c
diff options
context:
space:
mode:
authorTarnyko <tarnyko@tarnyko.net>2014-02-26 23:15:21 +0800
committerMilan Crha <mcrha@redhat.com>2014-02-26 23:15:21 +0800
commit5c60d57082ede522169b65efa67a1e268989b487 (patch)
treeb77a62c5fbee1719f7216f7135c068ca081c9c77 /e-util/e-photo-source.c
parent5727d74fb54a1c76922099d023a182418c3bac70 (diff)
downloadgsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.gz
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.bz2
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.lz
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.xz
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.tar.zst
gsoc2013-evolution-5c60d57082ede522169b65efa67a1e268989b487.zip
Replace 'interface' with 'iface' in the code
Win32 headers have a #define for 'interface', which breaks the build when this word is used in the code, thus replace it to 'iface', the same way as GLib or GTK+ code use to have it. (See bug #722068.)
Diffstat (limited to 'e-util/e-photo-source.c')
-rw-r--r--e-util/e-photo-source.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/e-util/e-photo-source.c b/e-util/e-photo-source.c
index 67deb6f1e6..56f3e427bd 100644
--- a/e-util/e-photo-source.c
+++ b/e-util/e-photo-source.c
@@ -36,7 +36,7 @@ G_DEFINE_INTERFACE (
G_TYPE_OBJECT)
static void
-e_photo_source_default_init (EPhotoSourceInterface *interface)
+e_photo_source_default_init (EPhotoSourceInterface *iface)
{
}
@@ -60,15 +60,15 @@ e_photo_source_get_photo (EPhotoSource *photo_source,
GAsyncReadyCallback callback,
gpointer user_data)
{
- EPhotoSourceInterface *interface;
+ EPhotoSourceInterface *iface;
g_return_if_fail (E_IS_PHOTO_SOURCE (photo_source));
g_return_if_fail (email_address != NULL);
- interface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
- g_return_if_fail (interface->get_photo != NULL);
+ iface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
+ g_return_if_fail (iface->get_photo != NULL);
- interface->get_photo (
+ iface->get_photo (
photo_source, email_address,
cancellable, callback, user_data);
}
@@ -107,16 +107,16 @@ e_photo_source_get_photo_finish (EPhotoSource *photo_source,
gint *out_priority,
GError **error)
{
- EPhotoSourceInterface *interface;
+ EPhotoSourceInterface *iface;
g_return_val_if_fail (E_IS_PHOTO_SOURCE (photo_source), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
g_return_val_if_fail (out_stream != NULL, FALSE);
- interface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
- g_return_val_if_fail (interface->get_photo_finish != NULL, FALSE);
+ iface = E_PHOTO_SOURCE_GET_INTERFACE (photo_source);
+ g_return_val_if_fail (iface->get_photo_finish != NULL, FALSE);
- return interface->get_photo_finish (
+ return iface->get_photo_finish (
photo_source, result, out_stream, out_priority, error);
}