Mercurial > pidgin

comparison libgaim/connection.c @ 14838:71404dbedabc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
14837:118fd0dc5b6e 14838:71404dbedabc
29 #include "dbus-maybe.h" 29 #include "dbus-maybe.h"
30 #include "debug.h" 30 #include "debug.h"
31 #include "log.h" 31 #include "log.h"
32 #include "notify.h" 32 #include "notify.h"
33 #include "prefs.h" 33 #include "prefs.h"
34 #include "proxy.h"
34 #include "request.h" 35 #include "request.h"
35 #include "server.h" 36 #include "server.h"
36 #include "signals.h" 37 #include "signals.h"
37 #include "util.h" 38 #include "util.h"
38 39
186 gaim_conv_chat_left(GAIM_CONV_CHAT(b)); 187 gaim_conv_chat_left(GAIM_CONV_CHAT(b));
187 } 188 }
188 189
189 update_keepalive(gc, FALSE); 190 update_keepalive(gc, FALSE);
190 191
191 if (gc->prpl != NULL) 192 gaim_proxy_connect_cancel_with_handle(gc);
192 { 193
193 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl); 194 prpl_info = GAIM_PLUGIN_PROTOCOL_INFO(gc->prpl);
194 195 if (prpl_info->close)
195 if (prpl_info->close) 196 (prpl_info->close)(gc);
196 (prpl_info->close)(gc);
197 }
198 197
199 /* Clear out the proto data that was freed in the prpl close method*/ 198 /* Clear out the proto data that was freed in the prpl close method*/
200 buddies = gaim_find_buddies(account, NULL); 199 buddies = gaim_find_buddies(account, NULL);
201 for (tmp = buddies; tmp; tmp = tmp->next) { 200 for (tmp = buddies; tmp; tmp = tmp->next) {
202 GaimBuddy *buddy = tmp->data; 201 GaimBuddy *buddy = tmp->data;