call dbus_shutdown() before exiting, to make valgrind output more useful

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1819 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/configure.ac b/configure.ac
index 7c8f3888f5746ab113bf9e03fff9ae9fdd7d99d1..cb68f57b14ce7345409b1aaac04e1f402fe58079 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -769,7 +769,7 @@ if test "x${dbus}" != xno ; then
             LIBS="$LIBS $DBUS_LIBS"
             AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
             LIBS="$saved_LIBS"
-        
+            AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.])
         ],
         [
             HAVE_DBUS=0

diff --git a/src/Makefile.am b/src/Makefile.am
index 52fa4b841c00e9e82bdf86e84939679910debf69..a04a91a87e34a09b3066c2368868adc7c31bb847 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,10 +135,9 @@ pulseaudio_SOURCES = \
                daemon/main.c \
                pulsecore/gccmacro.h
 
-pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS)
+pulseaudio_CFLAGS = $(AM_CFLAGS) $(LIBOIL_CFLAGS) $(LIBSAMPLERATE_CFLAGS) $(LIBSNDFILE_CFLAGS) $(CAP_CFLAGS) $(LIBOIL_CFLAGS) $(DBUS_CFLAGS)
 pulseaudio_CPPFLAGS = $(AM_CPPFLAGS)
-pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) \
-               $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS)
+pulseaudio_LDADD = $(AM_LDADD) libpulsecore.la $(LIBLTDL) $(LIBSAMPLERATE_LIBS) $(LIBSNDFILE_LIBS) $(CAP_LIBS) $(LIBOIL_LIBS) $(DBUS_LIBS)
 # This is needed because automake doesn't properly expand the foreach below
 pulseaudio_DEPENDENCIES = libpulsecore.la $(PREOPEN_LIBS)
 

diff --git a/src/daemon/main.c b/src/daemon/main.c
index 93d4eb6b0a518efcaa91c8e7ad4f4cef07338620..e01bb231318803cd8576fc4a5e99662d8e3c95ac 100644 (file)
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -58,6 +58,10 @@
 #include <tcpd.h>
 #endif
 
+#ifdef HAVE_DBUS
+#include <dbus/dbus.h>
+#endif
+
 #include <pulse/mainloop.h>
 #include <pulse/mainloop-signal.h>
 #include <pulse/timeval.h>
@@ -745,5 +749,9 @@ finish:
 
     libtool_done();
 
+#ifdef HAVE_DBUS
+    dbus_shutdown();
+#endif
+    
     return retval;
 }

diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c
index 9078ec72fc6d3eb86ba9277f9409f19bf2a6187f..ccc658b71bd5c73733e79e2699ff9d6240202cfa 100644 (file)
--- a/src/modules/dbus-util.c
+++ b/src/modules/dbus-util.c
@@ -26,10 +26,10 @@
 #include <config.h>
 #endif
 
-#include <pulsecore/log.h>
-#include <pulsecore/props.h>
 #include <pulse/xmalloc.h>
 #include <pulse/timeval.h>
+#include <pulsecore/log.h>
+#include <pulsecore/props.h>
 
 #include "dbus-util.h"