Updating branch refs/heads/master to edbbd07b6335d55faa1a6349658557fd4e7de26e (commit) from 6d3bb9775bd11e4b064138820a956bfd45ad2f33 (commit)
commit edbbd07b6335d55faa1a6349658557fd4e7de26e Author: Sean Davis <smd.seanda...@gmail.com> Date: Tue Jan 15 15:23:01 2013 -0500 Fix mute toggle (bug 9760) src/parole-player.c | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/src/parole-player.c b/src/parole-player.c index de90e7c..ea108ab 100644 --- a/src/parole-player.c +++ b/src/parole-player.c @@ -2192,6 +2192,7 @@ void parole_player_volume_value_changed_cb (GtkScaleButton *widget, gdouble value, ParolePlayer *player) { parole_player_change_volume (player, value); + if ( value > 0.0 ) g_object_set (G_OBJECT (player->priv->conf), "volume", (gint)(value * 100), NULL); @@ -2215,7 +2216,20 @@ parole_player_volume_down (GtkWidget *widget, ParolePlayer *player) void parole_player_volume_mute (GtkWidget *widget, ParolePlayer *player) { - gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), 0); + gint value; + if (gtk_scale_button_get_value (GTK_SCALE_BUTTON (player->priv->volume)) == 0.0) + { + g_object_get (G_OBJECT (player->priv->conf), + "volume", &value, + NULL); + gtk_menu_item_set_label( GTK_MENU_ITEM(widget), _("Mute") ); + } + else + { + value = 0; + gtk_menu_item_set_label( GTK_MENU_ITEM(widget), _("Unmute") ); + } + gtk_scale_button_set_value (GTK_SCALE_BUTTON (player->priv->volume), (gdouble)(value)/100); } static void _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits