Mercurial > pidgin

comparison libpurple/protocols/jabber/jingle/jingle.c @ 30518:090e141a5214

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some merge-resolving...
author Marcus Lundblad <ml@update.uu.se>
date Fri, 08 Jan 2010 23:33:44 +0000
parents 0712ce23901e
children d873eeaccfc2
comparison
equal deleted inserted replaced
30516:d4ec9ba82814 30518:090e141a5214
27 #include "network.h" 27 #include "network.h"
28 28
29 #include "content.h" 29 #include "content.h"
30 #include "debug.h" 30 #include "debug.h"
31 #include "jingle.h" 31 #include "jingle.h"
32 #include <string.h>
33 #include "session.h" 32 #include "session.h"
34 #include "iceudp.h" 33 #include "iceudp.h"
35 #include "rawudp.h" 34 #include "rawudp.h"
36 #include "rtp.h" 35 #include "rtp.h"
37 36
38 #ifdef USE_VV 37 #include <string.h>
39 #include <gst/farsight/fs-conference-iface.h>
40 #include <gst/farsight/fs-element-added-notifier.h>
41 #endif
42 38
43 GType 39 GType
44 jingle_get_type(const gchar *type) 40 jingle_get_type(const gchar *type)
45 { 41 {
46 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) 42 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP))