[Telepathy-commits] [telepathy-salut/master] Coding style: tubes_muc_message_received, tubes_message_received and tubes_message_close_received prefixed with salut_tubes_channel

[Alban Crequy]

---
 src/salut-muc-channel.c   |    2 +-
 src/salut-tubes-channel.c |   28 ++++++++++++++--------------
 src/salut-tubes-channel.h |    6 +++---
 src/salut-tubes-manager.c |    7 ++++---
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/salut-muc-channel.c b/src/salut-muc-channel.c
index a2644ec..bd798ea 100644
--- a/src/salut-muc-channel.c
+++ b/src/salut-muc-channel.c
@@ -1152,7 +1152,7 @@ salut_muc_channel_received_stanza (GibberMucConnection *conn,
           priv->handle, from_handle);
       g_assert (tubes_chan != NULL);
 
-      tubes_muc_message_received (tubes_chan, sender, stanza);
+      salut_tubes_channel_muc_message_received (tubes_chan, sender, stanza);
 
       g_object_unref (tubes_chan);
     }
diff --git a/src/salut-tubes-channel.c b/src/salut-tubes-channel.c
index b09c536..a64b5fe 100644
--- a/src/salut-tubes-channel.c
+++ b/src/salut-tubes-channel.c
@@ -756,9 +756,9 @@ emit_d_bus_names_changed_foreach (gpointer key,
 
 /* MUC message */
 void
-tubes_muc_message_received (SalutTubesChannel *self,
-                            const gchar *sender,
-                            GibberXmppStanza *stanza)
+salut_tubes_channel_muc_message_received (SalutTubesChannel *self,
+                                          const gchar *sender,
+                                          GibberXmppStanza *stanza)
 {
   SalutTubesChannelPrivate *priv = SALUT_TUBES_CHANNEL_GET_PRIVATE (self);
   TpHandleRepoIface *contact_repo = tp_base_connection_get_handles (
@@ -922,14 +922,14 @@ tubes_muc_message_received (SalutTubesChannel *self,
 
 /* 1-1 message */
 void
-tubes_message_received (SalutTubesChannel *self,
-                        const gchar *service,
-                        TpTubeType tube_type,
-                        TpHandle initiator_handle,
-                        GHashTable *parameters,
-                        guint tube_id,
-                        guint portnum,
-                        GibberIqHelperRequestStanza *iq_req)
+salut_tubes_channel_message_received (SalutTubesChannel *self,
+                                      const gchar *service,
+                                      TpTubeType tube_type,
+                                      TpHandle initiator_handle,
+                                      GHashTable *parameters,
+                                      guint tube_id,
+                                      guint portnum,
+                                      GibberIqHelperRequestStanza *iq_req)
 {
   SalutTubesChannelPrivate *priv = SALUT_TUBES_CHANNEL_GET_PRIVATE (self);
 
@@ -945,9 +945,9 @@ tubes_message_received (SalutTubesChannel *self,
 }
 
 void
-tubes_message_close_received (SalutTubesChannel *self,
-                                   TpHandle initiator_handle,
-                                   guint tube_id)
+salut_tubes_channel_message_close_received (SalutTubesChannel *self,
+                                            TpHandle initiator_handle,
+                                            guint tube_id)
 {
   SalutTubesChannelPrivate *priv = SALUT_TUBES_CHANNEL_GET_PRIVATE (self);
 
diff --git a/src/salut-tubes-channel.h b/src/salut-tubes-channel.h
index c3ddb16..87e22f1 100644
--- a/src/salut-tubes-channel.h
+++ b/src/salut-tubes-channel.h
@@ -70,15 +70,15 @@ void salut_tubes_channel_close (SalutTubesChannel *channel);
 void salut_tubes_channel_bytestream_offered (SalutTubesChannel *chanel,
     GibberBytestreamIface *bytestream, GibberXmppStanza *msg);
 
-void tubes_muc_message_received (SalutTubesChannel *channel,
+void salut_tubes_channel_muc_message_received (SalutTubesChannel *channel,
     const gchar *sender, GibberXmppStanza *stanza);
 
-void tubes_message_received (SalutTubesChannel *self,
+void salut_tubes_channel_message_received (SalutTubesChannel *self,
     const gchar *service, TpTubeType tube_type, TpHandle initiator_handle,
     GHashTable *parameters, guint tube_id, guint portnum,
     GibberIqHelperRequestStanza *iq_req);
 
-void tubes_message_close_received (SalutTubesChannel *self,
+void salut_tubes_channel_message_close_received (SalutTubesChannel *self,
     TpHandle initiator_handle, guint tube_id);
 
 G_END_DECLS
diff --git a/src/salut-tubes-manager.c b/src/salut-tubes-manager.c
index 2b01871..0a56080 100644
--- a/src/salut-tubes-manager.c
+++ b/src/salut-tubes-manager.c
@@ -328,7 +328,8 @@ iq_tube_request_cb (SalutXmppConnectionManager *xcm,
   {
     if (chan != NULL)
       {
-        tubes_message_close_received (chan, initiator_handle, tube_id);
+        salut_tubes_channel_message_close_received (chan, initiator_handle,
+            tube_id);
       }
   }
   else
@@ -340,8 +341,8 @@ iq_tube_request_cb (SalutXmppConnectionManager *xcm,
             (TpChannelIface *) chan, NULL);
       }
 
-    tubes_message_received (chan, service, tube_type, initiator_handle,
-        parameters, tube_id, portnum,
+    salut_tubes_channel_message_received (chan, service, tube_type,
+        initiator_handle, parameters, tube_id, portnum,
         gibber_iq_helper_get_request_stanza (stanza));
   }
 
-- 
1.5.6.5