drop old patches

8 files changed, 37 insertions, 456 deletions

diff --git a/.cvsignore b/.cvsignore
index 4d52a77..0c8a5b5 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.25.2.tar.bz2
+gnome-applets-2.25.3.tar.bz2
diff --git a/gnome-applets-2.18.0-node-leak.patch b/gnome-applets-2.18.0-node-leak.patch
deleted file mode 100644
index b13fd70..0000000
--- a/gnome-applets-2.18.0-node-leak.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnome-applets-2.18.0/gswitchit/gswitchit-applet.c.node-leak	2007-04-10 01:40:23.000000000 +0200
-+++ gnome-applets-2.18.0/gswitchit/gswitchit-applet.c	2007-04-10 01:41:27.000000000 +0200
-@@ -502,6 +502,7 @@
- 		bonobo_ui_component_add_verb (popup, verb, (BonoboUIVerbFn)
- 					      GSwitchItAppletCmdSetGroup,
- 					      sia);
-+		bonobo_ui_node_unref (node);
- 		xkl_debug (160,
- 			   "Registered group menu item \'%s\' as \'%s\'\n",
- 			   verb, *currentName);
diff --git a/gnome-applets-libgnomeui.patch b/gnome-applets-libgnomeui.patch
deleted file mode 100644
index e3f48fb..0000000
--- a/gnome-applets-libgnomeui.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -up gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui gnome-applets-2.25.2/mini-commander/src/Makefile.am
---- gnome-applets-2.25.2/mini-commander/src/Makefile.am.libgnomeui	2008-12-22 23:13:10.000000000 -0500
-+++ gnome-applets-2.25.2/mini-commander/src/Makefile.am	2008-12-22 23:13:43.000000000 -0500
-@@ -3,6 +3,7 @@
- INCLUDES = 				\
- 	-I.				\
- 	-I$(srcdir)			\
-+	$(GNOME_LIBS2_CFLAGS)		\
- 	$(GNOME_APPLETS_CFLAGS)		\
- 	$(WARN_CFLAGS)			\
- 	$(GNOME_INCLUDEDIR)
-@@ -34,6 +35,7 @@ mini_commander_applet_SOURCES =			\
- 	mc-default-macros.h
- 
- mini_commander_applet_LDADD =	\
-+	$(GNOME_LIBS2_LIBS)	\
- 	$(GNOME_APPLETS_LIBS)
- 
- mc_install_default_macros_SOURCES =	\
-diff -up gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui gnome-applets-2.25.2/modemlights/Makefile.am
---- gnome-applets-2.25.2/modemlights/Makefile.am.libgnomeui	2008-12-22 23:40:19.000000000 -0500
-+++ gnome-applets-2.25.2/modemlights/Makefile.am	2008-12-22 23:40:49.000000000 -0500
-@@ -2,6 +2,7 @@ SUBDIRS = docs
- 
- INCLUDES = -I. -I$(srcdir) 				\
- 	$(GNOME_APPLETS_CFLAGS)				\
-+	$(GNOME_LIBS2_CFLAGS)				\
- 	-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" 	\
- 	-DVERSION=\""$(VERSION)"\"
- 
-@@ -13,6 +14,7 @@ modemlights_applet2_SOURCES = \
- 	properties.c
- 
- modemlights_applet2_LDADD = \
-+		$(GNOME_LIBS2_LIBS)	\
- 		     $(GNOME_APPLETS_LIBS)
- 
- uidir		= $(datadir)/gnome-2.0/ui
diff --git a/gnome-applets-null-battstat.patch b/gnome-applets-null-battstat.patch
index 09653a8..c018921 100644
--- a/gnome-applets-null-battstat.patch
+++ b/gnome-applets-null-battstat.patch
@@ -1,35 +1,6 @@
-diff -up gnome-applets-2.21.2/null_applet/Makefile.am.battstat gnome-applets-2.21.2/null_applet/Makefile.am
---- gnome-applets-2.21.2/null_applet/Makefile.am.battstat	2007-12-06 22:43:35.000000000 -0500
-+++ gnome-applets-2.21.2/null_applet/Makefile.am	2007-12-06 22:43:43.000000000 -0500
-@@ -9,12 +9,17 @@ null_applet_SOURCES = null_applet.c
- 
- null_applet_LDADD = $(GNOME_APPLETS_LIBS)
- 
-+if !BUILD_BATTSTAT_APPLET
-+battstat_applet=GNOME_BattstatApplet.server.in
-+endif
-+
- serverdir = $(libdir)/bonobo/servers
- server_in_files =				\
- 	GNOME_NullApplet_Factory.server.in	\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
--	GNOME_Panel_WirelessApplet.server.in
-+	GNOME_Panel_WirelessApplet.server.in	\
-+	$(battstat_applet)
- server_DATA = $(server_in_files:.server.in=.server)
- 
- @INTLTOOL_SERVER_RULE@
-@@ -28,4 +33,5 @@ EXTRA_DIST =					\
- 	GNOME_NullApplet_Factory.server.in.in	\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
--	GNOME_Panel_WirelessApplet.server.in
-+	GNOME_Panel_WirelessApplet.server.in	\
-+	GNOME_BattstatApplet.server.in
-diff -up gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in
---- gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in.battstat	2007-12-06 22:44:07.000000000 -0500
-+++ gnome-applets-2.21.2/null_applet/GNOME_BattstatApplet.server.in	2007-12-06 22:43:54.000000000 -0500
+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
 @@ -0,0 +1,22 @@
 +<oaf_info>
 +
