Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jabber.c @ 28118:784013acc2f3
merged with im.pidgin.pidgin
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sat, 01 Aug 2009 14:55:12 +0900 |
| parents | 0754698c49f4 3ad2700e7c68 |
| children | 5ac0a83f0b21 |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.c Fri Jul 31 08:35:37 2009 +0900 +++ b/libpurple/protocols/jabber/jabber.c Sat Aug 01 14:55:12 2009 +0900 @@ -1544,6 +1544,9 @@ g_free(js->old_track); g_free(js->expected_rspauth); + if (js->vcard_timer != 0) + purple_timeout_remove(js->vcard_timer); + if (js->keepalive_timeout != 0) purple_timeout_remove(js->keepalive_timeout); @@ -3470,6 +3473,8 @@ #ifdef USE_VV jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled); jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled); + jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled); + jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_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, 0);