Merge branch 'master' into dbus-work

Conflicts:
	src/daemon/daemon-conf.c

diff --cc configure.ac
Simple merge

diff --cc src/Makefile.am
index 623cef57a556693e441515b9dc37327859ca7ab5,6544e2aa24d9286032ef86932519444459802687..69711ac1e880bdc67cf8c261364668d105b3a698
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -175,11 -175,10 +175,11 @@@ pulseaudio_SOURCES = 
                daemon/daemon-conf.c daemon/daemon-conf.h \
                daemon/dumpmodules.c daemon/dumpmodules.h \
                daemon/ltdl-bind-now.c daemon/ltdl-bind-now.h \
 -              daemon/main.c
 +              daemon/main.c \
 +              daemon/server-lookup.c daemon/server-lookup.h
  
- pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS)
- pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) $(DBUS_LIBS)
+ pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSPEEX_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(DBUS_CFLAGS)
+ pulseaudio_LDADD = $(AM_LDADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSPEEX_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(DBUS_LIBS)
  # This is needed because automake doesn't properly expand the foreach below
  pulseaudio_DEPENDENCIES = libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la $(PREOPEN_LIBS)
  

diff --cc src/daemon/daemon-conf.c
index 3428f8078ced803264dd4f2a3c528eb5b66f8943,6e7926f834d307b804190002437c889cbe7f00e2..571faae450eee27f73085f3c355706d87e16a558
--- 1/src/daemon/daemon-conf.c
--- 2/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@@ -83,10 -83,7 +83,10 @@@ static const pa_daemon_conf default_con
      .config_file = NULL,
      .use_pid_file = TRUE,
      .system_instance = FALSE,
-     .no_cpu_limit = FALSE,
 +#ifdef HAVE_DBUS
 +    .local_server_type = PA_SERVER_TYPE_UNSET, /* The actual default is _USER, but we have to detect when the user doesn't specify this option. */
 +#endif
+     .no_cpu_limit = TRUE,
      .disable_shm = FALSE,
      .lock_memory = FALSE,
      .default_n_fragments = 4,

diff --cc src/daemon/daemon.conf.in
Simple merge

diff --cc src/daemon/main.c
Simple merge

diff --cc src/modules/module-stream-restore.c
Simple merge

diff --cc src/pulse/proplist.h
Simple merge

diff --cc src/pulsecore/core-util.c
Simple merge

diff --cc src/pulsecore/core-util.h
Simple merge