--- modules/startup-wizard/e-mail-config-import-progress-page.c	2013-12-31 13:28:50 +0000
+++ modules/startup-wizard/e-mail-config-import-progress-page.c	2013-12-31 13:29:27 +0000
@@ -39,7 +39,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_import_progress_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigImportProgressPage,
@@ -335,14 +335,14 @@
 }
 
 static void
-e_mail_config_import_progress_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_import_progress_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Keep the title identical to EMailConfigImportPage
 	 * so it's only shown once in the assistant sidebar. */
-	interface->title = _("Importing Files");
-	interface->sort_order = E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_SORT_ORDER;
-	interface->page_type = GTK_ASSISTANT_PAGE_PROGRESS;
-	interface->check_complete = mail_config_import_progress_page_check_complete;
+	iface->title = _("Importing Files");
+	iface->sort_order = E_MAIL_CONFIG_IMPORT_PROGRESS_PAGE_SORT_ORDER;
+	iface->page_type = GTK_ASSISTANT_PAGE_PROGRESS;
+	iface->check_complete = mail_config_import_progress_page_check_complete;
 }
 
 static void
--- modules/startup-wizard/e-mail-config-import-page.c	2013-12-31 13:23:08 +0000
+++ modules/startup-wizard/e-mail-config-import-page.c	2013-12-31 13:23:36 +0000
@@ -45,7 +45,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_import_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 static gboolean	mail_config_import_page_next	(gpointer user_data);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
@@ -259,10 +259,10 @@
 }
 
 static void
-e_mail_config_import_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_import_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Importing Files");
-	interface->sort_order = E_MAIL_CONFIG_IMPORT_PAGE_SORT_ORDER;
+	iface->title = _("Importing Files");
+	iface->sort_order = E_MAIL_CONFIG_IMPORT_PAGE_SORT_ORDER;
 }
 
 static void
--- modules/spamassassin/evolution-spamassassin.c	2013-12-31 12:14:35 +0000
+++ modules/spamassassin/evolution-spamassassin.c	2013-12-31 12:53:22 +0000
@@ -103,7 +108,7 @@
 
 /* Forward Declarations */
 GType e_spam_assassin_get_type (void);
-static void e_spam_assassin_interface_init (CamelJunkFilterInterface *interface);
+static void e_spam_assassin_interface_init (CamelJunkFilterInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	ESpamAssassin,
@@ -1181,12 +1196,12 @@
 }
 
 static void
-e_spam_assassin_interface_init (CamelJunkFilterInterface *interface)
+e_spam_assassin_interface_init (CamelJunkFilterInterface *iface)
 {
-	interface->classify = spam_assassin_classify;
-	interface->learn_junk = spam_assassin_learn_junk;
-	interface->learn_not_junk = spam_assassin_learn_not_junk;
-	interface->synchronize = spam_assassin_synchronize;
+	iface->classify = spam_assassin_classify;
+	iface->learn_junk = spam_assassin_learn_junk;
+	iface->learn_not_junk = spam_assassin_learn_not_junk;
+	iface->synchronize = spam_assassin_synchronize;
 }
 
 static void
--- modules/imap-features/e-mail-config-imap-headers-page.c	2013-12-31 11:59:01 +0000
+++ modules/imap-features/e-mail-config-imap-headers-page.c	2013-12-31 11:59:32 +0000
@@ -48,7 +48,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_imap_headers_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailConfigImapHeadersPage,
@@ -390,10 +390,10 @@
 }
 
 static void
-e_mail_config_imap_headers_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_imap_headers_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("IMAP Headers");
-	interface->sort_order = E_MAIL_CONFIG_IMAP_HEADERS_PAGE_SORT_ORDER;
+	iface->title = _("IMAP Headers");
+	iface->sort_order = E_MAIL_CONFIG_IMAP_HEADERS_PAGE_SORT_ORDER;
 }
 
 static void
--- modules/cal-config-caldav/e-caldav-chooser.c	2013-12-31 11:49:29 +0000
+++ modules/cal-config-caldav/e-caldav-chooser.c	2013-12-31 11:53:02 +0000
@@ -95,7 +97,7 @@
 
 /* Forward Declarations */
 static void	e_caldav_chooser_authenticator_init
-				(ESourceAuthenticatorInterface *interface);
+				(ESourceAuthenticatorInterface *iface);
 static void	caldav_chooser_get_collection_details
 				(SoupSession *session,
 				 SoupMessage *message,
@@ -1438,9 +1442,9 @@
 }
 
 static void
-e_caldav_chooser_authenticator_init (ESourceAuthenticatorInterface *interface)
+e_caldav_chooser_authenticator_init (ESourceAuthenticatorInterface *iface)
 {
-	interface->try_password_sync = caldav_chooser_try_password_sync;
+	iface->try_password_sync = caldav_chooser_try_password_sync;
 }
 
 static void
--- modules/mail/e-mail-shell-content.c	2013-12-31 11:44:10 +0000
+++ modules/mail/e-mail-shell-content.c	2013-12-31 11:44:53 +0000
@@ -65,7 +65,7 @@
 
 /* Forward Declarations */
 static void	e_mail_shell_content_reader_init
-					(EMailReaderInterface *interface);
+					(EMailReaderInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EMailShellContent,
@@ -458,18 +458,18 @@
 }
 
 static void
-e_mail_shell_content_reader_init (EMailReaderInterface *interface)
+e_mail_shell_content_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_shell_content_get_action_group;
-	interface->get_backend = mail_shell_content_get_backend;
-	interface->get_mail_display = mail_shell_content_get_mail_display;
-	interface->get_hide_deleted = mail_shell_content_get_hide_deleted;
-	interface->get_message_list = mail_shell_content_get_message_list;
-	interface->get_popup_menu = mail_shell_content_get_popup_menu;
-	interface->get_preview_pane = mail_shell_content_get_preview_pane;
-	interface->get_window = mail_shell_content_get_window;
-	interface->set_folder = mail_shell_content_set_folder;
-	interface->open_selected_mail = mail_shell_content_open_selected_mail;
+	iface->get_action_group = mail_shell_content_get_action_group;
+	iface->get_backend = mail_shell_content_get_backend;
+	iface->get_mail_display = mail_shell_content_get_mail_display;
+	iface->get_hide_deleted = mail_shell_content_get_hide_deleted;
+	iface->get_message_list = mail_shell_content_get_message_list;
+	iface->get_popup_menu = mail_shell_content_get_popup_menu;
+	iface->get_preview_pane = mail_shell_content_get_preview_pane;
+	iface->get_window = mail_shell_content_get_window;
+	iface->set_folder = mail_shell_content_set_folder;
+	iface->open_selected_mail = mail_shell_content_open_selected_mail;
 }
 
 static void
--- modules/bogofilter/evolution-bogofilter.c	2013-12-31 11:30:37 +0000
+++ modules/bogofilter/evolution-bogofilter.c	2013-12-31 11:35:13 +0000
@@ -68,7 +70,7 @@
 
 /* Forward Declarations */
 GType e_bogofilter_get_type (void);
-static void e_bogofilter_interface_init (CamelJunkFilterInterface *interface);
+static void e_bogofilter_interface_init (CamelJunkFilterInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (
 	EBogofilter,
@@ -501,11 +508,11 @@
 }
 
 static void
-e_bogofilter_interface_init (CamelJunkFilterInterface *interface)
+e_bogofilter_interface_init (CamelJunkFilterInterface *iface)
 {
-	interface->classify = bogofilter_classify;
-	interface->learn_junk = bogofilter_learn_junk;
-	interface->learn_not_junk = bogofilter_learn_not_junk;
+	iface->classify = bogofilter_classify;
+	iface->learn_junk = bogofilter_learn_junk;
+	iface->learn_not_junk = bogofilter_learn_not_junk;
 }
 
 static void
--- calendar/alarm-notify/alarm-notify.c	2013-12-31 10:10:51 +0000
+++ calendar/alarm-notify/alarm-notify.c	2013-12-31 10:11:26 +0000
@@ -45,7 +45,7 @@
 };
 
 /* Forward Declarations */
-static void	alarm_notify_initable_init	(GInitableIface *interface);
+static void	alarm_notify_initable_init	(GInitableIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	AlarmNotify, alarm_notify, GTK_TYPE_APPLICATION,
@@ -185,10 +185,10 @@
 }
 
 static void
-alarm_notify_initable_init (GInitableIface *interface)
+alarm_notify_initable_init (GInitableIface *iface)
 {
 	/* XXX Awkward name since we're missing an 'E' prefix. */
-	interface->init = alarm_notify_initable;
+	iface->init = alarm_notify_initable;
 }
 
 static void
