rpms/gnome-applets/devel gnome-applets-no-mixer-icon.patch, NONE, 1.1 gnome-applets.spec, 1.325, 1.326

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/gnome-applets/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14998

Modified Files:
	gnome-applets.spec 
Added Files:
	gnome-applets-no-mixer-icon.patch 
Log Message:
no mixer applet ghosts, please


gnome-applets-no-mixer-icon.patch:

--- NEW FILE gnome-applets-no-mixer-icon.patch ---
diff -up gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in
--- gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in.no-mixer-icon	2009-02-06 14:31:43.000000000 -0500
+++ gnome-applets-2.25.90/null_applet/GNOME_MixerApplet.server.in	2009-02-06 14:32:54.000000000 -0500
@@ -11,7 +11,6 @@
 	</oaf_attribute>
 	<oaf_attribute name="name" type="string" _value="Volume Control (Deprecated)"/>
 	<oaf_attribute name="description" type="string" _value="Adjust the sound volume"/>
-	<oaf_attribute name="panel:icon" type="string" value="multimedia-volume-control"/>
 	<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
         <oaf_attribute name="bugzilla:product" type="string" value="gnome-applets"/>
         <oaf_attribute name="bugzilla:component" type="string" value="mixer"/>


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -r1.325 -r1.326
--- gnome-applets.spec	4 Feb 2009 02:07:48 -0000	1.325
+++ gnome-applets.spec	6 Feb 2009 19:36:36 -0000	1.326
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.90
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -58,6 +58,8 @@
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
+# and keep the mixer hidden away from the add to panel dialog
+Patch41:	gnome-applets-no-mixer-icon.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -142,6 +144,7 @@
 
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
+%patch41 -p1 -b .no-mixer-icon
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -336,6 +339,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Feb  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.90-3
+- Keep the dead mixer applet from haunting the add to panel dialog
+
 * Tue Feb  3 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.90-1
 - Update to 2.25.90