[continued from previous message]

! CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
! "Connecting to %s"),
! se->official_name);
! }
! } else if (main_cancel) {
! set_cancel_message(main_cancel,
! -1,
! CATGETS(elm_msg_cat, MeSet,MeConnectingSimple,
! "Connecting to %s"),
! se->official_name);
! bgcan = main_cancel;
}

if(ra->stream) {
***************
*** 2892,2898 ****
next_idx = idx+1;

DPRINT(Debug,12,(&Debug,
! "connect_remote_account: %d (count %d)\n",
idx,se->addr_count));

/* Copy all information */
--- 3077,3083 ----
next_idx = idx+1;

DPRINT(Debug,12,(&Debug,
! "connect_remote_account: %d (count %d)\n",
idx,se->addr_count));

/* Copy all information */
***************
*** 3479,3485 ****
clean:
if (bglist)
free_bgconnect_list(&bglist);
! if (bgcan)
free_cancel(&bgcan);

DPRINT(Debug,12,(&Debug,
--- 3664,3670 ----
clean:
if (bglist)
free_bgconnect_list(&bglist);
! if (bgcan && bgcan != main_cancel)
free_cancel(&bgcan);

DPRINT(Debug,12,(&Debug,
***************
*** 3492,3503 ****
1 == name found
2 == no lookup (se == NULL)
*/
! int split_remote_name(name,X,se,rest,lookup_flags)
const char *name;
struct remote_account *X;
struct service_entry **se;
char **rest;
int lookup_flags;
{
char *sep;
int ret = 0;
--- 3677,3691 ----
1 == name found
2 == no lookup (se == NULL)
*/
! int split_remote_name(name,