# HG changeset patch
# User Marcus Lundblad <ml@update.uu.se>
# Date 1262993631 0
# Node ID d873eeaccfc2fdff1e22af98ea9b09ef46fb9170
# Parent  105437d8253ffc862c168475dd6bda2585d1fdfd# Parent  090e141a52141e90d9d85376a3ed5ac2c41b895e
merge of '0e796ed7d94b3fa776ecd40ce0da65ae3f6b3242'
     and 'ceed48b0e66b4c3d505f6403da76076d6ee203a5'

diff -r 105437d8253f -r d873eeaccfc2 libpurple/protocols/jabber/jingle/jingle.c
--- a/libpurple/protocols/jabber/jingle/jingle.c	Fri Jan 08 23:22:19 2010 +0000
+++ b/libpurple/protocols/jabber/jingle/jingle.c	Fri Jan 08 23:33:51 2010 +0000
@@ -29,16 +29,12 @@
 #include "content.h"
 #include "debug.h"
 #include "jingle.h"
-#include <string.h>
 #include "session.h"
 #include "iceudp.h"
 #include "rawudp.h"
 #include "rtp.h"
 
-#ifdef USE_VV
-#include <gst/farsight/fs-conference-iface.h>
-#include <gst/farsight/fs-element-added-notifier.h>
-#endif
+#include <string.h>
 
 GType
 jingle_get_type(const gchar *type)