comparison: libpurple/protocols/jabber/jabber.c
libpurple/protocols/jabber/jabber.c
- branch
- vv
- changeset 26455
- 65d138da0c83
- parent 26454
- 94130b583e0b
- child 26495
- 52846ebe1c7d
equal
deleted
inserted
replaced
| 26454:94130b583e0b | 26455:65d138da0c83 |
|---|---|
| 59 #include "pep.h" | 59 #include "pep.h" |
| 60 #include "adhoccommands.h" | 60 #include "adhoccommands.h" |
| 61 | 61 |
| 62 #include "jingle/jingle.h" | 62 #include "jingle/jingle.h" |
| 63 #include "jingle/rtp.h" | 63 #include "jingle/rtp.h" |
| 64 | |
| 65 #ifdef USE_VV | |
| 66 #include <gst/farsight/fs-conference-iface.h> | |
| 67 | |
| 68 #define GTALK_CAP "http://www.google.com/xmpp/protocol/voice/v1" | |
| 69 | |
| 70 #endif | |
| 71 | 64 |
| 72 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5) | 65 #define JABBER_CONNECT_STEPS (js->gsc ? 9 : 5) |
| 73 | 66 |
| 74 static PurplePlugin *my_protocol = NULL; | 67 static PurplePlugin *my_protocol = NULL; |
| 75 GList *jabber_features = NULL; | 68 GList *jabber_features = NULL; |
| 2641 } | 2634 } |
| 2642 | 2635 |
| 2643 if (type & PURPLE_MEDIA_AUDIO && | 2636 if (type & PURPLE_MEDIA_AUDIO && |
| 2644 !jabber_buddy_has_capability(jb, | 2637 !jabber_buddy_has_capability(jb, |
| 2645 JINGLE_APP_RTP_SUPPORT_AUDIO) && | 2638 JINGLE_APP_RTP_SUPPORT_AUDIO) && |
| 2646 jabber_buddy_has_capability(jb, GTALK_CAP)) | 2639 jabber_buddy_has_capability(jb, GOOGLE_VOICE_CAP)) |
| 2647 return jabber_google_session_initiate(gc->proto_data, who, type); | 2640 return jabber_google_session_initiate(gc->proto_data, who, type); |
| 2648 else | 2641 else |
| 2649 return jingle_rtp_initiate_media(gc->proto_data, who, type); | 2642 return jingle_rtp_initiate_media(gc->proto_data, who, type); |
| 2650 #else | 2643 #else |
| 2651 return NULL; | 2644 return NULL; |
| 2689 caps = PURPLE_MEDIA_CAPS_NONE; | 2682 caps = PURPLE_MEDIA_CAPS_NONE; |
| 2690 } else | 2683 } else |
| 2691 caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION | | 2684 caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION | |
| 2692 PURPLE_MEDIA_CAPS_CHANGE_DIRECTION; | 2685 PURPLE_MEDIA_CAPS_CHANGE_DIRECTION; |
| 2693 } | 2686 } |
| 2694 if (jabber_buddy_has_capability(jb, GTALK_CAP)) | 2687 if (jabber_buddy_has_capability(jb, GOOGLE_VOICE_CAP)) |
| 2695 caps |= PURPLE_MEDIA_CAPS_AUDIO; | 2688 caps |= PURPLE_MEDIA_CAPS_AUDIO; |
| 2696 | 2689 |
| 2697 return caps; | 2690 return caps; |
| 2698 #else | 2691 #else |
| 2699 return PURPLE_MEDIA_CAPS_NONE; | 2692 return PURPLE_MEDIA_CAPS_NONE; |
