[gnome-settings-daemon/gnome-3-8] media-keys: Don't show a label for analog-output ports

[Bastien Nocera <hadess src gnome org>]

commit d635e496ae1c6b28bd53d37d8cb0cca6e7acd563
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 25 10:20:23 2013 +0200

    media-keys: Don't show a label for analog-output ports
    
    Adapted from master
    
    https://bugzilla.gnome.org/show_bug.cgi?id=694989

 plugins/media-keys/gsd-media-keys-manager.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c
index f95184a..5b66ba3 100644
--- a/plugins/media-keys/gsd-media-keys-manager.c
+++ b/plugins/media-keys/gsd-media-keys-manager.c
@@ -1036,7 +1036,9 @@ update_dialog (GsdMediaKeysManager *manager,
         icon = get_icon_name_for_volume (!GVC_IS_MIXER_SINK (stream), muted, vol);
         port = gvc_mixer_stream_get_port (stream);
         if (g_strcmp0 (gvc_mixer_stream_get_form_factor (stream), "internal") != 0 ||
-            (port != NULL && g_strcmp0 (port->port, "analog-output-speaker") != 0)) {
+            (port != NULL &&
+             g_strcmp0 (port->port, "analog-output-speaker") != 0 &&
+             g_strcmp0 (port->port, "analog-output") != 0)) {
                 device = gvc_mixer_control_lookup_device_from_stream (manager->priv->volume, stream);
                 show_osd (manager, icon,
                           gvc_mixer_ui_device_get_description (device), vol);