diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-01-08 23:33:44 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-01-08 23:33:44 +0000 |
| commit | 14c5b3cf333df0a926c2808464a3fcb1f191da7f (patch) | |
| tree | fb5be8228017a34a80a401666b98bfb721745f0e | |
| parent | 6f2df36d544fb32947547a1270e5334c4e6d9875 (diff) | |
| download | pidgin-14c5b3cf333df0a926c2808464a3fcb1f191da7f.tar.gz | |
Some merge-resolving...
| -rw-r--r-- | libpurple/protocols/jabber/jingle/jingle.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libpurple/protocols/jabber/jingle/jingle.c b/libpurple/protocols/jabber/jingle/jingle.c index d87dc5ae41..92d2da5e7e 100644 --- a/libpurple/protocols/jabber/jingle/jingle.c +++ b/libpurple/protocols/jabber/jingle/jingle.c @@ -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) |