diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-04-01 20:02:03 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-04-01 20:02:03 +0000 |
| commit | ce764489e358bad6b49418f5c8bc7b25a4b1815e (patch) | |
| tree | bdf7d009702adc91e63d261f7d924d9e5bf94cff /libsoup/soup-message-queue.h | |
| parent | 0d45677b0a20270735e4d18e969a4991a4e67078 (diff) | |
| parent | 6c14af04775a9de4dfa3fa0cc15a7ad0462ef3d9 (diff) | |
| download | libsoup-baserock/morph.tar.gz | |
Merge tag '2.46.0' into baserock/morphbaserock/morph
2.46.0
Diffstat (limited to 'libsoup/soup-message-queue.h')
| -rw-r--r-- | libsoup/soup-message-queue.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libsoup/soup-message-queue.h b/libsoup/soup-message-queue.h index 54c2971f..f86a1296 100644 --- a/libsoup/soup-message-queue.h +++ b/libsoup/soup-message-queue.h @@ -15,7 +15,6 @@ G_BEGIN_DECLS typedef enum { SOUP_MESSAGE_STARTING, - SOUP_MESSAGE_AWAITING_CONNECTION, SOUP_MESSAGE_GOT_CONNECTION, SOUP_MESSAGE_CONNECTING, SOUP_MESSAGE_CONNECTED, @@ -23,6 +22,7 @@ typedef enum { SOUP_MESSAGE_TUNNELED, SOUP_MESSAGE_READY, SOUP_MESSAGE_RUNNING, + SOUP_MESSAGE_CACHED, SOUP_MESSAGE_RESTARTING, SOUP_MESSAGE_FINISHING, SOUP_MESSAGE_FINISHED @@ -38,21 +38,24 @@ struct _SoupMessageQueueItem { GMainContext *async_context; GCancellable *cancellable; - SoupAddress *proxy_addr; - SoupURI *proxy_uri; + GError *error; + SoupConnection *conn; - GSimpleAsyncResult *result; + GTask *task; + GSource *io_source; guint paused : 1; guint new_api : 1; guint io_started : 1; - guint redirection_count : 29; + guint async : 1; + guint resend_count : 28; SoupMessageQueueItemState state; /*< private >*/ guint removed : 1; - guint ref_count : 31; + guint priority : 3; + guint ref_count : 28; SoupMessageQueueItem *prev, *next; SoupMessageQueueItem *related; }; @@ -77,8 +80,6 @@ void soup_message_queue_destroy (SoupMessageQueue *queue void soup_message_queue_item_ref (SoupMessageQueueItem *item); void soup_message_queue_item_unref (SoupMessageQueueItem *item); -void soup_message_queue_item_set_connection (SoupMessageQueueItem *item, - SoupConnection *conn); G_END_DECLS |