status/volume: Include origin in device names

The description alone may not be descriptive enough, so include
the origin (if available) to disambiguate the name.

This is consistent with the Sound Settings panel.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5829

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2502>
This commit is contained in:
Florian Müllner 2022-10-03 18:30:13 +02:00
parent f5c29de580
commit 0ce2bc343b

View File

@ -113,8 +113,11 @@ const StreamSlider = GObject.registerClass({
if (!device)
return;
const item = new PopupMenu.PopupImageMenuItem(
device.get_description(), device.get_gicon());
const {description, origin} = device;
const name = origin
? `${description} ${origin}`
: description;
const item = new PopupMenu.PopupImageMenuItem(name, device.get_gicon());
item.connect('activate', () => this._activateDevice(device));
this._deviceSection.addMenuItem(item);