[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test5-2-g4ebdee5

[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  47bc3b76fbdbeee915c50b3371899057b7fbbbcf (commit)

- Log -----------------------------------------------------------------
4ebdee5... deduce a proper icon for TV sets
3e8c7ac... Ignore HAL NoSuchProperty errors when looking for capabilities field. Closes rhbz #489394
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-hal-detect.c |    3 ++-
 src/pulsecore/sink.c            |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

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

commit 3e8c7ac65ff1399310725380e988185c62d37ce7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 19 12:38:36 2009 +0100

    Ignore HAL NoSuchProperty errors when looking for capabilities field. Closes rhbz #489394

diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c
index fe60110..9b0d71c 100644
--- a/src/modules/module-hal-detect.c
+++ b/src/modules/module-hal-detect.c
@@ -452,7 +452,8 @@ static void device_added_cb(LibHalContext *context, const char *udi) {
 
 finish:
     if (dbus_error_is_set(&error)) {
-        pa_log_error("D-Bus error while parsing HAL data: %s: %s", error.name, error.message);
+        if (!dbus_error_has_name(&error, "org.freedesktop.Hal.NoSuchProperty"))
+            pa_log_error("D-Bus error while parsing HAL data: %s: %s", error.name, error.message);
         dbus_error_free(&error);
     }
 }

commit 4ebdee5b294e23ba03d7da15a9aa51c704d38490
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Mar 19 12:38:59 2009 +0100

    deduce a proper icon for TV sets

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index ff8700c..c725595 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1921,6 +1921,8 @@ pa_bool_t pa_device_init_icon(pa_proplist *p, pa_bool_t is_sink) {
             t = "phone";
         else if (pa_streq(ff, "portable"))
             t = "multimedia-player";
+        else if (pa_streq(ff, "tv"))
+            t = "video-display";
     }
 
     if (!t)

-- 
hooks/post-receive
PulseAudio Sound Server