From 3e8c7ac65ff1399310725380e988185c62d37ce7 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Mar 2009 12:38:36 +0100
Subject: Ignore HAL NoSuchProperty errors when looking for capabilities field.
 Closes rhbz #489394

---
 src/modules/module-hal-detect.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c
index fe601100..9b0d71c9 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);
     }
 }
-- 
cgit 


From 4ebdee5b294e23ba03d7da15a9aa51c704d38490 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 19 Mar 2009 12:38:59 +0100
Subject: deduce a proper icon for TV sets

---
 src/pulsecore/sink.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index ff8700c7..c725595f 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)
-- 
cgit