[libpeas] Be more explicit about when a plugin loader is not enabled

[Garrett Regier <gregier src gnome org>]

commit cc66e626301848f0cc6d0fecebd7b705aebd0188
Author: Garrett Regier <garrettregier gmail com>
Date:   Tue Jun 24 11:01:10 2014 -0700

    Be more explicit about when a plugin loader is not enabled
    
    Also silence a warning when we have already warned.

 libpeas/peas-engine.c        |    9 ++++++---
 tests/libpeas/engine.c       |    4 ++--
 tests/libpeas/extension-py.c |    2 --
 3 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/libpeas/peas-engine.c b/libpeas/peas-engine.c
index 608dbfa..0a0be7b 100644
--- a/libpeas/peas-engine.c
+++ b/libpeas/peas-engine.c
@@ -642,7 +642,11 @@ get_plugin_loader (PeasEngine     *engine,
 
   /* The loader has not been enabled. */
   if (loader_info == NULL)
-    return NULL;
+    {
+      g_warning ("The '%s' plugin loader has not been enabled",
+                 info->loader);
+      return NULL;
+    }
 
   /* The loader has already been loaded. */
   if (loader_info->loader != NULL)
@@ -869,8 +873,7 @@ peas_engine_load_plugin_real (PeasEngine     *engine,
 
   if (loader == NULL)
     {
-      g_warning ("Could not find loader '%s' for plugin '%s'",
-                 info->loader, peas_plugin_info_get_module_name (info));
+      /* Already warned */
       g_set_error (&info->error,
                    PEAS_PLUGIN_INFO_ERROR,
                    PEAS_PLUGIN_INFO_ERROR_LOADER_NOT_FOUND,
diff --git a/tests/libpeas/engine.c b/tests/libpeas/engine.c
index 7cbff5f..1663ea7 100644
--- a/tests/libpeas/engine.c
+++ b/tests/libpeas/engine.c
@@ -387,7 +387,6 @@ test_engine_nonexistent_loader (PeasEngine *engine)
   PeasPluginInfo *info;
 
   testing_util_push_log_hook ("Could not load plugin loader 'does-not-exist'*");
-  testing_util_push_log_hook ("Could not find loader 'does-not-exist' for*");
 
   info = peas_engine_get_plugin_info (engine, "nonexistent-loader");
   peas_engine_enable_loader (engine, "does-not-exist");
@@ -407,7 +406,8 @@ test_engine_disabled_loader (PeasEngine *engine)
   PeasPluginInfo *info;
   GError *error = NULL;
 
-  testing_util_push_log_hook ("Could not find loader 'disabled'*");
+  testing_util_push_log_hook ("The 'disabled' plugin "
+                              "loader has not been enabled*");
 
   info = peas_engine_get_plugin_info (engine, "disabled-loader");
 
diff --git a/tests/libpeas/extension-py.c b/tests/libpeas/extension-py.c
index 4a1a580..b8ad418 100644
--- a/tests/libpeas/extension-py.c
+++ b/tests/libpeas/extension-py.c
@@ -177,8 +177,6 @@ test_extension_py_mixed_python_subprocess (void)
   testing_util_push_log_hook ("*check the installation*");
   testing_util_push_log_hook ("*'" ALT_PY_LOADER_STR
                               "' is not a valid PeasPluginLoader*");
-  testing_util_push_log_hook ("*Could not find loader '"
-                              ALT_PY_LOADER_STR "'*");
 
   /* Required when loading multiple loaders */
   g_setenv ("PEAS_ALLOW_ALL_LOADERS", "1", TRUE);