mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gconf: use correct path for gconf-helper tool when running from build tree

Browse source
This commit is contained in:
Lennart Poettering 2009-08-21 22:05:27 +02:00
parent 9abc010c93
commit 14c27c7ade
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/gconf/module-gconf.c
View file

@ -52,9 +52,6 @@ PA_MODULE_LOAD_ONCE(TRUE);
#define MAX_MODULES 10 #define MAX_MODULES 10
#define BUF_MAX 2048 #define BUF_MAX 2048
/* #undef PA_GCONF_HELPER */
/* #define PA_GCONF_HELPER "/home/lennart/projects/pulseaudio/src/gconf-helper" */
struct module_item { struct module_item {
char *name; char *name;
char *args; char *args;
@ -343,7 +340,11 @@ int pa__init(pa_module*m) {
u->io_event = NULL; u->io_event = NULL;
u->buf_fill = 0; u->buf_fill = 0;
if ((u->fd = pa_start_child_for_read(PA_GCONF_HELPER, NULL, &u->pid)) < 0) if ((u->fd = pa_start_child_for_read(
#if defined(__linux__) && !defined(__OPTIMIZE__)
pa_run_from_build_tree() ? PA_BUILDDIR "/.libs/gconf-helper" :
#endif
PA_GCONF_HELPER, NULL, &u->pid)) < 0)
goto fail; goto fail;
u->io_event = m->core->mainloop->io_new( u->io_event = m->core->mainloop->io_new(