@@ -53,14 +24,35 @@ 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");
+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
+@@ -9,12 +9,15 @@ null_applet_SOURCES = null_applet.c
+ 
+ null_applet_LDADD = $(GNOME_APPLETS_LIBS)
+ 
++if !BUILD_BATTSTAT_APPLET
++battstat_applet=GNOME_BattstatApplet.server.in
++endif
++
+ serverdir = $(libdir)/bonobo/servers
+ 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
+ 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-06 13:09:42.000000000 -0500
+@@ -41,6 +41,8 @@ insert_oafiids (GHashTable *hash_table)
  	g_hash_table_insert (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_BattstatApplet", "Battery Charge Monitor");
+ 			     "OAFIID:GNOME_MixerApplet_Factory", "Volume Control");
  }
  
- static gboolean already_running;
diff --git a/gnome-applets-remove-mixer.patch b/gnome-applets-remove-mixer.patch
deleted file mode 100644
index 2a621ae..0000000
--- a/gnome-applets-remove-mixer.patch
+++ /dev/null
@@ -1,222 +0,0 @@
-diff -up gnome-applets-2.25.2/configure.in.mixer-null gnome-applets-2.25.2/configure.in
---- gnome-applets-2.25.2/configure.in.mixer-null	2008-12-20 16:30:09.000000000 -0500
-+++ gnome-applets-2.25.2/configure.in	2008-12-20 16:31:52.000000000 -0500
-@@ -483,69 +483,6 @@ enable_stickynotes="yes"
- AM_CONDITIONAL(BUILD_STICKYNOTES_APPLET, test "x$enable_stickynotes" = "xyes")
- 
- dnl ***************************************************************************
--dnl *** mixer applet specific checks                                        ***
--dnl ***************************************************************************
--
--GST_MAJORMINOR=auto
--AC_ARG_WITH(gstreamer,
--            AC_HELP_STRING([--with-gstreamer],[use gstreamer version for mixer if available]),
--            [case "${withval}" in
--               0.8) GST_MAJORMINOR=0.8 ;;
--               0.10) GST_MAJORMINOR=0.10 ;;
--               *) AC_MSG_ERROR([
--                                *** Bad value ${withval} for --with-gstreamer
--                                *** Please use one of the following:
--                                ***    --with-gstreamer=0.8
--                                ***    --with-gstreamer=0.10
--                              ]);;
--             esac])
--
--GST10_REQS=0.10.2
--GST10_PKGS="gstreamer-0.10 >= $GST10_REQS gstreamer-plugins-base-0.10 >= $GST10_REQS"
--GST8_REQS=0.8.0
--GST8_PKGS="gstreamer-0.8 >= $GST8_REQS gstreamer-interfaces-0.8 >= $GST8_REQS"
--
--if test "x$GST_MAJORMINOR" = "xauto" -o "x$GST_MAJORMINOR=x0.10"; then
--   # try for GStreamer 0.10
--   MIXER_CFLAGS=
--   MIXER_LIBS=
--   PKG_CHECK_MODULES(MIXER, $GST10_PKGS, HAVE_GST_VER=0.10, HAVE_GST_VER=none)
--fi
--
--if test "x$GST_MAJORMINOR x$HAVE_GST_VER" = "xauto xnone" -o "x$GST_MAJORMINOR" = "x0.8" ; then
--   # try for GStreamer 0.8
--   MIXER_CFLAGS=
--   MIXER_LIBS=
--   PKG_CHECK_MODULES(MIXER, $GST8_PKGS, HAVE_GST_VER=0.8, HAVE_GST_VER=none)
--fi
--
--case $HAVE_GST_VER in
--	0.8|0.10)
--		HAVE_GST="yes"
--		AC_MSG_RESULT([    using GStreamer $HAVE_GST_VER backend])
--		;;
--	none)
--		HAVE_GST="no"
--		AC_MSG_RESULT([GStreamer not found])
--		AC_MSG_WARN([GStreamer unavailable, mixer applet will not be build])
--		;;
--	*)
--		AC_MSG_ERROR([Something bad happened when determining GStreamer version, aborting!])
--		;;
--esac
--
--AM_CONDITIONAL(APPLET_MIXER, test "x$HAVE_GST" = "xyes")
--AM_CONDITIONAL(HAVE_GST10, test "x$HAVE_GST_VER" = "x0.10")
--if test "x$HAVE_GST_VER" = "x0.10" ; then
--	AC_DEFINE(HAVE_GST10, 1, [Using Gstreamer 0.10])
--	# these don't seem to come from any pkg-config file
--	MIXER_LIBS="$MIXER_LIBS -lgstinterfaces-0.10 -lgstaudio-0.10"
--fi
--
--AC_SUBST(MIXER_CFLAGS)
--AC_SUBST(MIXER_LIBS)
--
--dnl ***************************************************************************
- dnl *** keyboard accessibility status applet check                          ***
- dnl ***************************************************************************
- 
-@@ -770,8 +707,6 @@ accessx-status/pixmaps/Makefile
- mini-commander/Makefile
- mini-commander/src/Makefile
- mini-commander/help/Makefile
--mixer/Makefile
--mixer/docs/Makefile
- drivemount/Makefile
- drivemount/help/Makefile
- modemlights/Makefile
-@@ -845,7 +780,6 @@ gnome-applets-$VERSION configure summary
- 	 - gweather			$build_libgweather_applets
- 	 - invest-applet		$BUILD_INVEST_APPLET
- 	 - mini-commander		$enable_mini_commander
--	 - mixer			$HAVE_GST
- 	 - modemlights			$BUILD_MODEM_LIGHTS
- 	 - multiload			$build_gtop_applets
- 	 - stickynotes			$enable_stickynotes
-@@ -854,6 +788,5 @@ gnome-applets-$VERSION configure summary
- 	Using DBUS:			$HAVE_DBUS
- 	Using NetworkManager:		$HAVE_NETWORKMANAGER
- 	Using HAL:			$HAVE_HAL
--	Using GStreamer version:	$HAVE_GST_VER
- 	Enabling IPv6:			$have_ipv6
- " >&2
-diff -up gnome-applets-2.25.2/Makefile.am.mixer-null gnome-applets-2.25.2/Makefile.am
---- gnome-applets-2.25.2/Makefile.am.mixer-null	2008-12-20 00:35:19.000000000 -0500
-+++ gnome-applets-2.25.2/Makefile.am	2008-12-20 16:30:09.000000000 -0500
-@@ -11,12 +11,6 @@ if BUILD_LIBGWEATHER_APPLETS
- libgweather_SUBDIRS = $(libgweather_applets)
- endif
- 
--mixer_applets = \
--	mixer
--if APPLET_MIXER
--mixer_SUBDIRS = $(mixer_applets)
--endif
--
- modemlights_applets = \
- 	modemlights
- if APPLET_MODEMLIGHTS
-@@ -56,7 +50,6 @@ always_built_SUBDIRS =  \
- SUBDIRS = \
- 	po			\
- 	$(always_built_SUBDIRS)	\
--	$(mixer_SUBDIRS)	\
- 	$(modemlights_SUBDIRS)	\
- 	$(gtop_SUBDIRS)		\
- 	$(libgweather_SUBDIRS)	\
-@@ -69,7 +62,6 @@ SUBDIRS = \
- 
- DIST_SUBDIRS = \
- 	po		\
--	mixer		\
- 	modemlights	\
- 	drivemount	\
- 	charpick	\
-diff -up gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in
---- gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in.mixer-null	2008-12-20 00:34:05.000000000 -0500
-+++ gnome-applets-2.25.2/null_applet/GNOME_MixerApplet.server.in	2008-12-20 16:30:09.000000000 -0500
-@@ -1,28 +1,15 @@
- <oaf_info>
- 
--<oaf_server iid="OAFIID:GNOME_MixerApplet_Factory"
--	    type="exe"
--	    location="@LIBEXECDIR@/mixer_applet2">
--
--	<oaf_attribute name="repo_ids" type="stringv">
--		<item value="IDL:Bonobo/GenericFactory:1.0"/>
--		<item value="IDL:Bonobo/Unknown:1.0"/>
--	</oaf_attribute>
--	<oaf_attribute name="name" type="string" value="Volume Control Applet Factory"/>
--	<oaf_attribute name="description" type="string" value="Factory for volume control applet"/>
--
--</oaf_server>
--
- <oaf_server iid="OAFIID:GNOME_MixerApplet"
- 	    type="factory" 
--	    location="OAFIID:GNOME_MixerApplet_Factory">
-+	    location="OAFIID:GNOME_NullApplet_Factory">
- 
- 	<oaf_attribute name="repo_ids" type="stringv">
- 		<item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
- 		<item value="IDL:Bonobo/Control:1.0"/>
- 		<item value="IDL:Bonobo/Unknown:1.0"/>
- 	</oaf_attribute>
--	<oaf_attribute name="name" type="string" _value="Volume Control"/>
-+	<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"/>
-diff -up gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null gnome-applets-2.25.2/null_applet/Makefile.am
---- gnome-applets-2.25.2/null_applet/Makefile.am.mixer-null	2008-12-20 16:30:09.000000000 -0500
-+++ gnome-applets-2.25.2/null_applet/Makefile.am	2008-12-20 16:30:09.000000000 -0500
-@@ -19,6 +19,7 @@ server_in_files =				\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
- 	GNOME_Panel_WirelessApplet.server.in	\
-+	GNOME_MixerApplet.server.in		\
- 	$(battstat_applet)
- server_DATA = $(server_in_files:.server.in=.server)
- 
-@@ -34,4 +35,6 @@ EXTRA_DIST =					\
- 	GNOME_CDPlayerApplet.server.in		\
- 	GNOME_MailcheckApplet_Factory.server.in	\
- 	GNOME_Panel_WirelessApplet.server.in	\
--	GNOME_BattstatApplet.server.in
-+	GNOME_BattstatApplet.server.in		\
-+	GNOME_MixerApplet.server.in
-+
-diff -up gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null gnome-applets-2.25.2/null_applet/null_applet.c
---- gnome-applets-2.25.2/null_applet/null_applet.c.mixer-null	2008-12-20 16:30:09.000000000 -0500
-+++ gnome-applets-2.25.2/null_applet/null_applet.c	2008-12-20 16:30:09.000000000 -0500
-@@ -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 -up gnome-applets-2.25.2/po/POTFILES.in.mixer-null gnome-applets-2.25.2/po/POTFILES.in
---- gnome-applets-2.25.2/po/POTFILES.in.mixer-null	2008-12-20 03:22:15.000000000 -0500
-+++ gnome-applets-2.25.2/po/POTFILES.in	2008-12-20 16:30:09.000000000 -0500
-@@ -80,13 +80,6 @@ mini-commander/src/mini-commander-global
- mini-commander/src/mini-commander.schemas.in
- mini-commander/src/mini-commander_applet.c
- mini-commander/src/preferences.c
--mixer/GNOME_MixerApplet.server.in.in
--mixer/GNOME_MixerApplet.xml
--mixer/applet.c
--mixer/dock.c
--mixer/load.c
--mixer/mixer.schemas.in
--mixer/preferences.c
- modemlights/GNOME_ModemLights.server.in.in
- modemlights/GNOME_ModemLights.xml
- modemlights/modem-applet.c
-diff -up gnome-applets-2.25.2/po/POTFILES.skip.mixer-null gnome-applets-2.25.2/po/POTFILES.skip
---- gnome-applets-2.25.2/po/POTFILES.skip.mixer-null	2008-12-20 00:33:44.000000000 -0500
-+++ gnome-applets-2.25.2/po/POTFILES.skip	2008-12-20 16:30:09.000000000 -0500
-@@ -23,7 +23,6 @@ invest-applet/data/Invest_Applet.server.
- invest-applet/data/financialchart.glade
- invest-applet/data/prefs-dialog.glade
- mini-commander/src/mini-commander.glade
--mixer/GNOME_MixerApplet.server.in
- modemlights/GNOME_ModemLights.server.in
- modemlights/modemlights.glade
- multiload/GNOME_MultiLoadApplet_Factory.server.in
diff --git a/gnome-applets.spec b/gnome-applets.spec
index aef639a..e7b575b 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -34,8 +34,8 @@
 
 Summary:        Small applications for the GNOME panel
 Name:		gnome-applets
