diff options
author | Lennart Poettering <lennart@poettering.net> | 2009-03-19 17:46:22 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2009-03-19 17:46:22 +0100 |
commit | 0a1af8eb59cd8c600803ca57a2be29dc927df882 (patch) | |
tree | 7cc0fdefccbe122d8aedcf9b79bf1d246662083b /src | |
parent | 4a983124e1ca76f05050e149d6333ec6b6940886 (diff) | |
parent | 97445955717468507ba70bf40dc944b1f117382e (diff) |
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/module-hal-detect.c | 3 | ||||
-rw-r--r-- | src/pulsecore/sink.c | 2 |
2 files changed, 4 insertions, 1 deletions
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); } } 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) |