@@ -344,15 +344,42 @@ ethos_manager_lookup_plugin_loader (EthosManager *manager, EthosManagerPrivate *priv; GList *iter; const gchar *loader_name; + gchar *loader_down = NULL, + *name_down = NULL; + EthosPluginLoader *loader = NULL; g_return_val_if_fail (ETHOS_IS_MANAGER (manager), NULL); priv = manager->priv; for (iter = priv->plugin_loaders; iter; iter = iter->next) { + /* To make things a bit more resilient, we will check to see if the developer + * accidentally used Loader=C or Loader=Vala and replace that with NULL to + * indicate we should use the default shared library loader. + */ + loader_name = ethos_plugin_loader_get_name (iter->data); - if (g_strcmp0 (name, loader_name) == 0) - return iter->data; + + if (loader_name) + loader_down = g_ascii_strdown (loader_name, -1); + if (name) + name_down = g_ascii_strdown (name, -1); + + if (g_strcmp0 (name_down, "c") == 0 || g_strcmp0 (name_down, "vala") == 0) { + g_free (name_down); + name_down = NULL; + } + + if (g_strcmp0 (name_down, loader_down) == 0) + loader = iter->data; + + g_free (loader_down); + g_free (name_down); + loader_down = NULL; + name_down = NULL; + + if (loader) + return loader; } return NULL; ethos/ethos-manager.c ebdd716386b7b1d093a374df65c465fa8f5f70c7 Christian Hergert chris@dronelabs.com http://github.com/chergert/ethos/commit/6ac3b682bc845715f12a826b42142983398e6ea1 6ac3b682bc845715f12a826b42142983398e6ea1 2009-06-22T15:00:09-07:00 2009-06-22T15:00:09-07:00 Make plugin loader matching a bit more resilient to developers using Loader=Vala or Loader=C. fe608b0476c836bc4523e35005fa212ad4190933 Christian Hergert chris@dronelabs.com