[gnome-builder] plugins: Load the Ide typelib during startup

[Garrett Regier <gregier src gnome org>]

commit 632f98e977244bd90772edf98ed9f3176c254290
Author: Garrett Regier <garrettregier gmail com>
Date:   Sat Jan 21 20:15:03 2017 -0800

    plugins: Load the Ide typelib during startup
    
    Also cleanup adding search paths to libpeas,
    much of the work being done is already handled
    automatically.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=773021

 libide/application/ide-application-plugins.c |   49 +++++++++++--------------
 1 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/libide/application/ide-application-plugins.c b/libide/application/ide-application-plugins.c
index 510d297..dfcb7fe 100644
--- a/libide/application/ide-application-plugins.c
+++ b/libide/application/ide-application-plugins.c
@@ -81,32 +81,20 @@ ide_application_discover_plugins (IdeApplication *self)
   PeasEngine *engine = peas_engine_get_default ();
   const GList *list;
   gchar *path;
+  g_autoptr(GError) error = NULL;
 
   g_return_if_fail (IDE_IS_APPLICATION (self));
 
-  peas_engine_enable_loader (engine, "python3");
-
   if (g_getenv ("GB_IN_TREE_PLUGINS") != NULL)
     {
-      GDir *dir;
-
-      g_irepository_require_private (g_irepository_get_default (),
-                                     BUILDDIR"/libide",
-                                     "Ide", "1.0", 0, NULL);
-
-      if ((dir = g_dir_open (BUILDDIR"/plugins", 0, NULL)))
-        {
-          const gchar *name;
-
-          while ((name = g_dir_read_name (dir)))
-            {
-              path = g_build_filename (BUILDDIR, "plugins", name, NULL);
-              peas_engine_prepend_search_path (engine, path, path);
-              g_free (path);
-            }
-
-          g_dir_close (dir);
-        }
+      g_irepository_prepend_search_path (BUILDDIR"/contrib/egg");
+      g_irepository_prepend_search_path (BUILDDIR"/contrib/gstyle");
+      g_irepository_prepend_search_path (BUILDDIR"/contrib/jsonrpc-glib");
+      g_irepository_prepend_search_path (BUILDDIR"/contrib/pnl");
+      g_irepository_prepend_search_path (BUILDDIR"/contrib/tmpl");
+      g_irepository_prepend_search_path (BUILDDIR"/libide");
+
+      peas_engine_prepend_search_path (engine, BUILDDIR"/plugins", NULL);
     }
   else
     {
@@ -117,16 +105,23 @@ ide_application_discover_plugins (IdeApplication *self)
                                        PACKAGE_DATADIR"/gnome-builder/plugins");
     }
 
-  peas_engine_prepend_search_path (engine,
-                                   "resource:///org/gnome/builder/plugins",
-                                   "resource:///org/gnome/builder/plugins");
+  g_irepository_require (NULL, "Ide", "1.0", 0, &error);
+  if (error != NULL)
+    {
+      g_warning ("Cannot enable Python 3 plugins: %s", error->message);
+    }
+  else
+    {
+      /* Avoid spamming stderr with Ide import tracebacks */
+      peas_engine_enable_loader (engine, "python3");
+    }
+
+  peas_engine_prepend_search_path (engine, "resource:///org/gnome/builder/plugins", NULL);
 
   path = g_build_filename (g_get_user_data_dir (), "gnome-builder", "plugins", NULL);
-  peas_engine_prepend_search_path (engine, path, path);
+  peas_engine_prepend_search_path (engine, path, NULL);
   g_free (path);
 
-  peas_engine_rescan_plugins (engine);
-
   list = peas_engine_get_plugin_list (engine);
 
   for (; list; list = list->next)