Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 26819:8b7d1aed6d59
merge of '8ddbfe5d6f5c2455497d11ccbfff769ed4e9fad4'
and 'ef988478f33650d37a90cb7c58a9ac5af81b525b'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 28 Apr 2009 19:08:06 +0000 |
| parents | a0e48796defb 3613804b8f8d |
| children | 5aabe95773dd |
line wrap: on
line diff
--- 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 */