[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.13-95-g60c2a82

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  d8465f2c4f22629f84c1b70f5b867ae00fd2760c (commit)

- Log -----------------------------------------------------------------
60c2a82... Merge commit 'vudentz/master'
931cbd1... Fix possible invalid read while attempting to load module-bluetooth-device.
-----------------------------------------------------------------------

Summary of changes:
 src/modules/bluetooth/module-bluetooth-discover.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit 931cbd19f269a64dd4d8edfa592ac21500cbd380
Author: Luiz Augusto von Dentz <luiz.dentz at openbossa.org>
Date:   Thu Oct 9 19:31:43 2008 -0300

    Fix possible invalid read while attempting to load module-bluetooth-device.

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index ae54c0a..a831876 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -73,7 +73,7 @@ load-module module-native-protocol-unix
 #load-module module-rtp-send source=rtp.monitor
 
 ### Enable flat volumes where possible
-load-module module-flat-volumes
+load-module module-flat-volume
 
 ### Automatically restore the volume of streams and devices
 load-module module-device-restore
diff --git a/src/modules/bluetooth/module-bluetooth-discover.c b/src/modules/bluetooth/module-bluetooth-discover.c
index a33ca64..79fb7a8 100644
--- a/src/modules/bluetooth/module-bluetooth-discover.c
+++ b/src/modules/bluetooth/module-bluetooth-discover.c
@@ -346,7 +346,7 @@ static void load_module_for_device(struct userdata *u, struct device *d, const c
     pa_m = pa_module_load(u->module->core, "module-bluetooth-device", args);
     pa_xfree(args);
 
-    if (!m) {
+    if (!pa_m) {
         pa_log_debug("Failed to load module for device %s", d->object_path);
         return;
     }

commit 60c2a82462df9429930894c220f168ef1a3fef38
Merge: d8465f2... 931cbd1...
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Oct 13 19:55:11 2008 +0200

    Merge commit 'vudentz/master'


-- 
hooks/post-receive
PulseAudio Sound Server