summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2006-06-19 23:51:58 +0000
committerLennart Poettering <lennart@poettering.net>2006-06-19 23:51:58 +0000
commit3cf16214334b4a1c51e56b0536abd8223d6813dd (patch)
tree6d7933a5ba84c4b2b0a0cc4dd6c0dac16492d7fd /src/daemon
parentfe1dadbadd9f694d533dc2191451d2a020d99c2f (diff)
* more s/pulseaudio/PulseAudio/ replacements
* name the per-user dir ~/.pulse (instead of .pulseaudio), just like /etc/pulse/ git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1039 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
-rw-r--r--src/daemon/daemon-conf.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index fd83f28f..4d458a5c 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -41,7 +41,7 @@
#ifndef DEFAULT_CONFIG_DIR
# ifndef OS_IS_WIN32
-# define DEFAULT_CONFIG_DIR "/etc/pulseaudio"
+# define DEFAULT_CONFIG_DIR "/etc/pulse"
# else
# define DEFAULT_CONFIG_DIR "%POLYP_ROOT%"
# endif
@@ -54,9 +54,9 @@
#endif
#define DEFAULT_SCRIPT_FILE DEFAULT_CONFIG_DIR PATH_SEP "default.pa"
-#define DEFAULT_SCRIPT_FILE_USER ".pulseaudio" PATH_SEP "default.pa"
+#define DEFAULT_SCRIPT_FILE_USER ".pulse" PATH_SEP "default.pa"
#define DEFAULT_CONFIG_FILE DEFAULT_CONFIG_DIR PATH_SEP "daemon.conf"
-#define DEFAULT_CONFIG_FILE_USER ".pulseaudio" PATH_SEP "daemon.conf"
+#define DEFAULT_CONFIG_FILE_USER ".pulse" PATH_SEP "daemon.conf"
#define ENV_SCRIPT_FILE "POLYP_SCRIPT"
#define ENV_CONFIG_FILE "POLYP_CONFIG"