-Version:	2.25.2
-Release: 	4%{?dist}
+Version:	2.25.3
+Release: 	1%{?dist}
 Epoch:          1
 License:	GPLv2+ and GFDL
 Group:          User Interface/Desktops
@@ -57,11 +57,6 @@ Patch34:        ppp-includes.patch
 
 # do the nullapplet dance for battstat
 Patch40:	gnome-applets-null-battstat.patch
-# and for the mixer applet
-Patch42:	gnome-applets-remove-mixer.patch
-
-# make mini-commander build
-Patch43:	gnome-applets-libgnomeui.patch
 
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
@@ -146,9 +141,6 @@ and more.
 
 %patch31 -p1 -b .fix-find
 %patch40 -p1 -b .battstat-null
-mv mixer/GNOME_MixerApplet.server.in.in null_applet/GNOME_MixerApplet.server.in
-rm -rf mixer/
-%patch42 -p1 -b .mixer-null
 
 # We don't ship gnome-system-tools
 rm -rf modemlights
@@ -157,7 +149,6 @@ tar xjf %{SOURCE2}
 %patch3 -p1 -b .ppp-command
 %patch34 -p1 -b .ppp-includes
 
-%patch43 -p1 -b .libgnomeui
 
 intltoolize --force
 autoreconf
