summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2008-04-07 13:22:22 +0000
committerDan Winship <danw@src.gnome.org>2008-04-07 13:22:22 +0000
commit87f33520b18966fa75d6e47513ce104603afca31 (patch)
tree16b93801b53db3d622d1751d7252833fa701feb0
parentfc42d8acf7fb64c71aae7db3480f4f121eb2baa3 (diff)
downloadlibsoup-87f33520b18966fa75d6e47513ce104603afca31.tar.gz
If pausing a message that was waiting to unpause, cancel the unpause.
* libsoup/soup-message-io.c (soup_message_io_pause): If pausing a message that was waiting to unpause, cancel the unpause. svn path=/trunk/; revision=1128
-rw-r--r--ChangeLog5
-rw-r--r--libsoup/soup-message-io.c5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aef1bac1..15101246 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-07 Dan Winship <danw@gnome.org>
+
+ * libsoup/soup-message-io.c (soup_message_io_pause): If pausing a
+ message that was waiting to unpause, cancel the unpause.
+
2008-04-05 Dan Winship <danw@gnome.org>
* libsoup/soup-dns.c (resolve_address, resolve_name): Don't
diff --git a/libsoup/soup-message-io.c b/libsoup/soup-message-io.c
index fbf398ee..87cc600c 100644
--- a/libsoup/soup-message-io.c
+++ b/libsoup/soup-message-io.c
@@ -920,6 +920,11 @@ soup_message_io_pause (SoupMessage *msg)
g_signal_handler_disconnect (io->sock, io->read_tag);
io->read_tag = 0;
}
+
+ if (io->unpause_source) {
+ g_source_destroy (io->unpause_source);
+ io->unpause_source = NULL;
+ }
}
static gboolean