telepathy-farstream: use _tf prefix for non-ABI functions

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=76462
Reviewed-by: Xavier Claessens

7 files changed, 66 insertions, 66 deletions

diff --git a/telepathy-farstream/call-channel.c b/telepathy-farstream/call-channel.c
index 4b9e46c2d..2ae2b0fb8 100644
--- a/telepathy-farstream/call-channel.c
+++ b/telepathy-farstream/call-channel.c
@@ -40,7 +40,7 @@
 
 static void call_channel_async_initable_init (GAsyncInitableIface *asynciface);
 
-G_DEFINE_TYPE_WITH_CODE (TfCallChannel, tf_call_channel, G_TYPE_OBJECT,
+G_DEFINE_TYPE_WITH_CODE (TfCallChannel, _tf_call_channel, G_TYPE_OBJECT,
     G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE,
         call_channel_async_initable_init))
 
@@ -103,7 +103,7 @@ static void channel_prepared (GObject *proxy, GAsyncResult *prepare_res,
 
 
 static void
-tf_call_channel_class_init (TfCallChannelClass *klass)
+_tf_call_channel_class_init (TfCallChannelClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -170,7 +170,7 @@ free_participant (gpointer data)
 }
 
 static void
-tf_call_channel_init (TfCallChannel *self)
+_tf_call_channel_init (TfCallChannel *self)
 {
   self->fsconferences = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
       free_call_conference);
@@ -262,8 +262,8 @@ tf_call_channel_dispose (GObject *object)
     g_object_unref (self->proxy);
   self->proxy = NULL;
 
-  if (G_OBJECT_CLASS (tf_call_channel_parent_class)->dispose)
-    G_OBJECT_CLASS (tf_call_channel_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (_tf_call_channel_parent_class)->dispose)
+    G_OBJECT_CLASS (_tf_call_channel_parent_class)->dispose (object);
 }
 
 static void
