From 4d3762940fbce8b7db14ae57a97e476fec64840d Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 2 Aug 2012 12:06:37 -0400 Subject: 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. --- libsoup/soup-session-sync.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'libsoup/soup-session-sync.c') 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; -- cgit v1.2.1