Mercurial > pidgin.yaz
changeset 26091:59188d904773
Fix compiling with --disable-vv.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Thu, 08 Jan 2009 08:26:36 +0000 |
| parents | dd3bdf691623 |
| children | db517c55c508 c80f151b159a |
| files | libpurple/protocols/jabber/jabber.h libpurple/protocols/jabber/jingle/jingle.c libpurple/protocols/jabber/jingle/rtp.c |
| diffstat | 3 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/jabber.h Thu Jan 08 04:10:38 2009 +0000 +++ b/libpurple/protocols/jabber/jabber.h Thu Jan 08 08:26:36 2009 +0000 @@ -245,9 +245,9 @@ */ GSList *url_datas; -#ifdef USE_VV /* keep a hash table of JingleSessions */ GHashTable *sessions; +#ifdef USE_VV GHashTable *medias; #endif };
--- a/libpurple/protocols/jabber/jingle/jingle.c Thu Jan 08 04:10:38 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/jingle.c Thu Jan 08 08:26:36 2009 +0000 @@ -92,15 +92,7 @@ GType jingle_get_type(const gchar *type) { - if (!strcmp(type, JINGLE_APP_RTP)) - return JINGLE_TYPE_RTP; -#if 0 - else if (!strcmp(type, JINGLE_APP_FT)) - return JINGLE_TYPE_FT; - else if (!strcmp(type, JINGLE_APP_XML)) - return JINGLE_TYPE_XML; -#endif - else if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) + if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) return JINGLE_TYPE_RAWUDP; else if (!strcmp(type, JINGLE_TRANSPORT_ICEUDP)) return JINGLE_TYPE_ICEUDP; @@ -110,6 +102,16 @@ else if (!strcmp(type, JINGLE_TRANSPORT_IBB)) return JINGLE_TYPE_IBB; #endif +#ifdef USE_VV + else if (!strcmp(type, JINGLE_APP_RTP)) + return JINGLE_TYPE_RTP; +#endif +#if 0 + else if (!strcmp(type, JINGLE_APP_FT)) + return JINGLE_TYPE_FT; + else if (!strcmp(type, JINGLE_APP_XML)) + return JINGLE_TYPE_XML; +#endif else return G_TYPE_NONE; }
--- a/libpurple/protocols/jabber/jingle/rtp.c Thu Jan 08 04:10:38 2009 +0000 +++ b/libpurple/protocols/jabber/jingle/rtp.c Thu Jan 08 08:26:36 2009 +0000 @@ -20,6 +20,8 @@ #include "config.h" +#ifdef USE_VV + #include "jabber.h" #include "jingle.h" #include "media.h" @@ -712,3 +714,5 @@ } } +#endif /* USE_VV */ +