Mercurial > pidgin
comparison libpurple/media.c @ 26348:d7393eebf1f4
merge of '85389d6ca8dc05827fa7e57e17906b2f73e2c676'
and 'd1fcdfed72472e989b6233008b7293bba744532c'
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Mon, 23 Mar 2009 01:43:25 +0000 |
| parents | cd41e1655a3e c0499eb4dd4d |
| children | 1ae3af12095a |
comparison
equal
deleted
inserted
replaced
| 26347:1c73d2ef9ddc | 26348:d7393eebf1f4 |
|---|---|
| 519 candidate->ip = g_strdup(ip); | 519 candidate->ip = g_strdup(ip); |
| 520 candidate->port = port; | 520 candidate->port = port; |
| 521 return candidate; | 521 return candidate; |
| 522 } | 522 } |
| 523 | 523 |
| 524 PurpleMediaCandidate * | 524 static PurpleMediaCandidate * |
| 525 purple_media_candidate_copy(PurpleMediaCandidate *candidate) | 525 purple_media_candidate_copy(PurpleMediaCandidate *candidate) |
| 526 { | 526 { |
| 527 PurpleMediaCandidate *new_candidate; | 527 PurpleMediaCandidate *new_candidate; |
| 528 | 528 |
| 529 if (candidate == NULL) | 529 if (candidate == NULL) |
| 774 codec->media_type = media_type; | 774 codec->media_type = media_type; |
| 775 codec->clock_rate = clock_rate; | 775 codec->clock_rate = clock_rate; |
| 776 return codec; | 776 return codec; |
| 777 } | 777 } |
| 778 | 778 |
| 779 PurpleMediaCodec * | 779 static PurpleMediaCodec * |
| 780 purple_media_codec_copy(PurpleMediaCodec *codec) | 780 purple_media_codec_copy(PurpleMediaCodec *codec) |
| 781 { | 781 { |
| 782 PurpleMediaCodec *new_codec; | 782 PurpleMediaCodec *new_codec; |
| 783 GList *iter; | 783 GList *iter; |
| 784 | 784 |