GObject boilerplate cleanup.

Prefer thread-safe G_DEFINE_TYPE and G_DEFINE_INTERFACE macros over
manual GType registration.

This is just a start... lots more to do.

1 files changed, 17 insertions, 17 deletions

diff --git a/mail/e-mail-paned-view.c b/mail/e-mail-paned-view.c
index 2839c1f44e..e81a7bbbef 100644
--- a/mail/e-mail-paned-view.c
+++ b/mail/e-mail-paned-view.c
@@ -84,7 +84,7 @@ enum {
 #define STATE_KEY_PREVIEW_VISIBLE	"PreviewVisible"
 
 /* Forward Declarations */
-static void e_mail_paned_view_reader_init (EMailReaderIface *iface);
+static void e_mail_paned_view_reader_init (EMailReaderInterface *interface);
 
 G_DEFINE_TYPE_WITH_CODE (
 	EMailPanedView, e_mail_paned_view, E_TYPE_MAIL_VIEW,
@@ -426,7 +426,7 @@ mail_paned_view_set_folder (EMailReader *reader,
 	EShellView *shell_view;
 	EShellWindow *shell_window;
 	EShellSettings *shell_settings;
-	EMailReaderIface *default_iface;
+	EMailReaderInterface *default_interface;
 	GtkWidget *message_list;
 	GKeyFile *key_file;
 	gchar *group_name;
@@ -448,8 +448,8 @@ mail_paned_view_set_folder (EMailReader *reader,
 	message_list_freeze (MESSAGE_LIST (message_list));
 
 	/* Chain up to interface's default set_folder() method. */
-	default_iface = g_type_default_interface_peek (E_TYPE_MAIL_READER);
-	default_iface->set_folder (reader, folder, folder_uri);
+	default_interface = g_type_default_interface_peek (E_TYPE_MAIL_READER);
+	default_interface->set_folder (reader, folder, folder_uri);
 
 	if (folder == NULL)
 		goto exit;
@@ -891,19 +891,19 @@ e_mail_paned_view_class_init (EMailPanedViewClass *class)
 }
 
 static void
-e_mail_paned_view_reader_init (EMailReaderIface *iface)
-{
-	iface->get_action_group = mail_paned_view_get_action_group;
-	iface->get_formatter = mail_paned_view_get_formatter;
-	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_shell_backend = mail_paned_view_get_shell_backend;
-	iface->get_window = mail_paned_view_get_window;
-	iface->set_folder = mail_paned_view_set_folder;
-	iface->show_search_bar = mail_paned_view_show_search_bar;
-	iface->open_selected_mail = mail_paned_view_reader_open_selected_mail;
-	iface->enable_show_folder = mail_paned_view_enable_show_folder;
+e_mail_paned_view_reader_init (EMailReaderInterface *interface)
+{
+	interface->get_action_group = mail_paned_view_get_action_group;
+	interface->get_formatter = mail_paned_view_get_formatter;
+	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_shell_backend = mail_paned_view_get_shell_backend;
+	interface->get_window = mail_paned_view_get_window;
+	interface->set_folder = mail_paned_view_set_folder;
+	interface->show_search_bar = mail_paned_view_show_search_bar;
+	interface->open_selected_mail = mail_paned_view_reader_open_selected_mail;
+	interface->enable_show_folder = mail_paned_view_enable_show_folder;
 }
 
 static void