[telepathy-sofiasip/master] Don't clobber ptime parameters if they are specified for the codec

[Mikhail Zabaluev]

This is weird, but is sometimes used.
---
 src/sip-media-stream.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sip-media-stream.c b/src/sip-media-stream.c
index f110ae7..fe00382 100644
--- a/src/sip-media-stream.c
+++ b/src/sip-media-stream.c
@@ -1346,9 +1346,6 @@ static void push_remote_codecs (TpsipMediaStream *stream)
       g_value_take_boxed (&codec,
                           dbus_g_type_specialized_construct (codec_type));
 
-      tpsip_codec_param_parse (priv->media_type, rtpmap->rm_encoding,
-          rtpmap->rm_fmtp, opt_params);
-
       if (ptime != NULL)
         g_hash_table_insert (opt_params,
             g_strdup("ptime"), g_strdup (ptime));
@@ -1356,6 +1353,9 @@ static void push_remote_codecs (TpsipMediaStream *stream)
         g_hash_table_insert (opt_params,
             g_strdup("maxptime"), g_strdup (max_ptime));
 
+      tpsip_codec_param_parse (priv->media_type, rtpmap->rm_encoding,
+          rtpmap->rm_fmtp, opt_params);
+
       /* RFC2327: see "m=" line definition 
        *  - note, 'encoding_params' is assumed to be channel
        *    count (i.e. channels in farsight) */
-- 
1.5.6.5