--- calendar/gui/e-task-table.c	2013-12-31 09:53:16 +0000
+++ calendar/gui/e-task-table.c	2013-12-31 09:53:48 +0000
@@ -103,7 +103,7 @@
 
 /* Forward Declarations */
 static void	e_task_table_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ETaskTable,
@@ -1553,14 +1553,14 @@
 }
 
 static void
-e_task_table_selectable_init (ESelectableInterface *interface)
+e_task_table_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = task_table_update_actions;
-	interface->cut_clipboard = task_table_cut_clipboard;
-	interface->copy_clipboard = task_table_copy_clipboard;
-	interface->paste_clipboard = task_table_paste_clipboard;
-	interface->delete_selection = task_table_delete_selection;
-	interface->select_all = task_table_select_all;
+	iface->update_actions = task_table_update_actions;
+	iface->cut_clipboard = task_table_cut_clipboard;
+	iface->copy_clipboard = task_table_copy_clipboard;
+	iface->paste_clipboard = task_table_paste_clipboard;
+	iface->delete_selection = task_table_delete_selection;
+	iface->select_all = task_table_select_all;
 }
 
 /**
--- calendar/gui/e-memo-table.c	2013-12-31 09:46:42 +0000
+++ calendar/gui/e-memo-table.c	2013-12-31 09:47:15 +0000
@@ -95,7 +95,7 @@
 
 /* Forward Declarations */
 static void	e_memo_table_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMemoTable,
@@ -1176,14 +1176,14 @@
 }
 
 static void
-e_memo_table_selectable_init (ESelectableInterface *interface)
+e_memo_table_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = memo_table_update_actions;
-	interface->cut_clipboard = memo_table_cut_clipboard;
-	interface->copy_clipboard = memo_table_copy_clipboard;
-	interface->paste_clipboard = memo_table_paste_clipboard;
-	interface->delete_selection = memo_table_delete_selection;
-	interface->select_all = memo_table_select_all;
+	iface->update_actions = memo_table_update_actions;
+	iface->cut_clipboard = memo_table_cut_clipboard;
+	iface->copy_clipboard = memo_table_copy_clipboard;
+	iface->paste_clipboard = memo_table_paste_clipboard;
+	iface->delete_selection = memo_table_delete_selection;
+	iface->select_all = memo_table_select_all;
 }
 
 /**
--- calendar/gui/e-calendar-view.c	2013-12-31 09:36:22 +0000
+++ calendar/gui/e-calendar-view.c	2013-12-31 09:37:07 +0000
@@ -102,7 +102,7 @@
 
 static guint signals[LAST_SIGNAL];
 
-static void calendar_view_selectable_init (ESelectableInterface *interface);
+static void calendar_view_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
 	ECalendarView, e_calendar_view, GTK_TYPE_TABLE,
@@ -987,13 +987,13 @@
 }
 
 static void
-calendar_view_selectable_init (ESelectableInterface *interface)
+calendar_view_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = calendar_view_update_actions;
-	interface->cut_clipboard = calendar_view_cut_clipboard;
-	interface->copy_clipboard = calendar_view_copy_clipboard;
-	interface->paste_clipboard = calendar_view_paste_clipboard;
-	interface->delete_selection = calendar_view_delete_selection;
+	iface->update_actions = calendar_view_update_actions;
+	iface->cut_clipboard = calendar_view_cut_clipboard;
+	iface->copy_clipboard = calendar_view_copy_clipboard;
+	iface->paste_clipboard = calendar_view_paste_clipboard;
+	iface->delete_selection = calendar_view_delete_selection;
 }
 
 void
--- mail/message-list.c	2013-12-31 02:05:06 +0000
+++ mail/message-list.c	2013-12-31 02:05:39 +0000
@@ -131,7 +131,7 @@
 
 /* Forward Declarations */
 static void	message_list_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	MessageList,
@@ -2841,10 +2841,10 @@
 }
 
 static void
-message_list_selectable_init (ESelectableInterface *interface)
+message_list_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = message_list_selectable_update_actions;
-	interface->select_all = message_list_selectable_select_all;
+	iface->update_actions = message_list_selectable_update_actions;
+	iface->select_all = message_list_selectable_select_all;
 }
 
 static void
--- mail/em-folder-tree.c	2013-12-31 02:02:07 +0000
+++ mail/em-folder-tree.c	2013-12-31 02:03:34 +0000
@@ -190,7 +190,7 @@
 };
 
 /* Forward Declarations */
