Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 30950:105437d8253f | 30952:d873eeaccfc2 |
|---|---|
| 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)) |