summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-03-14 17:52:27 +0300
committermonsta <[email protected]>2016-03-14 17:52:27 +0300
commitcb1020ce38edc5d956e981b1c8f092a329b7ade9 (patch)
treeef265e64fb3f964c1fbefb30d862f8b656391417
parent2f29ade5647e819e2ecfaa9a29819a09d1f0785c (diff)
downloadcaja-cb1020ce38edc5d956e981b1c8f092a329b7ade9.tar.bz2
caja-cb1020ce38edc5d956e981b1c8f092a329b7ade9.tar.xz
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. :-/
-rw-r--r--libcaja-private/caja-extensions.c20
1 files changed, 5 insertions, 15 deletions
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);
}