rpms/gnome-applets/devel gnome-applets-null-battstat.patch, 1.3, 1.4 gnome-applets.spec, 1.320, 1.321

[Matthias Clasen]

Author: mclasen

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

Modified Files:
	gnome-applets-null-battstat.patch gnome-applets.spec 
Log Message:
fix mixer applet nullification


gnome-applets-null-battstat.patch:

Index: gnome-applets-null-battstat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-null-battstat.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnome-applets-null-battstat.patch	6 Jan 2009 18:22:32 -0000	1.3
+++ gnome-applets-null-battstat.patch	11 Jan 2009 19:24:13 -0000	1.4
@@ -1,6 +1,6 @@
 diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
---- /dev/null	2009-01-06 09:07:59.720027856 -0500
-+++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-06 13:06:52.000000000 -0500
+--- /dev/null	2009-01-11 11:32:02.651110416 -0500
++++ gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in	2009-01-11 11:47:13.000000000 -0500
 @@ -0,0 +1,22 @@
 +<oaf_info>
 +
@@ -26,7 +26,7 @@
 +</oaf_info>
 diff -up gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null gnome-applets-2.25.3/null_applet/Makefile.am
 --- gnome-applets-2.25.3/null_applet/Makefile.am.battstat-null	2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-06 13:08:41.000000000 -0500
++++ gnome-applets-2.25.3/null_applet/Makefile.am	2009-01-11 11:47:13.000000000 -0500
 @@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
  
  null_applet_LDADD = $(GNOME_APPLETS_LIBS)
@@ -46,13 +46,15 @@
  
 diff -up gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null gnome-applets-2.25.3/null_applet/null_applet.c
 --- gnome-applets-2.25.3/null_applet/null_applet.c.battstat-null	2009-01-06 00:30:23.000000000 -0500
-+++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-06 13:09:42.000000000 -0500
-@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
++++ gnome-applets-2.25.3/null_applet/null_applet.c	2009-01-11 11:57:57.000000000 -0500
+@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
  	g_hash_table_insert (hash_table,
  			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
  	g_hash_table_insert (hash_table,
+-			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
 +			"OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
 +	g_hash_table_insert (hash_table,
- 			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
++			     "OAFIID:GNOME_MixerApplet", "Volume Control");
  }
  
+ static gboolean already_running;


Index: gnome-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets.spec,v
retrieving revision 1.320
retrieving revision 1.321
diff -u -r1.320 -r1.321
--- gnome-applets.spec	7 Jan 2009 02:46:42 -0000	1.320
+++ gnome-applets.spec	11 Jan 2009 19:24:13 -0000	1.321
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -339,6 +339,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Sun Jan 11 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-3
+- Fix the nullappletification of the mixer applet
+
 * Tue Jan  6 2009 Matthias Clasen <mclasen at redhat.com> - 1:2.25.3-2
 - Update to 2.25.3