# HG changeset patch # User Mike Ruprecht # Date 1212740817 0 # Node ID 9983353706b828f76a661afb88c08c3b53cc1212 # Parent 12a16471f94e13ea3b1bfdab6676fabeecfc099c# Parent a7be3074923bf5db17d3a2d9d307d449a6f6a9a3 merge of '3969ff3f40069748728f9ee2376a4bab3f089d04' and 'f284e82ae268ed7050aba789e9bbb15885d4fb6a' diff -r 12a16471f94e -r 9983353706b8 libpurple/protocols/jabber/jingle.c --- a/libpurple/protocols/jabber/jingle.c Fri Jun 06 07:43:03 2008 +0000 +++ b/libpurple/protocols/jabber/jingle.c Fri Jun 06 08:26:57 2008 +0000 @@ -750,7 +750,7 @@ media, jabber_jingle_session_content_get_name(jsc), jabber_jingle_session_get_remote_jid(session)); - purple_debug_info("jabber", + purple_debug_info("jingle", "jabber_session_candidates_prepared: %d candidates\n", g_list_length(candidates)); for (; candidates; candidates = candidates->next) { @@ -773,7 +773,7 @@ } - 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_pipeline(session->media), GST_STATE_PLAYING); session->session_started = TRUE; @@ -856,7 +856,7 @@ JingleSessionContent *jsc = contents->data; GList *candidates = purple_media_get_local_audio_candidates( jabber_jingle_session_get_media(session)); - purple_debug_info("jabber", + purple_debug_info("jingle", "jabber_session_candidates_prepared: %d candidates\n", g_list_length(candidates)); for (; candidates; candidates = candidates->next) { @@ -880,7 +880,7 @@ JingleSession *session) { #if 0 - purple_debug_info("jabber", "jabber_candidate_pair_established called\n"); + purple_debug_info("jingle", "jabber_candidate_pair_established called\n"); /* if we are the responder, we should send a sesson-accept message */ if (!jabber_jingle_session_is_initiator(session) && !session->session_started) { @@ -902,7 +902,7 @@ 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; } @@ -923,7 +923,7 @@ } if (!result) { - purple_debug_error("jabber", "Couldn't create stream\n"); + purple_debug_error("jingle", "Couldn't create stream\n"); purple_media_reject(media); return FALSE; } @@ -978,7 +978,7 @@ jabber_jingle_session_get_media(session), jabber_jingle_session_content_get_name(jsc), jabber_jingle_session_get_remote_jid(session)); - purple_debug_info("jabber", + purple_debug_info("jingle", "jabber_session_candidates_prepared: %d candidates\n", g_list_length(candidates)); for (; candidates; candidates = candidates->next) { @@ -1006,12 +1006,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)) { @@ -1127,17 +1127,17 @@ 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_codecs(session->media, xmlnode_get_attrib(content, "name"), @@ -1146,12 +1146,12 @@ codec_intersection = purple_media_get_negotiated_codecs(session->media, xmlnode_get_attrib(content, "name")); - 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 @@ -1180,7 +1180,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_pipeline(session->media), GST_STATE_PLAYING); } @@ -1210,7 +1210,7 @@ GList *codecs = NULL; if (!jingle) { - purple_debug_error("jabber", "Malformed request"); + purple_debug_error("jingle", "Malformed request"); return; } @@ -1219,7 +1219,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; } @@ -1229,7 +1229,7 @@ content = xmlnode_get_next_twin(content)) { /* init media */ 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; } @@ -1237,7 +1237,7 @@ 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; } @@ -1254,7 +1254,7 @@ } 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; @@ -1264,7 +1264,7 @@ content = xmlnode_get_next_twin(content)) { /* init media */ 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; } @@ -1272,7 +1272,7 @@ 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; } @@ -1297,7 +1297,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; } @@ -1322,7 +1322,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"));