libpurple/protocols/jabber/jingle/rtp.c

branch
string-comparison-r2
changeset 38256
035f00c4fd87
parent 33789
48af26131376
child 38258
9a6551eba09c
equal deleted inserted replaced
38239:f76c1aa92c07 38256:035f00c4fd87
606 transmitter = "nice"; 606 transmitter = "nice";
607 else 607 else
608 transmitter = "notransmitter"; 608 transmitter = "notransmitter";
609 g_object_unref(transport); 609 g_object_unref(transport);
610 610
611 is_audio = g_str_equal(media_type, "audio"); 611 is_audio = purple_strequal(media_type, "audio");
612 612
613 if (purple_strequal(senders, "both")) 613 if (purple_strequal(senders, "both"))
614 type = is_audio ? PURPLE_MEDIA_AUDIO 614 type = is_audio ? PURPLE_MEDIA_AUDIO
615 : PURPLE_MEDIA_VIDEO; 615 : PURPLE_MEDIA_VIDEO;
616 else if (purple_strequal(senders, "initiator") == 616 else if (purple_strequal(senders, "initiator") ==
634 g_free(params); 634 g_free(params);
635 g_object_unref(session); 635 g_object_unref(session);
636 return FALSE; 636 return FALSE;
637 } 637 }
638 638
639 if (g_str_equal(creator, "initiator")) 639 if (purple_strequal(creator, "initiator"))
640 is_creator = jingle_session_is_initiator(session); 640 is_creator = jingle_session_is_initiator(session);
641 else 641 else
642 is_creator = !jingle_session_is_initiator(session); 642 is_creator = !jingle_session_is_initiator(session);
643 g_free(creator); 643 g_free(creator);
644 644
673 if (media == NULL) { 673 if (media == NULL) {
674 purple_debug_warning("jingle-rtp", "missing media type\n"); 674 purple_debug_warning("jingle-rtp", "missing media type\n");
675 return NULL; 675 return NULL;
676 } 676 }
677 677
678 if (g_str_equal(media, "video")) { 678 if (purple_strequal(media, "video")) {
679 type = PURPLE_MEDIA_VIDEO; 679 type = PURPLE_MEDIA_VIDEO;
680 } else if (g_str_equal(media, "audio")) { 680 } else if (purple_strequal(media, "audio")) {
681 type = PURPLE_MEDIA_AUDIO; 681 type = PURPLE_MEDIA_AUDIO;
682 } else { 682 } else {
683 purple_debug_warning("jingle-rtp", "unknown media type: %s\n", 683 purple_debug_warning("jingle-rtp", "unknown media type: %s\n",
684 media); 684 media);
685 return NULL; 685 return NULL;

mercurial