[libgdata] core: Expose _gdata_service_actually_send_message() internally

[Philip Withnall <pwithnall src gnome org>]

commit ffde18eaeeb03464ad183cc46c41ed10d03f57a9
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Dec 16 18:05:25 2010 +0000

    core: Expose _gdata_service_actually_send_message() internally
    
    This will allow the GDataUploadStream and GDataDownloadStream message-sending
    code to be rebased on it to fix cancellation races.
    
    Helps: bgo#637036

 gdata/gdata-private.h |    1 +
 gdata/gdata-service.c |   16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)
---
diff --git a/gdata/gdata-private.h b/gdata/gdata-private.h
index f999960..020c3ce 100644
--- a/gdata/gdata-private.h
+++ b/gdata/gdata-private.h
@@ -48,6 +48,7 @@ typedef enum {
 G_GNUC_INTERNAL SoupSession *_gdata_service_get_session (GDataService *self) G_GNUC_PURE;
 G_GNUC_INTERNAL void _gdata_service_set_authenticated (GDataService *self, gboolean authenticated);
 G_GNUC_INTERNAL SoupMessage *_gdata_service_build_message (GDataService *self, const gchar *method, const gchar *uri, const gchar *etag, gboolean etag_if_match);
+G_GNUC_INTERNAL void _gdata_service_actually_send_message (SoupSession *session, SoupMessage *message, GCancellable *cancellable, GError **error);
 G_GNUC_INTERNAL guint _gdata_service_send_message (GDataService *self, SoupMessage *message, GCancellable *cancellable, GError **error);
 G_GNUC_INTERNAL SoupMessage *_gdata_service_query (GDataService *self, const gchar *feed_uri, GDataQuery *query, GCancellable *cancellable,
                                                    GError **error) G_GNUC_WARN_UNUSED_RESULT G_GNUC_MALLOC;
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index 0936403..2410dd8 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -997,8 +997,8 @@ message_request_queued_cb (SoupSession *session, SoupMessage *message, MessageDa
  * has started, we wait until the message has been queued by the session, then cancel the network activity and return as soon as possible.
  *
  * If cancellation has been handled, @error is guaranteed to be set to %G_IO_ERROR_CANCELLED. Otherwise, @error is guaranteed to be unset. */
-static void
-_gdata_service_actually_send_message (GDataService *self, SoupMessage *message, GCancellable *cancellable, GError **error)
+void
+_gdata_service_actually_send_message (SoupSession *session, SoupMessage *message, GCancellable *cancellable, GError **error)
 {
 	MessageData *data;
 	gulong cancel_signal = 0, request_queued_signal = 0;
@@ -1007,11 +1007,11 @@ _gdata_service_actually_send_message (GDataService *self, SoupMessage *message,
 	if (cancellable != NULL) {
 		data = g_slice_new (MessageData);
 		g_static_mutex_init (&(data->mutex));
-		data->session = g_object_ref (self->priv->session);
+		data->session = g_object_ref (session);
 		data->message = g_object_ref (message);
 
 		cancel_signal = g_cancellable_connect (cancellable, (GCallback) message_cancel_cb, data, (GDestroyNotify) message_data_free);
-		request_queued_signal = g_signal_connect (self->priv->session, "request-queued", (GCallback) message_request_queued_cb, data);
+		request_queued_signal = g_signal_connect (session, "request-queued", (GCallback) message_request_queued_cb, data);
 
 		/* We lock this mutex until the message has been queued by the session (i.e. it's unlocked in the request-queued callback), and require
 		 * the mutex to be held to cancel the message. Consequently, if the message is cancelled (in another thread) any time between this lock
@@ -1025,11 +1025,11 @@ _gdata_service_actually_send_message (GDataService *self, SoupMessage *message,
 	/* Only send the message if it hasn't already been cancelled. There is no race condition here for the above reasons: if the cancellable has
 	 * been cancelled, it's because it was cancelled before we called g_cancellable_connect(). */
 	if (cancellable == NULL || g_cancellable_is_cancelled (cancellable) == FALSE)
-		soup_session_send_message (self->priv->session, message);
+		soup_session_send_message (session, message);
 
 	/* Clean up the cancellation code */
 	if (cancellable != NULL)
-		g_signal_handler_disconnect (self->priv->session, request_queued_signal);
+		g_signal_handler_disconnect (session, request_queued_signal);
 
 	if (cancel_signal != 0)
 		g_cancellable_disconnect (cancellable, cancel_signal);
@@ -1052,7 +1052,7 @@ _gdata_service_send_message (GDataService *self, SoupMessage *message, GCancella
 	 */
 
 	soup_message_set_flags (message, SOUP_MESSAGE_NO_REDIRECT);
-	_gdata_service_actually_send_message (self, message, cancellable, error);
+	_gdata_service_actually_send_message (self->priv->session, message, cancellable, error);
 	soup_message_set_flags (message, 0);
 
 	/* Handle redirections specially so we don't lose our custom headers when making the second request */
@@ -1077,7 +1077,7 @@ _gdata_service_send_message (GDataService *self, SoupMessage *message, GCancella
 		soup_uri_free (new_uri);
 
 		/* Send the message again */
-		_gdata_service_actually_send_message (self, message, cancellable, error);
+		_gdata_service_actually_send_message (self->priv->session, message, cancellable, error);
 	}
 
 	return message->status_code;