diff libgaim/connection.c @ 14838:71404dbedabc

[gaim-migrate @ 17607] I don't believe this check is needed committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sat, 28 Oct 2006 20:05:27 +0000
parents 4124030c3f3a
children 4b7065af8549
line wrap: on
line diff
--- a/libgaim/connection.c	Sat Oct 28 20:04:03 2006 +0000
+++ b/libgaim/connection.c	Sat Oct 28 20:05:27 2006 +0000
@@ -31,6 +31,7 @@
 #include "log.h"
 #include "notify.h"
 #include "prefs.h"
+#include "proxy.h"
 #include "request.h"
 #include "server.h"
 #include "signals.h"
@@ -188,13 +189,11 @@
 
 	update_keepalive(gc, FALSE);
 
-	if (gc->prpl != NULL)
-	{
-		prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	gaim_proxy_connect_cancel_with_handle(gc);
 
-		if (prpl_info->close)
-			(prpl_info->close)(gc);
-	}
+	prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
+	if (prpl_info->close)
+		(prpl_info->close)(gc);
 
 	/* Clear out the proto data that was freed in the prpl close method*/
 	buddies = gaim_find_buddies(account, NULL);