mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Lennart Poettering 2009-03-19 17:46:22 +01:00
commit 0a1af8eb59
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/module-hal-detect.c
View file

@ -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);
}
}

2
src/pulsecore/sink.c
View file

@ -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)