[gnome-todo] Install plugins to libdir
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-todo] Install plugins to libdir
- Date: Tue, 19 Jan 2016 03:05:28 +0000 (UTC)
commit 6940eb9d228b2fff3fce05650afd073f3c643d26
Author: Patrick Griffis <tingping tingping se>
Date: Mon Jan 18 21:15:21 2016 -0500
Install plugins to libdir
common.am | 2 +-
src/Makefile.am | 1 +
src/plugin/gtd-plugin-manager.c | 27 +++++++++++----------------
3 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/common.am b/common.am
index aeb9a76..5ebff7f 100644
--- a/common.am
+++ b/common.am
@@ -1,4 +1,4 @@
-plugindir = ${pkgdatadir}/plugins
+plugindir = ${pkglibdir}/plugins
GNOME_TODO_PLUGIN_CFLAGS = \
$(GNOME_TODO_CFLAGS) \
diff --git a/src/Makefile.am b/src/Makefile.am
index dcaec6c..3a19fd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ AM_CPPFLAGS = \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
-DPACKAGE_DATA_DIR=\""$(pkgdatadir)"\" \
+ -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" \
-DUI_DATA_DIR=\""$(pkgdatadir)/style"\" \
-I$(srcdir)/provider \
-I$(srcdir)/notification \
diff --git a/src/plugin/gtd-plugin-manager.c b/src/plugin/gtd-plugin-manager.c
index 967c42e..3d6efce 100644
--- a/src/plugin/gtd-plugin-manager.c
+++ b/src/plugin/gtd-plugin-manager.c
@@ -377,30 +377,25 @@ static void
setup_engine (GtdPluginManager *self)
{
PeasEngine *engine;
- const gchar* const *config_dirs;
gchar *plugin_dir;
- gint i;
- config_dirs = g_get_system_data_dirs ();
engine = peas_engine_get_default ();
- for (i = 0; config_dirs[i]; i++)
- {
- plugin_dir = g_build_filename (config_dirs[i],
- "gnome-todo",
- "plugins",
- NULL);
+ /* Let Peas search for plugins in the specified directory */
+ plugin_dir = g_build_filename (PACKAGE_LIB_DIR,
+ "plugins",
+ NULL);
- /* Let Peas search for plugins in the specified directory */
- peas_engine_add_search_path (engine,
- plugin_dir,
- NULL);
+ peas_engine_add_search_path (engine,
+ plugin_dir,
+ NULL);
- g_free (plugin_dir);
- }
+ g_free (plugin_dir);
/* User-installed plugins shall be detected too */
- plugin_dir = g_build_filename (g_get_user_config_dir (),
+ plugin_dir = g_build_filename (g_get_home_dir (),
+ ".local",
+ "lib"
"gnome-todo",
"plugins",
NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]