[gnio] Rename g_socket_get_socket_protocol to g_socket_get_protocol

[Alexander Larsson <alexl src gnome org>]

commit 3678eeeaa0b423d54ec9f86ce8eeb0363a21af39
Author: Alexander Larsson <alexl redhat com>
Date:   Fri May 8 14:30:33 2009 +0200

    Rename g_socket_get_socket_protocol to g_socket_get_protocol
    
    This is more in line with the other ones, we only need get_socket_type
    because get_type is something completely different.
---
 gio/gsocket.c |    6 +++---
 gio/gsocket.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gio/gsocket.c b/gio/gsocket.c
index d15a4a8..2e3e538 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -1150,18 +1150,18 @@ g_socket_get_socket_type (GSocket *socket)
 }
 
 /**
- * g_socket_get_socket_type:
+ * g_socket_get_protocol:
  * @socket: a #GSocket.
  *
  * Gets the socket protocol type name the socket was created with.
  * This can be %NULL if the socket was created with a NULL protocol.
  *
- * Returns: a string, do not free
+ * Returns: a string or %NULL, do not free
  *
  * Since: 2.22
  **/
 const char *
-g_socket_get_socket_protocol (GSocket *socket)
+g_socket_get_protocol (GSocket *socket)
 {
   g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
 
diff --git a/gio/gsocket.h b/gio/gsocket.h
index 26b270e..c39f5b0 100644
--- a/gio/gsocket.h
+++ b/gio/gsocket.h
@@ -153,7 +153,7 @@ GSocket *              g_socket_new_from_fd             (gint
 int                    g_socket_get_fd                  (GSocket                 *socket);
 GSocketFamily          g_socket_get_family              (GSocket                 *socket);
 GSocketType            g_socket_get_socket_type         (GSocket                 *socket);
-const char *           g_socket_get_socket_protocol     (GSocket                 *socket);
+const char *           g_socket_get_protocol            (GSocket                 *socket);
 GSocketAddress *       g_socket_get_local_address       (GSocket                 *socket,
 							 GError                 **error);
 GSocketAddress *       g_socket_get_remote_address      (GSocket                 *socket,