Mercurial > pidgin

comparison libpurple/protocols/jabber/jingle/rtp.c @ 27835:584fa66dfb31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove the "accepted" signal from PurpleMedia as it was redundant.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Wed, 05 Aug 2009 03:37:45 +0000
parents 813f2eb3fdc8
children f5580e1ca4b1
comparison
equal deleted inserted replaced
27834:fa2e83d7ba7f 27835:584fa66dfb31
353 } 353 }
354 354
355 static void jingle_rtp_ready(JingleSession *session); 355 static void jingle_rtp_ready(JingleSession *session);
356 356
357 static void 357 static void
358 jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name,
359 JingleSession *session)
360 {
361 purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n");
362 jingle_rtp_ready(session);
363 }
364
365 static void
366 jingle_rtp_candidates_prepared_cb(PurpleMedia *media, 358 jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
367 gchar *sid, gchar *name, JingleSession *session) 359 gchar *sid, gchar *name, JingleSession *session)
368 { 360 {
369 JingleContent *content = jingle_session_find_content( 361 JingleContent *content = jingle_session_find_content(
370 session, sid, NULL); 362 session, sid, NULL);
478 g_object_unref(session); 470 g_object_unref(session);
479 } else if (type == PURPLE_MEDIA_INFO_REJECT) { 471 } else if (type == PURPLE_MEDIA_INFO_REJECT) {
480 jabber_iq_send(jingle_session_terminate_packet( 472 jabber_iq_send(jingle_session_terminate_packet(
481 session, "decline")); 473 session, "decline"));
482 g_object_unref(session); 474 g_object_unref(session);
475 } else if (type == PURPLE_MEDIA_INFO_ACCEPT &&
476 jingle_session_is_initiator(session) == FALSE) {
477 jingle_rtp_ready(session);
483 } 478 }
484 } 479 }
485 480
486 static void 481 static void
487 jingle_rtp_ready(JingleSession *session) 482 jingle_rtp_ready(JingleSession *session)
502 jabber_iq_send(jingle_session_to_packet(session, 497 jabber_iq_send(jingle_session_to_packet(session,
503 JINGLE_SESSION_ACCEPT)); 498 JINGLE_SESSION_ACCEPT));
504 } 499 }
505 500
506 g_signal_handlers_disconnect_by_func(G_OBJECT(media), 501 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
507 G_CALLBACK(jingle_rtp_accepted_cb), session);
508 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
509 G_CALLBACK(jingle_rtp_candidates_prepared_cb), 502 G_CALLBACK(jingle_rtp_candidates_prepared_cb),
510 session); 503 session);
511 g_signal_handlers_disconnect_by_func(G_OBJECT(media), 504 g_signal_handlers_disconnect_by_func(G_OBJECT(media),
512 G_CALLBACK(jingle_rtp_codecs_changed_cb), 505 G_CALLBACK(jingle_rtp_codecs_changed_cb),
513 session); 506 session);
537 } 530 }
538 531
539 purple_media_set_prpl_data(media, session); 532 purple_media_set_prpl_data(media, session);
540 533
541 /* connect callbacks */ 534 /* connect callbacks */
542 if (jingle_session_is_initiator(session) == FALSE)
543 g_signal_connect(G_OBJECT(media), "accepted",
544 G_CALLBACK(jingle_rtp_accepted_cb), session);
545 g_signal_connect(G_OBJECT(media), "candidates-prepared", 535 g_signal_connect(G_OBJECT(media), "candidates-prepared",
546 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session); 536 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
547 g_signal_connect(G_OBJECT(media), "codecs-changed", 537 g_signal_connect(G_OBJECT(media), "codecs-changed",
548 G_CALLBACK(jingle_rtp_codecs_changed_cb), session); 538 G_CALLBACK(jingle_rtp_codecs_changed_cb), session);
549 g_signal_connect(G_OBJECT(media), "state-changed", 539 g_signal_connect(G_OBJECT(media), "state-changed",