@@ -344,6 +335,9 @@ fi
 %{_datadir}/PolicyKit/policy/org.gnome.cpufreqselector.policy
 
 %changelog
+* Tue Jan  6 2009 Matthias Clasen <mclasen@redhat.com> - 1:2.25.3-1
+- Update to 2.25.3
+
 * Sat Dec 20 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.25.2-4
 - Update to 2.25.2
 
diff --git a/gweather-network.patch b/gweather-network.patch
deleted file mode 100644
index 8e97259..0000000
--- a/gweather-network.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -up gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network gnome-applets-2.23.3/gweather/gweather-applet.c
---- gnome-applets-2.23.3/gweather/gweather-applet.c.gweather-network	2008-06-11 02:34:08.000000000 -0400
-+++ gnome-applets-2.23.3/gweather/gweather-applet.c	2008-07-31 21:58:21.000000000 -0400
-@@ -29,6 +29,10 @@
- #include <libnotify/notification.h>
- #endif
- 
-+#include <dbus/dbus-glib.h>
-+#include <dbus/dbus-glib-lowlevel.h>
-+#include <NetworkManager/NetworkManager.h>
-+
- #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE
- 
- #include "gweather.h"
-@@ -289,6 +293,8 @@ applet_destroy (GtkWidget *widget, GWeat
-     weather_info_abort (gw_applet->gweather_info);
- }
- 
-+static void setup_network_monitor (GWeatherApplet *gw_applet);
-+
- void gweather_applet_create (GWeatherApplet *gw_applet)
- {
-     AtkObject *atk_obj;
-@@ -324,7 +330,7 @@ void gweather_applet_create (GWeatherApp
-     g_signal_connect (GTK_OBJECT(gw_applet->applet), "button_press_event",
-                        GTK_SIGNAL_FUNC(clicked_cb), gw_applet);
-     g_signal_connect (G_OBJECT(gw_applet->applet), "key_press_event",           
--			G_CALLBACK(key_press_cb), gw_applet);                    
-+			G_CALLBACK(key_press_cb), gw_applet);
-                      
-     gtk_widget_set_tooltip_text (GTK_WIDGET(gw_applet->applet), _("GNOME Weather"));
- 
-@@ -354,9 +360,9 @@ void gweather_applet_create (GWeatherApp
- 					  NULL);
-     }
- 	
--    place_widgets(gw_applet);
--  
--	return;
-+    place_widgets(gw_applet);        
-+
-+    setup_network_monitor (gw_applet);     
- }
- 
- gint timeout_cb (gpointer data)
-@@ -521,3 +527,88 @@ void gweather_update (GWeatherApplet *gw
- 						    update_finish, gw_applet);
-     }
- }
-+
-+static void
-+state_notify (DBusPendingCall *pending, gpointer data)
-+{
-+	GWeatherApplet *gw_applet = data;
-+
-+        DBusMessage *msg = dbus_pending_call_steal_reply (pending);
-+
-+        if (!msg)
-+                return;
-+
-+        if (dbus_message_get_type (msg) == DBUS_MESSAGE_TYPE_METHOD_RETURN) {
-+                dbus_uint32_t result;
-+
-+                if (dbus_message_get_args (msg, NULL,
-+                                           DBUS_TYPE_UINT32, &result,
-+                                           DBUS_TYPE_INVALID)) {
-+                        if (result == NM_STATE_CONNECTED) {
-+				gweather_update (gw_applet);
-+                        }
-+                }
-+        }
-+
-+        dbus_message_unref (msg);
-+}
-+
-+static void
-+check_network (DBusConnection *connection, gpointer user_data)
-+{
-+        DBusMessage *message;
-+        DBusPendingCall *reply;
-+
-+        message = dbus_message_new_method_call (NM_DBUS_SERVICE,
-+                                                NM_DBUS_PATH,
-+                                                NM_DBUS_INTERFACE,
-+                                                "state");
-+        if (dbus_connection_send_with_reply (connection, message, &reply, -1)) {
-+                dbus_pending_call_set_notify (reply, state_notify, user_data, NULL);
-+                dbus_pending_call_unref (reply);
-+        }
-+
-+        dbus_message_unref (message);
-+}
-+
-+static DBusHandlerResult
-+filter_func (DBusConnection *connection, DBusMessage *message, void *user_data)
-+{
-+    if (dbus_message_is_signal (message, 
-+				NM_DBUS_INTERFACE, 
-+				"StateChanged")) {
-+	check_network (connection, user_data);
-+
-+        return DBUS_HANDLER_RESULT_HANDLED;
-+    }
-+
-+    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-+}
-+
-+static void
-+setup_network_monitor (GWeatherApplet *gw_applet)
-+{
-+    GError *error;
-+    static DBusGConnection *bus = NULL;
-+    DBusConnection *dbus;
-+
-+    if (bus == NULL) {
-+        error = NULL;
-+        bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-+        if (bus == NULL) {
-+            g_warning ("Couldn't connect to system bus: %s",
-+                       error->message);
-+            g_error_free (error);
-+
-+            return;
-+        }
-+
-+        dbus = dbus_g_connection_get_connection (bus);	
-+        dbus_connection_add_filter (dbus, filter_func, gw_applet, NULL);
-+        dbus_bus_add_match (dbus,
-+                            "type='signal',"
-+                            "interface='" NM_DBUS_INTERFACE_DEVICE "'",
-+                            NULL);
-+    }
-+}	
-+
diff --git a/sources b/sources
index a2ba7aa..31433c3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ee040219c868baca6c75c6525a656a0b  gnome-applets-2.25.2.tar.bz2
-ccd89d3a58076214e2f34216388c9621  gnome-applets-2.9.3.1-modemlights.tar.bz2
+ddd99d0281df4fa4458408e6cdd19cd1  gnome-applets-2.25.3.tar.bz2