[totem] grilo: Install totem-grilo.conf in plugin dir

[Bastien Nocera <hadess src gnome org>]

commit cd41ed1981858da9d9c53fd691f189438a3c619a
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Jul 6 16:45:13 2011 +0100

    grilo: Install totem-grilo.conf in plugin dir

 configure.in                    |    4 ----
 src/plugins/grilo/Makefile.am   |    2 +-
 src/plugins/grilo/totem-grilo.c |    5 +----
 3 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/configure.in b/configure.in
index 65faf1c..33d923f 100644
--- a/configure.in
+++ b/configure.in
@@ -40,10 +40,6 @@ PKG_PROG_PKG_CONFIG
 AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
-CONFDIR=`eval echo $sysconfdir`
-AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR", [Directory containing default config])
-AC_SUBST(CONFDIR)
-
 # Requirements
 GLIB_REQS=2.27.92
 GIO_REQS=2.27.92
diff --git a/src/plugins/grilo/Makefile.am b/src/plugins/grilo/Makefile.am
index 3df486a..0efee37 100644
--- a/src/plugins/grilo/Makefile.am
+++ b/src/plugins/grilo/Makefile.am
@@ -9,7 +9,7 @@ uidir = $(plugindir)
 ui_DATA = grilo.ui
 EXTRA_DIST += $(ui_DATA)
 
-confdir = $(CONFDIR)
+confdir = $(plugindir)
 conf_DATA = totem-grilo.conf
 EXTRA_DIST += $(conf_DATA)
 
diff --git a/src/plugins/grilo/totem-grilo.c b/src/plugins/grilo/totem-grilo.c
index 86979ab..a603256 100644
--- a/src/plugins/grilo/totem-grilo.c
+++ b/src/plugins/grilo/totem-grilo.c
@@ -1357,10 +1357,7 @@ setup_config (TotemGriloPlugin *self)
 	GrlPluginRegistry *registry = grl_plugin_registry_get_default ();
 
 	/* Setup system-wide plugins configuration */
-	config_file = g_build_path (G_DIR_SEPARATOR_S,
-	                            CONFDIR,
-	                            TOTEM_GRILO_CONFIG_FILE,
-	                            NULL);
+	config_file = totem_plugin_find_file ("grilo", TOTEM_GRILO_CONFIG_FILE);
 
 	if (g_file_test (config_file, G_FILE_TEST_EXISTS)) {
 		grl_plugin_registry_add_config_from_file (registry, config_file, NULL);