* somehow all.patch got here. Reversing.

1 files changed, 5 insertions, 15 deletions

diff --git a/alpine/roleconf.c b/alpine/roleconf.c
index be046acf..fad1e661 100644
--- a/alpine/roleconf.c
+++ b/alpine/roleconf.c
@@ -140,13 +140,8 @@ role_select_screen(struct pine *ps, ACTION_S **role, int alt_compose)
 
     if(!(nonempty_patterns(rflags, &pstate) &&
          first_pattern(&pstate))){
-	if(!ps->send_immediately)
 	q_status_message(SM_ORDER, 3, 3,
 			 _("No roles available. Use Setup/Rules to add roles."));
-	else{
-	   printf( _("No roles available. Use Setup/Rules to add roles."));
-	   exit(-1);
-	}
 	return(ret);
     }
 
@@ -4483,11 +4478,11 @@ role_config_edit_screen(struct pine *ps, PAT_S *def, char *title, long int rflag
 	ctmp->tool		  = role_sort_tool;
 	ctmp->valoffset	    	  = rindent;
 	ctmp->flags              |= CF_NOSELECT;
-	ctmp->value     = cpystr(set_choose);
+	ctmp->value     = cpystr(set_choose);				\
 
 	pval = PVAL(&sort_act_var, ew);
 	if(pval)
-	  decode_sort(pval, &def_sort, &def_sort_rev, 0);
+	  decode_sort(pval, &def_sort, &def_sort_rev);
 
 	/* allow user to set their default sort order */
 	new_confline(&ctmp)->var = &sort_act_var;
@@ -4497,7 +4492,7 @@ role_config_edit_screen(struct pine *ps, PAT_S *def, char *title, long int rflag
 	ctmp->tool	      = role_sort_tool;
 	ctmp->valoffset	      = rindent;
 	ctmp->varmem	      = -1;
-	ctmp->value	      = generalized_sort_pretty_value(ps, ctmp, 0, 0);
+	ctmp->value	      = generalized_sort_pretty_value(ps, ctmp, 0);
 
 	for(j = 0; j < 2; j++){
 	    for(i = 0; ps->sort_types[i] != EndofList; i++){
@@ -4509,7 +4504,7 @@ role_config_edit_screen(struct pine *ps, PAT_S *def, char *title, long int rflag
 		ctmp->valoffset	      = rindent;
 		ctmp->varmem	      = i + (j * EndofList);
 		ctmp->value	      = generalized_sort_pretty_value(ps, ctmp,
-								      0, 0);
+								      0);
 	    }
 	}
 
@@ -5442,7 +5437,7 @@ role_config_edit_screen(struct pine *ps, PAT_S *def, char *title, long int rflag
 	  (*result)->patgrp->stat_boy = PAT_STAT_EITHER;
 
 	if(sort_act){
-	    decode_sort(sort_act, &def_sort, &def_sort_rev, 0);
+	    decode_sort(sort_act, &def_sort, &def_sort_rev);
 	    (*result)->action->sort_is_set = 1;
 	    (*result)->action->sortorder = def_sort;
 	    (*result)->action->revsort = (def_sort_rev ? 1 : 0);
@@ -7711,11 +7706,6 @@ role_text_tool_inick(struct pine *ps, int cmd, CONF_S **cl, unsigned int flags)
 	    if(apval)
 	      *apval = (role && role->nick) ? cpystr(role->nick) : NULL;
 
-	    if (ps_global->role)
-		fs_give((void **)&ps_global->role);
-	    if (role && role->nick)
-		ps_global->role = cpystr(role->nick);
-
 	    if((*cl)->value)
 	      fs_give((void **)&((*cl)->value));