pidgin.vv: b74a382d: Temporarily fix an oversight.

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: b74a382d93298ba37c0a570b978e2292ae2556c1
Ancestor: 15a7434b0496ba7ba0f67f142d3f22f0bd1fd8b3
Author: maiku at soc.pidgin.im
Date: 2009-01-05T10:19:51
Branch: im.pidgin.pidgin.vv
URL: http://d.pidgin.im/viewmtn/revision/info/b74a382d93298ba37c0a570b978e2292ae2556c1

Modified files:
        libpurple/media.c libpurple/protocols/jabber/jingle/rtp.c

ChangeLog: 

Temporarily fix an oversight.

-------------- next part --------------
============================================================
--- libpurple/media.c	be398504a06b5ae13418958f49d5513d0361f071
+++ libpurple/media.c	28892988216bcbf29e70b211fe53c6757f588d99
@@ -891,9 +891,15 @@ purple_media_got_hangup(PurpleMedia *med
 void
 purple_media_got_hangup(PurpleMedia *media)
 {
+/*
+ * There's no way to tell who hung up with the new structure.
+ * I'm commenting this out until this is resolved.
+ */
+#if 0
 	g_signal_emit(media, purple_media_signals[STATE_CHANGED],
 			0, PURPLE_MEDIA_STATE_CHANGED_END,
 			NULL, NULL);
+#endif
 	g_signal_emit(media, purple_media_signals[GOT_HANGUP], 0);
 }
 
============================================================
--- libpurple/protocols/jabber/jingle/rtp.c	cdbb19dcad967c4e565a2f1e3a656ed62a1ad0a9
+++ libpurple/protocols/jabber/jingle/rtp.c	917f1d83db6d705fa3d733810299b3934cbabee2
@@ -325,8 +325,8 @@ jingle_rtp_state_changed_cb(PurpleMedia 
 {
 	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) {
+	if (type == PURPLE_MEDIA_STATE_CHANGED_END &&
+			sid == NULL && name == NULL) {
 		gchar *sid = jingle_session_get_sid(session);
 		jabber_iq_send(jingle_session_to_packet(session,
 				JINGLE_SESSION_TERMINATE));