[telepathy-salut/master] rename gibber_transport_get_sockaddr to gibber_transport_get_peeraddr

[Guillaume Desmottes]

---
 lib/gibber/gibber-bytestream-oob.c    |    2 +-
 lib/gibber/gibber-fd-transport.c      |    8 ++++----
 lib/gibber/gibber-oob-file-transfer.c |    4 ++--
 lib/gibber/gibber-transport.c         |    6 +++---
 lib/gibber/gibber-transport.h         |    4 ++--
 src/salut-xmpp-connection-manager.c   |    2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/gibber/gibber-bytestream-oob.c b/lib/gibber/gibber-bytestream-oob.c
index e6a6ba0..5955acc 100644
--- a/lib/gibber/gibber-bytestream-oob.c
+++ b/lib/gibber/gibber-bytestream-oob.c
@@ -268,7 +268,7 @@ connect_to_url (GibberBytestreamOOB *self,
 
   /* FIXME, this is very specific to salut and won't work with a normal xmpp
    * client */
-  if (!gibber_transport_get_sockaddr (
+  if (!gibber_transport_get_peeraddr (
       GIBBER_TRANSPORT (priv->xmpp_connection->transport),
       &addr, &len))
     {
diff --git a/lib/gibber/gibber-fd-transport.c b/lib/gibber/gibber-fd-transport.c
index fdf80b2..a960424 100644
--- a/lib/gibber/gibber-fd-transport.c
+++ b/lib/gibber/gibber-fd-transport.c
@@ -39,7 +39,7 @@ static gboolean gibber_fd_transport_send (GibberTransport *transport,
 
 static void gibber_fd_transport_disconnect (GibberTransport *transport);
 
-static gboolean gibber_fd_transport_get_sockaddr (GibberTransport *transport,
+static gboolean gibber_fd_transport_get_peeraddr (GibberTransport *transport,
     struct sockaddr_storage *addr, socklen_t *len);
 
 static void _do_disconnect (GibberFdTransport *self);
@@ -118,7 +118,7 @@ gibber_fd_transport_class_init (
 
   transport_class->send = gibber_fd_transport_send;
   transport_class->disconnect = gibber_fd_transport_disconnect;
-  transport_class->get_sockaddr = gibber_fd_transport_get_sockaddr;
+  transport_class->get_peeraddr = gibber_fd_transport_get_peeraddr;
   transport_class->buffer_is_empty = gibber_fd_transport_buffer_is_empty;
   transport_class->block_receiving = gibber_fd_transport_block_receiving;
 
@@ -454,7 +454,7 @@ gibber_fd_transport_disconnect (GibberTransport *transport)
 }
 
 static gboolean
-gibber_fd_transport_get_sockaddr (GibberTransport *transport,
+gibber_fd_transport_get_peeraddr (GibberTransport *transport,
     struct sockaddr_storage *addr, socklen_t *len)
 {
   GibberFdTransport *self = GIBBER_FD_TRANSPORT (transport);
@@ -467,7 +467,7 @@ gibber_fd_transport_get_sockaddr (GibberTransport *transport,
 
    *len = sizeof (struct sockaddr_storage);
 
-   return (getpeername (self->fd, (struct sockaddr *)addr, len) == 0);
+   return (getpeername (self->fd, (struct sockaddr *) addr, len) == 0);
 }
 
 static gboolean
diff --git a/lib/gibber/gibber-oob-file-transfer.c b/lib/gibber/gibber-oob-file-transfer.c
index 7b4458e..661331d 100644
--- a/lib/gibber/gibber-oob-file-transfer.c
+++ b/lib/gibber/gibber-oob-file-transfer.c
@@ -446,7 +446,7 @@ create_transfer_offer (GibberOobFileTransfer *self,
       return NULL;
     }
 
-  gibber_transport_get_sockaddr (connection->transport, &name_addr,
+  gibber_transport_get_peeraddr (connection->transport, &name_addr,
       &name_addr_len);
   g_object_unref (connection);
   getnameinfo ((struct sockaddr *) &name_addr, name_addr_len, host_name,
@@ -696,7 +696,7 @@ gibber_oob_file_transfer_offer (GibberFileTransfer *ft)
             return;
           }
 
-        gibber_transport_get_sockaddr (connection->transport, &name_addr,
+        gibber_transport_get_peeraddr (connection->transport, &name_addr,
             &name_addr_len);
         g_object_unref (connection);
 
diff --git a/lib/gibber/gibber-transport.c b/lib/gibber/gibber-transport.c
index 248e629..bb78dc8 100644
--- a/lib/gibber/gibber-transport.c
+++ b/lib/gibber/gibber-transport.c
@@ -246,13 +246,13 @@ gibber_transport_set_handler (GibberTransport *transport,
 }
 
 gboolean
-gibber_transport_get_sockaddr (GibberTransport *transport,
+gibber_transport_get_peeraddr (GibberTransport *transport,
    struct sockaddr_storage *addr, socklen_t *len)
 {
   GibberTransportClass *cls = GIBBER_TRANSPORT_GET_CLASS (transport);
 
-  if (cls->get_sockaddr != NULL)
-    return cls->get_sockaddr (transport, addr, len);
+  if (cls->get_peeraddr != NULL)
+    return cls->get_peeraddr (transport, addr, len);
 
   return FALSE;
 }
diff --git a/lib/gibber/gibber-transport.h b/lib/gibber/gibber-transport.h
index 2455a37..aec1264 100644
--- a/lib/gibber/gibber-transport.h
+++ b/lib/gibber/gibber-transport.h
@@ -52,7 +52,7 @@ struct _GibberTransportClass {
     gboolean (*send) (GibberTransport *transport,
                           const guint8 *data, gsize length, GError **error);
     void (*disconnect) (GibberTransport *transport);
-    gboolean (*get_sockaddr) (GibberTransport *transport,
+    gboolean (*get_peeraddr) (GibberTransport *transport,
         struct sockaddr_storage *addr, socklen_t *len);
     gboolean (*buffer_is_empty) (GibberTransport *transport);
     void (*block_receiving) (GibberTransport *transport, gboolean block);
@@ -110,7 +110,7 @@ void gibber_transport_disconnect (GibberTransport *transport);
 void gibber_transport_set_handler (GibberTransport *transport,
     GibberHandlerFunc func, gpointer user_data);
 
-gboolean gibber_transport_get_sockaddr (GibberTransport *transport,
+gboolean gibber_transport_get_peeraddr (GibberTransport *transport,
     struct sockaddr_storage *addr, socklen_t *len);
 
 gboolean gibber_transport_buffer_is_empty (GibberTransport *transport);
diff --git a/src/salut-xmpp-connection-manager.c b/src/salut-xmpp-connection-manager.c
index 39eb94d..9b45389 100644
--- a/src/salut-xmpp-connection-manager.c
+++ b/src/salut-xmpp-connection-manager.c
@@ -633,7 +633,7 @@ incoming_connection_found_contact (SalutXmppConnectionManager *self,
   g_signal_handlers_disconnect_matched (conn->transport,
      G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, self);
 
-  if (!gibber_transport_get_sockaddr (conn->transport, &addr, &size))
+  if (!gibber_transport_get_peeraddr (conn->transport, &addr, &size))
     {
       DEBUG ("Failed to get address of connection from %s", contact->name);
       ret = FALSE;
-- 
1.5.6.5