Commit 708857c3 authored by Dafydd Harries's avatar Dafydd Harries

remove nice_agent_free; add/fix calls to nice_udp_socket_factory_close

darcs-hash:20070213145422-c9803-fbf639e9a7ee7f4e4d24bbd6ae189ced4e84dfe0.gz
parent f957f993
...@@ -1013,17 +1013,6 @@ nice_agent_get_local_candidates ( ...@@ -1013,17 +1013,6 @@ nice_agent_get_local_candidates (
return agent->local_candidates; return agent->local_candidates;
} }
/**
* nice_agent_free:
* @agent: a NiceAgent
*
* Free the agent.
**/
void
nice_agent_free (NiceAgent *agent)
{
g_object_unref (agent);
}
static void static void
nice_agent_dispose (GObject *object) nice_agent_dispose (GObject *object)
......
...@@ -79,9 +79,6 @@ nice_agent_remove_stream ( ...@@ -79,9 +79,6 @@ nice_agent_remove_stream (
NiceAgent *agent, NiceAgent *agent,
guint stream_id); guint stream_id);
void
nice_agent_free (NiceAgent *agent);
void void
nice_agent_add_remote_candidate ( nice_agent_add_remote_candidate (
NiceAgent *agent, NiceAgent *agent,
......
...@@ -34,7 +34,8 @@ main (void) ...@@ -34,7 +34,8 @@ main (void)
/* check no local candidates were left behind when streams were removed*/ /* check no local candidates were left behind when streams were removed*/
g_assert (NULL == agent->local_candidates); g_assert (NULL == agent->local_candidates);
nice_agent_free (agent); g_object_unref (agent);
nice_udp_socket_factory_close (&factory);
return 0; return 0;
} }
......
...@@ -53,8 +53,8 @@ main (void) ...@@ -53,8 +53,8 @@ main (void)
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);
g_main_loop_run (loop); g_main_loop_run (loop);
g_object_unref (agent);
nice_udp_socket_factory_close (&factory); nice_udp_socket_factory_close (&factory);
nice_agent_free (agent);
return 0; return 0;
} }
...@@ -91,7 +91,7 @@ main (void) ...@@ -91,7 +91,7 @@ main (void)
/* clean up */ /* clean up */
g_slist_free (fds); g_slist_free (fds);
nice_agent_free (agent); g_object_unref (agent);
return 0; return 0;
} }
......
...@@ -40,7 +40,7 @@ main (void) ...@@ -40,7 +40,7 @@ main (void)
} }
/* clean up */ /* clean up */
nice_agent_free (agent); g_object_unref (agent);
nice_udp_socket_factory_close (&factory); nice_udp_socket_factory_close (&factory);
return 0; return 0;
......
...@@ -148,7 +148,7 @@ main (void) ...@@ -148,7 +148,7 @@ main (void)
/* clean up */ /* clean up */
nice_agent_free (agent); g_object_unref (agent);
nice_udp_socket_factory_close (&factory); nice_udp_socket_factory_close (&factory);
return 0; return 0;
......
...@@ -215,7 +215,7 @@ main (void) ...@@ -215,7 +215,7 @@ main (void)
test_stun_valid_password (agent, remote_addr); test_stun_valid_password (agent, remote_addr);
/* clean up */ /* clean up */
nice_agent_free (agent); g_object_unref (agent);
nice_udp_socket_factory_close (&factory); nice_udp_socket_factory_close (&factory);
return 0; return 0;
......
...@@ -61,7 +61,7 @@ main (void) ...@@ -61,7 +61,7 @@ main (void)
g_assert (0 == strcmp (candidate->password, "password")); g_assert (0 == strcmp (candidate->password, "password"));
/* clean up */ /* clean up */
nice_agent_free (agent); g_object_unref (agent);
return 0; return 0;
} }
...@@ -183,7 +183,7 @@ main (gint argc, gchar *argv[]) ...@@ -183,7 +183,7 @@ main (gint argc, gchar *argv[])
// clean up // clean up
nice_agent_free (agent); g_object_unref (agent);
g_object_unref (pipeline); g_object_unref (pipeline);
gst_deinit (); gst_deinit ();
......
...@@ -128,7 +128,7 @@ END: ...@@ -128,7 +128,7 @@ END:
g_slist_free (in_fds); g_slist_free (in_fds);
nice_udp_socket_factory_close (&factory); nice_udp_socket_factory_close (&factory);
nice_agent_free (agent); g_object_unref (agent);
} }
static gboolean static gboolean
......
...@@ -134,7 +134,7 @@ accept_connection ( ...@@ -134,7 +134,7 @@ accept_connection (
OUT: OUT:
g_slist_free (fds); g_slist_free (fds);
nice_agent_free (agent); g_object_unref (agent);
return ret; return ret;
} }
......
...@@ -11,7 +11,6 @@ T nice_address_to_string ...@@ -11,7 +11,6 @@ T nice_address_to_string
T nice_agent_add_local_address T nice_agent_add_local_address
T nice_agent_add_remote_candidate T nice_agent_add_remote_candidate
T nice_agent_add_stream T nice_agent_add_stream
T nice_agent_free
T nice_agent_get_local_candidates T nice_agent_get_local_candidates
T nice_agent_get_type T nice_agent_get_type
T nice_agent_main_context_attach T nice_agent_main_context_attach
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment