rpms/gnome-applets/devel gnome-applets-null-battstat.patch, 1.1, 1.2 gnome-applets-remove-mixer.patch, 1.2, 1.3 gnome-applets.spec, 1.313, 1.314

[Bastien Nocera]

Author: hadess

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

Modified Files:
	gnome-applets-null-battstat.patch 
	gnome-applets-remove-mixer.patch gnome-applets.spec 
Log Message:
* Fri Dec 19 2008 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.1-8
- Fix battstat 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-applets-null-battstat.patch	7 Dec 2007 04:11:01 -0000	1.1
+++ gnome-applets-null-battstat.patch	19 Dec 2008 17:03:01 -0000	1.2
@@ -53,3 +53,14 @@
 +</oaf_server>
 +
 +</oaf_info>
+--- gnome-applets-2.25.1/null_applet/null_applet.c.old	2008-12-19 16:57:54.000000000 +0000
++++ gnome-applets-2.25.1/null_applet/null_applet.c	2008-12-19 16:58:49.000000000 +0000
+@@ -40,6 +40,8 @@ insert_oafiids (GHashTable *hash_table)
+ 			"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
+ 	g_hash_table_insert (hash_table,
+ 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
++	g_hash_table_insert (hash_table,
++			     "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
+ }
+ 
+ static gboolean already_running;

gnome-applets-remove-mixer.patch:

Index: gnome-applets-remove-mixer.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-applets/devel/gnome-applets-remove-mixer.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-applets-remove-mixer.patch	19 Dec 2008 15:03:30 -0000	1.2
+++ gnome-applets-remove-mixer.patch	19 Dec 2008 17:03:01 -0000	1.3
@@ -1,16 +1,3 @@
-Index: null_applet/null_applet.c
-===================================================================
---- null_applet/null_applet.c	(revision 11160)
-+++ null_applet/null_applet.c	(working copy)
-@@ -40,6 +40,8 @@
- 			"OAFIID:GNOME_MailcheckApplet", "Inbox Monitor");
- 	g_hash_table_insert (hash_table,
- 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
-+	g_hash_table_insert (hash_table,
-+			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
- }
- 
- static gboolean already_running;
 Index: null_applet/GNOME_MixerApplet.server.in
 ===================================================================
 --- null_applet/GNOME_MixerApplet.server.in	(revision 11160)
@@ -228,3 +215,14 @@
  modemlights/GNOME_ModemLights.server.in
  modemlights/modemlights.glade
  multiload/GNOME_MultiLoadApplet_Factory.server.in
+--- null_applet/null_applet.c.mixer-null	2008-12-19 16:59:48.000000000 +0000
++++ null_applet/null_applet.c	2008-12-19 17:00:26.000000000 +0000
+@@ -42,6 +42,8 @@ insert_oafiids (GHashTable *hash_table)
+ 			"OAFIID:GNOME_CDPlayerApplet", "CD Player");
+ 	g_hash_table_insert (hash_table,
+ 			     "OAFIID:GNOME_BattstatApplet", "Battery Charge Monitor");
++	g_hash_table_insert (hash_table,
++			     "OAFIID:GNOME_MixerApplet_Factory", "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.313
retrieving revision 1.314
diff -u -r1.313 -r1.314
--- gnome-applets.spec	19 Dec 2008 14:53:21 -0000	1.313
+++ gnome-applets.spec	19 Dec 2008 17:03:01 -0000	1.314
@@ -35,7 +35,7 @@
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
 Version:	2.25.1
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -351,6 +351,9 @@
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Fri Dec 19 2008 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.1-8
+- Fix battstat nullification
+
 * Fri Dec 19 2008 - Bastien Nocera <bnocera at redhat.com> - 1:2.25.1-7
 - Remove the mixer applet