From 90f7050236c48d42c4b416748aede29265519f2d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 4 Aug 2011 07:43:31 +0200 Subject: Bug #655507 - Do not unload extensions, keep them preloaded --- e-util/e-extensible.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'e-util') diff --git a/e-util/e-extensible.c b/e-util/e-extensible.c index a7523deb21..6e49e9dba7 100644 --- a/e-util/e-extensible.c +++ b/e-util/e-extensible.c @@ -94,17 +94,19 @@ extensible_load_extension (GType extension_type, extension_class = g_type_class_ref (extension_type); /* Only load extensions that extend the given extensible object. */ - if (!g_type_is_a (extensible_type, extension_class->extensible_type)) - goto exit; - - extension = g_object_new ( - extension_type, "extensible", extensible, NULL); - - extensions = extensible_get_extensions (extensible); - g_ptr_array_add (extensions, extension); - -exit: - g_type_class_unref (extension_class); + if (g_type_is_a (extensible_type, extension_class->extensible_type)) { + extension = g_object_new ( + extension_type, "extensible", extensible, NULL); + + extensions = extensible_get_extensions (extensible); + g_ptr_array_add (extensions, extension); + + g_type_class_unref (extension_class); + } else { + /* keep the class referenced forever, later may anyone need it anyway, + and unref it may mean module unload, which breaks static strings + in GType */ + } } static void -- cgit v1.2.3