[telepathy-salut/master] rename gibber_unix_transport_wait_credentials to gibber_unix_transport_recv_credentials

[Guillaume Desmottes]

---
 lib/gibber/gibber-unix-transport.c             |   32 ++++++++++++------------
 lib/gibber/gibber-unix-transport.h             |    6 ++--
 lib/gibber/tests/check-gibber-unix-transport.c |    2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/gibber/gibber-unix-transport.c b/lib/gibber/gibber-unix-transport.c
index fdb1f57..2f1fd45 100644
--- a/lib/gibber/gibber-unix-transport.c
+++ b/lib/gibber/gibber-unix-transport.c
@@ -59,8 +59,8 @@ struct _GibberUnixTransportPrivate
 {
   gboolean incoming;
 
-  GibberUnixTransportWaitCredentialsCb wait_creds_cb;
-  gpointer wait_creds_data;
+  GibberUnixTransportRecvCredentialsCb recv_creds_cb;
+  gpointer recv_creds_data;
 
   gboolean dispose_has_run;
 };
@@ -113,8 +113,8 @@ gibber_unix_transport_dispose (GObject *object)
 
   priv->dispose_has_run = TRUE;
 
-  priv->wait_creds_cb = NULL;
-  priv->wait_creds_data = NULL;
+  priv->recv_creds_cb = NULL;
+  priv->recv_creds_data = NULL;
 
   if (G_OBJECT_CLASS (gibber_unix_transport_parent_class)->dispose)
     G_OBJECT_CLASS (gibber_unix_transport_parent_class)->dispose (object);
@@ -261,7 +261,7 @@ gibber_unix_transport_read (GibberFdTransport *transport,
   struct ucred *cred;
   int opt;
 
-  if (priv->wait_creds_cb == NULL)
+  if (priv->recv_creds_cb == NULL)
     return gibber_fd_transport_read (transport, channel, error);
 
   /* We are waiting for credentials */
@@ -289,8 +289,8 @@ gibber_unix_transport_read (GibberFdTransport *transport,
       g_set_error_literal (error, G_IO_CHANNEL_ERROR,
           g_io_channel_error_from_errno (errno), "recvmsg failed");
 
-      priv->wait_creds_cb = NULL;
-      priv->wait_creds_data = NULL;
+      priv->recv_creds_cb = NULL;
+      priv->recv_creds_data = NULL;
       return GIBBER_FD_IO_RESULT_ERROR;
     }
 
@@ -307,7 +307,7 @@ gibber_unix_transport_read (GibberFdTransport *transport,
     {
       DEBUG ("Message doesn't contain credentials");
 
-      priv->wait_creds_cb (self, &buf, NULL, priv->wait_creds_data);
+      priv->recv_creds_cb (self, &buf, NULL, priv->recv_creds_data);
     }
   else
     {
@@ -318,28 +318,28 @@ gibber_unix_transport_read (GibberFdTransport *transport,
       credentials.uid = cred->uid;
       credentials.gid = cred->gid;
 
-      priv->wait_creds_cb (self, &buf, &credentials, priv->wait_creds_data);
+      priv->recv_creds_cb (self, &buf, &credentials, priv->recv_creds_data);
     }
 
-  priv->wait_creds_cb = NULL;
-  priv->wait_creds_data = NULL;
+  priv->recv_creds_cb = NULL;
+  priv->recv_creds_data = NULL;
   return GIBBER_FD_IO_RESULT_SUCCESS;
 }
 
 gboolean
-gibber_unix_transport_wait_credentials (GibberUnixTransport *self,
-    GibberUnixTransportWaitCredentialsCb callback,
+gibber_unix_transport_recv_credentials (GibberUnixTransport *self,
+    GibberUnixTransportRecvCredentialsCb callback,
     gpointer user_data)
 {
   GibberUnixTransportPrivate *priv = GIBBER_UNIX_TRANSPORT_GET_PRIVATE (self);
 
-  if (priv->wait_creds_cb != NULL)
+  if (priv->recv_creds_cb != NULL)
     {
       DEBUG ("already waiting for credentials");
       return FALSE;
     }
 
-  priv->wait_creds_cb = callback;
-  priv->wait_creds_data = user_data;
+  priv->recv_creds_cb = callback;
+  priv->recv_creds_data = user_data;
   return TRUE;
 }
diff --git a/lib/gibber/gibber-unix-transport.h b/lib/gibber/gibber-unix-transport.h
index a44680e..cdd68b9 100644
--- a/lib/gibber/gibber-unix-transport.h
+++ b/lib/gibber/gibber-unix-transport.h
@@ -94,14 +94,14 @@ typedef struct {
     gid_t gid;
 } GibberCredentials;
 
-typedef void (*GibberUnixTransportWaitCredentialsCb) (
+typedef void (*GibberUnixTransportRecvCredentialsCb) (
     GibberUnixTransport *transport,
     GibberBuffer *buffer,
     GibberCredentials *credentials,
     gpointer user_data);
 
-gboolean gibber_unix_transport_wait_credentials (GibberUnixTransport *transport,
-    GibberUnixTransportWaitCredentialsCb callback,
+gboolean gibber_unix_transport_recv_credentials (GibberUnixTransport *transport,
+    GibberUnixTransportRecvCredentialsCb callback,
     gpointer user_data);
 
 G_END_DECLS
diff --git a/lib/gibber/tests/check-gibber-unix-transport.c b/lib/gibber/tests/check-gibber-unix-transport.c
index f3ba4ff..1530730 100644
--- a/lib/gibber/tests/check-gibber-unix-transport.c
+++ b/lib/gibber/tests/check-gibber-unix-transport.c
@@ -163,7 +163,7 @@ receive_new_connection_cb (GibberListener *listener,
                            guint size,
                            GMainLoop *loop)
 {
-  gibber_unix_transport_wait_credentials (unix_transport,
+  gibber_unix_transport_recv_credentials (unix_transport,
       get_credentials_cb, loop);
 
   gibber_unix_transport_send_credentials (GIBBER_UNIX_TRANSPORT (connection),
-- 
1.5.6.5