# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1231403196 0
# Node ID 59188d90477349a95e90feeb8d5c2ffec13ec952
# Parent  dd3bdf6916236adde1d106336e0abde9cb75d4b6
Fix compiling with --disable-vv.

diff -r dd3bdf691623 -r 59188d904773 libpurple/protocols/jabber/jabber.h
--- 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
 };
diff -r dd3bdf691623 -r 59188d904773 libpurple/protocols/jabber/jingle/jingle.c
--- 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;
 }
diff -r dd3bdf691623 -r 59188d904773 libpurple/protocols/jabber/jingle/rtp.c
--- 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 */
+