rpms/gnome-applets/devel gnome-applets-2.16.0.1-mixer-icon-size.patch, 1.1, 1.2 gnome-applets.spec, 1.186, 1.187

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/gnome-applets/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7867

Modified Files:
	gnome-applets-2.16.0.1-mixer-icon-size.patch 
	gnome-applets.spec 
Log Message:
fix muting


gnome-applets-2.16.0.1-mixer-icon-size.patch:
 applet.c |   73 ++++++++++++++++++++++++++++++++++++++-------------------------
 applet.h |    2 -
 2 files changed, 46 insertions(+), 29 deletions(-)

Index: gnome-applets-2.16.0.1-mixer-icon-size.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets-2.16.0.1-mixer-icon-size.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-2.16.0.1-mixer-icon-size.patch	8 Sep 2006 15:50:55 -0000	1.1
+++ gnome-applets-2.16.0.1-mixer-icon-size.patch	14 Oct 2006 05:20:18 -0000	1.2
@@ -1,5 +1,5 @@
---- gnome-applets-2.16.0.1/mixer/applet.c.icon-size	2006-09-08 11:19:20.000000000 -0400
-+++ gnome-applets-2.16.0.1/mixer/applet.c	2006-09-08 11:46:29.000000000 -0400
+--- gnome-applets-2.16.0.1/mixer/applet.c.mixer-icon-size	2006-08-07 08:57:24.000000000 -0400
++++ gnome-applets-2.16.0.1/mixer/applet.c	2006-10-14 01:08:54.000000000 -0400
 @@ -57,6 +57,9 @@
  static void	gnome_volume_applet_init	(GnomeVolumeApplet *applet);
  static void	gnome_volume_applet_dispose	(GObject   *object);
@@ -88,12 +88,12 @@
 -  gnome_volume_applet_refresh (GNOME_VOLUME_APPLET (applet), TRUE);
 +  GnomeVolumeApplet *applet = GNOME_VOLUME_APPLET (widget);
 +  PanelAppletOrient orient;
-+
-+  if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
-+    GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
  
 -  if (PANEL_APPLET_CLASS (parent_class)->change_size)
 -    PANEL_APPLET_CLASS (parent_class)->change_size (applet, size);
++  if (GTK_WIDGET_CLASS (parent_class)->size_allocate)
++    GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
++
 +  orient = panel_applet_get_orient (PANEL_APPLET (applet));
 +  
 +  if (orient == PANEL_APPLET_ORIENT_UP || orient == PANEL_APPLET_ORIENT_DOWN) {
@@ -140,21 +140,8 @@
    }
  
    did_change = (force_refresh || (STATE (volume, mute) != applet->state) ||
-@@ -1081,11 +1098,7 @@
-   applet->force_next_update = FALSE;
- 
-   if (did_change) {
--    if (mute) {
--      pixbuf = applet->pix[0];
--    } else {
--      pixbuf = applet->pix[n];
--    }
-+    pixbuf = applet->pix[n];
- 
-     gtk_image_set_from_pixbuf (applet->image, pixbuf);
-     applet->state = STATE (volume, mute);
---- gnome-applets-2.16.0.1/mixer/applet.h.icon-size	2006-09-08 11:20:48.000000000 -0400
-+++ gnome-applets-2.16.0.1/mixer/applet.h	2006-09-08 11:30:07.000000000 -0400
+--- gnome-applets-2.16.0.1/mixer/applet.h.mixer-icon-size	2006-06-27 10:12:01.000000000 -0400
++++ gnome-applets-2.16.0.1/mixer/applet.h	2006-10-14 01:08:05.000000000 -0400
 @@ -83,8 +83,8 @@
    GtkWidget *prefs;
  


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- gnome-applets.spec	1 Oct 2006 21:16:40 -0000	1.186
+++ gnome-applets.spec	14 Oct 2006 05:20:18 -0000	1.187
@@ -32,7 +32,7 @@
 Summary:        Small applications for the GNOME panel
 Name:     	gnome-applets
 Version: 	2.16.0.1
-Release:  	7%{?dist}
+Release:  	9%{?dist}
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -327,6 +327,9 @@
 %{_libdir}/pkgconfig/gweather.pc
 
 %changelog
+* Sat Oct 14 2006 Matthias Clasen <mclasen at redhat.com> - 1:2.16.0.1-9
+- Fix muting in the mixer applet (#208660)
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 1:2.16.0.1-7
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21