From 1a7d652a5c8c875da05c92b83c8bac56b1d274d8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Sep 25 2007 11:46:16 +0000
Subject: - Fix possible crasher in the mixer messages when we receive an unhandled

    message (#302881)

---

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 7cd4c33..1f4f086 100644
--- a/gnome-applets-2.20.0-mixer-out-of-sync.patch
+++ b/gnome-applets-2.20.0-mixer-out-of-sync.patch
@@ -212,7 +212,7 @@ Index: applet.c
      tooltip_str = g_strdup_printf (_("%s: muted"), track_names->str);
    } else {
      /* Translator comment: I'm not all too sure if this makes sense
-@@ -1152,10 +1207,53 @@
+@@ -1152,10 +1207,56 @@
  				"state", mute ? "1" : "0", NULL);
  }
  
@@ -244,7 +244,7 @@ Index: applet.c
 +    gst_mixer_message_parse_mute_toggled (message, &track, &muted);
 +    mute = muted ? 1 : 0;
 +  }
-+  else {
++  else if (type == GST_MIXER_MESSAGE_VOLUME_CHANGED) {
 +    gint n, num_channels, *vols;
 +    volume = 0.0;
 +
@@ -253,6 +253,9 @@ Index: applet.c
 +      volume += vols[n];
 +    volume /= track->num_channels;
 +    volume = 100 * volume / (track->max_volume - track->min_volume);
++  } else
++  {
++    return;
 +  }
 +
 +  if (first_track == track)
@@ -267,7 +270,7 @@ Index: applet.c
  
    return TRUE;
  }
-@@ -1214,6 +1312,8 @@
+@@ -1214,6 +1315,8 @@
              /* save */
              gst_object_replace ((GstObject **) &applet->mixer, item->data);
              gst_element_set_state (old_element, GST_STATE_NULL);
@@ -276,7 +279,7 @@ Index: applet.c
              newdevice = TRUE;
            }
            break;
-@@ -1374,7 +1474,7 @@
+@@ -1374,7 +1477,7 @@
    GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
  
    init_pixbufs (applet);
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 7e34518..723c670 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: 	4%{?dist}
+Release: 	5%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL+
 Group:          User Interface/Desktops
@@ -357,6 +357,10 @@ fi
 %{_libdir}/libgweather.so
 
 %changelog
+* Tue Sep 25 2007 - Bastien Nocera <bnocera@redhat.com> - 1.2.20.0-5
+- Fix possible crasher in the mixer messages when we receive an
+  unhandled message (#302881)
+
 * Sat Sep 22 2007 David Woodhouse <dwmw2@infradead.org> - 1.2.20.0-4
 - Build modemlights applet again (#301601)