diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2009-09-27 20:04:44 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2009-09-27 20:04:44 +0000 |
| commit | 118086bee95daac2d549ef08f6a43f8043e2a5ef (patch) | |
| tree | 21582fd7477573ae5a22611fb2f6f1d435b9ed9f | |
| parent | afb474975b05724671bc0ac0d48e5f326b0c0784 (diff) | |
| download | pidgin-118086bee95daac2d549ef08f6a43f8043e2a5ef.tar.gz | |
Cancel ongoing Google relay request when signing out
| -rw-r--r-- | libpurple/protocols/jabber/google.c | 4 | ||||
| -rw-r--r-- | libpurple/protocols/jabber/jabber.c | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libpurple/protocols/jabber/google.c b/libpurple/protocols/jabber/google.c index 8d778b664d..0e9007229c 100644 --- a/libpurple/protocols/jabber/google.c +++ b/libpurple/protocols/jabber/google.c @@ -545,7 +545,9 @@ jabber_google_relay_response_session_handle_initiate_cb( GList *video_codecs = NULL; GList *codecs = NULL; JabberIq *result; - + + js->google_relay_request = NULL; + if (url_text && len > 0) { purple_debug_info("jabber", "got Google relay request response:\n%s\n", url_text); diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c index ab1eda1fe9..dd2750e24a 100644 --- a/libpurple/protocols/jabber/jabber.c +++ b/libpurple/protocols/jabber/jabber.c @@ -1569,6 +1569,10 @@ void jabber_close(PurpleConnection *gc) /* remove Google relay-related stuff */ g_free(js->google_relay_token); g_free(js->google_relay_host); + if (js->google_relay_request) { + purple_util_fetch_url_cancel(js->google_relay_request); + js->google_relay_request = NULL; + } if (js->google_relay_request != NULL) { purple_util_fetch_url_cancel(js->google_relay_request); |