changeset 26348:d7393eebf1f4

merge of '85389d6ca8dc05827fa7e57e17906b2f73e2c676' and 'd1fcdfed72472e989b6233008b7293bba744532c'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 23 Mar 2009 01:43:25 +0000
parents 1c73d2ef9ddc (current diff) c0499eb4dd4d (diff)
children 1ae3af12095a
files libpurple/media.c libpurple/media.h
diffstat 2 files changed, 2 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media.c	Mon Mar 23 01:06:15 2009 +0000
+++ b/libpurple/media.c	Mon Mar 23 01:43:25 2009 +0000
@@ -521,7 +521,7 @@
 	return candidate;
 }
 
-PurpleMediaCandidate *
+static PurpleMediaCandidate *
 purple_media_candidate_copy(PurpleMediaCandidate *candidate)
 {
 	PurpleMediaCandidate *new_candidate;
@@ -776,7 +776,7 @@
 	return codec;
 }
 
-PurpleMediaCodec *
+static PurpleMediaCodec *
 purple_media_codec_copy(PurpleMediaCodec *codec)
 {
 	PurpleMediaCodec *new_codec;
--- a/libpurple/media.h	Mon Mar 23 01:06:15 2009 +0000
+++ b/libpurple/media.h	Mon Mar 23 01:43:25 2009 +0000
@@ -221,16 +221,6 @@
 		const gchar *ip, guint port);
 
 /**
- * Copies a PurpleMediaCandidate instance.
- *
- * @param candidate The candidate to copy
- *
- * @return The newly created PurpleMediaCandidate copy.
- */
-PurpleMediaCandidate *purple_media_candidate_copy(
-		PurpleMediaCandidate *candidate);
-
-/**
  * Copies a GList of PurpleMediaCandidate and its contents.
  *
  * @param candidates The list of candidates to be copied.
@@ -267,15 +257,6 @@
 		PurpleMediaSessionType media_type, guint clock_rate);
 
 /**
- * Copies a PurpleMediaCodec instance.
- *
- * @param codec The codec to copy
- *
- * @return The newly created PurpleMediaCodec copy.
- */
-PurpleMediaCodec *purple_media_codec_copy(PurpleMediaCodec *codec);
-
-/**
  * Creates a string representation of the codec.
  *
  * @param codec The codec to create the string of.