/cpw/tomkiewicz/gg11: e1197edc9b24: Merge from trunk

[Tomasz Wasilczyk]

Changeset: e1197edc9b24e7eb83909026e8ce7d47ce19eeb5
Author:	 Tomasz Wasilczyk <tomkiewicz at cpw.pidgin.im>
Date:	 2012-10-22 01:28 +0200
Branch:	 default
URL: http://hg.pidgin.im/cpw/tomkiewicz/gg11/rev/e1197edc9b24

Description:

Merge from trunk

diffstat:

 libpurple/http.c |  3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diffs (13 lines):

diff --git a/libpurple/http.c b/libpurple/http.c
--- a/libpurple/http.c
+++ b/libpurple/http.c
@@ -1274,6 +1274,9 @@ static void purple_http_connection_termi
 
 void purple_http_conn_cancel(PurpleHttpConnection *http_conn)
 {
+	if (http_conn == NULL)
+		return;
+
 	http_conn->response->code = 0;
 	_purple_http_disconnect(http_conn);
 	purple_http_connection_terminate(http_conn);