-static void em_folder_tree_selectable_init (ESelectableInterface *interface);
+static void em_folder_tree_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMFolderTree,
@@ -1633,14 +1633,14 @@
 	g_return_if_fail (folder_tree != NULL);
 
 	if (folder_tree->priv->selectable != NULL) {
-		ESelectableInterface *interface;
+		ESelectableInterface *iface;
 		ESelectable *selectable;
 
 		selectable = E_SELECTABLE (folder_tree->priv->selectable);
-		interface = E_SELECTABLE_GET_INTERFACE (selectable);
-		g_return_if_fail (interface->update_actions != NULL);
+		iface = E_SELECTABLE_GET_INTERFACE (selectable);
+		g_return_if_fail (iface->update_actions != NULL);
 
-		interface->update_actions (
+		iface->update_actions (
 			selectable, focus_tracker,
 			clipboard_targets, n_clipboard_targets);
 	}
@@ -1649,7 +1649,7 @@
 static void
 folder_tree_selectable_cut_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1659,21 +1659,21 @@
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->cut_clipboard == NULL)
+	if (iface->cut_clipboard == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->cut_clipboard (E_SELECTABLE (proxy));
+	iface->cut_clipboard (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_copy_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1683,21 +1683,21 @@
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->copy_clipboard == NULL)
+	if (iface->copy_clipboard == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->copy_clipboard (E_SELECTABLE (proxy));
+	iface->copy_clipboard (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_paste_clipboard (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1707,21 +1707,21 @@
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->paste_clipboard == NULL)
+	if (iface->paste_clipboard == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->paste_clipboard (E_SELECTABLE (proxy));
+	iface->paste_clipboard (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_delete_selection (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1731,21 +1731,21 @@
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->delete_selection == NULL)
+	if (iface->delete_selection == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->delete_selection (E_SELECTABLE (proxy));
+	iface->delete_selection (E_SELECTABLE (proxy));
 }
 
 static void
 folder_tree_selectable_select_all (ESelectable *selectable)
 {
-	ESelectableInterface *interface;
+	ESelectableInterface *iface;
 	EMFolderTree *folder_tree;
 	GtkWidget *proxy;
 
@@ -1755,26 +1755,26 @@
 	if (!E_IS_SELECTABLE (proxy))
 		return;
 
-	interface = E_SELECTABLE_GET_INTERFACE (proxy);
+	iface = E_SELECTABLE_GET_INTERFACE (proxy);
 
-	if (interface->select_all == NULL)
+	if (iface->select_all == NULL)
 		return;
 
 	if (gtk_widget_get_can_focus (proxy))
 		gtk_widget_grab_focus (proxy);
 
-	interface->select_all (E_SELECTABLE (proxy));
+	iface->select_all (E_SELECTABLE (proxy));
 }
 
 static void
-em_folder_tree_selectable_init (ESelectableInterface *interface)
+em_folder_tree_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = folder_tree_selectable_update_actions;
-	interface->cut_clipboard = folder_tree_selectable_cut_clipboard;
-	interface->copy_clipboard = folder_tree_selectable_copy_clipboard;
-	interface->paste_clipboard = folder_tree_selectable_paste_clipboard;
-	interface->delete_selection = folder_tree_selectable_delete_selection;
-	interface->select_all = folder_tree_selectable_select_all;
+	iface->update_actions = folder_tree_selectable_update_actions;
+	iface->cut_clipboard = folder_tree_selectable_cut_clipboard;
+	iface->copy_clipboard = folder_tree_selectable_copy_clipboard;
+	iface->paste_clipboard = folder_tree_selectable_paste_clipboard;
+	iface->delete_selection = folder_tree_selectable_delete_selection;
+	iface->select_all = folder_tree_selectable_select_all;
 }
 
 GtkWidget *
--- mail/e-mail-reader.c	2013-12-31 01:56:26 +0000
+++ mail/e-mail-reader.c	2013-12-31 02:00:21 +0000
@@ -3678,25 +3678,25 @@
 }
 
 static void
-e_mail_reader_default_init (EMailReaderInterface *interface)
+e_mail_reader_default_init (EMailReaderInterface *iface)
 {
 	quark_private = g_quark_from_static_string ("e-mail-reader-private");
 
-	interface->get_alert_sink = mail_reader_get_alert_sink;
-	interface->get_selected_uids = mail_reader_get_selected_uids;
-	interface->get_folder = mail_reader_get_folder;
-	interface->enable_show_folder = mail_reader_get_enable_show_folder;
-	interface->set_folder = mail_reader_set_folder;
-	interface->set_message = mail_reader_set_message;
-	interface->open_selected_mail = e_mail_reader_open_selected;
-	interface->folder_loaded = mail_reader_folder_loaded;
-	interface->message_loaded = mail_reader_message_loaded;
-	interface->message_seen = mail_reader_message_seen;
-	interface->show_search_bar = mail_reader_show_search_bar;
-	interface->update_actions = mail_reader_update_actions;
+	iface->get_alert_sink = mail_reader_get_alert_sink;
+	iface->get_selected_uids = mail_reader_get_selected_uids;
+	iface->get_folder = mail_reader_get_folder;
+	iface->enable_show_folder = mail_reader_get_enable_show_folder;
+	iface->set_folder = mail_reader_set_folder;
+	iface->set_message = mail_reader_set_message;
+	iface->open_selected_mail = e_mail_reader_open_selected;
+	iface->folder_loaded = mail_reader_folder_loaded;
+	iface->message_loaded = mail_reader_message_loaded;
+	iface->message_seen = mail_reader_message_seen;
+	iface->show_search_bar = mail_reader_show_search_bar;
+	iface->update_actions = mail_reader_update_actions;
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_enum (
 			"forward-style",
 			"Forward Style",
@@ -3706,7 +3706,7 @@
 			G_PARAM_READWRITE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boolean (
 			"group-by-threads",
 			"Group by Threads",
@@ -3715,7 +3715,7 @@
 			G_PARAM_READWRITE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_enum (
 			"reply-style",
 			"Reply Style",
@@ -3726,7 +3726,7 @@
 
 	signals[CHANGED] = g_signal_new (
 		"changed",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST,
 		0, NULL, NULL,
 		g_cclosure_marshal_VOID__VOID,
@@ -3734,7 +3734,7 @@
 
 	signals[FOLDER_LOADED] = g_signal_new (
 		"folder-loaded",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST,
 		G_STRUCT_OFFSET (EMailReaderInterface, folder_loaded),
 		NULL, NULL,
@@ -3743,7 +3743,7 @@
 
 	signals[MESSAGE_LOADED] = g_signal_new (
 		"message-loaded",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailReaderInterface, message_loaded),
 		NULL, NULL,
@@ -3754,7 +3754,7 @@
 
 	signals[MESSAGE_SEEN] = g_signal_new (
 		"message-seen",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailReaderInterface, message_seen),
 		NULL, NULL,
@@ -3765,7 +3765,7 @@
 
 	signals[SHOW_SEARCH_BAR] = g_signal_new (
 		"show-search-bar",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		G_STRUCT_OFFSET (EMailReaderInterface, show_search_bar),
 		NULL, NULL,
@@ -3774,7 +3774,7 @@
 
 	signals[SHOW_FOLDER] = g_signal_new (
 		"show-folder",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		0,
 		NULL, NULL,
@@ -3783,7 +3783,7 @@
 
 	signals[SHOW_NEXTTAB] = g_signal_new (
 		"show-next-tab",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		0,
 		NULL, NULL,
@@ -3792,7 +3792,7 @@
 
 	signals[SHOW_PREVTAB] = g_signal_new (
 		"show-previous-tab",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		0,
 		NULL, NULL,
@@ -3801,7 +3801,7 @@
 
 	signals[CLOSE_TAB] = g_signal_new (
 		"close-tab",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		0,
 		NULL, NULL,
@@ -3810,7 +3810,7 @@
 
 	signals[UPDATE_ACTIONS] = g_signal_new (
 		"update-actions",
-		G_OBJECT_CLASS_TYPE (interface),
+		G_OBJECT_CLASS_TYPE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		G_STRUCT_OFFSET (EMailReaderInterface, update_actions),
 		NULL, NULL,
@@ -4368,185 +4368,185 @@
 e_mail_reader_get_action_group (EMailReader *reader,
                                 EMailReaderActionGroup group)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_action_group != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_action_group != NULL, NULL);
 
-	return interface->get_action_group (reader, group);
+	return iface->get_action_group (reader, group);
 }
 
 EAlertSink *
 e_mail_reader_get_alert_sink (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_alert_sink != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_alert_sink != NULL, NULL);
 
-	return interface->get_alert_sink (reader);
+	return iface->get_alert_sink (reader);
 }
 
 EMailBackend *
 e_mail_reader_get_backend (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_backend != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_backend != NULL, NULL);
 
-	return interface->get_backend (reader);
+	return iface->get_backend (reader);
 }
 
 EMailDisplay *
 e_mail_reader_get_mail_display (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_mail_display != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_mail_display != NULL, NULL);
 
-	return interface->get_mail_display (reader);
+	return iface->get_mail_display (reader);
 }
 
 gboolean
 e_mail_reader_get_hide_deleted (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), FALSE);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_hide_deleted != NULL, FALSE);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_hide_deleted != NULL, FALSE);
 
-	return interface->get_hide_deleted (reader);
+	return iface->get_hide_deleted (reader);
 }
 
 GtkWidget *
 e_mail_reader_get_message_list (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_message_list != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_message_list != NULL, NULL);
 
-	return interface->get_message_list (reader);
+	return iface->get_message_list (reader);
 }
 
 GtkMenu *
 e_mail_reader_get_popup_menu (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_popup_menu != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_popup_menu != NULL, NULL);
 
-	return interface->get_popup_menu (reader);
+	return iface->get_popup_menu (reader);
 }
 
 EPreviewPane *
 e_mail_reader_get_preview_pane (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_preview_pane != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_preview_pane != NULL, NULL);
 
-	return interface->get_preview_pane (reader);
+	return iface->get_preview_pane (reader);
 }
 
 GPtrArray *
 e_mail_reader_get_selected_uids (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_selected_uids != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_selected_uids != NULL, NULL);
 
-	return interface->get_selected_uids (reader);
+	return iface->get_selected_uids (reader);
 }
 
 GtkWindow *
 e_mail_reader_get_window (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_window != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_window != NULL, NULL);
 
-	return interface->get_window (reader);
+	return iface->get_window (reader);
 }
 
 CamelFolder *
 e_mail_reader_get_folder (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), NULL);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->get_folder != NULL, NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->get_folder != NULL, NULL);
 
-	return interface->get_folder (reader);
+	return iface->get_folder (reader);
 }
 
 void
 e_mail_reader_set_folder (EMailReader *reader,
                           CamelFolder *folder)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_if_fail (interface->set_folder != NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_if_fail (iface->set_folder != NULL);
 
-	interface->set_folder (reader, folder);
+	iface->set_folder (reader, folder);
 }
 
 void
 e_mail_reader_set_message (EMailReader *reader,
                            const gchar *message_uid)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_if_fail (E_IS_MAIL_READER (reader));
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_if_fail (interface->set_message != NULL);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_if_fail (iface->set_message != NULL);
 
-	interface->set_message (reader, message_uid);
+	iface->set_message (reader, message_uid);
 }
 
 guint
 e_mail_reader_open_selected_mail (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), 0);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->open_selected_mail != NULL, 0);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->open_selected_mail != NULL, 0);
 
-	return interface->open_selected_mail (reader);
+	return iface->open_selected_mail (reader);
 }
 
 EMailForwardStyle
@@ -4722,14 +4722,14 @@
 gboolean
 e_mail_reader_get_enable_show_folder (EMailReader *reader)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_READER (reader), FALSE);
 
-	interface = E_MAIL_READER_GET_INTERFACE (reader);
-	g_return_val_if_fail (interface->enable_show_folder != NULL, FALSE);
+	iface = E_MAIL_READER_GET_INTERFACE (reader);
+	g_return_val_if_fail (iface->enable_show_folder != NULL, FALSE);
 
-	return interface->enable_show_folder (reader);
+	return iface->enable_show_folder (reader);
 }
 
 void
--- mail/e-mail-paned-view.c	2013-12-31 01:46:37 +0000
+++ mail/e-mail-paned-view.c	2013-12-31 01:47:26 +0000
@@ -85,7 +85,7 @@
 #define STATE_GROUP_GLOBAL_FOLDER	"GlobalFolder"
 
 /* Forward Declarations */
-static void e_mail_paned_view_reader_init (EMailReaderInterface *interface);
+static void e_mail_paned_view_reader_init (EMailReaderInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailPanedView, e_mail_paned_view, E_TYPE_MAIL_VIEW,
@@ -1036,20 +1036,20 @@
 }
 
 static void
