diff options
| author | stefw <stefw@localhost> | 2009-04-02 03:57:19 +0000 |
|---|---|---|
| committer | stefw <stefw@localhost> | 2009-04-02 03:57:19 +0000 |
| commit | a35af5c7ff4f15713613944b072ed29d4a287baa (patch) | |
| tree | 7b79a7a4657537b1203e8d019db5a4c3d74d1813 | |
| parent | 22630c40c2861a9fed3db07430ee7d7a56c06ab4 (diff) | |
| download | gnome-keyring-a35af5c7ff4f15713613944b072ed29d4a287baa.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | daemon/Makefile.am | 5 | ||||
| -rw-r--r-- | daemon/org.gnome.keyring.service.in | 2 |
4 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,13 @@ 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 shrinking block of secure memory and then expanding again. 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 |