[rhythmbox] shell: use source dir rather than build dir for uninstalled plugin data
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] shell: use source dir rather than build dir for uninstalled plugin data
- Date: Mon, 13 Jun 2016 22:22:44 +0000 (UTC)
commit 0cdc753995089c52b87f5e48fcdd5285b4253dfc
Author: Jonathan Matthew <jonathan d14n org>
Date: Mon Jun 13 22:09:45 2016 +1000
shell: use source dir rather than build dir for uninstalled plugin data
We currently don't have any plugin data files that are generated as part
of the build, so locating them from the source dir works for now.
Python plugins still don't work in uninstalled builddir != srcdir builds,
however.
shell/rb-shell.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/shell/rb-shell.c b/shell/rb-shell.c
index a9c34f0..4f34aad 100644
--- a/shell/rb-shell.c
+++ b/shell/rb-shell.c
@@ -879,11 +879,13 @@ construct_plugins (RBShell *shell)
#ifdef USE_UNINSTALLED_DIRS
plugindir = g_build_filename (SHARE_UNINSTALLED_BUILDDIR, "..", UNINSTALLED_PLUGINS_LOCATION, NULL);
- rb_debug ("plugin search path: %s", plugindir);
+ plugindatadir = g_build_filename (SHARE_UNINSTALLED_DIR, "..", UNINSTALLED_PLUGINS_LOCATION, NULL);
+ rb_debug ("plugin search path: %s / %s", plugindir, plugindatadir);
peas_engine_add_search_path (shell->priv->plugin_engine,
plugindir,
- plugindir);
+ plugindatadir);
g_free (plugindir);
+ g_free (plugindatadir);
#endif
plugindir = g_build_filename (LIBDIR, "rhythmbox", "plugins", NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]