diff --git a/.cvsignore b/.cvsignore
index a045ad9..1a617b2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.4.tar.bz2
+gnome-applets-2.25.90.tar.bz2
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index a266f52..34cd923 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,6 +1,6 @@
-diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.in
---- /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
+diff -up /dev/null gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in
+--- /dev/null 2009-02-03 19:10:33.912072100 -0500
++++ gnome-applets-2.25.90/null_applet/GNOME_BattstatApplet.server.in 2009-02-03 20:59:23.000000000 -0500
@@ -0,0 +1,22 @@
+
+
@@ -24,29 +24,32 @@ diff -up /dev/null gnome-applets-2.25.3/null_applet/GNOME_BattstatApplet.server.
+
+
+
-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-11 11:47:13.000000000 -0500
-@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
-
- null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+diff -up gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null gnome-applets-2.25.90/null_applet/Makefile.am
+--- gnome-applets-2.25.90/null_applet/Makefile.am.battstat-null 2009-01-26 19:05:02.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/Makefile.am 2009-02-03 21:04:50.000000000 -0500
+@@ -8,6 +8,10 @@ if !BUILD_MIXER_APPLET
+ mixer_server_in = GNOME_MixerApplet.server.in
+ endif
+if !BUILD_BATTSTAT_APPLET
+battstat_applet=GNOME_BattstatApplet.server.in
+endif
+
- serverdir = $(libdir)/bonobo/servers
- server_in_files = \
+ libexec_PROGRAMS = null_applet
+
+ null_applet_SOURCES = null_applet.c
+@@ -19,7 +23,7 @@ server_in_files = \
GNOME_NullApplet_Factory.server.in \
GNOME_CDPlayerApplet.server.in \
GNOME_MailcheckApplet_Factory.server.in \
- GNOME_Panel_WirelessApplet.server.in \
- GNOME_MixerApplet.server.in
++ $(battstat_applet) \
+ $(mixer_server_in)
server_DATA = $(server_in_files:.server.in=.server)
-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-11 11:57:57.000000000 -0500
+diff -up gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null gnome-applets-2.25.90/null_applet/null_applet.c
+--- gnome-applets-2.25.90/null_applet/null_applet.c.battstat-null 2009-01-07 00:22:38.000000000 -0500
++++ gnome-applets-2.25.90/null_applet/null_applet.c 2009-02-03 20:59:23.000000000 -0500
@@ -41,7 +41,9 @@ insert_oafiids (GHashTable *hash_table)
g_hash_table_insert (hash_table,
"OAFIID:GNOME_CDPlayerApplet", "CD Player");
diff --git a/gnome-applets.spec b/gnome-applets.spec
index c5e9ac5..b8366cb 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,7 +34,7 @@
Summary: Small applications for the GNOME panel
Name: gnome-applets
-Version: 2.25.4
+Version: 2.25.90
Release: 2%{?dist}
Epoch: 1
License: GPLv2+ and GFDL
@@ -59,9 +59,6 @@ Patch35: modemlights-libgnome.patch
# do the nullapplet dance for battstat
Patch40: gnome-applets-null-battstat.patch
-# upstream fix
-Patch41: trash-init.patch
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: libgnomeui-devel >= %{libgnomeui_version}
@@ -145,7 +142,6 @@ and more.
%patch31 -p1 -b .fix-find
%patch40 -p1 -b .battstat-null
-%patch41 -p1 -b .trash-init
# We don't ship gnome-system-tools
rm -rf modemlights
@@ -340,6 +336,9 @@ fi
%{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
%changelog
+* Tue Feb 3 2009 Matthias Clasen - 1:2.25.90-1
+- Update to 2.25.90
+
* Wed Jan 21 2009 Matthias Clasen - 1:2.25.4-2
- Fix trash applet not starting up
diff --git a/sources b/sources
index d69c94e..a0e3a14 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-a9e69b2625137950a175d1e1d134f81e gnome-applets-2.25.4.tar.bz2
+6669b857554fc7c1216ad29b828a1a01 gnome-applets-2.25.90.tar.bz2
ccd89d3a58076214e2f34216388c9621 gnome-applets-2.9.3.1-modemlights.tar.bz2
diff --git a/trash-init.patch b/trash-init.patch
deleted file mode 100644
index 5aecce0..0000000
--- a/trash-init.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init gnome-applets-2.25.4/trashapplet/src/trashapplet.c
---- gnome-applets-2.25.4/trashapplet/src/trashapplet.c.trash-init 2009-01-21 10:39:43.000000000 -0500
-+++ gnome-applets-2.25.4/trashapplet/src/trashapplet.c 2009-01-21 10:41:09.000000000 -0500
-@@ -611,6 +611,10 @@ trash_applet_factory (PanelApplet *apple
-
- if (!strcmp (iid, "OAFIID:GNOME_Panel_TrashApplet"))
- {
-+ g_set_application_name (_("Trash Applet"));
-+
-+ gtk_window_set_default_icon_name ("user-trash");
-+
- /* Set up the menu */
- panel_applet_setup_menu_from_file (applet,
- DATADIR,
-@@ -627,13 +631,8 @@ trash_applet_factory (PanelApplet *apple
- return retval;
- }
-
--int
--main (int argc, char *argv [])
--{
-- gtk_window_set_default_icon_name ("user-trash");
-- g_set_application_name (_("Trash Applet"));
--
-- return panel_applet_factory_main
-- ("OAFIID:GNOME_Panel_TrashApplet_Factory", TRASH_TYPE_APPLET,
-- trash_applet_factory, NULL);
--}
-+PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_Panel_TrashApplet_Factory",
-+ TRASH_TYPE_APPLET,
-+ "TrashApplet", "0",
-+ trash_applet_factory,
-+ NULL)