[evolution-patches] probable fix for 41971

[Dan Winship <danw ximian com>]

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libsoup/ChangeLog,v
retrieving revision 1.300
diff -u -r1.300 ChangeLog
--- ChangeLog	28 Apr 2003 18:50:29 -0000	1.300
+++ ChangeLog	28 Apr 2003 19:45:43 -0000
@@ -1,6 +1,9 @@
 2003-04-28  Dan Winship  <danw ximian com>
 
-	* configure.in: 1.99.19 (the all 1s and 9s release)
+	* configure.in: 1.99.20
+
+	* libsoup/soup-transfer.c (soup_transfer_read_error_cb): Make sure
+	we always call UNIGNORE_CANCEL. Might fix #41971
 
 2003-04-25  Dan Winship  <danw ximian com>
 
Index: configure.in
===================================================================
RCS file: /cvs/gnome/libsoup/configure.in,v
retrieving revision 1.82
diff -u -r1.82 configure.in
--- configure.in	28 Apr 2003 18:50:29 -0000	1.82
+++ configure.in	28 Apr 2003 19:45:44 -0000
@@ -4,7 +4,7 @@
 
 AC_INIT(libsoup/soup.h)
 
-AM_INIT_AUTOMAKE(libsoup, 1.99.19)
+AM_INIT_AUTOMAKE(libsoup, 1.99.20)
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 AC_PROG_MAKE_SET
Index: libsoup/soup-transfer.c
===================================================================
RCS file: /cvs/gnome/libsoup/libsoup/soup-transfer.c,v
retrieving revision 1.28
diff -u -r1.28 soup-transfer.c
--- libsoup/soup-transfer.c	24 Apr 2003 17:59:02 -0000	1.28
+++ libsoup/soup-transfer.c	28 Apr 2003 19:45:44 -0000
@@ -196,9 +196,9 @@
 	}
 
 	if (r->error_cb) (*r->error_cb) (body_started, r->user_data);
-	UNIGNORE_CANCEL (r);
 
  CANCELLED:
+	UNIGNORE_CANCEL (r);
 	soup_transfer_read_cancel (GPOINTER_TO_INT (r));
 
 	return FALSE;