[telepathy-sofiasip/master] Staticized tpsip_codec_param_formats_init()

[Mikhail Zabaluev]

It's called internally wherever required.
---
 src/sip-media-stream.c      |    2 --
 tpsip/codec-param-formats.c |   12 ++++++++++--
 tpsip/codec-param-formats.h |    2 --
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/sip-media-stream.c b/src/sip-media-stream.c
index 04894cd..4a697f4 100644
--- a/src/sip-media-stream.c
+++ b/src/sip-media-stream.c
@@ -417,8 +417,6 @@ tpsip_media_stream_class_init (TpsipMediaStreamClass *klass)
                   NULL, NULL,
                   g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
-
-  tpsip_codec_param_formats_init ();
 }
 
 void
diff --git a/tpsip/codec-param-formats.c b/tpsip/codec-param-formats.c
index 4754fe3..6c19632 100644
--- a/tpsip/codec-param-formats.c
+++ b/tpsip/codec-param-formats.c
@@ -41,6 +41,8 @@ static GRegex *dtmf_events_regex = NULL;
 
 static GHashTable *codec_param_formats[NUM_TP_MEDIA_STREAM_TYPES];
 
+static void tpsip_codec_param_formats_init ();
+
 /**
  * tpsip_codec_param_format:
  * @media: the media type
@@ -58,6 +60,8 @@ tpsip_codec_param_format (TpMediaStreamType media, const char *name,
 {
   TpsipCodecParamFormatting *fmt;
 
+  tpsip_codec_param_formats_init ();
+
   /* XXX: thread unsafe, we don't care for now */
   fmt = g_hash_table_lookup (codec_param_formats[media], name);
 
@@ -87,6 +91,8 @@ tpsip_codec_param_parse (TpMediaStreamType media, const char *name,
   if (fmtp == NULL)
     return;
 
+  tpsip_codec_param_formats_init ();
+
   /* XXX: thread unsafe, we don't care for now */
   fmt = g_hash_table_lookup (codec_param_formats[media], name);
 
@@ -113,6 +119,8 @@ tpsip_codec_param_register_format (TpMediaStreamType media, const char *name,
 {
   TpsipCodecParamFormatting *fmt;
 
+  tpsip_codec_param_formats_init ();
+
   fmt = g_slice_new (TpsipCodecParamFormatting);
   fmt->format = format;
   fmt->parse = parse;
@@ -278,14 +286,14 @@ tpsip_codec_param_parse_telephone_event (const gchar *fmtp, GHashTable *out)
   tpsip_codec_param_parse_generic (fmtp + end_pos, out);
 }
 
-/**
+/*
  * tpsip_codec_param_formats_init:
  *
  * Initializes the codec parameter formatting infrastructure.
  * This function must be called before using any other functions in this module.
  * Calling the function more than once has no effect.
  */
-void
+static void
 tpsip_codec_param_formats_init ()
 {
   static volatile gsize been_here = 0;
diff --git a/tpsip/codec-param-formats.h b/tpsip/codec-param-formats.h
index 2198395..97c2405 100644
--- a/tpsip/codec-param-formats.h
+++ b/tpsip/codec-param-formats.h
@@ -59,8 +59,6 @@ typedef void (* TpsipCodecParamFormatFunc) (GHashTable *params, GString *out);
  */
 typedef void (* TpsipCodecParamParseFunc) (const gchar *str, GHashTable *out);
 
-void tpsip_codec_param_formats_init (void);
-
 void tpsip_codec_param_format (TpMediaStreamType media, const char *name,
                                GHashTable *params, GString *out);
 
-- 
1.5.6.5