pidgin: c637c732: Handle the local accept signal with GTal...

[maiku at pidgin.im]

-----------------------------------------------------------------
Revision: c637c732c528fb4d5bd6023bd572dd7a74714182
Ancestor: f286f2cfdfedd1e075eafa24e669794f1c19044c
Author: maiku at pidgin.im
Date: 2009-08-25T01:23:37
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c637c732c528fb4d5bd6023bd572dd7a74714182

Modified files:
        libpurple/protocols/jabber/google.c

ChangeLog: 

Handle the local accept signal with GTalk/Gmail. This was causing calls
initiated by GTalk/Gmail to ring until they timed out if everything
apart from accepting was done before clicking accept. Fixes #10043

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/google.c	5c4c306297c1b9a6a1b4c86636600dbe41d6c568
+++ libpurple/protocols/jabber/google.c	940c05f135865736e51fa0311197d6591352d1e6
@@ -296,6 +296,9 @@ google_session_stream_info_cb(PurpleMedi
 		gchar *sid, gchar *name, gboolean local,
 		GoogleSession *session)
 {
+	if (sid != NULL || name != NULL)
+		return;
+
 	if (type == PURPLE_MEDIA_INFO_HANGUP) {
 		xmlnode *sess;
 		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
@@ -314,6 +317,8 @@ google_session_stream_info_cb(PurpleMedi
 		xmlnode_insert_child(iq->node, sess);
 
 		jabber_iq_send(iq);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
+		google_session_ready(session);
 	}
 }