mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2026-03-04 01:40:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Browse source 
Conflicts:
	src/modules/module-stream-restore.c
This commit is contained in:
Tanu Kaskinen 2009-08-30 20:07:31 +03:00
commit 0ad2d55cbe
46 changed files with 720 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulsecore/core-util.c
View file

@ -1877,17 +1877,17 @@ char *pa_make_path_absolute(const char *p) {
static char *get_path(const char *fn, pa_bool_t prependmid, pa_bool_t rt) {
char *rtp;
if (pa_is_path_absolute(fn))
return pa_xstrdup(fn);
rtp = rt ? pa_get_runtime_dir() : pa_get_state_dir();
if (!rtp)
return NULL;
if (fn) {
char *r;
if (pa_is_path_absolute(fn))
return pa_xstrdup(fn);
if (!rtp)
return NULL;
if (prependmid) {
char *mid;