-e_mail_paned_view_reader_init (EMailReaderInterface *interface)
+e_mail_paned_view_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_paned_view_get_action_group;
-	interface->get_alert_sink = mail_paned_view_get_alert_sink;
-	interface->get_backend = mail_paned_view_get_backend;
-	interface->get_mail_display = mail_paned_view_get_mail_display;
-	interface->get_hide_deleted = mail_paned_view_get_hide_deleted;
-	interface->get_message_list = mail_paned_view_get_message_list;
-	interface->get_popup_menu = mail_paned_view_get_popup_menu;
-	interface->get_preview_pane = mail_paned_view_get_preview_pane;
-	interface->get_window = mail_paned_view_get_window;
-	interface->set_folder = mail_paned_view_set_folder;
-	interface->open_selected_mail = mail_paned_view_reader_open_selected_mail;
-	interface->enable_show_folder = mail_paned_view_enable_show_folder;
+	iface->get_action_group = mail_paned_view_get_action_group;
+	iface->get_alert_sink = mail_paned_view_get_alert_sink;
+	iface->get_backend = mail_paned_view_get_backend;
+	iface->get_mail_display = mail_paned_view_get_mail_display;
+	iface->get_hide_deleted = mail_paned_view_get_hide_deleted;
+	iface->get_message_list = mail_paned_view_get_message_list;
+	iface->get_popup_menu = mail_paned_view_get_popup_menu;
+	iface->get_preview_pane = mail_paned_view_get_preview_pane;
+	iface->get_window = mail_paned_view_get_window;
+	iface->set_folder = mail_paned_view_set_folder;
+	iface->open_selected_mail = mail_paned_view_reader_open_selected_mail;
+	iface->enable_show_folder = mail_paned_view_enable_show_folder;
 }
 
 static void
--- mail/e-mail-notebook-view.c	2013-12-31 01:43:44 +0000
+++ mail/e-mail-notebook-view.c	2013-12-31 01:44:37 +0000
@@ -58,7 +58,7 @@
 	E_SHELL_WINDOW_ACTION_GROUP ((window), "mail")
 
 /* Forward Declarations */
-static void e_mail_notebook_view_reader_init (EMailReaderInterface *interface);
+static void e_mail_notebook_view_reader_init (EMailReaderInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailNotebookView, e_mail_notebook_view, E_TYPE_MAIL_VIEW,
@@ -853,20 +853,20 @@
 }
 
 static void
-e_mail_notebook_view_reader_init (EMailReaderInterface *interface)
+e_mail_notebook_view_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_notebook_view_get_action_group;
-	interface->get_alert_sink = mail_notebook_view_get_alert_sink;
-	interface->get_backend = mail_notebook_view_get_backend;
-	interface->get_mail_display = mail_notebook_view_get_mail_display;
-	interface->get_hide_deleted = mail_notebook_view_get_hide_deleted;
-	interface->get_message_list = mail_notebook_view_get_message_list;
-	interface->get_popup_menu = mail_notebook_view_get_popup_menu;
-	interface->get_preview_pane = mail_notebook_view_get_preview_pane;
-	interface->get_window = mail_notebook_view_get_window;
-	interface->set_folder = mail_notebook_view_set_folder;
-	interface->open_selected_mail = mail_notebook_view_open_selected_mail;
-	interface->enable_show_folder = mail_notebook_view_enable_show_folder;
+	iface->get_action_group = mail_notebook_view_get_action_group;
+	iface->get_alert_sink = mail_notebook_view_get_alert_sink;
+	iface->get_backend = mail_notebook_view_get_backend;
+	iface->get_mail_display = mail_notebook_view_get_mail_display;
+	iface->get_hide_deleted = mail_notebook_view_get_hide_deleted;
+	iface->get_message_list = mail_notebook_view_get_message_list;
+	iface->get_popup_menu = mail_notebook_view_get_popup_menu;
+	iface->get_preview_pane = mail_notebook_view_get_preview_pane;
+	iface->get_window = mail_notebook_view_get_window;
+	iface->set_folder = mail_notebook_view_set_folder;
+	iface->open_selected_mail = mail_notebook_view_open_selected_mail;
+	iface->enable_show_folder = mail_notebook_view_enable_show_folder;
 }
 
 static void
--- mail/e-mail-config-window.c	2013-12-31 01:40:56 +0000
+++ mail/e-mail-config-window.c	2013-12-31 01:41:24 +0000
@@ -59,7 +59,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_window_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 static guint signals[LAST_SIGNAL];
 
@@ -495,9 +495,9 @@
 }
 
 static void
-e_mail_config_window_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_config_window_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_config_window_submit_alert;
+	iface->submit_alert = mail_config_window_submit_alert;
 }
 
 static void
--- mail/e-mail-config-welcome-page.c	2013-12-31 01:39:18 +0000
+++ mail/e-mail-config-welcome-page.c	2013-12-31 01:39:49 +0000
@@ -38,7 +38,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_welcome_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigWelcomePage,
@@ -162,11 +162,11 @@
 }
 
 static void
-e_mail_config_welcome_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_welcome_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Welcome");
-	interface->page_type = GTK_ASSISTANT_PAGE_INTRO;
-	interface->sort_order = E_MAIL_CONFIG_WELCOME_PAGE_SORT_ORDER;
+	iface->title = _("Welcome");
+	iface->page_type = GTK_ASSISTANT_PAGE_INTRO;
+	iface->sort_order = E_MAIL_CONFIG_WELCOME_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-config-summary-page.c	2013-12-31 01:37:26 +0000
+++ mail/e-mail-config-summary-page.c	2013-12-31 01:38:01 +0000
@@ -71,7 +71,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_summary_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigSummaryPage,
@@ -782,12 +782,12 @@
 }
 
 static void
-e_mail_config_summary_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_summary_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Account Summary");
-	interface->sort_order = E_MAIL_CONFIG_SUMMARY_PAGE_SORT_ORDER;
-	interface->check_complete = mail_config_summary_page_check_complete;
-	interface->commit_changes = mail_config_summary_page_commit_changes;
+	iface->title = _("Account Summary");
+	iface->sort_order = E_MAIL_CONFIG_SUMMARY_PAGE_SORT_ORDER;
+	iface->check_complete = mail_config_summary_page_check_complete;
+	iface->commit_changes = mail_config_summary_page_commit_changes;
 }
 
 static void
--- mail/e-mail-config-service-page.c	2013-12-31 01:34:11 +0000
+++ mail/e-mail-config-service-page.c	2013-12-31 01:34:51 +0000
@@ -87,7 +87,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_service_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_ABSTRACT_TYPE_WITH_CODE (
 	EMailConfigServicePage,
@@ -560,11 +560,11 @@
 }
 
 static void
-e_mail_config_service_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_service_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->setup_defaults = mail_config_service_page_setup_defaults;
-	interface->check_complete = mail_config_service_page_check_complete;
-	interface->commit_changes = mail_config_service_page_commit_changes;
+	iface->setup_defaults = mail_config_service_page_setup_defaults;
+	iface->check_complete = mail_config_service_page_check_complete;
+	iface->commit_changes = mail_config_service_page_commit_changes;
 }
 
 static void
--- mail/e-mail-config-sending-page.c	2013-12-31 01:32:27 +0000
+++ mail/e-mail-config-sending-page.c	2013-12-31 01:32:54 +0000
@@ -23,7 +23,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_sending_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigSendingPage,
@@ -45,10 +45,10 @@
 }
 
 static void
-e_mail_config_sending_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_sending_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Sending Email");
-	interface->sort_order = E_MAIL_CONFIG_SENDING_PAGE_SORT_ORDER;
+	iface->title = _("Sending Email");
+	iface->sort_order = E_MAIL_CONFIG_SENDING_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-config-security-page.c	2013-12-31 01:30:34 +0000
+++ mail/e-mail-config-security-page.c	2013-12-31 01:31:01 +0000
@@ -42,7 +42,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_security_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigSecurityPage,
@@ -637,10 +637,10 @@
 }
 
 static void
-e_mail_config_security_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_security_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Security");
-	interface->sort_order = E_MAIL_CONFIG_SECURITY_PAGE_SORT_ORDER;
+	iface->title = _("Security");
+	iface->sort_order = E_MAIL_CONFIG_SECURITY_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-config-receiving-page.c	2013-12-31 01:28:37 +0000
+++ mail/e-mail-config-receiving-page.c	2013-12-31 01:29:11 +0000
@@ -23,7 +23,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_receiving_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigReceivingPage,
@@ -45,10 +45,10 @@
 }
 
 static void
