diff options
| author | Dan Winship <danw@gnome.org> | 2012-08-02 12:06:37 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2012-08-25 08:44:22 -0400 |
| commit | 4d3762940fbce8b7db14ae57a97e476fec64840d (patch) | |
| tree | 8b0fd1101bbece230bb2417cb077d8aaa4772b48 /libsoup/soup-session-async.c | |
| parent | 95396a8b447160781f7db8b5ab9bb4bb95fad32b (diff) | |
| download | libsoup-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-async.c')
| -rw-r--r-- | libsoup/soup-session-async.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libsoup/soup-session-async.c b/libsoup/soup-session-async.c index 46dac509..dee7d927 100644 --- a/libsoup/soup-session-async.c +++ b/libsoup/soup-session-async.c @@ -176,7 +176,7 @@ tunnel_message_completed (SoupMessage *tunnel_msg, gpointer user_data) if (item->conn) soup_connection_disconnect (item->conn); if (tunnel_msg->status_code == SOUP_STATUS_TRY_AGAIN) { - item->state = SOUP_MESSAGE_AWAITING_CONNECTION; + item->state = SOUP_MESSAGE_STARTING; soup_message_queue_item_set_connection (item, NULL); } else soup_message_set_status (item->msg, tunnel_msg->status_code); @@ -209,7 +209,7 @@ got_connection (SoupConnection *conn, guint status, gpointer user_data) if (status == SOUP_STATUS_TRY_AGAIN) { soup_message_queue_item_set_connection (item, NULL); - item->state = SOUP_MESSAGE_AWAITING_CONNECTION; + item->state = SOUP_MESSAGE_STARTING; } else { soup_session_set_item_status (session, item, status); item->state = SOUP_MESSAGE_FINISHING; @@ -252,10 +252,6 @@ process_queue_item (SoupMessageQueueItem *item, switch (item->state) { case SOUP_MESSAGE_STARTING: - item->state = SOUP_MESSAGE_AWAITING_CONNECTION; - break; - - case SOUP_MESSAGE_AWAITING_CONNECTION: if (!soup_session_get_connection (session, item, should_prune)) return; |