diff --git a/gnome-applets-2.20.0-mixer-out-of-sync.patch b/gnome-applets-2.20.0-mixer-out-of-sync.patch index 1f4f086..5b6fed7 100644 --- a/gnome-applets-2.20.0-mixer-out-of-sync.patch +++ b/gnome-applets-2.20.0-mixer-out-of-sync.patch @@ -1,6 +1,6 @@ Index: applet.c =================================================================== ---- applet.c (revision 10436) +--- applet.c (revision 10461) +++ applet.c (working copy) @@ -79,7 +79,12 @@ PanelAppletOrient orient); @@ -89,12 +89,17 @@ Index: applet.c if (applet->tracks) { g_list_foreach (applet->tracks, (GFunc) g_object_unref, NULL); -@@ -677,7 +713,7 @@ +@@ -673,11 +709,11 @@ + component = panel_applet_get_popup_component (PANEL_APPLET (applet)); + bonobo_ui_component_set_prop (component, + "/commands/Mute", +- "state", mute ? "1" : "0", NULL); ++ "state", !mute ? "1" : "0", NULL); /* update graphic - this should happen automagically after the next * idle call, but apparently doesn't for some people... */ - gnome_volume_applet_refresh (applet, TRUE); -+ gnome_volume_applet_refresh (applet, TRUE, -1, mute); ++ gnome_volume_applet_refresh (applet, TRUE, -1, !mute); } /* @@ -179,6 +184,8 @@ Index: applet.c - volume = gnome_volume_applet_get_volume (applet->mixer, first_track); - mute = GST_MIXER_TRACK_HAS_FLAG (first_track, - GST_MIXER_TRACK_MUTE); +- if (volume <= 0) { +- mute = TRUE; + + if (volume == -1) { + /* only first track */ @@ -188,8 +195,7 @@ Index: applet.c + mute = GST_MIXER_TRACK_HAS_FLAG (first_track, + GST_MIXER_TRACK_MUTE) ? 1 : 0; + } - if (volume <= 0) { -- mute = TRUE; ++ if (volume <= 0 || mute) { + show_mute = 1; n = 0; } @@ -290,7 +296,7 @@ Index: applet.c /* Index: applet.h =================================================================== ---- applet.h (revision 10436) +--- applet.h (revision 10461) +++ applet.h (working copy) @@ -71,6 +71,7 @@ diff --git a/gnome-applets.spec b/gnome-applets.spec index 7897c48..f741819 100644 --- a/gnome-applets.spec +++ b/gnome-applets.spec @@ -34,7 +34,7 @@ Summary: Small applications for the GNOME panel Name: gnome-applets Version: 2.20.0 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: GPLv2+ and GFDL+ Group: User Interface/Desktops @@ -361,6 +361,9 @@ fi %{_libdir}/libgweather.so %changelog +* Fri Oct 12 2007 - Bastien Nocera - 1:2.20.0-7 +- Update out-of-sync patch to handle mute properly (#320451) + * Thu Sep 27 2007 Matthias Clasen - 1:2.20.0-6 - Fix a memory leak in the mixer preferences