From 5c60d57082ede522169b65efa67a1e268989b487 Mon Sep 17 00:00:00 2001
From: Tarnyko <tarnyko@tarnyko.net>
Date: Wed, 26 Feb 2014 16:15:21 +0100
Subject: 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.)
---
 shell/e-shell-content.c | 6 +++---
 shell/e-shell-sidebar.c | 6 +++---
 shell/e-shell-window.c  | 6 +++---
 shell/e-shell.c         | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'shell')

diff --git a/shell/e-shell-content.c b/shell/e-shell-content.c
index de4a58d6c3..8509668b80 100644
--- a/shell/e-shell-content.c
+++ b/shell/e-shell-content.c
@@ -61,7 +61,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_shell_content_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellContent,
@@ -481,9 +481,9 @@ e_shell_content_class_init (EShellContentClass *class)
 }
 
 static void
-e_shell_content_alert_sink_init (EAlertSinkInterface *interface)
+e_shell_content_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = shell_content_submit_alert;
+	iface->submit_alert = shell_content_submit_alert;
 }
 
 static void
diff --git a/shell/e-shell-sidebar.c b/shell/e-shell-sidebar.c
index 8afad7a533..268eaf3373 100644
--- a/shell/e-shell-sidebar.c
+++ b/shell/e-shell-sidebar.c
@@ -59,7 +59,7 @@ enum {
 
 /* Forward Declarations */
 static void	e_shell_sidebar_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellSidebar,
@@ -423,9 +423,9 @@ e_shell_sidebar_class_init (EShellSidebarClass *class)
 }
 
 static void
-e_shell_sidebar_alert_sink_init (EAlertSinkInterface *interface)
+e_shell_sidebar_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = shell_sidebar_submit_alert;
+	iface->submit_alert = shell_sidebar_submit_alert;
 }
 
 static void
diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c
index 845d21018f..69eef7d40f 100644
--- a/shell/e-shell-window.c
+++ b/shell/e-shell-window.c
@@ -55,7 +55,7 @@ static gulong signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_shell_window_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellWindow,
@@ -1039,9 +1039,9 @@ e_shell_window_class_init (EShellWindowClass *class)
 }
 
 static void
-e_shell_window_alert_sink_init (EAlertSinkInterface *interface)
+e_shell_window_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = shell_window_submit_alert;
+	iface->submit_alert = shell_window_submit_alert;
 }
 
 static void
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 7c1893e12d..9f4c9ecc3f 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -103,7 +103,7 @@ static gpointer default_shell;
 static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
-static void e_shell_initable_init (GInitableIface *interface);
+static void e_shell_initable_init (GInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShell,
@@ -1132,9 +1132,9 @@ e_shell_class_init (EShellClass *class)
 }
 
 static void
-e_shell_initable_init (GInitableIface *interface)
+e_shell_initable_init (GInitableIface *iface)
 {
-	interface->init = shell_initable_init;
+	iface->init = shell_initable_init;
 }
 
 static void
-- 
cgit v1.2.3