[continued from previous message]

set_cancel_message(main_cancel,
***************
*** 3484,3492 ****
CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
"Connecting to %s"),
se->official_name);
! bgcan = main_cancel;
} else {
! bgcan = new_schedule_cancel(100 /* msec */,
CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
"Connecting to %s"),
se->official_name);
--- 3541,3549 ----
CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
"Connecting to %s"),
se->official_name);
! *bgcan_p = main_cancel;
} else {
! *bgcan_p = new_schedule_cancel(100 /* msec */,
CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
"Connecting to %s"),
se->official_name);
***************
*** 3497,3519 ****
CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
"Connecting to %s"),
se->official_name);
! bgcan = main_cancel;
}
!
if (ra->stream) {
DPRINT(Debug,12,(&Debug,
! "connect_remote_account: Closing for reopening\n"));
FreeStreamStack2(& (ra->stream),
1 /* Force clearing of stack even when this is not last reference */);
}

if (ra->service) {
DPRINT(Debug,12,(&Debug,
! "connect_remote_account: Removing old service entry: %p\n",
ra->service));
free_service_entry(& (ra->service));
}

DPRINT(Debug,12,(&Debug,"c