[pulseaudio-commits] r1819 - in /branches/lennart: configure.ac src/Makefile.am src/daemon/main.c src/modules/dbus-util.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Sep 14 23:02:18 2007
New Revision: 1819

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1819&root=pulseaudio&view=rev
Log:
call dbus_shutdown() before exiting, to make valgrind output more useful

Modified:
    branches/lennart/configure.ac
    branches/lennart/src/Makefile.am
    branches/lennart/src/daemon/main.c
    branches/lennart/src/modules/dbus-util.c

Modified: branches/lennart/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/configure.ac?rev=1819&root=pulseaudio&r1=1818&r2=1819&view=diff
==============================================================================
--- branches/lennart/configure.ac (original)
+++ branches/lennart/configure.ac Fri Sep 14 23:02:18 2007
@@ -769,7 +769,7 @@
             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

Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.am?rev=1819&root=pulseaudio&r1=1818&r2=1819&view=diff
==============================================================================
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Fri Sep 14 23:02:18 2007
@@ -135,10 +135,9 @@
 		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)
 

Modified: branches/lennart/src/daemon/main.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/main.c?rev=1819&root=pulseaudio&r1=1818&r2=1819&view=diff
==============================================================================
--- branches/lennart/src/daemon/main.c (original)
+++ branches/lennart/src/daemon/main.c Fri Sep 14 23:02:18 2007
@@ -56,6 +56,10 @@
 #ifdef HAVE_LIBWRAP
 #include <syslog.h>
 #include <tcpd.h>
+#endif
+
+#ifdef HAVE_DBUS
+#include <dbus/dbus.h>
 #endif
 
 #include <pulse/mainloop.h>
@@ -745,5 +749,9 @@
 
     libtool_done();
 
+#ifdef HAVE_DBUS
+    dbus_shutdown();
+#endif
+    
     return retval;
 }

Modified: branches/lennart/src/modules/dbus-util.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/modules/dbus-util.c?rev=1819&root=pulseaudio&r1=1818&r2=1819&view=diff
==============================================================================
--- branches/lennart/src/modules/dbus-util.c (original)
+++ branches/lennart/src/modules/dbus-util.c Fri Sep 14 23:02:18 2007
@@ -26,10 +26,10 @@
 #include <config.h>
 #endif
 
+#include <pulse/xmalloc.h>
+#include <pulse/timeval.h>
 #include <pulsecore/log.h>
 #include <pulsecore/props.h>
-#include <pulse/xmalloc.h>
-#include <pulse/timeval.h>
 
 #include "dbus-util.h"