Mercurial > pidgin
comparison libpurple/protocols/jabber/jingle/jingle.c @ 30520:025fe823a921
Fix merge and a compilation error
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sun, 14 Feb 2010 22:42:11 +0000 |
parents | d873eeaccfc2 |
children | ba69a8d1cd9a |
comparison
equal
deleted
inserted
replaced
30519:d873eeaccfc2 | 30520:025fe823a921 |
---|---|
33 #include "iceudp.h" | 33 #include "iceudp.h" |
34 #include "rawudp.h" | 34 #include "rawudp.h" |
35 #include "rtp.h" | 35 #include "rtp.h" |
36 | 36 |
37 #include <string.h> | 37 #include <string.h> |
38 #ifdef USE_VV | |
39 #include <gst/gst.h> | |
40 #endif | |
38 | 41 |
39 GType | 42 GType |
40 jingle_get_type(const gchar *type) | 43 jingle_get_type(const gchar *type) |
41 { | 44 { |
42 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) | 45 if (!strcmp(type, JINGLE_TRANSPORT_RAWUDP)) |