pidgin.vv: 07557d13: Fix compiling with --disable-vv.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 07557d13ad7bbfd34e6cb96dd34cfb2daea2c20d
Ancestor: 2e6562913a4dbc5c445c4bfddb0ea6b24767a179
Author: maiku at soc.pidgin.im
Date: 2009-01-08T08:26:36
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/07557d13ad7bbfd34e6cb96dd34cfb2daea2c20d

Modified files:
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/rtp.c

ChangeLog: 

Fix compiling with --disable-vv.

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/jabber.h	be71a648fe61355b2deaf5b12356c99b61a27d87
+++ libpurple/protocols/jabber/jabber.h	50a045bf1c95fd68419dcc43fa727127ee7d35cc
@@ -245,9 +245,9 @@ struct _JabberStream
 	 */
 	GSList *url_datas;
 
-#ifdef USE_VV
 	/* keep a hash table of JingleSessions */
 	GHashTable *sessions;
+#ifdef USE_VV
 	GHashTable *medias;
 #endif
 };
============================================================
--- libpurple/protocols/jabber/jingle/jingle.c	d5a48b5bcc99c4b830185db7cb091b8c984d68a5
+++ libpurple/protocols/jabber/jingle/jingle.c	e19f6a7370fb6bc3cff5582680724ceaa07b6169
@@ -92,15 +92,7 @@ jingle_get_type(const gchar *type)
 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 @@ jingle_get_type(const gchar *type)
 	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;
 }
============================================================
--- libpurple/protocols/jabber/jingle/rtp.c	9509ca7de150f1aff11a187613dcf4e677747df9
+++ libpurple/protocols/jabber/jingle/rtp.c	1124fe18fae919593202cb553e7b535e7b65e1a6
@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#ifdef USE_VV
+
 #include "jabber.h"
 #include "jingle.h"
 #include "media.h"
@@ -712,3 +714,5 @@ jingle_rtp_terminate_session(JabberStrea
 	}
 }
 
+#endif /* USE_VV */
+