changeset 24995:8dba34f5f21a

Temporarily fix an oversight.
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 05 Jan 2009 10:19:51 +0000
parents 50309309bc4d
children 266c3cc02e0e
files libpurple/media.c libpurple/protocols/jabber/jingle/rtp.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/media.c	Mon Jan 05 09:48:39 2009 +0000
+++ b/libpurple/media.c	Mon Jan 05 10:19:51 2009 +0000
@@ -891,9 +891,15 @@
 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);
 }
 
--- a/libpurple/protocols/jabber/jingle/rtp.c	Mon Jan 05 09:48:39 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Mon Jan 05 10:19:51 2009 +0000
@@ -325,8 +325,8 @@
 {
 	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));