aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/ice/src/transport_parameters.vala8
-rw-r--r--plugins/ice/vapi/metadata/Nice-0.1.metadata3
-rw-r--r--plugins/ice/vapi/nice.vapi2
3 files changed, 7 insertions, 6 deletions
diff --git a/plugins/ice/src/transport_parameters.vala b/plugins/ice/src/transport_parameters.vala
index 6d160c62..8766e744 100644
--- a/plugins/ice/src/transport_parameters.vala
+++ b/plugins/ice/src/transport_parameters.vala
@@ -176,8 +176,7 @@ public class Dino.Plugins.Ice.TransportParameters : JingleIceUdp.IceUdpTransport
SList<Nice.Candidate> candidates = new SList<Nice.Candidate>();
foreach (JingleIceUdp.Candidate candidate in remote_candidates) {
if (candidate.component == i) {
- Nice.Candidate nc = candidate_to_nice(candidate);
- candidates.append(nc);
+ candidates.append(candidate_to_nice(candidate));
}
}
int new_candidates = agent.set_remote_candidates(stream_id, i, candidates);
@@ -203,9 +202,8 @@ public class Dino.Plugins.Ice.TransportParameters : JingleIceUdp.IceUdpTransport
foreach (JingleIceUdp.Candidate candidate in remote_candidates) {
if (candidate.ip.has_prefix("fe80::")) continue;
if (candidate.component == i) {
- Nice.Candidate nc = candidate_to_nice(candidate);
- candidates.append(nc);
- debug("remote candidate: %s", agent.generate_local_candidate_sdp(nc));
+ candidates.append(candidate_to_nice(candidate));
+ debug("remote candidate: %s", agent.generate_local_candidate_sdp(candidate_to_nice(candidate)));
}
}
int new_candidates = agent.set_remote_candidates(stream_id, i, candidates);
diff --git a/plugins/ice/vapi/metadata/Nice-0.1.metadata b/plugins/ice/vapi/metadata/Nice-0.1.metadata
index d6899f87..7fcf046a 100644
--- a/plugins/ice/vapi/metadata/Nice-0.1.metadata
+++ b/plugins/ice/vapi/metadata/Nice-0.1.metadata
@@ -6,3 +6,6 @@ Agent.send.buf type="uint8[]" array_length_idx=2
AgentRecvFunc.buf type="uint8[]" array_length_idx=3
PseudoTcpCallbacks#record skip
PseudoTcpSocket#class skip
+
+# Not yet supported by vapigen
+# Candidate copy_function="nice_candidate_copy" free_function="nice_candidate_free" type_id=""
diff --git a/plugins/ice/vapi/nice.vapi b/plugins/ice/vapi/nice.vapi
index 39768b9b..540e2b4e 100644
--- a/plugins/ice/vapi/nice.vapi
+++ b/plugins/ice/vapi/nice.vapi
@@ -164,7 +164,7 @@ namespace Nice {
[Version (since = "0.1.5")]
public signal void streams_removed ([CCode (array_length = false, array_null_terminated = true)] uint[] stream_ids);
}
- [CCode (cheader_filename = "nice.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "nice_candidate_get_type ()")]
+ [CCode (cheader_filename = "nice.h", copy_function = "nice_candidate_copy", free_function = "nice_candidate_free")]
[Compact]
public class Candidate {
public Nice.Address addr;