Mercurial > pidgin.yaz
changeset 28440:1e529b03ec81
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
| author | maiku@pidgin.im |
|---|---|
| date | Tue, 25 Aug 2009 01:23:37 +0000 |
| parents | e61b10db0044 |
| children | 0775b7b7298e 3896cbf6336a |
| files | libpurple/protocols/jabber/google.c |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/google.c Mon Aug 24 22:27:18 2009 +0000 +++ b/libpurple/protocols/jabber/google.c Tue Aug 25 01:23:37 2009 +0000 @@ -296,6 +296,9 @@ 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 @@ xmlnode_insert_child(iq->node, sess); jabber_iq_send(iq); + } else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) { + google_session_ready(session); } }