-e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_receiving_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Receiving Email");
-	interface->sort_order = E_MAIL_CONFIG_RECEIVING_PAGE_SORT_ORDER;
+	iface->title = _("Receiving Email");
+	iface->sort_order = E_MAIL_CONFIG_RECEIVING_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-config-provider-page.c	2013-12-31 01:25:42 +0000
+++ mail/e-mail-config-provider-page.c	2013-12-31 01:26:20 +0000
@@ -43,7 +43,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_provider_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigProviderPage,
@@ -695,10 +695,10 @@
 }
 
 static void
-e_mail_config_provider_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_provider_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Receiving Options");
-	interface->sort_order = E_MAIL_CONFIG_PROVIDER_PAGE_SORT_ORDER;
+	iface->title = _("Receiving Options");
+	iface->sort_order = E_MAIL_CONFIG_PROVIDER_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-config-page.c	2013-12-31 01:20:58 +0000
+++ mail/e-mail-config-page.c	2013-12-31 01:22:34 +0000
@@ -121,19 +121,19 @@
 }
 
 static void
-e_mail_config_page_default_init (EMailConfigPageInterface *interface)
+e_mail_config_page_default_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Untitled");
-	interface->page_type = GTK_ASSISTANT_PAGE_CONTENT;
+	iface->title = _("Untitled");
+	iface->page_type = GTK_ASSISTANT_PAGE_CONTENT;
 
-	interface->check_complete = mail_config_page_check_complete;
-	interface->submit_sync = mail_config_page_submit_sync;
-	interface->submit = mail_config_page_submit;
-	interface->submit_finish = mail_config_page_submit_finish;
+	iface->check_complete = mail_config_page_check_complete;
+	iface->submit_sync = mail_config_page_submit_sync;
+	iface->submit = mail_config_page_submit;
+	iface->submit_finish = mail_config_page_submit_finish;
 
 	signals[CHANGED] = g_signal_new (
 		"changed",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, changed),
 		NULL, NULL,
@@ -142,7 +142,7 @@
 
 	signals[SETUP_DEFAULTS] = g_signal_new (
 		"setup-defaults",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, setup_defaults),
 		NULL, NULL,
@@ -151,7 +151,7 @@
 
 	signals[CHECK_COMPLETE] = g_signal_new (
 		"check-complete",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, check_complete),
 		mail_config_page_check_complete_accumulator, NULL,
@@ -160,7 +160,7 @@
 
 	signals[COMMIT_CHANGES] = g_signal_new (
 		"commit-changes",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_LAST,
 		G_STRUCT_OFFSET (EMailConfigPageInterface, commit_changes),
 		NULL, NULL,
@@ -243,14 +243,14 @@
                                 GCancellable *cancellable,
                                 GError **error)
 {
-	EMailConfigPageInterface *interface;
+	EMailConfigPageInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_CONFIG_PAGE (page), FALSE);
 
-	interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
-	g_return_val_if_fail (interface->submit_sync != NULL, FALSE);
+	iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
+	g_return_val_if_fail (iface->submit_sync != NULL, FALSE);
 
-	return interface->submit_sync (page, cancellable, error);
+	return iface->submit_sync (page, cancellable, error);
 }
 
 void
@@ -259,14 +259,14 @@
                            GAsyncReadyCallback callback,
                            gpointer user_data)
 {
-	EMailConfigPageInterface *interface;
+	EMailConfigPageInterface *iface;
 
 	g_return_if_fail (E_IS_MAIL_CONFIG_PAGE (page));
 
-	interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
-	g_return_if_fail (interface->submit != NULL);
+	iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
+	g_return_if_fail (iface->submit != NULL);
 
-	return interface->submit (page, cancellable, callback, user_data);
+	return iface->submit (page, cancellable, callback, user_data);
 }
 
 gboolean
@@ -274,14 +274,14 @@
                                   GAsyncResult *result,
                                   GError **error)
 {
-	EMailConfigPageInterface *interface;
+	EMailConfigPageInterface *iface;
 
 	g_return_val_if_fail (E_IS_MAIL_CONFIG_PAGE (page), FALSE);
 	g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE);
 
-	interface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
-	g_return_val_if_fail (interface->submit_finish != NULL, FALSE);
+	iface = E_MAIL_CONFIG_PAGE_GET_INTERFACE (page);
+	g_return_val_if_fail (iface->submit_finish != NULL, FALSE);
 
-	return interface->submit_finish (page, result, error);
+	return iface->submit_finish (page, result, error);
 }
 
--- mail/e-mail-config-lookup-page.c	2013-12-31 01:18:25 +0000
+++ mail/e-mail-config-lookup-page.c	2013-12-31 01:18:56 +0000
@@ -23,7 +23,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_lookup_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigLookupPage,
@@ -87,14 +87,14 @@
 }
 
 static void
-e_mail_config_lookup_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_lookup_page_interface_init (EMailConfigPageInterface *iface)
 {
 	/* Do not set a title.  We don't want this
 	 * page listed in a GtkAssistant sidebar. */
-	interface->title = "";
-	interface->sort_order = E_MAIL_CONFIG_LOOKUP_PAGE_SORT_ORDER;
-	interface->page_type = GTK_ASSISTANT_PAGE_CUSTOM;
-	interface->check_complete = mail_config_lookup_page_check_complete;
+	iface->title = "";
+	iface->sort_order = E_MAIL_CONFIG_LOOKUP_PAGE_SORT_ORDER;
+	iface->page_type = GTK_ASSISTANT_PAGE_CUSTOM;
+	iface->check_complete = mail_config_lookup_page_check_complete;
 }
 
 static void
--- mail/e-mail-config-identity-page.c	2013-12-31 01:16:53 +0000
+++ mail/e-mail-config-identity-page.c	2013-12-31 01:17:33 +0000
@@ -52,7 +52,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_identity_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigIdentityPage,
@@ -674,11 +674,11 @@
 }
 
 static void
-e_mail_config_identity_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_identity_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Identity");
-	interface->sort_order = E_MAIL_CONFIG_IDENTITY_PAGE_SORT_ORDER;
-	interface->check_complete = mail_config_identity_page_check_complete;
+	iface->title = _("Identity");
+	iface->sort_order = E_MAIL_CONFIG_IDENTITY_PAGE_SORT_ORDER;
+	iface->check_complete = mail_config_identity_page_check_complete;
 }
 
 static void
--- mail/e-mail-config-defaults-page.c	2013-12-31 01:15:11 +0000
+++ mail/e-mail-config-defaults-page.c	2013-12-31 01:15:39 +0000
@@ -52,7 +52,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_defaults_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigDefaultsPage,
@@ -834,10 +834,10 @@
 }
 
 static void
-e_mail_config_defaults_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_defaults_page_interface_init (EMailConfigPageInterface *iface)
 {
-	interface->title = _("Defaults");
-	interface->sort_order = E_MAIL_CONFIG_DEFAULTS_PAGE_SORT_ORDER;
+	iface->title = _("Defaults");
+	iface->sort_order = E_MAIL_CONFIG_DEFAULTS_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-config-confirm-page.c	2013-12-31 01:11:09 +0000
+++ mail/e-mail-config-confirm-page.c	2013-12-31 01:12:04 +0000
@@ -38,7 +38,7 @@
 
 /* Forward Declarations */
 static void	e_mail_config_confirm_page_interface_init
-					(EMailConfigPageInterface *interface);
+					(EMailConfigPageInterface *interf);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailConfigConfirmPage,
@@ -164,11 +164,11 @@
 }
 
 static void
-e_mail_config_confirm_page_interface_init (EMailConfigPageInterface *interface)
+e_mail_config_confirm_page_interface_init (EMailConfigPageInterface *interf)
 {
-	interface->title = _("Done");
-	interface->page_type = GTK_ASSISTANT_PAGE_CONFIRM;
-	interface->sort_order = E_MAIL_CONFIG_CONFIRM_PAGE_SORT_ORDER;
+	interf->title = _("Done");
+	interf->page_type = GTK_ASSISTANT_PAGE_CONFIRM;
+	interf->sort_order = E_MAIL_CONFIG_CONFIRM_PAGE_SORT_ORDER;
 }
 
 static void
--- mail/e-mail-browser.c	2013-12-31 01:08:59 +0000
+++ mail/e-mail-browser.c	2013-12-31 01:09:56 +0000
@@ -100,7 +100,7 @@
 "</ui>";
 
 static void	e_mail_browser_reader_init
