Remove gal_view_collection_add_factory().

No longer needed.  Instead, use g_type_ensure() to ensure the necessary
GalView subclasses are registered in the GType system before loading a
GalViewCollection.  Best place to ensure types is from GClassInitFunc.

2 files changed, 4 insertions, 16 deletions

diff --git a/modules/mail/e-mail-shell-view-private.c b/modules/mail/e-mail-shell-view-private.c
index 7bb3043aae..9c0132aa26 100644
--- a/modules/mail/e-mail-shell-view-private.c
+++ b/modules/mail/e-mail-shell-view-private.c
@@ -538,21 +538,6 @@ mail_shell_view_prepare_for_quit_cb (EMailShellView *mail_shell_view,
 }
 
 static void
-mail_shell_view_load_view_collection (EShellViewClass *shell_view_class)
-{
-	GalViewCollection *collection;
-	GalViewFactory *factory;
-
-	collection = shell_view_class->view_collection;
-
-	factory = gal_view_factory_etable_new ();
-	gal_view_collection_add_factory (collection, factory);
-	g_object_unref (factory);
-
-	gal_view_collection_load (collection);
-}
-
-static void
 mail_shell_view_notify_view_id_cb (EMailShellView *mail_shell_view)
 {
 	EMailShellContent *mail_shell_content;
@@ -600,7 +585,7 @@ e_mail_shell_view_private_init (EMailShellView *mail_shell_view,
                                 EShellViewClass *shell_view_class)
 {
 	if (!gal_view_collection_loaded (shell_view_class->view_collection))
-		mail_shell_view_load_view_collection (shell_view_class);
+		gal_view_collection_load (shell_view_class->view_collection);
 
 	g_signal_connect (
 		mail_shell_view, "notify::view-id",
diff --git a/modules/mail/e-mail-shell-view.c b/modules/mail/e-mail-shell-view.c
index a4d5e9987c..b294a5476b 100644
--- a/modules/mail/e-mail-shell-view.c
+++ b/modules/mail/e-mail-shell-view.c
@@ -1082,6 +1082,9 @@ mail_shell_view_class_init (EMailShellViewClass *class,
 	shell_view_class->toggled = mail_shell_view_toggled;
 	shell_view_class->execute_search = mail_shell_view_execute_search;
 	shell_view_class->update_actions = mail_shell_view_update_actions;
+
+	/* Ensure the GalView types we need are registered. */
+	g_type_ensure (GAL_TYPE_VIEW_ETABLE);
 }
 
 static void