[gnome-keyring/gnome-3-0] prompt: Make sure to run the appropriate	GTK version of prompt tool.
- From: Stefan Walter <stefw src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [gnome-keyring/gnome-3-0] prompt: Make sure to run the appropriate	GTK version of prompt tool.
 
- Date: Tue,  5 Apr 2011 16:10:33 +0000 (UTC)
 
commit a4f19ca990862b67712107b89eb2768b8c1a4a1d
Author: Stef Walter <stefw collabora co uk>
Date:   Tue Apr 5 18:09:33 2011 +0200
    prompt: Make sure to run the appropriate GTK version of prompt tool.
 ui/Makefile.am  |    4 +---
 ui/gku-prompt.c |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/ui/Makefile.am b/ui/Makefile.am
index ded3d50..d4f124f 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -8,10 +8,8 @@ endif
 SUBDIRS = . $(TESTS_DIR)
 
 INCLUDES= \
-	-DPREFIX=\""$(prefix)"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DLIBEXECDIR=\""$(libexecdir)"\" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
+	-DPROMPTEXEC=\""$(libexecdir)/gnome-keyring-prompt GCR_VERSION_SUFFIX@"\" \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(GOBJECT_CFLAGS) \
diff --git a/ui/gku-prompt.c b/ui/gku-prompt.c
index 02acdbf..c852298 100644
--- a/ui/gku-prompt.c
+++ b/ui/gku-prompt.c
@@ -568,7 +568,7 @@ gku_prompt_constructor (GType type, guint n_props, GObjectConstructParam *props)
 	g_return_val_if_fail (self, NULL);
 
 	if (!self->pv->executable)
-		self->pv->executable = g_strdup (LIBEXECDIR "/gnome-keyring-prompt");
+		self->pv->executable = g_strdup (PROMPTEXEC);
 
 	return G_OBJECT (self);
 }
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]