[glib/glib-2-28] gsocket: Fix some cases of returning error without setting *error

[Matthias Clasen <matthiasc src gnome org>]

commit a94f498e27eb1dee6f735995f4dc50fb96a22725
Author: Neil Roberts <neil linux intel com>
Date:   Sat May 28 15:13:11 2011 +0100

    gsocket: Fix some cases of returning error without setting *error
    
    g_socket_shutdown and g_socket_close were calling check_socket with a
    NULL error parameter so any errors wouldn't get propagated up.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=651327

 gio/gsocket.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 694d9f8..7821227 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2105,7 +2105,7 @@ g_socket_shutdown (GSocket   *socket,
 
   g_return_val_if_fail (G_IS_SOCKET (socket), TRUE);
 
-  if (!check_socket (socket, NULL))
+  if (!check_socket (socket, error))
     return FALSE;
 
   /* Do nothing? */
@@ -2192,7 +2192,7 @@ g_socket_close (GSocket  *socket,
   if (socket->priv->closed)
     return TRUE; /* Multiple close not an error */
 
-  if (!check_socket (socket, NULL))
+  if (!check_socket (socket, error))
     return FALSE;
 
   while (1)