-					(EMailReaderInterface *interface);
+					(EMailReaderInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailBrowser,
@@ -814,13 +814,13 @@
 mail_browser_set_message (EMailReader *reader,
                           const gchar *uid)
 {
-	EMailReaderInterface *interface;
+	EMailReaderInterface *iface;
 	CamelMessageInfo *info;
 	CamelFolder *folder;
 
 	/* Chain up to parent's set_message() method. */
-	interface = g_type_default_interface_peek (E_TYPE_MAIL_READER);
-	interface->set_message (reader, uid);
+	iface = g_type_default_interface_peek (E_TYPE_MAIL_READER);
+	iface->set_message (reader, uid);
 
 	if (uid == NULL) {
 		e_mail_browser_close (E_MAIL_BROWSER (reader));
@@ -918,17 +918,17 @@
 }
 
 static void
-e_mail_browser_reader_init (EMailReaderInterface *interface)
+e_mail_browser_reader_init (EMailReaderInterface *iface)
 {
-	interface->get_action_group = mail_browser_get_action_group;
-	interface->get_backend = mail_browser_get_backend;
-	interface->get_mail_display = mail_browser_get_mail_display;
-	interface->get_hide_deleted = mail_browser_get_hide_deleted;
-	interface->get_message_list = mail_browser_get_message_list;
-	interface->get_popup_menu = mail_browser_get_popup_menu;
-	interface->get_preview_pane = mail_browser_get_preview_pane;
-	interface->get_window = mail_browser_get_window;
-	interface->set_message = mail_browser_set_message;
+	iface->get_action_group = mail_browser_get_action_group;
+	iface->get_backend = mail_browser_get_backend;
+	iface->get_mail_display = mail_browser_get_mail_display;
+	iface->get_hide_deleted = mail_browser_get_hide_deleted;
+	iface->get_message_list = mail_browser_get_message_list;
+	iface->get_popup_menu = mail_browser_get_popup_menu;
+	iface->get_preview_pane = mail_browser_get_preview_pane;
+	iface->get_window = mail_browser_get_window;
+	iface->set_message = mail_browser_set_message;
 }
 
 static void
--- mail/e-mail-autoconfig.c	2013-01-19 17:35:13 +0000
+++ mail/e-mail-autoconfig.c	2013-12-31 01:27:53 +0000
@@ -82,7 +87,7 @@
 };
 
 /* Forward Declarations */
-static void	e_mail_autoconfig_initable_init	(GInitableIface *interface);
+static void	e_mail_autoconfig_initable_init	(GInitableIface *iface);
 
 /* By default, the GAsyncInitable interface calls GInitable.init()
  * from a separate thread, so we only have to override GInitable. */
@@ -760,9 +835,9 @@
 }
 
 static void
-e_mail_autoconfig_initable_init (GInitableIface *interface)
+e_mail_autoconfig_initable_init (GInitableIface *iface)
 {
-	interface->init = mail_autoconfig_initable_init;
+	iface->init = mail_autoconfig_initable_init;
 }
 
 static void
--- mail/e-mail-account-store.c	2013-12-30 08:44:31 +0000
+++ mail/e-mail-account-store.c	2013-12-30 08:49:28 +0000
@@ -76,7 +76,7 @@
 
 /* Forward Declarations */
 static void	e_mail_account_store_interface_init
-						(GtkTreeModelIface *interface);
+						(GtkTreeModelIface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailAccountStore,
@@ -953,10 +953,10 @@
 }
 
 static void
-e_mail_account_store_interface_init (GtkTreeModelIface *interface)
+e_mail_account_store_interface_init (GtkTreeModelIface *iface)
 {
-	interface->row_changed = mail_account_store_row_changed;
-	interface->row_inserted = mail_account_store_row_inserted;
+	iface->row_changed = mail_account_store_row_changed;
+	iface->row_inserted = mail_account_store_row_inserted;
 }
 
 static void
--- composer/e-msg-composer.c	2013-12-30 08:34:00 +0000
+++ composer/e-msg-composer.c	2013-12-30 08:34:36 +0000
@@ -128,7 +128,7 @@
 						 GCancellable *cancellable,
 						 gint depth);
 
-static void	e_msg_composer_alert_sink_init	(EAlertSinkInterface *interface);
+static void	e_msg_composer_alert_sink_init	(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMsgComposer,
@@ -2485,9 +2485,9 @@
 }
 
 static void
-e_msg_composer_alert_sink_init (EAlertSinkInterface *interface)
+e_msg_composer_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = msg_composer_submit_alert;
+	iface->submit_alert = msg_composer_submit_alert;
 }
 
 static void
--- addressbook/gui/widgets/e-addressbook-view.c	2013-12-30 08:22:56 +0000
+++ addressbook/gui/widgets/e-addressbook-view.c	2013-12-30 08:23:34 +0000
@@ -129,7 +129,7 @@
 
 /* Forward Declarations */
 static void	e_addressbook_view_selectable_init
-					(ESelectableInterface *interface);
+					(ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAddressbookView,
@@ -882,14 +882,14 @@
 }
 
 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 *
--- em-format/e-mail-parser-application-smime.c	2013-12-28 23:51:42 +0000
+++ em-format/e-mail-parser-application-smime.c	2013-12-28 23:53:10 +0000
@@ -182,16 +182,16 @@
 }
 
 static void
-e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *interface)
+e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface)
 {
-	interface->parse = empe_app_smime_parse;
-	interface->get_flags = empe_app_smime_get_flags;
+	iface->parse = empe_app_smime_parse;
+	iface->get_flags = empe_app_smime_get_flags;
 }
 
 static void
-e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *interface)
+e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface)
 {
-	interface->mime_types = empe_application_smime_mime_types;
+	iface->mime_types = empe_application_smime_mime_types;
 }
 
 static void
--- em-format/e-mail-parser-application-mbox.c	2013-12-28 23:08:04 +0000
+++ em-format/e-mail-parser-application-mbox.c	2013-12-28 23:09:00 +0000
@@ -197,16 +197,16 @@
 }
 
 static void
-e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *interface)
+e_mail_parser_parser_extension_interface_init (EMailParserExtensionInterface *iface)
 {
-	interface->parse = empe_app_mbox_parse;
-	interface->get_flags = empe_app_mbox_get_flags;
+	iface->parse = empe_app_mbox_parse;
+	iface->get_flags = empe_app_mbox_get_flags;
 }
 
 static void
-e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *interface)
+e_mail_parser_mail_extension_interface_init (EMailExtensionInterface *iface)
 {
-	interface->mime_types = empe_app_mbox_mime_types;
+	iface->mime_types = empe_app_mbox_mime_types;
 }
 
 static void
--- em-format/e-mail-formatter.c	2013-12-28 22:48:46 +0000
+++ em-format/e-mail-formatter.c	2013-12-28 22:50:14 +0000
@@ -726,7 +726,7 @@
 }
 
 static void
-e_mail_formatter_extensible_interface_init (EExtensibleInterface *interface)
+e_mail_formatter_extensible_interface_init (EExtensibleInterface *iface)
 {
 
 }
--- em-format/e-mail-extension-registry.c	2013-12-28 22:39:36 +0000
+++ em-format/e-mail-extension-registry.c	2013-12-28 22:42:59 +0000
@@ -260,7 +260,7 @@
 }
 
 static void
-e_mail_parser_extension_registry_extensible_interface_init (EExtensibleInterface *interface)
+e_mail_parser_extension_registry_extensible_interface_init (EExtensibleInterface *iface)
 {
 
 }
@@ -289,7 +289,7 @@
 }
 
 static void
-e_mail_formatter_extension_registry_extensible_interface_init (EExtensibleInterface *interface)
+e_mail_formatter_extension_registry_extensible_interface_init (EExtensibleInterface *iface)
 {
 
 }
--- shell/e-shell-window.c	2013-01-19 17:35:14 +0000
+++ shell/e-shell-window.c	2013-12-28 07:27:11 +0000
@@ -55,7 +55,7 @@
 
 /* Forward Declarations */
 static void	e_shell_window_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellWindow,
@@ -1008,9 +1008,9 @@
 }
 
 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
--- shell/e-shell-sidebar.c	2013-01-19 17:35:14 +0000
+++ shell/e-shell-sidebar.c	2013-12-28 07:23:39 +0000
@@ -62,7 +62,7 @@
 
 /* Forward Declarations */
 static void	e_shell_sidebar_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellSidebar,
@@ -422,9 +422,9 @@
 }
 
 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
--- shell/e-shell-content.c	2013-01-19 17:35:14 +0000
+++ shell/e-shell-content.c	2013-12-28 07:16:27 +0000
@@ -69,7 +69,7 @@
 
 /* Forward Declarations */
 static void	e_shell_content_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EShellContent,
@@ -488,9 +488,9 @@
 }
 
 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
--- shell/e-shell.c	2013-01-19 17:35:14 +0000
+++ shell/e-shell.c	2013-12-28 07:13:12 +0000
@@ -116,7 +116,7 @@
 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,
