From 7bb795b299758e6a81536b81c19693f353106105 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 5 Jul 2013 12:34:19 -0400 Subject: 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. --- modules/mail/e-mail-shell-view-private.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'modules/mail/e-mail-shell-view-private.c') 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 @@ -537,21 +537,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) { @@ -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", -- cgit v1.2.3