# HG changeset patch # User Mike Ruprecht # Date 1212739477 0 # Node ID a7be3074923bf5db17d3a2d9d307d449a6f6a9a3 # Parent e73b03097664cef53782ea65438046e2991a56fe Corrected debug labels s/"jabber"/"jingle"/ diff -r e73b03097664 -r a7be3074923b libpurple/protocols/jabber/jingle.c --- a/libpurple/protocols/jabber/jingle.c Mon Jun 02 20:59:20 2008 +0000 +++ b/libpurple/protocols/jabber/jingle.c Fri Jun 06 08:04:37 2008 +0000 @@ -512,7 +512,7 @@ xmlnode_insert_child(result->node, jingle); jabber_iq_send(result); - purple_debug_info("jabber", "Sent session accept, starting stream\n"); + purple_debug_info("jingle", "Sent session accept, starting stream\n"); gst_element_set_state(purple_media_get_audio_pipeline(session->media), GST_STATE_PLAYING); session->session_started = TRUE; @@ -556,7 +556,7 @@ JabberIq *result = jabber_iq_new(jabber_jingle_session_get_js(session), JABBER_IQ_SET); xmlnode *jingle = jabber_jingle_session_create_transport_info(session); - purple_debug_info("jabber", "jabber_session_candidates_prepared: %d candidates\n", + purple_debug_info("jingle", "jabber_session_candidates_prepared: %d candidates\n", g_list_length(purple_media_get_local_audio_candidates(session->media))); xmlnode_set_attrib(result->node, "to", jabber_jingle_session_get_remote_jid(session)); @@ -574,13 +574,13 @@ FsCandidate *remote_candidate, JingleSession *session) { - purple_debug_info("jabber", "jabber_candidate_pair_established called\n"); + purple_debug_info("jingle", "jabber_candidate_pair_established called\n"); /* if we are the initiator, we should send a content-modify message */ if (jabber_jingle_session_is_initiator(session)) { JabberIq *result; xmlnode *jingle; - purple_debug_info("jabber", "we are the initiator, let's send content-modify\n"); + purple_debug_info("jingle", "we are the initiator, let's send content-modify\n"); result = jabber_iq_new(jabber_jingle_session_get_js(session), JABBER_IQ_SET); @@ -606,13 +606,13 @@ session->js->gc, "fsrtpconference", remote_jid); if (!media) { - purple_debug_error("jabber", "Couldn't create fsrtpconference\n"); + purple_debug_error("jingle", "Couldn't create fsrtpconference\n"); return FALSE; } /* this will need to be changed to "nice" once the libnice transmitter is finished */ if (!purple_media_add_stream(media, remote_jid, PURPLE_MEDIA_AUDIO, "rawudp")) { - purple_debug_error("jabber", "Couldn't create audio stream\n"); + purple_debug_error("jingle", "Couldn't create audio stream\n"); purple_media_reject(media); return FALSE; } @@ -661,7 +661,7 @@ /* create transport-info package */ result = jabber_iq_new(jabber_jingle_session_get_js(session), JABBER_IQ_SET); jingle = jabber_jingle_session_create_transport_info(session); - purple_debug_info("jabber", "jabber_session_candidates_prepared: %d candidates\n", + purple_debug_info("jingle", "jabber_session_candidates_prepared: %d candidates\n", g_list_length(purple_media_get_local_audio_candidates(session->media))); xmlnode_set_attrib(result->node, "to", jabber_jingle_session_get_remote_jid(session)); @@ -688,12 +688,12 @@ /* construct JID to send to */ jb = jabber_buddy_find(js, who, FALSE); if (!jb) { - purple_debug_error("jabber", "Could not find Jabber buddy\n"); + purple_debug_error("jingle", "Could not find Jabber buddy\n"); return NULL; } jbr = jabber_buddy_find_resource(jb, NULL); if (!jbr) { - purple_debug_error("jabber", "Could not find buddy's resource\n"); + purple_debug_error("jingle", "Could not find buddy's resource\n"); } if ((strchr(who, '/') == NULL) && jbr && (jbr->name != NULL)) { @@ -802,29 +802,29 @@ transport = xmlnode_get_child(content, "transport"); /* fetch codecs from remote party */ - purple_debug_info("jabber", "get codecs from session-accept\n"); + purple_debug_info("jingle", "get codecs from session-accept\n"); remote_codecs = jabber_jingle_get_codecs(description); - purple_debug_info("jabber", "get transport candidates from session accept\n"); + purple_debug_info("jingle", "get transport candidates from session accept\n"); remote_transports = jabber_jingle_get_candidates(transport); - purple_debug_info("jabber", "Got %d codecs from responder\n", + purple_debug_info("jingle", "Got %d codecs from responder\n", g_list_length(remote_codecs)); - purple_debug_info("jabber", "Got %d transport candidates from responder\n", + purple_debug_info("jingle", "Got %d transport candidates from responder\n", g_list_length(remote_transports)); - purple_debug_info("jabber", "Setting remote codecs on stream\n"); + purple_debug_info("jingle", "Setting remote codecs on stream\n"); purple_media_set_remote_audio_codecs(session->media, jabber_jingle_session_get_remote_jid(session), remote_codecs); codec_intersection = purple_media_get_negotiated_audio_codecs(session->media); - purple_debug_info("jabber", "codec_intersection contains %d elems\n", + purple_debug_info("jingle", "codec_intersection contains %d elems\n", g_list_length(codec_intersection)); /* get the top codec */ if (g_list_length(codec_intersection) > 0) { top = (FsCodec *) codec_intersection->data; - purple_debug_info("jabber", "Found a suitable codec on stream = %d\n", + purple_debug_info("jingle", "Found a suitable codec on stream = %d\n", top->id); /* we have found a suitable codec, but we will not start the stream @@ -850,7 +850,7 @@ if (!strcmp(action, "session-accept")) { purple_media_got_accept(jabber_jingle_session_get_media(session)); - purple_debug_info("jabber", "Got session-accept, starting stream\n"); + purple_debug_info("jingle", "Got session-accept, starting stream\n"); gst_element_set_state(purple_media_get_audio_pipeline(session->media), GST_STATE_PLAYING); } @@ -873,7 +873,7 @@ JabberIq *result = NULL; if (!jingle) { - purple_debug_error("jabber", "Malformed request"); + purple_debug_error("jingle", "Malformed request"); return; } @@ -882,7 +882,7 @@ if (jabber_jingle_session_find_by_id(js, sid)) { /* This should only happen if you start a session with yourself */ - purple_debug_error("jabber", "Jingle session with id={%s} already exists\n", sid); + purple_debug_error("jingle", "Jingle session with id={%s} already exists\n", sid); return; } session = jabber_jingle_session_create_by_id(js, sid); @@ -890,7 +890,7 @@ /* init media */ content = xmlnode_get_child(jingle, "content"); if (!content) { - purple_debug_error("jabber", "jingle tag must contain content tag\n"); + purple_debug_error("jingle", "jingle tag must contain content tag\n"); /* should send error here */ return; } @@ -898,13 +898,13 @@ description = xmlnode_get_child(content, "description"); if (!description) { - purple_debug_error("jabber", "content tag must contain description tag\n"); + purple_debug_error("jingle", "content tag must contain description tag\n"); /* we should create an error iq here */ return; } if (!jabber_jingle_session_initiate_media_internal(session, initiator, initiator)) { - purple_debug_error("jabber", "Couldn't start media session with %s\n", initiator); + purple_debug_error("jingle", "Couldn't start media session with %s\n", initiator); jabber_jingle_session_destroy(session); /* we should create an error iq here */ return; @@ -929,7 +929,7 @@ JingleSession *session = jabber_jingle_session_find_by_id(js, sid); if (!session) { - purple_debug_error("jabber", "jabber_handle_session_terminate couldn't find session\n"); + purple_debug_error("jingle", "jabber_handle_session_terminate couldn't find session\n"); return; } @@ -960,7 +960,7 @@ JingleSession *session = jabber_jingle_session_find_by_id(js, sid); if (!session) - purple_debug_error("jabber", "jabber_handle_session_candidates couldn't find session\n"); + purple_debug_error("jingle", "jabber_handle_session_candidates couldn't find session\n"); /* send acknowledement */ xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));