# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1237772605 0
# Node ID d7393eebf1f41580dbb7e951c13a384696223d98
# Parent  1c73d2ef9ddce843dbe59e89748bf6ce9e3fed0e# Parent  c0499eb4dd4dcf84ac414cf4ae120c74c77b04b3
merge of '85389d6ca8dc05827fa7e57e17906b2f73e2c676'
     and 'd1fcdfed72472e989b6233008b7293bba744532c'

diff -r 1c73d2ef9ddc -r d7393eebf1f4 libpurple/media.c
--- 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;
diff -r 1c73d2ef9ddc -r d7393eebf1f4 libpurple/media.h
--- 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.