summaryrefslogtreecommitdiff
path: root/libsoup/soup-session-sync.c
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2012-08-02 12:06:37 -0400
committerDan Winship <danw@gnome.org>2012-08-25 08:44:22 -0400
commit4d3762940fbce8b7db14ae57a97e476fec64840d (patch)
tree8b0fd1101bbece230bb2417cb077d8aaa4772b48 /libsoup/soup-session-sync.c
parent95396a8b447160781f7db8b5ab9bb4bb95fad32b (diff)
downloadlibsoup-4d3762940fbce8b7db14ae57a97e476fec64840d.tar.gz
SoupSession: merge AWAITING_CONNECTION state into STARTING
The only thing STARTING did was move directly into AWAITING_CONNECTION, so there's no need for two separate states.
Diffstat (limited to 'libsoup/soup-session-sync.c')
-rw-r--r--libsoup/soup-session-sync.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/libsoup/soup-session-sync.c b/libsoup/soup-session-sync.c
index 987d55dd..d753f573 100644
--- a/libsoup/soup-session-sync.c
+++ b/libsoup/soup-session-sync.c
@@ -237,16 +237,12 @@ process_queue_item (SoupMessageQueueItem *item)
switch (item->state) {
case SOUP_MESSAGE_STARTING:
- item->state = SOUP_MESSAGE_AWAITING_CONNECTION;
- break;
-
- case SOUP_MESSAGE_AWAITING_CONNECTION:
g_mutex_lock (&priv->lock);
do {
get_connection (item);
- if (item->state == SOUP_MESSAGE_AWAITING_CONNECTION)
+ if (item->state == SOUP_MESSAGE_STARTING)
g_cond_wait (&priv->cond, &priv->lock);
- } while (item->state == SOUP_MESSAGE_AWAITING_CONNECTION);
+ } while (item->state == SOUP_MESSAGE_STARTING);
g_mutex_unlock (&priv->lock);
break;