From dda82c2e96752df0c0495a631f03b6ea97383e2e Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 25 Jul 2008 22:29:20 +0000
Subject: [PATCH] fix weather not showing up in the clock applet

---
 libgweather.spec       |  8 ++++-
 pending-requests.patch | 81 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 pending-requests.patch

diff --git a/libgweather.spec b/libgweather.spec
index e37cdb9..f1b1702 100644
--- a/libgweather.spec
+++ b/libgweather.spec
@@ -1,6 +1,6 @@
 Name:           libgweather
 Version:        2.23.5
-Release:        1%{?d4st}
+Release:        2%{?d4st}
 Summary:        A library for weather information 
 
 Group:          System Environment/Libraries
@@ -17,6 +17,8 @@ BuildRequires:  gettext
 BuildRequires:  perl(XML::Parser)
 BuildRequires:  intltool
 
+# fixed in upstream svn
+Patch0:  pending-requests.patch
 
 %description
 libgweather is a library to access weather information from online
@@ -39,6 +41,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch -p0 -b .pending-requests
 
 %build
 %configure --disable-static
@@ -102,6 +105,9 @@ fi
 
 
 %changelog
+* Fri Jul 25 2008 Matthias Clasen <mclasen@redhat.com> 2.23.5-2
+- Fix pending request accounting
+
 * Tue Jul 22 2008 Matthias Clasen <mclasen@redhat.com> 2.23.5-1
 - Update to 2.23.5
 
diff --git a/pending-requests.patch b/pending-requests.patch
new file mode 100644
index 0000000..84dbeb7
--- /dev/null
+++ b/pending-requests.patch
@@ -0,0 +1,81 @@
+diff -u libgweather-2.23.5/libgweather/weather-bom.c hacked/libgweather/weather-bom.c
+--- libgweather-2.23.5/libgweather/weather-bom.c	2008-07-22 17:38:29.000000000 -0400
++++ hacked/libgweather/weather-bom.c	2008-07-25 18:19:16.000000000 -0400
+@@ -71,4 +71,6 @@
+     msg = soup_message_new ("GET", url);
+     soup_session_queue_message (info->session, msg, bom_finish, info);
+     g_free (url);
++
++    info->requests_pending++;
+ }
+diff -u libgweather-2.23.5/libgweather/weather.c hacked/libgweather/weather.c
+--- libgweather-2.23.5/libgweather/weather.c	2008-07-22 17:38:29.000000000 -0400
++++ hacked/libgweather/weather.c	2008-07-25 18:19:40.000000000 -0400
+@@ -484,13 +484,10 @@
+ 	info->session = soup_session_async_new ();
+ 
+     metar_start_open (info);
+-    info->requests_pending++;
+     iwin_start_open (info);
+-    info->requests_pending++;
+ 
+     if (prefs->radar) {
+         wx_start_open (info);
+-	info->requests_pending++;
+     }
+ 
+     return info;
+diff -u libgweather-2.23.5/libgweather/weather-iwin.c hacked/libgweather/weather-iwin.c
+--- libgweather-2.23.5/libgweather/weather-iwin.c	2008-07-22 17:38:29.000000000 -0400
++++ hacked/libgweather/weather-iwin.c	2008-07-25 18:20:07.000000000 -0400
+@@ -125,8 +125,10 @@
+         		   state, zone);
+     g_free (zone);
+     g_free (state);
+-
++    
+     msg = soup_message_new ("GET", url);
+     g_free (url);
+     soup_session_queue_message (info->session, msg, iwin_finish, info);
++
++    info->requests_pending++;
+ }
+diff -u libgweather-2.23.5/libgweather/weather-metar.c hacked/libgweather/weather-metar.c
+--- libgweather-2.23.5/libgweather/weather-metar.c	2008-07-22 17:38:29.000000000 -0400
++++ hacked/libgweather/weather-metar.c	2008-07-25 18:20:22.000000000 -0400
+@@ -492,7 +492,7 @@
+     gboolean success = FALSE;
+ 
+     g_return_if_fail (info != NULL);
+-
++   
+     if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) {
+         g_warning (_("Failed to get METAR data: %d %s.\n"),
+ 		   msg->status_code, msg->reason_phrase);
+@@ -540,4 +540,6 @@
+ 	"cccc", loc->code,
+ 	NULL);
+     soup_session_queue_message (info->session, msg, metar_finish, info);
++
++    info->requests_pending++;
+ }
+diff -u libgweather-2.23.5/libgweather/weather-met.c hacked/libgweather/weather-met.c
+--- libgweather-2.23.5/libgweather/weather-met.c	2008-07-22 17:38:29.000000000 -0400
++++ hacked/libgweather/weather-met.c	2008-07-25 18:20:41.000000000 -0400
+@@ -170,4 +170,6 @@
+     msg = soup_message_new ("GET", url);
+     soup_session_queue_message (info->session, msg, met_finish, info);
+     g_free (url);
++   
++    info->requests_pending++;
+ }
+diff -u libgweather-2.23.5/libgweather/weather-wx.c hacked/libgweather/weather-wx.c
+--- libgweather-2.23.5/libgweather/weather-wx.c	2008-07-22 17:38:29.000000000 -0400
++++ hacked/libgweather/weather-wx.c	2008-07-25 18:15:51.000000000 -0400
+@@ -93,4 +93,6 @@
+     soup_message_set_flags (msg, SOUP_MESSAGE_OVERWRITE_CHUNKS);
+     soup_session_queue_message (info->session, msg, wx_finish, info);
+     g_free (url);
++
++    info->requests_pending++;
+ }