[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 10/21: Show submenus with only one item

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository panel-plugins/xfce4-pulseaudio-plugin.

commit db4e7bfec65f2eb4940c804976f6d6fbe4f5bbba
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Mon Sep 11 21:06:38 2017 -0400

    Show submenus with only one item
---
 panel-plugin/devicemenuitem.c  | 10 +---------
 panel-plugin/pulseaudio-menu.c |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/panel-plugin/devicemenuitem.c b/panel-plugin/devicemenuitem.c
index 10130cf..ea0094d 100644
--- a/panel-plugin/devicemenuitem.c
+++ b/panel-plugin/devicemenuitem.c
@@ -138,15 +138,7 @@ device_menu_item_add_device (DeviceMenuItem *item,
 
   priv->group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (mi));
 
-  if (g_slist_length (priv->group) > 1)
-    {
-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), priv->submenu);
-      gtk_widget_set_sensitive (GTK_WIDGET (item), TRUE);
-    }
-  else
-    {
-      gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
-    }
+  gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), priv->submenu);
 
   gtk_widget_show (mi);
   gtk_menu_shell_append (GTK_MENU_SHELL (priv->submenu), mi);
diff --git a/panel-plugin/pulseaudio-menu.c b/panel-plugin/pulseaudio-menu.c
index e3ba3b9..585dff2 100644
--- a/panel-plugin/pulseaudio-menu.c
+++ b/panel-plugin/pulseaudio-menu.c
@@ -449,7 +449,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
   sources = pulseaudio_volume_get_output_list (menu->volume);
   if (g_list_length (sources) > 0) {
     device_mi = device_menu_item_new_with_label (_("Audio Output"));
-    device_menu_item_set_image_from_icon_name (DEVICE_MENU_ITEM (device_mi), "audio-speakers");
+    device_menu_item_set_image_from_icon_name (DEVICE_MENU_ITEM (device_mi), "audio-headphones");
 
     for (GList *list = sources; list != NULL; list = g_list_next (list)) {
       device_menu_item_add_device (DEVICE_MENU_ITEM (device_mi), (gchar *)list->data, pulseaudio_volume_get_output_by_name (menu->volume, list->data));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.