[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test5-19-gd259e1b

[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  066e160bbd095afe79fc7ea79fbc88b8746960cc (commit)

- Log -----------------------------------------------------------------
d259e1b Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
1d380c2 daemon: fix leak of script_commands
6fa91a0 udev: tell inotify to actually inform us about ACL changes
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/cmdline.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

commit 6fa91a0078922343eebb98a7d0a63b5047c7a000
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 21 23:24:40 2009 +0200

    udev: tell inotify to actually inform us about ACL changes

diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
index 2fcbe21..1d67c0c 100644
--- a/src/modules/module-udev-detect.c
+++ b/src/modules/module-udev-detect.c
@@ -389,7 +389,7 @@ static int setup_inotify(struct userdata *u) {
     }
 
     dev_snd = pa_sprintf_malloc("%s/snd", udev_get_dev_path(u->udev));
-    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
+    r = inotify_add_watch(u->inotify_fd, dev_snd, IN_ATTRIB|IN_CLOSE_WRITE|IN_DELETE_SELF|IN_MOVE_SELF);
     pa_xfree(dev_snd);
 
     if (r < 0) {

commit 1d380c21f1910b41dbd83488a873f0509795b2b2
Author: Scott Reeves <sreeves at novell.com>
Date:   Fri Aug 21 23:42:09 2009 +0200

    daemon: fix leak of script_commands

diff --git a/src/daemon/cmdline.c b/src/daemon/cmdline.c
index ecb3848..3ebc927 100644
--- a/src/daemon/cmdline.c
+++ b/src/daemon/cmdline.c
@@ -385,7 +385,7 @@ int pa_cmdline_parse(pa_daemon_conf *conf, int argc, char *const argv [], int *d
     pa_xfree(conf->script_commands);
     conf->script_commands = pa_strbuf_tostring_free(buf);
 
-    if (!conf->script_commands) {
+    if (conf->script_commands) {
         pa_xfree(conf->script_commands);
         conf->script_commands = NULL;
     }

commit d259e1bc6e7c7700907a3d717c33faacb88fcea4
Merge: 1d380c2 066e160
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Aug 21 23:43:00 2009 +0200

    Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio


-- 
hooks/post-receive
PulseAudio Sound Server