From cb1020ce38edc5d956e981b1c8f092a329b7ade9 Mon Sep 17 00:00:00 2001 From: monsta Date: Mon, 14 Mar 2016 17:52:27 +0300 Subject: Revert "add check to prevent extensions from being loaded multiple times" This reverts commit 4b5bcc5c67a070e6f29376213e3da993553d8f2b. It proved to break the actual fix, so reverting it for now. Note that you will see duplicates in the extensions list now, but it's better than non-working Python extensions. :-/ --- libcaja-private/caja-extensions.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'libcaja-private/caja-extensions.c') diff --git a/libcaja-private/caja-extensions.c b/libcaja-private/caja-extensions.c index 78b4af06..7f4791ec 100644 --- a/libcaja-private/caja-extensions.c +++ b/libcaja-private/caja-extensions.c @@ -192,23 +192,13 @@ caja_extensions_get_list (void) void caja_extension_register (gchar *filename, GObject *module) { - gboolean ext_state = TRUE; // new extensions are enabled by default. - gchar *ext_filename; - GList *l; + gboolean state = TRUE; // new extensions are enabled by default. + gchar *extname; - ext_filename = g_strndup (filename, strlen(filename) - 3); - ext_state = caja_extension_get_state (ext_filename); - - /* Do not attempt to register already registered extensions */ - for (l = caja_extensions; l != NULL; l = l->next) - { - Extension *r = l->data; - if (g_ascii_strcasecmp (r->filename, ext_filename) == 0) { - return; - } - } + extname = g_strndup (filename, strlen(filename) - 3); + state = caja_extension_get_state (extname); - Extension *ext = extension_new (ext_filename, ext_state, module); + Extension *ext = extension_new (extname, state, module); caja_extensions = g_list_append (caja_extensions, ext); } -- cgit v1.2.1