diff options
| author | Paul Aurich <darkrain42@pidgin.im> | 2009-04-28 19:08:06 +0000 |
|---|---|---|
| committer | Paul Aurich <darkrain42@pidgin.im> | 2009-04-28 19:08:06 +0000 |
| commit | ae64be97e324f8ddf18621e570ae9134c0d6a383 (patch) | |
| tree | 652cd76c100ad86f80f50fc2576de6bfab598b53 | |
| parent | 7abdc28ba3ce9fe7db30d09df4e2a0d9cf7c2394 (diff) | |
| parent | 16e912acf6ad32a71b738a3bad6595953c50f99e (diff) | |
| download | pidgin-cpw.darkrain42.xmpp.bosh.tar.gz | |
merge of '8482365bb2ecec16d6e7161069a6000c330727e8'cpw.darkrain42.xmpp.bosh
and '0451fd01c1c834db9f16502fc2da097024aa4a46'
| -rw-r--r-- | libpurple/media.c | 24 | ||||
| -rw-r--r-- | libpurple/media.h | 11 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/jabber.c | 8 |
3 files changed, 1 insertions, 42 deletions
diff --git a/libpurple/media.c b/libpurple/media.c index cd5e931fa0..8651b76b43 100644 --- a/libpurple/media.c +++ b/libpurple/media.c @@ -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 @@ purple_media_get_tee(PurpleMedia *media, } #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 --git a/libpurple/media.h b/libpurple/media.h index 12bd10e69f..2a9c139afb 100644 --- a/libpurple/media.h +++ b/libpurple/media.h @@ -681,17 +681,6 @@ gulong purple_media_set_output_window(PurpleMedia *media, */ 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 --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c index 2dd61d5b54..b42256444c 100644 --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -2863,12 +2863,6 @@ jabber_video_enabled(JabberStream *js, const char *namespace) 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_init_plugin(PurplePlugin *plugin) 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 */ |