[Telepathy-commits] [telepathy-gabble/master] bytestream-factory: most of the create bytestream methods don't have to be public

[Guillaume Desmottes]

---
 src/bytestream-factory.c |   21 ++++++++++++++++++---
 src/bytestream-factory.h |   16 ----------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/bytestream-factory.c b/src/bytestream-factory.c
index 427c2c8..6075bd4 100644
--- a/src/bytestream-factory.c
+++ b/src/bytestream-factory.c
@@ -552,6 +552,21 @@ stream_method_supported (const gchar *stream_method)
   return FALSE;
 }
 
+static GabbleBytestreamMultiple *gabble_bytestream_factory_create_multiple (
+    GabbleBytestreamFactory *self, TpHandle peer_handle,
+    const gchar *stream_id, const gchar *stream_init_id,
+    const gchar *peer_resource, GabbleBytestreamState state);
+
+static GabbleBytestreamIBB *gabble_bytestream_factory_create_ibb (
+    GabbleBytestreamFactory *fac, TpHandle peer_handle, const gchar *stream_id,
+    const gchar *stream_init_id, const gchar *peer_resource,
+    GabbleBytestreamState state);
+
+static GabbleBytestreamSocks5 *gabble_bytestream_factory_create_socks5 (
+    GabbleBytestreamFactory *fac, TpHandle peer_handle, const gchar *stream_id,
+    const gchar *stream_init_id, const gchar *peer_resource,
+    GabbleBytestreamState state);
+
 /**
  * bytestream_factory_iq_si_cb:
  *
@@ -1250,7 +1265,7 @@ gabble_bytestream_factory_create_from_method (GabbleBytestreamFactory *self,
   return bytestream;
 }
 
-GabbleBytestreamIBB *
+static GabbleBytestreamIBB *
 gabble_bytestream_factory_create_ibb (GabbleBytestreamFactory *self,
                                       TpHandle peer_handle,
                                       const gchar *stream_id,
@@ -1314,7 +1329,7 @@ gabble_bytestream_factory_create_muc (GabbleBytestreamFactory *self,
   return bytestream;
 }
 
-GabbleBytestreamSocks5 *
+static GabbleBytestreamSocks5 *
 gabble_bytestream_factory_create_socks5 (GabbleBytestreamFactory *self,
                                          TpHandle peer_handle,
                                          const gchar *stream_id,
@@ -1348,7 +1363,7 @@ gabble_bytestream_factory_create_socks5 (GabbleBytestreamFactory *self,
   return socks5;
 }
 
-GabbleBytestreamMultiple *
+static GabbleBytestreamMultiple *
 gabble_bytestream_factory_create_multiple (GabbleBytestreamFactory *self,
                                            TpHandle peer_handle,
                                            const gchar *stream_id,
diff --git a/src/bytestream-factory.h b/src/bytestream-factory.h
index 042b92a..8751ac0 100644
--- a/src/bytestream-factory.h
+++ b/src/bytestream-factory.h
@@ -73,26 +73,10 @@ typedef void (* GabbleBytestreamFactoryNegotiateReplyFunc) (
 GabbleBytestreamFactory *gabble_bytestream_factory_new (
     GabbleConnection *conn);
 
-/* FIXME: what's the point to have these public? */
-GabbleBytestreamIBB *gabble_bytestream_factory_create_ibb (
-    GabbleBytestreamFactory *fac, TpHandle peer_handle, const gchar *stream_id,
-    const gchar *stream_init_id, const gchar *peer_resource,
-    GabbleBytestreamState state);
-
 GabbleBytestreamMuc *gabble_bytestream_factory_create_muc (
     GabbleBytestreamFactory *fac, TpHandle peer_handle, const gchar *stream_id,
     GabbleBytestreamState state);
 
-GabbleBytestreamSocks5 *gabble_bytestream_factory_create_socks5 (
-    GabbleBytestreamFactory *fac, TpHandle peer_handle, const gchar *stream_id,
-    const gchar *stream_init_id, const gchar *peer_resource,
-    GabbleBytestreamState state);
-
-GabbleBytestreamMultiple *gabble_bytestream_factory_create_multiple (
-    GabbleBytestreamFactory *self, TpHandle peer_handle,
-    const gchar *stream_id, const gchar *stream_init_id,
-    const gchar *peer_resource, GabbleBytestreamState state);
-
 GabbleBytestreamIface *gabble_bytestream_factory_create_from_method (
     GabbleBytestreamFactory *self, const gchar *stream_method,
     TpHandle peer_handle, const gchar *stream_id, const gchar *stream_init_id,
-- 
1.5.6.5