@@ -1197,9 +1197,9 @@
 }
 
 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
--- widgets/misc/e-web-view-gtkhtml.c	2013-12-28 06:13:15 +0000
+++ widgets/misc/e-web-view-gtkhtml.c	2013-12-28 06:14:27 +0000
@@ -126,8 +126,8 @@
 "</ui>";
 
 /* Forward Declarations */
-static void e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *interface);
-static void e_web_view_gtkhtml_selectable_init (ESelectableInterface *interface);
+static void e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *iface);
+static void e_web_view_gtkhtml_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EWebViewGtkHTML,
@@ -1596,19 +1596,19 @@
 }
 
 static void
-e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *interface)
+e_web_view_gtkhtml_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = web_view_gtkhtml_submit_alert;
+	iface->submit_alert = web_view_gtkhtml_submit_alert;
 }
 
 static void
-e_web_view_gtkhtml_selectable_init (ESelectableInterface *interface)
+e_web_view_gtkhtml_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = web_view_gtkhtml_selectable_update_actions;
-	interface->cut_clipboard = web_view_gtkhtml_selectable_cut_clipboard;
-	interface->copy_clipboard = web_view_gtkhtml_selectable_copy_clipboard;
-	interface->paste_clipboard = web_view_gtkhtml_selectable_paste_clipboard;
-	interface->select_all = web_view_gtkhtml_selectable_select_all;
+	iface->update_actions = web_view_gtkhtml_selectable_update_actions;
+	iface->cut_clipboard = web_view_gtkhtml_selectable_cut_clipboard;
+	iface->copy_clipboard = web_view_gtkhtml_selectable_copy_clipboard;
+	iface->paste_clipboard = web_view_gtkhtml_selectable_paste_clipboard;
+	iface->select_all = web_view_gtkhtml_selectable_select_all;
 }
 
 static void
--- widgets/misc/e-web-view.c	2013-12-28 06:08:47 +0000
+++ widgets/misc/e-web-view.c	2013-12-28 06:09:34 +0000
@@ -128,8 +128,8 @@
 "</ui>";
 
 /* Forward Declarations */
-static void e_web_view_alert_sink_init (EAlertSinkInterface *interface);
-static void e_web_view_selectable_init (ESelectableInterface *interface);
+static void e_web_view_alert_sink_init (EAlertSinkInterface *iface);
+static void e_web_view_selectable_init (ESelectableInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EWebView,
@@ -1690,19 +1690,19 @@
 }
 
 static void
-e_web_view_alert_sink_init (EAlertSinkInterface *interface)
+e_web_view_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = web_view_submit_alert;
+	iface->submit_alert = web_view_submit_alert;
 }
 
 static void
-e_web_view_selectable_init (ESelectableInterface *interface)
+e_web_view_selectable_init (ESelectableInterface *iface)
 {
-	interface->update_actions = web_view_selectable_update_actions;
-	interface->cut_clipboard = web_view_selectable_cut_clipboard;
-	interface->copy_clipboard = web_view_selectable_copy_clipboard;
-	interface->paste_clipboard = web_view_selectable_paste_clipboard;
-	interface->select_all = web_view_selectable_select_all;
+	iface->update_actions = web_view_selectable_update_actions;
+	iface->cut_clipboard = web_view_selectable_cut_clipboard;
+	iface->copy_clipboard = web_view_selectable_copy_clipboard;
+	iface->paste_clipboard = web_view_selectable_paste_clipboard;
+	iface->select_all = web_view_selectable_select_all;
 }
 
 static void
--- widgets/misc/e-source-config-dialog.c	2013-01-19 17:35:14 +0000
+++ widgets/misc/e-source-config-dialog.c	2013-12-28 06:03:27 +0000
@@ -41,7 +41,7 @@
 
 /* Forward Declarations */
 static void	e_source_config_dialog_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	ESourceConfigDialog,
@@ -355,9 +355,9 @@
 }
 
 static void
-e_source_config_dialog_alert_sink_init (EAlertSinkInterface *interface)
+e_source_config_dialog_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = source_config_dialog_submit_alert;
+	iface->submit_alert = source_config_dialog_submit_alert;
 }
 
 static void
--- widgets/misc/e-preview-pane.c	2013-12-28 05:58:29 +0000
+++ widgets/misc/e-preview-pane.c	2013-12-28 05:59:00 +0000
@@ -57,7 +57,7 @@
 
 /* Forward Declarations */
 static void	e_preview_pane_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EPreviewPane,
@@ -267,9 +267,9 @@
 }
 
 static void
-e_preview_pane_alert_sink_init (EAlertSinkInterface *interface)
+e_preview_pane_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = preview_pane_submit_alert;
+	iface->submit_alert = preview_pane_submit_alert;
 }
 
 static void
--- widgets/misc/e-mail-signature-editor.c	2013-12-27 21:32:11 +0000
+++ widgets/misc/e-mail-signature-editor.c	2013-12-27 21:32:50 +0000
@@ -78,7 +78,7 @@
 
 /* Forward Declarations */
 static void	e_mail_signature_editor_alert_sink_init
-					(EAlertSinkInterface *interface);
+					(EAlertSinkInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailSignatureEditor,
@@ -727,9 +727,9 @@
 }
 
 static void
-e_mail_signature_editor_alert_sink_init (EAlertSinkInterface *interface)
+e_mail_signature_editor_alert_sink_init (EAlertSinkInterface *iface)
 {
-	interface->submit_alert = mail_signature_editor_submit_alert;
+	iface->submit_alert = mail_signature_editor_submit_alert;
 }
 
 static void
--- widgets/misc/e-attachment-view.c	2013-12-27 21:17:29 +0000
+++ widgets/misc/e-attachment-view.c	2013-12-27 21:28:13 +0000
@@ -836,12 +836,12 @@
 }
 
 static void
-e_attachment_view_default_init (EAttachmentViewInterface *interface)
+e_attachment_view_default_init (EAttachmentViewInterface *iface)
 {
-	interface->update_actions = attachment_view_update_actions;
+	iface->update_actions = attachment_view_update_actions;
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boolean (
 			"dragging",
 			"Dragging",
@@ -850,7 +850,7 @@
 			G_PARAM_READWRITE));
 
 	g_object_interface_install_property (
-		interface,
+		iface,
 		g_param_spec_boolean (
 			"editable",
 			"Editable",
@@ -861,7 +861,7 @@
 
 	signals[UPDATE_ACTIONS] = g_signal_new (
 		"update-actions",
-		G_TYPE_FROM_INTERFACE (interface),
+		G_TYPE_FROM_INTERFACE (iface),
 		G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
 		G_STRUCT_OFFSET (EAttachmentViewInterface, update_actions),
 		NULL, NULL,
@@ -978,27 +978,27 @@
 EAttachmentViewPrivate *
 e_attachment_view_get_private (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_private != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_private != NULL, NULL);
 
-	return interface->get_private (view);
+	return iface->get_private (view);
 }
 
 EAttachmentStore *
 e_attachment_view_get_store (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_store != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_store != NULL, NULL);
 
-	return interface->get_store (view);
+	return iface->get_store (view);
 }
 
 gboolean
@@ -1376,34 +1376,34 @@
                                    gint x,
                                    gint y)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_path_at_pos != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_path_at_pos != NULL, NULL);
 
-	return interface->get_path_at_pos (view, x, y);
+	return iface->get_path_at_pos (view, x, y);
 }
 
 GList *
 e_attachment_view_get_selected_paths (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->get_selected_paths != NULL, NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->get_selected_paths != NULL, NULL);
 
-	return interface->get_selected_paths (view);
+	return iface->get_selected_paths (view);
 }
 
 gboolean
 e_attachment_view_path_is_selected (EAttachmentView *view,
                                     GtkTreePath *path)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_val_if_fail (E_IS_ATTACHMENT_VIEW (view), FALSE);
 
@@ -1411,66 +1411,66 @@
 	if (path == NULL)
 		return FALSE;
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_val_if_fail (interface->path_is_selected != NULL, FALSE);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_val_if_fail (iface->path_is_selected != NULL, FALSE);
 
-	return interface->path_is_selected (view, path);
+	return iface->path_is_selected (view, path);
 }
 
 void
 e_attachment_view_select_path (EAttachmentView *view,
                                GtkTreePath *path)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 	g_return_if_fail (path != NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->select_path != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->select_path != NULL);
 
-	interface->select_path (view, path);
+	iface->select_path (view, path);
 }
 
 void
 e_attachment_view_unselect_path (EAttachmentView *view,
                                  GtkTreePath *path)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 	g_return_if_fail (path != NULL);
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->unselect_path != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->unselect_path != NULL);
 
