summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBastien Nocera <hadess@fedoraproject.org>2008-12-19 17:03:01 +0000
committerBastien Nocera <hadess@fedoraproject.org>2008-12-19 17:03:01 +0000
commit54228fd53c0de224e94b5690d8afd39408d64af2 (patch)
tree4ad652212313400a51034779e00e96f33a19184f
parentf34c5ced91b7cf4b1644392969a6ea43a386f010 (diff)
downloadgnome-applets-54228fd53c0de224e94b5690d8afd39408d64af2.tar.gz
gnome-applets-54228fd53c0de224e94b5690d8afd39408d64af2.tar.xz
gnome-applets-54228fd53c0de224e94b5690d8afd39408d64af2.zip
- Fix battstat nullificationgnome-applets-2_25_1-8_fc11
-rw-r--r--gnome-applets-null-battstat.patch11
-rw-r--r--gnome-applets-remove-mixer.patch24
-rw-r--r--gnome-applets.spec5
3 files changed, 26 insertions, 14 deletions
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index 95e4573..09653a8 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -53,3 +53,14 @@ diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battsta
+</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;
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
index efb19bc..cfa7b7d 100644
--- a/gnome-applets-remove-mixer.patch
+++ b/gnome-applets-remove-mixer.patch
@@ -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 @@ Index: po/POTFILES.skip
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;
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 58c2721..198c25b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -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 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Fri Dec 19 2008 - Bastien Nocera <bnocera@redhat.com> - 1:2.25.1-8
+- Fix battstat nullification
+
* Fri Dec 19 2008 - Bastien Nocera <bnocera@redhat.com> - 1:2.25.1-7
- Remove the mixer applet