@@ -332,12 +332,12 @@ add_content (TfCallChannel *self, TpCallContent *content_proxy)
 
   for (i = 0; i < self->contents->len; i++)
     {
-      if (tf_call_content_get_proxy (g_ptr_array_index (self->contents, i)) ==
+      if (_tf_call_content_get_proxy (g_ptr_array_index (self->contents, i)) ==
           content_proxy)
         return TRUE;
     }
 
-  content = tf_call_content_new_async (self, content_proxy,
+  content = _tf_call_content_new_async (self, content_proxy,
       &error, content_ready, g_object_ref (self));
 
   if (error)
@@ -381,7 +381,7 @@ content_removed (TpCallChannel *proxy,
   for (i = 0; i < self->contents->len; i++)
     {
 
-      if (tf_call_content_get_proxy (g_ptr_array_index (self->contents, i)) ==
+      if (_tf_call_content_get_proxy (g_ptr_array_index (self->contents, i)) ==
           content_proxy)
         {
           TfCallContent *content = g_ptr_array_index (self->contents, i);
@@ -448,7 +448,7 @@ out:
 }
 
 void
-tf_call_channel_new_async (TpChannel *channel,
+_tf_call_channel_new_async (TpChannel *channel,
     GAsyncReadyCallback callback,
     gpointer user_data)
 {
@@ -484,7 +484,7 @@ find_call_conference_by_conference (TfCallChannel *channel,
 }
 
 gboolean
-tf_call_channel_bus_message (TfCallChannel *channel,
+_tf_call_channel_bus_message (TfCallChannel *channel,
     GstMessage *message)
 {
   GError *error = NULL;
@@ -511,7 +511,7 @@ tf_call_channel_bus_message (TfCallChannel *channel,
 
       g_warning ("session ERROR: %s (%s)", error->message, debug);
 
-      tf_call_channel_error (channel);
+      _tf_call_channel_error (channel);
 
       g_error_free (error);
       g_free (debug);
@@ -521,7 +521,7 @@ tf_call_channel_bus_message (TfCallChannel *channel,
     }
 
   for (i = 0; i < channel->contents->len; i++)
-    if (tf_call_content_bus_message (g_ptr_array_index (channel->contents, i),
+    if (_tf_call_content_bus_message (g_ptr_array_index (channel->contents, i),
             message))
       return TRUE;
 
@@ -529,7 +529,7 @@ tf_call_channel_bus_message (TfCallChannel *channel,
 }
 
 void
-tf_call_channel_error (TfCallChannel *channel)
+_tf_call_channel_error (TfCallChannel *channel)
 {
   tp_call_channel_hangup_async (TP_CALL_CHANNEL (channel->proxy),
       TP_CALL_STATE_CHANGE_REASON_UNKNOWN, "", "", NULL, NULL);
diff --git a/telepathy-farstream/call-channel.h b/telepathy-farstream/call-channel.h
index 525e12f0f..036bd0c6f 100644
--- a/telepathy-farstream/call-channel.h
+++ b/telepathy-farstream/call-channel.h
@@ -28,7 +28,7 @@
 
 G_BEGIN_DECLS
 
-#define TF_TYPE_CALL_CHANNEL tf_call_channel_get_type()
+#define TF_TYPE_CALL_CHANNEL (_tf_call_channel_get_type ())
 
 #define TF_CALL_CHANNEL(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
@@ -86,15 +86,15 @@ struct _TfCallChannelClass{
 };
 
 
-GType tf_call_channel_get_type (void);
+GType _tf_call_channel_get_type (void);
 
-void tf_call_channel_new_async (TpChannel *channel_proxy,
+void _tf_call_channel_new_async (TpChannel *channel_proxy,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-void tf_call_channel_error (TfCallChannel *channel);
+void _tf_call_channel_error (TfCallChannel *channel);
 
-gboolean tf_call_channel_bus_message (TfCallChannel *channel,
+gboolean _tf_call_channel_bus_message (TfCallChannel *channel,
     GstMessage *message);
 
 /* Private methods, only to be used inside TP-FS */
diff --git a/telepathy-farstream/call-content.c b/telepathy-farstream/call-content.c
index db1e3c68e..2eea57bc8 100644
--- a/telepathy-farstream/call-content.c
+++ b/telepathy-farstream/call-content.c
@@ -123,7 +123,7 @@ struct _TfCallContentClass {
 
 static void call_content_async_initable_init (GAsyncInitableIface *asynciface);
 
-G_DEFINE_TYPE_WITH_CODE (TfCallContent, tf_call_content, TF_TYPE_CONTENT,
+G_DEFINE_TYPE_WITH_CODE (TfCallContent, _tf_call_content, TF_TYPE_CONTENT,
                          G_IMPLEMENT_INTERFACE (G_TYPE_ASYNC_INITABLE,
                              call_content_async_initable_init))
 
@@ -217,7 +217,7 @@ static void tf_call_content_receiving_failed (TfContent *content,
     const gchar *message);
 
 static void
-tf_call_content_class_init (TfCallContentClass *klass)
+_tf_call_content_class_init (TfCallContentClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   TfContentClass *content_class = TF_CONTENT_CLASS (klass);
@@ -325,7 +325,7 @@ free_content_fsstream (gpointer data)
 }
 
 static void
-tf_call_content_init (TfCallContent *self)
+_tf_call_content_init (TfCallContent *self)
 {
   self->fsstreams = g_ptr_array_new ();
   self->dtmf_sending_state = TP_SENDING_STATE_NONE;
@@ -390,8 +390,8 @@ tf_call_content_dispose (GObject *object)
     g_object_unref (self->proxy);
   self->proxy = NULL;
 
-  if (G_OBJECT_CLASS (tf_call_content_parent_class)->dispose)
-    G_OBJECT_CLASS (tf_call_content_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (_tf_call_content_parent_class)->dispose)
+    G_OBJECT_CLASS (_tf_call_content_parent_class)->dispose (object);
 }
 
 
@@ -405,8 +405,8 @@ tf_call_content_finalize (GObject *object)
 
   g_mutex_clear (&self->mutex);
 
-  if (G_OBJECT_CLASS (tf_call_content_parent_class)->finalize)
-    G_OBJECT_CLASS (tf_call_content_parent_class)->finalize (object);
+  if (G_OBJECT_CLASS (_tf_call_content_parent_class)->finalize)
+    G_OBJECT_CLASS (_tf_call_content_parent_class)->finalize (object);
 }
 
 
@@ -437,7 +437,7 @@ tf_call_content_get_property (GObject    *object,
         g_object_get_property (G_OBJECT (self->fssession), "sink-pad", value);
       break;
     case PROP_MEDIA_TYPE:
-      g_value_set_enum (value, tf_call_content_get_fs_media_type (self));
+      g_value_set_enum (value, _tf_call_content_get_fs_media_type (self));
       break;
     case PROP_OBJECT_PATH:
       g_object_get_property (G_OBJECT (self->proxy), "object-path", value);
@@ -510,7 +510,7 @@ static void
 add_stream (TfCallContent *self, TpCallStream *stream_proxy)
 {
   g_ptr_array_add (self->streams,
-      tf_call_stream_new (self, stream_proxy));
+      _tf_call_stream_new (self, stream_proxy));
 }
 
 static void
@@ -884,7 +884,7 @@ process_media_description (TfCallContent *self,
 
 
   g_debug ("Got MediaDescription %s", media_description_objpath);
-  fscodecs = tpcodecs_to_fscodecs (tf_call_content_get_fs_media_type (self),
+  fscodecs = tpcodecs_to_fscodecs (_tf_call_content_get_fs_media_type (self),
       codecs, does_avpf, rtcp_fb);
 
   fsrtp_hdrext = tprtphdrext_to_fsrtphdrext (rtp_hdrext);
@@ -1065,7 +1065,7 @@ streams_removed (TpCallContent *proxy,
   for (i = 0; i < streams->len; i++)
     for (j = 0; j < self->streams->len; j++)
       if (g_ptr_array_index (streams, i) ==
-          tf_call_stream_get_proxy (g_ptr_array_index (self->streams, j)))
+          _tf_call_stream_get_proxy (g_ptr_array_index (self->streams, j)))
         {
           g_ptr_array_remove_index_fast (self->streams, j);
           break;
@@ -1149,7 +1149,7 @@ got_content_media_properties (TpProxy *proxy, GHashTable *properties,
     }
 
   self->fssession = fs_conference_new_session (self->fsconference,
-      tf_call_content_get_fs_media_type (self), &myerror);
+      _tf_call_content_get_fs_media_type (self), &myerror);
 
   if (!self->fssession)
     {
@@ -1732,7 +1732,7 @@ tf_call_content_init_finish (GAsyncInitable *initable,
 }
 
 TfCallContent *
-tf_call_content_new_async (TfCallChannel *call_channel,
+_tf_call_content_new_async (TfCallChannel *call_channel,
     TpCallContent *content_proxy, GError **error,
     GAsyncReadyCallback callback, gpointer user_data)
 {
@@ -2087,7 +2087,7 @@ tf_call_content_dtmf_stopped (TfCallContent *self, FsDTMFMethod method)
 
 
 gboolean
-tf_call_content_bus_message (TfCallContent *content,
+_tf_call_content_bus_message (TfCallContent *content,
     GstMessage *message)
 {
   gboolean ret = TRUE;
@@ -2173,7 +2173,7 @@ tf_call_content_bus_message (TfCallContent *content,
     }
 
   for (i = 0; i < content->streams->len; i++)
-    if (tf_call_stream_bus_message (g_ptr_array_index (content->streams, i),
+    if (_tf_call_stream_bus_message (g_ptr_array_index (content->streams, i),
             message))
       return TRUE;
 
@@ -2354,7 +2354,7 @@ _tf_call_content_put_fsstream (TfCallContent *content, FsStream *fsstream)
 }
 
 FsMediaType
-tf_call_content_get_fs_media_type (TfCallContent *content)
+_tf_call_content_get_fs_media_type (TfCallContent *content)
 {
   return tp_media_type_to_fs (tp_call_content_get_media_type (content->proxy));
 }
@@ -2519,7 +2519,7 @@ tf_call_content_sending_failed (TfContent *content,
     }
 
   for (i = 0; i < self->streams->len; i++)
-    tf_call_stream_sending_failed (g_ptr_array_index (self->streams, i),
+    _tf_call_stream_sending_failed (g_ptr_array_index (self->streams, i),
         message);
 }
 
@@ -2539,13 +2539,13 @@ tf_call_content_receiving_failed (TfContent *content,
     }
 
   for (i = 0; i < self->streams->len; i++)
-    tf_call_stream_receiving_failed (g_ptr_array_index (self->streams, i),
+    _tf_call_stream_receiving_failed (g_ptr_array_index (self->streams, i),
         handles, handle_count, message);
 }
 
 
 TpCallContent *
-tf_call_content_get_proxy (TfCallContent *content)
+_tf_call_content_get_proxy (TfCallContent *content)
 {
   g_return_val_if_fail (TF_IS_CALL_CONTENT (content), NULL);
 
diff --git a/telepathy-farstream/call-content.h b/telepathy-farstream/call-content.h
index 499eead17..e196f3e3d 100644
--- a/telepathy-farstream/call-content.h
+++ b/telepathy-farstream/call-content.h
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-#define TF_TYPE_CALL_CONTENT tf_call_content_get_type()
+#define TF_TYPE_CALL_CONTENT (_tf_call_content_get_type ())
 
 #define TF_CALL_CONTENT(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
@@ -70,16 +70,16 @@ typedef struct _TfCallContent TfCallContent;
 
 typedef struct _TfCallContentClass TfCallContentClass;
 
-GType tf_call_content_get_type (void);
+GType _tf_call_content_get_type (void);
 
-TfCallContent *tf_call_content_new_async (
+TfCallContent *_tf_call_content_new_async (
     TfCallChannel *call_channel,
     TpCallContent *content_proxy,
     GError **error,
     GAsyncReadyCallback callback,
     gpointer user_data);
 
-gboolean tf_call_content_bus_message (TfCallContent *content,
+gboolean _tf_call_content_bus_message (TfCallContent *content,
     GstMessage *message);
 
 
@@ -94,14 +94,14 @@ FsStream *_tf_call_content_get_fsstream_by_handle (TfCallContent *content,
 void _tf_call_content_put_fsstream (TfCallContent *content, FsStream *fsstream);
 
 FsMediaType
-tf_call_content_get_fs_media_type (TfCallContent *content);
+_tf_call_content_get_fs_media_type (TfCallContent *content);
 
 
 gboolean
-tf_call_content_bus_message (TfCallContent *content, GstMessage *message);
+_tf_call_content_bus_message (TfCallContent *content, GstMessage *message);
 
 TpCallContent *
-tf_call_content_get_proxy (TfCallContent *content);
+_tf_call_content_get_proxy (TfCallContent *content);
 
 G_END_DECLS
 
diff --git a/telepathy-farstream/call-stream.c b/telepathy-farstream/call-stream.c
index 4052c2481..222bdca32 100644
--- a/telepathy-farstream/call-stream.c
+++ b/telepathy-farstream/call-stream.c
@@ -56,7 +56,7 @@
 #include "utils.h"
 
 
-G_DEFINE_TYPE (TfCallStream, tf_call_stream, G_TYPE_OBJECT);
+G_DEFINE_TYPE (TfCallStream, _tf_call_stream, G_TYPE_OBJECT);
 
 static void tf_call_stream_dispose (GObject *object);
 static void tf_call_stream_finalize (GObject *object);
@@ -76,7 +76,7 @@ static void _tf_call_stream_remove_endpoint (TfCallStream *self);
 
 
 static void
-tf_call_stream_class_init (TfCallStreamClass *klass)
+_tf_call_stream_class_init (TfCallStreamClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
@@ -85,7 +85,7 @@ tf_call_stream_class_init (TfCallStreamClass *klass)
 }
 
 static void
-tf_call_stream_init (TfCallStream *self)
+_tf_call_stream_init (TfCallStream *self)
 {
   self->sending_state = TP_STREAM_FLOW_STATE_STOPPED;
   self->receiving_state = TP_STREAM_FLOW_STATE_STOPPED;
@@ -130,8 +130,8 @@ tf_call_stream_dispose (GObject *object)
 
   _tf_call_stream_destroy (self);
 
-  if (G_OBJECT_CLASS (tf_call_stream_parent_class)->dispose)
-    G_OBJECT_CLASS (tf_call_stream_parent_class)->dispose (object);
+  if (G_OBJECT_CLASS (_tf_call_stream_parent_class)->dispose)
+    G_OBJECT_CLASS (_tf_call_stream_parent_class)->dispose (object);
 }
 
 static void
@@ -149,8 +149,8 @@ tf_call_stream_finalize (GObject *object)
     g_boxed_free (TP_ARRAY_TYPE_STRING_VARIANT_MAP_LIST, self->relay_info);
   self->relay_info = NULL;
 
-  if (G_OBJECT_CLASS (tf_call_stream_parent_class)->finalize)
-    G_OBJECT_CLASS (tf_call_stream_parent_class)->finalize (object);
+  if (G_OBJECT_CLASS (_tf_call_stream_parent_class)->finalize)
+    G_OBJECT_CLASS (_tf_call_stream_parent_class)->finalize (object);
 }
 
 
@@ -362,7 +362,7 @@ tf_call_stream_try_adding_fsstream (TfCallStream *self)
 
       g_debug ("Transmitter: rawudp");
 
-      switch (tf_call_content_get_fs_media_type (self->call_content))
+      switch (_tf_call_content_get_fs_media_type (self->call_content))
         {
         case TP_MEDIA_STREAM_TYPE_VIDEO:
           preferred_local_candidates = g_list_prepend (NULL,
@@ -1366,7 +1366,7 @@ stream_prepared (GObject *src_object, GAsyncResult *res, gpointer user_data)
 }
 
 TfCallStream *
-tf_call_stream_new (TfCallContent *call_content,
+_tf_call_stream_new (TfCallContent *call_content,
     TpCallStream *stream_proxy)
 {
   TfCallStream *self;
@@ -1592,7 +1592,7 @@ cb_fs_new_active_candidate_pair (TfCallStream *stream,
 }
 
 gboolean
-tf_call_stream_bus_message (TfCallStream *stream, GstMessage *message)
+_tf_call_stream_bus_message (TfCallStream *stream, GstMessage *message)
 {
   FsError errorno;
   const gchar *msg;
@@ -1691,7 +1691,7 @@ tf_call_stream_fail (TfCallStream *self,
 }
 
 void
-tf_call_stream_sending_failed (TfCallStream *self, const gchar *message)
+_tf_call_stream_sending_failed (TfCallStream *self, const gchar *message)
 {
   g_warning ("Reporting sending failure: %s", message);
 
@@ -1706,7 +1706,7 @@ tf_call_stream_sending_failed (TfCallStream *self, const gchar *message)
 
 
 void
-tf_call_stream_receiving_failed (TfCallStream *self,
+_tf_call_stream_receiving_failed (TfCallStream *self,
     guint *handles, guint handle_count,
     const gchar *message)
 {
@@ -1734,7 +1734,7 @@ tf_call_stream_receiving_failed (TfCallStream *self,
 
 
 TpCallStream *
-tf_call_stream_get_proxy (TfCallStream *stream)
+_tf_call_stream_get_proxy (TfCallStream *stream)
 {
   g_return_val_if_fail (TF_IS_CALL_STREAM (stream), NULL);
 
diff --git a/telepathy-farstream/call-stream.h b/telepathy-farstream/call-stream.h
index 31961c1e8..6825a9397 100644
--- a/telepathy-farstream/call-stream.h
+++ b/telepathy-farstream/call-stream.h
@@ -30,7 +30,7 @@
 
 G_BEGIN_DECLS
 
-#define TF_TYPE_CALL_STREAM tf_call_stream_get_type()
+#define TF_TYPE_CALL_STREAM (_tf_call_stream_get_type ())
 
 #define TF_CALL_STREAM(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
@@ -111,22 +111,22 @@ struct _TfCallStreamClass{
 };
 
 
-GType tf_call_stream_get_type (void);
+GType _tf_call_stream_get_type (void);
 
-TfCallStream *tf_call_stream_new (
+TfCallStream *_tf_call_stream_new (
     TfCallContent *content,
     TpCallStream *stream_proxy);
 
-gboolean tf_call_stream_bus_message (TfCallStream *stream, GstMessage *message);
+gboolean _tf_call_stream_bus_message (TfCallStream *stream, GstMessage *message);
 
-void tf_call_stream_sending_failed (TfCallStream *stream, const gchar *message);
+void _tf_call_stream_sending_failed (TfCallStream *stream, const gchar *message);
 
-void tf_call_stream_receiving_failed (TfCallStream *stream,
+void _tf_call_stream_receiving_failed (TfCallStream *stream,
     guint *handles, guint handle_count,
     const gchar *message);
 
 TpCallStream *
-tf_call_stream_get_proxy (TfCallStream *stream);
+_tf_call_stream_get_proxy (TfCallStream *stream);
 
 
 G_END_DECLS
diff --git a/telepathy-farstream/channel.c b/telepathy-farstream/channel.c
index 10107c04e..1106fa766 100644
--- a/telepathy-farstream/channel.c
+++ b/telepathy-farstream/channel.c
@@ -252,7 +252,7 @@ channel_prepared (GObject *obj,
         }
       else
         {
-          tf_call_channel_new_async (channel_proxy, call_channel_ready, res);
+          _tf_call_channel_new_async (channel_proxy, call_channel_ready, res);
 
           self->priv->channel_invalidated_handler = g_signal_connect (
               self->priv->channel_proxy,
@@ -536,7 +536,7 @@ tf_channel_bus_message (TfChannel *channel,
   g_return_val_if_fail (message != NULL, FALSE);
 
   if (channel->priv->call_channel)
-    return tf_call_channel_bus_message (channel->priv->call_channel,
+    return _tf_call_channel_bus_message (channel->priv->call_channel,
       message);
 
   return FALSE;