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 fa01a57080d264be84d545c1bd19f62ad6866118 Author: Sean Davis <[email protected]> Date: Sat Sep 23 14:51:28 2017 -0400 Remove image from device menu item to reduce clutter --- panel-plugin/devicemenuitem.c | 28 +--------------------------- panel-plugin/devicemenuitem.h | 3 --- panel-plugin/pulseaudio-menu.c | 2 -- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/panel-plugin/devicemenuitem.c b/panel-plugin/devicemenuitem.c index 0f1fea4..b627a2e 100644 --- a/panel-plugin/devicemenuitem.c +++ b/panel-plugin/devicemenuitem.c @@ -32,7 +32,6 @@ struct _DeviceMenuItemPrivate { GtkWidget *submenu; GtkWidget *label; - GtkWidget *image; GSList *group; gchar *title; }; @@ -49,7 +48,7 @@ enum { static guint signals[LAST_SIGNAL] = { 0 }; G_GNUC_BEGIN_IGNORE_DEPRECATIONS -G_DEFINE_TYPE (DeviceMenuItem, device_menu_item, GTK_TYPE_IMAGE_MENU_ITEM) +G_DEFINE_TYPE (DeviceMenuItem, device_menu_item, GTK_TYPE_MENU_ITEM) G_GNUC_END_IGNORE_DEPRECATIONS #define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_DEVICE_MENU_ITEM, DeviceMenuItemPrivate)) @@ -80,13 +79,6 @@ device_menu_item_new_with_label (const gchar *label) priv->title = g_strdup (label); priv->group = NULL; - /* Configure menu item image */ - priv->image = gtk_image_new_from_icon_name ("audio-card", GTK_ICON_SIZE_LARGE_TOOLBAR); -G_GNUC_BEGIN_IGNORE_DEPRECATIONS - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (device_item), priv->image); -G_GNUC_END_IGNORE_DEPRECATIONS - gtk_image_set_pixel_size (GTK_IMAGE (priv->image), 24); - /* Configure menu item label */ gtk_menu_item_set_label (GTK_MENU_ITEM (device_item), priv->title); priv->label = gtk_bin_get_child (GTK_BIN (device_item)); @@ -99,7 +91,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS /* Keep references to the widgets */ g_object_ref (priv->submenu); - g_object_ref (priv->image); g_object_ref (priv->label); return GTK_WIDGET(device_item); @@ -108,21 +99,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS void -device_menu_item_set_image_from_icon_name (DeviceMenuItem *item, - const gchar *icon_name) -{ - DeviceMenuItemPrivate *priv; - - g_return_if_fail (IS_DEVICE_MENU_ITEM (item)); - - priv = GET_PRIVATE (item); - - gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); -} - - - -void device_menu_item_add_device (DeviceMenuItem *item, const gchar *name, const gchar *description) @@ -219,7 +195,6 @@ device_menu_item_init (DeviceMenuItem *item) priv->submenu = NULL; priv->label = NULL; - priv->image = NULL; priv->title = NULL; priv->group = NULL; } @@ -237,7 +212,6 @@ device_menu_item_finalize (GObject *object) g_free (priv->title); g_object_unref (priv->submenu); - g_object_unref (priv->image); g_object_unref (priv->label); (*G_OBJECT_CLASS (device_menu_item_parent_class)->finalize) (object); diff --git a/panel-plugin/devicemenuitem.h b/panel-plugin/devicemenuitem.h index f37dc70..223c96d 100644 --- a/panel-plugin/devicemenuitem.h +++ b/panel-plugin/devicemenuitem.h @@ -55,9 +55,6 @@ GType device_menu_item_get_type (void) G_GNUC_CONST; GtkWidget *device_menu_item_new_with_label (const gchar *label); -void device_menu_item_set_image_from_icon_name (DeviceMenuItem *item, - const gchar *icon_name); - void device_menu_item_add_device (DeviceMenuItem *item, const gchar *name, const gchar *description); diff --git a/panel-plugin/pulseaudio-menu.c b/panel-plugin/pulseaudio-menu.c index 056dbdd..8ae0afc 100644 --- a/panel-plugin/pulseaudio-menu.c +++ b/panel-plugin/pulseaudio-menu.c @@ -444,7 +444,6 @@ 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 (_("Output")); - 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)); @@ -479,7 +478,6 @@ pulseaudio_menu_new (PulseaudioVolume *volume, sources = pulseaudio_volume_get_input_list (menu->volume); if (g_list_length (sources) > 0) { device_mi = device_menu_item_new_with_label (_("Input")); - device_menu_item_set_image_from_icon_name (DEVICE_MENU_ITEM (device_mi), "audio-input-microphone"); 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_input_by_name (menu->volume, list->data)); -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list [email protected] https://mail.xfce.org/mailman/listinfo/xfce4-commits
