From 8520ae3ffa71e2680076fd3fcc1b7350a364ae76 Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Fri, 12 Jun 2015 08:32:11 +0100
Subject: [PATCH] gsocket: Factor out blocking parameter from
 g_socket_send_messages()

This will make future API additions easier. The factored version is
internal for the time being.

https://bugzilla.gnome.org/show_bug.cgi?id=751924
---
 gio/gsocket.c | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gio/gsocket.c b/gio/gsocket.c
index 6856d0e6e..938f6bd7a 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -134,6 +134,15 @@ static gboolean g_socket_initable_init       (GInitable       *initable,
 					      GCancellable    *cancellable,
 					      GError         **error);
 
+static gint
+g_socket_send_messages_with_blocking   (GSocket        *socket,
+                                        GOutputMessage *messages,
+                                        guint           num_messages,
+                                        gint            flags,
+                                        gboolean        blocking,
+                                        GCancellable   *cancellable,
+                                        GError        **error);
+
 enum
 {
   PROP_0,
@@ -4043,6 +4052,20 @@ g_socket_send_messages (GSocket        *socket,
 		        gint            flags,
 		        GCancellable   *cancellable,
 		        GError        **error)
+{
+  return g_socket_send_messages_with_blocking (socket, messages, num_messages,
+                                               flags, socket->priv->blocking,
+                                               cancellable, error);
+}
+
+static gint
+g_socket_send_messages_with_blocking (GSocket        *socket,
+                                      GOutputMessage *messages,
+                                      guint           num_messages,
+                                      gint            flags,
+                                      gboolean        blocking,
+                                      GCancellable   *cancellable,
+                                      GError        **error)
 {
   g_return_val_if_fail (G_IS_SOCKET (socket), -1);
   g_return_val_if_fail (num_messages == 0 || messages != NULL, -1);
@@ -4183,7 +4206,7 @@ g_socket_send_messages (GSocket        *socket,
             if (errsv == EINTR)
               continue;
 
-            if (socket->priv->blocking &&
+            if (blocking &&
                 (errsv == EWOULDBLOCK ||
                  errsv == EAGAIN))
               {