Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/jingle/jingle.c @ 30952:d873eeaccfc2
merge of '0e796ed7d94b3fa776ecd40ce0da65ae3f6b3242'
and 'ceed48b0e66b4c3d505f6403da76076d6ee203a5'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Fri, 08 Jan 2010 23:33:51 +0000 |
| parents | 105437d8253f 090e141a5214 |
| children | 025fe823a921 |
line wrap: on
line diff
--- 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)