From a35af5c7ff4f15713613944b072ed29d4a287baa Mon Sep 17 00:00:00 2001
From: stefw <stefw@localhost>
Date: Thu, 2 Apr 2009 03:57:19 +0000
Subject: Include the full path to gnome-keyring-daemon in the DBus service
 file.

Fixes problems with autostarting daemon. See bug #576630

svn path=/trunk/; revision=1710
---
 ChangeLog                           | 8 ++++++++
 configure.in                        | 3 +--
 daemon/Makefile.am                  | 5 +++++
 daemon/org.gnome.keyring.service.in | 2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0ae3f85b..ad32765e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-01  Stef Walter  <stef@memberwebs.com>
+
+	* configure.in:
+	* daemon/Makefile.am:
+	* daemon/org.gnome.keyring.service.in: Include the full
+	path to gnome-keyring-daemon in the DBus service file.
+	Fixes problems with autostarting daemon. See bug #576630 
+
 2009-04-01  Stef Walter  <stef@memberwebs.com>
 
 	* egg/egg-secure-memory.c: Fix assertion that occurs when 
diff --git a/configure.in b/configure.in
index f8de7c09..82678217 100644
--- a/configure.in
+++ b/configure.in
@@ -494,7 +494,7 @@ if test "$enable_valgrind" == "run"; then
 	VALGRIND_RUN="$VALGRIND $VALGRIND_ARG "
 
 	AC_DEFINE_UNQUOTED(VALGRIND, "$VALGRIND", [Path to valgrind executable])
-	AC_DEFINE_UNQUOTED(VALGRIND_ARG, "$VALGRIND_ARG", [Path to valgrind executable])
+	AC_DEFINE_UNQUOTED(VALGRIND_ARG, "$VALGRIND_ARG", [Valgrind arguments])
 	
 	enable_valgrind="yes"
 	valgrind_status="run"
@@ -545,7 +545,6 @@ common/Makefile
 common/tests/Makefile
 daemon/Makefile
 daemon/gnome-keyring-daemon.desktop.in
-daemon/org.gnome.keyring.service
 daemon/data/Makefile
 daemon/keyrings/Makefile
 daemon/keyrings/tests/Makefile
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 6cc89100..fae4ad07 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -60,6 +60,11 @@ CLEANFILES = \
 servicedir       = $(DBUS_SERVICES_DIR)
 service_in_files = org.gnome.keyring.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
+service_PATH     = $(VALGRIND_RUN)$(bindir)
+
+# Rule to make the service file with bindir expanded
+$(service_DATA): $(service_in_files) Makefile
+	@sed -e "s|\@PATH\@|$(service_PATH)|" $< > $@
 
 desktop_in_files = gnome-keyring-daemon.desktop.in
 desktopdir       = $(sysconfdir)/xdg/autostart
diff --git a/daemon/org.gnome.keyring.service.in b/daemon/org.gnome.keyring.service.in
index c94c5d39..6633b682 100644
--- a/daemon/org.gnome.keyring.service.in
+++ b/daemon/org.gnome.keyring.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.keyring
-Exec=@VALGRIND_RUN@ gnome-keyring-daemon --foreground --components=keyring
+Exec=@PATH@/gnome-keyring-daemon --foreground --components=keyring
-- 
cgit v1.2.1