# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1240945686 0
# Node ID 8b7d1aed6d596b4adaffda0c2328a004b2b09d4a
# Parent  a0e48796defb3aa64a7c457bfc586524503198f6# Parent  3613804b8f8d898682da8e2f69cf92781e29dca0
merge of '8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4'
     and 'ef988478f33650d37a90cb7c58a9ac5af81b525b'

diff -r a0e48796defb -r 8b7d1aed6d59 libpurple/media.c
--- a/libpurple/media.c	Tue Apr 28 18:57:47 2009 +0000
+++ b/libpurple/media.c	Tue Apr 28 19:08:06 2009 +0000
@@ -43,7 +43,6 @@
 #ifdef USE_VV
 
 #include <gst/farsight/fs-conference-iface.h>
-#include <gst/farsight/fs-transmitter.h>
 
 /** @copydoc _PurpleMediaSession */
 typedef struct _PurpleMediaSession PurpleMediaSession;
@@ -3068,26 +3067,3 @@
 }
 #endif /* USE_GSTREAMER */
 
-gboolean
-purple_media_transmitter_exists(const gchar *transmitter)
-{
-#ifdef USE_VV
-	char **transmitters;
-	int i;
-
-	g_return_val_if_fail(transmitter != NULL, FALSE);
-
-	transmitters = fs_transmitter_list_available();
-	for (i = 0; transmitters[i]; ++i) {
-		if (g_str_equal(transmitter, transmitters[i])) {
-			g_strfreev(transmitters);
-			return TRUE;
-		}
-	}
-
-	g_strfreev(transmitters);
-	return FALSE;
-#else
-	return FALSE;
-#endif
-}
diff -r a0e48796defb -r 8b7d1aed6d59 libpurple/media.h
--- a/libpurple/media.h	Tue Apr 28 18:57:47 2009 +0000
+++ b/libpurple/media.h	Tue Apr 28 19:08:06 2009 +0000
@@ -681,17 +681,6 @@
  */
 void purple_media_remove_output_windows(PurpleMedia *media);
 
-/**
- * Returns whether or not a specific transmitter type is present.
- *
- * @param transmitter The name of the transmitter.
- *
- * @return TRUE if it is present, FALSE otherwise.
- *
- * @since 2.6.0
- */
-gboolean purple_media_transmitter_exists(const gchar *transmitter);
-
 #ifdef __cplusplus
 }
 #endif
diff -r a0e48796defb -r 8b7d1aed6d59 libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c	Tue Apr 28 18:57:47 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue Apr 28 19:08:06 2009 +0000
@@ -2863,12 +2863,6 @@
 	return (caps & (PURPLE_MEDIA_CAPS_VIDEO | PURPLE_MEDIA_CAPS_VIDEO_SINGLE_DIRECTION));
 }
 
-static gboolean
-jabber_ice_transmitter_present(JabberStream *js, const char *namespace)
-{
-	return purple_media_transmitter_exists("nice");
-}
-
 typedef struct {
 	PurpleAccount *account;
 	gchar *who;
@@ -3308,7 +3302,7 @@
 	jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled);
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
-	jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, jabber_ice_transmitter_present);
+	jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
 #endif
 
 	/* IPC functions */