rpms/gnome-applets/devel gnome-applets-2.20.0-mixer-out-of-sync.patch, 1.2, 1.3 gnome-applets.spec, 1.246, 1.247

Bastien Nocera (hadess) fedora-extras-commits at redhat.com
Fri Oct 12 14:55:39 UTC 2007


Author: hadess

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

Modified Files:
	gnome-applets-2.20.0-mixer-out-of-sync.patch 
	gnome-applets.spec 
Log Message:
* Fri Oct 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-7
- Update out-of-sync patch to handle mute properly (#320451)


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applets-2.20.0-mixer-out-of-sync.patch	25 Sep 2007 11:46:16 -0000	1.2
+++ gnome-applets-2.20.0-mixer-out-of-sync.patch	12 Oct 2007 14:55:35 -0000	1.3
@@ -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 @@
  
    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 @@
 -    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 @@
 +      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.h
 ===================================================================
---- applet.h	(revision 10436)
+--- applet.h	(revision 10461)
 +++ applet.h	(working copy)
 @@ -71,6 +71,7 @@
  


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- gnome-applets.spec	27 Sep 2007 04:54:44 -0000	1.246
+++ gnome-applets.spec	12 Oct 2007 14:55:35 -0000	1.247
@@ -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 @@
 %{_libdir}/libgweather.so
 
 %changelog
+* Fri Oct 12 2007 - Bastien Nocera <bnocera at redhat.com> - 1:2.20.0-7
+- Update out-of-sync patch to handle mute properly (#320451)
+
 * Thu Sep 27 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.20.0-6
 - Fix a memory leak in the mixer preferences
 




More information about the fedora-extras-commits mailing list