# HG changeset patch
# User Mike Ruprecht <maiku@soc.pidgin.im>
# Date 1231148919 0
# Node ID 50309309bc4dfd35e78c69ffa0c20471f504d01e
# Parent  7d2e06b29f8873a55667700e6c8ca83869d94764
Use the state-changed signal.

diff -r 7d2e06b29f88 -r 50309309bc4d libpurple/protocols/jabber/jingle/rtp.c
--- a/libpurple/protocols/jabber/jingle/rtp.c	Mon Jan 05 06:34:30 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Mon Jan 05 09:48:39 2009 +0000
@@ -264,16 +264,6 @@
 }
 
 static void
-jingle_rtp_hangup_cb(PurpleMedia *media, JingleSession *session)
-{
-	gchar *sid = jingle_session_get_sid(session);
-	jabber_iq_send(jingle_session_to_packet(session, JINGLE_SESSION_TERMINATE));
-	g_hash_table_remove(jingle_session_get_js(session)->medias, sid);
-	g_free(sid);
-	g_object_unref(session);
-}
-
-static void
 jingle_rtp_new_candidate_cb(PurpleMedia *media, gchar *sid, gchar *name, FsCandidate *candidate, JingleSession *session)
 {
 	purple_debug_info("jingle-rtp", "jingle_rtp_new_candidate_cb\n");
@@ -334,6 +324,16 @@
 		gchar *sid, gchar *name, JingleSession *session)
 {
 	purple_debug_info("jingle-rtp", "state-changed: type %d id: %s name: %s\n", type, sid, name);
+
+	if (sid == NULL && name == NULL &&
+			jingle_session_is_initiator(session) == TRUE) {
+		gchar *sid = jingle_session_get_sid(session);
+		jabber_iq_send(jingle_session_to_packet(session,
+				JINGLE_SESSION_TERMINATE));
+		g_hash_table_remove(jingle_session_get_js(session)->medias, sid);
+		g_free(sid);
+		g_object_unref(session);
+	}
 }
 
 static PurpleMedia *
@@ -363,10 +363,6 @@
 	g_hash_table_insert(js->medias, sid, media);
 
 	/* connect callbacks */
-	g_signal_connect(G_OBJECT(media), "reject",
-				 G_CALLBACK(jingle_rtp_hangup_cb), session);
-	g_signal_connect(G_OBJECT(media), "hangup",
-				 G_CALLBACK(jingle_rtp_hangup_cb), session);
 	g_signal_connect(G_OBJECT(media), "new-candidate",
 				 G_CALLBACK(jingle_rtp_new_candidate_cb), session);
 	g_signal_connect(G_OBJECT(media), "candidates-prepared",