-	interface->unselect_path (view, path);
+	iface->unselect_path (view, path);
 }
 
 void
 e_attachment_view_select_all (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->select_all != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->select_all != NULL);
 
-	interface->select_all (view);
+	iface->select_all (view);
 }
 
 void
 e_attachment_view_unselect_all (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	g_return_if_fail (interface->unselect_all != NULL);
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	g_return_if_fail (iface->unselect_all != NULL);
 
-	interface->unselect_all (view);
+	iface->unselect_all (view);
 }
 
 void
@@ -1495,22 +1495,22 @@
 void
 e_attachment_view_drag_source_set (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 	GtkTargetEntry *targets;
 	GtkTargetList *list;
 	gint n_targets;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_source_set == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_source_set == NULL)
 		return;
 
 	list = gtk_target_list_new (NULL, 0);
 	gtk_target_list_add_uri_targets (list, 0);
 	targets = gtk_target_table_new_from_list (list, &n_targets);
 
-	interface->drag_source_set (
+	iface->drag_source_set (
 		view, GDK_BUTTON1_MASK,
 		targets, n_targets, GDK_ACTION_COPY);
 
@@ -1521,15 +1521,15 @@
 void
 e_attachment_view_drag_source_unset (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_source_unset == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_source_unset == NULL)
 		return;
 
-	interface->drag_source_unset (view);
+	iface->drag_source_unset (view);
 }
 
 void
@@ -1676,14 +1676,14 @@
 e_attachment_view_drag_dest_set (EAttachmentView *view)
 {
 	EAttachmentViewPrivate *priv;
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 	GtkTargetEntry *targets;
 	gint n_targets;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_dest_set == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_dest_set == NULL)
 		return;
 
 	priv = e_attachment_view_get_private (view);
@@ -1691,7 +1691,7 @@
 	targets = gtk_target_table_new_from_list (
 		priv->target_list, &n_targets);
 
-	interface->drag_dest_set (
+	iface->drag_dest_set (
 		view, targets, n_targets, priv->drag_actions);
 
 	gtk_target_table_free (targets, n_targets);
@@ -1700,15 +1700,15 @@
 void
 e_attachment_view_drag_dest_unset (EAttachmentView *view)
 {
-	EAttachmentViewInterface *interface;
+	EAttachmentViewInterface *iface;
 
 	g_return_if_fail (E_IS_ATTACHMENT_VIEW (view));
 
-	interface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
-	if (interface->drag_dest_unset == NULL)
+	iface = E_ATTACHMENT_VIEW_GET_INTERFACE (view);
+	if (iface->drag_dest_unset == NULL)
 		return;
 
-	interface->drag_dest_unset (view);
+	iface->drag_dest_unset (view);
 }
 
 gboolean
--- widgets/misc/e-attachment-tree-view.c	2013-12-27 21:13:16 +0000
+++ widgets/misc/e-attachment-tree-view.c	2013-12-27 21:14:48 +0000
@@ -48,7 +48,7 @@
 
 /* Forward Declarations */
 static void	e_attachment_tree_view_interface_init
-					(EAttachmentViewInterface *interface);
+					(EAttachmentViewInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAttachmentTreeView,
@@ -597,23 +597,23 @@
 }
 
 static void
-e_attachment_tree_view_interface_init (EAttachmentViewInterface *interface)
+e_attachment_tree_view_interface_init (EAttachmentViewInterface *iface)
 {
-	interface->get_private = attachment_tree_view_get_private;
-	interface->get_store = attachment_tree_view_get_store;
+	iface->get_private = attachment_tree_view_get_private;
+	iface->get_store = attachment_tree_view_get_store;
 
-	interface->get_path_at_pos = attachment_tree_view_get_path_at_pos;
-	interface->get_selected_paths = attachment_tree_view_get_selected_paths;
-	interface->path_is_selected = attachment_tree_view_path_is_selected;
-	interface->select_path = attachment_tree_view_select_path;
-	interface->unselect_path = attachment_tree_view_unselect_path;
-	interface->select_all = attachment_tree_view_select_all;
-	interface->unselect_all = attachment_tree_view_unselect_all;
-
-	interface->drag_source_set = attachment_tree_view_drag_source_set;
-	interface->drag_dest_set = attachment_tree_view_drag_dest_set;
-	interface->drag_source_unset = attachment_tree_view_drag_source_unset;
-	interface->drag_dest_unset = attachment_tree_view_drag_dest_unset;
+	iface->get_path_at_pos = attachment_tree_view_get_path_at_pos;
+	iface->get_selected_paths = attachment_tree_view_get_selected_paths;
+	iface->path_is_selected = attachment_tree_view_path_is_selected;
+	iface->select_path = attachment_tree_view_select_path;
+	iface->unselect_path = attachment_tree_view_unselect_path;
+	iface->select_all = attachment_tree_view_select_all;
+	iface->unselect_all = attachment_tree_view_unselect_all;
+
+	iface->drag_source_set = attachment_tree_view_drag_source_set;
+	iface->drag_dest_set = attachment_tree_view_drag_dest_set;
+	iface->drag_source_unset = attachment_tree_view_drag_source_unset;
+	iface->drag_dest_unset = attachment_tree_view_drag_dest_unset;
 }
 
 GtkWidget *
--- widgets/misc/e-attachment-icon-view.c	2013-12-27 21:08:19 +0000
+++ widgets/misc/e-attachment-icon-view.c	2013-12-27 21:09:45 +0000
@@ -50,7 +50,7 @@
 
 /* Forward Declarations */
 static void	e_attachment_icon_view_interface_init
-					(EAttachmentViewInterface *interface);
+					(EAttachmentViewInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EAttachmentIconView,
@@ -544,23 +544,23 @@
 }
 
 static void
-e_attachment_icon_view_interface_init (EAttachmentViewInterface *interface)
+e_attachment_icon_view_interface_init (EAttachmentViewInterface *iface)
 {
-	interface->get_private = attachment_icon_view_get_private;
-	interface->get_store = attachment_icon_view_get_store;
+	iface->get_private = attachment_icon_view_get_private;
+	iface->get_store = attachment_icon_view_get_store;
 
-	interface->get_path_at_pos = attachment_icon_view_get_path_at_pos;
-	interface->get_selected_paths = attachment_icon_view_get_selected_paths;
-	interface->path_is_selected = attachment_icon_view_path_is_selected;
-	interface->select_path = attachment_icon_view_select_path;
-	interface->unselect_path = attachment_icon_view_unselect_path;
-	interface->select_all = attachment_icon_view_select_all;
-	interface->unselect_all = attachment_icon_view_unselect_all;
-
-	interface->drag_source_set = attachment_icon_view_drag_source_set;
-	interface->drag_dest_set = attachment_icon_view_drag_dest_set;
-	interface->drag_source_unset = attachment_icon_view_drag_source_unset;
-	interface->drag_dest_unset = attachment_icon_view_drag_dest_unset;
+	iface->get_path_at_pos = attachment_icon_view_get_path_at_pos;
+	iface->get_selected_paths = attachment_icon_view_get_selected_paths;
+	iface->path_is_selected = attachment_icon_view_path_is_selected;
+	iface->select_path = attachment_icon_view_select_path;
+	iface->unselect_path = attachment_icon_view_unselect_path;
+	iface->select_all = attachment_icon_view_select_all;
+	iface->unselect_all = attachment_icon_view_unselect_all;
+
+	iface->drag_source_set = attachment_icon_view_drag_source_set;
+	iface->drag_dest_set = attachment_icon_view_drag_dest_set;
+	iface->drag_source_unset = attachment_icon_view_drag_source_unset;
+	iface->drag_dest_unset = attachment_icon_view_drag_dest_unset;
 }
 
 GtkWidget *
--- libemail-engine/e-mail-authenticator.c	2013-12-27 20:26:41 +0000
+++ libemail-engine/e-mail-authenticator.c	2013-12-27 20:27:35 +0000
@@ -38,7 +38,7 @@
 
 /* Forward Declarations */
 static void	e_mail_authenticator_interface_init
-				(ESourceAuthenticatorInterface *interface);
+				(ESourceAuthenticatorInterface *iface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailAuthenticator,
@@ -227,9 +227,9 @@
 }
 
 static void
-e_mail_authenticator_interface_init (ESourceAuthenticatorInterface *interface)
+e_mail_authenticator_interface_init (ESourceAuthenticatorInterface *iface)
 {
-	interface->try_password_sync = mail_authenticator_try_password_sync;
+	iface->try_password_sync = mail_authenticator_try_password_sync;
 }
 
 static void