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.)

2 files changed, 23 insertions, 23 deletions

diff --git a/addressbook/gui/widgets/e-addressbook-table-adapter.c b/addressbook/gui/widgets/e-addressbook-table-adapter.c
index 04c720b76d..2e4a85a77f 100644
--- a/addressbook/gui/widgets/e-addressbook-table-adapter.c
+++ b/addressbook/gui/widgets/e-addressbook-table-adapter.c
@@ -50,7 +50,7 @@ struct _EAddressbookTableAdapterPrivate {
 
 /* Forward Declarations */
 static void	e_addressbook_table_adapter_table_model_init
-					(ETableModelInterface *interface);
+					(ETableModelInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAddressbookTableAdapter,
@@ -324,21 +324,21 @@ e_addressbook_table_adapter_class_init (EAddressbookTableAdapterClass *class)
 }
 
 static void
-e_addressbook_table_adapter_table_model_init (ETableModelInterface *interface)
+e_addressbook_table_adapter_table_model_init (ETableModelInterface *iface)
 {
-	interface->column_count = addressbook_col_count;
-	interface->row_count = addressbook_row_count;
-	interface->append_row = addressbook_append_row;
-
-	interface->value_at = addressbook_value_at;
-	interface->set_value_at = addressbook_set_value_at;
-	interface->is_cell_editable = addressbook_is_cell_editable;
-
-	interface->duplicate_value = addressbook_duplicate_value;
-	interface->free_value = addressbook_free_value;
-	interface->initialize_value = addressbook_initialize_value;
-	interface->value_is_empty = addressbook_value_is_empty;
-	interface->value_to_string = addressbook_value_to_string;
+	iface->column_count = addressbook_col_count;
+	iface->row_count = addressbook_row_count;
+	iface->append_row = addressbook_append_row;
+
+	iface->value_at = addressbook_value_at;
+	iface->set_value_at = addressbook_set_value_at;
+	iface->is_cell_editable = addressbook_is_cell_editable;
+
+	iface->duplicate_value = addressbook_duplicate_value;
+	iface->free_value = addressbook_free_value;
+	iface->initialize_value = addressbook_initialize_value;
+	iface->value_is_empty = addressbook_value_is_empty;
+	iface->value_to_string = addressbook_value_to_string;
 }
 
 static void
diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c
index 58178747ba..2f90245874 100644
--- a/addressbook/gui/widgets/e-addressbook-view.c
+++ b/addressbook/gui/widgets/e-addressbook-view.c
@@ -115,7 +115,7 @@ static guint signals[LAST_SIGNAL];
 
 /* Forward Declarations */
 static void	e_addressbook_view_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAddressbookView,
@@ -891,14 +891,14 @@ e_addressbook_view_init (EAddressbookView *view)
 }
 
 static void
-e_addressbook_view_selectable_init (ESelectableInterface *interface)
+e_addressbook_view_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = addressbook_view_update_actions;
-	interface->cut_clipboard = addressbook_view_cut_clipboard;
-	interface->copy_clipboard = addressbook_view_copy_clipboard;
-	interface->paste_clipboard = addressbook_view_paste_clipboard;
-	interface->delete_selection = addressbook_view_delete_selection;
-	interface->select_all = addressbook_view_select_all;
+	iface->update_actions = addressbook_view_update_actions;
+	iface->cut_clipboard = addressbook_view_cut_clipboard;
+	iface->copy_clipboard = addressbook_view_copy_clipboard;
+	iface->paste_clipboard = addressbook_view_paste_clipboard;
+	iface->delete_selection = addressbook_view_delete_selection;
+	iface->select_all = addressbook_view_select_all;
 }
 
 GtkWidget *