rpms/gnome-applets/devel gnome-applets-2.20.0-mixer-out-of-sync.patch, 1.1, 1.2 gnome-applets.spec, 1.244, 1.245

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15630

Modified Files:
	gnome-applets-2.20.0-mixer-out-of-sync.patch 
	gnome-applets.spec 
Log Message:
* Tue Sep 25 2007 - Bastien Nocera <bnocera at redhat.com> - 1.2.20.0-5
- Fix possible crasher in the mixer messages when we receive an
  unhandled message (#302881)


gnome-applets-2.20.0-mixer-out-of-sync.patch:

Index: gnome-applets-2.20.0-mixer-out-of-sync.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-2.20.0-mixer-out-of-sync.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.20.0-mixer-out-of-sync.patch	20 Sep 2007 00:02:46 -0000	1.1
+++ gnome-applets-2.20.0-mixer-out-of-sync.patch	25 Sep 2007 11:46:16 -0000	1.2
@@ -212,7 +212,7 @@
      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 @@
 +    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 @@
 +      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 @@
  
    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 @@
              newdevice = TRUE;
            }
            break;
-@@ -1374,7 +1474,7 @@
+@@ -1374,7 +1477,7 @@
    GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (data);
  
    init_pixbufs (applet);


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- gnome-applets.spec	23 Sep 2007 04:03:01 -0000	1.244
+++ gnome-applets.spec	25 Sep 2007 11:46:16 -0000	1.245
@@ -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 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Tue Sep 25 2007 - Bastien Nocera <bnocera at 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 at infradead.org> - 1.2.20.0-4
 - Build modemlights applet again (#301601)