[rhythmbox] shell: load uninstalled plugins before installed plugins

[Jonathan Matthew <jmatthew src gnome org>]

commit 0773baf8cea44ca81c8484007413d339dfea9a2f
Author: Jonathan Matthew <jonathan d14n org>
Date:   Wed Apr 17 08:58:59 2013 +1000

    shell: load uninstalled plugins before installed plugins

 shell/rb-shell.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index 8cce8ab..d7ae629 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -827,6 +827,15 @@ construct_plugins (RBShell *shell)
                                     plugindir);
        g_free (plugindir);
 
+#ifdef USE_UNINSTALLED_DIRS
+       plugindir = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "..", UNINSTALLED_PLUGINS_LOCATION, NULL);
+       rb_debug ("plugin search path: %s", plugindir);
+       peas_engine_add_search_path (shell->priv->plugin_engine,
+                                    plugindir,
+                                    plugindir);
+       g_free (plugindir);
+#endif
+
        plugindir = g_build_filename (LIBDIR, "rhythmbox", "plugins", NULL);
        plugindatadir = g_build_filename (DATADIR, "rhythmbox", "plugins", NULL);
        rb_debug ("plugin search path: %s / %s", plugindir, plugindatadir);
@@ -836,14 +845,6 @@ construct_plugins (RBShell *shell)
        g_free (plugindir);
        g_free (plugindatadir);
 
-#ifdef USE_UNINSTALLED_DIRS
-       plugindir = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "..", UNINSTALLED_PLUGINS_LOCATION, NULL);
-       rb_debug ("plugin search path: %s", plugindir);
-       peas_engine_add_search_path (shell->priv->plugin_engine,
-                                    plugindir,
-                                    plugindir);
-       g_free (plugindir);
-#endif
 
        shell->priv->activatable = peas_extension_set_new (shell->priv->plugin_engine,
                                                           PEAS_TYPE_ACTIVATABLE,